Naming improvements

This commit is contained in:
Keith Bowes 2020-03-08 13:45:40 -04:00
parent ee3cf551d0
commit 01d5e31772
3 changed files with 10 additions and 10 deletions

View file

@ -49,8 +49,8 @@ struct wb_server {
struct wl_list outputs; // wb_output::link struct wl_list outputs; // wb_output::link
}; };
bool init_wb(struct wb_server* server); bool wb_create_backend(struct wb_server* server);
bool start_wb(struct wb_server* server); bool wb_start_server(struct wb_server* server);
bool terminate_wb(struct wb_server* server); bool wb_terminate(struct wb_server* server);
#endif // server.h #endif // server.h

View file

@ -26,14 +26,14 @@ int main(int argc, char **argv) {
struct wb_server server = {0}; struct wb_server server = {0};
if (init_wb(&server) == false) { if (!wb_create_backend(&server)) {
printf("Failed to create backend\n"); printf("Failed to create backend\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!start_wb(&server)) { if (!wb_start_server(&server)) {
printf("Failed to start server\n"); printf("Failed to start server\n");
terminate_wb(&server); wb_terminate(&server);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -45,7 +45,7 @@ int main(int argc, char **argv) {
wl_display_run(server.wl_display); wl_display_run(server.wl_display);
terminate_wb(&server); wb_terminate(&server);
return 0; return 0;
} }

View file

@ -1,7 +1,7 @@
#include "waybox/server.h" #include "waybox/server.h"
#include "waybox/xdg_shell.h" #include "waybox/xdg_shell.h"
bool init_wb(struct wb_server* server) { bool wb_create_backend(struct wb_server* server) {
// create display // create display
server->wl_display = wl_display_create(); server->wl_display = wl_display_create();
if (server->wl_display == NULL) { if (server->wl_display == NULL) {
@ -28,7 +28,7 @@ bool init_wb(struct wb_server* server) {
return true; return true;
} }
bool start_wb(struct wb_server* server) { bool wb_start_server(struct wb_server* server) {
wl_list_init(&server->outputs); wl_list_init(&server->outputs);
server->new_output.notify = new_output_notify; server->new_output.notify = new_output_notify;
@ -62,7 +62,7 @@ bool start_wb(struct wb_server* server) {
return true; return true;
} }
bool terminate_wb(struct wb_server* server) { bool wb_terminate(struct wb_server* server) {
wl_display_destroy_clients(server->wl_display); wl_display_destroy_clients(server->wl_display);
wb_cursor_destroy(server->cursor); wb_cursor_destroy(server->cursor);
wb_seat_destroy(server->seat); wb_seat_destroy(server->seat);