aboutsummaryrefslogtreecommitdiff
path: root/src/command
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-04-18 13:41:04 +0200
committerIsaac Freund <ifreund@ifreund.xyz>2020-04-18 13:41:04 +0200
commit64a3b72a1cca547eecc52ba33e832c7b1700b31b (patch)
tree1e19a3fb9b7e35ca34619b9cc787589fce9165a2 /src/command
parente0c6b5bf729be8596c412bf401b8d4cf218cdda6 (diff)
downloadriver-64a3b72a1cca547eecc52ba33e832c7b1700b31b.tar.gz
river-64a3b72a1cca547eecc52ba33e832c7b1700b31b.tar.xz
Split up commands into separate files
Diffstat (limited to 'src/command')
-rw-r--r--src/command/close_view.zig11
-rw-r--r--src/command/exit_compositor.zig9
-rw-r--r--src/command/focus_output.zig27
-rw-r--r--src/command/focus_tags.zig11
-rw-r--r--src/command/focus_view.zig37
-rw-r--r--src/command/modify_master_count.zig16
-rw-r--r--src/command/modify_master_factor.zig19
-rw-r--r--src/command/set_view_tags.zig15
-rw-r--r--src/command/spawn.zig21
-rw-r--r--src/command/toggle_tags.zig15
-rw-r--r--src/command/toggle_view_tags.zig16
-rw-r--r--src/command/zoom.zig20
12 files changed, 217 insertions, 0 deletions
diff --git a/src/command/close_view.zig b/src/command/close_view.zig
new file mode 100644
index 0000000..b0f03b9
--- /dev/null
+++ b/src/command/close_view.zig
@@ -0,0 +1,11 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Close the focused view, if any.
+pub fn close_view(seat: *Seat, arg: Arg) void {
+ if (seat.focused_view) |view| {
+ view.close();
+ }
+}
diff --git a/src/command/exit_compositor.zig b/src/command/exit_compositor.zig
new file mode 100644
index 0000000..ff620ee
--- /dev/null
+++ b/src/command/exit_compositor.zig
@@ -0,0 +1,9 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Exit the compositor, terminating the wayland session.
+pub fn exitCompositor(seat: *Seat, arg: Arg) void {
+ c.wl_display_terminate(seat.input_manager.server.wl_display);
+}
diff --git a/src/command/focus_output.zig b/src/command/focus_output.zig
new file mode 100644
index 0000000..368bb96
--- /dev/null
+++ b/src/command/focus_output.zig
@@ -0,0 +1,27 @@
+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;
+
+/// Focus either the next or the previous output, depending on the bool passed.
+/// Does nothing if there is only one output.
+pub fn focusOutput(seat: *Seat, arg: Arg) void {
+ const direction = arg.direction;
+ const root = &seat.input_manager.server.root;
+ // If the noop output is focused, there are no other outputs to switch to
+ if (seat.focused_output == &root.noop_output) {
+ std.debug.assert(root.outputs.len == 0);
+ return;
+ }
+
+ // Focus the next/prev output in the list if there is one, else wrap
+ const focused_node = @fieldParentPtr(std.TailQueue(Output).Node, "data", seat.focused_output);
+ seat.focused_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,
+ };
+
+ seat.focus(null);
+}
diff --git a/src/command/focus_tags.zig b/src/command/focus_tags.zig
new file mode 100644
index 0000000..941a129
--- /dev/null
+++ b/src/command/focus_tags.zig
@@ -0,0 +1,11 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Switch focus to the passed tags.
+pub fn focusTags(seat: *Seat, arg: Arg) void {
+ const tags = arg.uint;
+ seat.focused_output.pending_focused_tags = tags;
+ seat.input_manager.server.root.arrange();
+}
diff --git a/src/command/focus_view.zig b/src/command/focus_view.zig
new file mode 100644
index 0000000..ec51b83
--- /dev/null
+++ b/src/command/focus_view.zig
@@ -0,0 +1,37 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+const View = @import("../view.zig").View;
+const ViewStack = @import("../view_stack.zig").ViewStack;
+
+/// Focus either the next or the previous visible view, depending on the enum
+/// passed. Does nothing if there are 1 or 0 views in the stack.
+pub fn focusView(seat: *Seat, arg: Arg) void {
+ const direction = arg.direction;
+ const output = seat.focused_output;
+ if (seat.focused_view) |current_focus| {
+ // If there is a currently focused view, focus the next visible view in the stack.
+ const focused_node = @fieldParentPtr(ViewStack(View).Node, "view", current_focus);
+ var it = switch (direction) {
+ .Next => ViewStack(View).iterator(focused_node, output.current_focused_tags),
+ .Prev => ViewStack(View).reverseIterator(focused_node, output.current_focused_tags),
+ };
+
+ // Skip past the focused node
+ _ = it.next();
+ // Focus the next visible node if there is one
+ if (it.next()) |node| {
+ seat.focus(&node.view);
+ return;
+ }
+ }
+
+ // There is either no currently focused view or the last visible view in the
+ // stack is focused and we need to wrap.
+ var it = switch (direction) {
+ .Next => ViewStack(View).iterator(output.views.first, output.current_focused_tags),
+ .Prev => ViewStack(View).reverseIterator(output.views.last, output.current_focused_tags),
+ };
+ seat.focus(if (it.next()) |node| &node.view else null);
+}
diff --git a/src/command/modify_master_count.zig b/src/command/modify_master_count.zig
new file mode 100644
index 0000000..6c64091
--- /dev/null
+++ b/src/command/modify_master_count.zig
@@ -0,0 +1,16 @@
+const c = @import("../c.zig");
+const std = @import("std");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Modify the number of master views
+pub fn modifyMasterCount(seat: *Seat, arg: Arg) void {
+ const delta = arg.int;
+ const output = seat.focused_output;
+ output.master_count = @intCast(
+ u32,
+ std.math.max(0, @intCast(i32, output.master_count) + delta),
+ );
+ seat.input_manager.server.root.arrange();
+}
diff --git a/src/command/modify_master_factor.zig b/src/command/modify_master_factor.zig
new file mode 100644
index 0000000..c522485
--- /dev/null
+++ b/src/command/modify_master_factor.zig
@@ -0,0 +1,19 @@
+const c = @import("../c.zig");
+const std = @import("std");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Modify the percent of the width of the screen that the master views occupy.
+pub fn modifyMasterFactor(seat: *Seat, arg: Arg) void {
+ const delta = arg.float;
+ const output = seat.focused_output;
+ const new_master_factor = std.math.min(
+ std.math.max(output.master_factor + delta, 0.05),
+ 0.95,
+ );
+ if (new_master_factor != output.master_factor) {
+ output.master_factor = new_master_factor;
+ seat.input_manager.server.root.arrange();
+ }
+}
diff --git a/src/command/set_view_tags.zig b/src/command/set_view_tags.zig
new file mode 100644
index 0000000..7bc4d87
--- /dev/null
+++ b/src/command/set_view_tags.zig
@@ -0,0 +1,15 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Set the tags of the focused view.
+pub fn setViewTags(seat: *Seat, arg: Arg) void {
+ const tags = arg.uint;
+ if (seat.focused_view) |view| {
+ if (view.current_tags != tags) {
+ view.pending_tags = tags;
+ seat.input_manager.server.root.arrange();
+ }
+ }
+}
diff --git a/src/command/spawn.zig b/src/command/spawn.zig
new file mode 100644
index 0000000..495cb94
--- /dev/null
+++ b/src/command/spawn.zig
@@ -0,0 +1,21 @@
+const c = @import("../c.zig");
+const std = @import("std");
+
+const Arg = @import("../command.zig").Arg;
+const Log = @import("../log.zig").Log;
+const Seat = @import("../seat.zig").Seat;
+
+/// Spawn a program.
+pub fn spawn(seat: *Seat, arg: Arg) void {
+ const cmd = arg.str;
+
+ const argv = [_][]const u8{ "/bin/sh", "-c", cmd };
+ const child = std.ChildProcess.init(&argv, std.heap.c_allocator) catch |err| {
+ Log.Error.log("Failed to execute {}: {}", .{ cmd, err });
+ return;
+ };
+ std.ChildProcess.spawn(child) catch |err| {
+ Log.Error.log("Failed to execute {}: {}", .{ cmd, err });
+ return;
+ };
+}
diff --git a/src/command/toggle_tags.zig b/src/command/toggle_tags.zig
new file mode 100644
index 0000000..16bf4e5
--- /dev/null
+++ b/src/command/toggle_tags.zig
@@ -0,0 +1,15 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Toggle focus of the passsed tags.
+pub fn toggleTags(seat: *Seat, arg: Arg) void {
+ const tags = arg.uint;
+ const output = seat.focused_output;
+ const new_focused_tags = output.current_focused_tags ^ tags;
+ if (new_focused_tags != 0) {
+ output.pending_focused_tags = new_focused_tags;
+ seat.input_manager.server.root.arrange();
+ }
+}
diff --git a/src/command/toggle_view_tags.zig b/src/command/toggle_view_tags.zig
new file mode 100644
index 0000000..a4845f1
--- /dev/null
+++ b/src/command/toggle_view_tags.zig
@@ -0,0 +1,16 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+
+/// Toggle the passed tags of the focused view
+pub fn toggleViewTags(seat: *Seat, arg: Arg) void {
+ const tags = arg.uint;
+ if (seat.focused_view) |view| {
+ const new_tags = view.current_tags ^ tags;
+ if (new_tags != 0) {
+ view.pending_tags = new_tags;
+ seat.input_manager.server.root.arrange();
+ }
+ }
+}
diff --git a/src/command/zoom.zig b/src/command/zoom.zig
new file mode 100644
index 0000000..507620d
--- /dev/null
+++ b/src/command/zoom.zig
@@ -0,0 +1,20 @@
+const c = @import("../c.zig");
+
+const Arg = @import("../command.zig").Arg;
+const Seat = @import("../seat.zig").Seat;
+const View = @import("../view.zig").View;
+const ViewStack = @import("../view_stack.zig").ViewStack;
+
+/// Bump the focused view to the top of the stack.
+/// TODO: if the top of the stack is focused, bump the next visible view.
+pub fn zoom(seat: *Seat, arg: Arg) void {
+ if (seat.focused_view) |current_focus| {
+ const output = seat.focused_output;
+ const node = @fieldParentPtr(ViewStack(View).Node, "view", current_focus);
+ if (node != output.views.first) {
+ output.views.remove(node);
+ output.views.push(node);
+ seat.input_manager.server.root.arrange();
+ }
+ }
+}