mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added bar_cmd_bindsym

Browse source 
Defined a sway_mouse_binding for clicks on the swaybar
This commit is contained in:
Yacine Hmito 2015-12-14 23:43:52 +01:00
parent 42a85431ee
commit 87126a9fc2
3 changed files with 81 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

42
sway/commands.c
View file

@ -65,6 +65,7 @@ static sway_cmd cmd_sticky;
static sway_cmd cmd_workspace;
static sway_cmd cmd_ws_auto_back_and_forth;
static sway_cmd bar_cmd_bindsym;
static sway_cmd bar_cmd_mode;
static sway_cmd bar_cmd_hidden_state;
static sway_cmd bar_cmd_id;
@ -1132,6 +1133,7 @@ static struct cmd_results *cmd_bar(int argc, char **argv) {
bar->hidden_state = strdup(config->bar.hidden_state);
bar->modifier = config->bar.modifier;
bar->position = config->bar.position;
bar->bindings = create_list();
bar->status_command = strdup(config->bar.status_command);
bar->font = strdup(config->bar.font);
bar->bar_height = config->bar.bar_height;
@ -1539,6 +1541,44 @@ static struct cmd_handler handlers[] = {
{ "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth },
};
static struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "bindsym", EXPECTED_MORE_THAN, 1))) {
return error;
} else if (!config->reading) {
return cmd_results_new(CMD_FAILURE, "bindsym", "Can only be used in config file.");
}
if (!config->current_bar) {
return cmd_results_new(CMD_FAILURE, "bindsym", "No bar defined.");
}
if (strlen(argv[1]) != 7) {
return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]);
}
uint32_t numbutton = (uint32_t)atoi(argv[1] + 6);
if (numbutton < 1 || numbutton > 5 || strncmp(argv[1], "button", 6) != 0) {
return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]);
}
struct sway_mouse_binding *binding = malloc(sizeof(struct sway_mouse_binding));
binding->button = numbutton;
binding->command = join_args(argv + 1, argc - 1);
struct bar_config *bar = config->current_bar;
int i = list_seq_find(bar->bindings, sway_mouse_binding_cmp_buttons, binding);
if (i > -1) {
sway_log(L_DEBUG, "bindsym - '%s' for swaybar already exists, overwriting", argv[0]);
struct sway_mouse_binding *dup = bar->bindings->items[i];
free_sway_mouse_binding(dup);
list_del(bar->bindings, i);
}
list_add(bar->bindings, binding);
list_sort(bar->bindings, sway_mouse_binding_cmp);
sway_log(L_DEBUG, "bindsym - Bound %s to command %s when clicking swaybar", argv[0], binding->command);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
static struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "hidden_state", EXPECTED_EQUAL_TO, 1))) {
@ -1723,7 +1763,7 @@ static struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
static struct cmd_handler bar_handlers[] = {
{ "binding_mode_indicator", NULL },
{ "bindsym", NULL },
{ "bindsym", bar_cmd_bindsym },
{ "colors", NULL },
{ "font", NULL },
{ "hidden_state", bar_cmd_hidden_state },