diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-20 17:06:40 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-22 17:19:37 +1030 |
| commit | 0b56b44addc323a00eb7cd86240cb0dd4275bcf8 (patch) | |
| tree | f7e948e967286fdf157babe7a156b337ae966197 | |
| parent | d72cd753b99fae147ef4c189700fc697f1ea7fb0 (diff) | |
xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.
Also set AutoAddDevices and AutoEnableDevices to their defaults.
And in doing so, switch the rest of the defaults over to named intializers.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
| -rw-r--r-- | hw/xfree86/common/xf86Globals.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index f72f1b6dc..dfc2bd7bb 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -98,37 +98,40 @@ InputInfoPtr xf86InputDevs = NULL; /* Globals that video drivers may not access */ xf86InfoRec xf86Info = { - -1, /* consoleFd */ - -1, /* vtno */ - FALSE, /* vtSysreq */ - SKWhenNeeded, /* ddxSpecialKeys */ - -1, /* lastEventTime */ - FALSE, /* vtRequestsPending */ - FALSE, /* dontVTSwitch */ - FALSE, /* dontZap */ - FALSE, /* dontZoom */ - FALSE, /* notrapSignals */ - FALSE, /* caughtSignal */ - NULL, /* currentScreen */ + .consoleFd = -1, + .vtno = -1, + .vtSysreq = FALSE, + .ddxSpecialKeys = SKWhenNeeded, + .lastEventTime = -1, + .vtRequestsPending = FALSE, + .dontVTSwitch = FALSE, + .dontZap = FALSE, + .dontZoom = FALSE, + .notrapSignals = FALSE, + .caughtSignal = FALSE, + .currentScreen = NULL, #ifdef CSRG_BASED - -1, /* screenFd */ - -1, /* consType */ + .screenFd = -1, + .consType = -1, #endif - FALSE, /* allowMouseOpenFail */ - TRUE, /* vidModeEnabled */ - FALSE, /* vidModeAllowNonLocal */ - TRUE, /* miscModInDevEnabled */ - FALSE, /* miscModInDevAllowNonLocal */ - Pix24DontCare, /* pixmap24 */ - X_DEFAULT, /* pix24From */ + .allowMouseOpenFail = FALSE, + .vidModeEnabled = TRUE, + .vidModeAllowNonLocal = FALSE, + .miscModInDevEnabled = TRUE, + .miscModInDevAllowNonLocal = FALSE, + .pixmap24 = Pix24DontCare, + .pix24From = X_DEFAULT, #ifdef __i386__ - FALSE, /* pc98 */ + .pc98 = FALSE, #endif - TRUE, /* pmFlag */ - LogNone, /* syncLog */ - FALSE, /* kbdCustomKeycodes */ - FALSE, /* disableRandR */ - X_DEFAULT /* randRFrom */ + .pmFlag = TRUE, + .log = LogNone, + .kbdCustomKeycodes = FALSE, + .disableRandR = FALSE, + .randRFrom = X_DEFAULT, + .allowEmptyInput = TRUE, + .autoAddDevices = TRUE, + .autoEnableDevices = TRUE }; const char *xf86ConfigFile = NULL; const char *xf86InputDeviceList = NULL; |