From f7e70e1ac3534b5b91cf1e9a3541cdb930ea7e1a Mon Sep 17 00:00:00 2001 From: "kmcclusk%netscape.com" Date: Fri, 7 Aug 1998 19:38:28 +0000 Subject: [PATCH] Correctly set shift and control flags on mouse and keyboard events. --- widget/src/motif/nsXtEventHandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/widget/src/motif/nsXtEventHandler.cpp b/widget/src/motif/nsXtEventHandler.cpp index 7bee4c4ecd19..d5746a8850f2 100644 --- a/widget/src/motif/nsXtEventHandler.cpp +++ b/widget/src/motif/nsXtEventHandler.cpp @@ -161,9 +161,9 @@ void nsXtWidget_InitNSMouseEvent(XEvent * anXEv, if (anXEv != NULL) { // Do Mouse Event specific intialization anEvent.time = anXEv->xbutton.time; - anEvent.isShift = anXEv->xbutton.state | ShiftMask; - anEvent.isControl = PR_FALSE; // anXEv->xbutton.state | ControlMask; - anEvent.isAlt = PR_FALSE; + anEvent.isShift = anXEv->xbutton.state & ShiftMask; + anEvent.isControl = anXEv->xbutton.state & ControlMask; + anEvent.isAlt = PR_FALSE; // Fix later anEvent.clickCount = 1; // Fix for double-clicks anEvent.eventStructType = NS_MOUSE_EVENT; } @@ -817,8 +817,8 @@ void nsXtWidget_InitNSKeyEvent(int aEventType, nsKeyEvent& aKeyEvent, Widget w, XtTranslateKeycode(xKeyEvent->display,xKeyEvent->keycode, xKeyEvent->state, &modout, &res); aKeyEvent.keyCode = nsConvertKey(res); aKeyEvent.time = xKeyEvent->time; - aKeyEvent.isShift = PR_FALSE; // modout | ShiftMask; // Fix later - aKeyEvent.isControl = PR_FALSE; // modout | ControlMask; + aKeyEvent.isShift = modout & ShiftMask; + aKeyEvent.isControl = modout & ControlMask; aKeyEvent.isAlt = PR_FALSE; // Fix later // printf("KEY Event type %d %d shift %d control %d \n", aEventType == NS_KEY_DOWN, aKeyEvent.keyCode, aKeyEvent.isShift, aKeyEvent.isControl); }