mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 21:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #362 from crondog/master

Browse source 
swaybar: use position from config
This commit is contained in:
Drew DeVault 2015-12-18 20:24:05 -05:00
parent 859f2fea0c c8555f5813
commit 155fb7a221
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
swaybar/main.c
View file

@ -173,6 +173,20 @@ uint32_t parse_color(const char *color) {
return res; return res;
} }
uint32_t parse_position(const char *position) {
if (strcmp("top", position) == 0) {
return DESKTOP_SHELL_PANEL_POSITION_TOP;
} else if (strcmp("bottom", position) == 0) {
return DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
} else if (strcmp("left", position) == 0) {
return DESKTOP_SHELL_PANEL_POSITION_LEFT;
} else if (strcmp("right", position) == 0) {
return DESKTOP_SHELL_PANEL_POSITION_RIGHT;
} else {
return DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
}
}
void bar_ipc_init(int outputi, const char *bar_id) { void bar_ipc_init(int outputi, const char *bar_id) {
uint32_t len = 0; uint32_t len = 0;
char *res = ipc_single_command(socketfd, IPC_GET_OUTPUTS, NULL, &len); char *res = ipc_single_command(socketfd, IPC_GET_OUTPUTS, NULL, &len);
@ -210,6 +224,10 @@ void bar_ipc_init(int outputi, const char *bar_id) {
status_command = strdup(json_object_get_string(_status_command)); status_command = strdup(json_object_get_string(_status_command));
} }
if (position) {
desktop_shell_set_panel_position(registry->desktop_shell, parse_position(json_object_get_string(position)));
}
if (_colors) { if (_colors) {
json_object *background, *statusline, *separator; json_object *background, *statusline, *separator;
json_object *focused_workspace_border, *focused_workspace_bg, *focused_workspace_text; json_object *focused_workspace_border, *focused_workspace_bg, *focused_workspace_text;
@ -456,7 +474,6 @@ int main(int argc, char **argv) {
sway_abort("Failed to create window."); sway_abort("Failed to create window.");
} }
desktop_shell_set_panel(registry->desktop_shell, output->output, window->surface); desktop_shell_set_panel(registry->desktop_shell, output->output, window->surface);
desktop_shell_set_panel_position(registry->desktop_shell, DESKTOP_SHELL_PANEL_POSITION_BOTTOM);
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");