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 /include | |
| parent | 3b05f92f76c3bd9400320844e485eb06e94772cd (diff) | |
| download | sway-5a13cb0ed136906a4370235214601b0129548c49.tar.xz | |
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 'include')
| -rw-r--r-- | include/border.h (renamed from include/render.h) | 5 | ||||
| -rw-r--r-- | include/config.h | 1 | ||||
| -rw-r--r-- | include/container.h | 17 |
3 files changed, 13 insertions, 10 deletions
diff --git a/include/render.h b/include/border.h index c3d1ca87..63cd63d2 100644 --- a/include/render.h +++ b/include/border.h @@ -1,9 +1,10 @@ -#ifndef _SWAY_RENDER_H -#define _SWAY_RENDER_H +#ifndef _SWAY_BORDER_H +#define _SWAY_BORDER_H #include <wlc/wlc.h> #include "container.h" void render_view_borders(wlc_handle view); void update_view_border(swayc_t *view); +int get_font_text_height(const char *font); #endif diff --git a/include/config.h b/include/config.h index a35cfd0a..fb84423c 100644 --- a/include/config.h +++ b/include/config.h @@ -184,6 +184,7 @@ struct sway_config { enum swayc_layouts default_orientation; enum swayc_layouts default_layout; char *font; + int font_height; // Flags bool focus_follows_mouse; diff --git a/include/container.h b/include/container.h index 07514c8a..26da851e 100644 --- a/include/container.h +++ b/include/container.h @@ -115,15 +115,16 @@ struct sway_container { * If this container's children include a fullscreen view, this is that view. */ struct sway_container *fullscreen; - /** - * If this container is a view, this may be set to the window's decoration - * buffer (or NULL). - */ - unsigned char *border; - enum swayc_border_types border_type; + /** + * If this container is a view, this may be set to the window's decoration + * buffer (or NULL). + */ + unsigned char *border; + enum swayc_border_types border_type; struct wlc_geometry border_geometry; - struct wlc_geometry presumed_geometry; - int border_thickness; + struct wlc_geometry title_bar_geometry; + struct wlc_geometry actual_geometry; + int border_thickness; }; enum visibility_mask { |