From 555b78e9ec1221d11b28c1531fb1c092665e8bea Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Sat, 29 Feb 2020 12:16:50 -0500 Subject: [PATCH 1/4] Removed unnecessary dependencies --- meson.build | 2 -- protocol/meson.build | 2 +- waybox/meson.build | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 9bb837f..662a858 100644 --- a/meson.build +++ b/meson.build @@ -22,10 +22,8 @@ cc = meson.get_compiler('c') # Adding include directory inc_dir = include_directories('include') -pixman = dependency('pixman-1') wlroots = dependency('wlroots', version: '>=0.9.0') wayland_server = dependency('wayland-server') -wayland_client = dependency('wayland-client') wayland_protos = dependency('wayland-protocols', version: '>=1.17') xkbcommon = dependency('xkbcommon') diff --git a/protocol/meson.build b/protocol/meson.build index c76348e..7a5f2cb 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -55,7 +55,7 @@ foreach p : client_protocols endforeach lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers, - dependencies: [wayland_client]) # for the include directory + dependencies: [wayland_server]) # for the include directory wlr_protos = declare_dependency( link_with: lib_wl_protos, diff --git a/waybox/meson.build b/waybox/meson.build index 9a05460..c793af0 100644 --- a/waybox/meson.build +++ b/waybox/meson.build @@ -10,7 +10,6 @@ wb_src = files( wb_dep = [ wayland_server, wlroots, - pixman, xkbcommon, ] From 97d08498e98e5eb2d84b9c6c5a66320b1c303886 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Sun, 8 Mar 2020 12:47:58 -0400 Subject: [PATCH 2/4] Name as well as version for --version --- meson.build | 3 ++- waybox/main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 662a858..f9074e2 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,8 @@ project( add_project_arguments( '-Wno-unused-parameter', '-DWLR_USE_UNSTABLE', - '-DVERSION="' + meson.project_version() + '"', + '-DPACKAGE_NAME="' + meson.project_name() + '"', + '-DPACKAGE_VERSION="' + meson.project_version() + '"', language: 'c') cc = meson.get_compiler('c') diff --git a/waybox/main.c b/waybox/main.c index fa9b48e..952bc7d 100644 --- a/waybox/main.c +++ b/waybox/main.c @@ -15,7 +15,7 @@ int main(int argc, char **argv) { } else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { startup_cmd = argv[i + 1]; } else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { - printf(VERSION "\n"); + printf(PACKAGE_NAME " " PACKAGE_VERSION "\n"); return 0; } else if (argv[i][0] == '-') { printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]); From 9eb57cf950f52345e234b9aa6e726a786c33ce0c Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Sun, 8 Mar 2020 13:45:40 -0400 Subject: [PATCH 3/4] Naming improvements --- include/waybox/server.h | 6 +++--- waybox/main.c | 8 ++++---- waybox/server.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/waybox/server.h b/include/waybox/server.h index 3a217f7..ecad2a6 100644 --- a/include/waybox/server.h +++ b/include/waybox/server.h @@ -49,8 +49,8 @@ struct wb_server { struct wl_list outputs; // wb_output::link }; -bool init_wb(struct wb_server* server); -bool start_wb(struct wb_server* server); -bool terminate_wb(struct wb_server* server); +bool wb_create_backend(struct wb_server* server); +bool wb_start_server(struct wb_server* server); +bool wb_terminate(struct wb_server* server); #endif // server.h diff --git a/waybox/main.c b/waybox/main.c index 952bc7d..d3c3113 100644 --- a/waybox/main.c +++ b/waybox/main.c @@ -26,14 +26,14 @@ int main(int argc, char **argv) { struct wb_server server = {0}; - if (init_wb(&server) == false) { + if (!wb_create_backend(&server)) { printf("Failed to create backend\n"); exit(EXIT_FAILURE); } - if (!start_wb(&server)) { + if (!wb_start_server(&server)) { printf("Failed to start server\n"); - terminate_wb(&server); + wb_terminate(&server); exit(EXIT_FAILURE); } @@ -45,7 +45,7 @@ int main(int argc, char **argv) { wl_display_run(server.wl_display); - terminate_wb(&server); + wb_terminate(&server); return 0; } diff --git a/waybox/server.c b/waybox/server.c index f409ece..3f99ba2 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -1,7 +1,7 @@ #include "waybox/server.h" #include "waybox/xdg_shell.h" -bool init_wb(struct wb_server* server) { +bool wb_create_backend(struct wb_server* server) { // create display server->wl_display = wl_display_create(); if (server->wl_display == NULL) { @@ -28,7 +28,7 @@ bool init_wb(struct wb_server* server) { return true; } -bool start_wb(struct wb_server* server) { +bool wb_start_server(struct wb_server* server) { wl_list_init(&server->outputs); server->new_output.notify = new_output_notify; @@ -62,7 +62,7 @@ bool start_wb(struct wb_server* server) { return true; } -bool terminate_wb(struct wb_server* server) { +bool wb_terminate(struct wb_server* server) { wl_display_destroy_clients(server->wl_display); wb_cursor_destroy(server->cursor); wb_seat_destroy(server->seat); From 0930f2f81f557b55a0dffb7b5f6470dd2bb39752 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Sun, 8 Mar 2020 13:54:00 -0400 Subject: [PATCH 4/4] Removed duplicate error message --- waybox/server.c | 1 - 1 file changed, 1 deletion(-) diff --git a/waybox/server.c b/waybox/server.c index bae6dee..3ff4c19 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -12,7 +12,6 @@ bool init_wb(struct wb_server* server) { // create backend server->backend = wlr_backend_autocreate(server->wl_display, NULL); if (server->backend == NULL) { - printf("Failed to create backend\n"); return false; }