has moved to a known window.
*/
e->xfocus.window = None;
+
+ no_focus = False; // focusing is back on
}
break;
if (win->isIconic())
win->deiconify(False, False);
if (! win->isStuck() &&
- (win->getWorkspaceNumber() != screen->getCurrentWorkspaceID()))
+ (win->getWorkspaceNumber() != screen->getCurrentWorkspaceID())) {
+ no_focus = True;
screen->changeWorkspaceID(win->getWorkspaceNumber());
+ }
if (win->isVisible() && win->setInputFocus()) {
win->getScreen()->getWorkspace(win->getWorkspaceNumber())->
raiseWindow(win);
}
}
}
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::openbox_show_root_menu) ||
+ e->xclient.message_type ==
+ xatom->getAtom(XAtom::openbox_show_workspace_menu)) {
+ // find the screen the mouse is on
+ int x, y;
+ ScreenList::iterator it, end = screenList.end();
+ for (it = screenList.begin(); it != end; ++it) {
+ Window w;
+ int i;
+ unsigned int m;
+ if (XQueryPointer(getXDisplay(), (*it)->getRootWindow(),
+ &w, &w, &x, &y, &i, &i, &m))
+ break;
+ }
+ if (it != end) {
+ if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::openbox_show_root_menu))
+ (*it)->showRootMenu(x, y);
+ else
+ (*it)->showWorkspaceMenu(x, y);
+ }
}
}
config.setValue("session.cacheMax", resource.cache_max);
config.setValue("session.styleFile", resource.style_file);
config.setValue("session.titlebarLayout", resource.titlebar_layout);
+
+ string s;
+ if (resource.mod_mask & Mod1Mask) s += "Mod1-";
+ if (resource.mod_mask & Mod2Mask) s += "Mod2-";
+ if (resource.mod_mask & Mod3Mask) s += "Mod3-";
+ if (resource.mod_mask & Mod4Mask) s += "Mod4-";
+ if (resource.mod_mask & Mod5Mask) s += "Mod5-";
+ if (resource.mod_mask & ShiftMask) s += "Shift-";
+ if (resource.mod_mask & ControlMask) s += "Control-";
+ s.resize(s.size() - 1); // drop the last '-'
+ config.setValue("session.modifierMask", s);
#ifdef XINERAMA
saveXineramaPlacement(resource.xinerama_placement);
resource.xinerama_snap))
resource.xinerama_snap = false;
#endif // XINERAMA
+
+ resource.mod_mask = 0;
+ if (config.getValue("session.modifierMask", s)) {
+ if (s.find("Mod1") != string::npos)
+ resource.mod_mask |= Mod1Mask;
+ if (s.find("Mod2") != string::npos)
+ resource.mod_mask |= Mod2Mask;
+ if (s.find("Mod3") != string::npos)
+ resource.mod_mask |= Mod3Mask;
+ if (s.find("Mod4") != string::npos)
+ resource.mod_mask |= Mod4Mask;
+ if (s.find("Mod5") != string::npos)
+ resource.mod_mask |= Mod5Mask;
+ if (s.find("Shift") != string::npos)
+ resource.mod_mask |= ShiftMask;
+ if (s.find("Control") != string::npos)
+ resource.mod_mask |= ControlMask;
+ }
+ if (! resource.mod_mask)
+ resource.mod_mask = Mod1Mask;
}