From 9423a7e23ebd9c1c4b5e9c2884115bbeb127e47a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 2 Nov 2013 17:32:03 +0100
Subject: x11: make window-scale use windowed size in fullscreen mode

This is a bit more intuitive, since before, the window size was just set
to something random when setting the window-scale property during
fullscreen.
---
 video/out/x11_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index fff74c3b2c..538235a439 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -1490,8 +1490,8 @@ int vo_x11_control(struct vo *vo, int *events, int request, void *arg)
         int *s = arg;
         if (!x11->window)
             return VO_FALSE;
-        s[0] = x11->win_width;
-        s[1] = x11->win_height;
+        s[0] = x11->fs ? x11->nofs_width : x11->win_width;
+        s[1] = x11->fs ? x11->nofs_height : x11->win_height;
         return VO_TRUE;
     }
     case VOCTRL_SET_WINDOW_SIZE: {
-- 
cgit v1.2.3