From 0fa9f06565864c0e1fd990b60046705b557cf8da Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 11 Dec 2018 09:32:11 +0100 Subject: [PATCH] Modified flag checks to avoid invalid flag sets. --- client/X11/xf_event.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index d528790..b7a5e80 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -395,22 +395,6 @@ BOOL xf_generic_ButtonEvent(xfContext* xfc, int x, int y, int button, if (flags != 0) { - BOOL extended = FALSE; - - if (flags & (PTR_XFLAGS_BUTTON1 | PTR_XFLAGS_BUTTON1)) - { - extended = TRUE; - - if (down) - flags |= PTR_XFLAGS_DOWN; - } - - if (flags & (PTR_FLAGS_BUTTON1 | PTR_FLAGS_BUTTON2 | PTR_FLAGS_BUTTON3)) - { - if (down) - flags |= PTR_FLAGS_DOWN; - } - if (flags & (PTR_FLAGS_WHEEL | PTR_FLAGS_HWHEEL)) { if (down) @@ -418,6 +402,21 @@ BOOL xf_generic_ButtonEvent(xfContext* xfc, int x, int y, int button, } else { + BOOL extended = FALSE; + + if (flags & (PTR_XFLAGS_BUTTON1 | PTR_XFLAGS_BUTTON2)) + { + extended = TRUE; + + if (down) + flags |= PTR_XFLAGS_DOWN; + } + else if (flags & (PTR_FLAGS_BUTTON1 | PTR_FLAGS_BUTTON2 | PTR_FLAGS_BUTTON3)) + { + if (down) + flags |= PTR_FLAGS_DOWN; + } + if (app) { /* make sure window exists */ -- 2.7.4