fix compilation

Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>

	* gdk/linux-fb/gdkwindow-fb.c: fix compilation

	* gdk/linux-fb/gdkmain-fb.c: better display mode setting

ChangeLog

+Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>
+
+	* gdk/linux-fb/gdkwindow-fb.c: fix compilation
+
+	* gdk/linux-fb/gdkmain-fb.c: better display mode setting
+
 Mon Oct  7 18:50:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_finalize):

ChangeLog.pre-2-10

+Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>
+
+	* gdk/linux-fb/gdkwindow-fb.c: fix compilation
+
+	* gdk/linux-fb/gdkmain-fb.c: better display mode setting
+
 Mon Oct  7 18:50:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_finalize):

ChangeLog.pre-2-2

+Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>
+
+	* gdk/linux-fb/gdkwindow-fb.c: fix compilation
+
+	* gdk/linux-fb/gdkmain-fb.c: better display mode setting
+
 Mon Oct  7 18:50:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_finalize):

ChangeLog.pre-2-4

+Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>
+
+	* gdk/linux-fb/gdkwindow-fb.c: fix compilation
+
+	* gdk/linux-fb/gdkmain-fb.c: better display mode setting
+
 Mon Oct  7 18:50:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_finalize):

ChangeLog.pre-2-6

+Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>
+
+	* gdk/linux-fb/gdkwindow-fb.c: fix compilation
+
+	* gdk/linux-fb/gdkmain-fb.c: better display mode setting
+
 Mon Oct  7 18:50:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_finalize):

ChangeLog.pre-2-8

+Mon Oct  7 19:14:24 2002  Eric Warmenhoven <eric@warmenhoven.org>
+
+	* gdk/linux-fb/gdkwindow-fb.c: fix compilation
+
+	* gdk/linux-fb/gdkmain-fb.c: better display mode setting
+
 Mon Oct  7 18:50:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_finalize):

gdk/linux-fb/gdkmain-fb.c

@@ -333,6 +333,13 @@ fb_modes_parse_mode (GScanner *scanner,
     }
 
   if (strcmp (modename, specified_modename)== 0) {
+    /* we really should be parsing for rgba. regardless, if rgba isn't found,
+     * we can't assume that the original colors are valid for the new mode */
+    memset (&modeinfo->red, 0, sizeof (modeinfo->red));
+    memset (&modeinfo->green, 0, sizeof (modeinfo->green));
+    memset (&modeinfo->blue, 0, sizeof (modeinfo->blue));
+    memset (&modeinfo->transp, 0, sizeof (modeinfo->transp));
+
     if (!found_geometry)
       g_warning ("Geometry not specified");
 
@@ -503,6 +510,13 @@ gdk_fb_set_mode (GdkFBDisplay *display)
       return -1;
     }
   
+  /* ask for info back to make sure of what we got */
+  if (ioctl (display->fb_fd, FBIOGET_VSCREENINFO, &display->modeinfo) < 0)
+    {
+      g_warning ("Error getting var screen info");
+      return -1;
+    }
+  
   if (ioctl (display->fb_fd, FBIOGET_FSCREENINFO, &display->sinfo) < 0)
     {
       g_warning ("Error getting fixed screen info");

gdk/linux-fb/gdkwindow-fb.c

@@ -1621,7 +1621,8 @@ gdk_window_fb_get_visible_region (GdkDrawable *drawable)
 }
 
 GdkWindow *
-_gdk_windowing_window_get_pointer (GdkWindow       *window,
+_gdk_windowing_window_get_pointer (GdkDisplay      *display,
+				   GdkWindow       *window,
 				   gint            *x,
 				   gint            *y,
 				   GdkModifierType *mask)
@@ -1704,10 +1705,10 @@ _gdk_windowing_get_pointer (GdkDisplay       *display,
 			    GdkModifierType  *mask)
 {
   GdkScreen *default_screen = gdk_display_get_default_screen (display);
-  GdkWindow *root_window = gdk_screen_get_root_window (screen);
+  GdkWindow *root_window = gdk_screen_get_root_window (default_screen);
   
   *screen = default_screen;
-  _gdk_windowing_window_get_pointer (root_window, x, y, mask);
+  _gdk_windowing_window_get_pointer (display, root_window, x, y, mask);
 }
 
 GdkWindow*