isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start populating MetaX11Display

Browse Source 
- Moved xdisplay, name and various atoms from MetaDisplay
- Moved xroot, screen_name, default_depth and default_xvisual
  from MetaScreen

- Moved some X11 specific functions from screen.c and display.c
  to meta-x11-display.c

https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:
Armin Krezović
2017-08-26 18:26:30 +02:00
committed by Jonas Ådahl
parent 522f9b4c38
commit 18779109de
35 changed files with 903 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tests/test-runner.c
View File

@ -30,6 +30,7 @@
#include "wayland/meta-wayland.h"
#include "window-private.h"
#include "tests/test-utils.h"
#include "x11/meta-x11-display-private.h"
typedef struct {
GHashTable *clients;
@ -301,8 +302,8 @@ test_case_check_xserver_stacking (TestCase *test,
Window parent;
Window *children;
unsigned int n_children;
XQueryTree (display->xdisplay,
meta_screen_get_xroot (display->screen),
XQueryTree (display->x11_display->xdisplay,
display->x11_display->xroot,
&root, &parent, &children, &n_children);
for (i = 0; i < (int)n_children; i++)

10
src/tests/test-utils.c
View File

@ -27,6 +27,7 @@
#include "core/display-private.h"
#include "core/window-private.h"
#include "wayland/meta-wayland.h"
#include "x11/meta-x11-display-private.h"
struct _TestClient {
char *id;
@ -78,7 +79,8 @@ async_waiter_new (void)
{
AsyncWaiter *waiter = g_new0 (AsyncWaiter, 1);
Display *xdisplay = meta_get_display ()->xdisplay;
MetaDisplay *display = meta_get_display ();
Display *xdisplay = display->x11_display->xdisplay;
XSyncValue value;
XSyncAlarmAttributes attr;
@ -118,7 +120,8 @@ async_waiter_new (void)
void
async_waiter_destroy (AsyncWaiter *waiter)
{
Display *xdisplay = meta_get_display ()->xdisplay;
MetaDisplay *display = meta_get_display ();
Display *xdisplay = display->x11_display->xdisplay;
XSyncDestroyAlarm (xdisplay, waiter->alarm);
XSyncDestroyCounter (xdisplay, waiter->counter);
@ -146,7 +149,8 @@ async_waiter_wait (AsyncWaiter *waiter,
void
async_waiter_set_and_wait (AsyncWaiter *waiter)
{
Display *xdisplay = meta_get_display ()->xdisplay;
MetaDisplay *display = meta_get_display ();
Display *xdisplay = display->x11_display->xdisplay;
int wait_value = async_waiter_next_value (waiter);
XSyncValue sync_value;