From: Steven Allen <steven@stebalien.com>
Date: Tue, 29 Jan 2013 08:05:23 +0000 (-0500)
Subject: Bugfix: Correctly parse `move ... workspace *_on_output`
X-Git-Tag: 4.5~31^2^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf830f69a2467b79454b6916ccfbbff45abf5418;p=i3%2Fi3

Bugfix: Correctly parse `move ... workspace *_on_output`

The parse spec for `move ... workspace ...`  ordered next/prev before
next_on_output/prev_on_output causing the parser to match next/prev
before next_on_output/prev_on_output.

Ticket: http://bugs.i3wm.org/report/ticket/941
---

diff --git a/parser-specs/commands.spec b/parser-specs/commands.spec
index c9b881b3..740c83ac 100644
--- a/parser-specs/commands.spec
+++ b/parser-specs/commands.spec
@@ -223,7 +223,7 @@ state RENAME_WORKSPACE_NEW_NAME:
       -> call cmd_rename_workspace($old_name, $new_name)
 
 # move <direction> [<pixels> [px]]
-# move [window|container] [to] workspace [<str>|next|prev|current]
+# move [window|container] [to] workspace [<str>|next|prev|next_on_output|prev_on_output|current]
 # move [window|container] [to] output <str>
 # move [window|container] [to] scratchpad
 # move workspace to [output] <str>
@@ -264,7 +264,7 @@ state MOVE_DIRECTION_PX:
 state MOVE_WORKSPACE:
   'to'
       -> MOVE_WORKSPACE_TO_OUTPUT
-  workspace = 'next', 'prev', 'next_on_output', 'prev_on_output', 'current'
+  workspace = 'next_on_output', 'prev_on_output', 'next', 'prev', 'current'
       -> call cmd_move_con_to_workspace($workspace)
   'back_and_forth'
       -> call cmd_move_con_to_workspace_back_and_forth()