nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't grab the pointer during interactive events. this allows you to alt-tab during a dnd.

Browse source
This commit is contained in:
Dana Jansens 2007-04-22 15:22:25 +00:00
parent 4c672be2e1
commit 27773e1cb7
5 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/client.c
View file

@ -507,6 +507,8 @@ void client_unmanage(ObClient *self)
g_assert(self != NULL);
frame_hide(self->frame);
/* sync to send the hide to the server quickly, and to get back the enter
events */
XSync(ob_display, FALSE);
if (focus_client == self) {

11
openbox/event.c
View file

@ -590,9 +590,10 @@ static void event_process(const XEvent *ec, gpointer data)
NULL, g_direct_equal, NULL);
if (e->type == ButtonPress || e->type == ButtonRelease ||
e->type == MotionNotify)
mouse_event(client, e);
else if (e->type == KeyPress) {
e->type == MotionNotify) {
if (!keyboard_interactively_grabbed())
mouse_event(client, e);
} else if (e->type == KeyPress) {
keyboard_event((focus_cycle_target ? focus_cycle_target :
(focus_hilite ? focus_hilite : client)),
e);
@ -762,6 +763,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_FRAME:
if (keyboard_interactively_grabbed())
break;
if (config_focus_follow && config_focus_delay)
ob_main_loop_timeout_remove_data(ob_main_loop,
focus_delay_func,
@ -803,6 +806,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_FRAME:
if (keyboard_interactively_grabbed())
break;
if (e->xcrossing.mode == NotifyGrab ||
e->xcrossing.mode == NotifyUngrab)
{

6
openbox/focus.c
View file

@ -328,10 +328,16 @@ static void popup_cycle(ObClient *c, gboolean show)
void focus_cycle_draw_indicator()
{
if (!focus_cycle_target) {
XEvent e;
XUnmapWindow(ob_display, focus_indicator.top.win);
XUnmapWindow(ob_display, focus_indicator.left.win);
XUnmapWindow(ob_display, focus_indicator.right.win);
XUnmapWindow(ob_display, focus_indicator.bottom.win);
/* kill enter events cause by this unmapping */
XSync(ob_display, FALSE);
while (XCheckTypedEvent(ob_display, EnterNotify, &e));
} else {
/*
if (focus_cycle_target)

7
openbox/keyboard.c
View file

@ -164,10 +164,8 @@ gboolean keyboard_interactive_grab(guint state, ObClient *client,
g_assert(action->data.any.interactive);
if (!interactive_states) {
if (!grab_keyboard(TRUE))
return FALSE;
if (!grab_pointer(TRUE, FALSE, OB_CURSOR_NONE)) {
grab_keyboard(FALSE);
if (!grab_keyboard(TRUE)) {
ob_debug("grab KEYBOARD failed\n");
return FALSE;
}
}
@ -195,7 +193,6 @@ void keyboard_interactive_end(ObInteractiveState *s,
if (!interactive_states) {
grab_keyboard(FALSE);
grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
keyboard_reset_chains();
}
}

6
openbox/popup.c
View file

@ -213,8 +213,14 @@ void popup_show(ObPopup *self, gchar *text)
void popup_hide(ObPopup *self)
{
if (self->mapped) {
XEvent e;
XUnmapWindow(ob_display, self->bg);
self->mapped = FALSE;
/* kill enter events cause by this unmapping */
XSync(ob_display, FALSE);
while (XCheckTypedEvent(ob_display, EnterNotify, &e));
}
}