diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-25 11:00:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-25 11:00:56 +0200 |
commit | c54097428a8f36e456d203d986d76702bd339066 (patch) | |
tree | ec248905f4c73d8f52c3e2c08ce26decbda2d704 /include | |
parent | Update wording about unmanaged/unmapped views (diff) | |
parent | Merge pull request #1861 from emersion/swaybar-memory-leaks (diff) | |
download | sway-c54097428a8f36e456d203d986d76702bd339066.tar.gz sway-c54097428a8f36e456d203d986d76702bd339066.tar.zst sway-c54097428a8f36e456d203d986d76702bd339066.zip |
Merge branch 'master' into criteria-commands
Diffstat (limited to 'include')
-rw-r--r-- | include/swaybar/bar.h | 2 | ||||
-rw-r--r-- | include/swaybar/config.h | 2 | ||||
-rw-r--r-- | include/swaybar/status_line.h | 1 | ||||
-rw-r--r-- | include/swaylock/seat.h | 1 | ||||
-rw-r--r-- | include/swaylock/swaylock.h | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index 0037190b..af478f33 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h | |||
@@ -79,4 +79,6 @@ void bar_setup(struct swaybar *bar, | |||
79 | void bar_run(struct swaybar *bar); | 79 | void bar_run(struct swaybar *bar); |
80 | void bar_teardown(struct swaybar *bar); | 80 | void bar_teardown(struct swaybar *bar); |
81 | 81 | ||
82 | void free_workspaces(struct wl_list *list); | ||
83 | |||
82 | #endif | 84 | #endif |
diff --git a/include/swaybar/config.h b/include/swaybar/config.h index 7f321df8..6739c28a 100644 --- a/include/swaybar/config.h +++ b/include/swaybar/config.h | |||
@@ -29,7 +29,7 @@ struct swaybar_config { | |||
29 | bool binding_mode_indicator; | 29 | bool binding_mode_indicator; |
30 | bool wrap_scroll; | 30 | bool wrap_scroll; |
31 | bool workspace_buttons; | 31 | bool workspace_buttons; |
32 | struct wl_list outputs; | 32 | struct wl_list outputs; // config_output::link |
33 | bool all_outputs; | 33 | bool all_outputs; |
34 | int height; | 34 | int height; |
35 | 35 | ||
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h index 3538f49c..bf12a842 100644 --- a/include/swaybar/status_line.h +++ b/include/swaybar/status_line.h | |||
@@ -73,5 +73,6 @@ void status_line_free(struct status_line *status); | |||
73 | bool i3bar_handle_readable(struct status_line *status); | 73 | bool i3bar_handle_readable(struct status_line *status); |
74 | void i3bar_block_send_click(struct status_line *status, | 74 | void i3bar_block_send_click(struct status_line *status, |
75 | struct i3bar_block *block, int x, int y, uint32_t button); | 75 | struct i3bar_block *block, int x, int y, uint32_t button); |
76 | void i3bar_block_free(struct i3bar_block *block); | ||
76 | 77 | ||
77 | #endif | 78 | #endif |
diff --git a/include/swaylock/seat.h b/include/swaylock/seat.h index 44bc37d5..180ea7a0 100644 --- a/include/swaylock/seat.h +++ b/include/swaylock/seat.h | |||
@@ -27,6 +27,7 @@ enum mask { | |||
27 | 27 | ||
28 | struct swaylock_xkb { | 28 | struct swaylock_xkb { |
29 | uint32_t modifiers; | 29 | uint32_t modifiers; |
30 | bool caps_lock; | ||
30 | struct xkb_state *state; | 31 | struct xkb_state *state; |
31 | struct xkb_context *context; | 32 | struct xkb_context *context; |
32 | struct xkb_keymap *keymap; | 33 | struct xkb_keymap *keymap; |
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index ed9fea19..07b908d7 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -11,7 +11,9 @@ | |||
11 | 11 | ||
12 | enum auth_state { | 12 | enum auth_state { |
13 | AUTH_STATE_IDLE, | 13 | AUTH_STATE_IDLE, |
14 | AUTH_STATE_CLEAR, | ||
14 | AUTH_STATE_INPUT, | 15 | AUTH_STATE_INPUT, |
16 | AUTH_STATE_INPUT_NOP, | ||
15 | AUTH_STATE_BACKSPACE, | 17 | AUTH_STATE_BACKSPACE, |
16 | AUTH_STATE_VALIDATING, | 18 | AUTH_STATE_VALIDATING, |
17 | AUTH_STATE_INVALID, | 19 | AUTH_STATE_INVALID, |