aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-30 14:07:38 (GMT)
committerfluxgen <fluxgen>2002-08-30 14:07:38 (GMT)
commit39e80fa25c4ca003b5d2648ca518f674997a3a6b (patch)
treeccd942bb5a8846f86641698611aceac087f700e1
parente954ecc72a0c4e308e51e1cb08556f4318d2b101 (diff)
downloadfluxbox_pavel-39e80fa25c4ca003b5d2648ca518f674997a3a6b.zip
fluxbox_pavel-39e80fa25c4ca003b5d2648ca518f674997a3a6b.tar.bz2
make sure we have valid keybindings while moving a window
-rw-r--r--src/fluxbox.cc32
1 files changed, 31 insertions, 1 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index cc2e199..01e2c3f 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.72 2002/08/30 13:11:47 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.73 2002/08/30 14:07:38 fluxgen Exp $
26 26
27 27
28#include "fluxbox.hh" 28#include "fluxbox.hh"
@@ -1146,6 +1146,36 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1146 if (action==Keys::LASTKEYGRAB) //if action not found end case 1146 if (action==Keys::LASTKEYGRAB) //if action not found end case
1147 break; 1147 break;
1148 1148
1149 // what to allow if moving
1150 if (focused_window && focused_window->isMoving()) {
1151 int allowed = false;
1152 switch (action) {
1153 case Keys::WORKSPACE:
1154 case Keys::SENDTOWORKSPACE:
1155 case Keys::WORKSPACE1:
1156 case Keys::WORKSPACE2:
1157 case Keys::WORKSPACE3:
1158 case Keys::WORKSPACE4:
1159 case Keys::WORKSPACE5:
1160 case Keys::WORKSPACE6:
1161 case Keys::WORKSPACE7:
1162 case Keys::WORKSPACE8:
1163 case Keys::WORKSPACE9:
1164 case Keys::WORKSPACE10:
1165 case Keys::WORKSPACE11:
1166 case Keys::WORKSPACE12:
1167 case Keys::NEXTWORKSPACE:
1168 case Keys::PREVWORKSPACE:
1169 case Keys::LEFTWORKSPACE:
1170 case Keys::RIGHTWORKSPACE:
1171 allowed = true;
1172 break;
1173 default:
1174 allowed = false;
1175 }
1176 if (!allowed) break;
1177 }
1178
1149 switch (action) { 1179 switch (action) {
1150 case Keys::WORKSPACE: 1180 case Keys::WORKSPACE:
1151 // Workspace1 has id 0, hence -1 1181 // Workspace1 has id 0, hence -1