summaryrefslogtreecommitdiff
path: root/src/x11/window-x11.c
diff options
context:
space:
mode:
authorArmin Krezović <krezovic.armin@gmail.com>2017-08-26 21:28:04 +0200
committerJonas Ådahl <jadahl@gmail.com>2018-07-06 19:47:16 +0200
commit82307dd69468d44a10027f8c3eb7bff7e8f62c0f (patch)
treea703c6e2156b8c563e28befb68ac91f7ef67ddcf /src/x11/window-x11.c
parente1c67a1824d32a581fa0c649ee8ffea47d56a228 (diff)
downloadmutter-82307dd69468d44a10027f8c3eb7bff7e8f62c0f.tar.gz
Move xinerama management to MetaX11Display
https://bugzilla.gnome.org/show_bug.cgi?id=759538
Diffstat (limited to 'src/x11/window-x11.c')
-rw-r--r--src/x11/window-x11.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index a5ab68236..d297b554d 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -1689,17 +1689,17 @@ meta_window_x11_set_net_wm_state (MetaWindow *window)
if (meta_window_has_fullscreen_monitors (window))
{
data[0] =
- meta_screen_logical_monitor_to_xinerama_index (window->screen,
- window->fullscreen_monitors.top);
+ meta_x11_display_logical_monitor_to_xinerama_index (window->display->x11_display,
+ window->fullscreen_monitors.top);
data[1] =
- meta_screen_logical_monitor_to_xinerama_index (window->screen,
- window->fullscreen_monitors.bottom);
+ meta_x11_display_logical_monitor_to_xinerama_index (window->display->x11_display,
+ window->fullscreen_monitors.bottom);
data[2] =
- meta_screen_logical_monitor_to_xinerama_index (window->screen,
- window->fullscreen_monitors.left);
+ meta_x11_display_logical_monitor_to_xinerama_index (window->display->x11_display,
+ window->fullscreen_monitors.left);
data[3] =
- meta_screen_logical_monitor_to_xinerama_index (window->screen,
- window->fullscreen_monitors.right);
+ meta_x11_display_logical_monitor_to_xinerama_index (window->display->x11_display,
+ window->fullscreen_monitors.right);
meta_verbose ("Setting _NET_WM_FULLSCREEN_MONITORS\n");
meta_error_trap_push (x11_display);
@@ -2814,17 +2814,17 @@ meta_window_x11_client_message (MetaWindow *window,
window->desc);
top =
- meta_screen_xinerama_index_to_logical_monitor (window->screen,
- event->xclient.data.l[0]);
+ meta_x11_display_xinerama_index_to_logical_monitor (window->display->x11_display,
+ event->xclient.data.l[0]);
bottom =
- meta_screen_xinerama_index_to_logical_monitor (window->screen,
- event->xclient.data.l[1]);
+ meta_x11_display_xinerama_index_to_logical_monitor (window->display->x11_display,
+ event->xclient.data.l[1]);
left =
- meta_screen_xinerama_index_to_logical_monitor (window->screen,
- event->xclient.data.l[2]);
+ meta_x11_display_xinerama_index_to_logical_monitor (window->display->x11_display,
+ event->xclient.data.l[2]);
right =
- meta_screen_xinerama_index_to_logical_monitor (window->screen,
- event->xclient.data.l[3]);
+ meta_x11_display_xinerama_index_to_logical_monitor (window->display->x11_display,
+ event->xclient.data.l[3]);
/* source_indication = event->xclient.data.l[4]; */
meta_window_update_fullscreen_monitors (window, top, bottom, left, right);