diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-03-29 14:47:30 +0200 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-03-30 00:47:58 +0200 |
commit | 5a13cb0ed136906a4370235214601b0129548c49 (patch) | |
tree | 51dce6cdcb9bb1ffe27dcdc9a01ca9bda3a7c87a /sway/handlers.c | |
parent | Add border <none|normal|toggle|pixel> config (diff) | |
download | sway-5a13cb0ed136906a4370235214601b0129548c49.tar.gz sway-5a13cb0ed136906a4370235214601b0129548c49.tar.zst sway-5a13cb0ed136906a4370235214601b0129548c49.zip |
Implement borders
The borders are implemented as a surface/buffer attached to each view
which is sent to and rendered by wlc in the view_pre_render callback.
All the drawing logic is handled in sway/border.c and all the logic for
calculating the geometry of the border/view is handled in
`update_geometry` in sway/layout.c (same place as gaps are calculated).
Diffstat (limited to 'sway/handlers.c')
-rw-r--r-- | sway/handlers.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 47b649fd..fc473640 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <ctype.h> | 9 | #include <ctype.h> |
10 | 10 | ||
11 | #include "handlers.h" | 11 | #include "handlers.h" |
12 | #include "render.h" | 12 | #include "border.h" |
13 | #include "log.h" | 13 | #include "log.h" |
14 | #include "layout.h" | 14 | #include "layout.h" |
15 | #include "config.h" | 15 | #include "config.h" |
@@ -349,15 +349,14 @@ static void handle_view_geometry_request(wlc_handle handle, const struct wlc_geo | |||
349 | view->desired_width = geometry->size.w; | 349 | view->desired_width = geometry->size.w; |
350 | view->desired_height = geometry->size.h; | 350 | view->desired_height = geometry->size.h; |
351 | 351 | ||
352 | if (view->is_floating) { | 352 | /* if (view->is_floating) { */ |
353 | view->width = view->desired_width; | 353 | /* view->width = view->desired_width; */ |
354 | view->height = view->desired_height; | 354 | /* view->height = view->desired_height; */ |
355 | view->x = geometry->origin.x; | 355 | /* view->x = geometry->origin.x; */ |
356 | view->y = geometry->origin.y; | 356 | /* view->y = geometry->origin.y; */ |
357 | arrange_windows(view->parent, -1, -1); | 357 | /* /1* arrange_windows(view->parent, -1, -1); *1/ */ |
358 | } | 358 | /* } */ |
359 | } | 359 | } |
360 | update_view_border(view); | ||
361 | } | 360 | } |
362 | 361 | ||
363 | static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit state, bool toggle) { | 362 | static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit state, bool toggle) { |