Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- dlls/user32/rawinput.c | 2 +- server/queue.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 49cf9f73a0..58480b8ae7 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -271,7 +271,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, U TRACE("device %u: page %#x, usage %#x, flags %#x, target %p.\n", i, devices[i].usUsagePage, devices[i].usUsage, devices[i].dwFlags, devices[i].hwndTarget); - if (devices[i].dwFlags & ~RIDEV_REMOVE) + if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY)) FIXME("Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i);
d[i].usage_page = devices[i].usUsagePage; diff --git a/server/queue.c b/server/queue.c index 96587d11d1..055bc1ff3c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -372,6 +372,9 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) static const struct hw_msg_source source = { IMDT_UNAVAILABLE, IMO_SYSTEM }; struct message *msg;
+ if (current->process->rawinput_mouse && + current->process->rawinput_mouse->flags & RIDEV_NOLEGACY) return; + if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return;
msg->msg = WM_MOUSEMOVE; @@ -1668,6 +1671,9 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data->rawinput.mouse.data = input->mouse.data;
queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; }
for (i = 0; i < ARRAY_SIZE( messages ); i++) @@ -1793,6 +1799,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data->rawinput.kbd.scan = input->kbd.scan;
queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; }
if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0;
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- dlls/user32/message.c | 46 +++---------------------------------------- server/protocol.def | 9 +++++---- server/queue.c | 46 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 43ce77c2dd..b6dd7d5932 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2295,54 +2295,14 @@ static BOOL process_rawinput_message( MSG *msg, const struct hardware_msg_data * rawinput->header.dwType = msg_data->rawinput.type; if (msg_data->rawinput.type == RIM_TYPEMOUSE) { - static const unsigned int button_flags[] = - { - 0, /* MOUSEEVENTF_MOVE */ - RI_MOUSE_LEFT_BUTTON_DOWN, /* MOUSEEVENTF_LEFTDOWN */ - RI_MOUSE_LEFT_BUTTON_UP, /* MOUSEEVENTF_LEFTUP */ - RI_MOUSE_RIGHT_BUTTON_DOWN, /* MOUSEEVENTF_RIGHTDOWN */ - RI_MOUSE_RIGHT_BUTTON_UP, /* MOUSEEVENTF_RIGHTUP */ - RI_MOUSE_MIDDLE_BUTTON_DOWN, /* MOUSEEVENTF_MIDDLEDOWN */ - RI_MOUSE_MIDDLE_BUTTON_UP, /* MOUSEEVENTF_MIDDLEUP */ - }; - unsigned int i; - rawinput->header.dwSize = FIELD_OFFSET(RAWINPUT, data) + sizeof(RAWMOUSE); rawinput->header.hDevice = WINE_MOUSE_HANDLE; rawinput->header.wParam = 0;
rawinput->data.mouse.usFlags = MOUSE_MOVE_RELATIVE; - rawinput->data.mouse.u.s.usButtonFlags = 0; - rawinput->data.mouse.u.s.usButtonData = 0; - for (i = 1; i < ARRAY_SIZE(button_flags); ++i) - { - if (msg_data->flags & (1 << i)) - rawinput->data.mouse.u.s.usButtonFlags |= button_flags[i]; - } - if (msg_data->flags & MOUSEEVENTF_WHEEL) - { - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_WHEEL; - rawinput->data.mouse.u.s.usButtonData = msg_data->rawinput.mouse.data; - } - if (msg_data->flags & MOUSEEVENTF_HWHEEL) - { - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_HORIZONTAL_WHEEL; - rawinput->data.mouse.u.s.usButtonData = msg_data->rawinput.mouse.data; - } - if (msg_data->flags & MOUSEEVENTF_XDOWN) - { - if (msg_data->rawinput.mouse.data == XBUTTON1) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_4_DOWN; - else if (msg_data->rawinput.mouse.data == XBUTTON2) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_5_DOWN; - } - if (msg_data->flags & MOUSEEVENTF_XUP) - { - if (msg_data->rawinput.mouse.data == XBUTTON1) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_4_UP; - else if (msg_data->rawinput.mouse.data == XBUTTON2) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_5_UP; - } + + rawinput->data.mouse.u.s.usButtonFlags = msg_data->rawinput.mouse.button_flags; + rawinput->data.mouse.u.s.usButtonData = msg_data->rawinput.mouse.button_data;
rawinput->data.mouse.ulRawButtons = 0; rawinput->data.mouse.lLastX = msg_data->rawinput.mouse.x; diff --git a/server/protocol.def b/server/protocol.def index 8157199f2f..f7e0008b04 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -304,10 +304,11 @@ struct hardware_msg_data } kbd; struct { - int type; /* RIM_TYPEMOUSE */ - int x; /* x coordinate */ - int y; /* y coordinate */ - unsigned int data; /* mouse data */ + int type; /* RIM_TYPEMOUSE */ + int x; /* x coordinate */ + int y; /* y coordinate */ + unsigned short button_flags; /* mouse button */ + unsigned short button_data; /* event details */ } mouse; } rawinput; }; diff --git a/server/queue.c b/server/queue.c index 055bc1ff3c..c87801001e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1627,6 +1627,16 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons WM_MOUSEHWHEEL /* 0x1000 = MOUSEEVENTF_HWHEEL */ };
+ static const unsigned int raw_button_flags[] = { + 0, /* 0x0001 = MOUSEEVENTF_MOVE */ + RI_MOUSE_LEFT_BUTTON_DOWN, /* 0x0002 = MOUSEEVENTF_LEFTDOWN */ + RI_MOUSE_LEFT_BUTTON_UP, /* 0x0004 = MOUSEEVENTF_LEFTUP */ + RI_MOUSE_RIGHT_BUTTON_DOWN, /* 0x0008 = MOUSEEVENTF_RIGHTDOWN */ + RI_MOUSE_RIGHT_BUTTON_UP, /* 0x0010 = MOUSEEVENTF_RIGHTUP */ + RI_MOUSE_MIDDLE_BUTTON_DOWN, /* 0x0020 = MOUSEEVENTF_MIDDLEDOWN */ + RI_MOUSE_MIDDLE_BUTTON_UP, /* 0x0040 = MOUSEEVENTF_MIDDLEUP */ + }; + desktop->cursor.last_change = get_tick_count(); flags = input->mouse.flags; time = input->mouse.time; @@ -1664,11 +1674,43 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg->wparam = RIM_INPUT; msg->lparam = 0;
- msg_data->flags = flags; + msg_data->flags = 0; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; msg_data->rawinput.mouse.y = y - desktop->cursor.y; - msg_data->rawinput.mouse.data = input->mouse.data; + msg_data->rawinput.mouse.button_flags = 0; + msg_data->rawinput.mouse.button_data = 0; + + for (i = 1; i < ARRAY_SIZE(raw_button_flags); ++i) + { + if (flags & (1 << i)) + msg_data->rawinput.mouse.button_flags |= raw_button_flags[i]; + } + + if (flags & MOUSEEVENTF_WHEEL) + { + msg_data->rawinput.mouse.button_flags |= RI_MOUSE_WHEEL; + msg_data->rawinput.mouse.button_data = input->mouse.data; + } + if (flags & MOUSEEVENTF_HWHEEL) + { + msg_data->rawinput.mouse.button_flags |= RI_MOUSE_HORIZONTAL_WHEEL; + msg_data->rawinput.mouse.button_data = input->mouse.data; + } + if (flags & MOUSEEVENTF_XDOWN) + { + if (input->mouse.data == XBUTTON1) + msg_data->rawinput.mouse.button_flags |= RI_MOUSE_BUTTON_4_DOWN; + else if (input->mouse.data == XBUTTON2) + msg_data->rawinput.mouse.button_flags |= RI_MOUSE_BUTTON_5_DOWN; + } + if (flags & MOUSEEVENTF_XUP) + { + if (input->mouse.data == XBUTTON1) + msg_data->rawinput.mouse.button_flags |= RI_MOUSE_BUTTON_4_UP; + else if (input->mouse.data == XBUTTON2) + msg_data->rawinput.mouse.button_flags |= RI_MOUSE_BUTTON_5_UP; + }
queue_hardware_message( desktop, msg, 0 );
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55086
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds win.c:10131: Test failed: GetActiveWindow() = 00000000 win.c:10131: Test failed: GetFocus() = 00000000 win.c:10133: Test failed: Expected foreground window 000E0120, got 00E300D4 win.c:10136: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. win.c:10143: Test failed: Expected foreground window 000E0120, got 00000000 win.c:10145: Test failed: GetActiveWindow() = 00000000 win.c:10145: Test failed: GetFocus() = 00000000 win.c:10150: Test failed: Expected foreground window 000E0120, got 00E300D4 win.c:10153: Test failed: Received WM_ACTIVATEAPP(1), did not expect it.
Report errors: user32:msg prints too much data (35221 bytes)
Hello Derek, This whole approach of using a static flag in wineserver seems needlessly complicated to me. Have you considered instead just adding extra fields to hw_input_t.mouse? That way you would keep the server diff much smaller, and you would also avoid making an extra server call for every motion event we receive (which, I gather, is already a rather pressing concern for mice with high polling rates).
ἔρρωσο, Zeb
Zebediah, I think that using hw_input_t for rawinput would make the code harder to follow. To do it this way we'd probably want to transform RAWINPUT into the custom fields of hw_input_t from __wine_send_input, and decipher the result on the server side. Using a hw_rawinput_t allows us to more closely match the internal data structures of windows from the display drivers / user32.
Additionally, the polling rate bug seems to be dinput related, not wineserver as was previously thought. On a side note, many people with high polling rates have tested Overwatch and none of them have reported lower performance.
Derek
On 8/5/19 11:25 AM, Derek Lesho wrote:
Zebediah, I think that using hw_input_t for rawinput would make the code harder to follow. To do it this way we'd probably want to transform RAWINPUT into the custom fields of hw_input_t from __wine_send_input, and decipher the result on the server side. Using a hw_rawinput_t allows us to more closely match the internal data structures of windows from the display drivers / user32.
I'm not sure I see how this is harder. It's the same thing we currently do, except now we're adding another couple of fields for raw messages. That way, we don't have to add any extra logic, we just pass more data along the same paths.
I also don't see why matching internal data structures should be a goal of ours.
What we do now is send a win32-defined INPUT structure to __wine_send_input and send_hardware_message. If we want to send raw data alongside it we'll have probably need to send in a RAWINPUT structure as well as an INPUT structure to these functions. Most invocations of __wine_send_input and send_hardware_message aren't sending raw-input data at all, but since C doesn't have optional parameters we'd have to refactor all invocations of it.
This also doesn't solve your primary concern, which is the static variable to indicate whether we want to emulate raw-input mouse movement. Yes we could duplicate the raw-input emulation code into all the display drivers for the mouse now and the keyboard in the future, but the current solution completely avoids this, and allows display drivers that have raw-input capabilities to seamlessly send what they want.
On Mon, Aug 5, 2019 at 12:55 PM Zebediah Figura zfigura@codeweavers.com wrote:
On 8/5/19 11:25 AM, Derek Lesho wrote:
Zebediah, I think that using hw_input_t for rawinput would make the code harder to follow. To do it this way we'd probably want to transform RAWINPUT into the custom fields of hw_input_t from __wine_send_input, and decipher the result on the server side. Using a hw_rawinput_t allows us to more closely match the internal data structures of windows from the display drivers / user32.
I'm not sure I see how this is harder. It's the same thing we currently do, except now we're adding another couple of fields for raw messages. That way, we don't have to add any extra logic, we just pass more data along the same paths.
I also don't see why matching internal data structures should be a goal of ours.
Also, keep in mind that with the combination solution, we will only be saving wine-server calls when the window is clipped. Raw-Input data is necessarily being send from many x11 threads and subsequently being discarded if the window isn't the foreground one. With the current version only one extra normal hardware message is being sent per frame, the one with the clipped window.
As outlined by Remi in a previous email, with further fixes it may even be possible to remove this extra layer of RawMotion and use the RAWINPUT structure for the low-level hooks that dinput uses, but I'm not entirely sure whether that is correct yet.
On Mon, Aug 5, 2019 at 1:22 PM Derek Lesho dereklesho52@gmail.com wrote:
What we do now is send a win32-defined INPUT structure to __wine_send_input and send_hardware_message. If we want to send raw data alongside it we'll have probably need to send in a RAWINPUT structure as well as an INPUT structure to these functions. Most invocations of __wine_send_input and send_hardware_message aren't sending raw-input data at all, but since C doesn't have optional parameters we'd have to refactor all invocations of it.
This also doesn't solve your primary concern, which is the static variable to indicate whether we want to emulate raw-input mouse movement. Yes we could duplicate the raw-input emulation code into all the display drivers for the mouse now and the keyboard in the future, but the current solution completely avoids this, and allows display drivers that have raw-input capabilities to seamlessly send what they want.
On Mon, Aug 5, 2019 at 12:55 PM Zebediah Figura zfigura@codeweavers.com wrote:
On 8/5/19 11:25 AM, Derek Lesho wrote:
Zebediah, I think that using hw_input_t for rawinput would make the code harder to follow. To do it this way we'd probably want to transform RAWINPUT into the custom fields of hw_input_t from __wine_send_input, and decipher the result on the server side. Using a hw_rawinput_t allows us to more closely match the internal data structures of windows from the display drivers / user32.
I'm not sure I see how this is harder. It's the same thing we currently do, except now we're adding another couple of fields for raw messages. That way, we don't have to add any extra logic, we just pass more data along the same paths.
I also don't see why matching internal data structures should be a goal of ours.
On 8/5/19 12:22 PM, Derek Lesho wrote:
What we do now is send a win32-defined INPUT structure to __wine_send_input and send_hardware_message. If we want to send raw data alongside it we'll have probably need to send in a RAWINPUT structure as well as an INPUT structure to these functions. Most invocations of __wine_send_input and send_hardware_message aren't sending raw-input data at all, but since C doesn't have optional parameters we'd have to refactor all invocations of it.
This doesn't seem particularly hard. You could even have winemac and wineandroid pass NULL, and have user32 fall back to copying from the INPUT structure in that case.
For that matter, if the only thing that actually matters is the cursor position, you don't even have to pass in a whole RAWINPUT structure, but instead just extra x/y parameters, or a POINT structure.
As yet another alternative, we could just pass in a hw_input_t. If it were my code that's probably what I'd do.
This also doesn't solve your primary concern, which is the static variable to indicate whether we want to emulate raw-input mouse movement. Yes we could duplicate the raw-input emulation code into all the display drivers for the mouse now and the keyboard in the future, but the current solution completely avoids this, and allows display drivers that have raw-input capabilities to seamlessly send what they want.
By the "emulate_raw_mouse" variable I metonymically mean all the logic introduced by this patch series, but essentially, yes. I disagree here with this concern: I don't think deduplication should always be the primary goal, and in this case I think it makes the logic more complicated than it needs to be.
Besides, if ultimately the goal is to send raw input from all USER drivers (and I see no reason why this should not be the case), then there's barely any point trying to make "emulation" simpler.
(By the way, it'd be appreciated if you could bottom-post in replies.)
On Mon, Aug 5, 2019 at 2:19 PM Zebediah Figura zfigura@codeweavers.com wrote:
On 8/5/19 12:22 PM, Derek Lesho wrote:
What we do now is send a win32-defined INPUT structure to __wine_send_input and send_hardware_message. If we want to send raw data alongside it we'll have probably need to send in a RAWINPUT structure as well as an INPUT structure to these functions. Most invocations of __wine_send_input and send_hardware_message aren't sending raw-input data at all, but since C doesn't have optional parameters we'd have to refactor all invocations of it.
This doesn't seem particularly hard. You could even have winemac and wineandroid pass NULL, and have user32 fall back to copying from the INPUT structure in that case.
For that matter, if the only thing that actually matters is the cursor position, you don't even have to pass in a whole RAWINPUT structure, but instead just extra x/y parameters, or a POINT structure.
Take a look at patch 8, we are also sending raw mouse wheel and mouse button data, so we might as well use the RAWINPUT structure in case there are any future quirks with say rawinput keyboard messages.
As yet another alternative, we could just pass in a hw_input_t. If it were my code that's probably what I'd do.
This also doesn't solve your primary concern, which is the static variable to indicate whether we want to emulate raw-input mouse movement. Yes we could duplicate the raw-input emulation code into all the display drivers for the mouse now and the keyboard in the future, but the current solution completely avoids this, and allows display drivers that have raw-input capabilities to seamlessly send what they want.
By the "emulate_raw_mouse" variable I metonymically mean all the logic introduced by this patch series, but essentially, yes. I disagree here with this concern: I don't think deduplication should always be the primary goal, and in this case I think it makes the logic more complicated than it needs to be.
This is a matter of preference, but I think that adding 3 lines of code to disable emulation when we get native events is not overly complicated.
Besides, if ultimately the goal is to send raw input from all USER drivers (and I see no reason why this should not be the case), then there's barely any point trying to make "emulation" simpler.
(By the way, it'd be appreciated if you could bottom-post in replies.)
Sorry, I use G-Mail which top-posts by default.
On 8/5/19 1:32 PM, Derek Lesho wrote:
On Mon, Aug 5, 2019 at 2:19 PM Zebediah Figura zfigura@codeweavers.com wrote:
On 8/5/19 12:22 PM, Derek Lesho wrote:
What we do now is send a win32-defined INPUT structure to __wine_send_input and send_hardware_message. If we want to send raw data alongside it we'll have probably need to send in a RAWINPUT structure as well as an INPUT structure to these functions. Most invocations of __wine_send_input and send_hardware_message aren't sending raw-input data at all, but since C doesn't have optional parameters we'd have to refactor all invocations of it.
This doesn't seem particularly hard. You could even have winemac and wineandroid pass NULL, and have user32 fall back to copying from the INPUT structure in that case.
For that matter, if the only thing that actually matters is the cursor position, you don't even have to pass in a whole RAWINPUT structure, but instead just extra x/y parameters, or a POINT structure.
Take a look at patch 8, we are also sending raw mouse wheel and mouse button data, so we might as well use the RAWINPUT structure in case there are any future quirks with say rawinput keyboard messages.
Sure, I didn't bother looking at the whole patch set. The same point applies.
As yet another alternative, we could just pass in a hw_input_t. If it were my code that's probably what I'd do.
This also doesn't solve your primary concern, which is the static variable to indicate whether we want to emulate raw-input mouse movement. Yes we could duplicate the raw-input emulation code into all the display drivers for the mouse now and the keyboard in the future, but the current solution completely avoids this, and allows display drivers that have raw-input capabilities to seamlessly send what they want.
By the "emulate_raw_mouse" variable I metonymically mean all the logic introduced by this patch series, but essentially, yes. I disagree here with this concern: I don't think deduplication should always be the primary goal, and in this case I think it makes the logic more complicated than it needs to be.
This is a matter of preference, but I think that adding 3 lines of code to disable emulation when we get native events is not overly complicated.
It's not just a matter of adding 3 lines of code (or as many lines of code as your patch 5/9 in fact adds). You also have to move the "emulation" to the server, and you have to have some way of signaling to the server that raw input is supported, as your patch 3/9 does.
Not to mention that using a static variable in patch 5/9 isn't correct. You can't depend on all clients equally supporting raw input. For that matter, I'm not sure you should depend on one client unconditionally supporting raw input.
In general I'm inclined to think that most of this logic should stay out of wineserver. It's the USER driver's responsibility to send the most accurate input that it can. If that means, for now, that some drivers send the same values for normal and raw input, that's not the end of the world. Again, not that line count should be the primary concern, but I suspect the amount of code you'd add this way would even be less than the amount of code this current iteration of the patch set changes.
Besides, if ultimately the goal is to send raw input from all USER drivers (and I see no reason why this should not be the case), then there's barely any point trying to make "emulation" simpler.
(By the way, it'd be appreciated if you could bottom-post in replies.)
Sorry, I use G-Mail which top-posts by default.
Yes, you may have to change your mail client's defaults if they aren't set to sensible values.
I see your point, I will make the changes tonight.
On Mon, Aug 5, 2019 at 2:49 PM Zebediah Figura zfigura@codeweavers.com wrote:
On 8/5/19 1:32 PM, Derek Lesho wrote:
On Mon, Aug 5, 2019 at 2:19 PM Zebediah Figura zfigura@codeweavers.com wrote:
On 8/5/19 12:22 PM, Derek Lesho wrote:
What we do now is send a win32-defined INPUT structure to __wine_send_input and send_hardware_message. If we want to send raw data alongside it we'll have probably need to send in a RAWINPUT structure as well as an INPUT structure to these functions. Most invocations of __wine_send_input and send_hardware_message aren't sending raw-input data at all, but since C doesn't have optional parameters we'd have to refactor all invocations of it.
This doesn't seem particularly hard. You could even have winemac and wineandroid pass NULL, and have user32 fall back to copying from the INPUT structure in that case.
For that matter, if the only thing that actually matters is the cursor position, you don't even have to pass in a whole RAWINPUT structure, but instead just extra x/y parameters, or a POINT structure.
Take a look at patch 8, we are also sending raw mouse wheel and mouse button data, so we might as well use the RAWINPUT structure in case there are any future quirks with say rawinput keyboard messages.
Sure, I didn't bother looking at the whole patch set. The same point applies.
As yet another alternative, we could just pass in a hw_input_t. If it were my code that's probably what I'd do.
This also doesn't solve your primary concern, which is the static variable to indicate whether we want to emulate raw-input mouse movement. Yes we could duplicate the raw-input emulation code into all the display drivers for the mouse now and the keyboard in the future, but the current solution completely avoids this, and allows display drivers that have raw-input capabilities to seamlessly send what they want.
By the "emulate_raw_mouse" variable I metonymically mean all the logic introduced by this patch series, but essentially, yes. I disagree here with this concern: I don't think deduplication should always be the primary goal, and in this case I think it makes the logic more complicated than it needs to be.
This is a matter of preference, but I think that adding 3 lines of code to disable emulation when we get native events is not overly complicated.
It's not just a matter of adding 3 lines of code (or as many lines of code as your patch 5/9 in fact adds). You also have to move the "emulation" to the server, and you have to have some way of signaling to the server that raw input is supported, as your patch 3/9 does.
Not to mention that using a static variable in patch 5/9 isn't correct. You can't depend on all clients equally supporting raw input. For that matter, I'm not sure you should depend on one client unconditionally supporting raw input.
In general I'm inclined to think that most of this logic should stay out of wineserver. It's the USER driver's responsibility to send the most accurate input that it can. If that means, for now, that some drivers send the same values for normal and raw input, that's not the end of the world. Again, not that line count should be the primary concern, but I suspect the amount of code you'd add this way would even be less than the amount of code this current iteration of the patch set changes.
Besides, if ultimately the goal is to send raw input from all USER drivers (and I see no reason why this should not be the case), then there's barely any point trying to make "emulation" simpler.
(By the way, it'd be appreciated if you could bottom-post in replies.)
Sorry, I use G-Mail which top-posts by default.
Yes, you may have to change your mail client's defaults if they aren't set to sensible values.
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v10: - Only send rawinput to foreground window, even if hwnd is specified - Minor structuring adjustments as Remi recommended --- server/protocol.def | 50 ++++++++++++++++++++++++++++----------------- server/queue.c | 48 +++++++++++++++++++++++++++++++++++++++++++ server/trace.c | 21 +++++++++++++++++++ tools/make_requests | 1 + 4 files changed, 101 insertions(+), 19 deletions(-)
diff --git a/server/protocol.def b/server/protocol.def index f7e0008b04..15cd48bbb5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -286,31 +286,38 @@ struct hw_msg_source unsigned int origin; /* source origin (IMO_* values) */ };
+typedef union +{ + int type; + struct + { + int type; /* RIM_TYPEKEYBOARD */ + unsigned int message; /* message generated by this rawinput event */ + unsigned short vkey; /* virtual key code */ + unsigned short scan; /* scan code */ + } kbd; + struct + { + int type; /* RIM_TYPEMOUSE */ + int x; /* x coordinate */ + int y; /* y coordinate */ + unsigned short button_flags; /* mouse button */ + unsigned short button_data; /* event details */ + } mouse; + struct + { + int type; /* RIM_TYPEHID */ + /* TODO: fill this in if/when necessary */ + } hid; +} hw_rawinput_t; + struct hardware_msg_data { lparam_t info; /* extra info */ unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ - union - { - int type; - struct - { - int type; /* RIM_TYPEKEYBOARD */ - unsigned int message; /* message generated by this rawinput event */ - unsigned short vkey; /* virtual key code */ - unsigned short scan; /* scan code */ - } kbd; - struct - { - int type; /* RIM_TYPEMOUSE */ - int x; /* x coordinate */ - int y; /* y coordinate */ - unsigned short button_flags; /* mouse button */ - unsigned short button_data; /* event details */ - } mouse; - } rawinput; + hw_rawinput_t rawinput; };
struct callback_msg_data @@ -2318,6 +2325,11 @@ enum message_type #define SEND_HWMSG_INJECTED 0x01
+@REQ(send_rawinput_message) + hw_rawinput_t input; +@END + + /* Get a message from the current queue */ @REQ(get_message) unsigned int flags; /* PM_* flags */ diff --git a/server/queue.c b/server/queue.c index c87801001e..f2e9c4fab1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2421,6 +2421,54 @@ DECL_HANDLER(send_hardware_message) release_object( desktop ); }
+/* send a hardware rawinput message to the queue thread */ +DECL_HANDLER(send_rawinput_message) +{ + const struct rawinput_device *device; + struct hardware_msg_data *msg_data; + struct message *msg; + struct desktop *desktop; + struct hw_msg_source source = { IMDT_MOUSE, IMO_HARDWARE }; + + desktop = get_thread_desktop( current, 0 ); + + switch (req->input.type) + { + case RIM_TYPEMOUSE: + if ((device = current->process->rawinput_mouse)) + { + struct thread *thread = device->target ? get_window_thread( device->target ) : NULL; + if ((current->queue->input != desktop->foreground_input) || (thread && thread != current)) + goto done; + + if (!(msg = alloc_hardware_message( 0, source, 0 ))) goto done; + msg_data = msg->data; + + msg->win = device->target; + msg->msg = WM_INPUT; + msg->wparam = RIM_INPUT; + msg->lparam = 0; + + msg_data->flags = 0; + msg_data->rawinput.type = RIM_TYPEMOUSE; + msg_data->rawinput.mouse.x = req->input.mouse.x; + msg_data->rawinput.mouse.y = req->input.mouse.y; + msg_data->rawinput.mouse.button_flags = req->input.mouse.button_flags; + msg_data->rawinput.mouse.button_data = req->input.mouse.button_data; + + queue_hardware_message( desktop, msg, 0 ); + + done: + if (thread) release_object( thread ); + } + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + } + + release_object(desktop); +} + /* post a quit message to the current queue */ DECL_HANDLER(post_quit_message) { diff --git a/server/trace.c b/server/trace.c index 0df649ea29..d849d89772 100644 --- a/server/trace.c +++ b/server/trace.c @@ -405,6 +405,27 @@ static void dump_hw_input( const char *prefix, const hw_input_t *input ) } }
+static void dump_hw_rawinput( const char *prefix, const hw_rawinput_t *rawinput ) +{ + switch (rawinput->type) + { + case RIM_TYPEMOUSE: + fprintf( stderr, "%s{type=MOUSE,x=%d,y=%d,button_flags=%04hx,button_data=%04hx}", + prefix, rawinput->mouse.x, rawinput->mouse.y, rawinput->mouse.button_flags, + rawinput->mouse.button_data); + break; + case RIM_TYPEKEYBOARD: + fprintf( stderr, "%s{type=KEYBOARD}\n", prefix); + break; + case RIM_TYPEHID: + fprintf( stderr, "%s{type=HID}\n", prefix); + break; + default: + fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type); + break; + } +} + static void dump_luid( const char *prefix, const luid_t *luid ) { fprintf( stderr, "%s%d.%u", prefix, luid->high_part, luid->low_part ); diff --git a/tools/make_requests b/tools/make_requests index faeabe5852..8b1f1a263b 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -53,6 +53,7 @@ my %formats = "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], "client_cpu_t" => [ 4, 4, "&dump_client_cpu" ], "hw_input_t" => [ 32, 8, "&dump_hw_input" ], + "hw_rawinput_t" => [ 16, 8, "&dump_hw_rawinput" ] );
my @requests = ();
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55087
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: menu.c:2354: Test failed: test 25 msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- dlls/user32/input.c | 29 +++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 31 insertions(+)
diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8b2ae805aa..f7ef1c3be2 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -33,6 +33,7 @@ #include <assert.h>
#define NONAMELESSUNION +#define NONAMELESSSTRUCT
#include "ntstatus.h" #define WIN32_NO_STATUS @@ -129,6 +130,34 @@ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) return !status; }
+BOOL CDECL __wine_send_raw_input( const RAWINPUT *raw_input ) +{ + NTSTATUS status; + + SERVER_START_REQ( send_rawinput_message ) + { + req->input.type = raw_input->header.dwType; + switch (raw_input->header.dwType) + { + case RIM_TYPEMOUSE: + if (raw_input->data.mouse.usFlags || raw_input->data.mouse.ulRawButtons + || raw_input->data.mouse.ulExtraInformation) + WARN("Unhandled parameters"); + + req->input.mouse.x = raw_input->data.mouse.lLastX; + req->input.mouse.y = raw_input->data.mouse.lLastY; + req->input.mouse.button_flags = raw_input->data.mouse.u.s.usButtonFlags; + req->input.mouse.button_data = raw_input->data.mouse.u.s.usButtonData; + break; + } + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} +
/*********************************************************************** * update_mouse_coords diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f9a4ae26df..3311dcd685 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -833,4 +833,5 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) +@ cdecl __wine_send_raw_input(ptr) @ cdecl __wine_set_pixel_format(long long) diff --git a/include/winuser.h b/include/winuser.h index 51c73d25c2..259db275c4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4390,6 +4390,7 @@ WORD WINAPI SYSTEM_KillSystemTimer( WORD );
#ifdef __WINESRC__ WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ); +WINUSERAPI BOOL CDECL __wine_send_raw_input( const RAWINPUT *raw_input ); #endif
#ifdef __cplusplus
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55088
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
On 8/2/19 8:24 AM, Derek Lesho wrote:
diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8b2ae805aa..f7ef1c3be2 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -33,6 +33,7 @@ #include <assert.h>
#define NONAMELESSUNION +#define NONAMELESSSTRUCT
#include "ntstatus.h" #define WIN32_NO_STATUS @@ -129,6 +130,34 @@ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) return !status; }
+BOOL CDECL __wine_send_raw_input( const RAWINPUT *raw_input ) +{
- NTSTATUS status;
- SERVER_START_REQ( send_rawinput_message )
- {
req->input.type = raw_input->header.dwType;switch (raw_input->header.dwType){case RIM_TYPEMOUSE:if (raw_input->data.mouse.usFlags || raw_input->data.mouse.ulRawButtons|| raw_input->data.mouse.ulExtraInformation)WARN("Unhandled parameters");
FIXME would be more appropriate IMHO.
req->input.mouse.x = raw_input->data.mouse.lLastX;req->input.mouse.y = raw_input->data.mouse.lLastY;req->input.mouse.button_flags = raw_input->data.mouse.u.s.usButtonFlags;req->input.mouse.button_data = raw_input->data.mouse.u.s.usButtonData;break;}status = wine_server_call( req );- }
- SERVER_END_REQ;
- if (status) SetLastError( RtlNtStatusToDosError(status) );
- return !status;
+}
/***********************************************************************
update_mouse_coord
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v11: Use FIXME instead of WARN for unhandled params in RAWINPUT --- dlls/user32/input.c | 29 +++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 31 insertions(+)
diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8b2ae805aa..5ecf92428f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -33,6 +33,7 @@ #include <assert.h>
#define NONAMELESSUNION +#define NONAMELESSSTRUCT
#include "ntstatus.h" #define WIN32_NO_STATUS @@ -129,6 +130,34 @@ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) return !status; }
+BOOL CDECL __wine_send_raw_input( const RAWINPUT *raw_input ) +{ + NTSTATUS status; + + SERVER_START_REQ( send_rawinput_message ) + { + req->input.type = raw_input->header.dwType; + switch (raw_input->header.dwType) + { + case RIM_TYPEMOUSE: + if (raw_input->data.mouse.usFlags || raw_input->data.mouse.ulRawButtons + || raw_input->data.mouse.ulExtraInformation) + FIXME("Unhandled parameters"); + + req->input.mouse.x = raw_input->data.mouse.lLastX; + req->input.mouse.y = raw_input->data.mouse.lLastY; + req->input.mouse.button_flags = raw_input->data.mouse.u.s.usButtonFlags; + req->input.mouse.button_data = raw_input->data.mouse.u.s.usButtonData; + break; + } + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} +
/*********************************************************************** * update_mouse_coords diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f9a4ae26df..3311dcd685 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -833,4 +833,5 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) +@ cdecl __wine_send_raw_input(ptr) @ cdecl __wine_set_pixel_format(long long) diff --git a/include/winuser.h b/include/winuser.h index 51c73d25c2..259db275c4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4390,6 +4390,7 @@ WORD WINAPI SYSTEM_KillSystemTimer( WORD );
#ifdef __WINESRC__ WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ); +WINUSERAPI BOOL CDECL __wine_send_raw_input( const RAWINPUT *raw_input ); #endif
#ifdef __cplusplus
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v10: Instead of relying on custom flags, stop emulating raw mouse input when we receive a native msg. --- server/queue.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/queue.c b/server/queue.c index f2e9c4fab1..c4042994e8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1599,6 +1599,8 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa return 1; }
+int emulate_raw_mouse = 1; + /* queue a hardware message for a mouse event */ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, unsigned int origin, struct msg_queue *sender ) @@ -1664,7 +1666,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons y = desktop->cursor.y; }
- if ((device = current->process->rawinput_mouse)) + device = current->process->rawinput_mouse; + if (device && emulate_raw_mouse) { if (!(msg = alloc_hardware_message( input->mouse.info, source, time ))) return 0; msg_data = msg->data; @@ -1713,11 +1716,11 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons }
queue_hardware_message( desktop, msg, 0 ); - - if (device->flags & RIDEV_NOLEGACY) - return FALSE; }
+ if (device && device->flags & RIDEV_NOLEGACY) + return FALSE; + for (i = 0; i < ARRAY_SIZE( messages ); i++) { if (!messages[i]) continue; @@ -2437,7 +2440,11 @@ DECL_HANDLER(send_rawinput_message) case RIM_TYPEMOUSE: if ((device = current->process->rawinput_mouse)) { - struct thread *thread = device->target ? get_window_thread( device->target ) : NULL; + struct thread *thread; + + emulate_raw_mouse = 0; + + thread = device->target ? get_window_thread( device->target ) : NULL; if ((current->queue->input != desktop->foreground_input) || (thread && thread != current)) goto done;
On 8/2/19 8:24 AM, Derek Lesho wrote:
Signed-off-by: Derek Lesho dereklesho52@Gmail.com
v10: Instead of relying on custom flags, stop emulating raw mouse input when we receive a native msg.
server/queue.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/queue.c b/server/queue.c index f2e9c4fab1..c4042994e8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1599,6 +1599,8 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa return 1; }
+int emulate_raw_mouse = 1;
static wouldn't hurt.
/* queue a hardware message for a mouse event */ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, unsigned int origin, struct msg_queue *sender ) @@ -1664,7 +1666,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons y = desktop->cursor.y; }
- if ((device = current->process->rawinput_mouse))
- device = current->process->rawinput_mouse;
- if (device && emulate_raw_mouse) { if (!(msg = alloc_hardware_message( input->mouse.info, source, time ))) return 0; msg_data = msg->data;
@@ -1713,11 +1716,11 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons }
queue_hardware_message( desktop, msg, 0 );
if (device->flags & RIDEV_NOLEGACY)return FALSE; }
- if (device && device->flags & RIDEV_NOLEGACY)
return FALSE;
See PATCH 1/9 comment.
for (i = 0; i < ARRAY_SIZE( messages ); i++) { if (!messages[i]) continue;@@ -2437,7 +2440,11 @@ DECL_HANDLER(send_rawinput_message) case RIM_TYPEMOUSE: if ((device = current->process->rawinput_mouse)) {
struct thread *thread = device->target ? get_window_thread( device->target ) : NULL;
struct thread *thread;emulate_raw_mouse = 0;thread = device->target ? get_window_thread( device->target ) : NULL; if ((current->queue->input != desktop->foreground_input) || (thread && thread != current)) goto done;
Not sure why you need to change the thread variable assignment here. And I think you can set emulate_raw_mouse to 0 regardless of the device status (so before the if, right after "case RIM_TYPEMOUSE:").
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55089
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v11: - Make emulate_raw_mouse static - Stop emulating raw mouse input even when there isn't a present device - Cleanup convoluted code --- server/queue.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/queue.c b/server/queue.c index f2e9c4fab1..70b4f88302 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1599,6 +1599,8 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa return 1; }
+static int emulate_raw_mouse = 1; + /* queue a hardware message for a mouse event */ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, unsigned int origin, struct msg_queue *sender ) @@ -1664,7 +1666,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons y = desktop->cursor.y; }
- if ((device = current->process->rawinput_mouse)) + device = current->process->rawinput_mouse; + if (device && emulate_raw_mouse) { if (!(msg = alloc_hardware_message( input->mouse.info, source, time ))) return 0; msg_data = msg->data; @@ -1713,11 +1716,11 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons }
queue_hardware_message( desktop, msg, 0 ); - - if (device->flags & RIDEV_NOLEGACY) - return FALSE; }
+ if (device && device->flags & RIDEV_NOLEGACY) + return FALSE; + for (i = 0; i < ARRAY_SIZE( messages ); i++) { if (!messages[i]) continue; @@ -2435,6 +2438,7 @@ DECL_HANDLER(send_rawinput_message) switch (req->input.type) { case RIM_TYPEMOUSE: + emulate_raw_mouse = 0; if ((device = current->process->rawinput_mouse)) { struct thread *thread = device->target ? get_window_thread( device->target ) : NULL;
From: Rémi Bernon rbernon@codeweavers.com
Under XInput2 protocol version < 2.1, raw events should not be received if pointer grab is active. However slave device events are still received regardless of this specification and Wine implemented a workaround to get raw events during pointer grabs by listening to these slave device events.
By advertising to support XInput2 protocol version >= 2.1, where raw events are sent even during pointer grabs, it is possible to simplify the code by listening to master device events only.
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v10/v2: I put the adding of DeviceChanged to the mask in the legacy path so we don't get those on XI >= 2.1 where we don't have any use for the event. --- dlls/winex11.drv/event.c | 42 +----------------------------- dlls/winex11.drv/mouse.c | 56 +++++++++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 56 deletions(-)
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5c465aa033..1e64f0d2a3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -271,46 +271,6 @@ enum event_merge_action MERGE_IGNORE /* ignore the new event, keep the old one */ };
-/*********************************************************************** - * merge_raw_motion_events - */ -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H -static enum event_merge_action merge_raw_motion_events( XIRawEvent *prev, XIRawEvent *next ) -{ - int i, j, k; - unsigned char mask; - - if (!prev->valuators.mask_len) return MERGE_HANDLE; - if (!next->valuators.mask_len) return MERGE_HANDLE; - - mask = prev->valuators.mask[0] | next->valuators.mask[0]; - if (mask == next->valuators.mask[0]) /* keep next */ - { - for (i = j = k = 0; i < 8; i++) - { - if (XIMaskIsSet( prev->valuators.mask, i )) - next->valuators.values[j] += prev->valuators.values[k++]; - if (XIMaskIsSet( next->valuators.mask, i )) j++; - } - TRACE( "merging duplicate GenericEvent\n" ); - return MERGE_DISCARD; - } - if (mask == prev->valuators.mask[0]) /* keep prev */ - { - for (i = j = k = 0; i < 8; i++) - { - if (XIMaskIsSet( next->valuators.mask, i )) - prev->valuators.values[j] += next->valuators.values[k++]; - if (XIMaskIsSet( prev->valuators.mask, i )) j++; - } - TRACE( "merging duplicate GenericEvent\n" ); - return MERGE_IGNORE; - } - /* can't merge events with disjoint masks */ - return MERGE_HANDLE; -} -#endif - /*********************************************************************** * merge_events * @@ -362,7 +322,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) if (next->xcookie.extension != xinput2_opcode) break; if (next->xcookie.evtype != XI_RawMotion) break; if (x11drv_thread_data()->warp_serial) break; - return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); + return MERGE_HANDLE; #endif } break; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f737a306a5..578efa1931 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -130,6 +130,8 @@ static Cursor create_cursor( HANDLE handle );
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; +static int xinput2_version_major = 2; +static int xinput2_version_minor = 1; static BOOL broken_rawevents; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIGetClientPointer); @@ -301,8 +303,11 @@ static void enable_xinput2(void)
if (data->xi2_state == xi_unknown) { - int major = 2, minor = 0; - if (!pXIQueryVersion( data->display, &major, &minor )) data->xi2_state = xi_disabled; + if (!pXIQueryVersion( data->display, &xinput2_version_major, &xinput2_version_minor )) + { + TRACE( "XInput2 v%d.%d available\n", xinput2_version_major, xinput2_version_minor ); + data->xi2_state = xi_disabled; + } else { data->xi2_state = xi_unavailable; @@ -314,12 +319,20 @@ static void enable_xinput2(void)
mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); - mask.deviceid = XIAllDevices; + mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); - XISetMask( mask_bits, XI_DeviceChanged ); XISetMask( mask_bits, XI_RawMotion ); XISetMask( mask_bits, XI_ButtonPress );
+ /* XInput 2.0 has a problematic behavior where master pointer will + * not send raw events to the root window whenever a grab is active + */ + if (xinput2_version_major == 2 && xinput2_version_minor == 0) + { + mask.deviceid = XIAllDevices; + XISetMask( mask_bits, XI_DeviceChanged ); + } + pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 );
pointer_info = pXIQueryDevice( data->display, data->xi2_core_pointer, &count ); @@ -333,7 +346,7 @@ static void enable_xinput2(void) * safe to be obtained statically at enable_xinput2() time. */ if (data->xi2_devices) pXIFreeDeviceInfo( data->xi2_devices ); - data->xi2_devices = pXIQueryDevice( data->display, XIAllDevices, &data->xi2_device_count ); + data->xi2_devices = pXIQueryDevice( data->display, mask.deviceid, &data->xi2_device_count ); data->xi2_current_slave = 0;
data->xi2_state = xi_enabled; @@ -356,7 +369,13 @@ static void disable_xinput2(void)
mask.mask = NULL; mask.mask_len = 0; - mask.deviceid = XIAllDevices; + mask.deviceid = XIAllMasterDevices; + + /* XInput 2.0 has a problematic behavior where master pointer will + * not send raw events to the root window whenever a grab is active + */ + if (xinput2_version_major == 2 && xinput2_version_minor == 0) + mask.deviceid = XIAllDevices;
pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); pXIFreeDeviceInfo( data->xi2_devices ); @@ -1735,25 +1754,32 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) 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) + if (xinput2_version_major == 2 && xinput2_version_minor == 0) { XIDeviceInfo *devices = thread_data->xi2_devices;
- for (i = 0; i < thread_data->xi2_device_count; i++) + /* 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. + */ + for (i = 0; !thread_data->xi2_current_slave && 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; + /* Only listen to slave device events on XInput == 2.0 */ + if (event->deviceid != thread_data->xi2_current_slave) + return FALSE; + } + else + { + /* Only listen to master device events on XInput >= 2.1 */ + if (event->deviceid != thread_data->xi2_core_pointer) + return FALSE; + }
x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55090
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- dlls/winex11.drv/mouse.c | 68 +++++++++++++++++++++++++--------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/x11drv_main.c | 4 ++ 3 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 578efa1931..2fd38db263 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -288,9 +288,9 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
/*********************************************************************** - * enable_xinput2 + * X11DRV_XInput2_Enable */ -static void enable_xinput2(void) +void X11DRV_XInput2_Enable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); @@ -322,7 +322,6 @@ static void enable_xinput2(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); - XISetMask( mask_bits, XI_ButtonPress );
/* XInput 2.0 has a problematic behavior where master pointer will * not send raw events to the root window whenever a grab is active @@ -354,15 +353,15 @@ static void enable_xinput2(void) }
/*********************************************************************** - * disable_xinput2 + * X11DRV_XInput2_Disable */ -static void disable_xinput2(void) +void X11DRV_XInput2_Disable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask;
- if (data->xi2_state != xi_enabled) return; + if (data->xi2_state < xi_enabled) return;
TRACE( "disabling\n" ); data->xi2_state = xi_disabled; @@ -387,6 +386,21 @@ static void disable_xinput2(void) #endif }
+static void use_xinput2_path(void) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (thread_data->xi2_state == xi_enabled) + thread_data->xi2_state = xi_extra; +} + +static void disable_xinput2_path(void) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (thread_data->xi2_state == xi_extra) + thread_data->xi2_state = xi_enabled; +}
/*********************************************************************** * grab_clipping_window @@ -412,9 +426,9 @@ static BOOL grab_clipping_window( const RECT *clip ) return TRUE;
/* enable XInput2 unless we are already clipping */ - if (!data->clip_hwnd) enable_xinput2(); + if (!data->clip_hwnd) use_xinput2_path();
- if (data->xi2_state != xi_enabled) + if (data->xi2_state < xi_extra) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); DestroyWindow( msg_hwnd ); @@ -442,7 +456,7 @@ static BOOL grab_clipping_window( const RECT *clip )
if (!clipping_cursor) { - disable_xinput2(); + disable_xinput2_path(); DestroyWindow( msg_hwnd ); return FALSE; } @@ -508,7 +522,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; data->clip_reset = GetTickCount(); - disable_xinput2(); + disable_xinput2_path(); DestroyWindow( hwnd ); } else if (hwnd == GetForegroundWindow()) /* request to clip */ @@ -1743,16 +1757,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; const double *values = event->valuators.values; + const double *raw_values = event->raw_values; RECT virtual_rect; INPUT input; + RAWINPUT raw_input; int i; - double dx = 0, dy = 0, val; + double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_valuator_data *x_rel, *y_rel;
if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; + if (thread_data->xi2_state < xi_enabled) return FALSE;
if (xinput2_version_major == 2 && xinput2_version_minor == 0) { @@ -1784,12 +1800,20 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator;
+ input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - input.u.mi.dx = 0; - input.u.mi.dy = 0; + input.u.mi.dx = 0; + input.u.mi.dy = 0; + + raw_input.header.dwType = RIM_TYPEMOUSE; + raw_input.data.mouse.u.usButtonFlags = 0; + raw_input.data.mouse.u.usButtonData = 0; + raw_input.data.mouse.ulExtraInformation = 0; + raw_input.data.mouse.lLastX = 0; + raw_input.data.mouse.lLastY = 0;
virtual_rect = get_virtual_screen_rect();
@@ -1797,12 +1821,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; + raw_val = *raw_values++; if (i == x_rel->number) { input.u.mi.dx = dx = val; if (x_rel->min < x_rel->max) input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + + raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) { @@ -1810,6 +1837,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) if (y_rel->min < y_rel->max) input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + + raw_input.data.mouse.lLastY = raw_dy = raw_val; } }
@@ -1819,10 +1848,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) return FALSE; }
- TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); + if (thread_data->xi2_state == xi_extra) + { + TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); + __wine_send_input( 0, &input ); + } + + TRACE("raw event %f,%f\n", raw_dx, raw_dy); + __wine_send_raw_input( &raw_input );
- input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); return TRUE; }
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d3695bdcf..2223629c7b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -194,6 +194,8 @@ extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Enable(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Disable(void) DECLSPEC_HIDDEN;
extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, @@ -335,7 +337,7 @@ struct x11drv_thread_data HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */ - enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ + enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled, xi_extra } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; struct x11drv_valuator_data x_rel_valuator; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f1..214c101b67 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -611,6 +611,8 @@ void CDECL X11DRV_ThreadDetach(void)
if (data) { + X11DRV_XInput2_Disable(); + if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); @@ -681,6 +683,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
if (use_xim) X11DRV_SetupXIM();
+ X11DRV_XInput2_Enable(); + return data; }
On 8/2/19 8:24 AM, Derek Lesho wrote:
Signed-off-by: Derek Lesho dereklesho52@Gmail.com
dlls/winex11.drv/mouse.c | 68 +++++++++++++++++++++++++--------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/x11drv_main.c | 4 ++ 3 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 578efa1931..2fd38db263 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -288,9 +288,9 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
/***********************************************************************
enable_xinput2
*/
X11DRV_XInput2_Enable-static void enable_xinput2(void) +void X11DRV_XInput2_Enable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); @@ -322,7 +322,6 @@ static void enable_xinput2(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion );
- XISetMask( mask_bits, XI_ButtonPress );
Not sure what this implies exactly, is it really needed for raw mouse movements?
/* XInput 2.0 has a problematic behavior where master pointer will * not send raw events to the root window whenever a grab is active@@ -354,15 +353,15 @@ static void enable_xinput2(void) }
/***********************************************************************
disable_xinput2
*/
X11DRV_XInput2_Disable-static void disable_xinput2(void) +void X11DRV_XInput2_Disable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask;
- if (data->xi2_state != xi_enabled) return;
if (data->xi2_state < xi_enabled) return;
TRACE( "disabling\n" ); data->xi2_state = xi_disabled;
@@ -387,6 +386,21 @@ static void disable_xinput2(void) #endif }
+static void use_xinput2_path(void) +{
- struct x11drv_thread_data *thread_data = x11drv_thread_data();
- if (thread_data->xi2_state == xi_enabled)
thread_data->xi2_state = xi_extra;+}
+static void disable_xinput2_path(void) +{
- struct x11drv_thread_data *thread_data = x11drv_thread_data();
- if (thread_data->xi2_state == xi_extra)
thread_data->xi2_state = xi_enabled;+}
/***********************************************************************
grab_clipping_window@@ -412,9 +426,9 @@ static BOOL grab_clipping_window( const RECT *clip ) return TRUE;
/* enable XInput2 unless we are already clipping */
- if (!data->clip_hwnd) enable_xinput2();
- if (!data->clip_hwnd) use_xinput2_path();
- if (data->xi2_state != xi_enabled)
- if (data->xi2_state < xi_extra) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); DestroyWindow( msg_hwnd );
@@ -442,7 +456,7 @@ static BOOL grab_clipping_window( const RECT *clip )
if (!clipping_cursor) {
disable_xinput2();
disable_xinput2_path(); DestroyWindow( msg_hwnd ); return FALSE; }@@ -508,7 +522,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; data->clip_reset = GetTickCount();
disable_xinput2();
disable_xinput2_path(); DestroyWindow( hwnd ); } else if (hwnd == GetForegroundWindow()) /* request to clip */
I would love to get rid of this "extra" level of enablement and always send "normal" inputs on RawMotion events, regardless of cursor clipping state, but I guess it's safer to keep old behaviour.
@@ -1743,16 +1757,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; const double *values = event->valuators.values;
- const double *raw_values = event->raw_values; RECT virtual_rect; INPUT input;
- RAWINPUT raw_input; int i;
- double dx = 0, dy = 0, val;
double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_valuator_data *x_rel, *y_rel;
if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE;
- if (thread_data->xi2_state != xi_enabled) return FALSE;
if (thread_data->xi2_state < xi_enabled) return FALSE;
if (xinput2_version_major == 2 && xinput2_version_minor == 0) {
@@ -1784,12 +1800,20 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator;
- input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0;
- input.u.mi.dx = 0;
- input.u.mi.dy = 0;
- input.u.mi.dx = 0;
- input.u.mi.dy = 0;
Nitpick: the formatting change is superfluous (the input.type line is probably OK though).
raw_input.header.dwType = RIM_TYPEMOUSE;
raw_input.data.mouse.u.usButtonFlags = 0;
raw_input.data.mouse.u.usButtonData = 0;
raw_input.data.mouse.ulExtraInformation = 0;
raw_input.data.mouse.lLastX = 0;
raw_input.data.mouse.lLastY = 0;
virtual_rect = get_virtual_screen_rect();
@@ -1797,12 +1821,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++;
raw_val = *raw_values++; if (i == x_rel->number) { input.u.mi.dx = dx = val; if (x_rel->min < x_rel->max) input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min);raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) {@@ -1810,6 +1837,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) if (y_rel->min < y_rel->max) input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min);
raw_input.data.mouse.lLastY = raw_dy = raw_val; } }@@ -1819,10 +1848,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) return FALSE; }
- TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );
- if (thread_data->xi2_state == xi_extra)
- {
TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );__wine_send_input( 0, &input );- }
- TRACE("raw event %f,%f\n", raw_dx, raw_dy);
- __wine_send_raw_input( &raw_input );
- input.type = INPUT_MOUSE;
- __wine_send_input( 0, &input ); return TRUE; }
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d3695bdcf..2223629c7b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -194,6 +194,8 @@ extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Enable(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Disable(void) DECLSPEC_HIDDEN;
extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, @@ -335,7 +337,7 @@ struct x11drv_thread_data HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */
- enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */
- enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled, xi_extra } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; struct x11drv_valuator_data x_rel_valuator;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f1..214c101b67 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -611,6 +611,8 @@ void CDECL X11DRV_ThreadDetach(void)
if (data) {
X11DRV_XInput2_Disable();if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display );@@ -681,6 +683,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
if (use_xim) X11DRV_SetupXIM();
- X11DRV_XInput2_Enable();
return data;
Not sure what this implies exactly, is it really needed for raw mouse
movements?
Maybe this isn't the right patch for it, but I found that since we don't handle ButtonPress messages, it was causing an issue where mouse movement didn't work while a mouse button was pressed. I'm honestly not sure why it's added to the mask in the first place.
On Fri, Aug 2, 2019 at 4:29 AM Rémi Bernon rbernon@codeweavers.com wrote:
On 8/2/19 8:24 AM, Derek Lesho wrote:
Signed-off-by: Derek Lesho dereklesho52@Gmail.com
dlls/winex11.drv/mouse.c | 68 +++++++++++++++++++++++++--------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/x11drv_main.c | 4 ++ 3 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 578efa1931..2fd38db263 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -288,9 +288,9 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
/***********************************************************************
enable_xinput2
*/
X11DRV_XInput2_Enable-static void enable_xinput2(void) +void X11DRV_XInput2_Enable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); @@ -322,7 +322,6 @@ static void enable_xinput2(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion );
- XISetMask( mask_bits, XI_ButtonPress );
Not sure what this implies exactly, is it really needed for raw mouse movements?
/* XInput 2.0 has a problematic behavior where master pointer will * not send raw events to the root window whenever a grab is active@@ -354,15 +353,15 @@ static void enable_xinput2(void) }
/***********************************************************************
disable_xinput2
*/
X11DRV_XInput2_Disable-static void disable_xinput2(void) +void X11DRV_XInput2_Disable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask;
- if (data->xi2_state != xi_enabled) return;
if (data->xi2_state < xi_enabled) return;
TRACE( "disabling\n" ); data->xi2_state = xi_disabled;
@@ -387,6 +386,21 @@ static void disable_xinput2(void) #endif }
+static void use_xinput2_path(void) +{
- struct x11drv_thread_data *thread_data = x11drv_thread_data();
- if (thread_data->xi2_state == xi_enabled)
thread_data->xi2_state = xi_extra;+}
+static void disable_xinput2_path(void) +{
- struct x11drv_thread_data *thread_data = x11drv_thread_data();
- if (thread_data->xi2_state == xi_extra)
thread_data->xi2_state = xi_enabled;+}
/***********************************************************************
grab_clipping_window@@ -412,9 +426,9 @@ static BOOL grab_clipping_window( const RECT *clip ) return TRUE;
/* enable XInput2 unless we are already clipping */
- if (!data->clip_hwnd) enable_xinput2();
- if (!data->clip_hwnd) use_xinput2_path();
- if (data->xi2_state != xi_enabled)
- if (data->xi2_state < xi_extra) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); DestroyWindow( msg_hwnd );
@@ -442,7 +456,7 @@ static BOOL grab_clipping_window( const RECT *clip )
if (!clipping_cursor) {
disable_xinput2();
disable_xinput2_path(); DestroyWindow( msg_hwnd ); return FALSE; }@@ -508,7 +522,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; data->clip_reset = GetTickCount();
disable_xinput2();
disable_xinput2_path(); DestroyWindow( hwnd ); } else if (hwnd == GetForegroundWindow()) /* request to clip */I would love to get rid of this "extra" level of enablement and always send "normal" inputs on RawMotion events, regardless of cursor clipping state, but I guess it's safer to keep old behaviour.
@@ -1743,16 +1757,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; const double *values = event->valuators.values;
- const double *raw_values = event->raw_values; RECT virtual_rect; INPUT input;
- RAWINPUT raw_input; int i;
- double dx = 0, dy = 0, val;
double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_valuator_data *x_rel, *y_rel;
if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE;
- if (thread_data->xi2_state != xi_enabled) return FALSE;
if (thread_data->xi2_state < xi_enabled) return FALSE;
if (xinput2_version_major == 2 && xinput2_version_minor == 0) {
@@ -1784,12 +1800,20 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator;
- input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0;
- input.u.mi.dx = 0;
- input.u.mi.dy = 0;
- input.u.mi.dx = 0;
- input.u.mi.dy = 0;
Nitpick: the formatting change is superfluous (the input.type line is probably OK though).
raw_input.header.dwType = RIM_TYPEMOUSE;
raw_input.data.mouse.u.usButtonFlags = 0;
raw_input.data.mouse.u.usButtonData = 0;
raw_input.data.mouse.ulExtraInformation = 0;
raw_input.data.mouse.lLastX = 0;
raw_input.data.mouse.lLastY = 0;
virtual_rect = get_virtual_screen_rect();
@@ -1797,12 +1821,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++;
raw_val = *raw_values++; if (i == x_rel->number) { input.u.mi.dx = dx = val; if (x_rel->min < x_rel->max) input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min);raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) {@@ -1810,6 +1837,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) if (y_rel->min < y_rel->max) input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min);
raw_input.data.mouse.lLastY = raw_dy = raw_val; } }@@ -1819,10 +1848,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) return FALSE; }
- TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );
- if (thread_data->xi2_state == xi_extra)
- {
TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );__wine_send_input( 0, &input );- }
- TRACE("raw event %f,%f\n", raw_dx, raw_dy);
- __wine_send_raw_input( &raw_input );
- input.type = INPUT_MOUSE;
- __wine_send_input( 0, &input ); return TRUE; }
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d3695bdcf..2223629c7b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -194,6 +194,8 @@ extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Enable(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Disable(void) DECLSPEC_HIDDEN;
extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, @@ -335,7 +337,7 @@ struct x11drv_thread_data HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */
- enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */
- enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled, xi_extra } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; struct x11drv_valuator_data x_rel_valuator;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f1..214c101b67 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -611,6 +611,8 @@ void CDECL X11DRV_ThreadDetach(void)
if (data) {
X11DRV_XInput2_Disable();if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display );@@ -681,6 +683,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
if (use_xim) X11DRV_SetupXIM();
- X11DRV_XInput2_Enable();
return data;-- Rémi Bernon rbernon@codeweavers.com
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55091
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v11: Remove superfluous and incorrect format change. --- dlls/winex11.drv/mouse.c | 64 ++++++++++++++++++++++++++-------- dlls/winex11.drv/x11drv.h | 4 ++- dlls/winex11.drv/x11drv_main.c | 4 +++ 3 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 578efa1931..581fbaaa49 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -288,9 +288,9 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
/*********************************************************************** - * enable_xinput2 + * X11DRV_XInput2_Enable */ -static void enable_xinput2(void) +void X11DRV_XInput2_Enable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); @@ -322,7 +322,6 @@ static void enable_xinput2(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); - XISetMask( mask_bits, XI_ButtonPress );
/* XInput 2.0 has a problematic behavior where master pointer will * not send raw events to the root window whenever a grab is active @@ -354,15 +353,15 @@ static void enable_xinput2(void) }
/*********************************************************************** - * disable_xinput2 + * X11DRV_XInput2_Disable */ -static void disable_xinput2(void) +void X11DRV_XInput2_Disable(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask;
- if (data->xi2_state != xi_enabled) return; + if (data->xi2_state < xi_enabled) return;
TRACE( "disabling\n" ); data->xi2_state = xi_disabled; @@ -387,6 +386,21 @@ static void disable_xinput2(void) #endif }
+static void use_xinput2_path(void) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (thread_data->xi2_state == xi_enabled) + thread_data->xi2_state = xi_extra; +} + +static void disable_xinput2_path(void) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (thread_data->xi2_state == xi_extra) + thread_data->xi2_state = xi_enabled; +}
/*********************************************************************** * grab_clipping_window @@ -412,9 +426,9 @@ static BOOL grab_clipping_window( const RECT *clip ) return TRUE;
/* enable XInput2 unless we are already clipping */ - if (!data->clip_hwnd) enable_xinput2(); + if (!data->clip_hwnd) use_xinput2_path();
- if (data->xi2_state != xi_enabled) + if (data->xi2_state < xi_extra) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); DestroyWindow( msg_hwnd ); @@ -442,7 +456,7 @@ static BOOL grab_clipping_window( const RECT *clip )
if (!clipping_cursor) { - disable_xinput2(); + disable_xinput2_path(); DestroyWindow( msg_hwnd ); return FALSE; } @@ -508,7 +522,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; data->clip_reset = GetTickCount(); - disable_xinput2(); + disable_xinput2_path(); DestroyWindow( hwnd ); } else if (hwnd == GetForegroundWindow()) /* request to clip */ @@ -1743,16 +1757,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; const double *values = event->valuators.values; + const double *raw_values = event->raw_values; RECT virtual_rect; INPUT input; + RAWINPUT raw_input; int i; - double dx = 0, dy = 0, val; + double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_valuator_data *x_rel, *y_rel;
if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; + if (thread_data->xi2_state < xi_enabled) return FALSE;
if (xinput2_version_major == 2 && xinput2_version_minor == 0) { @@ -1784,6 +1800,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator;
+ input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); @@ -1791,18 +1808,28 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dx = 0; input.u.mi.dy = 0;
+ raw_input.header.dwType = RIM_TYPEMOUSE; + raw_input.data.mouse.u.usButtonFlags = 0; + raw_input.data.mouse.u.usButtonData = 0; + raw_input.data.mouse.ulExtraInformation = 0; + raw_input.data.mouse.lLastX = 0; + raw_input.data.mouse.lLastY = 0; + virtual_rect = get_virtual_screen_rect();
for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; + raw_val = *raw_values++; if (i == x_rel->number) { input.u.mi.dx = dx = val; if (x_rel->min < x_rel->max) input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + + raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) { @@ -1810,6 +1837,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) if (y_rel->min < y_rel->max) input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + + raw_input.data.mouse.lLastY = raw_dy = raw_val; } }
@@ -1819,10 +1848,15 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) return FALSE; }
- TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); + if (thread_data->xi2_state == xi_extra) + { + TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); + __wine_send_input( 0, &input ); + } + + TRACE("raw event %f,%f\n", raw_dx, raw_dy); + __wine_send_raw_input( &raw_input );
- input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); return TRUE; }
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d3695bdcf..2223629c7b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -194,6 +194,8 @@ extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Enable(void) DECLSPEC_HIDDEN; +extern void X11DRV_XInput2_Disable(void) DECLSPEC_HIDDEN;
extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, @@ -335,7 +337,7 @@ struct x11drv_thread_data HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */ - enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ + enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled, xi_extra } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; struct x11drv_valuator_data x_rel_valuator; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f1..214c101b67 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -611,6 +611,8 @@ void CDECL X11DRV_ThreadDetach(void)
if (data) { + X11DRV_XInput2_Disable(); + if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); @@ -681,6 +683,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
if (use_xim) X11DRV_SetupXIM();
+ X11DRV_XInput2_Enable(); + return data; }
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- dlls/winex11.drv/mouse.c | 82 +++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2fd38db263..650e81204d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -259,6 +259,7 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
thread_data->x_rel_valuator.number = -1; thread_data->y_rel_valuator.number = -1; + thread_data->wheel_valuator.number = -1;
for (i = 0; i < n_valuators; i++) { @@ -276,6 +277,11 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator { valuator_data = &thread_data->y_rel_valuator; } + else if (class->label == x11drv_atom( Rel_Vert_Scroll ) || + (!class->label && class->number == 3 && class->mode == XIModeRelative)) + { + valuator_data = &thread_data->wheel_valuator; + }
if (valuator_data) { valuator_data->number = class->number; @@ -322,6 +328,8 @@ void X11DRV_XInput2_Enable(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_RawButtonPress ); + XISetMask( mask_bits, XI_RawButtonRelease );
/* XInput 2.0 has a problematic behavior where master pointer will * not send raw events to the root window whenever a grab is active @@ -380,6 +388,7 @@ void X11DRV_XInput2_Disable(void) pXIFreeDeviceInfo( data->xi2_devices ); data->x_rel_valuator.number = -1; data->y_rel_valuator.number = -1; + data->wheel_valuator.number = -1; data->xi2_devices = NULL; data->xi2_core_pointer = 0; data->xi2_current_slave = 0; @@ -1762,11 +1771,11 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) INPUT input; RAWINPUT raw_input; int i; - double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; + double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, dwheel = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; + struct x11drv_valuator_data *x_rel, *y_rel, *wheel;
- if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0 || thread_data->wheel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state < xi_enabled) return FALSE;
@@ -1799,6 +1808,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator; + wheel = &thread_data->wheel_valuator;
input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; @@ -1817,7 +1827,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
virtual_rect = get_virtual_screen_rect();
- for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) + for (i = 0; i <= max( wheel->number, max( x_rel->number, y_rel->number ) ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; @@ -1840,6 +1850,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
raw_input.data.mouse.lLastY = raw_dy = raw_val; } + if (i == wheel->number) + dwheel = raw_val; }
if (broken_rawevents && is_old_motion_event( xev->serial )) @@ -1854,12 +1866,67 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) __wine_send_input( 0, &input ); }
- TRACE("raw event %f,%f\n", raw_dx, raw_dy); + if (dwheel) + { + raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL; + raw_input.data.mouse.u.usButtonData = dwheel * 8; + } + + TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dwheel); __wine_send_raw_input( &raw_input );
return TRUE; }
+/*********************************************************************** + * X11DRV_RawButton + */ +static BOOL X11DRV_RawButton( XGenericEventCookie *xev ) +{ + RAWINPUT ri; + + static const unsigned short raw_button_press_flags[] = { + 0, /* 0 = unused */ + RI_MOUSE_LEFT_BUTTON_DOWN, /* 1 */ + RI_MOUSE_MIDDLE_BUTTON_DOWN, /* 2 */ + RI_MOUSE_RIGHT_BUTTON_DOWN, /* 3 */ + 0, /* 4 = unknown */ + 0, /* 5 = unknown */ + 0, /* 6 = unknown */ + 0, /* 7 = unknown */ + RI_MOUSE_BUTTON_4_DOWN, /* 8 */ + RI_MOUSE_BUTTON_5_DOWN /* 9 */ + }; + + static const unsigned short raw_button_release_flags[] = { + 0, /* 0 = unused */ + RI_MOUSE_LEFT_BUTTON_UP, /* 1 */ + RI_MOUSE_MIDDLE_BUTTON_UP, /* 2 */ + RI_MOUSE_RIGHT_BUTTON_UP, /* 3 */ + 0, /* 4 = unknown */ + 0, /* 5 = unknown */ + 0, /* 6 = unknown */ + 0, /* 7 = unknown */ + RI_MOUSE_BUTTON_4_UP, /* 8 */ + RI_MOUSE_BUTTON_5_UP /* 9 */ + }; + + int detail = ((XIRawEvent*)xev->data)->detail; + if (detail > 9) return TRUE; + + ri.header.dwType = RIM_TYPEMOUSE; + ri.data.mouse.u.usButtonFlags = xev->evtype == XI_RawButtonPress ? raw_button_press_flags[detail] : raw_button_release_flags[detail] ; + ri.data.mouse.u.usButtonData = 0; + ri.data.mouse.lLastX = 0; + ri.data.mouse.lLastY = 0; + ri.data.mouse.ulExtraInformation = 0; + + if (ri.data.mouse.u.usButtonFlags) + __wine_send_raw_input( &ri ); + + return TRUE; +} + #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */
@@ -1924,6 +1991,11 @@ BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) case XI_RawMotion: ret = X11DRV_RawMotion( event ); break; + case XI_RawButtonPress: + /* fall through */ + case XI_RawButtonRelease: + ret = X11DRV_RawButton( event ); + break;
default: TRACE( "Unhandled event %#x\n", event->evtype ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2223629c7b..c74f1493c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data int xi2_device_count; struct x11drv_valuator_data x_rel_valuator; struct x11drv_valuator_data y_rel_valuator; + struct x11drv_valuator_data wheel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ }; @@ -427,6 +428,7 @@ enum x11drv_atoms XATOM_RAW_CAP_HEIGHT, XATOM_Rel_X, XATOM_Rel_Y, + XATOM_Rel_Vert_Scroll, XATOM_WM_PROTOCOLS, XATOM_WM_DELETE_WINDOW, XATOM_WM_STATE, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 214c101b67..86b6efac08 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -120,6 +120,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "RAW_CAP_HEIGHT", "Rel X", "Rel Y", + "Rel Vert Scroll", "WM_PROTOCOLS", "WM_DELETE_WINDOW", "WM_STATE",
On 8/2/19 8:24 AM, Derek Lesho wrote:
Signed-off-by: Derek Lesho dereklesho52@Gmail.com
dlls/winex11.drv/mouse.c | 82 +++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2fd38db263..650e81204d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -259,6 +259,7 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
thread_data->x_rel_valuator.number = -1; thread_data->y_rel_valuator.number = -1;
thread_data->wheel_valuator.number = -1;
for (i = 0; i < n_valuators; i++) {
@@ -276,6 +277,11 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator { valuator_data = &thread_data->y_rel_valuator; }
else if (class->label == x11drv_atom( Rel_Vert_Scroll ) ||(!class->label && class->number == 3 && class->mode == XIModeRelative)){valuator_data = &thread_data->wheel_valuator;} if (valuator_data) { valuator_data->number = class->number;@@ -322,6 +328,8 @@ void X11DRV_XInput2_Enable(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion );
XISetMask( mask_bits, XI_RawButtonPress );
XISetMask( mask_bits, XI_RawButtonRelease );
/* XInput 2.0 has a problematic behavior where master pointer will
- not send raw events to the root window whenever a grab is active
@@ -380,6 +388,7 @@ void X11DRV_XInput2_Disable(void) pXIFreeDeviceInfo( data->xi2_devices ); data->x_rel_valuator.number = -1; data->y_rel_valuator.number = -1;
- data->wheel_valuator.number = -1; data->xi2_devices = NULL; data->xi2_core_pointer = 0; data->xi2_current_slave = 0;
@@ -1762,11 +1771,11 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) INPUT input; RAWINPUT raw_input; int i;
- double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val;
- double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, dwheel = 0, val, raw_val;
Nitpick: raw_dwheel / raw_dw to keep names consistent?
struct x11drv_thread_data *thread_data = x11drv_thread_data();
- struct x11drv_valuator_data *x_rel, *y_rel;
- struct x11drv_valuator_data *x_rel, *y_rel, *wheel;
- if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE;
- if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0 || thread_data->wheel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state < xi_enabled) return FALSE;
@@ -1799,6 +1808,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator;
wheel = &thread_data->wheel_valuator;
input.type = INPUT_MOUSE; input.u.mi.mouseData = 0;
@@ -1817,7 +1827,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
virtual_rect = get_virtual_screen_rect();
- for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++)
- for (i = 0; i <= max( wheel->number, max( x_rel->number, y_rel->number ) ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++;
@@ -1840,6 +1850,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
raw_input.data.mouse.lLastY = raw_dy = raw_val; }
if (i == wheel->number)dwheel = raw_val; } if (broken_rawevents && is_old_motion_event( xev->serial ))@@ -1854,12 +1866,67 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) __wine_send_input( 0, &input ); }
- TRACE("raw event %f,%f\n", raw_dx, raw_dy);
if (dwheel)
{
raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL;raw_input.data.mouse.u.usButtonData = dwheel * 8;}
TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dwheel); __wine_send_raw_input( &raw_input );
return TRUE; }
+/***********************************************************************
X11DRV_RawButton- */
+static BOOL X11DRV_RawButton( XGenericEventCookie *xev ) +{
- RAWINPUT ri;
- static const unsigned short raw_button_press_flags[] = {
0, /* 0 = unused */RI_MOUSE_LEFT_BUTTON_DOWN, /* 1 */RI_MOUSE_MIDDLE_BUTTON_DOWN, /* 2 */RI_MOUSE_RIGHT_BUTTON_DOWN, /* 3 */0, /* 4 = unknown */0, /* 5 = unknown */0, /* 6 = unknown */0, /* 7 = unknown */RI_MOUSE_BUTTON_4_DOWN, /* 8 */RI_MOUSE_BUTTON_5_DOWN /* 9 */- };
- static const unsigned short raw_button_release_flags[] = {
0, /* 0 = unused */RI_MOUSE_LEFT_BUTTON_UP, /* 1 */RI_MOUSE_MIDDLE_BUTTON_UP, /* 2 */RI_MOUSE_RIGHT_BUTTON_UP, /* 3 */0, /* 4 = unknown */0, /* 5 = unknown */0, /* 6 = unknown */0, /* 7 = unknown */RI_MOUSE_BUTTON_4_UP, /* 8 */RI_MOUSE_BUTTON_5_UP /* 9 */- };
- int detail = ((XIRawEvent*)xev->data)->detail;
- if (detail > 9) return TRUE;
- ri.header.dwType = RIM_TYPEMOUSE;
- ri.data.mouse.u.usButtonFlags = xev->evtype == XI_RawButtonPress ? raw_button_press_flags[detail] : raw_button_release_flags[detail] ;
- ri.data.mouse.u.usButtonData = 0;
- ri.data.mouse.lLastX = 0;
- ri.data.mouse.lLastY = 0;
- ri.data.mouse.ulExtraInformation = 0;
- if (ri.data.mouse.u.usButtonFlags)
__wine_send_raw_input( &ri );- return TRUE;
+}
- #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */
@@ -1924,6 +1991,11 @@ BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) case XI_RawMotion: ret = X11DRV_RawMotion( event ); break;
case XI_RawButtonPress:
/* fall through */case XI_RawButtonRelease:
ret = X11DRV_RawButton( event );break; default: TRACE( "Unhandled event %#x\n", event->evtype );diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2223629c7b..c74f1493c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data int xi2_device_count; struct x11drv_valuator_data x_rel_valuator; struct x11drv_valuator_data y_rel_valuator;
- struct x11drv_valuator_data wheel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ };
@@ -427,6 +428,7 @@ enum x11drv_atoms XATOM_RAW_CAP_HEIGHT, XATOM_Rel_X, XATOM_Rel_Y,
- XATOM_Rel_Vert_Scroll, XATOM_WM_PROTOCOLS, XATOM_WM_DELETE_WINDOW, XATOM_WM_STATE,
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 214c101b67..86b6efac08 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -120,6 +120,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "RAW_CAP_HEIGHT", "Rel X", "Rel Y",
- "Rel Vert Scroll", "WM_PROTOCOLS", "WM_DELETE_WINDOW", "WM_STATE",
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55092
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35223 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds msg.c:8713: Test failed: WaitForSingleObject failed 102 msg.c:8719: Test failed: destroy child on thread exit: 0: the msg 0x0082 was expected, but got msg 0x000f instead msg.c:8719: Test failed: destroy child on thread exit: 1: the msg 0x000f was expected, but got msg 0x0014 instead msg.c:8719: Test failed: destroy child on thread exit: 2: the msg sequence is not complete: expected 0014 - actual 0000
Report errors: user32:msg prints too much data (35952 bytes)
Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v11: - Rename dwheel to dw as Remi suggested. - Multiply incoming wheel motion sooner to prevent bug with accumulation. --- dlls/winex11.drv/mouse.c | 82 +++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 581fbaaa49..1247183c9d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -259,6 +259,7 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
thread_data->x_rel_valuator.number = -1; thread_data->y_rel_valuator.number = -1; + thread_data->wheel_valuator.number = -1;
for (i = 0; i < n_valuators; i++) { @@ -276,6 +277,11 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator { valuator_data = &thread_data->y_rel_valuator; } + else if (class->label == x11drv_atom( Rel_Vert_Scroll ) || + (!class->label && class->number == 3 && class->mode == XIModeRelative)) + { + valuator_data = &thread_data->wheel_valuator; + }
if (valuator_data) { valuator_data->number = class->number; @@ -322,6 +328,8 @@ void X11DRV_XInput2_Enable(void) mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_RawButtonPress ); + XISetMask( mask_bits, XI_RawButtonRelease );
/* XInput 2.0 has a problematic behavior where master pointer will * not send raw events to the root window whenever a grab is active @@ -380,6 +388,7 @@ void X11DRV_XInput2_Disable(void) pXIFreeDeviceInfo( data->xi2_devices ); data->x_rel_valuator.number = -1; data->y_rel_valuator.number = -1; + data->wheel_valuator.number = -1; data->xi2_devices = NULL; data->xi2_core_pointer = 0; data->xi2_current_slave = 0; @@ -1762,11 +1771,11 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) INPUT input; RAWINPUT raw_input; int i; - double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, val, raw_val; + double dx = 0, dy = 0, raw_dx = 0, raw_dy = 0, dw = 0, val, raw_val; struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; + struct x11drv_valuator_data *x_rel, *y_rel, *wheel;
- if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0 || thread_data->wheel_valuator.number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state < xi_enabled) return FALSE;
@@ -1799,6 +1808,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
x_rel = &thread_data->x_rel_valuator; y_rel = &thread_data->y_rel_valuator; + wheel = &thread_data->wheel_valuator;
input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; @@ -1817,7 +1827,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
virtual_rect = get_virtual_screen_rect();
- for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) + for (i = 0; i <= max( wheel->number, max( x_rel->number, y_rel->number ) ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; @@ -1840,6 +1850,8 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
raw_input.data.mouse.lLastY = raw_dy = raw_val; } + if (i == wheel->number) + dw = raw_val * 8; }
if (broken_rawevents && is_old_motion_event( xev->serial )) @@ -1854,12 +1866,67 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) __wine_send_input( 0, &input ); }
- TRACE("raw event %f,%f\n", raw_dx, raw_dy); + if (dw) + { + raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL; + raw_input.data.mouse.u.usButtonData = dw; + } + + TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dw); __wine_send_raw_input( &raw_input );
return TRUE; }
+/*********************************************************************** + * X11DRV_RawButton + */ +static BOOL X11DRV_RawButton( XGenericEventCookie *xev ) +{ + RAWINPUT ri; + + static const unsigned short raw_button_press_flags[] = { + 0, /* 0 = unused */ + RI_MOUSE_LEFT_BUTTON_DOWN, /* 1 */ + RI_MOUSE_MIDDLE_BUTTON_DOWN, /* 2 */ + RI_MOUSE_RIGHT_BUTTON_DOWN, /* 3 */ + 0, /* 4 = unknown */ + 0, /* 5 = unknown */ + 0, /* 6 = unknown */ + 0, /* 7 = unknown */ + RI_MOUSE_BUTTON_4_DOWN, /* 8 */ + RI_MOUSE_BUTTON_5_DOWN /* 9 */ + }; + + static const unsigned short raw_button_release_flags[] = { + 0, /* 0 = unused */ + RI_MOUSE_LEFT_BUTTON_UP, /* 1 */ + RI_MOUSE_MIDDLE_BUTTON_UP, /* 2 */ + RI_MOUSE_RIGHT_BUTTON_UP, /* 3 */ + 0, /* 4 = unknown */ + 0, /* 5 = unknown */ + 0, /* 6 = unknown */ + 0, /* 7 = unknown */ + RI_MOUSE_BUTTON_4_UP, /* 8 */ + RI_MOUSE_BUTTON_5_UP /* 9 */ + }; + + int detail = ((XIRawEvent*)xev->data)->detail; + if (detail > 9) return TRUE; + + ri.header.dwType = RIM_TYPEMOUSE; + ri.data.mouse.u.usButtonFlags = xev->evtype == XI_RawButtonPress ? raw_button_press_flags[detail] : raw_button_release_flags[detail] ; + ri.data.mouse.u.usButtonData = 0; + ri.data.mouse.lLastX = 0; + ri.data.mouse.lLastY = 0; + ri.data.mouse.ulExtraInformation = 0; + + if (ri.data.mouse.u.usButtonFlags) + __wine_send_raw_input( &ri ); + + return TRUE; +} + #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */
@@ -1924,6 +1991,11 @@ BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) case XI_RawMotion: ret = X11DRV_RawMotion( event ); break; + case XI_RawButtonPress: + /* fall through */ + case XI_RawButtonRelease: + ret = X11DRV_RawButton( event ); + break;
default: TRACE( "Unhandled event %#x\n", event->evtype ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2223629c7b..c74f1493c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data int xi2_device_count; struct x11drv_valuator_data x_rel_valuator; struct x11drv_valuator_data y_rel_valuator; + struct x11drv_valuator_data wheel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ }; @@ -427,6 +428,7 @@ enum x11drv_atoms XATOM_RAW_CAP_HEIGHT, XATOM_Rel_X, XATOM_Rel_Y, + XATOM_Rel_Vert_Scroll, XATOM_WM_PROTOCOLS, XATOM_WM_DELETE_WINDOW, XATOM_WM_STATE, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 214c101b67..86b6efac08 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -120,6 +120,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "RAW_CAP_HEIGHT", "Rel X", "Rel Y", + "Rel Vert Scroll", "WM_PROTOCOLS", "WM_DELETE_WINDOW", "WM_STATE",
From: Jordan Galby gravemind2a+wine@gmail.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 From: Jordan Galby gravemind2a+wine@gmail.com Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- dlls/winex11.drv/mouse.c | 50 +++++++++++++++++++++++++++++---------- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 650e81204d..b53bad8144 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -261,6 +261,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->y_rel_valuator.number = -1; thread_data->wheel_valuator.number = -1;
+ thread_data->x_rel_valuator.accum = 0; + thread_data->y_rel_valuator.accum = 0; + thread_data->wheel_valuator.accum = 0; + for (i = 0; i < n_valuators; i++) { XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i]; @@ -1815,8 +1819,6 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - input.u.mi.dx = 0; - input.u.mi.dy = 0;
raw_input.header.dwType = RIM_TYPEMOUSE; raw_input.data.mouse.u.usButtonFlags = 0; @@ -1834,18 +1836,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) raw_val = *raw_values++; if (i == x_rel->number) { - input.u.mi.dx = dx = val; + dx = val; if (x_rel->min < x_rel->max) - input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) + dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min);
raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) { - input.u.mi.dy = dy = val; + dy = val; if (y_rel->min < y_rel->max) - input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) + dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min);
raw_input.data.mouse.lLastY = raw_dy = raw_val; @@ -1856,20 +1858,44 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
if (broken_rawevents && is_old_motion_event( xev->serial )) { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); + TRACE( "pos %d,%d old serial %lu, ignoring\n", (LONG) dx, (LONG) dy, xev->serial ); return FALSE; }
- if (thread_data->xi2_state == xi_extra) + /* Accumulate the *double* motions so sub-pixel motions + * wont be lost when sent/cast to *LONG* target fields. + */ + + x_rel->accum += dx; + y_rel->accum += dy; + if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0) { - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); - __wine_send_input( 0, &input ); + TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", dx, dy, x_rel->accum, y_rel->accum ); } + else + { + input.u.mi.dx = x_rel->accum; + input.u.mi.dy = y_rel->accum; + x_rel->accum -= input.u.mi.dx; + y_rel->accum -= input.u.mi.dy;
- if (dwheel) + if (thread_data->xi2_state == xi_extra) + { + TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); + __wine_send_input( 0, &input ); + } + } + + wheel->accum += dwheel; + if (fabs(wheel->accum) < 1.0) + { + TRACE("accumulating wheel motion (event %f, accum %f)\n", dwheel, wheel->accum); + } + else { raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL; - raw_input.data.mouse.u.usButtonData = dwheel * 8; + raw_input.data.mouse.u.usButtonData = wheel->accum * 8; + wheel->accum -= dwheel; }
TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dwheel); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c74f1493c0..8a59874251 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -320,6 +320,7 @@ struct x11drv_valuator_data double min; double max; int number; + double accum; };
struct x11drv_thread_data
On 8/2/19 8:24 AM, Derek Lesho wrote:
From: Jordan Galby gravemind2a+wine@gmail.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 From: Jordan Galby gravemind2a+wine@gmail.com Signed-off-by: Derek Lesho dereklesho52@Gmail.com
dlls/winex11.drv/mouse.c | 50 +++++++++++++++++++++++++++++---------- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 650e81204d..b53bad8144 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -261,6 +261,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->y_rel_valuator.number = -1; thread_data->wheel_valuator.number = -1;
- thread_data->x_rel_valuator.accum = 0;
- thread_data->y_rel_valuator.accum = 0;
- thread_data->wheel_valuator.accum = 0;
for (i = 0; i < n_valuators; i++) { XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i];@@ -1815,8 +1819,6 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0;
input.u.mi.dx = 0;
input.u.mi.dy = 0;
raw_input.header.dwType = RIM_TYPEMOUSE; raw_input.data.mouse.u.usButtonFlags = 0;
@@ -1834,18 +1836,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) raw_val = *raw_values++; if (i == x_rel->number) {
input.u.mi.dx = dx = val;
dx = val; if (x_rel->min < x_rel->max)
input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left)
dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) {
input.u.mi.dy = dy = val;
dy = val; if (y_rel->min < y_rel->max)
input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top)
dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); raw_input.data.mouse.lLastY = raw_dy = raw_val;@@ -1856,20 +1858,44 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
if (broken_rawevents && is_old_motion_event( xev->serial )) {
TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial );
TRACE( "pos %d,%d old serial %lu, ignoring\n", (LONG) dx, (LONG) dy, xev->serial ); return FALSE; }
- if (thread_data->xi2_state == xi_extra)
- /* Accumulate the *double* motions so sub-pixel motions
* wont be lost when sent/cast to *LONG* target fields.*/- x_rel->accum += dx;
- y_rel->accum += dy;
- if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0) {
TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );__wine_send_input( 0, &input );
TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", dx, dy, x_rel->accum, y_rel->accum ); }- else
- {
input.u.mi.dx = x_rel->accum;input.u.mi.dy = y_rel->accum;x_rel->accum -= input.u.mi.dx;y_rel->accum -= input.u.mi.dy;
- if (dwheel)
if (thread_data->xi2_state == xi_extra){TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );__wine_send_input( 0, &input );} > + }- wheel->accum += dwheel;
- if (fabs(wheel->accum) < 1.0)
As there's a 8x factor below it could be 0.125, or you could accumulate the 8x values instead. Note that my testing with touchpad showed a higher threshold of +-120.0 for minimum wheel movement (+-15.0 in XInput2 raw values) but it wasn't very extensive though.
- {
TRACE("accumulating wheel motion (event %f, accum %f)\n", dwheel, wheel->accum);- }
- else { raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL;
raw_input.data.mouse.u.usButtonData = dwheel * 8;
raw_input.data.mouse.u.usButtonData = wheel->accum * 8;wheel->accum -= dwheel; } TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dwheel);diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c74f1493c0..8a59874251 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -320,6 +320,7 @@ struct x11drv_valuator_data double min; double max; int number;
double accum; };
struct x11drv_thread_data
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55093
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: menu.c:2354: Test failed: test 25 msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
From: Jordan Galby gravemind2a+wine@gmail.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 From: Jordan Galby gravemind2a+wine@gmail.com Signed-off-by: Derek Lesho dereklesho52@Gmail.com --- v11: Rebase --- dlls/winex11.drv/mouse.c | 50 +++++++++++++++++++++++++++++---------- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1247183c9d..18dc205bbc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -261,6 +261,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->y_rel_valuator.number = -1; thread_data->wheel_valuator.number = -1;
+ thread_data->x_rel_valuator.accum = 0; + thread_data->y_rel_valuator.accum = 0; + thread_data->wheel_valuator.accum = 0; + for (i = 0; i < n_valuators; i++) { XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i]; @@ -1815,8 +1819,6 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - input.u.mi.dx = 0; - input.u.mi.dy = 0;
raw_input.header.dwType = RIM_TYPEMOUSE; raw_input.data.mouse.u.usButtonFlags = 0; @@ -1834,18 +1836,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) raw_val = *raw_values++; if (i == x_rel->number) { - input.u.mi.dx = dx = val; + dx = val; if (x_rel->min < x_rel->max) - input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) + dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min);
raw_input.data.mouse.lLastX = raw_dx = raw_val; } if (i == y_rel->number) { - input.u.mi.dy = dy = val; + dy = val; if (y_rel->min < y_rel->max) - input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) + dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min);
raw_input.data.mouse.lLastY = raw_dy = raw_val; @@ -1856,20 +1858,44 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
if (broken_rawevents && is_old_motion_event( xev->serial )) { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); + TRACE( "pos %d,%d old serial %lu, ignoring\n", (LONG) dx, (LONG) dy, xev->serial ); return FALSE; }
- if (thread_data->xi2_state == xi_extra) + /* Accumulate the *double* motions so sub-pixel motions + * wont be lost when sent/cast to *LONG* target fields. + */ + + x_rel->accum += dx; + y_rel->accum += dy; + if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0) { - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); - __wine_send_input( 0, &input ); + TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", dx, dy, x_rel->accum, y_rel->accum ); } + else + { + input.u.mi.dx = x_rel->accum; + input.u.mi.dy = y_rel->accum; + x_rel->accum -= input.u.mi.dx; + y_rel->accum -= input.u.mi.dy;
- if (dw) + if (thread_data->xi2_state == xi_extra) + { + TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); + __wine_send_input( 0, &input ); + } + } + + wheel->accum += dw; + if (fabs(wheel->accum) < 1.0) + { + TRACE("accumulating wheel motion (event %f, accum %f)\n", dw, wheel->accum); + } + else { raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL; - raw_input.data.mouse.u.usButtonData = dw; + raw_input.data.mouse.u.usButtonData = wheel->accum; + wheel->accum -= dw; }
TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dw); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c74f1493c0..8a59874251 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -320,6 +320,7 @@ struct x11drv_valuator_data double min; double max; int number; + double accum; };
struct x11drv_thread_data
Hello Derek,
I think the title for this patch could be improved. "small slow mouse movements" is pretty vague, and "don't react to" is misleading, as we do react to them in due time. How about instead something like "winex11: Accumulate sub-pixel mouse motion." ?
ἔρρωσο, Zeb
Agreed, will do.
On Mon, Aug 5, 2019 at 10:57 AM Zebediah Figura zfigura@codeweavers.com wrote:
Hello Derek,
I think the title for this patch could be improved. "small slow mouse movements" is pretty vague, and "don't react to" is misleading, as we do react to them in due time. How about instead something like "winex11: Accumulate sub-pixel mouse motion." ?
ἔρρωσο, Zeb
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55085
Your paranoid android.
=== debian10 (32 bit report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit Chinese:China report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (32 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
=== debian10 (64 bit WoW report) ===
user32: msg.c:5145: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped: marked "todo_wine" but succeeds
Report errors: user32:msg prints too much data (35221 bytes)
You could probably move this after PATCH 5/9, so that you don't have to change those lines again.
I could, but then if Julliard wanted to pull in this patch without the others he'd have to perform a rebase.
On Fri, Aug 2, 2019 at 4:20 AM Rémi Bernon rbernon@codeweavers.com wrote:
You could probably move this after PATCH 5/9, so that you don't have to change those lines again. -- Rémi Bernon rbernon@codeweavers.com
On 8/5/19 6:57 AM, Derek Lesho wrote:
I could, but then if Julliard wanted to pull in this patch without the others he'd have to perform a rebase.
On Fri, Aug 2, 2019 at 4:20 AM Rémi Bernon rbernon@codeweavers.com wrote:
You could probably move this after PATCH 5/9, so that you don't have to change those lines again. -- Rémi Bernon rbernon@codeweavers.com
I think if you do
msg_data->rawinput.mouse.data = input->mouse.data;
queue_hardware_message( desktop, msg, 0 ); }
+ if (device && device->flags & RIDEV_NOLEGACY) + return FALSE;
for (i = 0; i < ARRAY_SIZE( messages ); i++)
instead of
msg_data->rawinput.mouse.data = input->mouse.data;
queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; }
for (i = 0; i < ARRAY_SIZE( messages ); i++)
then it would work the same for this patch (even if you keep it first in the serie), and you will not have to change it again later on.
-
Derek Lesho -
Marvin -
Rémi Bernon -
Zebediah Figura