mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start port of swaybar to layer shell

Browse source 
This starts up the event loop and wayland display and shims out the
basic top level rendering concepts. Also includes some changes to
incorporate pango into the 1.x codebase properly.
This commit is contained in:
Drew DeVault 2018-03-28 23:04:20 -04:00
parent 382e8af418
commit cab1352801
23 changed files with 345 additions and 3787 deletions
Download patch file Download diff file Expand all files Collapse all files

35
swaybar/main.c
View file

@ -4,23 +4,22 @@
#include <string.h>
#include <stdbool.h>
#include <getopt.h>
#include <wlr/util/log.h>
#include "swaybar/bar.h"
#include "ipc-client.h"
#include "log.h"
/* global bar state */
struct bar swaybar;
void sway_terminate(int exit_code) {
bar_teardown(&swaybar);
exit(exit_code);
}
static struct swaybar swaybar;
void sig_handler(int signal) {
bar_teardown(&swaybar);
exit(0);
}
void sway_terminate(int code) {
bar_teardown(&swaybar);
exit(code);
}
int main(int argc, char **argv) {
char *socket_path = NULL;
char *bar_id = NULL;
@ -75,20 +74,23 @@ int main(int argc, char **argv) {
}
}
if (!bar_id) {
sway_abort("No bar_id passed. Provide --bar_id or let sway start swaybar");
if (debug) {
wlr_log_init(L_DEBUG, NULL);
} else {
wlr_log_init(L_ERROR, NULL);
}
if (debug) {
init_log(L_DEBUG);
} else {
init_log(L_ERROR);
if (!bar_id) {
wlr_log(L_ERROR, "No bar_id passed. "
"Provide --bar_id or let sway start swaybar");
return 1;
}
if (!socket_path) {
socket_path = get_socketpath();
if (!socket_path) {
sway_abort("Unable to retrieve socket path");
wlr_log(L_ERROR, "Unable to retrieve socket path");
return 1;
}
}
@ -100,9 +102,6 @@ int main(int argc, char **argv) {
free(bar_id);
bar_run(&swaybar);
// gracefully shutdown swaybar and status_command
bar_teardown(&swaybar);
return 0;
}