TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

update alt-tab handling

Browse Source
This commit is contained in:
cxgeorge 2001-07-24 23:29:24 +00:00
parent bfc5300e57
commit 0268eeb7b5
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
panda/src/wgldisplay/wglGraphicsWindow.cxx
View File

@ -21,8 +21,8 @@
#include "config_wgldisplay.h" #include "config_wgldisplay.h"
#include <keyboardButton.h> #include <keyboardButton.h>
#include <mouseButton.h> #include <mouseButton.h>
#include <throw_event.h> //#include <throw_event.h>
#include <eventQueue.h> //#include <eventQueue.h>
#include <glGraphicsStateGuardian.h> #include <glGraphicsStateGuardian.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
@ -276,6 +276,7 @@ void wglGraphicsWindow::config(void) {
global_wglwinptr = this; // need this until we get an HWND from CreateWindow global_wglwinptr = this; // need this until we get an HWND from CreateWindow
_exiting_window = false; _exiting_window = false;
_return_control_to_app = false;
_PandaPausedTimer = NULL; _PandaPausedTimer = NULL;
_mouse_input_enabled = false; _mouse_input_enabled = false;
_mouse_motion_enabled = false; _mouse_motion_enabled = false;
@ -319,7 +320,7 @@ void wglGraphicsWindow::config(void) {
exit(1); exit(1);
} }
DWORD window_style = WS_POPUP | WS_MAXIMIZE | WS_SYSMENU; // for CreateWindow DWORD window_style = WS_POPUP | WS_SYSMENU; // for CreateWindow
// rect now contains the coords for the entire window, not the client // rect now contains the coords for the entire window, not the client
if (_props._fullscreen) { if (_props._fullscreen) {
@ -1111,8 +1112,13 @@ void INLINE process_1_event(void) {
void INLINE wglGraphicsWindow::process_events(void) { void INLINE wglGraphicsWindow::process_events(void) {
if(_window_inactive) { if(_window_inactive) {
// Get 1 msg at a time until no more are left and we block and sleep, // Get 1 msg at a time until no more are left and we block and sleep,
// or that message changes _window_inactive status and we leave in // or message changes _return_control_to_app or _window_inactive status
while(_window_inactive && (!_return_control_to_app)) {
process_1_event(); process_1_event();
}
_return_control_to_app = false;
} else { } else {
MSG msg; MSG msg;
@ -1307,10 +1313,7 @@ void wglGraphicsWindow::deactivate_window(void) {
wgldisplay_cat.spam() << "deactivate_window called" << endl; wgldisplay_cat.spam() << "deactivate_window called" << endl;
#endif #endif
if((!_props._fullscreen) || _exiting_window) if((!_props._fullscreen) || _exiting_window || _window_inactive)
return;
if(_window_inactive)
return; return;
if(wgldisplay_cat.is_spam()) if(wgldisplay_cat.is_spam())
@ -1397,15 +1400,18 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
//_props._yorg = HIWORD(lparam); //_props._yorg = HIWORD(lparam);
break; break;
case WM_ACTIVATE:
case WM_ACTIVATEAPP: {
#ifdef _DEBUG #ifdef _DEBUG
wgldisplay_cat.spam() << "WM_ACTIVATE received" << endl; wgldisplay_cat.spam() << "WM_ACTIVATEAPP(" << (bool)(wparam!=0) <<") received\n";
#endif #endif
if(LOWORD(wparam)==WA_INACTIVE) {
if(!wparam) {
deactivate_window(); deactivate_window();
return 0; return 0;
} // dont want to reactivate until window is actually un-minimized (see WM_SIZE) } // dont want to reactivate until window is actually un-minimized (see WM_SIZE)
break; break;
}
case WM_EXITSIZEMOVE: case WM_EXITSIZEMOVE:
#ifdef _DEBUG #ifdef _DEBUG
@ -1439,7 +1445,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
if(_window_inactive) if(_window_inactive)
reactivate_window(); reactivate_window();
if((_props._xsize != width) || (_props._ysize != height)) // if((_props._xsize != width) || (_props._ysize != height))
handle_reshape(); handle_reshape();
} }
break; break;
@ -1448,6 +1454,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
case WM_PAINT: { case WM_PAINT: {
PAINTSTRUCT ps; PAINTSTRUCT ps;
BeginPaint(hwnd, &ps); BeginPaint(hwnd, &ps);
// glReadBuffer(GL_BACK); need to copy current rendering to front buffer, a la wdxdisplay?
EndPaint(hwnd, &ps); EndPaint(hwnd, &ps);
return 0; return 0;
} }
@ -1548,8 +1555,11 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
case WM_TIMER: case WM_TIMER:
if((wparam==_PandaPausedTimer) && _window_inactive) { if((wparam==_PandaPausedTimer) && _window_inactive) {
// wgldisplay_cat.spam() << "throwing PandaPaused\n"; //wgldisplay_cat.spam() << "returning control to app\n";
throw_event("PandaPaused"); // throw panda event to invoke network-only processing _return_control_to_app = true;
// throw_event("PandaPaused");
// do we still need to do this since I return control to app periodically using timer msgs?
// does app need to know to avoid major computation?
} }
break; break;

5
panda/src/wgldisplay/wglGraphicsWindow.h
View File

@ -117,6 +117,7 @@ private:
DEVMODE *_pCurrent_display_settings; DEVMODE *_pCurrent_display_settings;
bool _window_inactive; bool _window_inactive;
bool _return_control_to_app;
bool _exiting_window; bool _exiting_window;
bool _mouse_input_enabled; bool _mouse_input_enabled;
@ -144,8 +145,8 @@ public:
LONG WINAPI window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); LONG WINAPI window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
ButtonHandle lookup_key(WPARAM wparam) const; ButtonHandle lookup_key(WPARAM wparam) const;
void DestroyMe(bool bAtExitFnCalled); void DestroyMe(bool bAtExitFnCalled);
void deactivate_window(void); virtual void deactivate_window(void);
void reactivate_window(void); virtual void reactivate_window(void);
protected: protected:
virtual void do_close_window(); virtual void do_close_window();