andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: init the sync extensions for tests to pass again

Browse Source 
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:
Peter Hutterer 2012-03-26 10:28:32 +10:00
parent 8053faa7b8
commit 17f33ca0e5
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/xi2/protocol-common.c
View File

@ -30,6 +30,7 @@
#include "exglobals.h" #include "exglobals.h"
#include "xkbsrv.h" /* for XkbInitPrivates */ #include "xkbsrv.h" /* for XkbInitPrivates */
#include "xserver-properties.h" #include "xserver-properties.h"
#include "syncsrv.h"
#include <X11/extensions/XI2.h> #include <X11/extensions/XI2.h>
#include "protocol-common.h" #include "protocol-common.h"
@ -38,6 +39,7 @@ struct devices devices;
ScreenRec screen; ScreenRec screen;
WindowRec root; WindowRec root;
WindowRec window; WindowRec window;
static ClientRec server_client;
void *userdata; void *userdata;
@ -214,6 +216,11 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen)
return TRUE; return TRUE;
} }
static void
device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen)
{
}
static Bool static Bool
set_cursor_pos(DeviceIntPtr dev, ScreenPtr screen, int x, int y, Bool event) set_cursor_pos(DeviceIntPtr dev, ScreenPtr screen, int x, int y, Bool event)
{ {
@ -231,6 +238,7 @@ init_simple(void)
screen.width = 640; screen.width = 640;
screen.height = 480; screen.height = 480;
screen.DeviceCursorInitialize = device_cursor_init; screen.DeviceCursorInitialize = device_cursor_init;
screen.DeviceCursorCleanup = device_cursor_cleanup;
screen.SetCursorPosition = set_cursor_pos; screen.SetCursorPosition = set_cursor_pos;
dixResetPrivates(); dixResetPrivates();
@ -245,6 +253,12 @@ init_simple(void)
init_window(&root, NULL, ROOT_WINDOW_ID); init_window(&root, NULL, ROOT_WINDOW_ID);
init_window(&window, &root, CLIENT_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(); devices = init_devices();
} }

13
test/xtest.c
View File

@ -32,6 +32,7 @@
#include "exevents.h" #include "exevents.h"
#include "xkbsrv.h" #include "xkbsrv.h"
#include "xserver-properties.h" #include "xserver-properties.h"
#include "syncsrv.h"
/** /**
*/ */
@ -46,10 +47,16 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen)
return TRUE; return TRUE;
} }
static void
device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen)
{
}
static void static void
xtest_init_devices(void) xtest_init_devices(void)
{ {
ScreenRec screen; ScreenRec screen;
ClientRec server_client;
/* random stuff that needs initialization */ /* random stuff that needs initialization */
memset(&screen, 0, sizeof(screen)); memset(&screen, 0, sizeof(screen));
@ -60,8 +67,14 @@ xtest_init_devices(void)
screen.width = 640; screen.width = 640;
screen.height = 480; screen.height = 480;
screen.DeviceCursorInitialize = device_cursor_init; screen.DeviceCursorInitialize = device_cursor_init;
screen.DeviceCursorCleanup = device_cursor_cleanup;
dixResetPrivates(); dixResetPrivates();
serverClient = &server_client;
InitClient(serverClient, 0, (pointer) NULL);
if (!InitClientResources(serverClient)) /* for root resources */
FatalError("couldn't init server resources");
InitAtoms(); InitAtoms();
SyncExtensionInit();
XkbInitPrivates(); XkbInitPrivates();