*** mainloop.c.orig Tue Mar 9 13:49:22 1999 --- mainloop.c Tue Mar 9 13:49:22 1999 *************** *** 45,48 **** --- 45,50 ---- #ifndef _NO_LOCALE_SUPPORT #include + #else /* _NO_LOCALE_SUPPORT */ + #include #endif /* ~_NO_LOCALE_SUPPORT */ *************** *** 475,478 **** --- 477,524 ---- FILE *fp=NULL; + #ifndef _NO_LOCALE_SUPPORT + setlocale(LC_ALL, "C"); + + if (x11R6OrAbove) { + #ifdef USE_XT_INITIALIZE + XtSetLanguageProc(NULL, NULL, NULL); + #else /* _NO_LOCALE_SUPPORT */ + char *c_ptr1=NULL; + #ifndef _DONT_USE_PORTABLE_LOCALE + int use_portable_locale=TRUE; + #else /* _DONT_USE_PORTABLE_LOCALE */ + int use_portable_locale=FALSE; + #endif /* ~_DONT_USE_PORTABLE_LOCALE */ + + if (use_portable_locale) { + setlocale(LC_ALL, "C"); + } else { + setlocale(LC_ALL, NULL); + if ((c_ptr1=((char*)getenv("LANG"))) != NULL) { + setlocale(LC_ALL, c_ptr1); + } + if ((c_ptr1=((char*)getenv("LC_COLLATE"))) != NULL) { + setlocale(LC_COLLATE, c_ptr1); + } + if ((c_ptr1=((char*)getenv("LC_CTYPE"))) != NULL) { + setlocale(LC_CTYPE, c_ptr1); + } + if ((c_ptr1=((char*)getenv("LC_NUMERIC"))) != NULL) { + setlocale(LC_NUMERIC, c_ptr1); + } + if ((c_ptr1=((char*)getenv("LC_TIME"))) != NULL) { + setlocale(LC_TIME, c_ptr1); + } + if ((c_ptr1=((char*)getenv("LC_MONETARY"))) != NULL) { + setlocale(LC_MONETARY, c_ptr1); + } + if (XSupportsLocale()) { + XSetLocaleModifiers(NULL); + } + } + #endif /* USE_XT_INITIALIZE */ + } + #endif /* ~_NO_LOCALE_SUPPORT */ + #ifdef USE_XAPPLRESDIR #ifdef XAPPLOADDIR_DEF *************** *** 1075,1120 **** #endif /* X_PROTOCOL */ - #ifndef _NO_LOCALE_SUPPORT - if (x11R6OrAbove) { - #ifdef USE_XT_INITIALIZE - XtSetLanguageProc(NULL, NULL, NULL); - #else - char *c_ptr1=NULL; - #ifndef _DONT_USE_PORTABLE_LOCALE - int use_portable_locale=TRUE; - #else /* _DONT_USE_PORTABLE_LOCALE */ - int use_portable_locale=FALSE; - #endif /* ~_DONT_USE_PORTABLE_LOCALE */ - - if (use_portable_locale) { - setlocale(LC_ALL, "C"); - } else { - setlocale(LC_ALL, NULL); - if ((c_ptr1=((char*)getenv("LANG"))) != NULL) { - setlocale(LC_ALL, c_ptr1); - } - if ((c_ptr1=((char*)getenv("LC_COLLATE"))) != NULL) { - setlocale(LC_COLLATE, c_ptr1); - } - if ((c_ptr1=((char*)getenv("LC_CTYPE"))) != NULL) { - setlocale(LC_CTYPE, c_ptr1); - } - if ((c_ptr1=((char*)getenv("LC_NUMERIC"))) != NULL) { - setlocale(LC_NUMERIC, c_ptr1); - } - if ((c_ptr1=((char*)getenv("LC_TIME"))) != NULL) { - setlocale(LC_TIME, c_ptr1); - } - if ((c_ptr1=((char*)getenv("LC_MONETARY"))) != NULL) { - setlocale(LC_MONETARY, c_ptr1); - } - if (XSupportsLocale()) { - XSetLocaleModifiers(NULL); - } - } - #endif /* USE_XT_INITIALIZE */ - } - #endif /* ~_NO_LOCALE_SUPPORT */ - JustInit(FileName, &need_to_check_auto_exec); if (*cmdLineFileToExec != '\0') { --- 1121,1124 ---- *** menu.c.orig Tue Mar 9 13:49:24 1999 --- menu.c Tue Mar 9 13:49:24 1999 *************** *** 171,175 **** int i, x=0, w=0, h=0, len=0, gap=0, padding=(windowPadding>>1); ! if (Y < 0 || Y >= menubarWindowH || X < 0 || X >= menubarWindowW) { return INVALID; } --- 171,176 ---- int i, x=0, w=0, h=0, len=0, gap=0, padding=(windowPadding>>1); ! if (noMenubar || ! Y < 0 || Y >= menubarWindowH || X < 0 || X >= menubarWindowW) { return INVALID; } *************** *** 2381,2388 **** HighLightMenubarString(gpMenubarItemInfos[index].menu_str, text_bbox, TRUE); ! excludeMenubarWinBBox.ltx = text_bbox->ltx-2; ! excludeMenubarWinBBox.lty = text_bbox->lty-2; ! excludeMenubarWinBBox.rbx = text_bbox->rbx+exclude_gap+2; ! excludeMenubarWinBBox.rby = text_bbox->rby+2; } switch (gpMenubarItemInfos[index].cmdid) { --- 2382,2389 ---- HighLightMenubarString(gpMenubarItemInfos[index].menu_str, text_bbox, TRUE); ! excludeMenubarWinBBox.ltx = text_bbox->ltx-2-windowPadding; ! excludeMenubarWinBBox.lty = text_bbox->lty-2-windowPadding; ! excludeMenubarWinBBox.rbx = text_bbox->rbx+exclude_gap+2+windowPadding; ! excludeMenubarWinBBox.rby = text_bbox->rby+2+windowPadding; } switch (gpMenubarItemInfos[index].cmdid) { *** miniline.c.orig Tue Mar 9 13:49:25 1999 --- miniline.c Tue Mar 9 13:49:26 1999 *************** *** 1890,1894 **** values.function = GXcopy; values.fill_style = FillSolid; ! XChangeGC(mainDisplay, drawGC, GCForeground | GCFunction | GCFillStyle, &values); XFillRectangle(mainDisplay, drawWindow, drawGC, x, y, w, h); --- 1890,1897 ---- values.function = GXcopy; values.fill_style = FillSolid; ! values.line_width = 1; ! values.line_style = LineSolid; ! XChangeGC(mainDisplay, drawGC, ! GCForeground | GCFunction | GCFillStyle | GCLineWidth | GCLineStyle, &values); XFillRectangle(mainDisplay, drawWindow, drawGC, x, y, w, h); *** page.c.orig Tue Mar 9 13:49:28 1999 --- page.c Tue Mar 9 13:49:28 1999 *************** *** 1386,1398 **** int X, Y, TrackMenubar; { ! int rc=INVALID; ! TgMenu *menu=(pageMenuInfo.create_proc)(NULL, X, Y, &pageMenuInfo); ! ! activeMenu = MENU_PAGE; ! if (menu != NULL) { ! rc = TgMenuLoop(menu); ! TgDestroyMenu(menu, TRUE); } ! return rc; } --- 1386,1394 ---- int X, Y, TrackMenubar; { ! switch (pageLayoutMode) { ! case PAGE_STACK: return StackedPageMenu(X, Y, TrackMenubar); ! case PAGE_TILE: return TiledPageMenu(X, Y, TrackMenubar); } ! return INVALID; } *** poly.c.orig Tue Mar 9 13:49:30 1999 --- poly.c Tue Mar 9 13:49:30 1999 *************** *** 3004,3007 **** --- 3004,3009 ---- } } + values.join_style = JoinMiter; + XChangeGC(mainDisplay, drawGC, GCJoinStyle, &values); } *** polygon.c.orig Tue Mar 9 13:49:32 1999 --- polygon.c Tue Mar 9 13:49:32 1999 *************** *** 419,422 **** --- 419,424 ---- polygon_ptr->rotated_n, CoordModeOrigin); } + values.join_style = JoinMiter; + XChangeGC(mainDisplay, drawGC, GCJoinStyle, &values); } *** text.c.orig Tue Mar 9 13:49:33 1999 --- text.c Tue Mar 9 13:49:33 1999 *************** *** 1367,1371 **** } } ! UpdateEditTextArea(textW, textH, text_ptr->minilines.min_lbearing, text_ptr->minilines.max_rextra); UpdateCurTextBBoxes(TRUE); --- 1367,1371 ---- } } ! SetEditTextArea(textW, textH, text_ptr->minilines.min_lbearing, text_ptr->minilines.max_rextra); UpdateCurTextBBoxes(TRUE); *** patchlvl.h.orig Tue Mar 9 13:49:36 1999 --- patchlvl.h Tue Mar 9 13:49:36 1999 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 0 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 1 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig Tue Mar 9 13:49:37 1999 --- Imakefile Tue Mar 9 13:49:37 1999 *************** *** 53,57 **** $(MOREDEFINES) ! TGIFVERSION = 4.1 XCOMM Things to try to add to the DEFINES line above: --- 53,57 ---- $(MOREDEFINES) ! TGIFVERSION = 4.1.1 XCOMM Things to try to add to the DEFINES line above: *** HISTORY.orig Tue Mar 9 13:49:38 1999 --- HISTORY Tue Mar 9 13:49:38 1999 *************** *** 1,2 **** --- 1,13 ---- + -----------------------> tgif-4.1 => tgif-4.1.1 <----------------------- + Here's a short list of added features/bug fixes. + + 1) Fix a locale bug for non-X11R6 systems. Thanks to Miroslav Flidr + for pointing out the problem. + 2) Fix a bug that if Tgif.NoMenubar is set to "true", some popup menus + in the choice window doesn't work. Thanks to Hiroto Kagotani + for pointing out the problem. + 3) Fix a bug with the File Menu flashing. Thanks to Andrew Sapuntzakis + for pointing out the problem. + -----------------------> tgif-4.0.18 => tgif-4.1 <----------------------- Here's a short list of added features/bug fixes.