debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtwm: In CDE we always build with MULTIBYTE support, disable unused singlebyte only

Browse Source
This commit is contained in:
Peter Howkins
2018-06-25 00:20:55 +01:00
parent 6bf175ef2d
commit 115c1a25d8
10 changed files with 4 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cde/programs/dtwm/WmCDInfo.c
View File

@@ -64,7 +64,6 @@ unsigned int TitleTextHeight (ClientData *pcd)
{
unsigned int ttextheight;
#ifndef NO_MULTIBYTE
if (DECOUPLE_TITLE_APPEARANCE(pcd))
{
ttextheight = CLIENT_TITLE_APPEARANCE(pcd).titleHeight;
@@ -73,34 +72,6 @@ unsigned int TitleTextHeight (ClientData *pcd)
{
ttextheight = CLIENT_APPEARANCE(pcd).titleHeight;
}
#else
XFontStruct *font;
if (DECOUPLE_TITLE_APPEARANCE(pcd))
{
font = CLIENT_TITLE_APPEARANCE(pcd).font;
}
else
{
font = CLIENT_APPEARANCE(pcd).font;
}
if (font)
{
ttextheight = TEXT_HEIGHT(font) + WM_TITLE_BAR_PADDING;
}
else
{
/*
* Failed to load any font! (probably due to error in
* font path, toolkit, or resource converter. Set to
* arbitrary value for robustness.
*
*/
ttextheight = 16;
}
#endif
return (ttextheight);
}