gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-16 05:55:45 +01:00
Code Issues Projects Releases Wiki Activity

- Fixed a bug with empty frame titles (Alexey Voinov <voins@voins.program.ru>)

Browse Source 
- Added WMGetWidgetBackgroundColor()
- Code cleanup in wtext.c
- Renamed WFANonBold and WFANonEmphasized to WFANotBold and WFANotEmphasized
This commit is contained in:
dan
2002-11-25 04:46:00 +00:00
parent 18b3753227
commit 0fe70d2b4e
10 changed files with 150 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
WINGs/wfont.c
View File

@@ -1061,126 +1061,54 @@ WMCopyFontWithChanges(WMScreen *scrPtr, WMFont *font,
// should WFANormal also set "normal" or leave it alone?
static const WMFontAttributes W_FANormal = {
WFAUnchanged,
WFAUnchanged,
"medium,normal,regular",
"r",
"normal", /* not sure about this */
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged
WFAUnchanged, WFAUnchanged, "medium,normal,regular", "r", "normal",
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
};
static const WMFontAttributes W_FABold = {
WFAUnchanged,
WFAUnchanged,
"bold",
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged
WFAUnchanged, WFAUnchanged, "bold", WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
};
static const WMFontAttributes W_FANonBold = {
WFAUnchanged,
WFAUnchanged,
"medium,normal,regular",
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged
static const WMFontAttributes W_FANotBold = {
WFAUnchanged, WFAUnchanged, "medium,normal,regular", WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
};
static const WMFontAttributes W_FAEmphasized = {
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
"o,i",
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged
WFAUnchanged, WFAUnchanged, WFAUnchanged, "o,i",
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
};
static const WMFontAttributes W_FANonEmphasized = {
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
"r",
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged
static const WMFontAttributes W_FANotEmphasized = {
WFAUnchanged, WFAUnchanged, WFAUnchanged, "r",
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
};
static const WMFontAttributes W_FABoldEmphasized = {
WFAUnchanged,
WFAUnchanged,
"bold",
"o,i",
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged,
WFAUnchanged
WFAUnchanged, WFAUnchanged, "bold", "o,i",
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
};
// by exposing a ptr to them we can allow one to alter their content
// const doesn't prevent this effectively.
// altering the content doesn't effectively work because it will core dump
// if one tries, but still is not clean.
// however passing the whole struct to the function instead of just the
// pointer means passing a strcut with 14 pointers to char*
//
const WMFontAttributes *WFANormal = &W_FANormal;
const WMFontAttributes *WFABold = &W_FABold;
const WMFontAttributes *WFANonBold = &W_FANonBold;
const WMFontAttributes *WFANotBold = &W_FANotBold;
const WMFontAttributes *WFAEmphasized = &W_FAEmphasized;
const WMFontAttributes *WFANonEmphasized = &W_FANonEmphasized;
const WMFontAttributes *WFANotEmphasized = &W_FANotEmphasized;
const WMFontAttributes *WFABoldEmphasized = &W_FABoldEmphasized;