*** choice.c.orig Tue Feb 16 17:08:22 1999 --- choice.c Tue Feb 16 17:08:22 1999 *************** *** 1901,1905 **** case -1: ZoomOut(); QuickSetMouseStatus(&zoomMouseStatus[0]); break; case 0: ZoomLoop(button_ev); break; ! case 1: ZoomIn(); QuickSetMouseStatus(&zoomMouseStatus[0]); break; } break; --- 1901,1905 ---- case -1: ZoomOut(); QuickSetMouseStatus(&zoomMouseStatus[0]); break; case 0: ZoomLoop(button_ev); break; ! case 1: ZoomIn(); break; } break; *** color.c.orig Tue Feb 16 17:08:24 1999 --- color.c Tue Feb 16 17:08:24 1999 *************** *** 66,74 **** #include "xbm/upend.xbm" - #define COLORSTRLEN 80 - - #define WHITE_COLOR_INDEX 8 - #define BLACK_COLOR_INDEX 9 - #define MAX_VERTICAL_BTNS 6 --- 66,69 ---- *************** *** 95,98 **** --- 90,102 ---- int gnUpdatePixelObjCount=0; + char defaultBgColorStr[COLORSTRLEN]; + int defaultBgColorIndex=INVALID; + + char altEditTextBgColorStr[COLORSTRLEN]; + int altEditTextBgIndex=INVALID; + char altEditTextHighlightColorStr[COLORSTRLEN]; + int altEditTextHighlightIndex=INVALID; + int useAltEditTextBgColor=FALSE; + static int colorWindowFirstIndex=0; static int colorItemH=12; *************** *** 362,365 **** --- 366,432 ---- } + static + int DoSetAltEditTextBgColor() + { + int new_alloc=FALSE; + + if (*altEditTextBgColorStr == '\0') return FALSE; + + altEditTextBgIndex = QuickFindColorIndex(NULL, altEditTextBgColorStr, + &new_alloc, FALSE); + if (altEditTextBgIndex == INVALID) { + sprintf(gszMsgBox, "%s '%s' %s.", + "Fail to allocate the", altEditTextBgColorStr, + "background color for use in editing existing text objects"); + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + *altEditTextBgColorStr = '\0'; + return FALSE; + } + if (colorLayers) RedrawColorWindow(); + + return TRUE; + } + + static + int DoSetAltEditTextHighlightColor() + { + int new_alloc=FALSE; + + if (*altEditTextHighlightColorStr == '\0') return FALSE; + + altEditTextHighlightIndex = QuickFindColorIndex(NULL, + altEditTextHighlightColorStr, &new_alloc, FALSE); + if (altEditTextHighlightIndex == INVALID) { + sprintf(gszMsgBox, "%s '%s' %s.", + "Fail to allocate the", altEditTextHighlightColorStr, + "background color for use in editing existing text objects"); + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + *altEditTextHighlightColorStr = '\0'; + return FALSE; + } + if (colorLayers) RedrawColorWindow(); + + return TRUE; + } + + static + int DoSetDefaultBgColor() + { + int new_alloc=FALSE; + + if (*defaultBgColorStr == '\0') return FALSE; + + defaultBgColorIndex = QuickFindColorIndex(NULL, defaultBgColorStr, + &new_alloc, FALSE); + if (defaultBgColorIndex == INVALID) { + sprintf(gszMsgBox, "%s: '%s'.", + "Fail to allocate the default background color", defaultBgColorStr); + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + *defaultBgColorStr = '\0'; + return FALSE; + } + return TRUE; + } + void InitColor() { *************** *** 799,802 **** --- 866,882 ---- } } + *defaultBgColorStr = '\0'; + defaultBgColorIndex = INVALID; + if (colorDisplay && (c_ptr=XGetDefault(mainDisplay, TOOL_NAME, + "DefaultObjectBackground")) != NULL) { + strcpy(defaultBgColorStr, c_ptr); + } else { + strcpy(defaultBgColorStr, myBgColorStr); + } + DoSetDefaultBgColor(); + + *altEditTextBgColorStr = *altEditTextHighlightColorStr = '\0'; + altEditTextBgIndex = altEditTextHighlightIndex = INVALID; + useAltEditTextBgColor = FALSE; } } *************** *** 1853,1858 **** } if (newColormapUsed) { ! struct PageRec *page_ptr; ! int saved_color_layers; for (page_ptr=firstPage; page_ptr != NULL; page_ptr=page_ptr->next) { --- 1933,1938 ---- } if (newColormapUsed) { ! struct PageRec *page_ptr=NULL; ! int saved_color_layers=FALSE, new_alloc=FALSE; for (page_ptr=firstPage; page_ptr != NULL; page_ptr=page_ptr->next) { *************** *** 1882,1885 **** --- 1962,1967 ---- colorLayers = saved_color_layers; + DoSetDefaultBgColor(); + ShowColor(TRUE); if (myFileBgColorStr != NULL) { *************** *** 1911,1914 **** --- 1993,1999 ---- } } + DoSetAltEditTextBgColor(); + DoSetAltEditTextHighlightColor(); + RecalcXorPixels(); *************** *** 1961,1964 **** --- 2046,2123 ---- } + void SetAltEditTextBgColor() + { + int new_alloc=FALSE, index=0; + char spec[MAXSTRING+1]; + + *spec = '\0'; + sprintf(gszMsgBox, "%s %s (please enter 'NONE' to remove): [current - %s]", + "Please enter the background color to be used in editing", + "existing a text object when UseAltEditTextBgColor is selected", + (altEditTextBgIndex==INVALID ? + (useAltEditTextBgColor ? myFgColorStr : myBgColorStr) : + altEditTextBgColorStr)); + if (Dialog(gszMsgBox, NULL, spec) == INVALID) return; + UtilTrimBlanks(spec); + if (*spec == '\0') return; + + if (UtilStrICmp(spec, "none") == 0) { + *altEditTextBgColorStr = '\0'; + altEditTextBgIndex = INVALID; + if (curChoice == DRAWTEXT && textCursorShown) { + RedrawCurText(); + } + return; + } + UtilStrCpyN(altEditTextBgColorStr, sizeof(altEditTextBgColorStr), spec); + if (DoSetAltEditTextBgColor()) { + if (curChoice == DRAWTEXT && textCursorShown) { + if (!useAltEditTextBgColor) { + useAltEditTextBgColor = TRUE; + UpdatePinnedMenu(MENU_PROPERTIES); + } + RedrawCurText(); + } + } + } + + void SetAltEditTextHighlightColor() + { + int new_alloc=FALSE, index=0; + char spec[MAXSTRING+1]; + + *spec = '\0'; + sprintf(gszMsgBox, "%s %s (please enter 'NONE' to remove): [current - %s]", + "Please enter the highlight color to be used in editing", + "existing a text object when UseAltEditTextBgColor is selected", + (altEditTextHighlightIndex==INVALID ? + (useAltEditTextBgColor ? myBgColorStr : myFgColorStr) : + altEditTextHighlightColorStr)); + if (Dialog(gszMsgBox, NULL, spec) == INVALID) return; + UtilTrimBlanks(spec); + if (*spec == '\0') return; + + if (UtilStrICmp(spec, "none") == 0) { + *altEditTextHighlightColorStr = '\0'; + altEditTextHighlightIndex = INVALID; + if (curChoice == DRAWTEXT && textCursorShown) { + RedrawCurText(); + } + return; + } + UtilStrCpyN(altEditTextHighlightColorStr, + sizeof(altEditTextHighlightColorStr), spec); + if (DoSetAltEditTextHighlightColor()) { + RedrawCurText(); + } + } + + void ToggleAltEditTextBgColor() + { + useAltEditTextBgColor = (!useAltEditTextBgColor); + RedrawCurText(); + UpdatePinnedMenu(MENU_PROPERTIES); + } + void SaveColors(FP) FILE *FP; *** drawing.c.orig Tue Feb 16 17:08:25 1999 --- drawing.c Tue Feb 16 17:08:25 1999 *************** *** 2348,2351 **** --- 2348,2357 ---- } else if (strcmp(name, "ChangeScrollMode()") == 0) { ChangeScrollMode(atoi(args)); + } else if (strcmp(name, "SetAltEditTextBgColor()") == 0) { + SetAltEditTextBgColor(); + } else if (strcmp(name, "SetAltEditTextHighlightColor()") == 0) { + SetAltEditTextHighlightColor(); + } else if (strcmp(name, "ToggleAltEditTextBgColor()") == 0) { + ToggleAltEditTextBgColor(); } } *** edit.c.orig Tue Feb 16 17:08:27 1999 --- edit.c Tue Feb 16 17:08:27 1999 *************** *** 3629,3637 **** } ! void RefreshPropertiesMenu(menu) TgMenu *menu; { } int PropertiesMenu(X, Y, TrackMenubar) int X, Y, TrackMenubar; --- 3629,3660 ---- } ! int RefreshPropertiesMenu(menu) TgMenu *menu; { + int ok=TRUE; + + /* UseAltEditTextBgColor */ + ok &= TgSetMenuItemCheckById(menu, CMDID_TOGGLEALTEDITTEXTBGCOLOR, + useAltEditTextBgColor); + + return ok; } + TgMenu *CreatePropertiesMenu(parent_menu, x, y, menu_info) + TgMenu *parent_menu; + int x, y; + TgMenuInfo *menu_info; + { + TgMenu *menu=TgCreateMenuFromMenuInfo(parent_menu, x, y, menu_info); + + if (menu != NULL) { + if (!RefreshPropertiesMenu(menu)) { + return TgDestroyMenu(menu, TRUE); + } + menu->refresh_proc = ((RefreshMenuFunc*)RefreshPropertiesMenu); + } + return menu; + } + int PropertiesMenu(X, Y, TrackMenubar) int X, Y, TrackMenubar; *** file.c.orig Tue Feb 16 17:08:30 1999 --- file.c Tue Feb 16 17:08:30 1999 *************** *** 831,835 **** } if (fprintf(FP, "fg_bg_colors('%s','%s').\n", ! colorMenuItems[colorIndex], myBgColorStr) == EOF) { /* * The above should use colorMenuItmes[bgColorIndex] --- 831,836 ---- } if (fprintf(FP, "fg_bg_colors('%s','%s').\n", ! colorMenuItems[colorIndex], (*defaultBgColorStr=='\0' ? ! myBgColorStr : defaultBgColorStr)) == EOF) { /* * The above should use colorMenuItmes[bgColorIndex] *************** *** 2674,2682 **** FALSE); if (bg_color_index == INVALID) { ! /* ! * Should find the color that's closest to myBgColor. ! */ } else { ! /* bgColorIndex = bg_color_index; */ } } --- 2675,2684 ---- FALSE); if (bg_color_index == INVALID) { ! fprintf(stderr, "%s: '%s'. (%s '%s' instead.)\n", ! "Fail to allocate the background color", bg_color_str, ! "Use the current default background color", defaultBgColorStr); } else { ! strcpy(defaultBgColorStr, bg_color_str); ! defaultBgColorIndex = bg_color_index; } } *** grid.c.orig Tue Feb 16 17:08:33 1999 --- grid.c Tue Feb 16 17:08:33 1999 *************** *** 677,680 **** --- 677,683 ---- } justDupped = FALSE; + if (!(curChoice==DRAWTEXT && textCursorShown)) { + ShowCurChoiceMouseStatus(curChoice); + } } *************** *** 786,797 **** MakeQuiescent(); } - SaveStatusStrings(); SetMouseStatus("Select zoom center", "Cancel", "Cancel"); if (DrawWindowLoop(&xc, &yc, magCursor, FALSE) != Button1) { - RestoreStatusStrings(); Msg("ZoomIn canceled by the user."); return; } - RestoreStatusStrings(); xc = ABS_X(xc); yc = ABS_Y(yc); --- 789,797 ---- *** menuinfo.c.orig Tue Feb 16 17:08:34 1999 --- menuinfo.c Tue Feb 16 17:08:34 1999 *************** *** 617,621 **** "Break up selected text objects into one-character text objects", NULL, CMDID_BREAKUPTEXT }, ! { "SetTextBackgroundColor", "Alt+#", "Set the background color of a text object to be the current color", NULL, CMDID_SETTEXTBACKGROUNDCOLOR }, --- 617,621 ---- "Break up selected text objects into one-character text objects", NULL, CMDID_BREAKUPTEXT }, ! { "SetTextBackgroundColor", NULL, "Set the background color of a text object to be the current color", NULL, CMDID_SETTEXTBACKGROUNDCOLOR }, *************** *** 1006,1012 **** { "SetSelFontSize...", NULL, "Change the font size of selected objects", NULL, CMDID_SETSELFONTSIZE }, - { "SetEditTextSize...", NULL, - "Set the text size to be used in editing existing text objects", NULL, - CMDID_SETEDITTEXTSIZE }, { TGMUITEM_SEPARATOR, NULL, NULL, NULL, INVALID }, { "AddColor...", NULL, "Add colors to the current palette", NULL, --- 1006,1009 ---- *************** *** 1013,1016 **** --- 1010,1026 ---- CMDID_ADDCOLOR }, { TGMUITEM_SEPARATOR, NULL, NULL, NULL, INVALID }, + { "SetEditTextSize...", NULL, + "Set the text size to be used in editing existing text objects", NULL, + CMDID_SETEDITTEXTSIZE }, + { "SetAltEditTextBgColor...", NULL, + "Set the background color to be used in editing existing text objects", + NULL, CMDID_SETALTEDITTEXTBGCOLOR }, + { "SetAltEditTextHighlightColor...", NULL, + "Set the highlight color to be used in editing existing text objects", + NULL, CMDID_SETALTEDITTEXTHIGHLIGHTCOLOR }, + { "UseAltEditTextBgColor", NULL, + "Toggles the background color to be used in editing existing text objects", + NULL, CMDID_TOGGLEALTEDITTEXTBGCOLOR }, + { TGMUITEM_SEPARATOR, NULL, NULL, NULL, INVALID }, { "Font", TGMUITEM_PINNABLESUBMENU, "Font submenu >>>", &fontMenuInfo, MENU_FONT }, *************** *** 1044,1048 **** }; TgMenuInfo propertiesMenuInfo={ TGMUTYPE_TEXT, propertiesMenuItemInfo, ! TgCreateMenuFromMenuInfo }; static TgMenuItemInfo navigateMenuItemInfo[] = { --- 1054,1058 ---- }; TgMenuInfo propertiesMenuInfo={ TGMUTYPE_TEXT, propertiesMenuItemInfo, ! CreatePropertiesMenu }; static TgMenuItemInfo navigateMenuItemInfo[] = { *** miniline.c.orig Tue Feb 16 17:08:35 1999 --- miniline.c Tue Feb 16 17:08:35 1999 *************** *** 1255,1260 **** if (!UpdateTextHighlightInfo()) return; ! XSetForeground(mainDisplay, defaultGC, myFgPixel); ! if (gstTextHighlightInfo.start_min_y == gstTextHighlightInfo.end_min_y) { int w=(gstTextHighlightInfo.end_x-gstTextHighlightInfo.start_x); --- 1255,1268 ---- if (!UpdateTextHighlightInfo()) return; ! if (useAltEditTextBgColor) { ! if (altEditTextHighlightIndex == INVALID) { ! XSetForeground(mainDisplay, defaultGC, myBgPixel); ! } else { ! XSetForeground(mainDisplay, defaultGC, ! colorPixels[altEditTextHighlightIndex]); ! } ! } else { ! XSetForeground(mainDisplay, defaultGC, myFgPixel); ! } if (gstTextHighlightInfo.start_min_y == gstTextHighlightInfo.end_min_y) { int w=(gstTextHighlightInfo.end_x-gstTextHighlightInfo.start_x); *************** *** 1302,1305 **** --- 1310,1314 ---- start_x, min_y, end_x-start_x, max_y-min_y); } + XSetForeground(mainDisplay, defaultGC, myFgPixel); } *************** *** 1350,1353 **** --- 1359,1373 ---- */ { + int inv_pixel=myBgPixel; + + if (useAltEditTextBgColor) { + if (altEditTextBgIndex == INVALID) { + inv_pixel = myFgPixel; + } else { + inv_pixel = colorPixels[altEditTextBgIndex]; + } + } else { + inv_pixel = myBgPixel; + } if (mode & PAINT) { switch (mode) { *************** *** 1357,1361 **** break; case PAINT_INV: ! XSetForeground(dpy, gc, myBgPixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, len); break; --- 1377,1381 ---- break; case PAINT_INV: ! XSetForeground(dpy, gc, inv_pixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, len); break; *************** *** 1364,1368 **** MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, first_index); x += MyTextWidth(canvasFontPtr, buf, first_index); ! XSetForeground(dpy, gc, myBgPixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, &buf[first_index], len-first_index); --- 1384,1388 ---- MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, first_index); x += MyTextWidth(canvasFontPtr, buf, first_index); ! XSetForeground(dpy, gc, inv_pixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, &buf[first_index], len-first_index); *************** *** 1369,1373 **** break; case PAINT_INV_NORM: ! XSetForeground(dpy, gc, myBgPixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, first_index); x += MyTextWidth(canvasFontPtr, buf, first_index); --- 1389,1393 ---- break; case PAINT_INV_NORM: ! XSetForeground(dpy, gc, inv_pixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, first_index); x += MyTextWidth(canvasFontPtr, buf, first_index); *************** *** 1380,1384 **** MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, first_index); x += MyTextWidth(canvasFontPtr, buf, first_index); ! XSetForeground(dpy, gc, myBgPixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, &buf[first_index], second_index-first_index); --- 1400,1404 ---- MyDrawString(dpy, d, gc, depth, x, baseline_y, buf, first_index); x += MyTextWidth(canvasFontPtr, buf, first_index); ! XSetForeground(dpy, gc, inv_pixel); MyDrawString(dpy, d, gc, depth, x, baseline_y, &buf[first_index], second_index-first_index); *************** *** 1598,1610 **** void RedrawCurText() { if (!textCursorShown) return; GetCurTextBBoxes(NULL, &curTextBBox); ! XClearArea(mainDisplay, drawWindow, curTextBBox.ltx-2, curTextBBox.lty-2, ! curTextBBox.rbx-curTextBBox.ltx+5, curTextBBox.rby-curTextBBox.lty+5, ! FALSE); ! XDrawRectangle(mainDisplay, drawWindow, defaultGC, curTextBBox.ltx-2, ! curTextBBox.lty-2, curTextBBox.rbx-curTextBBox.ltx+4, ! curTextBBox.rby-curTextBBox.lty+4); PaintCurText(); PutTextCursor(); --- 1618,1653 ---- void RedrawCurText() { + int x=0, y=0, w=0, h=0; + if (!textCursorShown) return; GetCurTextBBoxes(NULL, &curTextBBox); ! x = curTextBBox.ltx-2; ! y = curTextBBox.lty-2; ! w = curTextBBox.rbx-curTextBBox.ltx+4; ! h = curTextBBox.rby-curTextBBox.lty+4; ! ! if (useAltEditTextBgColor) { ! if (altEditTextBgIndex == INVALID) { ! XFillRectangle(mainDisplay, drawWindow, defaultGC, x, y, w, h); ! } else { ! XSetForeground(mainDisplay, defaultGC, ! colorPixels[altEditTextBgIndex]); ! XFillRectangle(mainDisplay, drawWindow, defaultGC, x, y, w, h); ! XSetForeground(mainDisplay, defaultGC, myFgPixel); ! } ! } else { ! int fill=curTextObj->detail.t->fill; ! int color_index=curTextObj->color; ! ! if (fill != NONEPAT && fill != BACKPAT && curTextObj->color < maxColors) { ! XSetForeground(mainDisplay, defaultGC, colorPixels[color_index]); ! XFillRectangle(mainDisplay, drawWindow, defaultGC, x, y, w, h); ! XSetForeground(mainDisplay, defaultGC, myFgPixel); ! } else { ! XClearArea(mainDisplay, drawWindow, x, y, w+1, h+1, FALSE); ! } ! } ! XDrawRectangle(mainDisplay, drawWindow, defaultGC, x, y, w, h); PaintCurText(); PutTextCursor(); *** shortcut.c.orig Tue Feb 16 17:08:40 1999 --- shortcut.c Tue Feb 16 17:08:40 1999 *************** *** 355,358 **** --- 355,362 ---- { '\0', 0, "ToggleVisibleGridInSlideShow()",0,CMDID_VISIBLEGRIDINSLIDESHOW }, { '\0', 0, "ChangeScrollMode()", 0, CMDID_CHANGESCROLLMODE }, + { '\0', 0, "SetAltEditTextBgColor()", 0, CMDID_SETALTEDITTEXTBGCOLOR }, + { '\0', 0, "SetAltEditTextHighlightColor()", 0, + CMDID_SETALTEDITTEXTHIGHLIGHTCOLOR }, + { '\0', 0, "ToggleAltEditTextBgColor()", 0, CMDID_TOGGLEALTEDITTEXTBGCOLOR }, { '\0', 0, "", 0, 0 } }; *** stream.c.orig Tue Feb 16 17:08:41 1999 --- stream.c Tue Feb 16 17:08:41 1999 *************** *** 44,47 **** --- 44,48 ---- #include "move.e" #include "msg.e" + #include "navigate.e" #include "obj.e" #include "remote.e" *************** *** 576,579 **** --- 577,581 ---- } if (*spec != '\0') { + if (!navigatingBackAndForth) BeforeNavigate(); ClearFileInfo(FALSE); RedrawTitleWindow(); *** text.c.orig Tue Feb 16 17:08:42 1999 --- text.c Tue Feb 16 17:08:42 1999 *************** *** 448,452 **** curTextObj->rotation = 0; curTextObj->locked = FALSE; ! curTextObj->detail.t = text_ptr; curTextObj->fattr = curTextObj->lattr = NULL; --- 448,454 ---- curTextObj->rotation = 0; curTextObj->locked = FALSE; ! if (defaultBgColorIndex != INVALID) { ! curTextObj->color = defaultBgColorIndex; ! } curTextObj->detail.t = text_ptr; curTextObj->fattr = curTextObj->lattr = NULL; *** color.e.orig Tue Feb 16 17:08:45 1999 --- color.e Tue Feb 16 17:08:45 1999 *************** *** 57,60 **** --- 57,69 ---- extern int gnUpdatePixelObjCount; + extern char defaultBgColorStr[]; + extern int defaultBgColorIndex; + + extern char altEditTextBgColorStr[]; + extern int altEditTextBgIndex; + extern char altEditTextHighlightColorStr[]; + extern int altEditTextHighlightIndex; + extern int useAltEditTextBgColor; + #ifdef _INCLUDE_FROM_COLOR_C_ #undef extern *************** *** 89,92 **** --- 98,104 ---- extern int FlushColormap ARGS_DECL((void)); extern void AddColor ARGS_DECL((void)); + extern void SetAltEditTextBgColor ARGS_DECL((void)); + extern void SetAltEditTextHighlightColor ARGS_DECL((void)); + extern void ToggleAltEditTextBgColor ARGS_DECL((void)); extern void SaveColors ARGS_DECL((FILE*)); extern int ReadColors ARGS_DECL((FILE*, char*)); *** edit.e.orig Tue Feb 16 17:08:46 1999 --- edit.e Tue Feb 16 17:08:46 1999 *************** *** 76,80 **** extern void RefreshArrangeMenu ARGS_DECL((TgMenu*)); extern int ArrangeMenu ARGS_DECL((int X, int Y, int TrackMenubar)); ! extern void RefreshPropertiesMenu ARGS_DECL((TgMenu*)); extern int PropertiesMenu ARGS_DECL((int X, int Y, int TrackMenubar)); extern void UpdateSymbols ARGS_DECL((void)); --- 76,82 ---- extern void RefreshArrangeMenu ARGS_DECL((TgMenu*)); extern int ArrangeMenu ARGS_DECL((int X, int Y, int TrackMenubar)); ! extern int RefreshPropertiesMenu ARGS_DECL((TgMenu*)); ! extern TgMenu *CreatePropertiesMenu ARGS_DECL((TgMenu*, int X, int Y, ! TgMenuInfo*)); extern int PropertiesMenu ARGS_DECL((int X, int Y, int TrackMenubar)); extern void UpdateSymbols ARGS_DECL((void)); *** cmdids.h.orig Tue Feb 16 17:08:47 1999 --- cmdids.h Tue Feb 16 17:08:47 1999 *************** *** 351,355 **** #define CMDID_CHANGESCROLLMODE 399 ! #define MAXCMDIDS 400 #endif /*_CMDIDS_H_*/ --- 351,359 ---- #define CMDID_CHANGESCROLLMODE 399 ! #define CMDID_SETALTEDITTEXTBGCOLOR 400 ! #define CMDID_SETALTEDITTEXTHIGHLIGHTCOLOR 401 ! #define CMDID_TOGGLEALTEDITTEXTBGCOLOR 402 + #define MAXCMDIDS 403 + #endif /*_CMDIDS_H_*/ *** const.h.orig Tue Feb 16 17:08:48 1999 --- const.h Tue Feb 16 17:08:48 1999 *************** *** 191,194 **** --- 191,196 ---- #define MAXPATHLENGTH 256 + #define COLORSTRLEN 80 + /* geometry stuff */ *** patchlvl.h.orig Tue Feb 16 17:08:49 1999 --- patchlvl.h Tue Feb 16 17:08:49 1999 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 14 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 15 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig Tue Feb 16 17:08:51 1999 --- Imakefile Tue Feb 16 17:08:51 1999 *************** *** 53,57 **** $(MOREDEFINES) ! TGIFVERSION = 4.0.14 XCOMM Things to try to add to the DEFINES line above: --- 53,57 ---- $(MOREDEFINES) ! TGIFVERSION = 4.0.15 XCOMM Things to try to add to the DEFINES line above: *** tgif.man.orig Tue Feb 16 17:08:52 1999 --- tgif.man Tue Feb 16 17:08:52 1999 *************** *** 9,13 **** .\" .\" ! .TH TGIF n "Version 4.0 Patchlevel 14 and Above" "Tgif" .\" .SH NAME --- 9,13 ---- .\" .\" ! .TH TGIF n "Version 4.0 Patchlevel 15 and Above" "Tgif" .\" .SH NAME *************** *** 4041,4044 **** --- 4041,4048 ---- This specifies the color to be used for the shadow of buttons, menus, etc. The default is gray50. + .TP + .I Tgif.DefaultObjectBackground: COLORSTRING + This specifies the color to be used for the background of objects. + By default, the default background color is used. .\" .SH ENVIRONMENT VARIABLE *** HISTORY.orig Tue Feb 16 17:08:55 1999 --- HISTORY Tue Feb 16 17:08:55 1999 *************** *** 1,2 **** --- 1,14 ---- + -----------------------> tgif-4.0.14 => tgif-4.0.15 <----------------------- + Here's a short list of added features/bug fixes. + + 1) Fix the default background color for new text objects. Used to be + that the first color is used. Now the background color of tgif is + used as the default background color for text objects. + 2) Add SetAltEditTextBgColor(), SetAltEditTextHighlightColor() and + UseAltEditTextBgColor() under the Properties Menu so that an alternate + background and highlight color can be used when editing/creating text + objects. Thanks to Ralphe Neill for + the suggestion. + -----------------------> tgif-4.0.13 => tgif-4.0.14 <----------------------- Here's a short list of added features/bug fixes. *** tgif.Xdefaults.orig Tue Feb 16 17:08:56 1999 --- tgif.Xdefaults Tue Feb 16 17:08:56 1999 *************** *** 395,396 **** --- 395,397 ---- Tgif.LightGrayColor: gray75 Tgif.DarkGrayColor: gray50 + !Tgif.DefaultObjectBackground: white