mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-28 07:56:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #429 from mikkeloscar/bar-workspace-buttons

Browse source 
swaybar: Implement workspace_buttons yes|no
This commit is contained in:
Drew DeVault 2016-01-03 16:46:18 -05:00
commit 7d5ef6bc84
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
swaybar/main.c
View file

@ -79,6 +79,7 @@ char *separator_symbol = NULL;
char *mode = NULL; char *mode = NULL;
bool binding_mode_indicator = true; bool binding_mode_indicator = true;
bool strip_workspace_numbers = false; bool strip_workspace_numbers = false;
bool workspace_buttons = true;
typedef enum {UNDEF, TEXT, I3BAR} command_protocol; typedef enum {UNDEF, TEXT, I3BAR} command_protocol;
command_protocol protocol = UNDEF; command_protocol protocol = UNDEF;
@ -292,7 +293,7 @@ void bar_ipc_init(int outputi, const char *bar_id) {
json_object *bar_config = json_tokener_parse(res); json_object *bar_config = json_tokener_parse(res);
json_object *tray_output, *mode, *hidden_state, *position, *_status_command; json_object *tray_output, *mode, *hidden_state, *position, *_status_command;
json_object *font, *bar_height, *workspace_buttons, *_strip_workspace_numbers; json_object *font, *bar_height, *_workspace_buttons, *_strip_workspace_numbers;
json_object *_binding_mode_indicator, *verbose, *_colors, *sep_symbol; json_object *_binding_mode_indicator, *verbose, *_colors, *sep_symbol;
json_object_object_get_ex(bar_config, "tray_output", &tray_output); json_object_object_get_ex(bar_config, "tray_output", &tray_output);
json_object_object_get_ex(bar_config, "mode", &mode); json_object_object_get_ex(bar_config, "mode", &mode);
@ -301,7 +302,7 @@ void bar_ipc_init(int outputi, const char *bar_id) {
json_object_object_get_ex(bar_config, "status_command", &_status_command); json_object_object_get_ex(bar_config, "status_command", &_status_command);
json_object_object_get_ex(bar_config, "font", &font); json_object_object_get_ex(bar_config, "font", &font);
json_object_object_get_ex(bar_config, "bar_height", &bar_height); json_object_object_get_ex(bar_config, "bar_height", &bar_height);
json_object_object_get_ex(bar_config, "workspace_buttons", &workspace_buttons); json_object_object_get_ex(bar_config, "workspace_buttons", &_workspace_buttons);
json_object_object_get_ex(bar_config, "strip_workspace_numbers", &_strip_workspace_numbers); json_object_object_get_ex(bar_config, "strip_workspace_numbers", &_strip_workspace_numbers);
json_object_object_get_ex(bar_config, "binding_mode_indicator", &_binding_mode_indicator); json_object_object_get_ex(bar_config, "binding_mode_indicator", &_binding_mode_indicator);
json_object_object_get_ex(bar_config, "verbose", &verbose); json_object_object_get_ex(bar_config, "verbose", &verbose);
@ -334,6 +335,10 @@ void bar_ipc_init(int outputi, const char *bar_id) {
binding_mode_indicator = json_object_get_boolean(_binding_mode_indicator); binding_mode_indicator = json_object_get_boolean(_binding_mode_indicator);
} }
if (_workspace_buttons) {
workspace_buttons = json_object_get_boolean(_workspace_buttons);
}
if (bar_height) { if (bar_height) {
int width, height; int width, height;
get_text_size(window, &width, &height, "Test string for measuring purposes"); get_text_size(window, &width, &height, "Test string for measuring purposes");
@ -696,12 +701,15 @@ void render() {
} }
} }
// Workspaces
cairo_set_line_width(window->cairo, 1.0); cairo_set_line_width(window->cairo, 1.0);
double x = 0.5; double x = 0.5;
for (i = 0; i < workspaces->length; ++i) {
struct workspace *ws = workspaces->items[i]; // Workspaces
render_workspace_button(ws, &x); if (workspace_buttons) {
for (i = 0; i < workspaces->length; ++i) {
struct workspace *ws = workspaces->items[i];
render_workspace_button(ws, &x);
}
} }
// binding mode indicator // binding mode indicator