Zebediah Figura : winex11: Fix the build when XInput2 headers are not present.
Alexandre Julliard
julliard at winehq.org
Wed Dec 22 16:17:55 CST 2021
Module: wine
Branch: master
Commit: 6ef7cd4e3ae54d6ed09d85a2518e7e64d7f03573
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef7cd4e3ae54d6ed09d85a2518e7e64d7f03573
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Tue Dec 21 20:26:52 2021 -0600
winex11: Fix the build when XInput2 headers are not present.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/mouse.c | 155 ++++++++++++++++++++++++-----------------------
1 file changed, 79 insertions(+), 76 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 9e56e080bda..51a6828f10c 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -275,7 +275,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
thread_data->x_valuator.value = 0;
thread_data->y_valuator.value = 0;
}
-#endif
/***********************************************************************
@@ -283,7 +282,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
*/
static void enable_xinput2(void)
{
-#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
struct x11drv_thread_data *data = x11drv_thread_data();
XIEventMask mask;
XIDeviceInfo *pointer_info;
@@ -330,9 +328,10 @@ static void enable_xinput2(void)
data->xi2_current_slave = 0;
data->xi2_state = xi_enabled;
-#endif
}
+#endif
+
/***********************************************************************
* disable_xinput2
*/
@@ -371,6 +370,7 @@ static void disable_xinput2(void)
*/
static BOOL grab_clipping_window( const RECT *clip )
{
+#if HAVE_X11_EXTENSIONS_XINPUT2_H
static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0};
struct x11drv_thread_data *data = x11drv_thread_data();
Window clip_window;
@@ -441,6 +441,10 @@ static BOOL grab_clipping_window( const RECT *clip )
data->clip_hwnd = msg_hwnd;
SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd );
return TRUE;
+#else
+ WARN( "XInput2 was not available at compile time\n" );
+ return FALSE;
+#endif
}
/***********************************************************************
@@ -628,79 +632,6 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x
input->u.mi.dy = pt.y;
}
-static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
-{
- struct x11drv_thread_data *thread_data = x11drv_thread_data();
- XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator;
- double x_value = 0, y_value = 0, x_scale, y_scale;
- const double *values = event->valuators.values;
- RECT virtual_rect;
- int i;
-
- if (x->number < 0 || y->number < 0) return FALSE;
- if (!event->valuators.mask_len) return FALSE;
- if (thread_data->xi2_state != xi_enabled) return FALSE;
-
- /* If there is no slave currently detected, no previous motion nor device
- * change events were received. Look it up now on the device list in this
- * case.
- */
- if (!thread_data->xi2_current_slave)
- {
- XIDeviceInfo *devices = thread_data->xi2_devices;
-
- for (i = 0; i < thread_data->xi2_device_count; i++)
- {
- if (devices[i].use != XISlavePointer) continue;
- if (devices[i].deviceid != event->deviceid) continue;
- if (devices[i].attachment != thread_data->xi2_core_pointer) continue;
- thread_data->xi2_current_slave = event->deviceid;
- break;
- }
- }
- if (event->deviceid != thread_data->xi2_current_slave) return FALSE;
-
- virtual_rect = get_virtual_screen_rect();
-
- if (x->max <= x->min) x_scale = 1;
- else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min);
- if (y->max <= y->min) y_scale = 1;
- else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min);
-
- for (i = 0; i <= max( x->number, y->number ); i++)
- {
- if (!XIMaskIsSet( event->valuators.mask, i )) continue;
- if (i == x->number)
- {
- x_value = *values;
- x->value += x_value * x_scale;
- }
- if (i == y->number)
- {
- y_value = *values;
- y->value += y_value * y_scale;
- }
- values++;
- }
-
- input->u.mi.dx = round( x->value );
- input->u.mi.dy = round( y->value );
-
- TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy );
-
- x->value -= input->u.mi.dx;
- y->value -= input->u.mi.dy;
-
- if (!input->u.mi.dx && !input->u.mi.dy)
- {
- TRACE( "accumulating motion\n" );
- return FALSE;
- }
-
- return TRUE;
-}
-
-
/***********************************************************************
* send_mouse_input
*
@@ -1887,6 +1818,78 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
return TRUE;
}
+static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
+{
+ struct x11drv_thread_data *thread_data = x11drv_thread_data();
+ XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator;
+ double x_value = 0, y_value = 0, x_scale, y_scale;
+ const double *values = event->valuators.values;
+ RECT virtual_rect;
+ int i;
+
+ if (x->number < 0 || y->number < 0) return FALSE;
+ if (!event->valuators.mask_len) return FALSE;
+ if (thread_data->xi2_state != xi_enabled) return FALSE;
+
+ /* If there is no slave currently detected, no previous motion nor device
+ * change events were received. Look it up now on the device list in this
+ * case.
+ */
+ if (!thread_data->xi2_current_slave)
+ {
+ XIDeviceInfo *devices = thread_data->xi2_devices;
+
+ for (i = 0; i < thread_data->xi2_device_count; i++)
+ {
+ if (devices[i].use != XISlavePointer) continue;
+ if (devices[i].deviceid != event->deviceid) continue;
+ if (devices[i].attachment != thread_data->xi2_core_pointer) continue;
+ thread_data->xi2_current_slave = event->deviceid;
+ break;
+ }
+ }
+ if (event->deviceid != thread_data->xi2_current_slave) return FALSE;
+
+ virtual_rect = get_virtual_screen_rect();
+
+ if (x->max <= x->min) x_scale = 1;
+ else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min);
+ if (y->max <= y->min) y_scale = 1;
+ else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min);
+
+ for (i = 0; i <= max( x->number, y->number ); i++)
+ {
+ if (!XIMaskIsSet( event->valuators.mask, i )) continue;
+ if (i == x->number)
+ {
+ x_value = *values;
+ x->value += x_value * x_scale;
+ }
+ if (i == y->number)
+ {
+ y_value = *values;
+ y->value += y_value * y_scale;
+ }
+ values++;
+ }
+
+ input->u.mi.dx = round( x->value );
+ input->u.mi.dy = round( y->value );
+
+ TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy );
+
+ x->value -= input->u.mi.dx;
+ y->value -= input->u.mi.dy;
+
+ if (!input->u.mi.dx && !input->u.mi.dy)
+ {
+ TRACE( "accumulating motion\n" );
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
/***********************************************************************
* X11DRV_RawMotion
*/
More information about the wine-cvs
mailing list