actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify. Do not use Open/CloseMask for the MapNotify events.

Browse Source
This commit is contained in:
Steve Checkoway
2006-12-07 11:51:42 +00:00
parent 33835ee478
commit 93be46923a
1 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+18 -29
View File
@@ -96,14 +96,6 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe
putenv( buf ); putenv( buf );
#endif #endif
XSizeHints hints;
XEvent ev;
stack<XEvent> otherEvs;
hints.flags = PBaseSize;
hints.base_width = p.width;
hints.base_height = p.height;
if( g_pContext == NULL || p.bpp != CurrentParams.bpp || m_bWasWindowed != p.windowed ) if( g_pContext == NULL || p.bpp != CurrentParams.bpp || m_bWasWindowed != p.windowed )
{ {
// Different depth, or we didn't make a window before. New context. // Different depth, or we didn't make a window before. New context.
@@ -136,9 +128,6 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe
if( xvi == NULL ) if( xvi == NULL )
return "No visual available for that depth."; return "No visual available for that depth.";
/* Enable StructureNotifyMask, so we receive a MapNotify for the following XMapWindow. */
OpenMask( StructureNotifyMask );
// I get strange behavior if I add override redirect after creating the window. // I get strange behavior if I add override redirect after creating the window.
// So, let's recreate the window when changing that state. // So, let's recreate the window when changing that state.
if( !MakeWindow(Win, xvi->screen, xvi->depth, xvi->visual, p.width, p.height, !p.windowed) ) if( !MakeWindow(Win, xvi->screen, xvi->depth, xvi->visual, p.width, p.height, !p.windowed) )
@@ -156,28 +145,20 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe
glXMakeCurrent( Dpy, Win, g_pContext ); glXMakeCurrent( Dpy, Win, g_pContext );
XWindowAttributes winAttrib;
XGetWindowAttributes( Dpy, Win, &winAttrib );
XSelectInput( Dpy, Win, winAttrib.your_event_mask | StructureNotifyMask );
XMapWindow( Dpy, Win ); XMapWindow( Dpy, Win );
// HACK: Wait for the MapNotify event, without spinning and // XXX: Why do we need to wait for the MapNotify event?
// eating CPU unnecessarily, and without smothering other while( true )
// events. Do this by grabbing all events, remembering
// uninteresting events, and putting them back on the queue
// after MapNotify arrives.
while(1)
{ {
XNextEvent( Dpy, &ev ); XEvent event;
if( ev.type == MapNotify ) XMaskEvent( Dpy, StructureNotifyMask, &event );
if( event.type == MapNotify )
break; break;
otherEvs.push( ev );
} }
XSelectInput( Dpy, Win, winAttrib.your_event_mask );
while( !otherEvs.empty() )
{
XPutBackEvent( Dpy, &otherEvs.top() );
otherEvs.pop();
}
CloseMask( StructureNotifyMask );
} }
else else
@@ -240,7 +221,15 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe
// Do this before resizing the window so that pane-style WMs (Ion, // Do this before resizing the window so that pane-style WMs (Ion,
// ratpoison) don't resize us back inappropriately. // ratpoison) don't resize us back inappropriately.
XSetWMNormalHints( Dpy, Win, &hints ); {
XSizeHints hints;
hints.flags = PBaseSize;
hints.base_width = p.width;
hints.base_height = p.height;
XSetWMNormalHints( Dpy, Win, &hints );
}
// Do this even if we just created the window -- works around Ion2 not // Do this even if we just created the window -- works around Ion2 not
// catching WM normal hints changes in mapped windows. // catching WM normal hints changes in mapped windows.