summaryrefslogtreecommitdiff
path: root/platform/x11
diff options
context:
space:
mode:
authorDana Olson <dana@shineuponthee.com>2014-09-16 02:49:31 -0400
committerDana Olson <dana@shineuponthee.com>2014-09-16 02:49:31 -0400
commit103cc7ffda6f15fedacc4be4ae93283472c474c3 (patch)
tree0335bdb0e3dc414cd028262365132ba337fb105f /platform/x11
parentf93712d0ae3034afd8c999511fed3d6ed9b90b1b (diff)
cleanup
Diffstat (limited to 'platform/x11')
-rw-r--r--platform/x11/os_x11.cpp5
-rw-r--r--platform/x11/os_x11.h10
2 files changed, 3 insertions, 12 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index e5ca70fbed..4bb4816723 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -192,9 +192,10 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
xsh = XAllocSizeHints();
xsh->flags = PMinSize | PMaxSize;
XWindowAttributes xwa;
- XGetWindowAttributes(x11_display,x11_window,&xwa);
if (current_videomode.fullscreen) {
- XGetWindowAttributes(x11_display,xwa.root,&xwa);
+ XGetWindowAttributes(x11_display,DefaultRootWindow(x11_display),&xwa);
+ } else {
+ XGetWindowAttributes(x11_display,x11_window,&xwa);
}
xsh->min_width = xwa.width;
xsh->max_width = xwa.width;
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index e1cd5ddd9d..dd7278e76d 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -49,16 +49,6 @@
#include <X11/Xlib.h>
#include <X11/Xcursor/Xcursor.h>
-// Hints for X11 fullscreen
-typedef struct {
- unsigned long flags;
- unsigned long functions;
- unsigned long decorations;
- long inputMode;
- unsigned long status;
-} Hints;
-
-//bitch
#undef CursorShape
/**
@author Juan Linietsky <reduzio@gmail.com>