static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_focus_startup()
+void action_focus_startup(void)
{
actions_register("Focus",
setup_func,
Options *o = options;
if (data->client) {
+/*
+ ob_debug("button %d focusable %d context %d %d %d\n",
+ data->button, client_mouse_focusable(data->client),
+ data->context,
+ OB_FRAME_CONTEXT_CLIENT, OB_FRAME_CONTEXT_FRAME);
+*/
if (data->button == 0 || client_mouse_focusable(data->client) ||
- data->context != OB_FRAME_CONTEXT_CLIENT ||
- data->context != OB_FRAME_CONTEXT_FRAME)
+ (data->context != OB_FRAME_CONTEXT_CLIENT &&
+ data->context != OB_FRAME_CONTEXT_FRAME))
{
client_activate(data->client, o->here, FALSE, FALSE, TRUE);
}
- } else {
- /* focus action on something other than a client, make keybindings
- work for this openbox instance, but don't focus any specific client
- */
+ } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
+ /* focus action on the root window. make keybindings work for this
+ openbox instance, but don't focus any specific client */
focus_nothing();
}