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

cosmetic

Browse Source
This commit is contained in:
cxgeorge 2002-03-08 03:42:43 +00:00
parent 6acf279b98
commit 7b38b1e5e7
1 changed files with 65 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
panda/src/wdxdisplay/wdxGraphicsWindow.cxx
View File

@ -546,73 +546,73 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
handle_keyrelease(lookup_key(wparam)); handle_keyrelease(lookup_key(wparam));
break; break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
button = 0; button = 0;
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
if(button < 0) if(button < 0)
button = 1; button = 1;
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
if(!DXREADY) if(!DXREADY)
break; break;
if(button < 0) if(button < 0)
button = 2; button = 2;
SetCapture(hwnd); SetCapture(hwnd);
SET_MOUSE_COORD(x,LOWORD(lparam)); SET_MOUSE_COORD(x,LOWORD(lparam));
SET_MOUSE_COORD(y,HIWORD(lparam)); SET_MOUSE_COORD(y,HIWORD(lparam));
handle_keypress(MouseButton::button(button), x, y); handle_keypress(MouseButton::button(button), x, y);
return 0; return 0;
case WM_LBUTTONUP: case WM_LBUTTONUP:
button = 0; button = 0;
case WM_MBUTTONUP: case WM_MBUTTONUP:
if(button < 0) if(button < 0)
button = 1; button = 1;
case WM_RBUTTONUP: case WM_RBUTTONUP:
if(!DXREADY) if(!DXREADY)
break; break;
if(button < 0) if(button < 0)
button = 2; button = 2;
ReleaseCapture(); ReleaseCapture();
#if 0 #if 0
SET_MOUSE_COORD(x,LOWORD(lparam)); SET_MOUSE_COORD(x,LOWORD(lparam));
SET_MOUSE_COORD(y,HIWORD(lparam)); SET_MOUSE_COORD(y,HIWORD(lparam));
#endif #endif
handle_keyrelease(MouseButton::button(button)); handle_keyrelease(MouseButton::button(button));
return 0; return 0;
case WM_MOVE: case WM_MOVE:
if(!DXREADY) if(!DXREADY)
break;
handle_window_move(LOWORD(lparam), HIWORD(lparam) );
return 0;
case WM_EXITSIZEMOVE:
#ifdef _DEBUG
wdxdisplay_cat.spam() << "WM_EXITSIZEMOVE received" << endl;
#endif
if(_WindowAdjustingType==Resizing) {
handle_reshape(true);
}
_WindowAdjustingType = NotAdjusting;
return 0;
case WM_ENTERSIZEMOVE: {
if(_dxgsg==NULL)
_dxgsg->SetDXReady(true); // dont disable here because I want to see pic as I resize
_WindowAdjustingType = MovingOrResizing;
}
break; break;
handle_window_move(LOWORD(lparam), HIWORD(lparam) );
return 0;
case WM_DISPLAYCHANGE: { case WM_EXITSIZEMOVE:
#ifdef _DEBUG #ifdef _DEBUG
wdxdisplay_cat.spam() << "WM_EXITSIZEMOVE received" << endl;
#endif
if(_WindowAdjustingType==Resizing) {
handle_reshape(true);
}
_WindowAdjustingType = NotAdjusting;
return 0;
case WM_ENTERSIZEMOVE: {
if(_dxgsg==NULL)
_dxgsg->SetDXReady(true); // dont disable here because I want to see pic as I resize
_WindowAdjustingType = MovingOrResizing;
}
break;
case WM_DISPLAYCHANGE: {
#ifdef _DEBUG
width = LOWORD(lparam); height = HIWORD(lparam); width = LOWORD(lparam); height = HIWORD(lparam);
DWORD newbitdepth=wparam; DWORD newbitdepth=wparam;
wdxdisplay_cat.spam() <<"WM_DISPLAYCHANGE received with width:" << width << " height: " << height << " bpp: " << wparam<< endl; wdxdisplay_cat.spam() <<"WM_DISPLAYCHANGE received with width:" << width << " height: " << height << " bpp: " << wparam<< endl;
#endif #endif
// unfortunately this doesnt seem to work because RestoreAllSurfaces doesn't // unfortunately this doesnt seem to work because RestoreAllSurfaces doesn't
// seem to think we're back in the original displaymode even after I've received // seem to think we're back in the original displaymode even after I've received
@ -630,9 +630,8 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
} }
break; break;
case WM_SIZE: { case WM_SIZE: {
#ifdef _DEBUG
#ifdef _DEBUG
{ {
width = LOWORD(lparam); height = HIWORD(lparam); width = LOWORD(lparam); height = HIWORD(lparam);
wdxdisplay_cat.spam() << "WM_SIZE received with width:" << width << " height: " << height << " flags: " << wdxdisplay_cat.spam() << "WM_SIZE received with width:" << width << " height: " << height << " flags: " <<
@ -640,7 +639,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
((wparam == SIZE_MINIMIZED)? "SIZE_MINIMIZED " : "") << ((wparam == SIZE_RESTORED)? "SIZE_RESTORED " : "") << ((wparam == SIZE_MINIMIZED)? "SIZE_MINIMIZED " : "") << ((wparam == SIZE_RESTORED)? "SIZE_RESTORED " : "") <<
((wparam == SIZE_MAXIMIZED)? "SIZE_MAXIMIZED " : "") << endl; ((wparam == SIZE_MAXIMIZED)? "SIZE_MAXIMIZED " : "") << endl;
} }
#endif #endif
// old comment -- added SIZE_RESTORED to handle 3dfx case // old comment -- added SIZE_RESTORED to handle 3dfx case
if(dx_full_screen || ((_dxgsg==NULL) || (_dxgsg->scrn.hWnd==NULL)) || ((wparam != SIZE_RESTORED) && (wparam != SIZE_MAXIMIZED))) if(dx_full_screen || ((_dxgsg==NULL) || (_dxgsg->scrn.hWnd==NULL)) || ((wparam != SIZE_RESTORED) && (wparam != SIZE_MAXIMIZED)))
break; break;
@ -1049,10 +1048,6 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
assert(hUser32); assert(hUser32);
_pfnGetMonitorInfo = (PFN_GETMONITORINFO) GetProcAddress(hUser32, "GetMonitorInfoA"); _pfnGetMonitorInfo = (PFN_GETMONITORINFO) GetProcAddress(hUser32, "GetMonitorInfoA");
// Note: could use _TrackMouseEvent in comctrl32.dll (part of IE 3.0+) which emulates
// TrackMouseEvent on w95, but that requires another 500K of memory to hold that DLL,
// which is lame just to support w95, which probably has other issues anyway
_pfnTrackMouseEvent = (PFN_TRACKMOUSEEVENT) GetProcAddress(hUser32, "TrackMouseEvent"); _pfnTrackMouseEvent = (PFN_TRACKMOUSEEVENT) GetProcAddress(hUser32, "TrackMouseEvent");
FreeLibrary(hUser32); FreeLibrary(hUser32);