rpms/rhgb/F-9 rhgb-eeepc.patch,NONE,1.1 rhgb.spec,1.98,1.99

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/rhgb/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4229

Modified Files:
	rhgb.spec 
Added Files:
	rhgb-eeepc.patch 
Log Message:
Make the splash work on 800x480 (Eee pc)


rhgb-eeepc.patch:

--- NEW FILE rhgb-eeepc.patch ---
diff -up rhgb-9.0.0/src/splash.c.eeepc rhgb-9.0.0/src/splash.c
--- rhgb-9.0.0/src/splash.c.eeepc	2008-05-02 13:21:20.000000000 -0400
+++ rhgb-9.0.0/src/splash.c	2008-05-02 13:21:24.000000000 -0400
@@ -171,7 +171,7 @@ window_realize (GtkWindow *window,
   GdkAtom atom;
 
   gtk_window_move (window, splash->x, splash->y);
-  gtk_window_fullscreen (window);
+//  gtk_window_fullscreen (window);
 
   /*
    * Jonathan's hack ask the WM to move on the 2nd desktop to get it
@@ -239,6 +239,8 @@ expand_pixbuf (GdkPixbuf *p, gint w2, gi
   w = gdk_pixbuf_get_width (p);
   h = gdk_pixbuf_get_height (p);
 
+  g_print ("expanding pixbuf from %dx%d to %dx%d\n", w, h, w2, h2);
+
   p2 = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w2, h2);
 
   w1 = MIN (w, w2) / 2;
@@ -275,14 +277,17 @@ event_box_realize (GtkWidget *widget)
 
   screen = gdk_screen_get_default ();
   gdk_screen_get_monitor_geometry (screen, 0, &rect);
-  screen_height = rect.height;
+  if (g_getenv ("RHGB_HEIGHT")) 
+    screen_height = atoi (g_getenv ("RHGB_HEIGHT"));
+  else
+    screen_height = rect.height;
 
   if (screen_height < 768)
     {
 #ifdef SPLASH_MAIN
-      pixbuf = gdk_pixbuf_new_from_file_at_scale ("main-logo.png", -1, (int) (.50 * screen_height), TRUE, NULL);
+      pixbuf = gdk_pixbuf_new_from_file_at_scale ("main-logo.png", -1, 400, TRUE, NULL);
 #else
-      pixbuf = gdk_pixbuf_new_from_file_at_scale ("/usr/share/rhgb/main-logo.png", -1, (int) (.50 * screen_height), TRUE, NULL);
+      pixbuf = gdk_pixbuf_new_from_file_at_scale ("/usr/share/rhgb/main-logo.png", -1, 400, TRUE, NULL);
 #endif
     }
   else
@@ -408,17 +413,28 @@ splash_new (void)
   splash = g_new0 (Splash, 1);
 
   screen = gdk_screen_get_default ();
-  gdk_screen_get_monitor_geometry (screen, 0, &rect);
-  screen_width = rect.width;
-  screen_height = rect.height;
-  splash->x = rect.x;
-  splash->y = rect.y;
+  if (g_getenv ("RHGB_WIDTH") && g_getenv ("RHGB_HEIGHT"))
+    {
+      screen_width = atoi (g_getenv ("RHGB_WIDTH"));
+      screen_height = atoi (g_getenv ("RHGB_HEIGHT"));
+      splash->x = 0;
+      splash->y = 0;
+    }
+  else
+    {
+      gdk_screen_get_monitor_geometry (screen, 0, &rect);
+      screen_width = rect.width;
+      screen_height = rect.height;
+      splash->x = rect.x;
+      splash->y = rect.y;
+    }
   splash->user_wants_details = FALSE;
 
   /* Make the window */
   splash->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_app_paintable (splash->window, TRUE);
   gtk_window_set_default_size (GTK_WINDOW (splash->window), screen_width, screen_height);
+  gtk_widget_set_size_request (GTK_WIDGET (splash->window), screen_width, screen_height);
   gtk_widget_modify_bg (splash->window, GTK_STATE_NORMAL, &background);
   g_signal_connect (G_OBJECT (splash->window),
 		    "realize",


Index: rhgb.spec
===================================================================
RCS file: /cvs/extras/rpms/rhgb/F-9/rhgb.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- rhgb.spec	24 Apr 2008 18:41:43 -0000	1.98
+++ rhgb.spec	2 May 2008 17:27:08 -0000	1.99
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 9.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 
 Patch0: rhgb-9.0.0-new-color.patch
 Patch1: rhgb-9.0.0-inittab.patch
+Patch2: rhgb-eeepc.patch
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -29,6 +30,7 @@
 %setup -q
 %patch0 -p1 -b .new-color
 %patch1 -p1 -b .inittab
+%patch2 -p1 -b .eeepc
 
 %build
 %configure
@@ -58,6 +60,9 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Fri May  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:9.0.0-4
+- Make the splash on 800x480 (#444944)
+
 * Thu Apr 24 2008 Bill Nottingham <notting at redhat.com> - 1:9.0.0-3
 - as we're using inittab again, go back to reading it