Fixed new-output notifications in wlroots 0.6.0-0.8.1 with DRM backend

keithbowes · Feb 26, 2020 · 13826a5 · 13826a5
1 parent 9b94ae7
commit 13826a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/meson.build b/meson.build
@@ -3,7 +3,7 @@
 project(
   'waybox',
   'c',
-  version: '0.0.2',
+  version: '0.0.2.1',
   license: 'MIT',
   meson_version: '>=0.43.0',
   default_options: [

diff --git a/waybox/output.c b/waybox/output.c
@@ -1,3 +1,5 @@
+#include <wlr/version.h>
+
 #include "waybox/output.h"
 
 struct render_data {
@@ -126,9 +128,12 @@ void new_output_notify(struct wl_listener *listener, void *data) {
 		wlr_output_set_mode(wlr_output, mode);
 		wlr_output_enable(wlr_output, true);
 
+#if WLR_VERSION_NUM > 2049
+		// wlroots 0.9.0+
 		if (!wlr_output_commit(wlr_output)) {
 			return;
 		}
+#endif
 	}
 
 	struct wb_output *output = calloc(1, sizeof(struct wb_output));

diff --git a/waybox/server.c b/waybox/server.c
@@ -2,7 +2,6 @@
 #include "waybox/xdg_shell.h"
 
 bool init_wb(struct wb_server* server) {
-
 	// create display
 	server->wl_display = wl_display_create();
 	if (server->wl_display == NULL) {