// X error handler to handle any and all X errors while the application is
// running
static bool internal_error = False;
-static Window last_bad_window = None;
BaseDisplay *base_display;
-#ifdef DEBUG
static int handleXErrors(Display *d, XErrorEvent *e) {
+#ifdef DEBUG
char errtxt[128];
XGetErrorText(d, e->error_code, errtxt, 128);
base_display->getApplicationName(), errtxt, e->error_code,
e->request_code, e->minor_code, e->resourceid);
#else
-static int handleXErrors(Display *, XErrorEvent *e) {
+ // shutup gcc
+ (void) d;
+ (void) e;
#endif // DEBUG
- if (e->error_code == BadWindow) last_bad_window = e->resourceid;
if (internal_error) abort();
return(False);
application_name = app_name;
run_state = STARTUP;
- last_bad_window = None;
::base_display = this;
for (int i = 0; i < ScreenCount(display); ++i)
screenInfoList.push_back(ScreenInfo(this, i));
+#ifndef NOCLOBBER
NumLockMask = ScrollLockMask = 0;
const XModifierKeymap* const modmap = XGetModifierMapping(display);
MaskListLength = sizeof(MaskList) / sizeof(MaskList[0]);
if (modmap) XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
+#else // NOCLOBBER
+ NumLockMask = 0;
+ ScrollLockMask = 0;
+#endif // NOCLOBBER
gccache = 0;
}
if (XPending(display)) {
XEvent e;
XNextEvent(display, &e);
-
- if (last_bad_window != None && e.xany.window == last_bad_window)
- continue;
-
- last_bad_window = None;
process_event(&e);
} else {
fd_set rfds;
unsigned int event_mask, int pointer_mode,
int keyboard_mode, Window confine_to,
Cursor cursor) const {
- for (size_t cnt = 0; cnt < MaskListLength; ++cnt) {
+#ifndef NOCLOBBER
+ for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
XGrabButton(display, button, modifiers | MaskList[cnt], grab_window,
owner_events, event_mask, pointer_mode, keyboard_mode,
confine_to, cursor);
- }
+#else // NOCLOBBER
+ XGrabButton(display, button, modifiers, grab_window,
+ owner_events, event_mask, pointer_mode, keyboard_mode,
+ confine_to, cursor);
+#endif // NOCLOBBER
}
/*
*/
void BaseDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
Window grab_window) const {
- for (size_t cnt = 0; cnt < MaskListLength; ++cnt) {
+#ifndef NOCLOBBER
+ for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
XUngrabButton(display, button, modifiers | MaskList[cnt], grab_window);
- }
+#else // NOCLOBBER
+ XUngrabButton(display, button, modifiers, grab_window);
+#endif // NOCLOBBER
}