From: David Webster Date: Mon, 29 Jan 2001 05:48:26 +0000 (+0000) Subject: Bitmap code, icon code and dir code updates X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6f38c86f452b444cab9eff182f76196d01bc9d22 Bitmap code, icon code and dir code updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 782ba34e62..62d8a3bc6f 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -88,29 +88,38 @@ void wxBitmap::Init() if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); -} +} // end of wxBitmap::Init bool wxBitmap::CopyFromIconOrCursor( const wxGDIImage& rIcon ) { + HPOINTER hIcon = (HPOINTER)rIcon.GetHandle(); + POINTERINFO SIconInfo; + + if (!::WinQueryPointerInfo(hIcon, &SIconInfo)) + { + wxLogLastError(wxT("WinQueryPointerInfo")); + return FALSE; + } wxBitmapRefData* pRefData = new wxBitmapRefData; m_refData = pRefData; - pRefData->m_nWidth = rIcon.GetWidth(); - pRefData->m_nHeight = rIcon.GetHeight(); - pRefData->m_nDepth = wxDisplayDepth(); + int nWidth = rIcon.GetWidth(); + int nHeight = rIcon.GetHeight(); - pRefData->m_hBitmap = (WXHBITMAP)rIcon.GetHandle(); - // no mask??? - pRefData->m_pBitmapMask = new wxMask(); + pRefData->m_nWidth = nWidth; + pRefData->m_nHeight = nHeight; + pRefData->m_nDepth = wxDisplayDepth(); -#if WXWIN_COMPATIBILITY_2 - pRefData->m_bOk = TRUE; -#endif // WXWIN_COMPATIBILITY_2 + pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor; + + // + // No mask in the Info struct in OS/2 + // return(TRUE); -} +} // end of wxBitmap::CopyFromIconOrCursor bool wxBitmap::CopyFromCursor( const wxCursor& rCursor @@ -121,7 +130,7 @@ bool wxBitmap::CopyFromCursor( if (!rCursor.Ok()) return(FALSE); return(CopyFromIconOrCursor(rCursor)); -} +} // end of wxBitmap::CopyFromCursor bool wxBitmap::CopyFromIcon( const wxIcon& rIcon @@ -133,13 +142,13 @@ bool wxBitmap::CopyFromIcon( return(FALSE); return CopyFromIconOrCursor(rIcon); -} +} // end of wxBitmap::CopyFromIcon wxBitmap::~wxBitmap() { if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this); -} +} // end of wxBitmap::~wxBitmap wxBitmap::wxBitmap( const char zBits[] @@ -200,12 +209,14 @@ wxBitmap::wxBitmap( wxLogLastError("CreateBitmap"); } SetHBITMAP((WXHBITMAP)hBmp); -} +} // end of wxBitmap::wxBitmap +// // Create from XPM data +// wxBitmap::wxBitmap( char** ppData -, wxControl* WXUNUSED(pAnItem)) +) { Init(); @@ -215,7 +226,21 @@ wxBitmap::wxBitmap( ,0 ,0 ); -} +} // end of wxBitmap::wxBitmap + +wxBitmap::wxBitmap( + const char** ppData +) +{ + Init(); + + (void)Create( (void *)ppData + ,wxBITMAP_TYPE_XPM_DATA + ,0 + ,0 + ,0 + ); +} // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( int nW @@ -229,7 +254,7 @@ wxBitmap::wxBitmap( ,nH ,nD ); -} +} // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( void* pData @@ -247,7 +272,7 @@ wxBitmap::wxBitmap( ,nHeight ,nDepth ); -} +} // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( const wxString& rFilename @@ -259,7 +284,7 @@ wxBitmap::wxBitmap( LoadFile( rFilename ,(int)lType ); -} +} // end of wxBitmap::wxBitmap bool wxBitmap::Create( int nW @@ -269,63 +294,63 @@ bool wxBitmap::Create( { HBITMAP hBmp; BITMAPINFOHEADER2 vHeader; - BITMAPINFO2 vInfo; - HPS hpsScreen; - HDC hdcScreen; - DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - SIZEL vSize = {0, 0}; - LONG lBitCount; wxASSERT(vHabmain != NULL); - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); - - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)nW; - vHeader.cy = (USHORT)nH; - vHeader.cPlanes = (USHORT)nD; - vHeader.cBitCount = lBitCount; - vHeader.ulCompression = BCA_UNCOMP; - vHeader.cxResolution = 0; - vHeader.cyResolution = 0; - vHeader.cclrUsed = 0; - vHeader.cclrImportant = 0; - vHeader.usUnits = BRU_METRIC; - vHeader.usRecording = BRA_BOTTOMUP; - vHeader.usRendering = BRH_NOTHALFTONED; - vHeader.cSize1 = 0; - vHeader.cSize2 = 0; - vHeader.ulColorEncoding = 0; - vHeader.ulIdentifier = 0; - UnRef(); m_refData = new wxBitmapRefData; - GetBitmapData()->m_nWidth = nW; GetBitmapData()->m_nHeight = nH; GetBitmapData()->m_nDepth = nD; if (nD > 0) { - hBmp = ::GpiCreateBitmap(hpsScreen, &vHeader, 0L, NULL, &vInfo); - if (!hBmp) - { - wxLogLastError("CreateBitmap"); - } + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + SIZEL vSize = {0, 0}; + HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); + + memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); + vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + vHeader.cx = nW; + vHeader.cy = nH; + vHeader.cPlanes = 1; + vHeader.cBitCount = nD; + + hBmp = ::GpiCreateBitmap( hPS + ,&vHeader + ,0L + ,NULL + ,NULL + ); + ::GpiDestroyPS(hPS); + ::DevCloseDC(hDC); } else { - LONG lPlanes; + HPS hPSScreen; + HDC hDCScreen; + LONG lBitCount; + + hPSScreen = ::WinGetScreenPS(HWND_DESKTOP); + hDCScreen = ::GpiQueryDevice(hPSScreen); + ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); + + memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); + vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + vHeader.cx = nW; + vHeader.cy = nH; + vHeader.cPlanes = 1; + vHeader.cBitCount = lBitCount; + + hBmp = ::GpiCreateBitmap( hPSScreen + ,&vHeader + ,0L + ,NULL + ,NULL + ); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes); - hBmp = ::GpiCreateBitmap(hpsScreen, &vHeader, 0L, NULL, &vInfo); - if (!hBmp) - { - wxLogLastError("CreateBitmap"); - } GetBitmapData()->m_nDepth = wxDisplayDepth(); + ::WinReleasePS(hPSScreen); } SetHBITMAP((WXHBITMAP)hBmp); @@ -334,7 +359,7 @@ bool wxBitmap::Create( #endif // WXWIN_COMPATIBILITY_2 return Ok(); -} +} // end of wxBitmap::Create bool wxBitmap::LoadFile( const wxString& rFilename @@ -372,7 +397,7 @@ bool wxBitmap::LoadFile( return(TRUE); } -} +} // end of wxBitmap::LoadFile bool wxBitmap::Create( void* pData @@ -405,7 +430,7 @@ bool wxBitmap::Create( ,nHeight ,nDepth )); -} +} // end of wxBitmap::Create bool wxBitmap::SaveFile( const wxString& rFilename @@ -437,7 +462,99 @@ bool wxBitmap::SaveFile( ,lType )); } -} +} // end of wxBitmap::SaveFile + +// ---------------------------------------------------------------------------- +// sub bitmap extraction +// ---------------------------------------------------------------------------- + +wxBitmap wxBitmap::GetSubBitmap( + const wxRect& rRect +) const +{ + wxCHECK_MSG( Ok() && + (rRect.x >= 0) && (rRect.y >= 0) && + (rRect.x + rRect.width <= GetWidth()) && + (rRect.y + rRect.height <= GetHeight()), + wxNullBitmap, wxT("Invalid bitmap or bitmap region") ); + + wxBitmap vRet( rRect.width + ,rRect.height + ,GetDepth() + ); + wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") ); + + + // + // Copy bitmap data + // + SIZEL vSize = {0, 0}; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); + HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); + POINTL vPoint[4] = { rRect.x, rRect.y, + rRect.x + rRect.width, rRect.y + rRect.height, + 0, 0, GetWidth(), GetHeight() + }; + + ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP()); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + + // + // Copy mask if there is one + // + if (GetMask()) + { + BITMAPINFOHEADER2 vBmih; + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = rRect.width; + vBmih.cy = rRect.height; + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP()); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) GetMask()->GetMaskBitmap()); + ::GpiSetBitmap(hPSDst, (HBITMAP) hBmpMask); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + + wxMask* pMask = new wxMask((WXHBITMAP)hBmpMask); + vRet.SetMask(pMask); + } + + ::GpiSetBitmap(hPSSrc, NULL); + ::GpiSetBitmap(hPSDst, NULL); + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); + return vRet; +} // end of wxBitmap::GetSubBitmap // ---------------------------------------------------------------------------- // wxBitmap accessors @@ -450,7 +567,7 @@ void wxBitmap::SetQuality( EnsureHasData(); GetBitmapData()->m_nQuality = nQ; -} +} // end of wxBitmap::SetQuality #if WXWIN_COMPATIBILITY_2 void wxBitmap::SetOk( @@ -460,7 +577,7 @@ void wxBitmap::SetOk( EnsureHasData(); GetBitmapData()->m_bOk = bOk; -} +} // end of wxBitmap::SetOk #endif // WXWIN_COMPATIBILITY_2 void wxBitmap::SetPalette( @@ -470,7 +587,7 @@ void wxBitmap::SetPalette( EnsureHasData(); GetBitmapData()->m_vBitmapPalette = rPalette; -} +} // end of wxBitmap::SetPalette void wxBitmap::SetMask( wxMask* pMask @@ -479,10 +596,12 @@ void wxBitmap::SetMask( EnsureHasData(); GetBitmapData()->m_pBitmapMask = pMask; -} +} // end of wxBitmap::SetMask +// // Will try something for OS/2 but not really sure how close // to the msw intent this is. +// wxBitmap wxBitmap::GetBitmapForDC( wxDC& rDc ) const @@ -507,7 +626,7 @@ wxBitmap wxBitmap::GetBitmapForDC( ::GpiBitBlt(hPs, hMemoryPS, 4L, vPoint, ROP_SRCCOPY, BBO_IGNORE); return(vTmpBitmap); -} +} // end of wxBitmap::GetBitmapForDC // ---------------------------------------------------------------------------- // wxMask @@ -516,7 +635,7 @@ wxBitmap wxBitmap::GetBitmapForDC( wxMask::wxMask() { m_hMaskBitmap = 0; -} +} // end of wxMask::wxMask // Construct a mask from a bitmap and a colour indicating // the transparent area @@ -529,7 +648,7 @@ wxMask::wxMask( Create( rBitmap ,rColour ); -} +} // end of wxMask::wxMask // Construct a mask from a bitmap and a palette index indicating // the transparent area @@ -542,7 +661,7 @@ wxMask::wxMask( Create( rBitmap ,nPaletteIndex ); -} +} // end of wxMask::wxMask // Construct a mask from a mono bitmap (copies the bitmap). wxMask::wxMask( @@ -551,23 +670,29 @@ wxMask::wxMask( { m_hMaskBitmap = 0; Create(rBitmap); -} +} // end of wxMask::wxMask wxMask::~wxMask() { if (m_hMaskBitmap) ::GpiDeleteBitmap((HBITMAP)m_hMaskBitmap); -} +} // end of wxMask::~wxMask // Create a mask from a mono bitmap (copies the bitmap). bool wxMask::Create( const wxBitmap& rBitmap ) { - BITMAPINFOHEADER2 vHeader; - DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + BITMAPINFOHEADER2 vBmih; SIZEL vSize = {0, 0}; - POINTL vPoint[4]; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); + HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); + POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), + 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + }; if (m_hMaskBitmap) { @@ -578,30 +703,37 @@ bool wxMask::Create( { return(FALSE); } - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)rBitmap.GetWidth(); - vHeader.cy = (USHORT)rBitmap.GetHeight(); - vHeader.cPlanes = 1; - vHeader.cBitCount = 1; - - m_hMaskBitmap = (WXHBITMAP) ::GpiCreateBitmap( m_hPs - ,&vHeader - ,0L - ,NULL - ,NULL - ); - - HPS srcPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)rBitmap.GetHBITMAP()); - HPS destPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)m_hMaskBitmap); - // TODO: Set the point array - ::GpiBitBlt(destPS, srcPS, 4L, vPoint, ROP_SRCCOPY , BBO_IGNORE); - - ::GpiDestroyPS(srcPS); - ::GpiDestroyPS(destPS); + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = rBitmap.GetWidth(); + vBmih.cy = rBitmap.GetHeight(); + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + m_hMaskBitmap = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); return(TRUE); -} +} // end of wxMask::Create // Create a mask from a bitmap and a palette index indicating // the transparent area @@ -638,7 +770,7 @@ bool wxMask::Create( } } return(FALSE); -} +} // end of wxMask::Create // Create a mask from a bitmap and a colour indicating // the transparent area @@ -647,10 +779,21 @@ bool wxMask::Create( , const wxColour& rColour ) { - BITMAPINFOHEADER2 vHeader; - DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + bool bOk = TRUE; + COLORREF vMaskColour = OS2RGB( rColour.Red() + ,rColour.Green() + ,rColour.Blue() + ); + BITMAPINFOHEADER2 vBmih; SIZEL vSize = {0, 0}; - POINTL vPoint[4]; + DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); + HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); + POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), + 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + }; if (m_hMaskBitmap) { @@ -662,58 +805,68 @@ bool wxMask::Create( return(FALSE); } - // scan the bitmap for the transparent colour and set + // + // Scan the bitmap for the transparent colour and set // the corresponding pixels in the mask to BLACK and // the rest to WHITE - COLORREF vMaskColour = OS2RGB(rColour.Red(), rColour.Green(), rColour.Blue()); - - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)rBitmap.GetWidth(); - vHeader.cy = (USHORT)rBitmap.GetHeight(); - vHeader.cPlanes = 1; - vHeader.cBitCount = 1; - - m_hMaskBitmap = (WXHBITMAP) ::GpiCreateBitmap( m_hPs - ,&vHeader - ,0L - ,NULL - ,NULL - ); - - HPS srcPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)rBitmap.GetHBITMAP()); - HPS destPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)m_hMaskBitmap); - - // this is not very efficient, but I can't think + // + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = rBitmap.GetWidth(); + vBmih.cy = rBitmap.GetHeight(); + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + m_hMaskBitmap = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap); + + // + // This is not very efficient, but I can't think // of a better way of doing it + // for (int w = 0; w < rBitmap.GetWidth(); w++) { for (int h = 0; h < rBitmap.GetHeight(); h++) { - POINTL vPoint; - - vPoint.x = w; - vPoint.y = h; - - COLORREF col = ::GpiQueryPel(srcPS, &vPoint); + POINTL vPt = {w, h}; + COLORREF vCol = (COLORREF)::GpiQueryPel(hPSSrc, &vPt); + if (vCol == (COLORREF)CLR_NOINDEX) + { + // + // Doesn't make sense to continue + // + bOk = FALSE; + break; + } - if (col == vMaskColour) + if (vCol == vMaskColour) { - ::GpiSetColor(destPS, CLR_WHITE); - ::GpiSetPel(destPS, &vPoint); + ::GpiSetColor(hPSDst, OS2RGB(0, 0, 0)); + ::GpiSetPel(hPSDst, &vPt); } else { - ::GpiSetColor(destPS, CLR_BLACK); - ::GpiSetPel(destPS, &vPoint); + ::GpiSetColor(hPSDst, OS2RGB(255, 255, 255)); + ::GpiSetPel(hPSDst, &vPt); } } } - ::GpiDestroyPS(srcPS); - ::GpiDestroyPS(destPS); + ::GpiSetBitmap(hPSSrc, NULL); + ::GpiSetBitmap(hPSDst, NULL); + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); return(TRUE); -} +} // end of wxMask::Create // ---------------------------------------------------------------------------- // wxBitmapHandler diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp index 2915cf69b6..c5a14f2ce3 100644 --- a/src/os2/dir.cpp +++ b/src/os2/dir.cpp @@ -34,10 +34,112 @@ #include +#define INCL_DOSFILEMGR +#include + #ifdef __EMX__ #include #endif +// ---------------------------------------------------------------------------- +// define the types and functions used for file searching +// ---------------------------------------------------------------------------- + +typedef FILEFINDBUF3 FIND_STRUCT; +typedef HDIR FIND_DATA; +typedef ULONG FIND_ATTR; + +static inline FIND_DATA InitFindData() { return ERROR_INVALID_HANDLE; } + +static inline bool IsFindDataOk( + FIND_DATA vFd +) +{ + return vFd != ERROR_INVALID_HANDLE; +} + +static inline void FreeFindData( + FIND_DATA vFd +) +{ + if (!::DosFindClose(vFd)) + { + wxLogLastError(_T("DosFindClose")); + } +} + +static inline FIND_DATA FindFirst( + const wxString& rsSpec +, FIND_STRUCT* pFinddata +) +{ + ULONG ulFindCount = 1; + FIND_DATA hDir; + FIND_ATTR rc; + + rc = ::DosFindFirst( rsSpec.c_str() + ,&hDir + ,FILE_NORMAL + ,pFinddata + ,sizeof(FILEFINDBUF3) + ,&ulFindCount + ,FIL_STANDARD + ); + if (rc != 0) + return 0; + return hDir; +} + +static inline bool FindNext( + FIND_DATA vFd +, FIND_STRUCT* pFinddata +) +{ + ULONG ulFindCount = 1; + + return ::DosFindNext( vFd + ,pFinddata + ,sizeof(FILEFINDBUF3) + ,&ulFindCount + ) != 0; +} + +static const wxChar* GetNameFromFindData( + FIND_STRUCT* pFinddata +) +{ + return pFinddata->achName; +} + +static const FIND_ATTR GetAttrFromFindData( + FIND_STRUCT* pFinddata +) +{ + return pFinddata->attrFile; +} + +static inline bool IsDir( + FIND_ATTR vAttr +) +{ + return (vAttr & FILE_DIRECTORY) != 0; +} + +static inline bool IsHidden( + FIND_ATTR vAttr +) +{ + return (vAttr & (FILE_HIDDEN | FILE_SYSTEM)) != 0; +} + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +#ifndef MAX_PATH + #define MAX_PATH 260 // from PM++ headers +#endif + // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -52,25 +154,22 @@ class wxDirData { public: - wxDirData(const wxString& dirname); + wxDirData(const wxString& rsDirname); ~wxDirData(); - bool IsOk() const { return m_dir != NULL; } - - void SetFileSpec(const wxString& filespec) { m_filespec = filespec; } - void SetFlags(int flags) { m_flags = flags; } + void SetFileSpec(const wxString& rsFilespec) { m_sFilespec = rsFilespec; } + void SetFlags(int nFlags) { m_nFlags = nFlags; } - void Rewind() { rewinddir(m_dir); } - bool Read(wxString *filename); + void Close(); + void Rewind(); + bool Read(wxString* rsFilename); private: - DIR *m_dir; - - wxString m_dirname; - wxString m_filespec; - - int m_flags; -}; + FIND_DATA m_vFinddata; + wxString m_sDirname; + wxString m_sFilespec; + int m_nFlags; +}; // end of CLASS wxDirData // ============================================================================ // implementation @@ -80,160 +179,203 @@ private: // wxDirData // ---------------------------------------------------------------------------- -wxDirData::wxDirData(const wxString& dirname) - : m_dirname(dirname) +wxDirData::wxDirData( + const wxString& rsDirname +) +: m_sDirname(rsDirname) { - m_dir = NULL; - - // throw away the trailing slashes - size_t n = m_dirname.length(); - wxCHECK_RET( n, _T("empty dir name in wxDir") ); + m_vFinddata = InitFindData(); +} // end of wxDirData::wxDirData - while ( n > 0 && m_dirname[--n] == '/' ) - ; +wxDirData::~wxDirData() +{ + Close(); +} // end of wxDirData::~wxDirData - m_dirname.Truncate(n + 1); +void wxDirData::Close() +{ + if ( IsFindDataOk(m_vFinddata) ) + { + FreeFindData(m_vFinddata); + m_vFinddata = InitFindData(); + } +} // end of wxDirData::Close - // do open the dir - m_dir = opendir(m_dirname.fn_str()); -} +void wxDirData::Rewind() +{ + Close(); +} // end of wxDirData::Rewind -wxDirData::~wxDirData() +bool wxDirData::Read( + wxString* psFilename +) { - if ( m_dir ) + bool bFirst = FALSE; + + FILEFINDBUF3 vFinddata; + #define PTR_TO_FINDDATA (&vFinddata) + + if (!IsFindDataOk(m_vFinddata)) { - if ( closedir(m_dir) != 0 ) + // + // Open first + // + wxString sFilespec = m_sDirname; + + if ( !wxEndsWithPathSeparator(sFilespec) ) { - wxLogLastError(_T("closedir")); + sFilespec += _T('\\'); } + sFilespec += (!m_sFilespec ? _T("*.*") : m_sFilespec.c_str()); + + m_vFinddata = FindFirst( sFilespec + ,PTR_TO_FINDDATA + ); + bFirst = TRUE; } -} -bool wxDirData::Read(wxString *filename) -{ - dirent *de; - bool matches = FALSE; + if ( !IsFindDataOk(m_vFinddata) ) + { + return FALSE; + } - while ( !matches ) + const wxChar* zName; + FIND_ATTR vAttr; + + for ( ;; ) { - de = readdir(m_dir); - if ( !de ) - return FALSE; - - // don't return "." and ".." unless asked for - if ( de->d_name[0] == '.' && - ((de->d_name[1] == '.' && de->d_name[2] == '\0') || - (de->d_name[1] == '\0')) ) + if (bFirst) + { + bFirst = FALSE; + } + else { - if ( !(m_flags & wxDIR_DOTDOT) ) + if (!FindNext( m_vFinddata + ,PTR_TO_FINDDATA + )) + { + return FALSE; + } + } + + zName = GetNameFromFindData(PTR_TO_FINDDATA); + vAttr = GetAttrFromFindData(PTR_TO_FINDDATA); + + // + // Don't return "." and ".." unless asked for + // + if ( zName[0] == _T('.') && + ((zName[1] == _T('.') && zName[2] == _T('\0')) || + (zName[1] == _T('\0'))) ) + { + if (!(m_nFlags & wxDIR_DOTDOT)) continue; } - // check the type now - if ( !(m_flags & wxDIR_FILES) && - !wxDir::Exists(m_dirname + _T('/') + de->d_name) ) + // + // Check the type now + // + if (!(m_nFlags & wxDIR_FILES) && !IsDir(vAttr)) { - // it's a file, but we don't want them + // + // It's a file, but we don't want them + // continue; } - else if ( !(m_flags & wxDIR_DIRS) && - wxDir::Exists(m_dirname + _T('/') + de->d_name) ) + else if (!(m_nFlags & wxDIR_DIRS) && IsDir(vAttr) ) { - // it's a dir, and we don't want it + // + // It's a dir, and we don't want it + // continue; } - // finally, check the name - if ( !m_filespec ) - { - matches = m_flags & wxDIR_HIDDEN ? TRUE : de->d_name[0] != '.'; - } - else + // + // Finally, check whether it's a hidden file + // + if (!(m_nFlags & wxDIR_HIDDEN)) { - // test against the pattern - matches = wxMatchWild(m_filespec, de->d_name, - !(m_flags & wxDIR_HIDDEN)); + if (IsHidden(vAttr)) + { + // + // It's a hidden file, skip it + // + continue; + } } + *psFilename = zName; + break; } - - *filename = de->d_name; - return TRUE; -} +} // end of wxDirData::Read // ---------------------------------------------------------------------------- // wxDir helpers // ---------------------------------------------------------------------------- /* static */ -bool wxDir::Exists(const wxString& dir) +bool wxDir::Exists( + const wxString& rsDir +) { - return wxPathExists(dir); -} + return wxPathExists(rsDir); +} // end of wxDir::Exists // ---------------------------------------------------------------------------- // wxDir construction/destruction // ---------------------------------------------------------------------------- -wxDir::wxDir(const wxString& dirname) +wxDir::wxDir( + const wxString& rsDirname +) { m_data = NULL; - (void)Open(dirname); -} + (void)Open(rsDirname); +} // end of wxDir::wxDir -bool wxDir::Open(const wxString& dirname) +bool wxDir::Open( + const wxString& rsDirname +) { delete M_DIR; - m_data = new wxDirData(dirname); - - if ( !M_DIR->IsOk() ) - { - wxLogSysError(_("Can not enumerate files in directory '%s'"), - dirname.c_str()); - - delete M_DIR; - m_data = NULL; - - return FALSE; - } - + m_data = new wxDirData(rsDirname); return TRUE; -} +} // end of wxDir::Open bool wxDir::IsOpened() const { return m_data != NULL; -} +} // end of wxDir::IsOpen wxDir::~wxDir() { delete M_DIR; -} +} // end of wxDir::~wxDir // ---------------------------------------------------------------------------- // wxDir enumerating // ---------------------------------------------------------------------------- -bool wxDir::GetFirst(wxString *filename, - const wxString& filespec, - int flags) const +bool wxDir::GetFirst( + wxString* psFilename +, const wxString& rsFilespec +, int nFlags +) const { wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") ); - M_DIR->Rewind(); - - M_DIR->SetFileSpec(filespec); - M_DIR->SetFlags(flags); - - return GetNext(filename); -} - -bool wxDir::GetNext(wxString *filename) const + M_DIR->SetFileSpec(rsFilespec); + M_DIR->SetFlags(nFlags); + return GetNext(psFilename); +} // end of wxDir::GetFirst + +bool wxDir::GetNext( + wxString* psFilename +) const { wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") ); + wxCHECK_MSG( psFilename, FALSE, _T("bad pointer in wxDir::GetNext()") ); + return M_DIR->Read(psFilename); +} // end of wxDir::GetNext - wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") ); - - return M_DIR->Read(filename); -} diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index 26f744c91f..4801c71d86 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -87,6 +87,89 @@ wxIcon::~wxIcon() { } +void wxIcon::CreateIconFromXpm( + const char** ppData +) +{ + wxBitmap vBmp(ppData); + + CopyFromBitmap(vBmp); +} // end of wxIcon::CreateIconFromXpm + +void wxIcon::CopyFromBitmap( + const wxBitmap& rBmp +) +{ + wxMask* pMask = rBmp.GetMask(); + + if (!pMask) + { + // + // We must have a mask for an icon, so even if it's probably incorrect, + // do create it (grey is the "standard" transparent colour) + // + pMask = new wxMask( rBmp + ,*wxLIGHT_GREY + ); + } + + POINTERINFO vIconInfo; + + memset(&vIconInfo, '\0', sizeof(POINTERINFO)); + vIconInfo.fPointer = FALSE; // we want an icon, not a pointer + vIconInfo.hbmColor = GetHbitmapOf(rBmp); + + SIZEL vSize = {0, 0}; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); + HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); + POINTL vPoint[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(), + 0, 0, rBmp.GetWidth(), rBmp.GetHeight() + }; + ::GpiSetBitmap(hPSSrc, (HBITMAP) pMask->GetMaskBitmap()); + ::GpiSetBitmap(hPSDst, (HBITMAP) vIconInfo.hbmColor); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCAND + ,BBO_IGNORE + ); + + ::GpiSetBitmap(hPSSrc, NULL); + ::GpiSetBitmap(hPSDst, NULL); + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); + + HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP + ,&vIconInfo + ); + + if (!hIcon) + { + wxLogLastError(wxT("WinCreatePointerIndirect")); + } + else + { + SetHICON((WXHICON)hIcon); + SetSize( rBmp.GetWidth() + ,rBmp.GetHeight() + ); + } + + if (!rBmp.GetMask()) + { + // + // We created the mask, now delete it + // + delete pMask; + } +} // end of wxIcon::CopyFromBitmap + bool wxIcon::LoadFile( const wxString& rFilename , long lType diff --git a/src/os2/makefile.va b/src/os2/makefile.va index aa1993c0a5..8570d3904e 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -101,6 +101,7 @@ GENERICOBJS= \ ..\generic\$D\choicdgg.obj \ ..\generic\$D\colrdlgg.obj \ ..\generic\$D\dcpsg.obj \ + ..\generic\$D\dirctrlg.obj \ ..\generic\$D\dragimgg.obj \ ..\generic\$D\fontdlgg.obj \ ..\generic\$D\grid.obj \ @@ -144,6 +145,7 @@ GENLIBOBJS= \ choicdgg.obj \ colrdlgg.obj \ dcpsg.obj \ + dirctrlg.obj \ dragimgg.obj \ fontdlgg.obj \ grid.obj \ @@ -207,6 +209,7 @@ COMMONOBJS = \ ..\common\$D\docview.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\effects.obj \ ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ @@ -317,6 +320,7 @@ COMLIBOBJS1 = \ docview.obj \ dynarray.obj \ dynlib.obj \ + effects.obj \ encconv.obj \ event.obj \ extended.obj \ @@ -338,10 +342,10 @@ COMLIBOBJS1 = \ gifdecod.obj \ hash.obj \ helpbase.obj \ - http.obj \ - imagall.obj + http.obj COMLIBOBJS2 = \ + imagall.obj \ imagbmp.obj \ image.obj \ imaggif.obj \ @@ -382,10 +386,10 @@ COMLIBOBJS2 = \ strconv.obj \ stream.obj \ string.obj \ - tbarbase.obj \ - textcmn.obj + tbarbase.obj COMLIBOBJS3 = \ + textcmn.obj \ textfile.obj \ timercmn.obj \ tokenzr.obj \ @@ -429,6 +433,7 @@ OS2OBJS = \ ..\os2\$D\dcprint.obj \ ..\os2\$D\dcscreen.obj \ ..\os2\$D\dialog.obj \ + ..\os2\$D\dir.obj \ ..\os2\$D\dirdlg.obj \ ..\os2\$D\dnd.obj \ ..\os2\$D\filedlg.obj \ @@ -438,8 +443,8 @@ OS2OBJS = \ ..\os2\$D\fontutil.obj \ ..\os2\$D\frame.obj \ ..\os2\$D\gauge.obj \ - ..\os2\$D\gdiobj.obj \ ..\os2\$D\gdiimage.obj \ + ..\os2\$D\gdiobj.obj \ ..\os2\$D\gsocket.obj \ ..\os2\$D\helpwin.obj \ ..\os2\$D\icon.obj \ @@ -509,6 +514,7 @@ OS2LIBOBJS1 = \ dcprint.obj \ dcscreen.obj \ dialog.obj \ + dir.obj \ dirdlg.obj \ dnd.obj \ filedlg.obj \ @@ -530,10 +536,10 @@ OS2LIBOBJS1 = \ mdi.obj \ menu.obj \ menuitem.obj \ - metafile.obj \ - mimetype.obj + metafile.obj OS2LIBOBJS2 = \ + mimetype.obj \ minifram.obj \ msgdlg.obj \ nativdlg.obj \ @@ -652,6 +658,7 @@ $(COMLIBOBJS1): copy ..\common\$D\docview.obj copy ..\common\$D\dynarray.obj copy ..\common\$D\dynlib.obj + copy ..\common\$D\effects.obj copy ..\common\$D\encconv.obj copy ..\common\$D\event.obj copy ..\common\$D\extended.obj @@ -674,9 +681,9 @@ $(COMLIBOBJS1): copy ..\common\$D\hash.obj copy ..\common\$D\helpbase.obj copy ..\common\$D\http.obj - copy ..\common\$D\imagall.obj $(COMLIBOBJS2): + copy ..\common\$D\imagall.obj copy ..\common\$D\imagbmp.obj copy ..\common\$D\image.obj copy ..\common\$D\imaggif.obj @@ -718,9 +725,9 @@ $(COMLIBOBJS2): copy ..\common\$D\stream.obj copy ..\common\$D\string.obj copy ..\common\$D\tbarbase.obj - copy ..\common\$D\textcmn.obj $(COMLIBOBJS3): + copy ..\common\$D\textcmn.obj copy ..\common\$D\textfile.obj copy ..\common\$D\timercmn.obj copy ..\common\$D\tokenzr.obj @@ -749,6 +756,7 @@ $(GENLIBOBJS): copy ..\generic\$D\colrdlgg.obj copy ..\generic\$D\dragimgg.obj copy ..\generic\$D\dcpsg.obj + copy ..\generic\$D\dirctrlg.obj copy ..\generic\$D\fontdlgg.obj copy ..\generic\$D\grid.obj copy ..\generic\$D\gridsel.obj @@ -826,6 +834,7 @@ $(OS2LIBOBJS1): copy ..\os2\$D\dcprint.obj copy ..\os2\$D\dcscreen.obj copy ..\os2\$D\dialog.obj + copy ..\os2\$D\dir.obj copy ..\os2\$D\dirdlg.obj copy ..\os2\$D\dnd.obj copy ..\os2\$D\filedlg.obj @@ -848,9 +857,9 @@ $(OS2LIBOBJS1): copy ..\os2\$D\menu.obj copy ..\os2\$D\menuitem.obj copy ..\os2\$D\metafile.obj - copy ..\os2\$D\mimetype.obj $(OS2LIBOBJS2): + copy ..\os2\$D\mimetype.obj copy ..\os2\$D\minifram.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj