test: init the sync extensions for tests to pass again
Introduced in d645edd11e
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
8053faa7b8
commit
17f33ca0e5
|
@ -30,6 +30,7 @@
|
|||
#include "exglobals.h"
|
||||
#include "xkbsrv.h" /* for XkbInitPrivates */
|
||||
#include "xserver-properties.h"
|
||||
#include "syncsrv.h"
|
||||
#include <X11/extensions/XI2.h>
|
||||
|
||||
#include "protocol-common.h"
|
||||
|
@ -38,6 +39,7 @@ struct devices devices;
|
|||
ScreenRec screen;
|
||||
WindowRec root;
|
||||
WindowRec window;
|
||||
static ClientRec server_client;
|
||||
|
||||
void *userdata;
|
||||
|
||||
|
@ -214,6 +216,11 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen)
|
||||
{
|
||||
}
|
||||
|
||||
static Bool
|
||||
set_cursor_pos(DeviceIntPtr dev, ScreenPtr screen, int x, int y, Bool event)
|
||||
{
|
||||
|
@ -231,6 +238,7 @@ init_simple(void)
|
|||
screen.width = 640;
|
||||
screen.height = 480;
|
||||
screen.DeviceCursorInitialize = device_cursor_init;
|
||||
screen.DeviceCursorCleanup = device_cursor_cleanup;
|
||||
screen.SetCursorPosition = set_cursor_pos;
|
||||
|
||||
dixResetPrivates();
|
||||
|
@ -245,6 +253,12 @@ init_simple(void)
|
|||
init_window(&root, NULL, ROOT_WINDOW_ID);
|
||||
init_window(&window, &root, CLIENT_WINDOW_ID);
|
||||
|
||||
serverClient = &server_client;
|
||||
InitClient(serverClient, 0, (pointer) NULL);
|
||||
if (!InitClientResources(serverClient)) /* for root resources */
|
||||
FatalError("couldn't init server resources");
|
||||
SyncExtensionInit();
|
||||
|
||||
devices = init_devices();
|
||||
}
|
||||
|
||||
|
|
13
test/xtest.c
13
test/xtest.c
|
@ -32,6 +32,7 @@
|
|||
#include "exevents.h"
|
||||
#include "xkbsrv.h"
|
||||
#include "xserver-properties.h"
|
||||
#include "syncsrv.h"
|
||||
|
||||
/**
|
||||
*/
|
||||
|
@ -46,10 +47,16 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
xtest_init_devices(void)
|
||||
{
|
||||
ScreenRec screen;
|
||||
ClientRec server_client;
|
||||
|
||||
/* random stuff that needs initialization */
|
||||
memset(&screen, 0, sizeof(screen));
|
||||
|
@ -60,8 +67,14 @@ xtest_init_devices(void)
|
|||
screen.width = 640;
|
||||
screen.height = 480;
|
||||
screen.DeviceCursorInitialize = device_cursor_init;
|
||||
screen.DeviceCursorCleanup = device_cursor_cleanup;
|
||||
dixResetPrivates();
|
||||
serverClient = &server_client;
|
||||
InitClient(serverClient, 0, (pointer) NULL);
|
||||
if (!InitClientResources(serverClient)) /* for root resources */
|
||||
FatalError("couldn't init server resources");
|
||||
InitAtoms();
|
||||
SyncExtensionInit();
|
||||
|
||||
XkbInitPrivates();
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user