Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bitmap code, icon code and dir code updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-01-29 05:48:26 +00:00
parent ec1b28a357
commit 6f38c86f45
4 changed files with 648 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

425
src/os2/bitmap.cpp
View File

@@ -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
);
memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
vBmih.cx = rBitmap.GetWidth();
vBmih.cy = rBitmap.GetHeight();
vBmih.cPlanes = 1;
vBmih.cBitCount = 1;
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);
m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
,&vBmih
,0L
,NULL
,NULL
);
::GpiDestroyPS(srcPS);
::GpiDestroyPS(destPS);
::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;
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 = (WXHBITMAP) ::GpiCreateBitmap( m_hPs
,&vHeader
,0L
,NULL
,NULL
);
m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
,&vBmih
,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);
::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP());
::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap);
// this is not very efficient, but I can't think
//
// 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);
if (col == vMaskColour)
POINTL vPt = {w, h};
COLORREF vCol = (COLORREF)::GpiQueryPel(hPSSrc, &vPt);
if (vCol == (COLORREF)CLR_NOINDEX)
{
::GpiSetColor(destPS, CLR_WHITE);
::GpiSetPel(destPS, &vPoint);
//
// Doesn't make sense to continue
//
bOk = FALSE;
break;
}
if (vCol == vMaskColour)
{
::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