Add binds to move views between outputs

4 files changed, 57 insertions, 1 deletions

diff --git a/src/command.zig b/src/command.zig
index 8abf288..01e9c33 100644
--- a/src/command.zig
+++ b/src/command.zig
@@ -23,6 +23,7 @@ pub usingnamespace @import("command/focus_tags.zig");
 pub usingnamespace @import("command/focus_view.zig");
 pub usingnamespace @import("command/modify_master_count.zig");
 pub usingnamespace @import("command/modify_master_factor.zig");
+pub usingnamespace @import("command/send_to_output.zig");
 pub usingnamespace @import("command/set_view_tags.zig");
 pub usingnamespace @import("command/spawn.zig");
 pub usingnamespace @import("command/toggle_tags.zig");
diff --git a/src/command/send_to_output.zig b/src/command/send_to_output.zig
new file mode 100644
index 0000000..55787a5
--- /dev/null
+++ b/src/command/send_to_output.zig
@@ -0,0 +1,41 @@
+const c = @import("../c.zig");
+const std = @import("std");
+
+const Arg = @import("../command.zig").Arg;
+const Output = @import("../output.zig").Output;
+const Seat = @import("../seat.zig").Seat;
+const ViewStack = @import("../view_stack.zig").ViewStack;
+const View = @import("../view.zig").View;
+
+/// Send the focused view to the the next or the previous output, depending on
+/// the bool passed. Does nothing if there is only one output.
+pub fn sendToOutput(seat: *Seat, arg: Arg) void {
+    @import("../log.zig").Log.Debug.log("send to output", .{});
+
+    const direction = arg.direction;
+    const root = &seat.input_manager.server.root;
+
+    if (seat.focused_view) |view| {
+        // If the noop output is focused, there is nowhere to send the view
+        if (seat.focused_output == &root.noop_output) {
+            std.debug.assert(root.outputs.len == 0);
+            return;
+        }
+
+        // Send to the next/preg output in the list if there is one, else wrap
+        const focused_node = @fieldParentPtr(std.TailQueue(Output).Node, "data", seat.focused_output);
+        const target_output = switch (direction) {
+            .Next => if (focused_node.next) |node| &node.data else &root.outputs.first.?.data,
+            .Prev => if (focused_node.prev) |node| &node.data else &root.outputs.last.?.data,
+        };
+
+        // Move the view to the target output
+        const view_node = @fieldParentPtr(ViewStack(View).Node, "view", view);
+        seat.focused_output.views.remove(view_node);
+        target_output.views.push(view_node);
+        view.output = target_output;
+
+        // Focus whatever's next in the focus stack
+        seat.focus(null);
+    }
+}
diff --git a/src/config.zig b/src/config.zig
index 01d217d..f09dc1a 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -174,5 +174,20 @@ pub const Config = struct {
             .command = command.focusOutput,
             .arg = .{ .direction = .Prev },
         });
+
+        // Mod+Shift+Period/Comma to send the focused view to the the
+        // next/previous output
+        try self.keybinds.append(Keybind{
+            .keysym = c.XKB_KEY_period,
+            .modifiers = mod | c.WLR_MODIFIER_SHIFT,
+            .command = command.sendToOutput,
+            .arg = .{ .direction = .Next },
+        });
+        try self.keybinds.append(Keybind{
+            .keysym = c.XKB_KEY_comma,
+            .modifiers = mod | c.WLR_MODIFIER_SHIFT,
+            .command = command.sendToOutput,
+            .arg = .{ .direction = .Prev },
+        });
     }
 };
diff --git a/src/seat.zig b/src/seat.zig
index e011579..179b93f 100644
--- a/src/seat.zig
+++ b/src/seat.zig
@@ -4,7 +4,6 @@ const c = @import("c.zig");
 const Cursor = @import("cursor.zig").Cursor;
 const InputManager = @import("input_manager.zig").InputManager;
 const Keyboard = @import("keyboard.zig").Keyboard;
-const Log = @import("log.zig").Log;
 const Output = @import("output.zig").Output;
 const View = @import("view.zig").View;
 const ViewStack = @import("view_stack.zig").ViewStack;