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:
parent
cd3b16a57e
commit
08928afb05
|
@ -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];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user