From 0d9b73cd748e40035eeb01f55dca2571fd24d708 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 25 Oct 2004 02:23:41 +0000 Subject: [PATCH] - Fixed issues with crashing dialog not working - Keep menu and title text at 12px since there is not constrained by width - Removed some obsoleted options from wconfig.h - Added a lighter image for the switch panel --- ChangeLog | 3 + WindowMaker/Defaults/WindowMaker.in | 10 ++-- .../Pixmaps/{swback.png => swback-dark.png} | Bin WindowMaker/Pixmaps/swback.png | Bin 4192 -> 5483 bytes src/dialog.c | 16 +++-- src/main.c | 66 +++++++++++++-------- src/monitor.c | 9 +-- src/startup.c | 1 + src/wconfig.h.in | 22 ++----- 9 files changed, 70 insertions(+), 57 deletions(-) copy WindowMaker/Pixmaps/{swback.png => swback-dark.png} (100%) rewrite WindowMaker/Pixmaps/swback.png (99%) diff --git a/ChangeLog b/ChangeLog index 68a2e8d3..48e64f13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Changes since version 0.90.0: - new WPrefs icon (thanks to Largo) - replaced VirtualEdgeThickness option, with EnableVirtualDesktop (boolean) - enhanced alt-tab panel, added theming ability +- fixed issues with broken crash dialog +- removed obsoleted options from wconfig.h + Changes since version 0.80.2: ............................. diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in index 2a64a7bf..a11f8da3 100644 --- a/WindowMaker/Defaults/WindowMaker.in +++ b/WindowMaker/Defaults/WindowMaker.in @@ -105,12 +105,12 @@ ConstrainWindowSize = NO; ClipRaiseLowerKey = None; TitleJustify = center; - WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=11"; - MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=11"; - MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=11"; - IconTitleFont = "Arial,Luxi Sans:pixelsize=8"; + WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12"; + MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12"; + MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12"; + IconTitleFont = "Arial,Luxi Sans:pixelsize=9"; ClipTitleFont = "Verdana:bold:pixelsize=10"; - DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=11"; + DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12"; LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24"; HighlightColor = white; HighlightTextColor = black; diff --git a/WindowMaker/Pixmaps/swback.png b/WindowMaker/Pixmaps/swback-dark.png similarity index 100% copy from WindowMaker/Pixmaps/swback.png copy to WindowMaker/Pixmaps/swback-dark.png diff --git a/WindowMaker/Pixmaps/swback.png b/WindowMaker/Pixmaps/swback.png dissimilarity index 99% index fab56ac3322352511bfcdbeb73de05fc27fef520..cd9633a2107cd173f2af6144f28e73e033d957df 100644 GIT binary patch delta 5420 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 U`-E+RdjJ3c07*qoM6N<$g3tZe$p8QV diff --git a/src/dialog.c b/src/dialog.c index 8d63a6fc..f99269f5 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -561,7 +561,7 @@ keyPressHandler(XEvent *event, void *data) KeySym ksym; int iidx; int didx; - int item; + int item = 0; WMList *list = NULL; if (event->type == KeyRelease) @@ -862,8 +862,8 @@ typedef struct { #define COPYRIGHT_TEXT \ - "Copyright \xc2\xa9 1997-2004 Alfredo K. Kojima \n"\ - "Copyright \xc2\xa9 1998-2004 Dan Pascu " + "Copyright \xc2\xa9 1997-2004 Alfredo K. Kojima\n"\ + "Copyright \xc2\xa9 1998-2004 Dan Pascu" @@ -1647,6 +1647,7 @@ setCrashAction(void *self, void *clientData) } +/* Make this read the logo from a compiled in pixmap -Dan */ static WMPixmap* getWindowMakerIconImage(WMScreen *scr) { @@ -1654,6 +1655,9 @@ getWindowMakerIconImage(WMScreen *scr) WMPixmap *pix=NULL; char *path; + if (!WDWindowAttributes || !WDWindowAttributes->dictionary) + return NULL; + WMPLSetCaseSensitive(True); key = WMCreatePLString("Logo.WMPanel"); @@ -1732,10 +1736,10 @@ wShowCrashingDialogPanel(int whatSig) } panel->nameL = WMCreateLabel(panel->win); - WMResizeWidget(panel->nameL, 190, 18); - WMMoveWidget(panel->nameL, 80, 35); + WMResizeWidget(panel->nameL, 200, 30); + WMMoveWidget(panel->nameL, 80, 25); WMSetLabelTextAlignment(panel->nameL, WALeft); - font = WMBoldSystemFontOfSize(scr, 18); + font = WMBoldSystemFontOfSize(scr, 24); WMSetLabelFont(panel->nameL, font); WMReleaseFont(font); WMSetLabelText(panel->nameL, _("Fatal error")); diff --git a/src/main.c b/src/main.c index 06f14bb7..de630907 100644 --- a/src/main.c +++ b/src/main.c @@ -582,13 +582,32 @@ getFullPath(char *path) #endif - int main(int argc, char **argv) { - int i; - int i_am_the_monitor= 1; - + int i_am_the_monitor, i, len; + char *str, *alt; + + /* setup common stuff for the monitor and wmaker itself */ + WMInitializeApplication("WindowMaker", &argc, argv); + + memset(&wPreferences, 0, sizeof(WPreferences)); + + wPreferences.fallbackWMs = WMCreateArray(8); + alt = getenv("WINDOWMAKER_ALT_WM"); + if (alt != NULL) + WMAddToArray(wPreferences.fallbackWMs, wstrdup(alt)); + + WMAddToArray(wPreferences.fallbackWMs, wstrdup("blackbox")); + WMAddToArray(wPreferences.fallbackWMs, wstrdup("metacity")); + WMAddToArray(wPreferences.fallbackWMs, wstrdup("fvwm")); + WMAddToArray(wPreferences.fallbackWMs, wstrdup("twm")); + WMAddToArray(wPreferences.fallbackWMs, NULL); + WMAddToArray(wPreferences.fallbackWMs, wstrdup("rxvt")); + WMAddToArray(wPreferences.fallbackWMs, wstrdup("xterm")); + + i_am_the_monitor= 1; + for (i= 1; i < argc; i++) { if (strncmp(argv[i], "--for-real", strlen("--for-real"))==0) @@ -596,8 +615,23 @@ main(int argc, char **argv) i_am_the_monitor= 0; break; } + else if (strcmp(argv[i], "-display")==0 || strcmp(argv[i], "--display")==0) + { + i++; + if (i>=argc) { + wwarning(_("too few arguments for %s"), argv[i-1]); + exit(0); + } + DisplayName = argv[i]; + } } - + + DisplayName = XDisplayName(DisplayName); + len = strlen(DisplayName)+64; + str = wmalloc(len); + snprintf(str, len, "DISPLAY=%s", DisplayName); + putenv(str); + if (i_am_the_monitor) return MonitorLoop(argc, argv); else @@ -605,11 +639,11 @@ main(int argc, char **argv) } -static int +static int real_main(int argc, char **argv) { int i, restart=0; - char *str, *alt; + char *str; int d, s; int flag; #ifdef DEBUG @@ -635,9 +669,6 @@ real_main(int argc, char **argv) Arguments[argc-1]= "--for-real="; Arguments[argc]= NULL; - WMInitializeApplication("WindowMaker", &argc, argv); - - ProgName = strrchr(argv[0],'/'); if (!ProgName) ProgName = argv[0]; @@ -647,21 +678,6 @@ real_main(int argc, char **argv) restart = 0; - memset(&wPreferences, 0, sizeof(WPreferences)); - - wPreferences.fallbackWMs = WMCreateArray(8); - alt = getenv("WINDOWMAKER_ALT_WM"); - if (alt != NULL) - WMAddToArray(wPreferences.fallbackWMs, wstrdup(alt)); - - WMAddToArray(wPreferences.fallbackWMs, wstrdup(FALLBACK_WINDOWMANAGER)); - WMAddToArray(wPreferences.fallbackWMs, wstrdup("metacity")); - WMAddToArray(wPreferences.fallbackWMs, wstrdup("fvwm")); - WMAddToArray(wPreferences.fallbackWMs, wstrdup("twm")); - WMAddToArray(wPreferences.fallbackWMs, NULL); - WMAddToArray(wPreferences.fallbackWMs, wstrdup("rxvt")); - WMAddToArray(wPreferences.fallbackWMs, wstrdup("xterm")); - if (argc>1) { for (i=1; i