aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-29 11:47:19 +0200
committermarha <marha@users.sourceforge.net>2012-03-29 11:47:19 +0200
commitecf66d49a103b87d07da8b7d0f9a3629681e6643 (patch)
tree40362ec7a305e1a95d5e65ac9a08c26f2af7bbff /xorg-server
parent992585b1df5c2d96a2cfac3835afbe818a13165f (diff)
downloadvcxsrv-ecf66d49a103b87d07da8b7d0f9a3629681e6643.tar.gz
vcxsrv-ecf66d49a103b87d07da8b7d0f9a3629681e6643.tar.bz2
vcxsrv-ecf66d49a103b87d07da8b7d0f9a3629681e6643.zip
xserver fontconfig mesa git update 29 Mar 2012
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/hw/xfree86/common/xf86Module.h2
-rw-r--r--xorg-server/test/xi2/protocol-common.c14
-rw-r--r--xorg-server/test/xi2/protocol-xiqueryversion.c1
-rw-r--r--xorg-server/test/xtest.c13
4 files changed, 29 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 894b93f59..31f5c6a86 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -83,7 +83,7 @@ typedef enum {
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(12, 0)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(16, 0)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(17, 0)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(6, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
diff --git a/xorg-server/test/xi2/protocol-common.c b/xorg-server/test/xi2/protocol-common.c
index 32c056797..e2b0b8ba3 100644
--- a/xorg-server/test/xi2/protocol-common.c
+++ b/xorg-server/test/xi2/protocol-common.c
@@ -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();
}
diff --git a/xorg-server/test/xi2/protocol-xiqueryversion.c b/xorg-server/test/xi2/protocol-xiqueryversion.c
index 3d50fa888..2552307f2 100644
--- a/xorg-server/test/xi2/protocol-xiqueryversion.c
+++ b/xorg-server/test/xi2/protocol-xiqueryversion.c
@@ -115,6 +115,7 @@ request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int error)
rc = ProcXIQueryVersion(&client);
assert(rc == error);
+ client = init_client(request.length, &request);
client.swapped = TRUE;
swaps(&request.length);
diff --git a/xorg-server/test/xtest.c b/xorg-server/test/xtest.c
index aeca669d8..99e218541 100644
--- a/xorg-server/test/xtest.c
+++ b/xorg-server/test/xtest.c
@@ -32,6 +32,7 @@
#include "exevents.h"
#include "xkbsrv.h"
#include "xserver-properties.h"
+#include "syncsrv.h"
/**
*/
@@ -47,9 +48,15 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen)
}
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();