Don't apply user position in fullscreen mode

[libs/gui.git] / source / graphics / x11 / window.cpp

diff --git a/source/graphics/x11/window.cpp b/source/graphics/x11/window.cpp
index 9b46e4e16593cfe4abe1e760d2cdf832a4593d26..0b9eacb41187f138153b71674b26b7ebdd0daa41 100644 (file)
--- a/source/graphics/x11/window.cpp
+++ b/source/graphics/x11/window.cpp
@@ -32,11 +32,21 @@ void Window::platform_init()
 
        XSetWindowAttributes attr;
        attr.override_redirect = options.fullscreen;
-       attr.event_mask = ButtonPressMask|ButtonReleaseMask|PointerMotionMask|KeyPressMask|KeyReleaseMask|StructureNotifyMask|EnterWindowMask|ExposureMask;
+       attr.event_mask = ButtonPressMask|ButtonReleaseMask|PointerMotionMask|KeyPressMask|KeyReleaseMask|StructureNotifyMask|EnterWindowMask|ExposureMask|FocusChangeMask;
+
+       // User position is set when the window is mapped
+       int x = 0;
+       int y = 0;
+       if(options.fullscreen && !options.fullscreen_exclusive)
+       {
+               const Monitor::Settings &ms = options.fullscreen_monitor->current_settings;
+               x = ms.x;
+               y = ms.y;
+       }
 
        priv->window = XCreateWindow(dpy,
                display.get_private().root_window,
-               0, 0,
+               x, y,
                options.width, options.height,
                0,
                CopyFromParent,
@@ -111,7 +121,17 @@ void Window::platform_reconfigure(bool fullscreen_changed)
        XSetWMNormalHints(dpy, priv->window, &hints);
 
        if(options.fullscreen)
-               XMoveResizeWindow(dpy, priv->window, 0, 0, options.width, options.height);
+       {
+               if(options.fullscreen_exclusive)
+                       XMoveResizeWindow(dpy, priv->window, 0, 0, options.width, options.height);
+               else
+               {
+                       const Monitor::Settings &ms = options.fullscreen_monitor->current_settings;
+                       XMoveResizeWindow(dpy, priv->window, ms.x, ms.y, options.width, options.height);
+               }
+       }
+       else if(options.user_position)
+               XMoveResizeWindow(dpy, priv->window, options.x, options.y, options.width, options.height);
        else
                XResizeWindow(dpy, priv->window, options.width, options.height);
 
@@ -160,7 +180,10 @@ void Window::platform_set_touch_input()
 
 void Window::platform_show()
 {
-       XMapRaised(display.get_private().display, priv->window);
+       DisplayHandle dpy = display.get_private().display;
+       XMapRaised(dpy, priv->window);
+       if(options.user_position && !options.fullscreen)
+               XMoveWindow(dpy, priv->window, options.x, options.y);
 }
 
 void Window::platform_hide()
@@ -212,10 +235,11 @@ bool Window::event(const Event &evnt)
                                y -= priv->rel_y;
                        }
 
-                       if(x!=options.x || y!=options.y)
+                       if((x==options.x && y==options.y) == moving)
                        {
                                options.x = x;
                                options.y = y;
+                               moving = false;
                                signal_move.emit(options.x, options.y);
                        }
                }
@@ -238,12 +262,18 @@ bool Window::event(const Event &evnt)
                        XSetInputFocus(display.get_private().display, priv->window, RevertToParent, CurrentTime);
                break;
        case MapNotify:
-               if(options.fullscreen)
+               if(options.fullscreen && options.fullscreen_exclusive)
                        XGrabPointer(display.get_private().display, priv->window, true, None, GrabModeAsync, GrabModeAsync, priv->window, None, CurrentTime);
                break;
        case Expose:
                signal_expose.emit(ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height, evnt);
                break;
+       case FocusIn:
+               signal_got_focus.emit();
+               break;
+       case FocusOut:
+               signal_lost_focus.emit();
+               break;
        default:
                return false;
        }