pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

Add support binding on-click handlers to other buttons than LEFT

Browse source 
One can now bind the left/middle/right mouse buttons to on-click. In
fact, you can have all three buttons bound to different handlers for
the same particle. The new syntax is

    on-click:
        left: <command>
        middle: <command>
        right: <command>

Leaving one out is the same thing as not mapping it at
all. Furthermore,

    on-click: <command>

is still valid, and is a shorthand for

    on-click:
        left: <commsnd>
This commit is contained in:
Daniel Eklöf 2021-06-22 19:04:13 +02:00
parent af163d3f77
commit c79ffbe057
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
15 changed files with 163 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

19
particles/progress-bar.c
View file

@ -148,7 +148,9 @@ on_mouse(struct exposable *exposable, struct bar *bar, enum mouse_event event,
}
/* Remember the original handler, so that we can restore it */
char *original = exposable->on_click;
char *original[MOUSE_BTN_COUNT];
for (size_t i = 0; i < MOUSE_BTN_COUNT; i++)
original[i] = exposable->on_click[i];
if (event == ON_MOUSE_CLICK) {
long where = clickable_width > 0
@ -160,7 +162,9 @@ on_mouse(struct exposable *exposable, struct bar *bar, enum mouse_event event,
.count = 1,
};
exposable->on_click = tags_expand_template(exposable->on_click, &tags);
tags_expand_templates(
exposable->on_click, (const char **)exposable->on_click,
MOUSE_BTN_COUNT, &tags);
tag_set_destroy(&tags);
}
@ -169,8 +173,10 @@ on_mouse(struct exposable *exposable, struct bar *bar, enum mouse_event event,
if (event == ON_MOUSE_CLICK) {
/* Reset handler string */
free(exposable->on_click);
exposable->on_click = original;
for (size_t i = 0; i < MOUSE_BTN_COUNT; i++) {
free(exposable->on_click[i]);
exposable->on_click[i] = original[i];
}
}
}
@ -213,10 +219,7 @@ instantiate(const struct particle *particle, const struct tag_set *tags)
for (size_t i = 0; i < epriv->count; i++)
assert(epriv->exposables[i] != NULL);
char *on_click = tags_expand_template(particle->on_click_template, tags);
struct exposable *exposable = exposable_common_new(particle, on_click);
free(on_click);
struct exposable *exposable = exposable_common_new(particle, tags);
exposable->private = epriv;
exposable->destroy = &exposable_destroy;