Changeset 4551 for trunk/src


Ignore:
Timestamp:
Nov 4, 2000, 5:28:26 PM (25 years ago)
Author:
sandervl
Message:

LockWindowUpdate rewritten + small changes

Location:
trunk/src/user32
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/Makefile

    r3864 r4551  
    1 # $Id: Makefile,v 1.73 2000-07-19 19:05:24 sandervl Exp $
     1# $Id: Makefile,v 1.74 2000-11-04 16:28:24 sandervl Exp $
    22
    33#
    … …  
    2121CLEANEXTRAS = user32rsrc.asm
    2222
     23CFLAGS   = $(CFLAGS) -DINVERT
     24CXXFLAGS = $(CXXFLAGS) -DINVERT
    2325
    2426# Object files. All objects should be prefixed with $(OBJDIR)!
    2527OBJS = \
     28$(OBJDIR)\dc.obj \
     29$(OBJDIR)\dcrgn.obj \
    2630$(OBJDIR)\user32.obj \
    2731$(OBJDIR)\loadres.obj \
    … …  
    7882$(OBJDIR)\win32wbaseprop.obj \
    7983$(OBJDIR)\oslibres.obj \
    80 $(OBJDIR)\dc.obj \
    81 $(OBJDIR)\dcrgn.obj \
    8284$(OBJDIR)\timer.obj \
    8385$(OBJDIR)\dbglocal.obj \
    … …  
    119121/MAP:$(OBJDIR)\$(TARGET).map
    120122$(OBJS)
     123$(PDWIN32_LIB)/gdi32.lib
    121124$(PDWIN32_LIB)/pmwinx.lib
    122 $(PDWIN32_LIB)/gdi32.lib
    123125$(PDWIN32_LIB)/kernel32.lib
    124126$(PDWIN32_LIB)/libuls.lib

  • trunk/src/user32/USER32.DEF

    r4535 r4551  
    1 ; $Id: USER32.DEF,v 1.38 2000-10-26 17:22:23 sandervl Exp $
     1; $Id: USER32.DEF,v 1.39 2000-11-04 16:28:24 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
    … …  
    1111IMPORTS
    1212    _WinSetDAXData              = PMMERGE.5448
    13     _GpiQueryDCData             = PMGPI.665
    14     _GpiEnableYInversion        = PMGPI.723
    15     _GpiQueryYInversion         = PMGPI.726
    16     _HPSToHDC                   = PMWINX.1022
    17     _DeleteHDC                  = PMWINX.1023
    1813    __DestroyCaret              = PMMERGE.10001
    1914    __GetCaretBlinkTime         = PMMERGE.10002
    … …  
    2217    __ShowCaret                 = PMMERGE.10007
    2318    WinReplyMsg                 = PMMERGE.5325
     19    _GpiEnableYInversion        = PMGPI.723
     20    _GpiQueryYInversion         = PMGPI.726
     21;;;----------->>>>
     22    _GpiQueryDCData            = PMGPI.665
    2423
    2524EXPORTS
    … …  
    662661
    663662    _wvsnprintfW@16                                              @2015
     663
     664    _WGSS_setPageXForm@4                                         @2016
     665    _WGSS_clientHeight@8                                         @2017
     666    _WGSS_changePageXForm@20                                     @2018
     667    _WGSS_removeClientArea@4                                     @2019

  • trunk/src/user32/dc.cpp

    r4463 r4551  
    1 /* $Id: dc.cpp,v 1.74 2000-10-09 17:26:47 sandervl Exp $ */
     1/* $Id: dc.cpp,v 1.75 2000-11-04 16:28:25 sandervl Exp $ */
    22
    33/*
    … …  
    225225   mlf.lM31  = pHps->viewportOrg.x - (LONG)(pHps->windowOrg.x * xScale);
    226226   mlf.lM32  = pHps->viewportOrg.y - (LONG)(pHps->windowOrg.y * yScale);
     227   mlf.lM33  = 1;
    227228
    228229   pHps->isLeftLeft = mlf.fxM11 >= 0;
    … …  
    249250      rc = GpiSetDefaultViewMatrix(pHps->hps, 8, &mlf, TRANSFORM_REPLACE);
    250251
     252#ifdef INVERT
    251253   if (bEnableYInversion)
    252254      GpiEnableYInversion(pHps->hps, pHps->height + pHps->HPStoHDCInversionHeight);
    253255   else
    254256      GpiEnableYInversion(pHps->hps, 0);
     257#else
     258   pHps->yInvert = 0;
     259   if(bEnableYInversion)
     260   {
     261      pHps->yInvert4Enable = pHps->height + pHps->HPStoHDCInversionHeight;
     262      if(pHps->isPrinter)
     263      {
     264         pHps->yInvert = pHps->yInvert4Enable
     265                       * (pHps->windowExt.cy / (double)pHps->viewportYExt);
     266      } else {
     267         pHps->yInvert = pHps->yInvert4Enable;
     268      }
     269   }
     270#endif
    255271
    256272   TestWideLine(pHps);
    … …  
    469485//******************************************************************************
    470486//******************************************************************************
     487BOOL   WIN32API WGSS_changePageXForm(pDCData pHps, PPOINTL pValue, int x, int y, PPOINTL pPrev)
     488{
     489 Win32BaseWindow *wnd;
     490
     491   wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
     492   return changePageXForm(wnd, pHps, pValue, x, y, pPrev);
     493}
     494//******************************************************************************
     495//******************************************************************************
     496BOOL   WIN32API WGSS_setPageXForm(pDCData pHps)
     497{
     498 Win32BaseWindow *wnd;
     499
     500   wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
     501   return setPageXForm(wnd, pHps);
     502}
     503//******************************************************************************
     504//******************************************************************************
     505VOID   WIN32API WGSS_removeClientArea(pDCData pHps)
     506{
     507 Win32BaseWindow *wnd;
     508
     509   wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
     510   removeClientArea(wnd, pHps);
     511}
     512//******************************************************************************
     513//******************************************************************************
     514LONG   WIN32API WGSS_clientHeight(HWND hwnd, pDCData pHps)
     515{
     516 Win32BaseWindow *wnd;
     517
     518   wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
     519   return clientHeight(wnd, hwnd, pHps);
     520}
     521//******************************************************************************
     522//******************************************************************************
    471523BOOL isYup (pDCData pHps)
    472524{
    … …  
    652704        POINTL point = {-rectlClient.xLeft, -rectlClient.yBottom};
    653705        GpiOffsetRegion(pHps->hps, hrgnClip, &point);
    654 
     706#ifdef DEBUG
     707        dprintfRegion1(pHps->hps, hWnd, hrgnClip);
     708#endif
    655709        //set clip region
    656         GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
     710        lComplexity = GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
     711
     712        GpiQueryClipBox(pHps->hps, &rectl);
     713        dprintf(("ClipBox (%d): (%d,%d)(%d,%d)", lComplexity, rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
    657714
    658715        //save old clip region (restored for CS_OWNDC windows in EndPaint)
    … …  
    672729   WinShowTrackRect(wnd->getOS2WindowHandle(), FALSE);
    673730
    674 #ifdef DEBUG
    675    POINTL point;
    676    GreGetDCOrigin(pHps->hps, &point);
    677    dprintf(("dc origin (%d,%d)", point.x, point.y));
    678 #endif
    679 
    680731   if(wnd->needsEraseBkgnd() && lComplexity != RGN_NULL) {
    681732        wnd->setEraseBkgnd(FALSE);
    … …  
    685736
    686737#ifdef DEBUG
     738   POINTL point;
    687739   GreGetDCOrigin(pHps->hps, &point);
    688740   dprintf(("dc origin (%d,%d)", point.x, point.y));

  • trunk/src/user32/oslibwin.cpp

    r4434 r4551  
    1 /* $Id: oslibwin.cpp,v 1.83 2000-10-05 18:37:25 sandervl Exp $ */
     1/* $Id: oslibwin.cpp,v 1.84 2000-11-04 16:28:25 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    817817//******************************************************************************
    818818//******************************************************************************
     819BOOL OSLibWinLockWindowUpdate(HWND hwnd)
     820{
     821  return WinLockWindowUpdate(HWND_DESKTOP, (HWND)hwnd);
     822}
     823//******************************************************************************
     824//******************************************************************************

  • trunk/src/user32/oslibwin.h

    r4452 r4551  
    1 /* $Id: oslibwin.h,v 1.47 2000-10-08 14:03:49 sandervl Exp $ */
     1/* $Id: oslibwin.h,v 1.48 2000-11-04 16:28:26 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    295295ULONG OSLibGetScreenWidth();
    296296
     297BOOL   OSLibWinLockWindowUpdate(HWND hwnd);
     298
    297299#endif //__OSLIBWIN_H__

  • trunk/src/user32/window.cpp

    r4497 r4551  
    1 /* $Id: window.cpp,v 1.81 2000-10-18 17:10:50 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.82 2000-11-04 16:28:26 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    727727BOOL WIN32API LockWindowUpdate(HWND hwnd)
    728728{
    729     dprintf(("USER32:  LockWindowUpdate\n"));
    730     return O32_LockWindowUpdate(Win32BaseWindow::Win32ToOS2Handle(hwnd));
     729    dprintf(("USER32: LockWindowUpdate %x", hwnd));
     730    return OSLibWinLockWindowUpdate(Win32BaseWindow::Win32ToOS2Handle(hwnd));
    731731}
    732732//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.