summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorhurikhan <m4r10.5ch14ck@gmail.com>2015-02-15 18:26:49 +0800
committerhurikhan <m4r10.5ch14ck@gmail.com>2015-02-15 18:26:49 +0800
commitf5d2e1f42cca1c5b078073133fccda63c556a0da (patch)
treefcda88825b0d77f8494970c891dc5421987cfebb /platform
parentee81d4b359ec5dbeaed5725739ba53b7734372cd (diff)
Renamed EXPERIMENTAL_WM_API to NEW_WM_API
Diffstat (limited to 'platform')
-rw-r--r--platform/x11/detect.py6
-rw-r--r--platform/x11/os_x11.cpp12
-rw-r--r--platform/x11/os_x11.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 0601c59981..2519dd6fdf 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -53,7 +53,7 @@ def get_opts():
('use_llvm','Use llvm compiler','no'),
('use_sanitizer','Use llvm compiler sanitize address','no'),
('pulseaudio','Detect & Use pulseaudio','yes'),
- ('experimental_wm_api', 'Use experimental window management API','no'),
+ ('new_wm_api', 'Use experimental window management API','no'),
]
def get_flags():
@@ -153,7 +153,7 @@ def configure(env):
env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
#env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
- if(env["experimental_wm_api"]=="yes"):
- env.Append(CPPFLAGS=['-DEXPERIMENTAL_WM_API'])
+ if(env["new_wm_api"]=="yes"):
+ env.Append(CPPFLAGS=['-DNEW_WM_API'])
env.ParseConfig('pkg-config xinerama --cflags --libs')
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 4c86f5a82f..8def564562 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -36,7 +36,7 @@
#include "servers/physics/physics_server_sw.h"
#include "X11/Xutil.h"
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
#include "X11/Xatom.h"
#include "X11/extensions/Xinerama.h"
// ICCCM
@@ -187,7 +187,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
visual_server =memnew(VisualServerWrapMT(visual_server,get_render_thread_mode()==RENDER_SEPARATE_THREAD));
}
-#ifndef EXPERIMENTAL_WM_API
+#ifndef NEW_WM_API
// borderless fullscreen window mode
if (current_videomode.fullscreen) {
// needed for lxde/openbox, possibly others
@@ -552,7 +552,7 @@ void OS_X11::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) cons
}
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
#if 0
// Just now not needed. Can be used for a possible OS.set_border(bool) method
void OS_X11::set_wm_border(bool p_enabled) {
@@ -1133,7 +1133,7 @@ void OS_X11::process_xevents() {
case FocusIn:
minimized = false;
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
if(current_videomode.fullscreen) {
set_wm_fullscreen(true);
visual_server->init();
@@ -1149,7 +1149,7 @@ void OS_X11::process_xevents() {
break;
case FocusOut:
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
if(current_videomode.fullscreen) {
set_wm_fullscreen(false);
set_minimized(true);
@@ -1269,7 +1269,7 @@ void OS_X11::process_xevents() {
Point2i rel = pos - last_mouse_pos;
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
if (mouse_mode==MOUSE_MODE_CAPTURED) {
pos.x = current_videomode.width / 2;
pos.y = current_videomode.height / 2;
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 7518c93562..ffa1ce00b3 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -159,7 +159,7 @@ class OS_X11 : public OS_Unix {
int joystick_count;
Joystick joysticks[JOYSTICKS_MAX];
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
unsigned int capture_idle;
bool maximized;
//void set_wm_border(bool p_enabled);
@@ -220,7 +220,7 @@ public:
virtual VideoMode get_video_mode(int p_screen=0) const;
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const;
-#ifdef EXPERIMENTAL_WM_API
+#ifdef NEW_WM_API
virtual int get_screen_count() const;
virtual int get_screen() const;
virtual void set_screen(int p_screen);