CONFIG BREAK: rename 'mode floating/tiling' to 'floating enable/disable'

The three different variants now:
   floating enable
   floating disable
   floating toggle

diff --git a/docs/userguide b/docs/userguide
index 863199742271735e6ebb24f89875149452709e59..bf0e84a2aa1df8cecec50cea22bd1f76d4bed757 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -611,8 +611,8 @@ focus_follows_mouse no
 To change the layout of the current container to stacking, use +layout
 stacking+, for default use +layout default+ and for tabbed, use +layout
 tabbed+. To make the current client (!) fullscreen, use +fullscreen+, to make
-it floating (or tiling again) use +mode floating+ respectively +mode tiling+
-(or +mode toggle+):
+it floating (or tiling again) use +floating enable+ respectively +floating disable+
+(or +floating toggle+):
 
 *Examples*:
 --------------
@@ -624,7 +624,7 @@ bindsym Mod1+w layout tabbed
 bindsym Mod1+f fullscreen
 
 # Toggle floating/tiling
-bindsym Mod1+t mode toggle
+bindsym Mod1+t floating toggle
 --------------
 
 === Focusing/Moving containers

diff --git a/i3.config b/i3.config
index 72399dfaac0506e8694ee21ba9e0072a130f4d64..1ce396de916f7a70bbe0d36f11e204bc6248920d 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -38,7 +38,7 @@ bindsym Mod1+w layout tabbed
 bindsym Mod1+l layout default
 
 # toggle tiling / floating
-bindsym Mod1+Shift+space mode toggle
+bindsym Mod1+Shift+space floating toggle
 
 # focus the parent container
 bindsym Mod1+u focus parent

diff --git a/src/cmdparse.l b/src/cmdparse.l
index 545def7d05259c53aebf6b8259ee9e2883deb068..6c57984ea61c8f16442961ea8d6f26b810462449 100644 (file)
--- a/src/cmdparse.l
+++ b/src/cmdparse.l
@@ -140,6 +140,13 @@ nop                             { WS_STRING; return TOK_NOP; }
 restore                         { WS_STRING; return TOK_RESTORE; }
 mark                            { WS_STRING; return TOK_MARK; }
 
+enable                          { return TOK_ENABLE; }
+true                            { return TOK_ENABLE; }
+yes                             { return TOK_ENABLE; }
+disable                         { return TOK_DISABLE; }
+false                           { return TOK_DISABLE; }
+no                              { return TOK_DISABLE; }
+
 class                           { BEGIN(WANT_QSTRING); return TOK_CLASS; }
 id                              { BEGIN(WANT_QSTRING); return TOK_ID; }
 con_id                          { BEGIN(WANT_QSTRING); return TOK_CON_ID; }

diff --git a/src/cmdparse.y b/src/cmdparse.y
index 8cf7858beac2b42ec88e3aa5c19fd36cb4b2649d..0738d0c90eca134a4925e20c6222833148b60ffa 100644 (file)
--- a/src/cmdparse.y
+++ b/src/cmdparse.y
@@ -135,6 +135,8 @@ char *parse_cmd(const char *new) {
 %token              TOK_MODE            "mode"
 %token              TOK_TILING          "tiling"
 %token              TOK_FLOATING        "floating"
+%token              TOK_ENABLE          "enable"
+%token              TOK_DISABLE         "disable"
 %token              TOK_WORKSPACE       "workspace"
 %token              TOK_TOGGLE          "toggle"
 %token              TOK_FOCUS           "focus"
@@ -170,7 +172,7 @@ char *parse_cmd(const char *new) {
 
 %type   <number>    direction
 %type   <number>    level
-%type   <number>    window_mode
+%type   <number>    boolean
 %type   <number>    border_style
 %type   <number>    layout_mode
 %type   <number>    resize_px
@@ -345,7 +347,7 @@ operation:
     | open
     | fullscreen
     | split
-    | mode
+    | floating
     | mark
     | resize
     | nop
@@ -541,8 +543,8 @@ direction:
     | 'v'           { $$ = 'v'; }
     ;
 
-mode:
-    TOK_MODE window_mode
+floating:
+    TOK_FLOATING boolean
     {
         HANDLE_EMPTY_MATCH;
 
@@ -554,7 +556,7 @@ mode:
                 toggle_floating_mode(current->con, false);
             } else {
                 printf("should switch mode to %s\n", ($2 == TOK_FLOATING ? "floating" : "tiling"));
-                if ($2 == TOK_FLOATING) {
+                if ($2 == TOK_ENABLE) {
                     floating_enable(current->con, false);
                 } else {
                     floating_disable(current->con, false);
@@ -566,10 +568,10 @@ mode:
     }
     ;
 
-window_mode:
-    TOK_FLOATING    { $$ = TOK_FLOATING; }
-    | TOK_TILING    { $$ = TOK_TILING; }
-    | TOK_TOGGLE    { $$ = TOK_TOGGLE; }
+boolean:
+    TOK_ENABLE    { $$ = TOK_ENABLE; }
+    | TOK_DISABLE { $$ = TOK_DISABLE; }
+    | TOK_TOGGLE  { $$ = TOK_TOGGLE; }
     ;
 
 border:

diff --git a/testcases/t/32-move-workspace.t b/testcases/t/32-move-workspace.t
index affd18f27ab234e3d23cf06102e0c4f46af121e6..93bd4f8f8283e0b0dcca7f6a594bc4d47583aeca 100644 (file)
--- a/testcases/t/32-move-workspace.t
+++ b/testcases/t/32-move-workspace.t
@@ -47,7 +47,7 @@ $tmp2 = get_unused_workspace();
 cmd "workspace $tmp";
 
 cmd "open";
-cmd "mode toggle";
+cmd "floating toggle";
 
 my $ws = get_ws($tmp);
 is(@{$ws->{nodes}}, 0, 'no nodes on workspace');

diff --git a/testcases/t/46-floating-reinsert.t b/testcases/t/46-floating-reinsert.t
index b75c08e1e2aa748125ae5e3dfb9a770ef1a01d4d..a4e90d4d1bfa96202b80e8f52e55eac90db5b63c 100644 (file)
--- a/testcases/t/46-floating-reinsert.t
+++ b/testcases/t/46-floating-reinsert.t
@@ -54,10 +54,10 @@ is(@{$nodes->[1]->{nodes}}, 2, 'two windows in split con');
 # 2: make it tiling, see where it ends up
 #############################################################################
 
-cmd 'mode toggle';
+cmd 'floating toggle';
 
 my ($nodes, $focus) = get_ws_content($tmp);
 
-is(@{$nodes->[1]->{nodes}}, 3, 'three windows in split con after mode toggle');
+is(@{$nodes->[1]->{nodes}}, 3, 'three windows in split con after floating toggle');
 
 done_testing;

diff --git a/testcases/t/53-floating-originalsize.t b/testcases/t/53-floating-originalsize.t
index 166945933faa94faf9af29088715a4386f7e9c07..16e62c2078da89334c7f04788bd460b69c245bed 100644 (file)
--- a/testcases/t/53-floating-originalsize.t
+++ b/testcases/t/53-floating-originalsize.t
@@ -29,7 +29,7 @@ ok($window->mapped, 'Window is mapped');
 cmp_ok($absolute->{width}, '>', 400, 'i3 raised the width');
 cmp_ok($absolute->{height}, '>', 150, 'i3 raised the height');
 
-cmd 'mode toggle';
+cmd 'floating toggle';
 sleep 0.25;
 
 ($absolute, $top) = $window->rect;

diff --git a/testcases/t/55-floating-split-size.t b/testcases/t/55-floating-split-size.t
index 3ff1d8f372d66d9afba0cb9a830f26f7999008c7..c6f42b97f82562a4e2fd7aa00b1f81b571e9aebe 100644 (file)
--- a/testcases/t/55-floating-split-size.t
+++ b/testcases/t/55-floating-split-size.t
@@ -49,7 +49,7 @@ sleep 0.25;
 #####################################################################
 cmd 'nop setting floating';
 cmd 'focus parent';
-cmd 'mode floating';
+cmd 'floating enable';
 
 #####################################################################
 # Get geometry of the first floating node (the split container)