diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-12-17 11:17:59 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2009-09-12 21:36:25 -0400 |
| commit | a0d3516e7a8658e7ad62584cf3e92975cb3d71a8 (patch) | |
| tree | 2859f2cacaab8bfde3482625bec44f8dd4a9c0a9 /hw/xfree86 | |
| parent | fad5f96c01811af7490a071719e4017c019a8d9b (diff) | |
First wayland bits.
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86Globals.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 14 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Priv.h | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index df0470c48..df1050a75 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -198,6 +198,7 @@ Bool xf86VidModeAllowNonLocal = FALSE; RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; Bool xf86inSuspend = FALSE; Bool xorgHWAccess = FALSE; +Bool xorgWayland = FALSE; struct pci_slot_match xf86IsolateDevice = { PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0 diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 44eed4dc9..517d37303 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -585,7 +585,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) if (xf86DoShowOptions) DoShowOptions(); - xf86OpenConsole(); + if (0 && !xorgWayland) + xf86OpenConsole(); /* Do a general bus probe. This will be a PCI probe for x86 platforms */ xf86BusProbe(); @@ -950,7 +951,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) /* * serverGeneration != 1; some OSs have to do things here, too. */ - xf86OpenConsole(); + if (0 && !xorgWayland) + xf86OpenConsole(); #ifdef XF86PM /* @@ -1182,7 +1184,8 @@ ddxGiveUp(void) DGAShutdown(); #endif - xf86CloseConsole(); + if (0 && !xorgWayland) + xf86CloseConsole(); xf86CloseLog(); @@ -1609,6 +1612,11 @@ ddxProcessArgument(int argc, char **argv, int i) return 0; } + if (!strcmp(argv[i], "-wayland")) + { + xorgWayland = TRUE; + return 1; + } /* OS-specific processing */ return xf86ProcessArgument(argc, argv, i); } diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 5ce4dbbf4..bcfe346c7 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -92,6 +92,7 @@ extern _X_EXPORT const char *xf86VisualNames[]; extern _X_EXPORT int xf86Verbose; /* verbosity level */ extern _X_EXPORT int xf86LogVerbose; /* log file verbosity level */ extern _X_EXPORT Bool xorgHWAccess; +extern _X_EXPORT Bool xorgWayland; extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable; |