Changeset 3072 for trunk/src


Ignore:
Timestamp:
Mar 9, 2000, 10:50:11 PM (25 years ago)
Author:
sandervl
Message:

dinput changes/fixes

Location:
trunk/src/user32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/oslibmsgtranslate.cpp

    r3007 r3072  
    1 /* $Id: oslibmsgtranslate.cpp,v 1.21 2000-03-04 19:54:03 sandervl Exp $ */
     1/* $Id: oslibmsgtranslate.cpp,v 1.22 2000-03-09 21:50:11 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    195195        if(ISMOUSE_CAPTURED())
    196196        {
    197             if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_BUTTON, winMsg->pt.x, winMsg->pt.y))
     197            if(DInputMouseHandler(win32wnd->getWindowHandle(), winMsg->message, winMsg->pt.x, winMsg->pt.y))
    198198                goto dummymessage; //dinput swallowed message
    199199        }
    … …  
    231231        if(ISMOUSE_CAPTURED())
    232232        {
    233             if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_MOVE, winMsg->pt.x, winMsg->pt.y))
     233            if(DInputMouseHandler(win32wnd->getWindowHandle(), winMsg->message, winMsg->pt.x, winMsg->pt.y))
    234234                goto dummymessage; //dinput swallowed message
    235235        }
    … …  
    449449        if(ISMOUSE_CAPTURED())
    450450        {
    451             if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_BUTTON, winMsg->pt.x, winMsg->pt.y))
     451            if(DInputMouseHandler(win32wnd->getWindowHandle(), winMsg->message, winMsg->pt.x, winMsg->pt.y))
    452452                goto dummymessage; //dinput swallowed message
    453453        }
    … …  
    485485        if(ISMOUSE_CAPTURED())
    486486        {
    487             if(DInputMouseHandler(win32wnd->getWindowHandle(), MOUSEMSG_MOVE, winMsg->pt.x, winMsg->pt.y))
     487            if(DInputMouseHandler(win32wnd->getWindowHandle(), winMsg->message, winMsg->pt.x, winMsg->pt.y))
    488488                goto dummymessage; //dinput swallowed message
    489489        }

  • trunk/src/user32/winmouse.cpp

    r3007 r3072  
    1 /* $Id: winmouse.cpp,v 1.7 2000-03-04 19:54:03 sandervl Exp $ */
     1/* $Id: winmouse.cpp,v 1.8 2000-03-09 21:50:11 sandervl Exp $ */
    22/*
    33 * Mouse handler for DINPUT
    … …  
    6262  mouseEvent.time  = OSLibWinQueryMsgTime();
    6363  mouseEvent.keyState = 0; //not used in dinput right now
    64   if(msg == MOUSEMSG_BUTTON)
     64  switch(msg)
    6565  {
    66         switch(msg)
    67         {
    68         case WM_LBUTTONDOWN:
    69                 dwFlags |= MOUSEEVENTF_LEFTDOWN;
    70                 break;
    71         case WM_LBUTTONUP:
    72                 dwFlags |= MOUSEEVENTF_LEFTUP;
    73                 break;
    74         case WM_RBUTTONUP:
    75                 dwFlags |= MOUSEEVENTF_RIGHTUP;
    76                 break;
    77         case WM_RBUTTONDOWN:
    78                 dwFlags |= MOUSEEVENTF_RIGHTDOWN;
    79                 break;
    80         case WM_MBUTTONUP:
    81                 dwFlags |= MOUSEEVENTF_MIDDLEUP;
    82                 break;
    83         case WM_MBUTTONDOWN:
    84                 dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
    85                 break;
    86         }
     66  case WM_NCLBUTTONDOWN:
     67  case WM_LBUTTONDOWN:
     68        dwFlags |= MOUSEEVENTF_LEFTDOWN;
     69        break;
     70  case WM_NCLBUTTONUP:
     71  case WM_LBUTTONUP:
     72        dwFlags |= MOUSEEVENTF_LEFTUP;
     73        break;
     74  case WM_NCRBUTTONUP:
     75  case WM_RBUTTONUP:
     76        dwFlags |= MOUSEEVENTF_RIGHTUP;
     77        break;
     78  case WM_NCRBUTTONDOWN:
     79  case WM_RBUTTONDOWN:
     80        dwFlags |= MOUSEEVENTF_RIGHTDOWN;
     81        break;
     82  case WM_NCMBUTTONUP:
     83  case WM_MBUTTONUP:
     84        dwFlags |= MOUSEEVENTF_MIDDLEUP;
     85        break;
     86  case WM_NCMBUTTONDOWN:
     87  case WM_MBUTTONDOWN:
     88        dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
     89        break;
     90  case WM_MOUSEMOVE:
     91  case WM_NCMOUSEMOVE:
     92        dwFlags |= MOUSEEVENTF_MOVE;
     93        break;
     94  default:
     95        //TODO: handle double clicks???
     96        return FALSE;
    8797  }
    88   else  dwFlags |= MOUSEEVENTF_MOVE;
    8998
    9099  x = (((long)x << 16) + ScreenWidth-1)  / ScreenWidth;

  • trunk/src/user32/winmouse.h

    r3007 r3072  
    1 /* $Id: winmouse.h,v 1.6 2000-03-04 19:54:03 sandervl Exp $ */
     1/* $Id: winmouse.h,v 1.7 2000-03-09 21:50:11 sandervl Exp $ */
    22/*
    33 * Mouse handler for DINPUT
    … …  
    1818#define ISKDB_CAPTURED()        (keyboardHandler!=0)
    1919
    20 #define MOUSEMSG_BUTTON 0
    21 #define MOUSEMSG_MOVE   1
    22 
    2320BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y);
    2421BOOL DInputKeyBoardHandler(MSG *msg);
Note: See TracChangeset for help on using the changeset viewer.