src/video/wayland/SDL_waylandtouch.h
changeset 8104 2e4f1bd21196
parent 8082 5b83ad3f01ac
child 8149 681eb46b8ac4
     1.1 --- a/src/video/wayland/SDL_waylandtouch.h	Wed Jan 08 14:53:08 2014 -0500
     1.2 +++ b/src/video/wayland/SDL_waylandtouch.h	Thu Jan 09 13:56:21 2014 -0300
     1.3 @@ -19,7 +19,7 @@
     1.4    3. This notice may not be removed or altered from any source distribution.
     1.5  */
     1.6  
     1.7 -#include "SDL_config.h"
     1.8 +#include "../../SDL_internal.h"
     1.9  
    1.10  #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
    1.11  
    1.12 @@ -29,8 +29,9 @@
    1.13  #include "SDL_waylandvideo.h"
    1.14  #include <stdint.h>
    1.15  #include <stddef.h>
    1.16 -#include "wayland-client.h"
    1.17  #include "wayland-util.h"
    1.18 +#include "SDL_waylanddyn.h"
    1.19 +
    1.20  
    1.21  void Wayland_touch_create(SDL_VideoData *data, uint32_t id);
    1.22  void Wayland_touch_destroy(SDL_VideoData *data);
    1.23 @@ -89,7 +90,7 @@
    1.24  static inline void
    1.25  qt_surface_extension_destroy(struct qt_surface_extension *qt_surface_extension)
    1.26  {
    1.27 -    wl_proxy_destroy((struct wl_proxy *) qt_surface_extension);
    1.28 +    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_surface_extension);
    1.29  }
    1.30  
    1.31  static inline struct qt_extended_surface *
    1.32 @@ -102,7 +103,7 @@
    1.33      if (!id)
    1.34          return NULL;
    1.35  
    1.36 -    wl_proxy_marshal((struct wl_proxy *) qt_surface_extension,
    1.37 +    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_surface_extension,
    1.38               QT_SURFACE_EXTENSION_GET_EXTENDED_SURFACE, id, surface);
    1.39  
    1.40      return (struct qt_extended_surface *) id;
    1.41 @@ -166,39 +167,39 @@
    1.42  static inline void
    1.43  qt_extended_surface_set_user_data(struct qt_extended_surface *qt_extended_surface, void *user_data)
    1.44  {
    1.45 -    wl_proxy_set_user_data((struct wl_proxy *) qt_extended_surface, user_data);
    1.46 +    WAYLAND_wl_proxy_set_user_data((struct wl_proxy *) qt_extended_surface, user_data);
    1.47  }
    1.48  
    1.49  static inline void *
    1.50  qt_extended_surface_get_user_data(struct qt_extended_surface *qt_extended_surface)
    1.51  {
    1.52 -    return wl_proxy_get_user_data((struct wl_proxy *) qt_extended_surface);
    1.53 +    return WAYLAND_wl_proxy_get_user_data((struct wl_proxy *) qt_extended_surface);
    1.54  }
    1.55  
    1.56  static inline void
    1.57  qt_extended_surface_destroy(struct qt_extended_surface *qt_extended_surface)
    1.58  {
    1.59 -    wl_proxy_destroy((struct wl_proxy *) qt_extended_surface);
    1.60 +    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_extended_surface);
    1.61  }
    1.62  
    1.63  static inline void
    1.64  qt_extended_surface_update_generic_property(struct qt_extended_surface *qt_extended_surface, const char *name, struct wl_array *value)
    1.65  {
    1.66 -    wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
    1.67 +    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
    1.68               QT_EXTENDED_SURFACE_UPDATE_GENERIC_PROPERTY, name, value);
    1.69  }
    1.70  
    1.71  static inline void
    1.72  qt_extended_surface_set_content_orientation(struct qt_extended_surface *qt_extended_surface, int32_t orientation)
    1.73  {
    1.74 -    wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
    1.75 +    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
    1.76               QT_EXTENDED_SURFACE_SET_CONTENT_ORIENTATION, orientation);
    1.77  }
    1.78  
    1.79  static inline void
    1.80  qt_extended_surface_set_window_flags(struct qt_extended_surface *qt_extended_surface, int32_t flags)
    1.81  {
    1.82 -    wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
    1.83 +    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
    1.84               QT_EXTENDED_SURFACE_SET_WINDOW_FLAGS, flags);
    1.85  }
    1.86  
    1.87 @@ -269,25 +270,25 @@
    1.88  static inline void
    1.89  qt_touch_extension_set_user_data(struct qt_touch_extension *qt_touch_extension, void *user_data)
    1.90  {
    1.91 -    wl_proxy_set_user_data((struct wl_proxy *) qt_touch_extension, user_data);
    1.92 +    WAYLAND_wl_proxy_set_user_data((struct wl_proxy *) qt_touch_extension, user_data);
    1.93  }
    1.94  
    1.95  static inline void *
    1.96  qt_touch_extension_get_user_data(struct qt_touch_extension *qt_touch_extension)
    1.97  {
    1.98 -    return wl_proxy_get_user_data((struct wl_proxy *) qt_touch_extension);
    1.99 +    return WAYLAND_wl_proxy_get_user_data((struct wl_proxy *) qt_touch_extension);
   1.100  }
   1.101  
   1.102  static inline void
   1.103  qt_touch_extension_destroy(struct qt_touch_extension *qt_touch_extension)
   1.104  {
   1.105 -    wl_proxy_destroy((struct wl_proxy *) qt_touch_extension);
   1.106 +    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_touch_extension);
   1.107  }
   1.108  
   1.109  static inline void
   1.110  qt_touch_extension_dummy(struct qt_touch_extension *qt_touch_extension)
   1.111  {
   1.112 -    wl_proxy_marshal((struct wl_proxy *) qt_touch_extension,
   1.113 +    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_touch_extension,
   1.114               QT_TOUCH_EXTENSION_DUMMY);
   1.115  }
   1.116  
   1.117 @@ -324,25 +325,25 @@
   1.118  static inline void
   1.119  qt_windowmanager_set_user_data(struct qt_windowmanager *qt_windowmanager, void *user_data)
   1.120  {
   1.121 -    wl_proxy_set_user_data((struct wl_proxy *) qt_windowmanager, user_data);
   1.122 +    WAYLAND_wl_proxy_set_user_data((struct wl_proxy *) qt_windowmanager, user_data);
   1.123  }
   1.124  
   1.125  static inline void *
   1.126  qt_windowmanager_get_user_data(struct qt_windowmanager *qt_windowmanager)
   1.127  {
   1.128 -    return wl_proxy_get_user_data((struct wl_proxy *) qt_windowmanager);
   1.129 +    return WAYLAND_wl_proxy_get_user_data((struct wl_proxy *) qt_windowmanager);
   1.130  }
   1.131  
   1.132  static inline void
   1.133  qt_windowmanager_destroy(struct qt_windowmanager *qt_windowmanager)
   1.134  {
   1.135 -    wl_proxy_destroy((struct wl_proxy *) qt_windowmanager);
   1.136 +    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_windowmanager);
   1.137  }
   1.138  
   1.139  static inline void
   1.140  qt_windowmanager_open_url(struct qt_windowmanager *qt_windowmanager, uint32_t remaining, const char *url)
   1.141  {
   1.142 -    wl_proxy_marshal((struct wl_proxy *) qt_windowmanager,
   1.143 +    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_windowmanager,
   1.144               QT_WINDOWMANAGER_OPEN_URL, remaining, url);
   1.145  }
   1.146