From 47cbcc03ae6858763b611c83fdb61742d50e067d Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 15 Dec 2009 00:12:26 +0000 Subject: [PATCH] Don't focus activated if focus is locked out. SVN revision: 44456 --- src/modules/illume2/e_mod_layout_illume.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c index e3fad6d37..9a9ffe658 100644 --- a/src/modules/illume2/e_mod_layout_illume.c +++ b/src/modules/illume2/e_mod_layout_illume.c @@ -163,8 +163,9 @@ _border_activate(E_Border *bd) { /* HANDLE A BORDER BEING ACTIVATED */ - /* only set focus if border accepts it */ - if ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) + /* only set focus if border accepts it and it's not locked out */ + if (((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) || + (bd->lock_focus_out)) return; /* if the border is not focused, check focus settings */