Changeset 2463 for trunk/src


Ignore:
Timestamp:
Jan 17, 2000, 6:19:21 PM (26 years ago)
Author:
sandervl
Message:

Added support for DInput wm_char notification handler

Location:
trunk/src/user32/new
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/new/makefile

    r2426 r2463  
    1 # $Id: makefile,v 1.58 2000-01-13 13:54:51 sandervl Exp $
     1# $Id: makefile,v 1.59 2000-01-17 17:19:20 sandervl Exp $
    22
    33#
    … …  
    4141        win32wmdiclient.obj oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj \
    4242        win32wmdichild.obj winprop.obj wingdi.obj oslibgdi.obj winaccel.obj \
    43         win32wbasepos.obj oslibres.obj dummy.obj dc.obj timer.obj \
     43        win32wbasepos.obj oslibres.obj dc.obj timer.obj \
    4444        caret.obj resource.obj winproc.obj text.obj oslibmsgtranslate.obj \
    4545        windlgmsg.obj windlg.obj win32wdesktop.obj win32wbasenonclient.obj
    … …  
    8989user32.obj: user32.cpp $(PDWIN32_INCLUDE)\wndproc.h \
    9090            $(PDWIN32_INCLUDE)\winicon.h syscolor.h pmwindow.h
    91 dummy.obj: dummy.cpp
     91
    9292char.obj: char.cpp user32.h
    9393loadres.obj: loadres.cpp user32.h dib.h

  • trunk/src/user32/new/user32.def

    r2290 r2463  
    1 ; $Id: user32.def,v 1.11 2000-01-01 14:59:42 cbratschi Exp $
     1; $Id: user32.def,v 1.12 2000-01-17 17:19:20 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
    … …  
    628628    EnumDisplayMonitors        = _EnumDisplayMonitors@16        @1005
    629629
    630     CreateWindowProc                    @2000
    631     GetOS2Callback__15Win32WindowProcFv = GetOS2Callback__Fv @2001
    632 
    633630; Wine/Odin helper function
    634631    GetSysColorPen              = _GetSysColorPen@4              @2002
    … …  
    641638
    642639    _wvsnprintfA@16                                              @2010
     640
     641    _KEYBOARD_Enable@4                                           @2011

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

    r2458 r2463  
    1 /* $Id: win32wbase.cpp,v 1.44 2000-01-16 18:17:12 cbratschi Exp $ */
     1/* $Id: win32wbase.cpp,v 1.45 2000-01-17 17:19:20 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    10061006//******************************************************************************
    10071007//******************************************************************************
     1008ULONG Win32BaseWindow::MsgChar(MSG *msg)
     1009{
     1010    if(ISKDB_CAPTURED())
     1011    {
     1012        DInputKeyBoardHandler(msg);
     1013    }
     1014    return DispatchMsgA(msg);
     1015}
     1016//******************************************************************************
     1017//******************************************************************************
    10081018ULONG Win32BaseWindow::MsgNCPaint()
    10091019{

  • trunk/src/user32/new/win32wbase.h

    r2458 r2463  
    1 /* $Id: win32wbase.h,v 1.31 2000-01-16 18:17:12 cbratschi Exp $ */
     1/* $Id: win32wbase.h,v 1.32 2000-01-17 17:19:21 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    112112         ULONG  MsgButton(MSG *msg);
    113113         ULONG  MsgMouseMove(MSG *msg);
     114         ULONG  MsgChar(MSG *msg);
    114115         ULONG  MsgPaint(ULONG tmp1, BOOL select = TRUE);
    115116         ULONG  MsgEraseBackGround(HDC hdc);

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

    r2290 r2463  
    1 /* $Id: winmouse.cpp,v 1.1 2000-01-01 14:57:38 cbratschi Exp $ */
     1/* $Id: winmouse.cpp,v 1.2 2000-01-17 17:19:21 sandervl Exp $ */
    22/*
    33 * Mouse handler for DINPUT
    … …  
    1717
    1818LPMOUSE_EVENT_PROC mouseHandler = NULL;
     19WNDPROC            keyboardHandler = NULL;
    1920
    2021//******************************************************************************
    … …  
    2728  }
    2829  else  mouseHandler = lpMouseEventProc;
     30}
     31//******************************************************************************
     32//******************************************************************************
     33VOID WIN32API KEYBOARD_Enable(WNDPROC handler)
     34{
     35  keyboardHandler = handler;
     36}
     37//******************************************************************************
     38//******************************************************************************
     39void DInputKeyBoardHandler(MSG *msg)
     40{
     41  if(keyboardHandler)
     42        keyboardHandler(msg->hwnd, msg->message, msg->wParam, msg->lParam);
    2943}
    3044//******************************************************************************

  • trunk/src/user32/new/winmouse.h

    r2290 r2463  
    1 /* $Id: winmouse.h,v 1.1 2000-01-01 14:54:58 cbratschi Exp $ */
     1/* $Id: winmouse.h,v 1.2 2000-01-17 17:19:21 sandervl Exp $ */
    22/*
    33 * Mouse handler for DINPUT
    … …  
    1515
    1616extern LPMOUSE_EVENT_PROC mouseHandler;
     17extern WNDPROC            keyboardHandler;
    1718
    1819#define ISMOUSE_CAPTURED()      (mouseHandler!=NULL)
     20#define ISKDB_CAPTURED()        (keyboardHandler!=0)
    1921
    2022#define MOUSEMSG_BUTTON 0
    … …  
    2224
    2325BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y);
     26void DInputKeyBoardHandler(MSG *msg);
    2427
    2528#endif //__WINMOUSE_H__
Note: See TracChangeset for help on using the changeset viewer.