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

Implement inner gaps

Browse Source
This commit is contained in:
Isaac Freund 2020-04-05 18:31:55 +02:00
parent 259e554921
commit aef2245272
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/output.zig
View File

@ -79,7 +79,7 @@ pub const Output = struct {
// Begin the renderer (calls glViewport and some other GL sanity checks) // Begin the renderer (calls glViewport and some other GL sanity checks)
c.wlr_renderer_begin(renderer, width, height); c.wlr_renderer_begin(renderer, width, height);
const color = [_]f32{ 0.3, 0.3, 0.3, 1.0 }; const color = [_]f32{ 0.0, 0.16862745, 0.21176471, 1.0 };
c.wlr_renderer_clear(renderer, &color); c.wlr_renderer_clear(renderer, &color);
// The view has a position in layout coordinates. If you have two displays, // The view has a position in layout coordinates. If you have two displays,
@ -129,11 +129,13 @@ pub const Output = struct {
// If we have a stashed buffer, we are in the middle of a transaction // If we have a stashed buffer, we are in the middle of a transaction
// and need to render that buffer until the transaction is complete. // and need to render that buffer until the transaction is complete.
if (view.stashed_buffer) |buffer| { if (view.stashed_buffer) |buffer| {
const border_width = view.root.border_width;
const inner_gap_width = view.root.inner_gap_width;
var box = c.wlr_box{ var box = c.wlr_box{
.x = view.current_box.x + @intCast(i32, view.root.border_width), .x = view.current_box.x + @intCast(i32, border_width + inner_gap_width),
.y = view.current_box.y + @intCast(i32, view.root.border_width), .y = view.current_box.y + @intCast(i32, border_width + inner_gap_width),
.width = @intCast(c_int, view.current_box.width - view.root.border_width * 2), .width = @intCast(c_int, view.current_box.width - border_width * 2 - inner_gap_width * 2),
.height = @intCast(c_int, view.current_box.height - view.root.border_width * 2), .height = @intCast(c_int, view.current_box.height - border_width * 2 - inner_gap_width * 2),
}; };
// Scale the box to the output's current scaling factor // Scale the box to the output's current scaling factor
@ -194,9 +196,9 @@ pub const Output = struct {
var box = c.wlr_box{ var box = c.wlr_box{
.x = @floatToInt(c_int, rdata.ox) + view.current_box.x + sx + .x = @floatToInt(c_int, rdata.ox) + view.current_box.x + sx +
@intCast(c_int, view.root.border_width), @intCast(c_int, view.root.border_width + view.root.inner_gap_width),
.y = @floatToInt(c_int, rdata.oy) + view.current_box.y + sy + .y = @floatToInt(c_int, rdata.oy) + view.current_box.y + sy +
@intCast(c_int, view.root.border_width), @intCast(c_int, view.root.border_width + view.root.inner_gap_width),
.width = surface.current.width, .width = surface.current.width,
.height = surface.current.height, .height = surface.current.height,
}; };
@ -228,12 +230,13 @@ pub const Output = struct {
else else
[_]f32{ 0.34509804, 0.43137255, 0.45882353, 1.0 }; // Solarized base01 [_]f32{ 0.34509804, 0.43137255, 0.45882353, 1.0 }; // Solarized base01
const border_width = self.root.border_width; const border_width = self.root.border_width;
const inner_gap_width = self.root.inner_gap_width;
// left border // left border
border.x = @floatToInt(c_int, ox) + view.current_box.x; border.x = @floatToInt(c_int, ox) + view.current_box.x + @intCast(c_int, inner_gap_width);
border.y = @floatToInt(c_int, oy) + view.current_box.y; border.y = @floatToInt(c_int, oy) + view.current_box.y + @intCast(c_int, inner_gap_width);
border.width = @intCast(c_int, border_width); border.width = @intCast(c_int, border_width);
border.height = @intCast(c_int, view.current_box.height); border.height = @intCast(c_int, view.current_box.height - inner_gap_width * 2);
scaleBox(&border, self.wlr_output.scale); scaleBox(&border, self.wlr_output.scale);
c.wlr_render_rect( c.wlr_render_rect(
self.root.server.wlr_renderer, self.root.server.wlr_renderer,
@ -244,10 +247,10 @@ pub const Output = struct {
// right border // right border
border.x = @floatToInt(c_int, ox) + view.current_box.x + border.x = @floatToInt(c_int, ox) + view.current_box.x +
@intCast(c_int, view.current_box.width - border_width); @intCast(c_int, view.current_box.width - border_width - inner_gap_width);
border.y = @floatToInt(c_int, oy) + view.current_box.y; border.y = @floatToInt(c_int, oy) + view.current_box.y + @intCast(c_int, inner_gap_width);
border.width = @intCast(c_int, border_width); border.width = @intCast(c_int, border_width);
border.height = @intCast(c_int, view.current_box.height); border.height = @intCast(c_int, view.current_box.height - inner_gap_width * 2);
scaleBox(&border, self.wlr_output.scale); scaleBox(&border, self.wlr_output.scale);
c.wlr_render_rect( c.wlr_render_rect(
self.root.server.wlr_renderer, self.root.server.wlr_renderer,
@ -258,9 +261,11 @@ pub const Output = struct {
// top border // top border
border.x = @floatToInt(c_int, ox) + view.current_box.x + border.x = @floatToInt(c_int, ox) + view.current_box.x +
@intCast(c_int, border_width); @intCast(c_int, border_width + inner_gap_width);
border.y = @floatToInt(c_int, oy) + view.current_box.y; border.y = @floatToInt(c_int, oy) + view.current_box.y +
border.width = @intCast(c_int, view.current_box.width - border_width * 2); @intCast(c_int, inner_gap_width);
border.width = @intCast(c_int, view.current_box.width -
border_width * 2 - inner_gap_width * 2);
border.height = @intCast(c_int, border_width); border.height = @intCast(c_int, border_width);
scaleBox(&border, self.wlr_output.scale); scaleBox(&border, self.wlr_output.scale);
c.wlr_render_rect( c.wlr_render_rect(
@ -272,10 +277,11 @@ pub const Output = struct {
// bottom border // bottom border
border.x = @floatToInt(c_int, ox) + view.current_box.x + border.x = @floatToInt(c_int, ox) + view.current_box.x +
@intCast(c_int, border_width); @intCast(c_int, border_width + inner_gap_width);
border.y = @floatToInt(c_int, oy) + view.current_box.y + border.y = @floatToInt(c_int, oy) + view.current_box.y +
@intCast(c_int, view.current_box.height - border_width); @intCast(c_int, view.current_box.height - border_width - inner_gap_width);
border.width = @intCast(c_int, view.current_box.width - border_width * 2); border.width = @intCast(c_int, view.current_box.width -
border_width * 2 - inner_gap_width * 2);
border.height = @intCast(c_int, border_width); border.height = @intCast(c_int, border_width);
scaleBox(&border, self.wlr_output.scale); scaleBox(&border, self.wlr_output.scale);
c.wlr_render_rect( c.wlr_render_rect(

5
src/root.zig
View File

@ -37,6 +37,9 @@ pub const Root = struct {
/// Width of borders in pixels /// Width of borders in pixels
border_width: u32, border_width: u32,
/// Width of inner gaps in pixels
inner_gap_width: u32,
/// Number of pending configures sent in the current transaction. /// Number of pending configures sent in the current transaction.
/// A value of 0 means there is no current transaction. /// A value of 0 means there is no current transaction.
pending_configures: u32, pending_configures: u32,
@ -68,6 +71,8 @@ pub const Root = struct {
self.border_width = 4; self.border_width = 4;
self.inner_gap_width = 10;
self.pending_configures = 0; self.pending_configures = 0;
self.transaction_timer = null; self.transaction_timer = null;

4
src/view.zig
View File

@ -93,8 +93,8 @@ pub const View = struct {
if (self.pending_box) |pending_box| { if (self.pending_box) |pending_box| {
self.pending_serial = c.wlr_xdg_toplevel_set_size( self.pending_serial = c.wlr_xdg_toplevel_set_size(
self.wlr_xdg_surface, self.wlr_xdg_surface,
pending_box.width - self.root.border_width * 2, pending_box.width - self.root.border_width * 2 - self.root.inner_gap_width * 2,
pending_box.height - self.root.border_width * 2, pending_box.height - self.root.border_width * 2 - self.root.inner_gap_width * 2,
); );
} else { } else {
// TODO: log warning // TODO: log warning