Tell dispatch which mouse button is being dragged.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5415 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 76c73d9be40f31d58f2bf0cc5eafcbf116ea2356..09b90b0cd274727233b2fb8bd71cc352472e1ef3 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-15  Angus Leeming  <leeming@lyx.org>
+
+       * XWorkArea.C (work_area_handler): it transpires that
+         ev->xbutton.button == 0 when the mouse is dragged,
+         so it cannot be used to initialise x_button_state and
+         hence FuncRequest.
+         This patch uses the 'key' that is passed into the function
+         by xforms to extract this info and so resolve the problem.
+
 2002-10-15  Angus Leeming  <leeming@lyx.org>
 
        * FormCitation.C (updateBrowser): deselect the highlighted item when

diff --git a/src/frontends/xforms/XWorkArea.C b/src/frontends/xforms/XWorkArea.C
index 3d66aaf7222bfee7cab58746116e1afefa3a6de6..1f0bd3beab561416cb4be863223f931961443286 100644 (file)
--- a/src/frontends/xforms/XWorkArea.C
+++ b/src/frontends/xforms/XWorkArea.C
@@ -69,45 +69,28 @@ mouse_button::state x_button_state(unsigned int button)
 {
        mouse_button::state b = mouse_button::none;
        switch (button) {
-               case Button1:
-                       b = mouse_button::button1;
-                       break;
-               case Button2:
-                       b = mouse_button::button2;
-                       break;
-               case Button3:
-                       b = mouse_button::button3;
-                       break;
-               case Button4:
-                       b = mouse_button::button4;
-                       break;
-               case Button5:
-                       b = mouse_button::button5;
-                       break;
-               default: // FIXME
-                       break;
+       case FL_MBUTTON1:
+               b = mouse_button::button1;
+               break;
+       case FL_MBUTTON2:
+               b = mouse_button::button2;
+               break;
+       case FL_MBUTTON3:
+               b = mouse_button::button3;
+               break;
+       case FL_MBUTTON4:
+               b = mouse_button::button4;
+               break;
+       case FL_MBUTTON5:
+               b = mouse_button::button5;
+               break;
+       default: // FIXME
+               break;
        }
        return b;
 }
 
 
-mouse_button::state x_motion_state(unsigned int state)
-{
-       mouse_button::state b = mouse_button::none;
-       if (state & Button1MotionMask)
-               b |= mouse_button::button1;
-       if (state & Button2MotionMask)
-               b |= mouse_button::button2;
-       if (state & Button3MotionMask)
-               b |= mouse_button::button3;
-       if (state & Button4MotionMask)
-               b |= mouse_button::button4;
-       if (state & Button5MotionMask)
-               b |= mouse_button::button5;
-       return b;
-}
-
-
 key_modifier::state x_key_state(unsigned int state)
 {
        key_modifier::state k = key_modifier::none;
@@ -355,18 +338,20 @@ int XWorkArea::work_area_handler(FL_OBJECT * ob, int event,
                // Should really have used xbutton.state
                lyxerr[Debug::WORKAREA] << "Workarea event: PUSH" << endl;
                area->dispatch(
-                       FuncRequest(LFUN_MOUSE_PRESS, ev->xbutton.x - ob->x,
-                                                       ev->xbutton.y - ob->y,
-                                                       x_button_state(ev->xbutton.button)));
+                       FuncRequest(LFUN_MOUSE_PRESS,
+                                   ev->xbutton.x - ob->x,
+                                   ev->xbutton.y - ob->y,
+                                   x_button_state(key)));
                break;
        case FL_RELEASE:
                if (!ev || ev->xbutton.button == 0) break;
                // Should really have used xbutton.state
                lyxerr[Debug::WORKAREA] << "Workarea event: RELEASE" << endl;
                area->dispatch(
-                       FuncRequest(LFUN_MOUSE_RELEASE, ev->xbutton.x - ob->x,
-                                                       ev->xbutton.y - ob->y,
-                                                       x_button_state(ev->xbutton.button)));
+                       FuncRequest(LFUN_MOUSE_RELEASE,
+                                   ev->xbutton.x - ob->x,
+                                   ev->xbutton.y - ob->y,
+                                   x_button_state(key)));
                break;
 #if FL_VERSION < 1 && FL_REVISION < 89
        case FL_MOUSE:
@@ -384,9 +369,10 @@ int XWorkArea::work_area_handler(FL_OBJECT * ob, int event,
                        scrollbar_value_old = fl_get_scrollbar_value(area->scrollbar);
                        lyxerr[Debug::WORKAREA] << "Workarea event: MOUSE" << endl;
                        area->dispatch(
-                               FuncRequest(LFUN_MOUSE_MOTION, ev->xbutton.x - ob->x,
-                                                               ev->xbutton.y - ob->y,
-                                                               x_button_state(ev->xbutton.button)));
+                               FuncRequest(LFUN_MOUSE_MOTION,
+                                           ev->xbutton.x - ob->x,
+                                           ev->xbutton.y - ob->y,
+                                           x_button_state(key)));
                }
                break;
 #if FL_VERSION < 1 && FL_REVISION < 89
@@ -519,18 +505,20 @@ int XWorkArea::work_area_handler(FL_OBJECT * ob, int event,
        case FL_DBLCLICK:
                if (ev) {
                        lyxerr[Debug::WORKAREA] << "Workarea event: DBLCLICK" << endl;
-                       FuncRequest cmd(LFUN_MOUSE_DOUBLE, ev->xbutton.x - ob->x,
-                                                       ev->xbutton.y - ob->y,
-                                                       x_button_state(ev->xbutton.button));
+                       FuncRequest cmd(LFUN_MOUSE_DOUBLE,
+                                       ev->xbutton.x - ob->x,
+                                       ev->xbutton.y - ob->y,
+                                       x_button_state(key));
                        area->dispatch(cmd);
                }
                break;
        case FL_TRPLCLICK:
                if (ev) {
                        lyxerr[Debug::WORKAREA] << "Workarea event: TRPLCLICK" << endl;
-                       FuncRequest cmd(LFUN_MOUSE_TRIPLE, ev->xbutton.x - ob->x,
-                                                       ev->xbutton.y - ob->y,
-                                                       x_button_state(ev->xbutton.button));
+                       FuncRequest cmd(LFUN_MOUSE_TRIPLE,
+                                       ev->xbutton.x - ob->x,
+                                       ev->xbutton.y - ob->y,
+                                       x_button_state(key));
                        area->dispatch(cmd);
                }
                break;