if the keyboard is grabbed then dont ungrab it!

This commit is contained in:
Dana Jansens 2003-09-21 17:17:34 +00:00
parent 32047fd66c
commit a260db31a9

View file

@ -785,7 +785,7 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
return act; return act;
} }
void action_run_list(GSList *acts, struct _ObClient *c, void action_run_list(GSList *acts, ObClient *c,
guint state, guint button, gint x, gint y, guint state, guint button, gint x, gint y,
gboolean cancel, gboolean done) gboolean cancel, gboolean done)
{ {
@ -793,16 +793,22 @@ void action_run_list(GSList *acts, struct _ObClient *c,
ObAction *a; ObAction *a;
gboolean inter = FALSE; gboolean inter = FALSE;
if (!acts)
return;
if (x < 0 && y < 0) if (x < 0 && y < 0)
screen_pointer_pos(&x, &y); screen_pointer_pos(&x, &y);
for (it = acts; it; it = g_slist_next(it)) { if (grab_on_keyboard())
a = it->data; inter = TRUE;
if (a->data.any.interactive) { else
inter = TRUE; for (it = acts; it; it = g_slist_next(it)) {
break; a = it->data;
if (a->data.any.interactive) {
inter = TRUE;
break;
}
} }
}
if (!inter) { if (!inter) {
/* sometimes when we execute another app as an action, /* sometimes when we execute another app as an action,