frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xnest: disable XKB, reshuffle code 

Disable XKB, as we can't yet use it; move Composite disabling to
ddxInitGlobals, along with XKB.
This commit is contained in:
Daniel Stone 2006-10-23 02:51:52 +03:00 committed by Daniel Stone
parent cd3b16a57e
commit 08928afb05
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xnest/Args.c
View File

@ -53,18 +53,21 @@ Window xnestParentWindow = 0;
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ /* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void) void ddxInitGlobals(void)
{ {
}
int
ddxProcessArgument (int argc, char *argv[], int i)
{
#ifdef COMPOSITE #ifdef COMPOSITE
/* XXX terrible hack */ /* XXX terrible hack */
extern Bool noCompositeExtension; extern Bool noCompositeExtension;
noCompositeExtension = TRUE; noCompositeExtension = TRUE;
#endif #endif
#ifdef XKB
extern Bool noXkbExtension;
noXkbExtension = TRUE;
#endif
}
int
ddxProcessArgument (int argc, char *argv[], int i)
{
if (!strcmp(argv[i], "-display")) { if (!strcmp(argv[i], "-display")) {
if (++i < argc) { if (++i < argc) {
xnestDisplayName = argv[i]; xnestDisplayName = argv[i];