test: fix failing tests
Broken since 69d8ea4a49
because our fake screen
didn't have a root window and writing the XKB rules prop would happily
segfault. Fix this by setting up the required bits.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Michel Dänzer michel.daenzer@amd.com
This commit is contained in:
parent
a7472da941
commit
fde27b9b48
|
@ -259,6 +259,7 @@ init_simple(void)
|
|||
screen.DeviceCursorInitialize = device_cursor_init;
|
||||
screen.DeviceCursorCleanup = device_cursor_cleanup;
|
||||
screen.SetCursorPosition = set_cursor_pos;
|
||||
screen.root = &root;
|
||||
|
||||
dixResetPrivates();
|
||||
InitAtoms();
|
||||
|
|
11
test/xtest.c
11
test/xtest.c
|
@ -29,6 +29,7 @@
|
|||
#include "input.h"
|
||||
#include "inputstr.h"
|
||||
#include "scrnintstr.h"
|
||||
#include "windowstr.h"
|
||||
#include "exevents.h"
|
||||
#include "extinit.h"
|
||||
#include "xkbsrv.h"
|
||||
|
@ -58,11 +59,15 @@ device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen)
|
|||
static void
|
||||
xtest_init_devices(void)
|
||||
{
|
||||
ScreenRec screen;
|
||||
ClientRec server_client;
|
||||
ScreenRec screen = {0};
|
||||
ClientRec server_client = {0};
|
||||
WindowRec root = {0};
|
||||
WindowOptRec optional = {0};
|
||||
|
||||
/* random stuff that needs initialization */
|
||||
memset(&screen, 0, sizeof(screen));
|
||||
root.drawable.id = 0xab;
|
||||
root.optional = &optional;
|
||||
screen.root = &root;
|
||||
screenInfo.numScreens = 1;
|
||||
screenInfo.screens[0] = &screen;
|
||||
screen.myNum = 0;
|
||||
|
|
Loading…
Reference in New Issue
Block a user