[Emacs-diffs] Changes to emacs/src/w32term.c

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.134 emacs/src/w32term.c:1.135
*** emacs/src/w32term.c:1.134   Sat Jan 12 11:00:35 2002
--- emacs/src/w32term.c Sun Jan 13 07:16:05 2002
***************
*** 6037,6045 ****
    return success_p;
  }
  
  BOOL 
! parse_button (message, pbutton, pup)
       int message;
       int * pbutton;
       int * pup;
  {
--- 6037,6049 ----
    return success_p;
  }
  
+ /* Parse a button MESSAGE. The button index is returned in PBUTTON, and
+    the state in PUP. XBUTTON provides extra information for extended mouse
+    button messages. Returns FALSE if unable to parse the message.  */
  BOOL 
! parse_button (message, xbutton, pbutton, pup)
       int message;
+      int xbutton;
       int * pbutton;
       int * pup;
  {
***************
*** 6084,6089 ****
--- 6088,6101 ----
        button = 1;
        up = 1;
        break;
+     case WM_XBUTTONDOWN:
+       button = xbutton + 2;
+       up = 0;
+       break;
+     case WM_XBUTTONUP:
+       button = xbutton + 2;
+       up = 1;
+       break;
      default:
        return (FALSE);
      }
***************
*** 6109,6115 ****
    int button;
    int up;
  
!   parse_button (msg->msg.message, &button, &up);
  
    /* Make the event type no_event; we'll change that when we decide
       otherwise.  */
--- 6121,6128 ----
    int button;
    int up;
  
!   parse_button (msg->msg.message, HIWORD (msg->msg.wParam),
!               &button, &up);
  
    /* Make the event type no_event; we'll change that when we decide
       otherwise.  */
***************
*** 8661,8666 ****
--- 8674,8681 ----
        case WM_MBUTTONUP:
        case WM_RBUTTONDOWN:
        case WM_RBUTTONUP:
+       case WM_XBUTTONDOWN:
+       case WM_XBUTTONUP:
          {
              /* If we decide we want to generate an event to be seen
                 by the rest of Emacs, we put it here.  */
***************
*** 8712,8719 ****
                      }
              }
            
!           parse_button (msg.msg.message, &button, &up);
!           
            if (up)
              {
                dpyinfo->grabbed &= ~ (1 << button);
--- 8727,8735 ----
                      }
              }
            
!           parse_button (msg.msg.message, HIWORD (msg.msg.wParam),
!                         &button, &up);
! 
            if (up)
              {
                dpyinfo->grabbed &= ~ (1 << button);