diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cairo.h | 2 | ||||
| -rw-r--r-- | include/pango.h | 14 | ||||
| -rw-r--r-- | include/sway/commands.h | 9 | ||||
| -rw-r--r-- | include/swaybar/bar.h | 1 | ||||
| -rw-r--r-- | include/swaylock/swaylock.h | 1 |
5 files changed, 17 insertions, 10 deletions
diff --git a/include/cairo.h b/include/cairo.h index 31672705..86530b60 100644 --- a/include/cairo.h +++ b/include/cairo.h @@ -2,8 +2,10 @@ #define _SWAY_CAIRO_H #include <stdint.h> #include <cairo/cairo.h> +#include <wlr/types/wlr_output.h> void cairo_set_source_u32(cairo_t *cairo, uint32_t color); +cairo_subpixel_order_t to_cairo_subpixel_order(enum wl_output_subpixel subpixel); cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image, int width, int height); diff --git a/include/pango.h b/include/pango.h index 09a535a5..6ab83c16 100644 --- a/include/pango.h +++ b/include/pango.h @@ -6,17 +6,13 @@ #include <cairo/cairo.h> #include <pango/pangocairo.h> -/* Utility function which escape characters a & < > ' ". +/** + * Utility function which escape characters a & < > ' ". * - * If the dest parameter is NULL, then the function returns the length of - * of the escaped src string. The dest_length doesn't matter. - * - * If the dest parameter is not NULL then the fuction escapes the src string - * an puts the escaped string in dest and returns the lenght of the escaped string. - * The dest_length parameter is the size of dest array. If the size of dest is not - * enough, then the function returns -1. + * The function returns the length of the escaped string, optionally writing the + * escaped string to dest if provided. */ -int escape_markup_text(const char *src, char *dest, int dest_length); +size_t escape_markup_text(const char *src, char *dest); PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, double scale, bool markup); void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, diff --git a/include/sway/commands.h b/include/sway/commands.h index 226cf932..1654eb48 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -4,6 +4,8 @@ #include <wlr/util/edges.h> #include "config.h" +struct sway_container; + typedef struct cmd_results *sway_cmd(int argc, char **argv); struct cmd_handler { @@ -50,8 +52,13 @@ struct cmd_handler *find_handler(char *line, struct cmd_handler *cmd_handlers, int handlers_size); /** * Parse and executes a command. + * + * If the command string contains criteria then the command will be executed on + * all matching containers. Otherwise, it'll run on the `con` container. If + * `con` is NULL then it'll run on the currently focused container. */ -struct cmd_results *execute_command(char *command, struct sway_seat *seat); +struct cmd_results *execute_command(char *command, struct sway_seat *seat, + struct sway_container *con); /** * Parse and handles a command during config file loading. * diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index 4065fb8b..29e96159 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h @@ -81,6 +81,7 @@ struct swaybar_output { uint32_t width, height; int32_t scale; + enum wl_output_subpixel subpixel; struct pool_buffer buffers[2]; struct pool_buffer *current_buffer; }; diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 950cfaaf..2f0cd34d 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -82,6 +82,7 @@ struct swaylock_surface { bool frame_pending, dirty; uint32_t width, height; int32_t scale; + enum wl_output_subpixel subpixel; char *output_name; struct wl_list link; }; |