Add binds to move views between outputs
This commit is contained in:
		@ -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");
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										41
									
								
								src/command/send_to_output.zig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								src/command/send_to_output.zig
									
									
									
									
									
										Normal file
									
								
							@ -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);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@ -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 },
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -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;
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user