Made pass through mode to a submode (#48).

This allows to use pass through mode together with insert mode. There where
also some bugs around the vb_set_mode()'s handling for insert mode, that are
now fixed.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/command.c b/src/command.c
index 92507ee..d1cd64f 100644
--- a/src/command.c
+++ b/src/command.c
@@ -948,7 +948,14 @@ gboolean command_queue(const Arg *arg)
 
 gboolean command_mode(const Arg *arg)
 {
-    return vb_set_mode(arg->i, false);
+    /* if a main mode is given - set the mode like it is */
+    if (CLEAN_MODE(arg->i)) {
+        return vb_set_mode(arg->i, false);
+    }
+
+    /* else combine the current main mode with the new submode */
+    /* TODO move this logic to main.c: vb_set_mode() */
+    return vb_set_mode(arg->i|CLEAN_MODE(vb.state.mode), false);
 }
 
 gboolean command_focusinput(const Arg *arg)