patches/gnome-session-06-indiana-splash-hack.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 16501 a897c2973dc1
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15123
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
     1
diff -rup -x '*.orig' -x '*.rej' -x '*.*~' gnome-session-2.25.91/splash/gnome-session-splash.c ../gnome-session-2.25.91/splash/gnome-session-splash.c
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
     2
--- gnome-session-2.25.91/splash/gnome-session-splash.c	2009-02-17 17:52:31.574130870 +0100
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
     3
+++ ../gnome-session-2.25.91/splash/gnome-session-splash.c	2009-02-17 17:52:10.834139948 +0100
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
     4
@@ -270,8 +270,29 @@ setup_splash_window (void)
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
     5
         GsmSplashWindow *splash;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
     6
         GdkPixbuf       *background;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
     7
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
     8
+	display = gdk_display_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
     9
+	screen = gdk_display_get_default_screen (display);
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    10
+
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    11
         /* Create the splash window */
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    12
         background = load_splash_pixbuf ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    13
+	
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    14
+	if (gdk_pixbuf_get_width (background) > gdk_screen_get_width (screen))
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    15
+	  {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    16
+	    GdkPixbuf *center = NULL;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    17
+	    int width = gdk_screen_get_width (screen);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    18
+	    int height = gdk_screen_get_height (screen);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    19
+	    int x_offset = (gdk_pixbuf_get_width (background) - width) / 2;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    20
+	    int y_offset = (gdk_pixbuf_get_height (background) - height) / 2;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    21
+	    
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    22
+	    center = gdk_pixbuf_new_subpixbuf (background,
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    23
+					       x_offset,
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    24
+					       y_offset,
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    25
+					       width,
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    26
+					       height);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    27
+	    g_object_unref (background);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    28
+	    background = center;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    29
+	  }
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    30
+ 
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    31
         splash_widget = gsm_splash_window_new (background);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    32
         splash = (GsmSplashWindow *)splash_widget;
15123
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
    33
         if (background)
16501
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    34
--- gnome-session-2.27.91/splash/splash-window.c.ori	2009-09-09 04:43:59.062657500 +0100
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    35
+++ gnome-session-2.27.91/splash/splash-window.c	2009-09-09 04:50:16.324625800 +0100
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    36
@@ -116,10 +116,8 @@
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    37
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    38
         pango_layout_get_pixel_extents (splash->layout, NULL, &pixel_rect);
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    39
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    40
-        splash->text_box.x = (allocation->x + allocation->width / 2 -
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    41
-                              pixel_rect.width / 2);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    42
-        splash->text_box.y = (allocation->y + allocation->height -
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    43
-                              pixel_rect.height - SPLASH_LABEL_V_OFFSET);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    44
+	splash->text_box.x = (gdk_pixbuf_get_width (splash->background) / 2) - (pixel_rect.width / 2);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    45
+	splash->text_box.y = (gdk_pixbuf_get_height (splash->background) / 2) - (pixel_rect.height / 2) + 66;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    46
         splash->text_box.width = pixel_rect.width + 1;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    47
         splash->text_box.height = pixel_rect.height + 1;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    48
 }
16501
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    49
@@ -137,7 +135,7 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    50
                 return FALSE;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    51
         }
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    52
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    53
-        for (l = splash->icons; l; l = l->next) {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    54
+/*        for (l = splash->icons; l; l = l->next) {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    55
                 SplashIcon *si = l->data;
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    56
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    57
                 if (gdk_rectangle_intersect (&event->area,
16501
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    58
@@ -154,24 +152,24 @@
15123
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
    59
                                 GDK_RGB_DITHER_MAX,
98f1cf0da71a 2009-02-17 Erwann Chenede - <[email protected]>
erwannc
parents: 13577
diff changeset
    60
                                 exposed.x, exposed.y);
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    61
                 }
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    62
-        }
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    63
+        } */
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    64
 
13577
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    65
+/*
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    66
         if (splash->layout) {
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    67
                 calc_text_box (splash);
13577
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    68
                 if (gdk_rectangle_intersect (&event->area, &splash->text_box, &exposed)) {
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    69
-                        /* drop shadow */
16501
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    70
                         gdk_draw_layout (gtk_widget_get_window (widget),
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    71
                                          style->black_gc,
13577
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    72
                                          splash->text_box.x + 1, splash->text_box.y + 1,
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    73
                                          splash->layout);
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    74
 
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    75
-                        /* text */
16501
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    76
                         gdk_draw_layout (gtk_widget_get_window (widget),
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    77
                                          style->white_gc,
13577
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    78
                                          splash->text_box.x, splash->text_box.y,
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    79
                                          splash->layout);
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    80
                 }
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    81
         }
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    82
+*/
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    83
 
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    84
         return FALSE;
8fa2787b5146 2008-09-14 Wang Xin <[email protected]>
jedy
parents: 13113
diff changeset
    85
 }
16501
a897c2973dc1 reworked patch
davelam
parents: 15330
diff changeset
    86
@@ -483,8 +481,8 @@
12752
7a38a411c0be 2008-07-02 Niall Power <[email protected]>
niall
parents:
diff changeset
    87
 
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    88
         /* re-draw the old text extents */
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    89
         gtk_widget_queue_draw_area (GTK_WIDGET (splash),
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    90
-                                    splash->text_box.x, splash->text_box.y,
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    91
-                                    splash->text_box.width, splash->text_box.height);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    92
+                                    splash->text_box.x - 10, splash->text_box.y,
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    93
+                                    splash->text_box.width + 10, splash->text_box.height);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    94
 
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    95
         g_free (splash->cur_text);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 12752
diff changeset
    96
         splash->cur_text = g_strdup (app_name);