diff options
Diffstat (limited to 'include/sway/config.h')
-rw-r--r-- | include/sway/config.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 9b583323..9d2e1bf9 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -49,6 +49,7 @@ struct sway_mode { | |||
49 | char *name; | 49 | char *name; |
50 | list_t *keysym_bindings; | 50 | list_t *keysym_bindings; |
51 | list_t *keycode_bindings; | 51 | list_t *keycode_bindings; |
52 | bool pango; | ||
52 | }; | 53 | }; |
53 | 54 | ||
54 | struct input_config_mapped_from_region { | 55 | struct input_config_mapped_from_region { |
@@ -73,9 +74,11 @@ struct input_config { | |||
73 | float pointer_accel; | 74 | float pointer_accel; |
74 | int repeat_delay; | 75 | int repeat_delay; |
75 | int repeat_rate; | 76 | int repeat_rate; |
77 | int scroll_button; | ||
76 | int scroll_method; | 78 | int scroll_method; |
77 | int send_events; | 79 | int send_events; |
78 | int tap; | 80 | int tap; |
81 | int tap_button_map; | ||
79 | 82 | ||
80 | char *xkb_layout; | 83 | char *xkb_layout; |
81 | char *xkb_model; | 84 | char *xkb_model; |
@@ -263,11 +266,10 @@ enum ipc_feature { | |||
263 | IPC_FEATURE_EVENT_WINDOW = 2048, | 266 | IPC_FEATURE_EVENT_WINDOW = 2048, |
264 | IPC_FEATURE_EVENT_BINDING = 4096, | 267 | IPC_FEATURE_EVENT_BINDING = 4096, |
265 | IPC_FEATURE_EVENT_INPUT = 8192, | 268 | IPC_FEATURE_EVENT_INPUT = 8192, |
266 | IPC_FEATURE_GET_CLIPBOARD = 16384, | 269 | IPC_FEATURE_GET_SEATS = 16384, |
267 | IPC_FEATURE_GET_SEATS = 32768, | ||
268 | 270 | ||
269 | IPC_FEATURE_ALL_COMMANDS = | 271 | IPC_FEATURE_ALL_COMMANDS = |
270 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384 | 32768, | 272 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384, |
271 | IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192, | 273 | IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192, |
272 | 274 | ||
273 | IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS, | 275 | IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS, |
@@ -314,6 +316,7 @@ struct sway_config { | |||
314 | char *font; | 316 | char *font; |
315 | size_t font_height; | 317 | size_t font_height; |
316 | bool pango_markup; | 318 | bool pango_markup; |
319 | size_t urgent_timeout; | ||
317 | 320 | ||
318 | // Flags | 321 | // Flags |
319 | bool focus_follows_mouse; | 322 | bool focus_follows_mouse; |
@@ -332,6 +335,7 @@ struct sway_config { | |||
332 | int gaps_outer; | 335 | int gaps_outer; |
333 | 336 | ||
334 | list_t *config_chain; | 337 | list_t *config_chain; |
338 | const char *current_config_path; | ||
335 | const char *current_config; | 339 | const char *current_config; |
336 | 340 | ||
337 | enum sway_container_border border; | 341 | enum sway_container_border border; |
@@ -447,8 +451,14 @@ void merge_output_config(struct output_config *dst, struct output_config *src); | |||
447 | void apply_output_config(struct output_config *oc, | 451 | void apply_output_config(struct output_config *oc, |
448 | struct sway_container *output); | 452 | struct sway_container *output); |
449 | 453 | ||
454 | struct output_config *store_output_config(struct output_config *oc); | ||
455 | |||
456 | void apply_output_config_to_outputs(struct output_config *oc); | ||
457 | |||
450 | void free_output_config(struct output_config *oc); | 458 | void free_output_config(struct output_config *oc); |
451 | 459 | ||
460 | void create_default_output_configs(void); | ||
461 | |||
452 | int workspace_output_cmp_workspace(const void *a, const void *b); | 462 | int workspace_output_cmp_workspace(const void *a, const void *b); |
453 | 463 | ||
454 | int sway_binding_cmp(const void *a, const void *b); | 464 | int sway_binding_cmp(const void *a, const void *b); |
@@ -484,7 +494,4 @@ void config_update_font_height(bool recalculate); | |||
484 | /* Global config singleton. */ | 494 | /* Global config singleton. */ |
485 | extern struct sway_config *config; | 495 | extern struct sway_config *config; |
486 | 496 | ||
487 | /* Config file currently being read */ | ||
488 | extern const char *current_config_path; | ||
489 | |||
490 | #endif | 497 | #endif |