2007-05-15 Matthew Allum <[email protected]>

        * src/matchbox-keyboard-remote.c:
        * src/matchbox-keyboard-ui.c:
        Dont intercept and handle *ALL* configure events.
        Add some more debug info.

git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/matchbox-keyboard@1540 b067294f-1dea-0310-9683-c47a78595994

ChangeLog

@@ -1,3 +1,10 @@
+2007-05-15  Matthew Allum  <[email protected]>
+
+	* src/matchbox-keyboard-remote.c:
+	* src/matchbox-keyboard-ui.c:
+	Dont intercept and handle *ALL* configure events.
+	Add some more debug info.
+
 2007-05-15  Ross Burton  <[email protected]>
 
 	* gtk-im/im-protocol.c:

src/matchbox-keyboard-remote.c

@@ -31,11 +31,16 @@ mb_kbd_remote_init (MBKeyboardUI *ui)
 void
 mb_kbd_remote_process_xevents (MBKeyboardUI *ui, XEvent *xevent)
 {
+  DBG("got a message\n");
+
   switch (xevent->type)
     {
     case ClientMessage:
+      DBG("is a Client Message\n");
       if (xevent->xclient.message_type == Atom_MB_IM_INVOKER_COMMAND)
 	{
+	  DBG("got a message of type _MB_IM_INVOKER_COMMAND, val %i\n",
+	      xevent->xclient.data.l[0]);
 	  if (xevent->xclient.data.l[0] == 1)
 	      mb_kbd_ui_show (ui);
 	  else

src/matchbox-keyboard-ui.c

@@ -568,7 +568,6 @@ void
 mb_kbd_ui_show(MBKeyboardUI  *ui)
 {
   XMapWindow(ui->xdpy, ui->xwin);
-  mb_kbd_ui_redraw (ui);
 }
 
 void
@@ -991,7 +990,6 @@ mb_kbd_ui_resize(MBKeyboardUI *ui, int width, int height)
   ui->xwin_width  = width;
   ui->xwin_height = height;
 
-
   if (ui->backbuffer) /* may get called before initialised */
     {
       XFreePixmap(ui->xdpy, ui->backbuffer);
@@ -1042,6 +1040,7 @@ mb_kbd_ui_handle_configure(MBKeyboardUI *ui,
 
   mb_kbd_ui_resize(ui, width, height); 
 
+
 }
 
 void
@@ -1117,11 +1116,15 @@ mb_kbd_ui_event_loop(MBKeyboardUI *ui)
 		  }
 		break;
 	      case ConfigureNotify:
-		if (xev.xconfigure.width != ui->xwin_width
-		    || xev.xconfigure.height != ui->xwin_height)
-		  mb_kbd_ui_handle_configure(ui,
-					     xev.xconfigure.width,
-					     xev.xconfigure.height);
+		if (xev.xconfigure.window == ui->xwin 
+		    &&  (xev.xconfigure.width != ui->xwin_width
+			 || xev.xconfigure.height != ui->xwin_height))
+		  {
+		    mb_kbd_ui_handle_configure(ui,
+					       xev.xconfigure.width,
+					       xev.xconfigure.height);
+		  }
+
 		break;
 	      case MappingNotify: 
 		fakekey_reload_keysyms(ui->fakekey);