diff options
Diffstat (limited to 'src/blocks')
| -rw-r--r-- | src/blocks/fs.c | 2 | ||||
| -rw-r--r-- | src/blocks/slider.c | 41 |
2 files changed, 22 insertions, 21 deletions
diff --git a/src/blocks/fs.c b/src/blocks/fs.c index 1f92776..f7feeeb 100644 --- a/src/blocks/fs.c +++ b/src/blocks/fs.c @@ -175,7 +175,7 @@ static int block_fs_validate(block_t *block, config_t *config) } static const config_entry_t block_fs_entries[] = { - { "path", CONFIG_STRING, NULL, offsetof(block_fs_t, path) }, + { "path", CONFIG_STRING, NULL, NULL, offsetof(block_fs_t, path) }, { 0 }, }; diff --git a/src/blocks/slider.c b/src/blocks/slider.c index 5246162..fe8ee28 100644 --- a/src/blocks/slider.c +++ b/src/blocks/slider.c @@ -190,6 +190,7 @@ static void block_slider_event(layout_t *layout, config_t *config, event_t event int bar_width = slider->width; int bar_height = slider->height; + // NOTE: Consider disabling these actions for non seekable sliders bool clicked = check_capsule(event.x, event.y, bar_x, bar_y, bar_width, bar_height); action_t *action = layout->block->actions[event.type]; @@ -307,26 +308,26 @@ static config_enum_t knob_shape_enum[] = { static const config_entry_t block_slider_entries[] = { // TODO: Ugly names - { "bar-color", CONFIG_GRADIENT, NULL, offsetof(block_slider_t, bar_color) }, - { "bar-line-color", CONFIG_GRADIENT, NULL, offsetof(block_slider_t, line_color) }, - { "bar-bg-color", CONFIG_GRADIENT, NULL, offsetof(block_slider_t, bg_color) }, - { "bar-height", CONFIG_UINT, NULL, offsetof(block_slider_t, height) }, - { "bar-width", CONFIG_UINT, NULL, offsetof(block_slider_t, width) }, - { "bar-line-width", CONFIG_UINT, NULL, offsetof(block_slider_t, line_width) }, - { "bar-value", CONFIG_INT, NULL, offsetof(block_slider_t, value) }, - { "seekable", CONFIG_BOOL, NULL, offsetof(block_slider_t, seekable) }, - { "knob", CONFIG_ENUM, knob_shape_enum, offsetof(block_slider_t, knob) }, - { "knob-height", CONFIG_UINT, NULL, offsetof(block_slider_t, knob_height) }, - { "knob-width", CONFIG_UINT, NULL, offsetof(block_slider_t, knob_width) }, - { "knob-line-width", CONFIG_UINT, NULL, offsetof(block_slider_t, knob_line_width) }, - { "knob-color", CONFIG_GRADIENT, NULL, offsetof(block_slider_t, knob_color) }, - { "knob-line-color", CONFIG_GRADIENT, NULL, offsetof(block_slider_t, knob_line_color) }, - { "knob-x-offset", CONFIG_INT, NULL, offsetof(block_slider_t, knob_x_offset) }, - { "knob-y-offset", CONFIG_INT, NULL, offsetof(block_slider_t, knob_y_offset) }, - { "knob-rotation", CONFIG_DOUBLE, NULL, offsetof(block_slider_t, knob_rotation) }, - { "left-click-bar", CONFIG_STRING, NULL, offsetof(block_slider_t, left_click) }, - { "middle-click-bar", CONFIG_STRING, NULL, offsetof(block_slider_t, middle_click) }, - { "right-click-bar", CONFIG_STRING, NULL, offsetof(block_slider_t, right_click) }, + { "bar-color", CONFIG_GRADIENT, NULL, NULL, offsetof(block_slider_t, bar_color) }, + { "bar-line-color", CONFIG_GRADIENT, NULL, NULL, offsetof(block_slider_t, line_color) }, + { "bar-bg-color", CONFIG_GRADIENT, NULL, NULL, offsetof(block_slider_t, bg_color) }, + { "bar-height", CONFIG_UINT, NULL, NULL, offsetof(block_slider_t, height) }, + { "bar-width", CONFIG_UINT, NULL, NULL, offsetof(block_slider_t, width) }, + { "bar-line-width", CONFIG_UINT, NULL, NULL, offsetof(block_slider_t, line_width) }, + { "bar-value", CONFIG_INT, NULL, NULL, offsetof(block_slider_t, value) }, + { "seekable", CONFIG_BOOL, NULL, NULL, offsetof(block_slider_t, seekable) }, + { "knob", CONFIG_ENUM, knob_shape_enum, NULL, offsetof(block_slider_t, knob) }, + { "knob-height", CONFIG_UINT, NULL, NULL, offsetof(block_slider_t, knob_height) }, + { "knob-width", CONFIG_UINT, NULL, NULL, offsetof(block_slider_t, knob_width) }, + { "knob-line-width", CONFIG_UINT, NULL, NULL, offsetof(block_slider_t, knob_line_width) }, + { "knob-color", CONFIG_GRADIENT, NULL, NULL, offsetof(block_slider_t, knob_color) }, + { "knob-line-color", CONFIG_GRADIENT, NULL, NULL, offsetof(block_slider_t, knob_line_color) }, + { "knob-x-offset", CONFIG_INT, NULL, NULL, offsetof(block_slider_t, knob_x_offset) }, + { "knob-y-offset", CONFIG_INT, NULL, NULL, offsetof(block_slider_t, knob_y_offset) }, + { "knob-rotation", CONFIG_DOUBLE, NULL, NULL, offsetof(block_slider_t, knob_rotation) }, + { "left-click-bar", CONFIG_STRING, NULL, NULL, offsetof(block_slider_t, left_click) }, + { "middle-click-bar", CONFIG_STRING, NULL, NULL, offsetof(block_slider_t, middle_click) }, + { "right-click-bar", CONFIG_STRING, NULL, NULL, offsetof(block_slider_t, right_click) }, { 0 }, }; |