asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into snapping2

Browse source
This commit is contained in:
Carl Olsson 2015-03-23 14:58:56 +10:00
commit 09e6e29d67
4 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
demos/misc/window_management/control.gd
View file

@ -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

BIN
demos/misc/window_management/window_management.scn
View file

Binary file not shown.

1
platform/x11/detect.py
View file

@ -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')

12
platform/x11/os_x11.cpp
View file

@ -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