Added some tentative wxMotif clipboard code; did some file formatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,12 +37,12 @@ wxXFont::~wxXFont()
|
||||
{
|
||||
XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
|
||||
XmFontList fontList = (XmFontList) m_fontList;
|
||||
|
||||
|
||||
XmFontListFree (fontList);
|
||||
|
||||
// TODO: why does freeing the font produce a segv???
|
||||
|
||||
// TODO: why does freeing the font produce a segv???
|
||||
// Note that XFreeFont wasn't called in wxWin 1.68 either.
|
||||
// XFreeFont((Display*) m_display, fontStruct);
|
||||
// XFreeFont((Display*) m_display, fontStruct);
|
||||
}
|
||||
|
||||
wxFontRefData::wxFontRefData()
|
||||
@@ -65,7 +65,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
|
||||
m_weight = data.m_weight;
|
||||
m_underlined = data.m_underlined;
|
||||
m_faceName = data.m_faceName;
|
||||
|
||||
|
||||
// Don't have to copy actual fonts, because they'll be created
|
||||
// on demand.
|
||||
}
|
||||
@@ -91,7 +91,7 @@ wxFont::wxFont()
|
||||
wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
|
||||
{
|
||||
Create(pointSize, family, style, weight, underlined, faceName);
|
||||
|
||||
|
||||
if ( wxTheFontList )
|
||||
wxTheFontList->Append(this);
|
||||
}
|
||||
@@ -100,16 +100,16 @@ bool wxFont::Create(int pointSize, int family, int style, int weight, bool under
|
||||
{
|
||||
UnRef();
|
||||
m_refData = new wxFontRefData;
|
||||
|
||||
|
||||
M_FONTDATA->m_family = family;
|
||||
M_FONTDATA->m_style = style;
|
||||
M_FONTDATA->m_weight = weight;
|
||||
M_FONTDATA->m_pointSize = pointSize;
|
||||
M_FONTDATA->m_underlined = underlined;
|
||||
M_FONTDATA->m_faceName = faceName;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -127,101 +127,101 @@ bool wxFont::RealizeResource()
|
||||
|
||||
void wxFont::Unshare()
|
||||
{
|
||||
// Don't change shared data
|
||||
if (!m_refData)
|
||||
// Don't change shared data
|
||||
if (!m_refData)
|
||||
{
|
||||
m_refData = new wxFontRefData();
|
||||
}
|
||||
m_refData = new wxFontRefData();
|
||||
}
|
||||
else
|
||||
{
|
||||
wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
|
||||
UnRef();
|
||||
m_refData = ref;
|
||||
}
|
||||
wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
|
||||
UnRef();
|
||||
m_refData = ref;
|
||||
}
|
||||
}
|
||||
|
||||
void wxFont::SetPointSize(int pointSize)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
|
||||
M_FONTDATA->m_pointSize = pointSize;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxFont::SetFamily(int family)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
|
||||
M_FONTDATA->m_family = family;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxFont::SetStyle(int style)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
|
||||
M_FONTDATA->m_style = style;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxFont::SetWeight(int weight)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
|
||||
M_FONTDATA->m_weight = weight;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxFont::SetFaceName(const wxString& faceName)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
|
||||
M_FONTDATA->m_faceName = faceName;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxFont::SetUnderlined(bool underlined)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
|
||||
M_FONTDATA->m_underlined = underlined;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
wxString wxFont::GetFamilyString() const
|
||||
{
|
||||
wxString fam("");
|
||||
switch (GetFamily())
|
||||
{
|
||||
wxString fam("");
|
||||
switch (GetFamily())
|
||||
{
|
||||
case wxDECORATIVE:
|
||||
fam = "wxDECORATIVE";
|
||||
break;
|
||||
fam = "wxDECORATIVE";
|
||||
break;
|
||||
case wxROMAN:
|
||||
fam = "wxROMAN";
|
||||
break;
|
||||
fam = "wxROMAN";
|
||||
break;
|
||||
case wxSCRIPT:
|
||||
fam = "wxSCRIPT";
|
||||
break;
|
||||
fam = "wxSCRIPT";
|
||||
break;
|
||||
case wxSWISS:
|
||||
fam = "wxSWISS";
|
||||
break;
|
||||
fam = "wxSWISS";
|
||||
break;
|
||||
case wxMODERN:
|
||||
fam = "wxMODERN";
|
||||
break;
|
||||
fam = "wxMODERN";
|
||||
break;
|
||||
case wxTELETYPE:
|
||||
fam = "wxTELETYPE";
|
||||
break;
|
||||
fam = "wxTELETYPE";
|
||||
break;
|
||||
default:
|
||||
fam = "wxDEFAULT";
|
||||
break;
|
||||
}
|
||||
return fam;
|
||||
fam = "wxDEFAULT";
|
||||
break;
|
||||
}
|
||||
return fam;
|
||||
}
|
||||
|
||||
/* New font system */
|
||||
@@ -229,7 +229,7 @@ wxString wxFont::GetFaceName() const
|
||||
{
|
||||
wxString str("");
|
||||
if (M_FONTDATA)
|
||||
str = M_FONTDATA->m_faceName ;
|
||||
str = M_FONTDATA->m_faceName ;
|
||||
return str;
|
||||
}
|
||||
|
||||
@@ -238,15 +238,15 @@ wxString wxFont::GetStyleString() const
|
||||
wxString styl("");
|
||||
switch (GetStyle())
|
||||
{
|
||||
case wxITALIC:
|
||||
styl = "wxITALIC";
|
||||
break;
|
||||
case wxSLANT:
|
||||
styl = "wxSLANT";
|
||||
break;
|
||||
default:
|
||||
styl = "wxNORMAL";
|
||||
break;
|
||||
case wxITALIC:
|
||||
styl = "wxITALIC";
|
||||
break;
|
||||
case wxSLANT:
|
||||
styl = "wxSLANT";
|
||||
break;
|
||||
default:
|
||||
styl = "wxNORMAL";
|
||||
break;
|
||||
}
|
||||
return styl;
|
||||
}
|
||||
@@ -256,15 +256,15 @@ wxString wxFont::GetWeightString() const
|
||||
wxString w("");
|
||||
switch (GetWeight())
|
||||
{
|
||||
case wxBOLD:
|
||||
w = "wxBOLD";
|
||||
break;
|
||||
case wxLIGHT:
|
||||
w = "wxLIGHT";
|
||||
break;
|
||||
default:
|
||||
w = "wxNORMAL";
|
||||
break;
|
||||
case wxBOLD:
|
||||
w = "wxBOLD";
|
||||
break;
|
||||
case wxLIGHT:
|
||||
w = "wxLIGHT";
|
||||
break;
|
||||
default:
|
||||
w = "wxNORMAL";
|
||||
break;
|
||||
}
|
||||
return w;
|
||||
}
|
||||
@@ -274,106 +274,106 @@ wxString wxFont::GetWeightString() const
|
||||
// font to list in the private data for future reference.
|
||||
wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
|
||||
{
|
||||
if (!Ok())
|
||||
return (wxXFont*) NULL;
|
||||
|
||||
long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
|
||||
int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
|
||||
|
||||
wxNode* node = M_FONTDATA->m_fonts.First();
|
||||
while (node)
|
||||
{
|
||||
wxXFont* f = (wxXFont*) node->Data();
|
||||
if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
|
||||
return f;
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family,
|
||||
M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
|
||||
if (!font)
|
||||
{
|
||||
// search up and down by stepsize 10
|
||||
int max_size = pointSize + 20 * (1 + (pointSize/180));
|
||||
int min_size = pointSize - 20 * (1 + (pointSize/180));
|
||||
int i;
|
||||
|
||||
// Search for smaller size (approx.)
|
||||
for (i=pointSize-10; !font && i >= 10 && i >= min_size; i -= 10)
|
||||
font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
// Search for larger size (approx.)
|
||||
for (i=pointSize+10; !font && i <= max_size; i += 10)
|
||||
font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
// Try default family
|
||||
if (!font && M_FONTDATA->m_family != wxDEFAULT)
|
||||
font = LoadQueryFont(pointSize, wxDEFAULT, M_FONTDATA->m_style,
|
||||
M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
// Bogus font
|
||||
if (!font)
|
||||
font = LoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
|
||||
M_FONTDATA->m_underlined);
|
||||
if (!Ok())
|
||||
return (wxXFont*) NULL;
|
||||
|
||||
long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
|
||||
int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
|
||||
|
||||
wxNode* node = M_FONTDATA->m_fonts.First();
|
||||
while (node)
|
||||
{
|
||||
wxXFont* f = (wxXFont*) node->Data();
|
||||
if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
|
||||
return f;
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family,
|
||||
M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
|
||||
if (!font)
|
||||
{
|
||||
// search up and down by stepsize 10
|
||||
int max_size = pointSize + 20 * (1 + (pointSize/180));
|
||||
int min_size = pointSize - 20 * (1 + (pointSize/180));
|
||||
int i;
|
||||
|
||||
// Search for smaller size (approx.)
|
||||
for (i=pointSize-10; !font && i >= 10 && i >= min_size; i -= 10)
|
||||
font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
// Search for larger size (approx.)
|
||||
for (i=pointSize+10; !font && i <= max_size; i += 10)
|
||||
font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
// Try default family
|
||||
if (!font && M_FONTDATA->m_family != wxDEFAULT)
|
||||
font = LoadQueryFont(pointSize, wxDEFAULT, M_FONTDATA->m_style,
|
||||
M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
|
||||
// Bogus font
|
||||
if (!font)
|
||||
font = LoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
|
||||
M_FONTDATA->m_underlined);
|
||||
wxASSERT_MSG( (font != (XFontStruct*) NULL), "Could not allocate even a default font -- something is wrong." );
|
||||
}
|
||||
if (font)
|
||||
{
|
||||
wxXFont* f = new wxXFont;
|
||||
f->m_fontStruct = font;
|
||||
f->m_display = ( display ? display : wxGetDisplay() );
|
||||
f->m_scale = intScale;
|
||||
f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
|
||||
M_FONTDATA->m_fonts.Append(f);
|
||||
return f;
|
||||
}
|
||||
return (wxXFont*) NULL;
|
||||
}
|
||||
if (font)
|
||||
{
|
||||
wxXFont* f = new wxXFont;
|
||||
f->m_fontStruct = font;
|
||||
f->m_display = ( display ? display : wxGetDisplay() );
|
||||
f->m_scale = intScale;
|
||||
f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
|
||||
M_FONTDATA->m_fonts.Append(f);
|
||||
return f;
|
||||
}
|
||||
return (wxXFont*) NULL;
|
||||
}
|
||||
|
||||
WXFontStructPtr wxFont::LoadQueryFont(int pointSize, int family, int style,
|
||||
int weight, bool underlined) const
|
||||
int weight, bool underlined) const
|
||||
{
|
||||
char *xfamily;
|
||||
char *xstyle;
|
||||
char *xweight;
|
||||
switch (family)
|
||||
{
|
||||
case wxDECORATIVE: xfamily = "lucida";
|
||||
break;
|
||||
case wxROMAN: xfamily = "times";
|
||||
break;
|
||||
case wxMODERN: xfamily = "courier";
|
||||
break;
|
||||
case wxSWISS: xfamily = "lucida";
|
||||
break;
|
||||
case wxDEFAULT:
|
||||
default: xfamily = "*";
|
||||
case wxDECORATIVE: xfamily = "lucida";
|
||||
break;
|
||||
case wxROMAN: xfamily = "times";
|
||||
break;
|
||||
case wxMODERN: xfamily = "courier";
|
||||
break;
|
||||
case wxSWISS: xfamily = "lucida";
|
||||
break;
|
||||
case wxDEFAULT:
|
||||
default: xfamily = "*";
|
||||
}
|
||||
switch (style)
|
||||
{
|
||||
case wxITALIC: xstyle = "i";
|
||||
break;
|
||||
case wxSLANT: xstyle = "o";
|
||||
break;
|
||||
case wxNORMAL: xstyle = "r";
|
||||
break;
|
||||
default: xstyle = "*";
|
||||
break;
|
||||
case wxITALIC: xstyle = "i";
|
||||
break;
|
||||
case wxSLANT: xstyle = "o";
|
||||
break;
|
||||
case wxNORMAL: xstyle = "r";
|
||||
break;
|
||||
default: xstyle = "*";
|
||||
break;
|
||||
}
|
||||
switch (weight)
|
||||
{
|
||||
case wxBOLD: xweight = "bold";
|
||||
break;
|
||||
case wxLIGHT:
|
||||
case wxNORMAL: xweight = "medium";
|
||||
break;
|
||||
default: xweight = "*";
|
||||
break;
|
||||
case wxBOLD: xweight = "bold";
|
||||
break;
|
||||
case wxLIGHT:
|
||||
case wxNORMAL: xweight = "medium";
|
||||
break;
|
||||
default: xweight = "*";
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
sprintf(wxBuffer, "-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*",
|
||||
xfamily, xweight, xstyle, pointSize);
|
||||
|
||||
xfamily, xweight, xstyle, pointSize);
|
||||
|
||||
Display *dpy = (Display*) wxGetDisplay();
|
||||
XFontStruct* font = XLoadQueryFont(dpy, wxBuffer);
|
||||
|
||||
|
||||
return (WXFontStructPtr) font;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user