diff options
Diffstat (limited to 'swaynag/main.c')
-rw-r--r-- | swaynag/main.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/swaynag/main.c b/swaynag/main.c index 5c97e12a..0493c1f0 100644 --- a/swaynag/main.c +++ b/swaynag/main.c | |||
@@ -3,19 +3,19 @@ | |||
3 | #include "log.h" | 3 | #include "log.h" |
4 | #include "list.h" | 4 | #include "list.h" |
5 | #include "swaynag/config.h" | 5 | #include "swaynag/config.h" |
6 | #include "swaynag/nagbar.h" | 6 | #include "swaynag/swaynag.h" |
7 | #include "swaynag/types.h" | 7 | #include "swaynag/types.h" |
8 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" | 8 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" |
9 | 9 | ||
10 | static struct sway_nagbar nagbar; | 10 | static struct swaynag swaynag; |
11 | 11 | ||
12 | void sig_handler(int signal) { | 12 | void sig_handler(int signal) { |
13 | nagbar_destroy(&nagbar); | 13 | swaynag_destroy(&swaynag); |
14 | exit(EXIT_FAILURE); | 14 | exit(EXIT_FAILURE); |
15 | } | 15 | } |
16 | 16 | ||
17 | void sway_terminate(int code) { | 17 | void sway_terminate(int code) { |
18 | nagbar_destroy(&nagbar); | 18 | swaynag_destroy(&swaynag); |
19 | exit(code); | 19 | exit(code); |
20 | } | 20 | } |
21 | 21 | ||
@@ -23,28 +23,28 @@ int main(int argc, char **argv) { | |||
23 | int exit_code = EXIT_SUCCESS; | 23 | int exit_code = EXIT_SUCCESS; |
24 | 24 | ||
25 | list_t *types = create_list(); | 25 | list_t *types = create_list(); |
26 | nagbar_types_add_default(types); | 26 | swaynag_types_add_default(types); |
27 | 27 | ||
28 | memset(&nagbar, 0, sizeof(nagbar)); | 28 | memset(&swaynag, 0, sizeof(swaynag)); |
29 | nagbar.anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | 29 | swaynag.anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
30 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | 30 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
31 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; | 31 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; |
32 | nagbar.font = strdup("pango:monospace 10"); | 32 | swaynag.font = strdup("pango:monospace 10"); |
33 | nagbar.buttons = create_list(); | 33 | swaynag.buttons = create_list(); |
34 | 34 | ||
35 | struct sway_nagbar_button *button_close = | 35 | struct swaynag_button *button_close = |
36 | calloc(sizeof(struct sway_nagbar_button), 1); | 36 | calloc(sizeof(struct swaynag_button), 1); |
37 | button_close->text = strdup("X"); | 37 | button_close->text = strdup("X"); |
38 | button_close->type = NAGBAR_ACTION_DISMISS; | 38 | button_close->type = SWAYNAG_ACTION_DISMISS; |
39 | list_add(nagbar.buttons, button_close); | 39 | list_add(swaynag.buttons, button_close); |
40 | 40 | ||
41 | nagbar.details.button_details.text = strdup("Toggle Details"); | 41 | swaynag.details.button_details.text = strdup("Toggle Details"); |
42 | nagbar.details.button_details.type = NAGBAR_ACTION_EXPAND; | 42 | swaynag.details.button_details.type = SWAYNAG_ACTION_EXPAND; |
43 | 43 | ||
44 | 44 | ||
45 | char *config_path = NULL; | 45 | char *config_path = NULL; |
46 | bool debug = false; | 46 | bool debug = false; |
47 | int launch_status = nagbar_parse_options(argc, argv, NULL, NULL, | 47 | int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, |
48 | &config_path, &debug); | 48 | &config_path, &debug); |
49 | if (launch_status != 0) { | 49 | if (launch_status != 0) { |
50 | exit_code = launch_status; | 50 | exit_code = launch_status; |
@@ -53,11 +53,11 @@ int main(int argc, char **argv) { | |||
53 | wlr_log_init(debug ? WLR_DEBUG : WLR_ERROR, NULL); | 53 | wlr_log_init(debug ? WLR_DEBUG : WLR_ERROR, NULL); |
54 | 54 | ||
55 | if (!config_path) { | 55 | if (!config_path) { |
56 | config_path = nagbar_get_config_path(); | 56 | config_path = swaynag_get_config_path(); |
57 | } | 57 | } |
58 | if (config_path) { | 58 | if (config_path) { |
59 | wlr_log(WLR_DEBUG, "Loading config file: %s", config_path); | 59 | wlr_log(WLR_DEBUG, "Loading config file: %s", config_path); |
60 | int config_status = nagbar_load_config(config_path, &nagbar, types); | 60 | int config_status = swaynag_load_config(config_path, &swaynag, types); |
61 | free(config_path); | 61 | free(config_path); |
62 | if (config_status != 0) { | 62 | if (config_status != 0) { |
63 | exit_code = config_status; | 63 | exit_code = config_status; |
@@ -66,7 +66,7 @@ int main(int argc, char **argv) { | |||
66 | } | 66 | } |
67 | 67 | ||
68 | if (argc > 1) { | 68 | if (argc > 1) { |
69 | int result = nagbar_parse_options(argc, argv, &nagbar, types, | 69 | int result = swaynag_parse_options(argc, argv, &swaynag, types, |
70 | NULL, NULL); | 70 | NULL, NULL); |
71 | if (result != 0) { | 71 | if (result != 0) { |
72 | exit_code = result; | 72 | exit_code = result; |
@@ -74,46 +74,46 @@ int main(int argc, char **argv) { | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | if (!nagbar.message) { | 77 | if (!swaynag.message) { |
78 | wlr_log(WLR_ERROR, "No message passed. Please provide --message/-m"); | 78 | wlr_log(WLR_ERROR, "No message passed. Please provide --message/-m"); |
79 | exit_code = EXIT_FAILURE; | 79 | exit_code = EXIT_FAILURE; |
80 | goto cleanup; | 80 | goto cleanup; |
81 | } | 81 | } |
82 | 82 | ||
83 | if (!nagbar.type) { | 83 | if (!swaynag.type) { |
84 | nagbar.type = nagbar_type_get(types, "error"); | 84 | swaynag.type = swaynag_type_get(types, "error"); |
85 | } | 85 | } |
86 | 86 | ||
87 | nagbar.type = nagbar_type_clone(nagbar.type); | 87 | swaynag.type = swaynag_type_clone(swaynag.type); |
88 | nagbar_types_free(types); | 88 | swaynag_types_free(types); |
89 | 89 | ||
90 | if (nagbar.details.message) { | 90 | if (swaynag.details.message) { |
91 | list_add(nagbar.buttons, &nagbar.details.button_details); | 91 | list_add(swaynag.buttons, &swaynag.details.button_details); |
92 | } else { | 92 | } else { |
93 | free(nagbar.details.button_details.text); | 93 | free(swaynag.details.button_details.text); |
94 | } | 94 | } |
95 | 95 | ||
96 | wlr_log(WLR_DEBUG, "Output: %s", nagbar.output.name); | 96 | wlr_log(WLR_DEBUG, "Output: %s", swaynag.output.name); |
97 | wlr_log(WLR_DEBUG, "Anchors: %d", nagbar.anchors); | 97 | wlr_log(WLR_DEBUG, "Anchors: %d", swaynag.anchors); |
98 | wlr_log(WLR_DEBUG, "Type: %s", nagbar.type->name); | 98 | wlr_log(WLR_DEBUG, "Type: %s", swaynag.type->name); |
99 | wlr_log(WLR_DEBUG, "Message: %s", nagbar.message); | 99 | wlr_log(WLR_DEBUG, "Message: %s", swaynag.message); |
100 | wlr_log(WLR_DEBUG, "Font: %s", nagbar.font); | 100 | wlr_log(WLR_DEBUG, "Font: %s", swaynag.font); |
101 | wlr_log(WLR_DEBUG, "Buttons"); | 101 | wlr_log(WLR_DEBUG, "Buttons"); |
102 | for (int i = 0; i < nagbar.buttons->length; i++) { | 102 | for (int i = 0; i < swaynag.buttons->length; i++) { |
103 | struct sway_nagbar_button *button = nagbar.buttons->items[i]; | 103 | struct swaynag_button *button = swaynag.buttons->items[i]; |
104 | wlr_log(WLR_DEBUG, "\t[%s] `%s`", button->text, button->action); | 104 | wlr_log(WLR_DEBUG, "\t[%s] `%s`", button->text, button->action); |
105 | } | 105 | } |
106 | 106 | ||
107 | signal(SIGTERM, sig_handler); | 107 | signal(SIGTERM, sig_handler); |
108 | 108 | ||
109 | nagbar_setup(&nagbar); | 109 | swaynag_setup(&swaynag); |
110 | nagbar_run(&nagbar); | 110 | swaynag_run(&swaynag); |
111 | return exit_code; | 111 | return exit_code; |
112 | 112 | ||
113 | cleanup: | 113 | cleanup: |
114 | nagbar_types_free(types); | 114 | swaynag_types_free(types); |
115 | free(nagbar.details.button_details.text); | 115 | free(swaynag.details.button_details.text); |
116 | nagbar_destroy(&nagbar); | 116 | swaynag_destroy(&swaynag); |
117 | return exit_code; | 117 | return exit_code; |
118 | } | 118 | } |
119 | 119 | ||