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

fixed minor issue with keyboard navigation in menus

Browse source
This commit is contained in:
fluxgen 2004-01-16 18:07:40 +00:00
parent 5a24731d3a
commit 2e57767332
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.224 2004/01/16 11:38:30 fluxgen Exp $ // $Id: fluxbox.cc,v 1.225 2004/01/16 18:07:40 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -756,9 +756,14 @@ void Fluxbox::handleEvent(XEvent * const e) {
// we need to check focus out for menus before // we need to check focus out for menus before
// we call FbTk eventhandler // we call FbTk eventhandler
// so we can get FbTk::Menu::focused() before it sets to 0 // so we can get FbTk::Menu::focused() before it sets to 0
if (e->type == FocusOut && if (e->type == FocusOut &&
e->xfocus.mode != NotifyGrab &&
e->xfocus.detail != NotifyPointer &&
e->xfocus.detail != NotifyInferior &&
FbTk::Menu::focused() != 0 && FbTk::Menu::focused() != 0 &&
FbTk::Menu::focused()->window() == e->xfocus.window) { FbTk::Menu::focused()->window() == e->xfocus.window) {
// find screen num // find screen num
BScreen *screen = 0; BScreen *screen = 0;
ScreenList::iterator it = m_screen_list.begin(); ScreenList::iterator it = m_screen_list.begin();
@ -770,8 +775,9 @@ void Fluxbox::handleEvent(XEvent * const e) {
break; // found the screen, no more search break; // found the screen, no more search
} }
} }
if (screen != 0) if (screen != 0)
revertFocus(*screen); revertFocus(*screen);
} }
// try FbTk::EventHandler first // try FbTk::EventHandler first
@ -923,7 +929,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
e->xfocus.detail == NotifyPointer || e->xfocus.detail == NotifyPointer ||
e->xfocus.detail == NotifyInferior) e->xfocus.detail == NotifyInferior)
break; break;
WinClient *winclient = searchWindow(e->xfocus.window); WinClient *winclient = searchWindow(e->xfocus.window);
if (winclient && m_focused_window != winclient) if (winclient && m_focused_window != winclient)
setFocusedWindow(winclient); setFocusedWindow(winclient);