X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwindow.cpp;h=3de9ba7f33894ba1c5c07d1f71a73d7faf1a51eb;hb=eb9a95ca4acbbdbc6c17acd6b8a135deab906f39;hp=b977f6bc97ac89cbd7af1e81d02f125593f3de02;hpb=935c50bdcc95fe95d39931182461a2b25ac30b9d;p=libs%2Fgui.git

diff --git a/source/window.cpp b/source/window.cpp
index b977f6b..3de9ba7 100644
--- a/source/window.cpp
+++ b/source/window.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <vector>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <msp/core/error.h>
 #include "window.h"
@@ -52,6 +53,17 @@ Window::~Window()
 		XCloseDisplay(display);
 }
 
+void Window::set_title(const string &title)
+{
+	vector<unsigned char> buf(title.begin(), title.end());
+	XTextProperty prop;
+	prop.value=&buf[0];
+	prop.encoding=XA_STRING;
+	prop.format=8;
+	prop.nitems=title.size();
+	XSetWMName(display, window, &prop);
+}
+
 void Window::show()
 {
 	XMapRaised(display, window);
@@ -90,14 +102,15 @@ void Window::prepare()
 
 	wm_delete_window=XInternAtom(display, "WM_DELETE_WINDOW", true);
 
+	/* Throwing from the error handler doesn't work too well and I don't know
+	   how to dig up all the information that Xlib gives by default, so disable
+		custom error handling for now. */
 	//XSetErrorHandler(x_error_handler);
 }
 
-void Window::create()
+void Window::set_window(Handle wnd)
 {
-	window=XCreateWindow(display, DefaultRootWindow(display), 0, 0, options.width, options.height, 0, CopyFromParent, InputOutput, CopyFromParent, 0, 0);
-	if(!window)
-		throw Exception("Couldn't create a window");
+	window=wnd;
 
 	XSelectInput(display, window, ButtonPressMask|ButtonReleaseMask|PointerMotionMask|KeyPressMask|KeyReleaseMask|StructureNotifyMask);
 
@@ -107,7 +120,9 @@ void Window::create()
 void Window::init()
 {
 	prepare();
-	create();
+
+	Handle wnd=XCreateWindow(display, DefaultRootWindow(display), 0, 0, options.width, options.height, 0, CopyFromParent, InputOutput, CopyFromParent, 0, 0);
+	set_window(wnd);
 }
 
 void Window::process_event(const XEvent &event)
@@ -137,7 +152,6 @@ void Window::process_event(const XEvent &event)
 	case ConfigureNotify:
 		options.width=event.xconfigure.width;
 		options.height=event.xconfigure.height;
-		on_resize();
 		signal_resize.emit(options.width, options.height);
 		break;
 	case ClientMessage:
@@ -146,6 +160,8 @@ void Window::process_event(const XEvent &event)
 		break;
 	default:;
 	}
+
+	on_event(event);
 }
 
 int Window::x_error_handler(Display *display, XErrorEvent *error)