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

make focusDelay check the destroying window properly before killing the timer

Browse source
This commit is contained in:
Dana Jansens 2003-09-03 15:39:27 +00:00
parent e2b79a0b59
commit 3f372aaebf
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
openbox/event.c
View file

@ -72,6 +72,8 @@ static const int mask_table[] = {
}; };
static int mask_table_size; static int mask_table_size;
static ObClient *focus_delay_client;
#ifdef USE_SM #ifdef USE_SM
static void ice_handler(int fd, gpointer conn) static void ice_handler(int fd, gpointer conn)
{ {
@ -657,8 +659,10 @@ static void event_handle_client(ObClient *client, XEvent *e)
case OB_FRAME_CONTEXT_FRAME: case OB_FRAME_CONTEXT_FRAME:
/* XXX if doing a 'reconfigure' make sure you kill this timer, /* XXX if doing a 'reconfigure' make sure you kill this timer,
maybe all timers.. */ maybe all timers.. */
if (config_focus_delay) if (config_focus_delay) {
focus_delay_client = NULL;
ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func); ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
}
default: default:
break; break;
} }
@ -705,8 +709,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
ob_main_loop_timeout_add(ob_main_loop, ob_main_loop_timeout_add(ob_main_loop,
config_focus_delay, config_focus_delay,
focus_delay_func, focus_delay_func,
client, NULL, NULL);
NULL); focus_delay_client = client;
} else } else
client_focus(client); client_focus(client);
} }
@ -1178,12 +1182,15 @@ static void event_handle_menu(XEvent *ev)
static gboolean focus_delay_func(gpointer data) static gboolean focus_delay_func(gpointer data)
{ {
ObClient *c = data; client_focus(focus_delay_client);
client_focus(c);
return FALSE; /* no repeat */ return FALSE; /* no repeat */
} }
static void focus_delay_client_dest(gpointer data) static void focus_delay_client_dest(gpointer data)
{ {
ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func); ObClient *c = data;
if (c == focus_delay_client) {
focus_delay_client = NULL;
ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
}
} }