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

fixed checking on focused_window in handleKeyEvents

Browse source
This commit is contained in:
fluxgen 2002-05-08 09:33:11 +00:00
parent 05588b7505
commit 1f5c8b5ba1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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.55 2002/05/02 07:14:21 fluxgen Exp $ // $Id: fluxbox.cc,v 1.56 2002/05/08 09:33:11 fluxgen Exp $
//Use GNU extensions //Use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -1188,16 +1188,20 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
screen->rightWorkspace(key->getParam()); screen->rightWorkspace(key->getParam());
break; break;
case Keys::KILLWINDOW: //kill the current window case Keys::KILLWINDOW: //kill the current window
XKillClient(screen->getBaseDisplay()->getXDisplay(), if (focused_window) {
focused_window->getClientWindow()); XKillClient(screen->getBaseDisplay()->getXDisplay(),
focused_window->getClientWindow());
}
break; break;
case Keys::NEXTWINDOW: //activate next window case Keys::NEXTWINDOW: //activate next window
screen->nextFocus(key->getParam()); screen->nextFocus(key->getParam());
focused_window->getTab()->raise(); if (focused_window)
focused_window->getTab()->raise();
break; break;
case Keys::PREVWINDOW: //activate prev window case Keys::PREVWINDOW: //activate prev window
screen->prevFocus(key->getParam()); screen->prevFocus(key->getParam());
focused_window->getTab()->raise(); if (focused_window)
focused_window->getTab()->raise();
break; break;
case Keys::NEXTTAB: case Keys::NEXTTAB:
if (focused_window && focused_window->getTab()) { if (focused_window && focused_window->getTab()) {
@ -1944,7 +1948,7 @@ void Fluxbox::load_rc(void) {
if (!m_rc_menufile->size()) if (!m_rc_menufile->size())
m_rc_menufile.setDefaultValue(); m_rc_menufile.setDefaultValue();
delete tmpvar; delete [] tmpvar;
} else } else
m_rc_menufile.setDefaultValue(); m_rc_menufile.setDefaultValue();