[WIP] Wayland

src/discover/discover.ml

@@ -35,8 +35,8 @@ let x11_config c =
 
 let wl_config c =
   let cflags, libs =
-    query_or_default c "wayland-client wayland-cursor"
-      [] [ "-lwayland-client"; "-lwayland-cursor" ]
+    query_or_default c "wayland-client wayland-cursor xkbcommon" 
+      [] [ "-lwayland-client"; "-lwayland-cursor"; "-lxkbcommon" ]
   in
   "-DHAS_WAYLAND" :: cflags, "-lrt" :: libs
 

src/dune

@@ -15,7 +15,7 @@
          gdi_keyboard gdi_backend gdi_target gdi_window gdi_surface
          qtz_keyboard qtz_backend qtz_target qtz_window qtz_surface
          x11_keysym x11_keyboard x11_backend x11_target x11_window x11_surface
-         wl_backend wl_target wl_window wl_surface xdg-shell-protocol
+         wl_backend wl_memory wl_target wl_window wl_surface wl_decoration wl_keyboard xdg-shell-protocol xdg-decor-protocol
          window surface
          path arc polygon polygonize poly_render
          font_desc gdi_font qtz_font ft_font font

src/implem/backend.c

@@ -133,7 +133,7 @@ backend_init(
     case_GDI(result = gdi_backend_init());
     case_QUARTZ(result = qtz_backend_init());
     case_X11(result = x11_backend_init());
-    case_WAYLAND(/*result = wl_backend_init()*/);
+    case_WAYLAND(result = wl_backend_init());
     default_ignore();
   }
 

src/implem/surface.c

@@ -137,7 +137,12 @@ surface_destroy(
   }
 
   if (s->data) {
-    free(s->data);
+    switch_IMPL() {
+      case_WAYLAND(s->data = NULL;);
+      default:
+        free(s->data);
+        break;
+    }
   }
 
   free(s);
@@ -191,7 +196,12 @@ surface_resize(
 
     _surface_copy_to_buffer(s, data, width, height);
 
-    free(s->data);
+    switch_IMPL() {
+      case_WAYLAND(s->data = NULL);
+      default:
+        free(s->data);
+        break;
+    }
 
   } else {