Add swaybar basics

This should make the bar open and appear as the panel, once sway
supports panels. Right now it crashes sway!
This commit is contained in:
Drew DeVault 2015-11-29 10:58:18 -05:00
parent 63cf8e48c4
commit 60e76cf932
2 changed files with 97 additions and 4 deletions

View File

@ -4,8 +4,57 @@
#include "client/window.h"
#include "log.h"
struct box_colors {
uint32_t border;
uint32_t background;
uint32_t text;
};
struct colors {
uint32_t background;
uint32_t statusline;
uint32_t seperator;
struct box_colors focused_workspace;
struct box_colors active_workspace;
struct box_colors inactive_workspace;
struct box_colors urgent_workspace;
struct box_colors binding_mode;
};
struct registry *registry;
struct window *window;
struct colors colors = {
.background = 0x00000000,
.statusline = 0xffffffff,
.seperator = 0x666666ff,
.focused_workspace = {
.border = 0x4c7899ff,
.background = 0x285577ff,
.text = 0xffffffff
},
.active_workspace = {
.border = 0x333333ff,
.background = 0x5f676aff,
.text = 0xffffffff
},
.inactive_workspace = {
.border = 0x333333ff,
.background = 0x222222ff,
.text = 0x888888ff
},
.urgent_workspace = {
.border = 0x2f343aff,
.background = 0x900000ff,
.text = 0xffffffff
},
.binding_mode = {
.border = 0x2f343aff,
.background = 0x900000ff,
.text = 0xffffffff
},
};
void sway_terminate(void) {
window_teardown(window);
@ -13,8 +62,54 @@ void sway_terminate(void) {
exit(EXIT_FAILURE);
}
void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
cairo_set_source_rgba(cairo,
((color & 0xFF000000) >> 24) / 256.0,
((color & 0xFF0000) >> 16) / 256.0,
((color & 0xFF00) >> 8) / 256.0,
(color & 0xFF) / 256.0);
}
void render() {
// Reset buffer
cairo_save(window->cairo);
cairo_set_operator(window->cairo, CAIRO_OPERATOR_CLEAR);
cairo_paint(window->cairo);
cairo_restore(window->cairo);
// Draw bar
cairo_set_source_u32(window->cairo, colors.background);
cairo_paint(window->cairo);
}
int main(int argc, char **argv) {
init_log(L_INFO);
sway_log(L_INFO, "Hello world!");
registry = registry_poll();
if (!registry->desktop_shell) {
sway_abort("swaybar requires the compositor to support the desktop-shell extension.");
}
int desired_output = atoi(argv[1]);
sway_log(L_INFO, "Using output %d of %d", desired_output, registry->outputs->length);
struct output_state *output = registry->outputs->items[desired_output];
window = window_setup(registry, output->width, 30, false);
if (!window) {
sway_abort("Failed to create window.");
}
desktop_shell_set_panel(registry->desktop_shell, output->output, window->surface);
desktop_shell_set_panel_position(registry->desktop_shell, DESKTOP_SHELL_PANEL_POSITION_BOTTOM);
do {
if (window_prerender(window) && window->cairo) {
render();
window_render(window);
}
} while (wl_display_dispatch(registry->display) != -1);
window_teardown(window);
registry_teardown(registry);
return 0;
}

View File

@ -49,12 +49,10 @@ int main(int argc, const char **argv) {
sway_log(L_INFO, "Using output %d of %d", desired_output, registry->outputs->length);
int i;
struct output_state *output = registry->outputs->items[desired_output];
struct window *window = window_setup(registry, 100, 100, false);
struct window *window = window_setup(registry, output->width, output->height, false);
if (!window) {
sway_abort("Failed to create surfaces.");
}
window->width = output->width;
window->height = output->height;
desktop_shell_set_background(registry->desktop_shell, output->output, window->surface);
list_add(surfaces, window);