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

lots of unrelated fixes

Browse source
This commit is contained in:
markt 2007-02-27 17:46:48 +00:00
parent 8ce203c949
commit 3503f75903
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Ewmh.cc
View file

@ -662,15 +662,7 @@ void Ewmh::updateState(FluxboxWindow &win) {
} }
void Ewmh::updateLayer(FluxboxWindow &win) { void Ewmh::updateLayer(FluxboxWindow &win) {
//!! TODO _NET_WM_WINDOW_TYPE updateState(win);
/*
if (win.getLayer() == Fluxbox::instance()->getAboveDockLayer()) {
// _NET_WM_STATE_BELOW
} else if (win.getLayer() == Fluxbox::instance()->getBottomLayer()) {
// _NET_WM_STATE_ABOVE
}
*/
} }
void Ewmh::updateHints(FluxboxWindow &win) { void Ewmh::updateHints(FluxboxWindow &win) {

4
src/FbTk/Menu.cc
View file

@ -965,6 +965,10 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
if (w == m_active_index) if (w == m_active_index)
return; return;
// if another menu is focused, change focus to this one, so arrow keys
// work as expected
if (s_focused != this && s_focused != 0)
grabInputFocus();
if (validIndex(m_active_index) && w != m_active_index) { if (validIndex(m_active_index) && w != m_active_index) {
int old_active_index = m_active_index; int old_active_index = m_active_index;

2
src/Keys.cc
View file

@ -339,7 +339,7 @@ bool Keys::doAction(int type, unsigned int mods, unsigned int key) {
// grab "None Escape" to exit keychain in the middle // grab "None Escape" to exit keychain in the middle
unsigned int esc = FbTk::KeyUtil::getKey("Escape"); unsigned int esc = FbTk::KeyUtil::getKey("Escape");
if (temp_key && temp_key->keylist.size()) { // emacs-style if (temp_key && !temp_key->keylist.empty()) { // emacs-style
if (!saved_keymode) if (!saved_keymode)
saved_keymode = m_keylist; saved_keymode = m_keylist;
next_key = temp_key; next_key = temp_key;

4
src/fluxbox.cc
View file

@ -733,7 +733,9 @@ void Fluxbox::handleEvent(XEvent * const e) {
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if ( (*it)->screenNumber() == if ( (*it)->screenNumber() ==
FbTk::Menu::focused()->fbwindow().screenNumber()) { FbTk::Menu::focused()->fbwindow().screenNumber()) {
FocusControl::revertFocus(**it); FocusControl::setFocusedWindow(0);
m_revert_screen = *it;
m_revert_timer.start();
break; // found the screen, no more search break; // found the screen, no more search
} }
} }