# define BTN_BACK 0x116
#endif
-#include <X11/extensions/XKBcommon.h>
+#include <xkbcommon/xkbcommon.h>
/* local function prototypes */
static Eina_Bool _ecore_wl_shutdown(Eina_Bool close_display);
static void _ecore_wl_cb_disp_handle_geometry(void *data __UNUSED__, struct wl_output *output __UNUSED__, int x, int y, int pw __UNUSED__, int ph __UNUSED__, int subpixel __UNUSED__, const char *make __UNUSED__, const char *model __UNUSED__);
static void _ecore_wl_cb_disp_handle_mode(void *data __UNUSED__, struct wl_output *output __UNUSED__, uint32_t flags, int w, int h, int refresh __UNUSED__);
static Eina_Bool _ecore_wl_cb_fd_handle(void *data, Ecore_Fd_Handler *hdl __UNUSED__);
-static void _ecore_wl_cb_handle_motion(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, int32_t x, int32_t y, int32_t sx, int32_t sy);
+static void _ecore_wl_cb_handle_motion(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, int32_t sx, int32_t sy);
static void _ecore_wl_cb_handle_button(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, uint32_t btn, uint32_t state);
static void _ecore_wl_cb_handle_key(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t __UNUSED__, uint32_t key, uint32_t state);
-static void _ecore_wl_cb_handle_pointer_focus(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, struct wl_surface *surface, int32_t x, int32_t y, int32_t sx, int32_t sy);
+static void _ecore_wl_cb_handle_pointer_focus(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, struct wl_surface *surface, int32_t sx, int32_t sy);
static void _ecore_wl_cb_handle_keyboard_focus(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t __UNUSED__, struct wl_surface *surface, struct wl_array *keys);
static void _ecore_wl_cb_handle_touch_down(void *data __UNUSED__, struct wl_input_device *dev __UNUSED__, uint32_t timestamp, struct wl_surface *surface, int32_t id, int32_t x, int32_t y);
static void _ecore_wl_cb_handle_touch_up(void *data __UNUSED__, struct wl_input_device *dev __UNUSED__, uint32_t timestamp, int32_t id);
source->buffer = buffer;
wl_data_device_start_drag(source->data_dev, source->data_source,
- surface, source->timestamp);
+ surface, surface, source->timestamp);
}
EAPI void
}
static void
-_ecore_wl_cb_handle_motion(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, int32_t x, int32_t y, int32_t sx, int32_t sy)
+_ecore_wl_cb_handle_motion(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, int32_t sx, int32_t sy)
{
// LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (dev != _ecore_wl_input_dev) return;
- _ecore_wl_screen_x = x;
- _ecore_wl_screen_y = y;
+ /* _ecore_wl_screen_x = x; */
+ /* _ecore_wl_screen_y = y; */
_ecore_wl_surface_x = sx;
_ecore_wl_surface_y = sy;
ev->timestamp = t;
ev->x = _ecore_wl_surface_x;
ev->y = _ecore_wl_surface_y;
- ev->root.x = _ecore_wl_screen_x;
- ev->root.y = _ecore_wl_screen_y;
+ /* ev->root.x = _ecore_wl_screen_x; */
+ /* ev->root.y = _ecore_wl_screen_y; */
ev->modifiers = _ecore_wl_input_modifiers;
ev->direction = 0;
}
static void
-_ecore_wl_cb_handle_pointer_focus(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, struct wl_surface *surface, int32_t x, int32_t y, int32_t sx, int32_t sy)
+_ecore_wl_cb_handle_pointer_focus(void *data __UNUSED__, struct wl_input_device *dev, uint32_t t, struct wl_surface *surface, int32_t sx, int32_t sy)
{
if (dev != _ecore_wl_input_dev) return;
* move or resize is finished, we get this event again, but this time
* with an active surface */
- _ecore_wl_screen_x = x;
- _ecore_wl_screen_y = y;
+ /* _ecore_wl_screen_x = x; */
+ /* _ecore_wl_screen_y = y; */
_ecore_wl_surface_x = sx;
_ecore_wl_surface_y = sy;
printf("\tHave Drag Source\n");
/* FIXME: buffer here should really be the mouse cursor buffer */
- wl_data_device_attach(s->data_dev, s->timestamp, s->buffer,
- s->hotspot_x, s->hotspot_y);
+ /* wl_data_device_attach(s->data_dev, s->timestamp, s->buffer, */
+ /* s->hotspot_x, s->hotspot_y); */
}
static void
ev->x = _ecore_wl_surface_x;
ev->y = _ecore_wl_surface_y;
- ev->root.x = _ecore_wl_screen_x;
- ev->root.y = _ecore_wl_screen_y;
+ /* ev->root.x = _ecore_wl_screen_x; */
+ /* ev->root.y = _ecore_wl_screen_y; */
ev->modifiers = _ecore_wl_input_modifiers;
ev->multi.device = 0;
ev->multi.angle = 0.0;
ev->multi.x = _ecore_wl_surface_x;
ev->multi.y = _ecore_wl_surface_y;
- ev->multi.root.x = _ecore_wl_screen_x;
- ev->multi.root.y = _ecore_wl_screen_y;
+ /* ev->multi.root.x = _ecore_wl_screen_x; */
+ /* ev->multi.root.y = _ecore_wl_screen_y; */
{
unsigned int id = 0;
ev->x = _ecore_wl_surface_x;
ev->y = _ecore_wl_surface_y;
- ev->root.x = _ecore_wl_screen_x;
- ev->root.y = _ecore_wl_screen_y;
+ /* ev->root.x = _ecore_wl_screen_x; */
+ /* ev->root.y = _ecore_wl_screen_y; */
ev->modifiers = _ecore_wl_input_modifiers;
ev->time = timestamp;
ev->x = _ecore_wl_surface_x;
ev->y = _ecore_wl_surface_y;
- ev->root.x = _ecore_wl_screen_x;
- ev->root.y = _ecore_wl_screen_y;
+ /* ev->root.x = _ecore_wl_screen_x; */
+ /* ev->root.y = _ecore_wl_screen_y; */
ev->modifiers = _ecore_wl_input_modifiers;
ev->time = timestamp;
ev->timestamp = timestamp;
ev->x = _ecore_wl_surface_x;
ev->y = _ecore_wl_surface_y;
- ev->root.x = _ecore_wl_screen_x;
- ev->root.y = _ecore_wl_screen_y;
+ /* ev->root.x = _ecore_wl_screen_x; */
+ /* ev->root.y = _ecore_wl_screen_y; */
ev->modifiers = _ecore_wl_input_modifiers;
/* FIXME: Need to get these from Wayland somehow */
ev->multi.angle = 0.0;
ev->multi.x = _ecore_wl_surface_x;
ev->multi.y = _ecore_wl_surface_y;
- ev->multi.root.x = _ecore_wl_screen_x;
- ev->multi.root.y = _ecore_wl_screen_y;
+ /* ev->multi.root.x = _ecore_wl_screen_x; */
+ /* ev->multi.root.y = _ecore_wl_screen_y; */
{
unsigned int id = 0;
ev->timestamp = timestamp;
ev->x = _ecore_wl_surface_x;
ev->y = _ecore_wl_surface_y;
- ev->root.x = _ecore_wl_screen_x;
- ev->root.y = _ecore_wl_screen_y;
+ /* ev->root.x = _ecore_wl_screen_x; */
+ /* ev->root.y = _ecore_wl_screen_y; */
ev->modifiers = _ecore_wl_input_modifiers;
/* FIXME: Need to get these from Wayland somehow */
ev->multi.angle = 0.0;
ev->multi.x = _ecore_wl_surface_x;
ev->multi.y = _ecore_wl_surface_y;
- ev->multi.root.x = _ecore_wl_screen_x;
- ev->multi.root.y = _ecore_wl_screen_y;
+ /* ev->multi.root.x = _ecore_wl_screen_x; */
+ /* ev->multi.root.y = _ecore_wl_screen_y; */
{
unsigned int id = 0;