godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
hurikhan 2015-01-14 13:19:27 +08:00
parent 790d8ecbb9
commit 7222e195e5
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
platform/x11/os_x11.cpp
View File

@ -214,10 +214,10 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev); XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev);
#else #else
old_window_position.x = 0; window_data.position.x = 0;
old_window_position.y = 0; window_data.position.y = 0;
old_window_size.width = 800; window_data.size.width = 800;
old_window_size.height = 600; window_data.size.height = 600;
set_wm_border(false); set_wm_border(false);
set_wm_fullscreen(true); set_wm_fullscreen(true);
#endif #endif
@ -709,8 +709,8 @@ void OS_X11::set_fullscreen(bool p_enabled) {
return; return;
if(p_enabled) { if(p_enabled) {
old_window_size = get_window_size(); window_data.size = get_window_size();
old_window_position = get_window_position(); window_data.position = get_window_position();
int screen = get_screen(); int screen = get_screen();
Size2i size = get_screen_size(screen); Size2i size = get_screen_size(screen);
@ -724,7 +724,11 @@ void OS_X11::set_fullscreen(bool p_enabled) {
} else { } else {
set_wm_fullscreen(false); set_wm_fullscreen(false);
set_wm_border(true); set_wm_border(true);
XMoveResizeWindow(x11_display, x11_window, old_window_position.x, old_window_position.y, old_window_size.width, old_window_size.height); XMoveResizeWindow(x11_display, x11_window,
window_data.position.x,
window_data.position.y,
window_data.size.width,
window_data.size.height);
current_videomode.fullscreen = False; current_videomode.fullscreen = False;
} }
@ -1072,7 +1076,7 @@ void OS_X11::process_xevents() {
if (mouse_mode==MOUSE_MODE_CAPTURED) { if (mouse_mode==MOUSE_MODE_CAPTURED) {
#if 1 #if 1
Vector2 c = Point2i(current_videomode.width/2,current_videomode.height/2); //Vector2 c = Point2i(current_videomode.width/2,current_videomode.height/2);
if (pos==Point2i(current_videomode.width/2,current_videomode.height/2)) { if (pos==Point2i(current_videomode.width/2,current_videomode.height/2)) {
//this sucks, it's a hack, etc and is a little inaccurate, etc. //this sucks, it's a hack, etc and is a little inaccurate, etc.
//but nothing I can do, X11 sucks. //but nothing I can do, X11 sucks.
@ -1081,9 +1085,9 @@ void OS_X11::process_xevents() {
break; break;
} }
Point2i ncenter = pos; Point2i new_center = pos;
pos = last_mouse_pos + ( pos-center ); pos = last_mouse_pos + ( pos-center );
center=ncenter; center=new_center;
do_mouse_warp=true; do_mouse_warp=true;
#else #else
//Dear X11, thanks for making my life miserable //Dear X11, thanks for making my life miserable

6
platform/x11/os_x11.h
View File

@ -160,8 +160,10 @@ class OS_X11 : public OS_Unix {
Joystick joysticks[JOYSTICKS_MAX]; Joystick joysticks[JOYSTICKS_MAX];
#ifdef EXPERIMENTAL_WM_API #ifdef EXPERIMENTAL_WM_API
Point2i old_window_position; struct {
Size2i old_window_size; Point2i position;
Size2i size;
} window_data;
void set_wm_border(bool p_enabled); void set_wm_border(bool p_enabled);
void set_wm_fullscreen(bool p_enabled); void set_wm_fullscreen(bool p_enabled);
#endif #endif