[maemo-commits] [maemo-commits] r19109 - in projects/haf/trunk/gtk+: . gdk

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-11 11:48:59 +0300 (Tue, 11 Aug 2009)
New Revision: 19109

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/gdkwindow.c
Log:
2009-08-11  Sven Herzberg  <herzi at lanedo.com>

	About: NB#129361 - [AF checked] compositing issues with rgba

	* gdk/gdkwindow.c (gdk_window_new), (gdk_window_end_paint): revert the
	changes, this is going to be solved in a different way


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-11 08:48:29 UTC (rev 19108)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-11 08:48:59 UTC (rev 19109)
@@ -1,5 +1,12 @@
 2009-08-11  Sven Herzberg  <herzi at lanedo.com>
 
+	About: NB#129361 - [AF checked] compositing issues with rgba
+
+	* gdk/gdkwindow.c (gdk_window_new), (gdk_window_end_paint): revert the
+	changes, this is going to be solved in a different way
+
+2009-08-11  Sven Herzberg  <herzi at lanedo.com>
+
 	About: NB#89864 - [AF Checked] RGBA support
 
 	* gdk/x11/gdkcolor-x11.c (gdk_screen_get_system_colormap): some more

Modified: projects/haf/trunk/gtk+/gdk/gdkwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/gdkwindow.c	2009-08-11 08:48:29 UTC (rev 19108)
+++ projects/haf/trunk/gtk+/gdk/gdkwindow.c	2009-08-11 08:48:59 UTC (rev 19109)
@@ -35,11 +35,6 @@
 #include "gdkscreen.h"
 #include "gdkalias.h"
 
-#ifdef MAEMO_CHANGES
-#include <X11/Xatom.h>
-#include "x11/gdkx.h"
-#endif
-
 #define USE_BACKING_STORE	/* Appears to work on Win32, too, now. */
 
 typedef struct _GdkWindowPaint GdkWindowPaint;
@@ -396,25 +391,6 @@
       gdk_window_set_composited (window, TRUE);
       gdk_window_set_auto_composite (window, TRUE);
     }
-
-  /* set a flag to tell the window manager that we don't intend to use the
-   * alpha value; we use RGBA windows because we want to avoid BadMatch errors
-   * but as XFillRectangle() (called by the GtkWindow's expose handler) doesn't
-   * set the alpha value to 1.0 (instead it keeps it on 0.0), we have to tell
-   * the window manager, that we are not really invisible */
-  if (attributes->window_type == GDK_WINDOW_TOPLEVEL)
-    {
-      Atom  property = XInternAtom (GDK_WINDOW_XDISPLAY (window), "_MAEMO_IGNORE_ALPHA", True);
-      guint32 data = 1;
-      XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                       GDK_WINDOW_XID (window),
-                       property,
-                       XA_CARDINAL,
-                       32,
-                       PropModeReplace,
-                       (guchar*) &data,
-                       1);
-    }
 #endif
 
   return window;
@@ -1235,9 +1211,7 @@
 {
 #ifdef USE_BACKING_STORE
   GdkWindowObject *private = (GdkWindowObject *)window;
-#ifndef MAEMO_CHANGES
   GdkWindowObject *composited;
-#endif
   GdkWindowPaint *paint;
   GdkGC *tmp_gc;
 #ifdef MAEMO_CHANGES