Created
September 29, 2012 06:21
-
-
Save swiftgeek/3803351 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -rupN original/data/greeter.ui changed/data/greeter.ui | |
--- original/data/greeter.ui 2012-07-31 00:05:50.000000000 +0200 | |
+++ changed/data/greeter.ui 2012-09-29 09:21:25.000000000 +0200 | |
@@ -317,6 +317,15 @@ | |
</object> | |
</child> | |
</object> | |
+ <object class="GtkWindow" id="background_window"> | |
+ <property name="name">background_window</property> | |
+ <property name="can_focus">False</property> | |
+ <property name="decorated">False</property> | |
+ <property name="has_resize_grip">False</property> | |
+ <property name="opacity">1</property> | |
+ <property name="accept-focus">False</property> | |
+ <property name="focus-on-map">False</property> | |
+ </object> | |
<object class="GtkListStore" id="session_liststore"> | |
<columns> | |
<!-- column-name label --> | |
diff -rupN original/src/lightdm-gtk-greeter.c changed/src/lightdm-gtk-greeter.c | |
--- original/src/lightdm-gtk-greeter.c 2012-08-30 19:39:09.000000000 +0200 | |
+++ changed/src/lightdm-gtk-greeter.c 2012-09-29 09:17:43.000000000 +0200 | |
@@ -22,7 +22,7 @@ | |
static LightDMGreeter *greeter; | |
static GKeyFile *state; | |
static gchar *state_filename; | |
-static GtkWindow *login_window, *panel_window; | |
+static GtkWindow *login_window, *panel_window, *background_window; | |
static GtkButton *login_button, *cancel_button; | |
static GtkLabel *message_label, *prompt_label; | |
static GtkWidget *login_box, *prompt_box; | |
@@ -779,7 +779,7 @@ main (int argc, char **argv) | |
return EXIT_FAILURE; | |
/* Set default cursor */ | |
- gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); | |
+ //gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); | |
/* Load background */ | |
value = g_key_file_get_value (config, "greeter", "background", NULL); | |
@@ -839,8 +839,8 @@ main (int argc, char **argv) | |
gdk_flush (); | |
XClearWindow (GDK_SCREEN_XDISPLAY (screen), RootWindow (GDK_SCREEN_XDISPLAY (screen), i)); | |
} | |
- if (background_pixbuf) | |
- g_object_unref (background_pixbuf); | |
+ //if (background_pixbuf) | |
+ // g_object_unref (background_pixbuf); | |
/* Set GTK+ settings */ | |
value = g_key_file_get_value (config, "greeter", "theme-name", NULL); | |
@@ -894,6 +894,7 @@ main (int argc, char **argv) | |
} | |
g_clear_error (&error); | |
+ background_window = GTK_WINDOW (gtk_builder_get_object (builder, "background_window")); | |
login_window = GTK_WINDOW (gtk_builder_get_object (builder, "login_window")); | |
login_box = GTK_WIDGET (gtk_builder_get_object (builder, "login_box")); | |
login_button = GTK_BUTTON (gtk_builder_get_object (builder, "login_button")); | |
@@ -1035,16 +1036,29 @@ main (int argc, char **argv) | |
gtk_builder_connect_signals(builder, greeter); | |
+ //background_window placeholder | |
+ gdk_screen_get_monitor_geometry (gdk_screen_get_default (), gdk_screen_get_primary_monitor (gdk_screen_get_default ()), &monitor_geometry); | |
+ gtk_widget_show (GTK_WIDGET (background_window)); | |
+ gtk_window_resize (background_window, monitor_geometry.width, monitor_geometry.height); | |
+ gtk_window_move (background_window, monitor_geometry.x, monitor_geometry.y); | |
+ gdk_window_set_cursor (gtk_widget_get_window (background_window), gdk_cursor_new (GDK_LEFT_PTR)); | |
+ if (background_pixbuf) | |
+ g_object_unref (background_pixbuf); | |
+ else | |
+ gtk_widget_modify_bg(background_window, GTK_STATE_NORMAL, &background_color); | |
+ | |
gtk_widget_show (GTK_WIDGET (login_window)); | |
center_window (login_window); | |
+ gdk_window_set_cursor (gtk_widget_get_window (login_window), gdk_cursor_new (GDK_LEFT_PTR)); | |
g_signal_connect (GTK_WIDGET (login_window), "size-allocate", G_CALLBACK (center_window), login_window); | |
gtk_widget_show (GTK_WIDGET (panel_window)); | |
GtkAllocation allocation; | |
gtk_widget_get_allocation (GTK_WIDGET (panel_window), &allocation); | |
- gdk_screen_get_monitor_geometry (gdk_screen_get_default (), gdk_screen_get_primary_monitor (gdk_screen_get_default ()), &monitor_geometry); | |
+ //gdk_screen_get_monitor_geometry (gdk_screen_get_default (), gdk_screen_get_primary_monitor (gdk_screen_get_default ()), &monitor_geometry); | |
gtk_window_resize (panel_window, monitor_geometry.width, allocation.height); | |
gtk_window_move (panel_window, monitor_geometry.x, monitor_geometry.y); | |
+ gdk_window_set_cursor (gtk_widget_get_window (panel_window), gdk_cursor_new (GDK_LEFT_PTR)); | |
gtk_widget_show (GTK_WIDGET (login_window)); | |
gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (login_window)), GDK_CURRENT_TIME); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment