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

dtwm: Remove WSM define, that is always on for CDE

Browse Source
This commit is contained in:
Peter Howkins
2018-06-20 00:46:58 +01:00
parent 5dc05eaeb4
commit 9a551dd8a6
57 changed files with 237 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cde/programs/dtwm/WmGraphics.c
View File

@@ -1110,42 +1110,22 @@ void WmDrawString (Display *dpy, Drawable d, GC gc, int x, int y, char *string,
* B/W displays.
*
*************************************<->***********************************/
#ifdef WSM
void WmDrawXmString (Display *dpy, Window w, XmFontList xmfontlist,
XmString xmstring, GC gc, Position x, Position y,
Dimension width, XRectangle *pbox, Boolean bCenter)
#else /* WSM */
void WmDrawXmString (Display *dpy, Window w, XmFontList xmfontlist,
XmString xmstring, GC gc, Position x, Position y,
Dimension width, XRectangle *pbox)
#endif /* WSM */
{
Dimension textWidth;
#ifdef WSM
int alignment;
#else /* WSM */
int alignment = XmALIGNMENT_BEGINNING;
#endif /* WSM */
textWidth = XmStringWidth(xmfontlist, xmstring);
#ifdef WSM
alignment = bCenter ? XmALIGNMENT_CENTER : XmALIGNMENT_BEGINNING;
if (textWidth >= pbox->width) /* can't center text if no room */
{ /* left justify & clip text */
alignment = XmALIGNMENT_BEGINNING;
}
#else /* WSM */
if (textWidth < pbox->width) { /* center text if there's room */
alignment = XmALIGNMENT_CENTER;
}
else
{ /* left justify & clip text */
alignment = XmALIGNMENT_BEGINNING;
}
#endif /* WSM */
if (ACTIVE_PSD->cleanText)
{
@@ -1160,8 +1140,6 @@ void WmDrawXmString (Display *dpy, Window w, XmFontList xmfontlist,
}
} /* END OF FUNCTION WmDrawXmString */
#ifdef WSM
/*************************************<->*************************************
*
* WmInstallBitmapIntoXmCache (pchName, bitmap, width, height)
@@ -1258,4 +1236,3 @@ void WmInstallBitmapDataIntoXmCache (WmScreenData *pSD,
}
} /* END OF FUNCTION WmInstallBitmapDataIntoXmCache */
#endif /* WSM */