[PATCH v4 3/8] winex11.drv: Merge FocusIn/FocusOut NotifyGrab/NotifyUngrab cases.
Rémi Bernon
rbernon at codeweavers.com
Mon Oct 21 02:13:41 CDT 2019
The return value was different as well, this makes it more consistent.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/winex11.drv/event.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index ae6860f372e..a4a6ad8d601 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -772,18 +772,8 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev )
if (event->detail == NotifyPointer) return FALSE;
if (hwnd == GetDesktopWindow()) return FALSE;
- switch (event->mode)
- {
- case NotifyGrab:
- /* these are received when moving undecorated managed windows on mutter */
- return FALSE;
- case NotifyWhileGrabbed:
- break;
- case NotifyNormal:
- break;
- case NotifyUngrab:
- return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */
- }
+ /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */
+ if (event->mode == NotifyGrab || event->mode == NotifyUngrab) return FALSE;
if ((xic = X11DRV_get_ic( hwnd ))) XSetICFocus( xic );
if (use_take_focus)
@@ -869,18 +859,8 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev )
}
if (!hwnd) return FALSE;
- switch (event->mode)
- {
- case NotifyUngrab:
- /* these are received when moving undecorated managed windows on mutter */
- return FALSE;
- case NotifyNormal:
- break;
- case NotifyWhileGrabbed:
- break;
- case NotifyGrab:
- return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */
- }
+ /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */
+ if (event->mode == NotifyGrab || event->mode == NotifyUngrab) return FALSE;
focus_out( event->display, hwnd );
return TRUE;
--
2.23.0
More information about the wine-devel
mailing list