mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-02 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into criteria-commands

Browse source
This commit is contained in:
Drew DeVault 2018-04-25 11:00:56 +02:00 • committed by GitHub
commit c54097428a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 112 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/swaybar/bar.h
View file

@ -79,4 +79,6 @@ void bar_setup(struct swaybar *bar,
void bar_run(struct swaybar *bar);
void bar_teardown(struct swaybar *bar);
void free_workspaces(struct wl_list *list);
#endif

2
include/swaybar/config.h
View file

@ -29,7 +29,7 @@ struct swaybar_config {
bool binding_mode_indicator;
bool wrap_scroll;
bool workspace_buttons;
struct wl_list outputs;
struct wl_list outputs; // config_output::link
bool all_outputs;
int height;

1
include/swaybar/status_line.h
View file

@ -73,5 +73,6 @@ void status_line_free(struct status_line *status);
bool i3bar_handle_readable(struct status_line *status);
void i3bar_block_send_click(struct status_line *status,
struct i3bar_block *block, int x, int y, uint32_t button);
void i3bar_block_free(struct i3bar_block *block);
#endif

1
include/swaylock/seat.h
View file

@ -27,6 +27,7 @@ enum mask {
struct swaylock_xkb {
uint32_t modifiers;
bool caps_lock;
struct xkb_state *state;
struct xkb_context *context;
struct xkb_keymap *keymap;

2
include/swaylock/swaylock.h
View file

@ -11,7 +11,9 @@
enum auth_state {
AUTH_STATE_IDLE,
AUTH_STATE_CLEAR,
AUTH_STATE_INPUT,
AUTH_STATE_INPUT_NOP,
AUTH_STATE_BACKSPACE,
AUTH_STATE_VALIDATING,
AUTH_STATE_INVALID,