summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2009-09-22 21:19:47 -0400
committerKristian Høgsberg <krh@redhat.com>2009-09-22 21:19:47 -0400
commitee43581cdf6900012300f08c6ce37122f1aaa84a (patch)
treeae860b77ed41072ded7afb449a1b21f4d9c67de1
parent103e1fd234c170850b3300ed69238d05c1cdd1b4 (diff)
Add flag to toggle rootlessHEADwayland-rootless
-rw-r--r--hw/xfree86/common/xf86Globals.c1
-rw-r--r--hw/xfree86/common/xf86Init.c6
-rw-r--r--hw/xfree86/common/xf86Priv.h1
3 files changed, 8 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index df1050a75..35c2bbd5e 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -199,6 +199,7 @@ RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
Bool xf86inSuspend = FALSE;
Bool xorgHWAccess = FALSE;
Bool xorgWayland = FALSE;
+Bool xorgRootless = 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 517d37303..3ef1f7764 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1617,6 +1617,12 @@ ddxProcessArgument(int argc, char **argv, int i)
xorgWayland = TRUE;
return 1;
}
+
+ if (!strcmp(argv[i], "-rootless"))
+ {
+ xorgRootless = 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 bcfe346c7..ff056ae21 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -93,6 +93,7 @@ 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 Bool xorgRootless;
extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable;