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

Fix window resizing, and add a harmless workaround for my obscure WM. Recreating the window (when the depth changes) now works too.

Browse Source
This commit is contained in:
Ben Anderson
2005-03-16 05:55:01 +00:00
parent 37c6621bd7
commit 063298de3d
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+36 -34
View File
@@ -50,14 +50,14 @@ CString LowLevelWindow_X11::TryVideoMode(RageDisplay::VideoModeParams p, bool &b
hints.min_width = hints.max_width = hints.base_width = p.width; hints.min_width = hints.max_width = hints.base_width = p.width;
hints.min_height = hints.max_height = hints.base_height = p.height; hints.min_height = hints.max_height = hints.base_height = p.height;
X11Helper::OpenMask(StructureNotifyMask);
if(!windowIsOpen || p.bpp != CurrentParams.bpp) if(!windowIsOpen || p.bpp != CurrentParams.bpp)
{ {
int visAttribs[32]; int visAttribs[32];
XVisualInfo *xvi; XVisualInfo *xvi;
GLXContext ctxt; GLXContext ctxt;
X11Helper::OpenMask(StructureNotifyMask);
// Different depth, or we didn't make a window before. New context. // Different depth, or we didn't make a window before. New context.
bNewDeviceOut = true; bNewDeviceOut = true;
@@ -90,9 +90,7 @@ CString LowLevelWindow_X11::TryVideoMode(RageDisplay::VideoModeParams p, bool &b
return "No visual available for that depth."; return "No visual available for that depth.";
} }
// Taking a hint from SDL. if(!X11Helper::MakeWindow(xvi->screen, xvi->depth, xvi->visual, p.width, p.height) )
if(!X11Helper::MakeWindow(xvi->screen, xvi->depth, xvi->visual) )
{ {
return "Failed to create the window."; return "Failed to create the window.";
} }
@@ -102,48 +100,52 @@ CString LowLevelWindow_X11::TryVideoMode(RageDisplay::VideoModeParams p, bool &b
glXMakeCurrent(X11Helper::Dpy, X11Helper::Win, ctxt); glXMakeCurrent(X11Helper::Dpy, X11Helper::Win, ctxt);
XMapWindow(X11Helper::Dpy, X11Helper::Win);
// HACK: Wait for the MapNotify event, without spinning and
// eating CPU unnecessarily, and without smothering other
// events. Do this by grabbing all events, remembering
// uninteresting events, and putting them back on the queue
// after MapNotify arrives.
while(true)
{
XNextEvent(X11Helper::Dpy, &ev);
if(ev.type == MapNotify)
{
break;
}
else
{
otherEvs.push(ev);
}
}
while(!otherEvs.empty() )
{
XPutBackEvent(X11Helper::Dpy, &otherEvs.top() );
otherEvs.pop();
}
X11Helper::CloseMask(StructureNotifyMask);
} }
else else
{ {
// We're remodeling the existing window, and not touching the // We're remodeling the existing window, and not touching the
// context. // context.
bNewDeviceOut = false; bNewDeviceOut = false;
// Remap the window to work around possible buggy WMs and/or
// X servers
XUnmapWindow(X11Helper::Dpy, X11Helper::Win);
} }
// Do this before resizing the window so that pane-style WMs (Ion,
// ratpoison) don't resize us back inappropriately.
XSetWMNormalHints(X11Helper::Dpy, X11Helper::Win, &hints); XSetWMNormalHints(X11Helper::Dpy, X11Helper::Win, &hints);
XMapWindow(X11Helper::Dpy, X11Helper::Win); // Do this even if we just created the window -- works around Ion2 not
// catching WM normal hints changes in mapped windows.
// HACK: Wait for the MapNotify event, without spinning and XResizeWindow(X11Helper::Dpy, X11Helper::Win, p.width, p.height);
// eating CPU unnecessarily, and without smothering other
// events. Do this by grabbing all events, remembering
// uninteresting events, and putting them back on the queue
// after MapNotify arrives.
while(true)
{
XNextEvent(X11Helper::Dpy, &ev);
if(ev.type == MapNotify)
{
break;
}
else
{
otherEvs.push(ev);
}
}
while(!otherEvs.empty() )
{
XPutBackEvent(X11Helper::Dpy, &otherEvs.top() );
otherEvs.pop();
}
CurrentParams = p; CurrentParams = p;
X11Helper::CloseMask(StructureNotifyMask);
return ""; // Success return ""; // Success
} }