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

Applied wxImage -> wxCursor patch, tool window event table fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-01-31 22:11:06 +00:00
parent 9fce8d2eee
commit 7eff657c07
5 changed files with 290 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/fl/toolwnd.cpp
View File

@@ -41,9 +41,9 @@ static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
/***** Implementation for class wxToolWindow *****/
IMPLEMENT_DYNAMIC_CLASS( wxToolWindow, wxWindow )
IMPLEMENT_DYNAMIC_CLASS( wxToolWindow, wxFrame)
BEGIN_EVENT_TABLE( wxToolWindow, wxWindow )
BEGIN_EVENT_TABLE( wxToolWindow, wxFrame )
EVT_PAINT ( wxToolWindow::OnPaint )
EVT_MOTION ( wxToolWindow::OnMotion )

7
include/wx/gtk/cursor.h
View File

@@ -19,6 +19,10 @@
#include "wx/object.h"
#include "wx/gdicmn.h"
#if wxUSE_IMAGE
#include "wx/image.h"
#endif
//-----------------------------------------------------------------------------
// wxCursor
//-----------------------------------------------------------------------------
@@ -30,6 +34,9 @@ public:
wxCursor();
wxCursor( int cursorId );
wxCursor( const wxCursor &cursor );
#if wxUSE_IMAGE
wxCursor( const wxImage & image );
#endif
wxCursor( const char bits[], int width, int height,
int hotSpotX=-1, int hotSpotY=-1,
const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );

7
include/wx/gtk1/cursor.h
View File

@@ -19,6 +19,10 @@
#include "wx/object.h"
#include "wx/gdicmn.h"
#if wxUSE_IMAGE
#include "wx/image.h"
#endif
//-----------------------------------------------------------------------------
// wxCursor
//-----------------------------------------------------------------------------
@@ -30,6 +34,9 @@ public:
wxCursor();
wxCursor( int cursorId );
wxCursor( const wxCursor &cursor );
#if wxUSE_IMAGE
wxCursor( const wxImage & image );
#endif
wxCursor( const char bits[], int width, int height,
int hotSpotX=-1, int hotSpotY=-1,
const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );

137
src/gtk/cursor.cpp
View File

@@ -58,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
wxCursor::wxCursor()
{
}
wxCursor::wxCursor( int cursorId )
@@ -145,6 +146,142 @@ wxCursor::wxCursor( const wxCursor &cursor )
Ref( cursor );
}
#if wxUSE_IMAGE
wxCursor::wxCursor( const wxImage & image )
{
unsigned char * rgbBits = image.GetData();
int w = image.GetWidth() ;
int h = image.GetHeight() ;
bool bHasMask = image.HasMask() ;
int imagebitcount = (w*h)/8;
unsigned char r, g, b ;
unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount];
int i,j, i8; unsigned char c, cMask;
for (i=0; i<imagebitcount; i++)
{
bits[i] = 0;
i8 = i * 8;
cMask = 1;
for (j=0; j<8; j++)
{
// possible overflow if we do the summation first ?
c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3 ;
//if average value is > mid grey
if (c>127)
bits[i] = bits[i] | cMask ;
cMask = cMask * 2 ;
}
}
if (bHasMask)
{
r = image.GetMaskRed() ;
g = image.GetMaskGreen() ;
b = image.GetMaskBlue() ;
for (i=0; i<imagebitcount; i++)
{
maskBits[i] = 0x0;
i8 = i * 8;
cMask = 1;
for (j=0; j<8; j++)
{
if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
maskBits[i] = maskBits[i] | cMask ;
cMask = cMask * 2 ;
}
}
}
else
{
for (i=0; i<imagebitcount; i++)
maskBits[i]= 0xFF ;
}
//find the most frequent color(s)
//it seems a waste of effort to copy the image
//but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy();
wxHashTable hTable;
//colors as rrggbb
unsigned long key;
unsigned long keyMaskColor = 0;
if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram( hTable );
long MostFreqCol = 0 ; long nMost = 0;
long NextFreqCol = 0 ; long nNext = 0;
long value ;
hTable.BeginFind();
wxNode *node = NULL;
while ((node = hTable.Next()) != NULL)
{
wxHNode *hnode = (wxHNode*) node->GetData();
value = hnode->value;
key = node->GetKeyInteger() ;
if (!bHasMask || (key != keyMaskColor) )
{
if (value > nMost)
{
nMost = value;
MostFreqCol = key;
}
else
if (value > nNext)
{
nNext = value ;
NextFreqCol = key;
}
}
}
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
(unsigned char)(MostFreqCol >> 8),
(unsigned char)(MostFreqCol) ) ;
wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16),
(unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ;
int hotSpotX=0;
int hotSpotY=0;
if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h)
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits,
w, h );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits,
w, h );
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
data, mask, fg.GetColor(), bg.GetColor(),
hotSpotX, hotSpotY );
gdk_bitmap_unref( data );
gdk_bitmap_unref( mask );
delete [] bits ;
delete [] maskBits;
}
#endif
wxCursor::~wxCursor()
{
}

137
src/gtk1/cursor.cpp
View File

@@ -58,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
wxCursor::wxCursor()
{
}
wxCursor::wxCursor( int cursorId )
@@ -145,6 +146,142 @@ wxCursor::wxCursor( const wxCursor &cursor )
Ref( cursor );
}
#if wxUSE_IMAGE
wxCursor::wxCursor( const wxImage & image )
{
unsigned char * rgbBits = image.GetData();
int w = image.GetWidth() ;
int h = image.GetHeight() ;
bool bHasMask = image.HasMask() ;
int imagebitcount = (w*h)/8;
unsigned char r, g, b ;
unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount];
int i,j, i8; unsigned char c, cMask;
for (i=0; i<imagebitcount; i++)
{
bits[i] = 0;
i8 = i * 8;
cMask = 1;
for (j=0; j<8; j++)
{
// possible overflow if we do the summation first ?
c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3 ;
//if average value is > mid grey
if (c>127)
bits[i] = bits[i] | cMask ;
cMask = cMask * 2 ;
}
}
if (bHasMask)
{
r = image.GetMaskRed() ;
g = image.GetMaskGreen() ;
b = image.GetMaskBlue() ;
for (i=0; i<imagebitcount; i++)
{
maskBits[i] = 0x0;
i8 = i * 8;
cMask = 1;
for (j=0; j<8; j++)
{
if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
maskBits[i] = maskBits[i] | cMask ;
cMask = cMask * 2 ;
}
}
}
else
{
for (i=0; i<imagebitcount; i++)
maskBits[i]= 0xFF ;
}
//find the most frequent color(s)
//it seems a waste of effort to copy the image
//but otherwise we need to remove the const modifier ??
wxImage tmpImage = image.Copy();
wxHashTable hTable;
//colors as rrggbb
unsigned long key;
unsigned long keyMaskColor = 0;
if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram( hTable );
long MostFreqCol = 0 ; long nMost = 0;
long NextFreqCol = 0 ; long nNext = 0;
long value ;
hTable.BeginFind();
wxNode *node = NULL;
while ((node = hTable.Next()) != NULL)
{
wxHNode *hnode = (wxHNode*) node->GetData();
value = hnode->value;
key = node->GetKeyInteger() ;
if (!bHasMask || (key != keyMaskColor) )
{
if (value > nMost)
{
nMost = value;
MostFreqCol = key;
}
else
if (value > nNext)
{
nNext = value ;
NextFreqCol = key;
}
}
}
wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
(unsigned char)(MostFreqCol >> 8),
(unsigned char)(MostFreqCol) ) ;
wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16),
(unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ;
int hotSpotX=0;
int hotSpotY=0;
if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h)
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits,
w, h );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits,
w, h );
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
data, mask, fg.GetColor(), bg.GetColor(),
hotSpotX, hotSpotY );
gdk_bitmap_unref( data );
gdk_bitmap_unref( mask );
delete [] bits ;
delete [] maskBits;
}
#endif
wxCursor::~wxCursor()
{
}