Update TODO, fix parsing in commandmode for moving windows to workspaces vs. switching

diff --git a/TODO b/TODO
index 70023cfe06e644cf0b0e9a8a1b8be24d74f5a61e..2cefe03f5aa3d92848d0fad0408b142cdf3a1cae 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,8 @@
 TODO list, in order of importance:
 
+ * Implement moving windows to other workspaces (see src/command.c)
+ * When at the edge of a screen and wanting to change into the direction of the edge,
+   i3 should switch to the next screen (if any) in this direction.
  * document stuff!
  * more documentation!
  * debian package

diff --git a/src/commands.c b/src/commands.c
index e583b0ab80b4fe42908207bf78ba92d49cfd8512..30a0ac0885633188c63d12aa55db4a23e3249df8 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -386,10 +386,6 @@ void parse_command(xcb_connection_t *conn, const char *command) {
                 printf("Invalid command (\"%s\")\n", command);
                 return;
         }
-        if (*rest == 'm' || *rest == 's') {
-                action = (*rest == 'm' ? ACTION_MOVE : ACTION_SNAP);
-                rest++;
-        }
 
         if (*rest == '\0') {
                 /* No rest? This was a tag number, not a times specification */
@@ -397,6 +393,11 @@ void parse_command(xcb_connection_t *conn, const char *command) {
                 return;
         }
 
+        if (*rest == 'm' || *rest == 's') {
+                action = (*rest == 'm' ? ACTION_MOVE : ACTION_SNAP);
+                rest++;
+        }
+
         /* Now perform action to <where> */
         while (*rest != '\0') {
                 if (*rest == 'h')