aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-05-08 09:33:11 (GMT)
committerfluxgen <fluxgen>2002-05-08 09:33:11 (GMT)
commit1f5c8b5ba118c3700f0aac8652f400bf316a97b9 (patch)
treeca80f228fda2c67bab6d229dfd5f9b1ded05c4e5
parent05588b7505a320a47f62b0224c8d640847a81cc0 (diff)
downloadfluxbox-1f5c8b5ba118c3700f0aac8652f400bf316a97b9.zip
fluxbox-1f5c8b5ba118c3700f0aac8652f400bf316a97b9.tar.bz2
fixed checking on focused_window in handleKeyEvents
-rw-r--r--src/fluxbox.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index cf3a6d4..f61eca2 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.55 2002/05/02 07:14:21 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.56 2002/05/08 09:33:11 fluxgen Exp $
26 26
27//Use GNU extensions 27//Use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -1188,16 +1188,20 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1188 screen->rightWorkspace(key->getParam()); 1188 screen->rightWorkspace(key->getParam());
1189 break; 1189 break;
1190 case Keys::KILLWINDOW: //kill the current window 1190 case Keys::KILLWINDOW: //kill the current window
1191 XKillClient(screen->getBaseDisplay()->getXDisplay(), 1191 if (focused_window) {
1192 focused_window->getClientWindow()); 1192 XKillClient(screen->getBaseDisplay()->getXDisplay(),
1193 focused_window->getClientWindow());
1194 }
1193 break; 1195 break;
1194 case Keys::NEXTWINDOW: //activate next window 1196 case Keys::NEXTWINDOW: //activate next window
1195 screen->nextFocus(key->getParam()); 1197 screen->nextFocus(key->getParam());
1196 focused_window->getTab()->raise(); 1198 if (focused_window)
1199 focused_window->getTab()->raise();
1197 break; 1200 break;
1198 case Keys::PREVWINDOW: //activate prev window 1201 case Keys::PREVWINDOW: //activate prev window
1199 screen->prevFocus(key->getParam()); 1202 screen->prevFocus(key->getParam());
1200 focused_window->getTab()->raise(); 1203 if (focused_window)
1204 focused_window->getTab()->raise();
1201 break; 1205 break;
1202 case Keys::NEXTTAB: 1206 case Keys::NEXTTAB:
1203 if (focused_window && focused_window->getTab()) { 1207 if (focused_window && focused_window->getTab()) {
@@ -1944,7 +1948,7 @@ void Fluxbox::load_rc(void) {
1944 if (!m_rc_menufile->size()) 1948 if (!m_rc_menufile->size())
1945 m_rc_menufile.setDefaultValue(); 1949 m_rc_menufile.setDefaultValue();
1946 1950
1947 delete tmpvar; 1951 delete [] tmpvar;
1948 } else 1952 } else
1949 m_rc_menufile.setDefaultValue(); 1953 m_rc_menufile.setDefaultValue();
1950 1954