*** mainloop.c.orig Wed May 3 20:38:01 2000 --- mainloop.c Wed May 3 20:38:01 2000 *************** *** 647,650 **** --- 647,652 ---- } } else { + #ifndef USE_XAPPLRESDIR + #ifdef USE_XT_INITIALIZE if (XtSetLanguageProc(NULL, NULL, NULL) == NULL) { fprintf(stderr, "%s\n", *************** *** 652,655 **** --- 654,659 ---- MySetLocale(LC_ALL, "C"); } + #endif /* USE_XT_INITIALIZE */ + #endif /* ~USE_XAPPLRESDIR */ } } *** menu.c.orig Wed May 3 20:38:02 2000 --- menu.c Wed May 3 20:38:02 2000 *************** *** 116,119 **** --- 116,120 ---- static int gnMinimalMenubar=TRUE; + static int gnAutoWrapMenubar=FALSE; static *************** *** 133,136 **** --- 134,142 ---- gnMinimalMenubar = FALSE; } + gnAutoWrapMenubar = FALSE; + if (((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"AutoWrapMenubar")) != + NULL) && UtilStrICmp(c_ptr,"true") == 0) { + gnAutoWrapMenubar = TRUE; + } gpMenubarItemInfos = (gnMinimalMenubar ? minimalMenubarMenuInfo.items : maximalMenubarMenuInfo.items); *************** *** 199,203 **** len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), len); ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { if (Y < h) return INVALID; --- 205,209 ---- len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), len); ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { if (Y < h) return INVALID; *************** *** 223,227 **** len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = defaultFontWidth*len; ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { if (Y < h) return INVALID; --- 229,233 ---- len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = defaultFontWidth*len; ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { if (Y < h) return INVALID; *************** *** 258,262 **** len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), len); ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { x = menuFontWidth+padding; --- 264,268 ---- len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), len); ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { x = menuFontWidth+padding; *************** *** 278,282 **** len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = defaultFontWidth*len; ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { x = 2+padding; --- 284,288 ---- len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = defaultFontWidth*len; ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { x = 2+padding; *************** *** 3240,3244 **** w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), strlen(_(gpMenubarItemInfos[i].menu_str))); ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { x = menuFontWidth+padding; --- 3246,3250 ---- w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), strlen(_(gpMenubarItemInfos[i].menu_str))); ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { x = menuFontWidth+padding; *************** *** 3257,3261 **** for (i=0; i < gnNumMenubarItems; i++) { w = defaultFontWidth*strlen(_(gpMenubarItemInfos[i].menu_str)); ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { x = 2+padding; --- 3263,3267 ---- for (i=0; i < gnNumMenubarItems; i++) { w = defaultFontWidth*strlen(_(gpMenubarItemInfos[i].menu_str)); ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { x = 2+padding; *************** *** 3329,3333 **** len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), len); ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { x = menuFontWidth+padding; --- 3335,3339 ---- len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = MenuTextWidth(menuFontPtr, _(gpMenubarItemInfos[i].menu_str), len); ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { x = menuFontWidth+padding; *************** *** 3354,3358 **** len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = defaultFontWidth*len; ! if (!noMinWinSize && !gnMinimalMenubar && x+w+padding >= menubarWindowW) { x = 2+padding; --- 3360,3364 ---- len = strlen(_(gpMenubarItemInfos[i].menu_str)); w = defaultFontWidth*len; ! if ((!noMinWinSize || !gnMinimalMenubar || gnAutoWrapMenubar) && x+w+padding >= menubarWindowW) { x = 2+padding; *** patchlvl.h.orig Wed May 3 20:38:03 2000 --- patchlvl.h Wed May 3 20:38:03 2000 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 30 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 31 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig Wed May 3 20:38:04 2000 --- Imakefile Wed May 3 20:38:04 2000 *************** *** 54,58 **** $(MOREDEFINES) ! TGIFVERSION = 4.1.30 XCOMM Things to try to add to the DEFINES line above: --- 54,58 ---- $(MOREDEFINES) ! TGIFVERSION = 4.1.31 XCOMM Things to try to add to the DEFINES line above: *** tgif.man.orig Wed May 3 20:38:05 2000 --- tgif.man Wed May 3 20:38:05 2000 *************** *** 9,13 **** .\" .\" ! .TH tgif n "Version 4.1 Patchlevel 30 and Above" "Tgif" .\" .SH NAME --- 9,13 ---- .\" .\" ! .TH tgif n "Version 4.1 Patchlevel 31 and Above" "Tgif" .\" .SH NAME *************** *** 4737,4740 **** --- 4737,4746 ---- automatically wraps around when Tgif.MinimalMenubar is set to true. The default is true. + .TP + .I Tgif.AutoWrapMenubar: [true,false] + If set to ``true'', the menubar will automatically wrap around. + If Tgif.MinimalMenubar is set to false, menubar will always + wrap around automatically. + The default is false. .\" .\" add new X defaults here *** HISTORY.orig Wed May 3 20:38:06 2000 --- HISTORY Wed May 3 20:38:06 2000 *************** *** 1,2 **** --- 1,8 ---- + -----------------------> tgif-4.1.30 => tgif-4.1.31 <----------------------- + 1) Fix a typo that cause link problems on Linux. + 2) Add a new X default, Tgif.AutoWrapMenubar, so that menubar will + automatically wrap around. If Tgif.MinimalMenubar is set to false, + menubar will always wrap around automatically. + -----------------------> tgif-4.1.29 => tgif-4.1.30 <----------------------- 1) There's a bug with measure tooltip that certain X servers would generate *** tgif.Xdefaults.orig Wed May 3 20:38:06 2000 --- tgif.Xdefaults Wed May 3 20:38:06 2000 *************** *** 460,461 **** --- 460,465 ---- !Tgif.NoMinWinSize: true !Tgif.JpegToXpm: djpeg -gif -color 222 %s | giftopnm | ppmtoxpm + ! + ! Added in version 4.1.31 + ! + !Tgif.AutoWrapMenubar: false