Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove len field from ViewStack

Browse Source 
This is misleading as unmapped views should be ignored
This commit is contained in:
Isaac Freund 2020-04-04 16:26:13 +02:00
parent 6c8e7c14f7
commit 424a16fe94
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server.zig
View File

@ -119,16 +119,16 @@ pub const Server = struct {
if (modifiers & @intCast(u32, c.WLR_MODIFIER_SHIFT) != 0) { if (modifiers & @intCast(u32, c.WLR_MODIFIER_SHIFT) != 0) {
switch (sym) { switch (sym) {
c.XKB_KEY_H => { c.XKB_KEY_H => {
if (self.root.master_count < self.root.views.len) { //if (self.root.master_count < self.root.views.len) {
self.root.master_count += 1; self.root.master_count += 1;
self.root.arrange(); self.root.arrange();
} //}
}, },
c.XKB_KEY_L => { c.XKB_KEY_L => {
if (self.root.master_count > 0) { //if (self.root.master_count > 0) {
self.root.master_count -= 1; self.root.master_count -= 1;
self.root.arrange(); self.root.arrange();
} //}
}, },
c.XKB_KEY_Return => { c.XKB_KEY_Return => {
// Spawn an instance of alacritty // Spawn an instance of alacritty

17
src/view_stack.zig
View File

@ -18,14 +18,10 @@ pub const ViewStack = struct {
first: ?*Node, first: ?*Node,
last: ?*Node, last: ?*Node,
/// Total number of views
len: u32,
/// Initialize an undefined stack /// Initialize an undefined stack
pub fn init(self: *Self) void { pub fn init(self: *Self) void {
self.first = null; self.first = null;
self.last = null; self.last = null;
self.len = 0;
} }
/// Add a node to the top of the stack. /// Add a node to the top of the stack.
@ -43,9 +39,8 @@ pub const ViewStack = struct {
self.last = new_node; self.last = new_node;
} }
// Set the first pointer to the new node and increment length // Set the first pointer to the new node
self.first = new_node; self.first = new_node;
self.len += 1;
} }
/// Remove a node from the view stack. This removes it from the stack of /// Remove a node from the view stack. This removes it from the stack of
@ -64,8 +59,6 @@ pub const ViewStack = struct {
} else { } else {
self.last = target_node.prev; self.last = target_node.prev;
} }
self.len -= 1;
} }
const Iterator = struct { const Iterator = struct {
@ -151,13 +144,11 @@ test "push/remove" {
const five = try allocator.create(ViewStack.Node); const five = try allocator.create(ViewStack.Node);
defer allocator.destroy(five); defer allocator.destroy(five);
testing.expect(views.len == 0);
views.push(three); // {3} views.push(three); // {3}
views.push(one); // {1, 3} views.push(one); // {1, 3}
views.push(four); // {4, 1, 3} views.push(four); // {4, 1, 3}
views.push(five); // {5, 4, 1, 3} views.push(five); // {5, 4, 1, 3}
views.push(two); // {2, 5, 4, 1, 3} views.push(two); // {2, 5, 4, 1, 3}
testing.expect(views.len == 5);
// Simple insertion // Simple insertion
{ {
@ -174,7 +165,6 @@ test "push/remove" {
it = it.?.next; it = it.?.next;
testing.expect(it == null); testing.expect(it == null);
testing.expect(views.len == 5);
testing.expect(views.first == two); testing.expect(views.first == two);
testing.expect(views.last == three); testing.expect(views.last == three);
@ -194,7 +184,6 @@ test "push/remove" {
it = it.?.next; it = it.?.next;
testing.expect(it == null); testing.expect(it == null);
testing.expect(views.len == 4);
testing.expect(views.first == five); testing.expect(views.first == five);
testing.expect(views.last == three); testing.expect(views.last == three);
@ -212,7 +201,6 @@ test "push/remove" {
it = it.?.next; it = it.?.next;
testing.expect(it == null); testing.expect(it == null);
testing.expect(views.len == 3);
testing.expect(views.first == five); testing.expect(views.first == five);
testing.expect(views.last == one); testing.expect(views.last == one);
@ -228,7 +216,6 @@ test "push/remove" {
it = it.?.next; it = it.?.next;
testing.expect(it == null); testing.expect(it == null);
testing.expect(views.len == 2);
testing.expect(views.first == five); testing.expect(views.first == five);
testing.expect(views.last == one); testing.expect(views.last == one);
@ -252,7 +239,6 @@ test "push/remove" {
it = it.?.next; it = it.?.next;
testing.expect(it == null); testing.expect(it == null);
testing.expect(views.len == 5);
testing.expect(views.first == four); testing.expect(views.first == four);
testing.expect(views.last == one); testing.expect(views.last == one);
@ -267,7 +253,6 @@ test "push/remove" {
testing.expect(views.first == null); testing.expect(views.first == null);
testing.expect(views.last == null); testing.expect(views.last == null);
testing.expect(views.len == 0);
} }
test "iteration" { test "iteration" {