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

gdk: Fix screen geometry detection for non-randr setups

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=773601
This commit is contained in:
Michael Koloberdin
2016-11-15 01:00:10 +02:00
committed by Matthias Clasen
parent c5f6d61783
commit 504beaddb1
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gdk/x11/gdkscreen-x11.c
View File

@ -755,10 +755,12 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
static void static void
init_no_multihead (GdkScreen *screen, gboolean *changed) init_no_multihead (GdkScreen *screen, gboolean *changed)
{ {
GdkDisplay *display = gdk_screen_get_display (screen);
GdkX11Display *x11_display = GDK_X11_DISPLAY (display);
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen); GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display);
GdkX11Monitor *monitor; GdkX11Monitor *monitor;
GdkRectangle geometry; GdkRectangle geometry;
GdkRectangle newgeo;
int i; int i;
for (i = 0; i < x11_display->monitors->len; i++) for (i = 0; i < x11_display->monitors->len; i++)
@ -782,18 +784,25 @@ init_no_multihead (GdkScreen *screen, gboolean *changed)
} }
gdk_monitor_get_geometry (GDK_MONITOR (monitor), &geometry); gdk_monitor_get_geometry (GDK_MONITOR (monitor), &geometry);
if (0 != geometry.x ||
0 != geometry.y || newgeo.x = 0;
gdk_x11_screen_get_width (screen) != geometry.width || newgeo.y = 0;
gdk_x11_screen_get_height (screen) != geometry.height || newgeo.width = DisplayWidth (x11_display->xdisplay, x11_screen->screen_num) /
x11_screen->window_scale;
newgeo.height = DisplayHeight (x11_display->xdisplay, x11_screen->screen_num) /
x11_screen->window_scale;
if (newgeo.x != geometry.x ||
newgeo.y != geometry.y ||
newgeo.width != geometry.width ||
newgeo.height != geometry.height ||
gdk_x11_screen_get_width_mm (screen) != gdk_monitor_get_width_mm (GDK_MONITOR (monitor)) || gdk_x11_screen_get_width_mm (screen) != gdk_monitor_get_width_mm (GDK_MONITOR (monitor)) ||
gdk_x11_screen_get_height_mm (screen) != gdk_monitor_get_height_mm (GDK_MONITOR (monitor))) gdk_x11_screen_get_height_mm (screen) != gdk_monitor_get_height_mm (GDK_MONITOR (monitor)))
*changed = TRUE; *changed = TRUE;
gdk_monitor_set_position (GDK_MONITOR (monitor), 0, 0); gdk_monitor_set_position (GDK_MONITOR (monitor), newgeo.x, newgeo.y);
gdk_monitor_set_size (GDK_MONITOR (monitor), gdk_monitor_set_size (GDK_MONITOR (monitor), newgeo.width, newgeo.height);
gdk_x11_screen_get_width (screen),
gdk_x11_screen_get_height (screen));
g_object_notify (G_OBJECT (monitor), "workarea"); g_object_notify (G_OBJECT (monitor), "workarea");
gdk_monitor_set_physical_size (GDK_MONITOR (monitor), gdk_monitor_set_physical_size (GDK_MONITOR (monitor),
gdk_x11_screen_get_width_mm (screen), gdk_x11_screen_get_width_mm (screen),