1 From af417c65348ba2d743a555d3647f8c5910f0f85a Mon Sep 17 00:00:00 2001
2 From: Peter Hutterer <peter.hutterer@redhat.com>
3 Date: Thu, 13 Nov 2008 10:17:33 +1000
4 Subject: [PATCH 02/41] xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.
6 Also set AutoAddDevices and AutoEnableDevices to their defaults.
8 And in doing so, switch the rest of the defaults over to named intializers.
10 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
11 (cherry picked from commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8)
15 hw/xfree86/common/xf86Globals.c
17 hw/xfree86/common/xf86Globals.c | 69 ++++++++++++++++++++------------------
18 1 files changed, 36 insertions(+), 33 deletions(-)
20 diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
21 index f5babbc..a5edd82 100644
22 --- a/hw/xfree86/common/xf86Globals.c
23 +++ b/hw/xfree86/common/xf86Globals.c
24 @@ -95,45 +95,48 @@ InputInfoPtr xf86InputDevs = NULL;
25 /* Globals that video drivers may not access */
27 xf86InfoRec xf86Info = {
30 - FALSE, /* vtSysreq */
31 - SKWhenNeeded, /* ddxSpecialKeys */
36 + .ddxSpecialKeys = SKWhenNeeded,
39 - NULL, /* mouseLocal */
42 - -1, /* lastEventTime */
43 - FALSE, /* vtRequestsPending */
44 - FALSE, /* inputPending */
45 - FALSE, /* dontVTSwitch */
46 - FALSE, /* dontZap */
47 - FALSE, /* dontZoom */
48 - FALSE, /* notrapSignals */
49 - FALSE, /* caughtSignal */
50 - FALSE, /* sharedMonitor */
51 - NULL, /* currentScreen */
52 + .lastEventTime = -1,
53 + .vtRequestsPending = FALSE,
54 + .inputPending = FALSE,
55 + .dontVTSwitch = FALSE,
58 + .notrapSignals = FALSE,
59 + .caughtSignal = FALSE,
60 + .sharedMonitor = FALSE,
61 + .currentScreen = NULL,
68 - FALSE, /* allowMouseOpenFail */
69 - TRUE, /* vidModeEnabled */
70 - FALSE, /* vidModeAllowNonLocal */
71 - TRUE, /* miscModInDevEnabled */
72 - FALSE, /* miscModInDevAllowNonLocal */
73 - PCIOsConfig, /* pciFlags */
74 - Pix24DontCare, /* pixmap24 */
75 - X_DEFAULT, /* pix24From */
76 + .allowMouseOpenFail = FALSE,
77 + .vidModeEnabled = TRUE,
78 + .vidModeAllowNonLocal = FALSE,
79 + .miscModInDevEnabled = TRUE,
80 + .miscModInDevAllowNonLocal = FALSE,
81 + .pciFlags = PCIOsConfig,
82 + .pixmap24 = Pix24DontCare,
83 + .pix24From = X_DEFAULT,
89 - LogNone, /* syncLog */
90 - 0, /* estimateSizesAggressively */
91 - FALSE, /* kbdCustomKeycodes */
92 - FALSE, /* disableRandR */
93 - X_DEFAULT /* randRFrom */
96 + .estimateSizesAggressively = 0,
97 + .kbdCustomKeycodes = FALSE,
98 + .disableRandR = FALSE,
99 + .randRFrom = X_DEFAULT,
100 + .allowEmptyInput = TRUE,
101 + .autoAddDevices = TRUE,
102 + .autoEnableDevices = TRUE
104 const char *xf86ConfigFile = NULL;
105 const char *xf86InputDeviceList = NULL;