Merge branches 'basic-functionality' and 'modernize'

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')
@@ -22,10 +23,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')
 

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,

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]);

waybox/meson.build

@@ -10,7 +10,6 @@ wb_src = files(
 wb_dep = [
   wayland_server,
   wlroots,
-  pixman,
   xkbcommon,
   ]
 

waybox/server.c

@@ -12,7 +12,6 @@ bool wb_create_backend(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;
 	}