xorg-x11-server/F-10/xserver-1.5.3-AEI-on-by-default.patch

From 15bf414daa83967fd1f24bd48bd01ea941c11ce2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu, 13 Nov 2008 10:17:33 +1000
Subject: [PATCH] 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>
(cherry picked from commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8)

Conflicts:

        hw/xfree86/common/xf86Globals.c
---
 hw/xfree86/common/xf86Globals.c |   69 ++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index f5babbc..a5edd82 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -95,45 +95,48 @@ InputInfoPtr xf86InputDevs = NULL;
 /* Globals that video drivers may not access */
 
 xf86InfoRec xf86Info = {
-       -1,             /* consoleFd */
-       -1,             /* vtno */
-       FALSE,          /* vtSysreq */
-       SKWhenNeeded,   /* ddxSpecialKeys */
-       NULL,           /* pMouse */
+    .consoleFd                  = -1,
+    .vtno                       = -1,
+    .vtSysreq                   = FALSE,
+    .ddxSpecialKeys             = SKWhenNeeded,
+    .pMouse                     = NULL,
 #ifdef XINPUT
-       NULL,           /* mouseLocal */
+    .mouseLocal                 = NULL,
 #endif
-       -1,             /* lastEventTime */
-       FALSE,          /* vtRequestsPending */
-       FALSE,          /* inputPending */
-       FALSE,          /* dontVTSwitch */
-       FALSE,          /* dontZap */
-       FALSE,          /* dontZoom */
-       FALSE,          /* notrapSignals */
-       FALSE,          /* caughtSignal */
-       FALSE,          /* sharedMonitor */
-       NULL,           /* currentScreen */
+    .lastEventTime              = -1,
+    .vtRequestsPending          = FALSE,
+    .inputPending               = FALSE,
+    .dontVTSwitch               = FALSE,
+    .dontZap                    = FALSE,
+    .dontZoom                   = FALSE,
+    .notrapSignals              = FALSE,
+    .caughtSignal               = FALSE,
+    .sharedMonitor              = 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 */
-       PCIOsConfig,    /* pciFlags */
-       Pix24DontCare,  /* pixmap24 */
-       X_DEFAULT,      /* pix24From */
+    .allowMouseOpenFail         = FALSE,
+    .vidModeEnabled             = TRUE,
+    .vidModeAllowNonLocal       = FALSE,
+    .miscModInDevEnabled        = TRUE,
+    .miscModInDevAllowNonLocal  = FALSE,
+    .pciFlags                   = PCIOsConfig,
+    .pixmap24                   = Pix24DontCare,
+    .pix24From                  = X_DEFAULT,
 #ifdef __i386__
-       FALSE,          /* pc98 */
+    .pc98                       = FALSE,
 #endif
-       TRUE,           /* pmFlag */
-       LogNone,        /* syncLog */
-       0,              /* estimateSizesAggressively */
-       FALSE,          /* kbdCustomKeycodes */
-       FALSE,          /* disableRandR */
-       X_DEFAULT       /* randRFrom */
+    .pmFlag                     = TRUE,
+    .log                        = LogNone,
+    .estimateSizesAggressively  = 0,
+    .kbdCustomKeycodes          = FALSE,
+    .disableRandR               = FALSE,
+    .randRFrom                  = X_DEFAULT,
+    .allowEmptyInput            = TRUE,
+    .autoAddDevices             = TRUE,
+    .autoEnableDevices          = TRUE
 };
 const char *xf86ConfigFile = NULL;
 const char *xf86InputDeviceList = NULL;
-- 
1.6.0.3

1	From 15bf414daa83967fd1f24bd48bd01ea941c11ce2 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] xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.
5
6	Also set AutoAddDevices and AutoEnableDevices to their defaults.
7
8	And in doing so, switch the rest of the defaults over to named intializers.
9
10	Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
11	(cherry picked from commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8)
12
13	Conflicts:
14
15	hw/xfree86/common/xf86Globals.c
16	---
17	hw/xfree86/common/xf86Globals.c \| 69 ++++++++++++++++++++------------------
18	1 files changed, 36 insertions(+), 33 deletions(-)
19
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 */
26
27	xf86InfoRec xf86Info = {
28	- -1, /* consoleFd */
29	- -1, /* vtno */
30	- FALSE, /* vtSysreq */
31	- SKWhenNeeded, /* ddxSpecialKeys */
32	- NULL, /* pMouse */
33	+ .consoleFd = -1,
34	+ .vtno = -1,
35	+ .vtSysreq = FALSE,
36	+ .ddxSpecialKeys = SKWhenNeeded,
37	+ .pMouse = NULL,
38	#ifdef XINPUT
39	- NULL, /* mouseLocal */
40	+ .mouseLocal = NULL,
41	#endif
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,
56	+ .dontZap = FALSE,
57	+ .dontZoom = FALSE,
58	+ .notrapSignals = FALSE,
59	+ .caughtSignal = FALSE,
60	+ .sharedMonitor = FALSE,
61	+ .currentScreen = NULL,
62	#ifdef CSRG_BASED
63	- -1, /* screenFd */
64	- -1, /* consType */
65	+ .screenFd = -1,
66	+ .consType = -1,
67	#endif
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,
84	#ifdef __i386__
85	- FALSE, /* pc98 */
86	+ .pc98 = FALSE,
87	#endif
88	- TRUE, /* pmFlag */
89	- LogNone, /* syncLog */
90	- 0, /* estimateSizesAggressively */
91	- FALSE, /* kbdCustomKeycodes */
92	- FALSE, /* disableRandR */
93	- X_DEFAULT /* randRFrom */
94	+ .pmFlag = TRUE,
95	+ .log = LogNone,
96	+ .estimateSizesAggressively = 0,
97	+ .kbdCustomKeycodes = FALSE,
98	+ .disableRandR = FALSE,
99	+ .randRFrom = X_DEFAULT,
100	+ .allowEmptyInput = TRUE,
101	+ .autoAddDevices = TRUE,
102	+ .autoEnableDevices = TRUE
103	};
104	const char *xf86ConfigFile = NULL;
105	const char *xf86InputDeviceList = NULL;
106	--
107	1.6.0.3
108
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.6