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

wayland: calculate screen physical size

Browse Source 
A simple calculation is done so far (assuming monitor areas never overlap)
so gdk_screen_get_width/height_mm return meaningful values.

https://bugzilla.gnome.org/show_bug.cgi?id=753621
This commit is contained in:
Carlos Garnacho
2015-08-14 12:05:37 +02:00
committed by Matthias Clasen
parent 84bd32a09a
commit 02f3fe0671
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gdk/wayland/gdkscreen-wayland.c
View File

@ -1007,25 +1007,52 @@ _gdk_wayland_screen_init (GdkWaylandScreen *screen_wayland)
static void static void
update_screen_size (GdkWaylandScreen *screen_wayland) update_screen_size (GdkWaylandScreen *screen_wayland)
{ {
gboolean emit_changed = FALSE;
gint width, height; gint width, height;
gint width_mm, height_mm;
gint i; gint i;
width = height = 0; width = height = 0;
width_mm = height_mm = 0;
for (i = 0; i < screen_wayland->monitors->len; i++) for (i = 0; i < screen_wayland->monitors->len; i++)
{ {
GdkWaylandMonitor *monitor = screen_wayland->monitors->pdata[i]; GdkWaylandMonitor *monitor = screen_wayland->monitors->pdata[i];
/* XXX: Largely assuming here that monitor areas
* are contiguous and never overlap.
*/
if (monitor->geometry.x > 0)
width_mm += monitor->width_mm;
else
width_mm = MAX (width_mm, monitor->width_mm);
if (monitor->geometry.y > 0)
height_mm += monitor->height_mm;
else
height_mm = MAX (height_mm, monitor->height_mm);
width = MAX (width, monitor->geometry.x + monitor->geometry.width); width = MAX (width, monitor->geometry.x + monitor->geometry.width);
height = MAX (height, monitor->geometry.y + monitor->geometry.height); height = MAX (height, monitor->geometry.y + monitor->geometry.height);
} }
if (screen_wayland->width_mm != width_mm ||
screen_wayland->height_mm != height_mm)
{
emit_changed = TRUE;
screen_wayland->width_mm = width_mm;
screen_wayland->height_mm = height_mm;
}
if (screen_wayland->width != width || if (screen_wayland->width != width ||
screen_wayland->height != height) screen_wayland->height != height)
{ {
emit_changed = TRUE;
screen_wayland->width = width; screen_wayland->width = width;
screen_wayland->height = height; screen_wayland->height = height;
g_signal_emit_by_name (screen_wayland, "size-changed");
} }
if (emit_changed)
g_signal_emit_by_name (screen_wayland, "size-changed");
} }
static void static void