nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-01-30 13:30:59 +01:00
parent 3e59a8c949 29c027db3b
commit fcdfab4d28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser-specs/commands.spec
View File

@ -223,7 +223,7 @@ state RENAME_WORKSPACE_NEW_NAME:
-> call cmd_rename_workspace($old_name, $new_name) -> call cmd_rename_workspace($old_name, $new_name)
# move <direction> [<pixels> [px]] # 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] output <str>
# move [window|container] [to] scratchpad # move [window|container] [to] scratchpad
# move workspace to [output] <str> # move workspace to [output] <str>
@ -264,7 +264,7 @@ state MOVE_DIRECTION_PX:
state MOVE_WORKSPACE: state MOVE_WORKSPACE:
'to' 'to'
-> MOVE_WORKSPACE_TO_OUTPUT -> 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) -> call cmd_move_con_to_workspace($workspace)
'back_and_forth' 'back_and_forth'
-> call cmd_move_con_to_workspace_back_and_forth() -> call cmd_move_con_to_workspace_back_and_forth()