|
 |
2e5fb93 |
diff -up gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window gdm-2.23.92/daemon/gdm-simple-slave.c
|
|
|
2e5fb93 |
--- gdm-2.23.92/daemon/gdm-simple-slave.c.save-root-window 2008-09-03 16:52:53.000000000 -0400
|
|
|
67928d9 |
+++ gdm-2.23.92/daemon/gdm-simple-slave.c 2008-09-19 18:18:50.000000000 -0400
|
|
|
2e5fb93 |
@@ -825,6 +825,15 @@ setup_server (GdmSimpleSlave *slave)
|
|
|
2e5fb93 |
{
|
|
|
2e5fb93 |
/* Set the busy cursor */
|
|
|
2e5fb93 |
gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ /* The root window has a background that may be useful
|
|
|
2e5fb93 |
+ * to cross fade or transition from when setting the
|
|
|
2e5fb93 |
+ * login screen background. We read it here, and stuff
|
|
|
6a8cf98 |
+ * it into the standard _XROOTPMAP_ID root window property,
|
|
|
2e5fb93 |
+ * so gnome-settings-daemon can get at it.
|
|
|
2e5fb93 |
+ */
|
|
|
2e5fb93 |
+ gdm_slave_save_root_windows (GDM_SLAVE (slave));
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
}
|
|
|
2e5fb93 |
|
|
|
2e5fb93 |
static void
|
|
|
2e5fb93 |
diff -up gdm-2.23.92/daemon/gdm-slave.c.save-root-window gdm-2.23.92/daemon/gdm-slave.c
|
|
|
2e5fb93 |
--- gdm-2.23.92/daemon/gdm-slave.c.save-root-window 2008-08-26 15:04:00.000000000 -0400
|
|
|
67928d9 |
+++ gdm-2.23.92/daemon/gdm-slave.c 2008-09-22 11:06:36.000000000 -0400
|
|
|
2e5fb93 |
@@ -42,6 +42,7 @@
|
|
|
2e5fb93 |
#include <dbus/dbus-glib-lowlevel.h>
|
|
|
2e5fb93 |
|
|
|
2e5fb93 |
#include <X11/Xlib.h> /* for Display */
|
|
|
2e5fb93 |
+#include <X11/Xatom.h> /* for XA_PIXMAP */
|
|
|
2e5fb93 |
#include <X11/cursorfont.h> /* for watch cursor */
|
|
|
2e5fb93 |
|
|
|
2e5fb93 |
#include "gdm-common.h"
|
|
|
67928d9 |
@@ -341,6 +342,77 @@ gdm_slave_run_script (GdmSlave *slave,
|
|
|
2e5fb93 |
return ret;
|
|
|
2e5fb93 |
}
|
|
|
2e5fb93 |
|
|
|
2e5fb93 |
+static void
|
|
|
2e5fb93 |
+gdm_slave_save_root_window_of_screen (GdmSlave *slave,
|
|
|
2e5fb93 |
+ Atom id_atom,
|
|
|
2e5fb93 |
+ int screen_number)
|
|
|
2e5fb93 |
+{
|
|
|
2e5fb93 |
+ Window root_window;
|
|
|
2e5fb93 |
+ GC gc;
|
|
|
2e5fb93 |
+ XGCValues values;
|
|
|
2e5fb93 |
+ Pixmap pixmap;
|
|
|
2e5fb93 |
+ int width, height, depth;
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ root_window = RootWindow (slave->priv->server_display,
|
|
|
2e5fb93 |
+ screen_number);
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ width = DisplayWidth (slave->priv->server_display, screen_number);
|
|
|
2e5fb93 |
+ height = DisplayHeight (slave->priv->server_display, screen_number);
|
|
|
2e5fb93 |
+ depth = DefaultDepth (slave->priv->server_display, screen_number);
|
|
|
2e5fb93 |
+ pixmap = XCreatePixmap (slave->priv->server_display,
|
|
|
2e5fb93 |
+ root_window,
|
|
|
2e5fb93 |
+ width, height, depth);
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ values.function = GXcopy;
|
|
|
2e5fb93 |
+ values.plane_mask = AllPlanes;
|
|
|
2e5fb93 |
+ values.fill_style = FillSolid;
|
|
|
2e5fb93 |
+ values.subwindow_mode = IncludeInferiors;
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ gc = XCreateGC (slave->priv->server_display,
|
|
|
2e5fb93 |
+ root_window,
|
|
|
2e5fb93 |
+ GCFunction | GCPlaneMask | GCFillStyle | GCSubwindowMode,
|
|
|
2e5fb93 |
+ &values);
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ if (XCopyArea (slave->priv->server_display,
|
|
|
2e5fb93 |
+ root_window, pixmap, gc, 0, 0,
|
|
|
2e5fb93 |
+ width, height, 0, 0)) {
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ long pixmap_as_long;
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ pixmap_as_long = (long) pixmap;
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ XChangeProperty (slave->priv->server_display,
|
|
|
2e5fb93 |
+ root_window, id_atom, XA_PIXMAP,
|
|
|
2e5fb93 |
+ 32, PropModeReplace, (guchar *) &pixmap_as_long,
|
|
|
2e5fb93 |
+ 1);
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ }
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ XFreeGC (slave->priv->server_display, gc);
|
|
|
2e5fb93 |
+}
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+void
|
|
|
2e5fb93 |
+gdm_slave_save_root_windows (GdmSlave *slave)
|
|
|
2e5fb93 |
+{
|
|
|
2e5fb93 |
+ int i, number_of_screens;
|
|
|
2e5fb93 |
+ Atom atom;
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ number_of_screens = ScreenCount (slave->priv->server_display);
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ atom = XInternAtom (slave->priv->server_display,
|
|
|
6a8cf98 |
+ "_XROOTPMAP_ID", False);
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ if (atom == 0) {
|
|
|
2e5fb93 |
+ return;
|
|
|
2e5fb93 |
+ }
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
+ for (i = 0; i < number_of_screens; i++) {
|
|
|
2e5fb93 |
+ gdm_slave_save_root_window_of_screen (slave, atom, i);
|
|
|
2e5fb93 |
+ }
|
|
|
67928d9 |
+
|
|
|
67928d9 |
+ XSync (slave->priv->server_display, False);
|
|
|
2e5fb93 |
+}
|
|
|
2e5fb93 |
+
|
|
|
2e5fb93 |
void
|
|
|
2e5fb93 |
gdm_slave_set_busy_cursor (GdmSlave *slave)
|
|
|
2e5fb93 |
{
|
|
|
2e5fb93 |
diff -up gdm-2.23.92/daemon/gdm-slave.h.save-root-window gdm-2.23.92/daemon/gdm-slave.h
|
|
|
2e5fb93 |
--- gdm-2.23.92/daemon/gdm-slave.h.save-root-window 2008-08-26 15:04:00.000000000 -0400
|
|
|
67928d9 |
+++ gdm-2.23.92/daemon/gdm-slave.h 2008-09-19 18:18:50.000000000 -0400
|
|
|
2e5fb93 |
@@ -69,6 +69,7 @@ gboolean gdm_slave_switch_to_
|
|
|
2e5fb93 |
|
|
|
2e5fb93 |
gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave);
|
|
|
2e5fb93 |
void gdm_slave_set_busy_cursor (GdmSlave *slave);
|
|
|
2e5fb93 |
+void gdm_slave_save_root_windows (GdmSlave *slave);
|
|
|
2e5fb93 |
gboolean gdm_slave_run_script (GdmSlave *slave,
|
|
|
2e5fb93 |
const char *dir,
|
|
|
2e5fb93 |
const char *username);
|