mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 20:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
ca40663d42
sway/swaybar/i3bar.c

318 lines
11 KiB
C
Raw Normal View History

Render i3bar blocks
2018-03-31 20:39:18 +02:00
#define _POSIX_C_SOURCE 200809L
Make json-c include respect pkg-config --cflags json-c.pc contains `Cflags: -I${includedir}/json-c`, so `<json-c/json.h>` won't be found unless the parent directory is searched by default.
2019-01-23 19:00:14 +01:00
#include <json.h>
make hotspot callback take an x11 button id
2018-07-16 02:16:37 +02:00
#include <linux/input-event-codes.h>
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
#include <ctype.h>
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
#include "log.h"
swaybar: move i3bar definitions into separate file
2018-09-24 22:56:35 +02:00
#include "swaybar/bar.h"
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
#include "swaybar/config.h"
swaybar: move i3bar definitions into separate file
2018-09-24 22:56:35 +02:00
#include "swaybar/i3bar.h"
swaybar: separate input code to new file
2018-10-17 21:21:27 +02:00
#include "swaybar/input.h"
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
#include "swaybar/status_line.h"
bar: remove i3bar_block_free in favour of i3bar_block_unref
2018-09-14 22:04:43 +02:00
void i3bar_block_unref(struct i3bar_block *block) {
if (block == NULL) {
Render i3bar blocks
2018-03-31 20:39:18 +02:00
return;
}
i3bar: count references to blocks This prevents blocks from being destroyed before their hotspots are destroyed, in case it is used for a pending click event that fires between the bar receiving a new status, which destroys the block, and the bar rendering the new status, which destroys the hotspot; this problem can be easily produced by scrolling on a block that immediately causes a new status to be sent, with multiple outputs
2018-09-12 09:28:28 +02:00
if (--block->ref_count == 0) {
bar: remove i3bar_block_free in favour of i3bar_block_unref
2018-09-14 22:04:43 +02:00
free(block->full_text);
free(block->short_text);
free(block->align);
Rebase #1636 against current master
2019-01-31 10:45:12 +01:00
free(block->min_width_str);
bar: remove i3bar_block_free in favour of i3bar_block_unref
2018-09-14 22:04:43 +02:00
free(block->name);
free(block->instance);
free(block);
i3bar: count references to blocks This prevents blocks from being destroyed before their hotspots are destroyed, in case it is used for a pending click event that fires between the bar receiving a new status, which destroys the block, and the bar rendering the new status, which destroys the hotspot; this problem can be easily produced by scrolling on a block that immediately causes a new status to be sent, with multiple outputs
2018-09-12 09:28:28 +02:00
}
}
swaybar: properly draw blocks with transparent black border while the draw itself is a no-op, alignment must still be accounted this requires more signalling about the blocks (border_set; was the border set?)
2021-09-15 12:07:07 +02:00
static bool i3bar_parse_json_color(json_object *json, uint32_t *color) {
if (!json) {
return false;
}
const char *hexstring = json_object_get_string(json);
bool color_set = parse_color(hexstring, color);
if (!color_set) {
sway_log(SWAY_ERROR, "Ignoring invalid block hexadecimal color string: %s", hexstring);
}
return color_set;
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
static void i3bar_parse_json(struct status_line *status,
struct json_object *json_array) {
Render i3bar blocks
2018-03-31 20:39:18 +02:00
struct i3bar_block *block, *tmp;
wl_list_for_each_safe(block, tmp, &status->blocks, link) {
i3bar: count references to blocks This prevents blocks from being destroyed before their hotspots are destroyed, in case it is used for a pending click event that fires between the bar receiving a new status, which destroys the block, and the bar rendering the new status, which destroys the hotspot; this problem can be easily produced by scrolling on a block that immediately causes a new status to be sent, with multiple outputs
2018-09-12 09:28:28 +02:00
wl_list_remove(&block->link);
i3bar_block_unref(block);
Render i3bar blocks
2018-03-31 20:39:18 +02:00
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
for (size_t i = 0; i < json_object_array_length(json_array); ++i) {
Render i3bar blocks
2018-03-31 20:39:18 +02:00
json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
json_object *name, *instance, *separator, *separator_block_width;
json_object *background, *border, *border_top, *border_bottom;
json_object *border_left, *border_right, *markup;
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
json_object *json = json_object_array_get_idx(json_array, i);
Render i3bar blocks
2018-03-31 20:39:18 +02:00
if (!json) {
continue;
}
json_object_object_get_ex(json, "full_text", &full_text);
json_object_object_get_ex(json, "short_text", &short_text);
json_object_object_get_ex(json, "color", &color);
json_object_object_get_ex(json, "min_width", &min_width);
json_object_object_get_ex(json, "align", &align);
json_object_object_get_ex(json, "urgent", &urgent);
json_object_object_get_ex(json, "name", &name);
json_object_object_get_ex(json, "instance", &instance);
json_object_object_get_ex(json, "markup", &markup);
json_object_object_get_ex(json, "separator", &separator);
json_object_object_get_ex(json, "separator_block_width", &separator_block_width);
json_object_object_get_ex(json, "background", &background);
json_object_object_get_ex(json, "border", &border);
json_object_object_get_ex(json, "border_top", &border_top);
json_object_object_get_ex(json, "border_bottom", &border_bottom);
json_object_object_get_ex(json, "border_left", &border_left);
json_object_object_get_ex(json, "border_right", &border_right);
struct i3bar_block *block = calloc(1, sizeof(struct i3bar_block));
i3bar: count references to blocks This prevents blocks from being destroyed before their hotspots are destroyed, in case it is used for a pending click event that fires between the bar receiving a new status, which destroys the block, and the bar rendering the new status, which destroys the hotspot; this problem can be easily produced by scrolling on a block that immediately causes a new status to be sent, with multiple outputs
2018-09-12 09:28:28 +02:00
block->ref_count = 1;
Render i3bar blocks
2018-03-31 20:39:18 +02:00
block->full_text = full_text ?
strdup(json_object_get_string(full_text)) : NULL;
block->short_text = short_text ?
strdup(json_object_get_string(short_text)) : NULL;
swaybar: properly draw blocks with transparent black border while the draw itself is a no-op, alignment must still be accounted this requires more signalling about the blocks (border_set; was the border set?)
2021-09-15 12:07:07 +02:00
block->color_set = i3bar_parse_json_color(color, &block->color);
Render i3bar blocks
2018-03-31 20:39:18 +02:00
if (min_width) {
json_type type = json_object_get_type(min_width);
if (type == json_type_int) {
block->min_width = json_object_get_int(min_width);
} else if (type == json_type_string) {
/* the width will be calculated when rendering */
Rebase #1636 against current master
2019-01-31 10:45:12 +01:00
block->min_width_str = strdup(json_object_get_string(min_width));
Render i3bar blocks
2018-03-31 20:39:18 +02:00
}
}
block->align = strdup(align ? json_object_get_string(align) : "left");
block->urgent = urgent ? json_object_get_int(urgent) : false;
block->name = name ? strdup(json_object_get_string(name)) : NULL;
block->instance = instance ?
strdup(json_object_get_string(instance)) : NULL;
if (markup) {
block->markup = false;
const char *markup_str = json_object_get_string(markup);
if (strcmp(markup_str, "pango") == 0) {
block->markup = true;
}
}
block->separator = separator ? json_object_get_int(separator) : true;
block->separator_block_width = separator_block_width ?
json_object_get_int(separator_block_width) : 9;
// Airblader features
swaybar: properly draw blocks with transparent black border while the draw itself is a no-op, alignment must still be accounted this requires more signalling about the blocks (border_set; was the border set?)
2021-09-15 12:07:07 +02:00
i3bar_parse_json_color(background, &block->background);
block->border_set = i3bar_parse_json_color(border, &block->border);
Render i3bar blocks
2018-03-31 20:39:18 +02:00
block->border_top = border_top ? json_object_get_int(border_top) : 1;
block->border_bottom = border_bottom ?
json_object_get_int(border_bottom) : 1;
block->border_left = border_left ? json_object_get_int(border_left) : 1;
block->border_right = border_right ?
json_object_get_int(border_right) : 1;
wl_list_insert(&status->blocks, &block->link);
}
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
Render i3bar blocks
2018-03-31 20:39:18 +02:00
bool i3bar_handle_readable(struct status_line *status) {
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
while (!status->started) { // look for opening bracket
for (size_t c = 0; c < status->buffer_index; ++c) {
if (status->buffer[c] == '[') {
status->started = true;
status->buffer_index -= ++c;
memmove(status->buffer, &status->buffer[c], status->buffer_index);
break;
} else if (!isspace(status->buffer[c])) {
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
sway_log(SWAY_DEBUG, "Invalid i3bar json: expected '[' but encountered '%c'",
swaybar: log invalid i3bar json
2018-09-21 13:06:25 +02:00
status->buffer[c]);
status_error(status, "[invalid i3bar json]");
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
return true;
}
}
if (status->started) {
break;
}
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
errno = 0;
ssize_t read_bytes = read(status->read_fd, status->buffer, status->buffer_size);
if (read_bytes > -1) {
status->buffer_index = read_bytes;
} else if (errno == EAGAIN) {
return false;
} else {
status_error(status, "[error reading from status command]");
Fix some more bugs
2018-04-09 14:07:54 +02:00
return true;
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
struct json_object *last_object = NULL;
struct json_object *test_object;
size_t buffer_pos = 0;
while (true) {
// since the incoming stream is an infinite array
// parsing is split into two parts
// first, attempt to parse the current object, reading more if the
// parser indicates that the current object is incomplete, and failing
// if the parser fails
// second, look for separating comma, ignoring whitespace, failing if
// any other characters are encountered
if (status->expecting_comma) {
for (; buffer_pos < status->buffer_index; ++buffer_pos) {
if (status->buffer[buffer_pos] == ',') {
status->expecting_comma = false;
++buffer_pos;
break;
} else if (!isspace(status->buffer[buffer_pos])) {
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
sway_log(SWAY_DEBUG, "Invalid i3bar json: expected ',' but encountered '%c'",
swaybar: log invalid i3bar json
2018-09-21 13:06:25 +02:00
status->buffer[buffer_pos]);
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
status_error(status, "[invalid i3bar json]");
return true;
}
}
if (buffer_pos < status->buffer_index) {
continue; // look for new object without reading more input
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
buffer_pos = status->buffer_index = 0;
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
} else {
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
test_object = json_tokener_parse_ex(status->tokener,
&status->buffer[buffer_pos], status->buffer_index - buffer_pos);
swaybar: log invalid i3bar json
2018-09-21 13:06:25 +02:00
enum json_tokener_error err = json_tokener_get_error(status->tokener);
if (err == json_tokener_success) {
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
if (json_object_get_type(test_object) == json_type_array) {
if (last_object) {
json_object_put(last_object);
}
last_object = test_object;
} else {
json_object_put(test_object);
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
swaybar: add debugging statements for handling i3bar json
2018-09-17 15:21:14 +02:00
// in order to print the json for debugging purposes
// the last character is temporarily replaced with a null character
// (the last character is used in case the buffer is full)
char *last_char_pos =
&status->buffer[buffer_pos + status->tokener->char_offset - 1];
char last_char = *last_char_pos;
while (isspace(last_char)) {
last_char = *--last_char_pos;
}
*last_char_pos = '\0';
size_t offset = strspn(&status->buffer[buffer_pos], " \f\n\r\t\v");
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
sway_log(SWAY_DEBUG, "Received i3bar json: '%s%c'",
swaybar: add debugging statements for handling i3bar json
2018-09-17 15:21:14 +02:00
&status->buffer[buffer_pos + offset], last_char);
*last_char_pos = last_char;
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
buffer_pos += status->tokener->char_offset;
status->expecting_comma = true;
if (buffer_pos < status->buffer_index) {
continue; // look for comma without reading more input
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
buffer_pos = status->buffer_index = 0;
swaybar: log invalid i3bar json
2018-09-21 13:06:25 +02:00
} else if (err == json_tokener_continue) {
swaybar: reset tokener if json is incomplete If the tokener parses incomplete json, it sets its error value to json_tokener_continue. This means that extra json should be provided, but the code was providing the entire object again. In the interest of simplicity, the tokener is reset so that buffer_pos always points to the start of the current object.
2018-09-21 15:59:01 +02:00
json_tokener_reset(status->tokener);
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
if (status->buffer_index < status->buffer_size) {
// move the object to the start of the buffer
status->buffer_index -= buffer_pos;
memmove(status->buffer, &status->buffer[buffer_pos],
status->buffer_index);
swaybar: update buffer_pos when moving object to start of buffer
2018-09-19 16:16:19 +02:00
buffer_pos = 0;
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
} else {
// expand buffer
status->buffer_size *= 2;
char *new_buffer = realloc(status->buffer, status->buffer_size);
if (new_buffer) {
status->buffer = new_buffer;
} else {
free(status->buffer);
status_error(status, "[failed to allocate buffer]");
return true;
}
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
} else {
swaybar: log invalid i3bar json
2018-09-21 13:06:25 +02:00
char last_char = status->buffer[status->buffer_index - 1];
status->buffer[status->buffer_index - 1] = '\0';
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
sway_log(SWAY_DEBUG, "Failed to parse i3bar json - %s: '%s%c'",
swaybar: log invalid i3bar json
2018-09-21 13:06:25 +02:00
json_tokener_error_desc(err), &status->buffer[buffer_pos], last_char);
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
status_error(status, "[failed to parse i3bar json]");
return true;
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
}
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
errno = 0;
ssize_t read_bytes = read(status->read_fd, &status->buffer[status->buffer_index],
status->buffer_size - status->buffer_index);
if (read_bytes > -1) {
status->buffer_index += read_bytes;
} else if (errno == EAGAIN) {
break;
} else {
status_error(status, "[error reading from status command]");
return true;
}
}
if (last_object) {
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
sway_log(SWAY_DEBUG, "Rendering last received json");
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
i3bar_parse_json(status, last_object);
json_object_put(last_object);
return true;
} else {
return false;
Demarcate i3bar JSON into individual updates
2018-03-31 19:07:22 +02:00
}
}
Send click events for i3bar blocks
2018-03-31 20:58:30 +02:00
swaybar: Fix scroll handling on workspace buttons As well as ignoring scroll events on status elements when click_events is enabled. Previously, using the scroll wheel on a workspace button would switch to that workspace instead of scrolling through them. Clicks and scrolling on status elements would always be processed by swaybar, too. So in case you were using scrolling as volume control on a status item, swaybar would additionally scroll through your workspaces.
2018-07-19 21:15:01 +02:00
enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
swaybar: fix i3bar relative coordinates when scaling is used 24e8ba048aef4751c6fa1d5982ee634f921e6cf6 did not take scaling into account. The hotspot size used pixel coordinates, the absolute coordinates were logical, and the relative coordinates were completely wrong. This commit makes all coordinates use logical values. If `"float_event_coords":true` is sent in the handshake message, coordinates are sent as floating-point values. The "scale" field is an integer containing the scale value.
2020-02-01 18:08:00 +01:00
struct i3bar_block *block, double x, double y, double rx, double ry,
swaybar: Make hotspots block bar release bindings The previous commit prioritized hotspots before bar bindings for press events, which matches i3's behaviour. However, since hotspots don't need to do any processing on release events, those were not handled, and simply fell through to `bindsym --release` bar bindings (if any). This is counter-intuitive, and doesn't match i3's behaviour. Instead in case a hotspot handles the press event, it should also handle the release event, doing nothing, but blocking the event from triggering a --release bar binding. E.g., in Sway, without this commit, this config. shows a text on tray clicks: bar { # ... bindsym --release button1 exec swaynag -m I_got_the_release_event. } But the same configuration in i3 (with i3-nagbar) doesn't show the text. Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
2021-09-18 22:21:22 +02:00
double w, double h, int scale, uint32_t button, bool released) {
Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
2019-01-20 19:51:12 +01:00
sway_log(SWAY_DEBUG, "block %s clicked", block->name);
swaybar: rewrite i3bar protocol handling This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-17 15:10:57 +02:00
if (!block->name || !status->click_events) {
swaybar: Fix scroll handling on workspace buttons As well as ignoring scroll events on status elements when click_events is enabled. Previously, using the scroll wheel on a workspace button would switch to that workspace instead of scrolling through them. Clicks and scrolling on status elements would always be processed by swaybar, too. So in case you were using scrolling as volume control on a status item, swaybar would additionally scroll through your workspaces.
2018-07-19 21:15:01 +02:00
return HOTSPOT_PROCESS;
Send click events for i3bar blocks
2018-03-31 20:58:30 +02:00
}
swaybar: Make hotspots block bar release bindings The previous commit prioritized hotspots before bar bindings for press events, which matches i3's behaviour. However, since hotspots don't need to do any processing on release events, those were not handled, and simply fell through to `bindsym --release` bar bindings (if any). This is counter-intuitive, and doesn't match i3's behaviour. Instead in case a hotspot handles the press event, it should also handle the release event, doing nothing, but blocking the event from triggering a --release bar binding. E.g., in Sway, without this commit, this config. shows a text on tray clicks: bar { # ... bindsym --release button1 exec swaynag -m I_got_the_release_event. } But the same configuration in i3 (with i3-nagbar) doesn't show the text. Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
2021-09-18 22:21:22 +02:00
if (released) {
// Since we handle the pressed event, also handle the released event
// to block it from falling through to a binding in the bar
return HOTSPOT_IGNORE;
}
Send click events for i3bar blocks
2018-03-31 20:58:30 +02:00
struct json_object *event_json = json_object_new_object();
json_object_object_add(event_json, "name",
json_object_new_string(block->name));
if (block->instance) {
json_object_object_add(event_json, "instance",
json_object_new_string(block->instance));
}
bar_cmd_bind: utilize mouse button helpers This modifies `bar_cmd_bindsym` to use `get_mouse_bindsym` for parsing mouse buttons. This also introduces `cmd_bar_bindcode`, which will use `get_mouse_bindcode` for parsing mouse buttons. Like sway bindings, the two commands are encapsulated in a single file with shared code. This also modifies swaybar to operate off of event codes rather than x11 button numbers, which allows for any mouse button to be used. This introduces two new IPC properties: - For `get_bar_config`, `event_code` has been added to the `bindings` section and will include to event code for the button. If the event code can be mapped to a x11 button, `input_code` will still be the x11 button number. Otherwise, `input_code` will be `0`. - Likewise for `click_events`, `event` has been added and will include the event code for the button clicked. If the event code can be mapped to a x11 button, `button` will still be the x11 button number. Otherwise, `button` will be `0`.
2019-01-10 18:43:10 +01:00
json_object_object_add(event_json, "button",
json_object_new_int(event_to_x11_button(button)));
json_object_object_add(event_json, "event", json_object_new_int(button));
swaybar: fix i3bar relative coordinates when scaling is used 24e8ba048aef4751c6fa1d5982ee634f921e6cf6 did not take scaling into account. The hotspot size used pixel coordinates, the absolute coordinates were logical, and the relative coordinates were completely wrong. This commit makes all coordinates use logical values. If `"float_event_coords":true` is sent in the handshake message, coordinates are sent as floating-point values. The "scale" field is an integer containing the scale value.
2020-02-01 18:08:00 +01:00
if (status->float_event_coords) {
json_object_object_add(event_json, "x", json_object_new_double(x));
json_object_object_add(event_json, "y", json_object_new_double(y));
json_object_object_add(event_json, "relative_x", json_object_new_double(rx));
json_object_object_add(event_json, "relative_y", json_object_new_double(ry));
json_object_object_add(event_json, "width", json_object_new_double(w));
json_object_object_add(event_json, "height", json_object_new_double(h));
} else {
json_object_object_add(event_json, "x", json_object_new_int(x));
json_object_object_add(event_json, "y", json_object_new_int(y));
json_object_object_add(event_json, "relative_x", json_object_new_int(rx));
json_object_object_add(event_json, "relative_y", json_object_new_int(ry));
json_object_object_add(event_json, "width", json_object_new_int(w));
json_object_object_add(event_json, "height", json_object_new_int(h));
}
json_object_object_add(event_json, "scale", json_object_new_int(scale));
swaybar: add leading comma to click event JSON
2018-10-02 15:04:48 +02:00
if (dprintf(status->write_fd, "%s%s\n", status->clicked ? "," : "",
Fix #1709
2018-04-03 17:17:34 +02:00
json_object_to_json_string(event_json)) < 0) {
status_error(status, "[failed to write click event]");
}
swaybar: add leading comma to click event JSON
2018-10-02 15:04:48 +02:00
status->clicked = true;
Send click events for i3bar blocks
2018-03-31 20:58:30 +02:00
json_object_put(event_json);
swaybar: Fix scroll handling on workspace buttons As well as ignoring scroll events on status elements when click_events is enabled. Previously, using the scroll wheel on a workspace button would switch to that workspace instead of scrolling through them. Clicks and scrolling on status elements would always be processed by swaybar, too. So in case you were using scrolling as volume control on a status item, swaybar would additionally scroll through your workspaces.
2018-07-19 21:15:01 +02:00
return HOTSPOT_IGNORE;
Send click events for i3bar blocks
2018-03-31 20:58:30 +02:00
}
Reference in New Issue Copy Permalink