[PATCH] Wayland X server uses xwayand.conf instead of xorg.conf

spitzak at gmail.com spitzak at gmail.com
Wed Aug 29 21:23:45 PDT 2012


From: Bill Spitzak <spitzak at gmail.com>

This allows X applications to be run on wayland without having to
delete an xorg.conf file that is required to run the normal X server.
---
 hw/xfree86/common/xf86Init.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a062929..8afbb2d 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1412,6 +1412,8 @@ ddxProcessArgument(int argc, char **argv, int i)
   if (!strcmp(argv[i], "-wayland"))
   {
     xorgWayland = TRUE;
+    if (!xf86ConfigFile)
+      xf86ConfigFile = "xwayland.conf";
     return 1;
   }
 
-- 
1.7.9.5



More information about the wayland-devel mailing list