SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XKB: Make XKB mandatory

Browse Source 
No more #ifdef XKB, because you can't disable the build, and no more
noXkbExtension either.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone
2008-03-18 10:05:57 +02:00
parent f9da417163
commit 40877c6680
38 changed files with 350 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dix/dispatch.c
View File

@@ -136,13 +136,8 @@ int ProcInitialConnection();
#endif
#include "privates.h"
#include "xace.h"
#ifdef XKB
#ifndef XKB_IN_SERVER
#define XKB_IN_SERVER
#endif
#include "inputstr.h"
#include <xkbsrv.h>
#endif
#include "xkbsrv.h"
#ifdef XSERVER_DTRACE
#include "registry.h"
@@ -3478,15 +3473,11 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
client->priority = 0;
client->clientState = ClientStateInitial;
client->devPrivates = NULL;
#ifdef XKB
if (!noXkbExtension) {
client->xkbClientFlags = 0;
client->mapNotifyMask = 0;
client->newKeyboardNotifyMask = 0;
client->vMinor = client->vMajor = 0;
QueryMinMaxKeyCodes(&client->minKC,&client->maxKC);
}
#endif
client->xkbClientFlags = 0;
client->mapNotifyMask = 0;
client->newKeyboardNotifyMask = 0;
client->vMinor = client->vMajor = 0;
QueryMinMaxKeyCodes(&client->minKC,&client->maxKC);
client->replyBytesRemaining = 0;
client->fontResFunc = NULL;
client->smart_priority = 0;