gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-09 07:14:18 +01:00
Code Issues Projects Releases Wiki Activity

- If fonts are specified as xlfd, convert to fc names before creating them.

Browse Source 
This was we internally only deal with fc names and properties. It will
  incur a small performance hit as the font needs to be parsed/unparsed,
  but this is only for backward-compatibility to support old xlfd names.
  People are encouraged to swtich to fontconfig names.
- WINGs no longer adds sans as a fallback for internal fonts. It is
  automatically done by fontconfig (if it can't find the requested font
  it will use the closest match which is the default font: sans-serif)
- Added code to honor the AntialiasesText global option
- Fixed style names for WMCopyFontWithStyle()
- Added fonts in style files where they were missing. Also changed some
  fonts to better defaults.
This commit is contained in:
dan
2004-10-22 00:21:51 +00:00
parent 6de693a24d
commit 08e811aae7
54 changed files with 368 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WPrefs.app/Expert.c
View File

@@ -73,7 +73,7 @@ createPanel(Panel *p)
WMMoveWidget(panel->swi[i], 20, 20+i*25);
}
WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));
WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."));
WMSetButtonText(panel->swi[1], _("Do not set non-WindowMaker specific parameters (do not use xset)."));
WMSetButtonText(panel->swi[2], _("Automatically save session when exiting Window Maker."));
WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects."));

6
WPrefs.app/Focus.c
View File

@@ -220,14 +220,14 @@ createPanel(Panel *p)
panel->kfocB[0] = WMCreateRadioButton(box);
WMSetButtonText(panel->kfocB[0], _("Manual: Click on the window to set "\
"keyboard input focus"));
"keyboard input focus."));
WMAddBoxSubview(box, WMWidgetView(panel->kfocB[0]), True, True,
20, 0, 0);
panel->kfocB[1] = WMCreateRadioButton(box);
WMGroupButtons(panel->kfocB[0], panel->kfocB[1]);
WMSetButtonText(panel->kfocB[1], _("Auto: Set keyboard input focus to "\
"the window under the mouse pointer"));
"the window under the mouse pointer."));
WMAddBoxSubview(box, WMWidgetView(panel->kfocB[1]), True, True,
20, 0, 0);
@@ -250,7 +250,7 @@ createPanel(Panel *p)
panel->autB = WMCreateRadioButton(panel->cfocF);
WMResizeWidget(panel->autB, 225, 20);
WMMoveWidget(panel->autB, 10, 43);
WMSetButtonText(panel->autB, _("...that is under the mouse pointer."));
WMSetButtonText(panel->autB, _("...that's under the mouse pointer."));
WMGroupButtons(panel->manB, panel->autB);
WMMapSubwidgets(panel->cfocF);

3
WPrefs.app/WPrefs.c
View File

@@ -322,7 +322,8 @@ createMainWindow(WMScreen *scr)
WMMoveWidget(WPrefs.banner, FRAME_LEFT, FRAME_TOP);
WMSetFrameRelief(WPrefs.banner, WRFlat);
font = WMCreateFont(scr, "Lucida Sans,URW Gothic L,Times New Roman,serif:bold:pixelsize=26");
font = WMCreateFont(scr, "Lucida Sans,URW Gothic L,Times New Roman,serif"
":bold:pixelsize=26:antialias=true");
WPrefs.nameL = WMCreateLabel(WPrefs.banner);
WMSetLabelTextAlignment(WPrefs.nameL, WACenter);
WMResizeWidget(WPrefs.nameL, FRAME_WIDTH-20, 60);

161
WPrefs.app/font.data
View File

@@ -1,161 +0,0 @@
{
Encodings = (("default", 0, "iso8859-1",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("latin1 iso8859-1", 0, "iso8859-1",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("latin2 iso8859-2", 1, "iso8859-2",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("Greek iso8859-7", 1, "iso8859-7",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("Japanese jis", 1, "jis",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("Korean ksc5601", 1, "ksc5601",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("Korean2 ksc5601.1987", 1, "ksc5601.1987",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("Russian koi8-r", 1, "koi8-r",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
("Ukrainian koi8-u", 1, "koi8-u",
"ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890")
);
WindowTitleFont = {
"iso8859-1" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-1");
"iso8859-2" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-2");
"iso8859-7" = ("-*-georgia-bold-r-normal-*-14-*-*-*-*-*-iso8859-7");
"jis" = ("-*-fixed-bold-r-normal-*-16-*-*-*-*-*-jisx0208.1983-*",
"-*-*-medium-r-normal-*-14-*",
"-*-*-medium-r-normal-*-*-*");
"ksc5601" = ("-*-mincho-bold-r-normal-*-12-*-*-*-*-*-ksc5601.1987-*",
"-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"ksc5601.1987" = ("-*-gothic-medium-r-normal-*-16-*-*-*-*-*-ksc5601.1987-*",
"-*-helvetica-medium-r-normal--14-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--16-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"koi8-r" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-r");
"koi8-u" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-u");
};
MenuTitleFont = {
"iso8859-1" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-1");
"iso8859-2" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-2");
"iso8859-7" = ("-*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-7");
"jis" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal-*-14-*",
"-*-*-medium-r-normal-*-*-*");
"ksc5601" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*",
"-*-kodig-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*",
"-*-gothic-medium-r-normal--16-*-*-*-*-*-ksc5601.1987-*",
"-*-*-medium-r-normal--16-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"koi8-r" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-r");
"koi8-u" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-u");
};
MenuTextFont = {
"iso8859-1" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-1");
"iso8859-2" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-2");
"iso8859-7" = ("-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-7");
"jis" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*",
"-*-*-medium-r-medium-*-14-*",
"-*-*-medium-r-medium-*-*-*");
"ksc5601" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*",
"-*-kodig-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*",
"-*-gothic-medium-r-normal--16-*-*-*-*-*-ksc5601.1987-*",
"-*-*-medium-r-normal--16-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"koi8-r" = ("-*-georgia-medium-r-normal-*-12-*-*-*-*-*-koi8-r");
"koi8-u" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-u");
};
IconTitleFont = {
"iso8859-1" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-iso8859-1");
"iso8859-2" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-iso8859-2");
"iso8859-7" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-iso8859-7");
"jis" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*",
"-*-*-medium-r-medium-*-10-*",
"-*-*-medium-r-medium-*-*-*");
"ksc5601" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*",
"-*-kodig-medium-r-normal--8-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--8-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
"-*-gothic-medium-r-normal--12-*-*-*-*-*-ksc5601.1987-*",
"-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"koi8-r" = ("-*-georgia-medium-r-normal-*-8-*-*-*-*-*-koi8-r");
"koi8-u" = ("-*-georgia-medium-r-normal-*-8-*-*-*-*-*-koi8-u");
};
ClipTitleFont = {
"iso8859-1" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-iso8859-1");
"iso8859-2" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-iso8859-2");
"iso8859-7" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-7");
"jis" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
"-*-*-medium-r-medium-*-12-*",
"-*-*-medium-r-medium-*-*-*");
"ksc5601" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
"-*-kodig-medium-r-normal--10-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--10-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
"-*-gothic-medium-r-normal--12-*-*-*-*-*-ksc5601.1987-*",
"-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"koi8-r" = ("-*-georgia-medium-r-normal-*-10-*-*-*-*-*-koi8-r");
"koi8-u" = ("-*-georgia-medium-r-normal-*-8-*-*-*-*-*-koi8-u");
};
LargeDisplayFont = {
"iso8859-1" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-iso8859-1");
"iso8859-2" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-iso8859-2");
"iso8859-7" = ("-*-helvetica-medium-r-normal-*-26-*-*-*-*-*-iso8859-7");
"jis" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*",
"-*-*-medium-r-medium-*-26-*",
"-*-*-medium-r-medium-*-*-*");
"ksc5601" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*",
"-*-kodig-medium-r-normal--24-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--24-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*",
"-*-gothic-medium-r-normal--24-*-*-*-*-*-ksc5601.1987-*",
"-*-*-medium-r-normal--24-*-*-*-*-*-*-*",
"-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-r-normal--*-*-*-*-*-*-*-*",
"-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
"koi8-r" = ("-*-georgia-medium-r-normal-*-24-*-*-*-*-*-koi8-r");
"koi8-u" = ("-*-georgia-medium-r-normal-*-24-*-*-*-*-*-koi8-u");
};
}