From 6173371a617359d0bcc976336ba536cc3d93a260 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Tue, 8 Oct 2002 02:19:09 +0000 Subject: [PATCH] fix compilation Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation * gdk/linux-fb/gdkmain-fb.c: better display mode setting --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/linux-fb/gdkmain-fb.c | 14 ++++++++++++++ gdk/linux-fb/gdkwindow-fb.c | 7 ++++--- 8 files changed, 54 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27f9cd9a16..3acf07a317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 7 19:14:24 2002 Eric Warmenhoven + + * 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 * gtk/gtkcolorsel.c (gtk_color_selection_finalize): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 27f9cd9a16..3acf07a317 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Oct 7 19:14:24 2002 Eric Warmenhoven + + * 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 * gtk/gtkcolorsel.c (gtk_color_selection_finalize): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 27f9cd9a16..3acf07a317 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Oct 7 19:14:24 2002 Eric Warmenhoven + + * 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 * gtk/gtkcolorsel.c (gtk_color_selection_finalize): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 27f9cd9a16..3acf07a317 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Oct 7 19:14:24 2002 Eric Warmenhoven + + * 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 * gtk/gtkcolorsel.c (gtk_color_selection_finalize): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 27f9cd9a16..3acf07a317 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Oct 7 19:14:24 2002 Eric Warmenhoven + + * 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 * gtk/gtkcolorsel.c (gtk_color_selection_finalize): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 27f9cd9a16..3acf07a317 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Oct 7 19:14:24 2002 Eric Warmenhoven + + * 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 * gtk/gtkcolorsel.c (gtk_color_selection_finalize): diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c index ec6569575a..24c910f15f 100644 --- a/gdk/linux-fb/gdkmain-fb.c +++ b/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"); diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index bbb3a7adc4..4466d06fcd 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/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*