We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Wayland Hit Test

wayland_hit_test.patch (text/plain), 5.73 KB, created by x414e54 on 2015-04-11 23:50:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: x414e54

Created: 2015-04-11 23:50:47 UTC

Size: 5.73 KB

patch

obsolete

>diff -r cf8fab52e33b src/video/wayland/SDL_waylandevents.c
>--- a/src/video/wayland/SDL_waylandevents.c	Thu Apr 09 22:28:37 2015 -0400
>+++ b/src/video/wayland/SDL_waylandevents.c	Sun Apr 12 08:46:28 2015 +0900
>@@ -52,6 +52,10 @@
>     SDL_WindowData *pointer_focus;
>     SDL_WindowData *keyboard_focus;
> 
>+    /* Last motion location */
>+    wl_fixed_t sx_w;
>+    wl_fixed_t sy_w;
>+    
>     struct {
>         struct xkb_keymap *keymap;
>         struct xkb_state *state;
>@@ -119,6 +123,8 @@
> {
>     struct SDL_WaylandInput *input = data;
>     SDL_WindowData *window = input->pointer_focus;
>+    input->sx_w = sx_w;
>+    input->sy_w = sy_w;
>     int sx = wl_fixed_to_int(sx_w);
>     int sy = wl_fixed_to_int(sy_w);
>     if (input->pointer_focus) {
>@@ -126,6 +132,70 @@
>     }
> }
> 
>+static SDL_bool
>+ProcessHitTest(struct SDL_WaylandInput *input, uint32_t serial)
>+{
>+    SDL_WindowData *window_data = input->pointer_focus;
>+    SDL_Window *window = window_data->sdlwindow;
>+    SDL_bool ret = SDL_FALSE;
>+
>+    if (window->hit_test) {
>+        const SDL_Point point = { wl_fixed_to_int(input->sx_w), wl_fixed_to_int(input->sy_w) };
>+        const SDL_HitTestResult rc = window->hit_test(window, &point, window->hit_test_data);
>+        switch (rc) {
>+            case SDL_HITTEST_DRAGGABLE: {
>+                    wl_shell_surface_move(window_data->shell_surface, input->seat, serial);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_TOPLEFT: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial, WL_SHELL_SURFACE_RESIZE_TOP_LEFT);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_TOP: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial, WL_SHELL_SURFACE_RESIZE_TOP);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_TOPRIGHT: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial,  WL_SHELL_SURFACE_RESIZE_TOP_RIGHT);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_RIGHT: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial, WL_SHELL_SURFACE_RESIZE_RIGHT);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_BOTTOMRIGHT: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial,  WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_BOTTOM: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial, WL_SHELL_SURFACE_RESIZE_BOTTOM);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_BOTTOMLEFT: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial, WL_SHELL_SURFACE_RESIZE_BOTTOM_LEFT);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            case SDL_HITTEST_RESIZE_LEFT: {
>+                    wl_shell_surface_resize(window_data->shell_surface, input->seat, serial, WL_SHELL_SURFACE_RESIZE_LEFT);
>+                    ret = SDL_TRUE;
>+                }
>+                break;
>+            default:
>+                break;
>+        }
>+    }
>+
>+    return ret;
>+}
>+
> static void
> pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
>                       uint32_t time, uint32_t button, uint32_t state_w)
>@@ -139,6 +209,9 @@
>         switch (button) {
>             case BTN_LEFT:
>                 sdl_button = SDL_BUTTON_LEFT;
>+                if (ProcessHitTest(data, serial)) {
>+                    return;  /* don't pass this event on to app. */
>+                }
>                 break;
>             case BTN_MIDDLE:
>                 sdl_button = SDL_BUTTON_MIDDLE;
>@@ -364,7 +437,8 @@
> 
>     input->display = d;
>     input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, 1);
>-
>+    input->sx_w = wl_fixed_from_int(0);
>+    input->sy_w = wl_fixed_from_int(0);
>     d->input = input;
> 
>     wl_seat_add_listener(input->seat, &seat_listener, input);
>diff -r cf8fab52e33b src/video/wayland/SDL_waylandvideo.c
>--- a/src/video/wayland/SDL_waylandvideo.c	Thu Apr 09 22:28:37 2015 -0400
>+++ b/src/video/wayland/SDL_waylandvideo.c	Sun Apr 12 08:46:28 2015 +0900
>@@ -119,6 +119,7 @@
>     device->SetWindowFullscreen = Wayland_SetWindowFullscreen;
>     device->SetWindowSize = Wayland_SetWindowSize;
>     device->DestroyWindow = Wayland_DestroyWindow;
>+    device->SetWindowHitTest = Wayland_SetWindowHitTest;
> 
>     device->free = Wayland_DeleteDevice;
> 
>diff -r cf8fab52e33b src/video/wayland/SDL_waylandwindow.c
>--- a/src/video/wayland/SDL_waylandwindow.c	Thu Apr 09 22:28:37 2015 -0400
>+++ b/src/video/wayland/SDL_waylandwindow.c	Sun Apr 12 08:46:28 2015 +0900
>@@ -109,6 +109,12 @@
>     return SDL_TRUE;
> }
> 
>+int
>+Wayland_SetWindowHitTest(SDL_Window *window, SDL_bool enabled)
>+{
>+    return 0;  /* just succeed, the real work is done elsewhere. */
>+}
>+
> void Wayland_ShowWindow(_THIS, SDL_Window *window)
> {
>     SDL_WindowData *wind = window->driverdata;
>diff -r cf8fab52e33b src/video/wayland/SDL_waylandwindow.h
>--- a/src/video/wayland/SDL_waylandwindow.h	Thu Apr 09 22:28:37 2015 -0400
>+++ b/src/video/wayland/SDL_waylandwindow.h	Sun Apr 12 08:46:28 2015 +0900
>@@ -55,6 +55,7 @@
> 
> extern SDL_bool
> Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
>+extern int Wayland_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
> 
> #endif /* _SDL_waylandwindow_h */
>

Actions: View | Diff

Attachments on bug 2941: 2119 | 2120

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.