callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation

Browse Source 
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
This commit is contained in:
Eric Warmenhoven 2002-10-08 02:19:09 +00:00 committed by Eric Warmenhoven
parent 6dde472cbe
commit 6173371a61
8 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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):

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
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):

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
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):

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
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):

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
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):

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
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):

14
gdk/linux-fb/gdkmain-fb.c
View File

@ -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");

7
gdk/linux-fb/gdkwindow-fb.c
View File

@ -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*