mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 19:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

bar_cmd_modifier: add support for none

Browse source 
sway-bar(5) documents `modifier none`, which comes from i3. This
implements the functionality for `modifier none` since it was not
previously implemented. The bar modifier toggles visibility of the bar
when the bar mode is set to hide. When the bar modifier is set to
`none`, the ability to toggle visibility of the bar will be disabled.
This commit is contained in:
Brian Ashworth 2019-02-06 22:00:29 -05:00 committed by Drew DeVault
parent 32f790bd15
commit 4339ba6424
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/commands/bar/modifier.c
View file

@ -15,19 +15,26 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
} }
uint32_t mod = 0; uint32_t mod = 0;
list_t *split = split_string(argv[0], "+"); if (strcmp(argv[0], "none") != 0) {
for (int i = 0; i < split->length; ++i) { list_t *split = split_string(argv[0], "+");
uint32_t tmp_mod; for (int i = 0; i < split->length; ++i) {
if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) { uint32_t tmp_mod;
mod |= tmp_mod; if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) {
} else { mod |= tmp_mod;
error = cmd_results_new(CMD_INVALID, } else if (strcmp(split->items[i], "none") == 0) {
"Unknown modifier '%s'", (char *)split->items[i]); error = cmd_results_new(CMD_INVALID,
list_free_items_and_destroy(split); "none cannot be used along with other modifiers");
return error; list_free_items_and_destroy(split);
return error;
} else {
error = cmd_results_new(CMD_INVALID,
"Unknown modifier '%s'", (char *)split->items[i]);
list_free_items_and_destroy(split);
return error;
}
} }
list_free_items_and_destroy(split);
} }
list_free_items_and_destroy(split);
config->current_bar->modifier = mod; config->current_bar->modifier = mod;
sway_log(SWAY_DEBUG, sway_log(SWAY_DEBUG,
"Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]);

3
sway/input/keyboard.c
View file

@ -425,7 +425,8 @@ static void determine_bar_visibility(uint32_t modifiers) {
for (int i = 0; i < config->bars->length; ++i) { for (int i = 0; i < config->bars->length; ++i) {
struct bar_config *bar = config->bars->items[i]; struct bar_config *bar = config->bars->items[i];
if (strcmp(bar->mode, bar->hidden_state) == 0) { // both are "hide" if (strcmp(bar->mode, bar->hidden_state) == 0) { // both are "hide"
bool should_be_visible = (~modifiers & bar->modifier) == 0; bool should_be_visible =
bar->modifier != 0 && (~modifiers & bar->modifier) == 0;
if (bar->visible_by_modifier != should_be_visible) { if (bar->visible_by_modifier != should_be_visible) {
bar->visible_by_modifier = should_be_visible; bar->visible_by_modifier = should_be_visible;
ipc_event_bar_state_update(bar); ipc_event_bar_state_update(bar);