diff -uprk.orig nedit-5.5.orig/doc/NEdit.ad nedit-5.5/doc/NEdit.ad --- nedit-5.5.orig/doc/NEdit.ad 2003-11-22 13:03:38 +0000 +++ nedit-5.5/doc/NEdit.ad 2005-03-14 16:39:56 +0000 @@ -8,11 +8,11 @@ ! Application defaults for NEdit 5.4 ! ! -!*FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1 -!*XmText.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1 -!*XmTextField.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1 -!*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1 -!*XmFileSelectionBox*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1 +!*FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-* +!*XmText.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-*-* +!*XmTextField.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-*-* +!*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-*-* +!*XmFileSelectionBox*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-*-* !*background: #b3b3b3 !*foreground: black !*XmText.foreground: black @@ -51,8 +51,8 @@ !*helpText.foreground: black !*helpText.selectBackground: #b3b3b3 !*statsLine.background: #b3b3b3 -!*statsLine.FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1 -!*helpText.font: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1 +!*statsLine.FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-* +!*helpText.font: -*-courier-medium-r-normal-*-*-120-*-*-*-*-* !*calltip.background: LemonChiffon1 !*calltip.foreground: black !*iSearchForm*highlightThickness: 1 diff -uprk.orig nedit-5.5.orig/source/fontdef.h nedit-5.5/source/fontdef.h --- nedit-5.5.orig/source/fontdef.h 1970-01-01 00:00:00 +0000 +++ nedit-5.5/source/fontdef.h 2005-03-14 16:39:56 +0000 @@ -0,0 +1,13 @@ +#ifndef __FONTDEF_H__ +#define __FONTDEF_H__ + +#define NEDIT_FIXED_MEDIUM_R_FONT "-*-courier-medium-r-normal--12-*-*-*-*-*-*" +#define NEDIT_FIXED_BOLD_R_FONT "-*-courier-bold-r-normal--12-*-*-*-*-*-*" +#define NEDIT_FIXED_MEDIUM_O_FONT "-*-courier-medium-o-normal--12-*-*-*-*-*-*" +#define NEDIT_FIXED_BOLD_O_FONT "-*-courier-bold-o-normal--12-*-*-*-*-*-*" + +#define NEDIT_FIXED_FONT NEDIT_FIXED_MEDIUM_R_FONT +#define NEDIT_DEFAULT_FONT "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*" +#define NEDIT_DEFAULT_BG "#b3b3b3" + +#endif /* __FONTDEF_H__ */ diff -uprk.orig nedit-5.5.orig/source/nedit.c nedit-5.5/source/nedit.c --- nedit-5.5.orig/source/nedit.c 2004-09-02 08:49:56 +0000 +++ nedit-5.5/source/nedit.c 2005-03-14 16:42:09 +0000 @@ -48,6 +48,7 @@ static const char CVSID[] = "$Id: nedit. #include "interpret.h" #include "parse.h" #include "help.h" +#include "fontdef.h" #include "../util/misc.h" #include "../util/printUtils.h" #include "../util/fileUtils.h" @@ -107,28 +108,6 @@ char *ArgV0 = NULL; Boolean IsServer = False; Widget TheAppShell; -/* Reasons for choice of default font qualifications: - - iso8859 appears to be necessary for newer versions of XFree86 that - default to Unicode encoding, which doesn't quite work with Motif. - Otherwise Motif puts up garbage (square blocks). - - (This of course, is a stupid default because there are far more iso8859 - apps than Unicode apps. But the X folks insist it's a client bug. Hah.) - - RedHat 7.3 won't default to '-1' for an encoding, if left with a *, - and so reverts to "fixed". Yech. */ - -#define NEDIT_DEFAULT_FONT "-*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1," \ - "-*-helvetica-bold-r-normal-*-*-120-*-*-*-iso8859-1=BOLD," \ - "-*-helvetica-medium-o-normal-*-*-120-*-*-*-iso8859-1=ITALIC" - -#define NEDIT_FIXED_FONT "-*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1," \ - "-*-courier-bold-r-normal-*-*-120-*-*-*-iso8859-1=BOLD," \ - "-*-courier-medium-o-normal-*-*-120-*-*-*-iso8859-1=ITALIC" - -#define NEDIT_DEFAULT_BG "#b3b3b3" - static char *fallbackResources[] = { /* Try to avoid Motif's horrificly ugly default colors and fonts, if the user's environment provides no usable defaults. We try diff -uprk.orig nedit-5.5.orig/source/preferences.c nedit-5.5/source/preferences.c --- nedit-5.5.orig/source/preferences.c 2004-08-20 19:33:20 +0000 +++ nedit-5.5/source/preferences.c 2005-03-14 16:45:49 +0000 @@ -47,6 +47,7 @@ static const char CVSID[] = "$Id: prefer #include "windowTitle.h" #include "server.h" #include "tags.h" +#include "fontdef.h" #include "../util/prefFile.h" #include "../util/misc.h" #include "../util/DialogF.h" @@ -832,65 +833,65 @@ static PrefDescripRec PrefDescrip[] = { {"insertTabs", "InsertTabs", PREF_BOOLEAN, "True", &PrefData.insertTabs, NULL, True}, {"textFont", "TextFont", PREF_STRING, - "-*-courier-medium-r-normal--*-120-*-*-*-iso8859-1", + NEDIT_FIXED_MEDIUM_R_FONT, PrefData.fontString, (void *)sizeof(PrefData.fontString), True}, {"boldHighlightFont", "BoldHighlightFont", PREF_STRING, - "-*-courier-bold-r-normal--*-120-*-*-*-iso8859-1", + NEDIT_FIXED_BOLD_R_FONT, PrefData.boldFontString, (void *)sizeof(PrefData.boldFontString), True}, {"italicHighlightFont", "ItalicHighlightFont", PREF_STRING, - "-*-courier-medium-o-normal--*-120-*-*-*-iso8859-1", + NEDIT_FIXED_MEDIUM_O_FONT, PrefData.italicFontString, (void *)sizeof(PrefData.italicFontString), True}, {"boldItalicHighlightFont", "BoldItalicHighlightFont", PREF_STRING, - "-*-courier-bold-o-normal--*-120-*-*-*-iso8859-1", + NEDIT_FIXED_BOLD_O_FONT, PrefData.boldItalicFontString, (void *)sizeof(PrefData.boldItalicFontString), True}, {"helpFont", "HelpFont", PREF_STRING, - "-*-helvetica-medium-r-normal--*-120-*-*-*-iso8859-1", + "-*-helvetica-medium-r-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[HELP_FONT], (void *)sizeof(PrefData.helpFontNames[HELP_FONT]), False}, {"boldHelpFont", "BoldHelpFont", PREF_STRING, - "-*-helvetica-bold-r-normal--*-120-*-*-*-iso8859-1", + "-*-helvetica-bold-r-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[BOLD_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[BOLD_HELP_FONT]), False}, {"italicHelpFont", "ItalicHelpFont", PREF_STRING, - "-*-helvetica-medium-o-normal--*-120-*-*-*-iso8859-1", + "-*-helvetica-medium-o-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[ITALIC_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[ITALIC_HELP_FONT]), False}, {"boldItalicHelpFont", "BoldItalicHelpFont", PREF_STRING, - "-*-helvetica-bold-o-normal--*-120-*-*-*-iso8859-1", + "-*-helvetica-bold-o-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[BOLD_ITALIC_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[BOLD_ITALIC_HELP_FONT]), False}, {"fixedHelpFont", "FixedHelpFont", PREF_STRING, - "-*-courier-medium-r-normal--*-120-*-*-*-iso8859-1", + "-*-courier-medium-r-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[FIXED_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[FIXED_HELP_FONT]), False}, {"boldFixedHelpFont", "BoldFixedHelpFont", PREF_STRING, - "-*-courier-bold-r-normal--*-120-*-*-*-iso8859-1", + "-*-courier-bold-r-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[BOLD_FIXED_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[BOLD_FIXED_HELP_FONT]), False}, {"italicFixedHelpFont", "ItalicFixedHelpFont", PREF_STRING, - "-*-courier-medium-o-normal--*-120-*-*-*-iso8859-1", + "-*-courier-medium-o-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[ITALIC_FIXED_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[ITALIC_FIXED_HELP_FONT]), False}, {"boldItalicFixedHelpFont", "BoldItalicFixedHelpFont", PREF_STRING, - "-*-courier-bold-o-normal--*-120-*-*-*-iso8859-1", + "-*-courier-bold-o-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[BOLD_ITALIC_FIXED_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[BOLD_ITALIC_FIXED_HELP_FONT]), False}, {"helpLinkFont", "HelpLinkFont", PREF_STRING, - "-*-helvetica-medium-r-normal--*-120-*-*-*-iso8859-1", + "-*-helvetica-medium-r-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[HELP_LINK_FONT], (void *)sizeof(PrefData.helpFontNames[HELP_LINK_FONT]), False}, {"h1HelpFont", "H1HelpFont", PREF_STRING, - "-*-helvetica-bold-r-normal--*-140-*-*-*-iso8859-1", + "-*-helvetica-bold-r-normal--*-140-*-*-*-*-*", PrefData.helpFontNames[H1_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[H1_HELP_FONT]), False}, {"h2HelpFont", "H2HelpFont", PREF_STRING, - "-*-helvetica-bold-o-normal--*-120-*-*-*-iso8859-1", + "-*-helvetica-bold-o-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[H2_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[H2_HELP_FONT]), False}, {"h3HelpFont", "H3HelpFont", PREF_STRING, - "-*-courier-bold-r-normal--*-120-*-*-*-iso8859-1", + "-*-courier-bold-r-normal--*-120-*-*-*-*-*", PrefData.helpFontNames[H3_HELP_FONT], (void *)sizeof(PrefData.helpFontNames[H3_HELP_FONT]), False}, {"helpLinkColor", "HelpLinkColor", PREF_STRING, "#009900",