xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Thu Jan 22 19:14:17 PST 2009
hw/kdrive/ephyr/ephyrinit.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
New commits:
commit 759348f13ffa02fb1804238189ffce1c92d33e2a
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 22 22:09:11 2009 -0500
Xephyr: Add some rudimentary Xnest command line compat
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 1399d7a..3c573cd 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -246,6 +246,27 @@ ddxProcessArgument (int argc, char **argv, int i)
{
hostx_set_display_name(argv[i]);
}
+ /* Xnest compatibility */
+ else if (!strcmp(argv[i], "-display"))
+ {
+ hostx_set_display_name(argv[i+1]);
+ return 2;
+ }
+ else if (!strcmp(argv[i], "-sync") ||
+ !strcmp(argv[i], "-full") ||
+ !strcmp(argv[i], "-sss") ||
+ !strcmp(argv[i], "-install"))
+ {
+ return 1;
+ }
+ else if (!strcmp(argv[i], "-bw") ||
+ !strcmp(argv[i], "-class") ||
+ !strcmp(argv[i], "-geometry") ||
+ !strcmp(argv[i], "-scrns"))
+ {
+ return 2;
+ }
+ /* end Xnest compat */
return KdProcessArgument (argc, argv, i);
}
More information about the xorg-commit
mailing list