From ca0b3ce1f6e40827096e1fa66e4d159d7e16a83a Mon Sep 17 00:00:00 2001 From: rollenrolm Date: Mon, 23 Mar 2015 01:31:38 +0100 Subject: [PATCH 1/2] New API: build fixes for x11 --- platform/x11/detect.py | 1 + platform/x11/os_x11.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 2519dd6fdf..b0876d7fc6 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -113,6 +113,7 @@ def configure(env): env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED']) env.ParseConfig('pkg-config x11 --cflags --libs') + env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config openssl --cflags --libs') diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 5b36df6a53..92b0abff37 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -248,10 +248,10 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi set_wm_fullscreen(true); } if (!current_videomode.resizable) { - int screen = get_screen(); + int screen = get_current_screen(); Size2i screen_size = get_screen_size(screen); set_window_size(screen_size); - set_resizable(false); + set_window_resizable(false); } #endif @@ -624,7 +624,7 @@ void OS_X11::set_current_screen(int p_screen) { XMoveResizeWindow(x11_display, x11_window, position.x, position.y, size.x, size.y); } else { - if( p_screen != get_screen() ) { + if( p_screen != get_current_screen() ) { Point2i position = get_screen_position(p_screen); XMoveWindow(x11_display, x11_window, position.x, position.y); } @@ -667,7 +667,7 @@ Point2 OS_X11::get_window_position() const { Window child; XTranslateCoordinates( x11_display, x11_window, DefaultRootWindow(x11_display), 0, 0, &x, &y, &child); - int screen = get_screen(); + int screen = get_current_screen(); Point2i screen_position = get_screen_position(screen); return Point2i(x-screen_position.x, y-screen_position.y); @@ -711,7 +711,7 @@ void OS_X11::set_window_position(const Point2& p_position) { XFree(data); } - int screen = get_screen(); + int screen = get_current_screen(); Point2i screen_position = get_screen_position(screen); left -= screen_position.x; @@ -1152,7 +1152,7 @@ void OS_X11::process_xevents() { #ifdef NEW_WM_API if(current_videomode.fullscreen) { set_wm_fullscreen(false); - set_minimized(true); + set_window_minimized(true); visual_server->init(); } #endif From 001a16064f886944f2746828c3b8d8be813838e5 Mon Sep 17 00:00:00 2001 From: hurikhan Date: Mon, 23 Mar 2015 00:09:12 -0400 Subject: [PATCH 2/2] adjust the window_management demo to the new function names --- demos/misc/window_management/control.gd | 54 +++++++++--------- .../window_management/window_management.scn | Bin 5087 -> 5129 bytes 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd index d1b8f0e71a..5eb5817619 100644 --- a/demos/misc/window_management/control.gd +++ b/demos/misc/window_management/control.gd @@ -5,18 +5,18 @@ func _fixed_process(delta): var modetext = "Mode:\n" - if(OS.is_fullscreen()): + if(OS.is_window_fullscreen()): modetext += "Fullscreen\n" else: modetext += "Windowed\n" - if(!OS.is_resizable()): + if(!OS.is_window_resizable()): modetext += "FixedSize\n" - if(OS.is_minimized()): + if(OS.is_window_minimized()): modetext += "Minimized\n" - if(OS.is_maximized()): + if(OS.is_window_maximized()): modetext += "Maximized\n" if(Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED): @@ -55,9 +55,9 @@ func _fixed_process(delta): get_node("Label_Screen1_Position").hide() get_node("Button_Fullscreen").set_pressed( OS.is_window_fullscreen() ) - get_node("Button_FixedSize").set_pressed( !OS.is_is_window_resizable() ) - get_node("Button_Minimized").set_pressed( OS.is_is_window_minimized() ) - get_node("Button_Maximized").set_pressed( OS.is_is_window_maximized() ) + get_node("Button_FixedSize").set_pressed( !OS.is_window_resizable() ) + get_node("Button_Minimized").set_pressed( OS.is_window_minimized() ) + get_node("Button_Maximized").set_pressed( OS.is_window_maximized() ) get_node("Button_Mouse_Grab").set_pressed( Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED ) @@ -66,11 +66,11 @@ func check_wm_api(): if( !OS.has_method("get_screen_count") ): s += " - get_screen_count()\n" - if( !OS.has_method("get_screen") ): - s += " - get_screen()\n" + if( !OS.has_method("get_current_screen") ): + s += " - get_current_screen()\n" - if( !OS.has_method("set_screen") ): - s += " - set_screen()\n" + if( !OS.has_method("set_current_screen") ): + s += " - set_current_screen()\n" if( !OS.has_method("get_screen_position") ): s += " - get_screen_position()\n" @@ -90,29 +90,29 @@ func check_wm_api(): if( !OS.has_method("set_window_size") ): s += " - set_window_size()\n" - if( !OS.has_method("set_fullscreen") ): - s += " - set_fullscreen()\n" + if( !OS.has_method("set_window_fullscreen") ): + s += " - set_window_fullscreen()\n" - if( !OS.has_method("is_fullscreen") ): - s += " - is_fullscreen()\n" + if( !OS.has_method("is_window_fullscreen") ): + s += " - is_window_fullscreen()\n" - if( !OS.has_method("set_resizable") ): - s += " - set_resizable()\n" + if( !OS.has_method("set_window_resizable") ): + s += " - set_window_resizable()\n" - if( !OS.has_method("is_resizable") ): - s += " - is_resizable()\n" + if( !OS.has_method("is_window_resizable") ): + s += " - is_window_resizable()\n" - if( !OS.has_method("set_minimized") ): - s += " - set_minimized()\n" + if( !OS.has_method("set_window_minimized") ): + s += " - set_window_minimized()\n" - if( !OS.has_method("is_minimized") ): - s += " - is_minimized()\n" + if( !OS.has_method("is_window_minimized") ): + s += " - is_window_minimized()\n" - if( !OS.has_method("set_maximized") ): - s += " - set_maximized()\n" + if( !OS.has_method("set_window_maximized") ): + s += " - set_window_maximized()\n" - if( !OS.has_method("is_maximized") ): - s += " - is_maximized()\n" + if( !OS.has_method("is_window_maximized") ): + s += " - is_window_maximized()\n" if( s.length() == 0 ): return true diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn index b8b0ee210bd9249622682ba85d0ae7915e63b24f..c7d6260df620d50d0960fb0dcf6e8df43db9eadc 100644 GIT binary patch delta 3151 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 delta 3121 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 HgZc>oIrf