[maemo-commits] [maemo-commits] r18024 - in projects/haf/trunk/libmatchbox2: . debian matchbox/core

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-07 17:31:01 +0300 (Tue, 07 Apr 2009)
New Revision: 18024

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
hide the cursor so that apps can show it


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-07 12:14:32 UTC (rev 18023)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-07 14:31:01 UTC (rev 18024)
@@ -1,3 +1,9 @@
+2009-04-07  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-window-manager.c (mb_window_manager_init): Use an
+	invisible pixmap instead of XFixesHideCursor to allow applications to
+	show it. Fixes: NB#109073
+
 2009-04-03  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Made libmatchbox2 warning-free.

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-07 12:14:32 UTC (rev 18023)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-07 14:31:01 UTC (rev 18024)
@@ -1,6 +1,6 @@
 matchbox-window-manager-2 (0.2.30-1~unreleased) unstable; urgency=low
 
-  * writeme
+  * Fixes: NB#109073 - Unable to show mouse pointer.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri,  3 Apr 2009 13:05:57 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-07 12:14:32 UTC (rev 18023)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-07 14:31:01 UTC (rev 18024)
@@ -1715,10 +1715,18 @@
 
   mb_wm_keys_init(wm);
 
-#ifdef HAVE_XFIXES
-  XFixesHideCursor (wm->xdpy, wm->root_win->xwindow);
-#endif
+  /* set the cursor invisible */
+  {
+    Pixmap pix = XCreatePixmap (wm->xdpy, wm->root_win->xwindow, 1, 1, 1);
+    XColor col;
+    Cursor blank_curs;
 
+    memset (&col, 0, sizeof (col));
+    blank_curs = XCreatePixmapCursor (wm->xdpy, pix, pix, &col, &col, 1, 1);
+    XFreePixmap (wm->xdpy, pix);
+    XDefineCursor(wm->xdpy, wm->root_win->xwindow, blank_curs);
+  }
+
   return 1;
 }