From 983bd9a5d8382e22f588bb4c719ee052254d890b Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 4 Oct 2008 12:49:56 +0200 Subject: [PATCH] Don't allow deiconifying locked windows via the focus action. --- openbox/actions/focus.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c index 6c8957c8..0ea51cb5 100644 --- a/openbox/actions/focus.c +++ b/openbox/actions/focus.c @@ -54,12 +54,14 @@ static gboolean run_func(ObActionsData *data, gpointer options) (data->context != OB_FRAME_CONTEXT_CLIENT && data->context != OB_FRAME_CONTEXT_FRAME)) { - if (o->stop_int) - actions_interactive_cancel_act(); + if (!(data->client->iconic && actions_client_locked(data))) { + if (o->stop_int) + actions_interactive_cancel_act(); - actions_client_move(data, TRUE); - client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE); - actions_client_move(data, FALSE); + actions_client_move(data, TRUE); + client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE); + actions_client_move(data, FALSE); + } } } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) { if (o->stop_int) -- 2.34.1