diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-10-23 02:51:52 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-10-23 02:51:52 +0300 |
| commit | 08928afb0500d46b0caa0a1d1244dee2ed80e6a0 (patch) | |
| tree | c324a16d6105c1bb48386f1ac0e2db46b7d7d3b3 /hw/xnest/Args.c | |
| parent | cd3b16a57efaf89108054f18a94c91e2dd74fafa (diff) | |
Xnest: disable XKB, reshuffle code
Disable XKB, as we can't yet use it; move Composite disabling to
ddxInitGlobals, along with XKB.
Diffstat (limited to 'hw/xnest/Args.c')
| -rw-r--r-- | hw/xnest/Args.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 5d0a0c02d..c2e8b0db7 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -53,18 +53,21 @@ Window xnestParentWindow = 0; /* ddxInitGlobals - called by |InitGlobals| from os/util.c */ void ddxInitGlobals(void) { -} - -int -ddxProcessArgument (int argc, char *argv[], int i) -{ - #ifdef COMPOSITE /* XXX terrible hack */ extern Bool noCompositeExtension; noCompositeExtension = TRUE; #endif +#ifdef XKB + extern Bool noXkbExtension; + noXkbExtension = TRUE; +#endif +} + +int +ddxProcessArgument (int argc, char *argv[], int i) +{ if (!strcmp(argv[i], "-display")) { if (++i < argc) { xnestDisplayName = argv[i]; |