Merge pull request #259 from WayfireWM/track-wlroots-0.18

Track wlroots 0.18
WayfireWM · Dec 18, 2024 · 96bd690 · 96bd690
2 parents 3d5dc67 + b211e0f
commit 96bd690
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "subprojects/windecor"]
-	path = subprojects/windecor
-	url = https://gitlab.com/wayfireplugins/windecor.git
 [submodule "subprojects/wayfire-shadows"]
 	path = subprojects/wayfire-shadows
 	url = https://github.com/timgott/wayfire-shadows.git

diff --git a/src/annotate.cpp b/src/annotate.cpp
@@ -246,7 +246,7 @@ class wayfire_annotate_screen : public wf::per_output_plugin_instance_t, public
 
     void handle_pointer_button(const wlr_pointer_button_event& event) override
     {
-        if ((event.button == button) && (event.state == WLR_BUTTON_RELEASED))
+        if ((event.button == button) && (event.state == WL_POINTER_BUTTON_STATE_RELEASED))
         {
             draw_end();
         }

diff --git a/src/focus-steal-prevent.cpp b/src/focus-steal-prevent.cpp
@@ -199,14 +199,14 @@ class wayfire_focus_steal_prevent : public wf::per_output_plugin_instance_t
     wf::signal::connection_t<wf::input_event_signal<wlr_pointer_button_event>> on_button_event =
         [=] (wf::input_event_signal<wlr_pointer_button_event> *ev)
     {
-        if ((ev->event->state == WLR_BUTTON_RELEASED) || !prevent_focus_steal)
+        if ((ev->event->state == WL_POINTER_BUTTON_STATE_RELEASED) || !prevent_focus_steal)
         {
             return;
         }
 
         auto view = wf::get_core().get_cursor_focus_view();
         if ((!view || (view && (view->role == wf::VIEW_ROLE_DESKTOP_ENVIRONMENT))) &&
-            (ev->event->state == WLR_BUTTON_PRESSED) && prevent_focus_steal)
+            (ev->event->state == WL_POINTER_BUTTON_STATE_PRESSED) && prevent_focus_steal)
         {
             cancel();
             return;

diff --git a/src/water.cpp b/src/water.cpp
@@ -226,7 +226,7 @@ class wayfire_water_screen : public wf::per_output_plugin_instance_t, public wf:
 
     void handle_pointer_button(const wlr_pointer_button_event& event) override
     {
-        if (event.state == WLR_BUTTON_RELEASED)
+        if (event.state == WL_POINTER_BUTTON_STATE_RELEASED)
         {
             output->deactivate_plugin(&grab_interface);
             timer.set_timeout(5000, timeout);

diff --git a/src/window-zoom.cpp b/src/window-zoom.cpp
@@ -317,7 +317,7 @@ class wayfire_winzoom : public wf::per_output_plugin_instance_t
     wf::axis_callback axis_cb = [=] (wlr_pointer_axis_event *ev)
     {
         auto view = toplevel_cast(wf::get_core().get_cursor_focus_view());
-        if (ev->orientation == WLR_AXIS_ORIENTATION_VERTICAL)
+        if (ev->orientation == WL_POINTER_AXIS_VERTICAL_SCROLL)
         {
             auto delta = (int)-std::clamp(ev->delta, -1.0, 1.0);
             return update_winzoom(view, wf::point_t{delta, delta});

diff --git a/subprojects/filters b/subprojects/filters
diff --git a/subprojects/pixdecor b/subprojects/pixdecor
diff --git a/subprojects/wayfire-shadows b/subprojects/wayfire-shadows
diff --git a/subprojects/windecor b/subprojects/windecor
+4 −0		README.md
+5 −5		ipc-scripts/set-fs-shader.py
+4 −4		ipc-scripts/set-inactive-views.py
+5 −5		ipc-scripts/set-view-shader.py
+7 −7		ipc-scripts/toggle-fs-shader.py
+5 −5		ipc-scripts/unset-fs-shader.py
+5 −5		ipc-scripts/unset-view-shader.py
+4 −4		ipc-scripts/view-has-shader.py
+6 −8		ipc-scripts/ipc-shade-toggle.py
+0 −54		ipc-scripts/wayfire_socket.py
+5 −2		src/deco-subsurface.cpp
+1 −1		src/decoration.cpp