x11 work

5 files changed, 23 insertions, 1 deletions

diff --git a/README b/README
index 26e6d5e95..b672a4ab8 100644
--- a/README
+++ b/README
@@ -44,6 +44,7 @@ jrabe (https://github.com/jrabe)
         - Epiphany profile
         - Polari profile
         - qTox profile
+        - X11 fixes
 jgriffiths (https://github.com/jgriffiths)
         - make rpm packages support
 Tom Mellor (https://github.com/kalegrill)
diff --git a/etc/firejail.config b/etc/firejail.config
index 0721ce6a4..8333c26ba 100644
--- a/etc/firejail.config
+++ b/etc/firejail.config
@@ -30,3 +30,9 @@
 # Enable or disable file transfer support, default enabled.
 # file-transfer yes
 
+# Screen size for --x11=xephyr, default 800x600. Run /usr/bin/xrandr for
+# a full list of resolutions available on your specifc setup.
+# xephyr-screen 640x480
+# xephyr-screen 800x600
+# xephyr-screen 1024x768
+# xephyr-screen 1280x1024
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index df0e1a8e1..430b0c5a6 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -24,6 +24,7 @@
 
 static int initialized = 0;
 static int cfg_val[CFG_MAX];
+char *xephyr_screen = "800x600";
 
 int checkcfg(int val) {
         EUID_ASSERT();
@@ -132,8 +133,21 @@ int checkcfg(int val) {
                                 else
                                         goto errout;
                         }
+                        
+                        // Xephyr screen size
+                        else if (strncmp(ptr, "xephyr-screen ", 14) == 0) {
+                                // expecting two numbers and an x between them
+                                int n1;
+                                int n2;
+                                int rv = sscanf(ptr + 14, "%dx%d", &n1, &n2);
+                                if (rv != 2)
+                                        goto errout;
+                                if (asprintf(&xephyr_screen, "%dx%d", n1, n2) == -1)
+                                        errExit("asprintf");
+                        }
                         else
                                 goto errout;
+                                
                         free(ptr);
                 }
 
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index d729504a2..d58c6291d 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -531,6 +531,7 @@ int x11_display(void);
 void x11_start(int argc, char **argv);
 void x11_start_xpra(int argc, char **argv);
 void x11_start_xephyr(int argc, char **argv);
+extern char *xephyr_screen;
 
 // ls.c
 #define SANDBOX_FS_LS 0
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 85141c265..0e97947d2 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -183,7 +183,7 @@ void x11_start_xephyr(int argc, char **argv) {
 
         // start xephyr
         char *cmd1;
-        if (asprintf(&cmd1, "Xephyr -ac -br -noreset -screen 800x600 :%d", display) == -1)
+        if (asprintf(&cmd1, "Xephyr -ac -br -noreset -screen %s :%d", xephyr_screen, display) == -1)
                 errExit("asprintf");
         
         int len = 50; // DISPLAY...