Ignore:
Timestamp:
Aug 16, 1999, 5:55:28 PM (26 years ago)
Author:
dengert
Message:

Client window mouse button messages improved.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/new/pmwindow.cpp

    r397 r509  
    1 /* $Id: pmwindow.cpp,v 1.17 1999-07-26 09:01:34 sandervl Exp $ */
     1/* $Id: pmwindow.cpp,v 1.18 1999-08-16 15:55:28 dengert Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    44 *
    55 * Copyright 1998-1999 Sander van Leeuwen (sandervl@xs4all.nl)
     6 * Copyright 1999      Daniela Engert (dani@ngrt.de)
    67 *
    78 *
    … …  
    8889{
    8990 POSTMSG_PACKET *postmsg;
    90  OSLIBPOINT      point;
     91 OSLIBPOINT      point, ClientPoint;
    9192 Win32Window    *win32wnd;
    9293 APIRET          rc;
    … …  
    286287        point.x = (*(POINTS *)&mp1).x;
    287288        point.y = (*(POINTS *)&mp1).y;
    288         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    289         if(win32wnd->MsgButton(BUTTON_LEFTDOWN, point.x, point.y)) {
     289        ClientPoint.x = point.x;
     290        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     291        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     292        if(win32wnd->MsgButton(BUTTON_LEFTDOWN, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    290293                goto RunDefWndProc;
    291294        }
    … …  
    296299        point.x = (*(POINTS *)&mp1).x;
    297300        point.y = (*(POINTS *)&mp1).y;
    298         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    299         if(win32wnd->MsgButton(BUTTON_LEFTUP, point.x, point.y)) {
     301        ClientPoint.x = point.x;
     302        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     303        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     304        if(win32wnd->MsgButton(BUTTON_LEFTUP, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    300305                goto RunDefWndProc;
    301306        }
    … …  
    304309        point.x = (*(POINTS *)&mp1).x;
    305310        point.y = (*(POINTS *)&mp1).y;
    306         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    307         if(win32wnd->MsgButton(BUTTON_LEFTDBLCLICK, point.x, point.y)) {
     311        ClientPoint.x = point.x;
     312        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     313        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     314        if(win32wnd->MsgButton(BUTTON_LEFTDBLCLICK, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    308315                goto RunDefWndProc;
    309316        }
    … …  
    312319        point.x = (*(POINTS *)&mp1).x;
    313320        point.y = (*(POINTS *)&mp1).y;
    314         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    315         if(win32wnd->MsgButton(BUTTON_RIGHTDOWN, point.x, point.y)) {
     321        ClientPoint.x = point.x;
     322        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     323        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     324        if(win32wnd->MsgButton(BUTTON_RIGHTDOWN, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    316325                goto RunDefWndProc;
    317326        }
    … …  
    320329        point.x = (*(POINTS *)&mp1).x;
    321330        point.y = (*(POINTS *)&mp1).y;
    322         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    323         if(win32wnd->MsgButton(BUTTON_RIGHTUP, point.x, point.y)) {
     331        ClientPoint.x = point.x;
     332        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     333        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     334        if(win32wnd->MsgButton(BUTTON_RIGHTUP, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    324335                goto RunDefWndProc;
    325336        }
    … …  
    328339        point.x = (*(POINTS *)&mp1).x;
    329340        point.y = (*(POINTS *)&mp1).y;
    330         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    331         if(win32wnd->MsgButton(BUTTON_RIGHTDBLCLICK, point.x, point.y)) {
     341        ClientPoint.x = point.x;
     342        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     343        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     344        if(win32wnd->MsgButton(BUTTON_RIGHTDBLCLICK, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    332345                goto RunDefWndProc;
    333346        }
    … …  
    336349        point.x = (*(POINTS *)&mp1).x;
    337350        point.y = (*(POINTS *)&mp1).y;
    338         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    339         if(win32wnd->MsgButton(BUTTON_MIDDLEDOWN, point.x, point.y)) {
     351        ClientPoint.x = point.x;
     352        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     353        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     354        if(win32wnd->MsgButton(BUTTON_MIDDLEDOWN, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    340355                goto RunDefWndProc;
    341356        }
    … …  
    344359        point.x = (*(POINTS *)&mp1).x;
    345360        point.y = (*(POINTS *)&mp1).y;
    346         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    347         if(win32wnd->MsgButton(BUTTON_MIDDLEUP, point.x, point.y)) {
     361        ClientPoint.x = point.x;
     362        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     363        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     364        if(win32wnd->MsgButton(BUTTON_MIDDLEUP, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    348365                goto RunDefWndProc;
    349366        }
    … …  
    352369        point.x = (*(POINTS *)&mp1).x;
    353370        point.y = (*(POINTS *)&mp1).y;
    354         MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
    355         if(win32wnd->MsgButton(BUTTON_MIDDLEDBLCLICK, point.x, point.y)) {
     371        ClientPoint.x = point.x;
     372        ClientPoint.y = MapOS2ToWin32Y(hwnd, 1, point.y);
     373        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
     374        if(win32wnd->MsgButton(BUTTON_MIDDLEDBLCLICK, point.x, point.y, ClientPoint.x, ClientPoint.y)) {
    356375                goto RunDefWndProc;
    357376        }
Note: See TracChangeset for help on using the changeset viewer.