*** align.c.orig Thu Oct 31 01:44:17 1996 --- align.c Thu Oct 31 01:44:17 1996 *************** *** 59,62 **** --- 59,63 ---- #include "poly.e" #include "raster.e" + #include "rect.e" #include "select.e" #include "setup.e" *** arc.c.orig Thu Oct 31 01:44:20 1996 --- arc.c Thu Oct 31 01:44:20 1996 *************** *** 64,67 **** --- 64,68 ---- #include "ps.e" #include "raster.e" + #include "rect.e" #include "ruler.e" #include "select.e" *************** *** 72,75 **** --- 73,78 ---- #include "xpixmap.e" + extern int atoi ARGS_DECL((char*)); + #define EXPAND_BBOX(bbox,x,y) \ if ((x)<(bbox)->ltx) (bbox)->ltx=(x); if ((y)<(bbox)->lty) (bbox)->lty=(y); \ *************** *** 270,274 **** { struct ArcRec *arc_ptr=obj_ptr->detail.a; ! int i, style=arc_ptr->style, a_angle1, a_angle2, angle90, angle360; int x1, y1, x2, y2, int_dx, int_dy, x, y, angle1, angle2, dir, w, h, aw, ah; double dx, dy, angle_in_radian, theta1, theta2; --- 273,277 ---- { struct ArcRec *arc_ptr=obj_ptr->detail.a; ! int style=arc_ptr->style, a_angle1, a_angle2, angle90, angle360; int x1, y1, x2, y2, int_dx, int_dy, x, y, angle1, angle2, dir, w, h, aw, ah; double dx, dy, angle_in_radian, theta1, theta2; *************** *** 1044,1051 **** { struct ArcRec *arc_ptr=ObjPtr->detail.a; ! XPoint *sv=NULL; ! IntPoint *pv, *cntrlv=NULL, tmp_vs[25]; struct BBRec obbox; ! int i, cx, cy, v_index, cur_index, angle, a_angle1, a_angle2; double hw, hh; /* half w and half h */ --- 1047,1053 ---- { struct ArcRec *arc_ptr=ObjPtr->detail.a; ! IntPoint tmp_vs[25]; struct BBRec obbox; ! int i, cx, cy, a_angle1, a_angle2; double hw, hh; /* half w and half h */ *************** *** 1599,1602 **** --- 1601,1611 ---- int xc, yc, x1, y1, x2, y2, dir, angle1, angle2; int invisible=FALSE, transformed=FALSE; + #ifdef _TGIF_WB + + char aux[10000]; + + strcpy(aux,Inbuf); + + #endif /* _TGIF_WB */ *ObjPtr = NULL; *************** *** 1908,1912 **** --- 1917,1931 ---- struct XfrmMtrxRec *ctm; + #ifdef _TGIF_WB + + s = FindChar ((int)'[', aux); + s++; + + #else /* ~_TGIF_WB */ + fgets(inbuf, MAXSTRING, FP); + + #endif /* _TGIF_WB */ + scanLineNum++; InitScan(inbuf, "\t\n, "); *** attr.c.orig Thu Oct 31 01:44:22 1996 --- attr.c Thu Oct 31 01:44:22 1996 *************** *** 209,212 **** --- 209,213 ---- } UpdTextBBox (AttrPtr->obj); + AdjObjCache (AttrPtr->obj); } *************** *** 576,580 **** { struct ObjRec * TextObj; ! char * s, * line, * c_ptr; char * name, * value; int len, shown, nameshown, inherited; --- 577,581 ---- { struct ObjRec * TextObj; ! char * s, * line; char * name, * value; int len, shown, nameshown, inherited; *************** *** 1700,1704 **** } - static XComposeStatus c_stat; static DspList * fileAttrNameDspPtr=NULL; --- 1701,1704 ---- *** auxtext.c.orig Thu Oct 31 01:44:24 1996 --- auxtext.c Thu Oct 31 01:44:24 1996 *************** *** 48,51 **** --- 48,52 ---- #include "cursor.e" #include "dialog.e" + #include "drawing.e" #include "file.e" #include "font.e" *************** *** 485,488 **** --- 486,492 ---- ObjPtr->detail.t->max_rextra = max_rextra; + SetTextOrigBBoxes (ObjPtr, textJust, max_len, + num_lines*textCursorH+(num_lines-1)*textVSpace, + min_lbearing, max_rextra, ObjPtr->detail.t->rotate); SetTextBBox (ObjPtr, textJust, max_len, num_lines*textCursorH+(num_lines-1)*textVSpace, *************** *** 1529,1533 **** struct ObjRec *obj_ptr; struct TextRec *text_ptr; ! int num_lines=0, len, max_len=0, min_lbearing=0, max_rextra=0; text_ptr = (struct TextRec *)malloc(sizeof(struct TextRec)); --- 1533,1537 ---- struct ObjRec *obj_ptr; struct TextRec *text_ptr; ! int num_lines=0, max_len=0, min_lbearing=0, max_rextra=0; text_ptr = (struct TextRec *)malloc(sizeof(struct TextRec)); *** box.c.orig Thu Oct 31 01:44:26 1996 --- box.c Thu Oct 31 01:44:26 1996 *************** *** 59,62 **** --- 59,63 ---- #include "ps.e" #include "raster.e" + #include "rect.e" #include "ruler.e" #include "select.e" *************** *** 585,588 **** --- 586,596 ---- int new_alloc, rotation, locked=FALSE; int transformed=FALSE, invisible=FALSE; + #ifdef _TGIF_WB + + char aux[10000]; + + strcpy(aux,Inbuf); + + #endif /* _TGIF_WB */ *ObjPtr = NULL; *************** *** 799,803 **** --- 807,821 ---- struct XfrmMtrxRec *ctm; + #ifdef _TGIF_WB + + s = FindChar ((int)'[', aux); + s++; + + #else /* ~_TGIF_WB */ + fgets(inbuf, MAXSTRING, FP); + + #endif /* _TGIF_WB */ + scanLineNum++; InitScan(inbuf, "\t\n, "); *** choice.c.orig Thu Oct 31 01:44:27 1996 --- choice.c Thu Oct 31 01:44:27 1996 *************** *** 66,69 **** --- 66,70 ---- #include "raster.e" #include "rcbox.e" + #include "rect.e" #include "select.e" #include "setup.e" *************** *** 72,75 **** --- 73,77 ---- #include "stretch.e" #include "text.e" + #include "util.e" #include "xbitmap.e" *** choose.c.orig Thu Oct 31 01:44:30 1996 --- choose.c Thu Oct 31 01:44:30 1996 *************** *** 75,78 **** --- 75,79 ---- #include "types.h" + #include "auxtext.e" #include "button.e" #ifndef _NO_EXTERN *************** *** 89,92 **** --- 90,95 ---- #include "names.e" #include "raster.e" + #include "rect.e" + #include "remote.e" #include "setup.e" #include "util.e" *************** *** 529,533 **** { struct NamesRec *pni=(&namesInfo); ! int x, y, base_win_x, base_win_y; XWMHints wmhints; XSizeHints sizehints; --- 532,536 ---- { struct NamesRec *pni=(&namesInfo); ! int y, base_win_x, base_win_y; XWMHints wmhints; XSizeHints sizehints; *************** *** 1314,1318 **** static ! int KeyPressInNames(key_ev, pn_changing, pn_selected_btn_index) XKeyEvent *key_ev; int *pn_changing, *pn_selected_btn_index; --- 1317,1321 ---- static ! void KeyPressInNames(key_ev, pn_changing, pn_selected_btn_index) XKeyEvent *key_ev; int *pn_changing, *pn_selected_btn_index; *************** *** 1471,1475 **** void NamesSetDefaultBtnId(def_btn_id, double_click_btn_id) ! int def_btn_id; { struct NamesRec *pni=(&namesInfo); --- 1474,1478 ---- void NamesSetDefaultBtnId(def_btn_id, double_click_btn_id) ! int def_btn_id, double_click_btn_id; { struct NamesRec *pni=(&namesInfo); *************** *** 1544,1548 **** { struct NamesRec *pni=(&namesInfo); - int i; if (pni->faking_dot_dot) { --- 1547,1550 ---- *************** *** 1616,1620 **** { struct NamesRec *pni=(&namesInfo); ! int index=INVALID, looping=TRUE, selected_btn_index=INVALID; if (selected_str != NULL) *selected_str = '\0'; --- 1618,1622 ---- { struct NamesRec *pni=(&namesInfo); ! int looping=TRUE, selected_btn_index=INVALID; if (selected_str != NULL) *selected_str = '\0'; *** cmd.c.orig Thu Oct 31 01:44:32 1996 --- cmd.c Thu Oct 31 01:44:32 1996 *************** *** 33,37 **** #endif #include #include #include "const.h" --- 33,38 ---- #endif #include + #include #include #include "const.h" *************** *** 48,51 **** --- 49,53 ---- #include "dup.e" #include "imgproc.e" + #include "mainmenu.e" #include "mark.e" #include "move.e" *************** *** 533,546 **** struct CmdRec *cmd_ptr; struct SelRec *sel_ptr; switch (CmdPtr->type) { case CMD_COMPOSITE: for (cmd_ptr=CmdPtr->first; cmd_ptr!=NULL; cmd_ptr=cmd_ptr->next) { ! UpdatePixelInACmd(cmd_ptr, old_color_str); } break; case CMD_NEW: for (sel_ptr=CmdPtr->top_after; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! UpdatePixel(sel_ptr->obj, old_color_str); } break; --- 535,549 ---- struct CmdRec *cmd_ptr; struct SelRec *sel_ptr; + int changed=FALSE; switch (CmdPtr->type) { case CMD_COMPOSITE: for (cmd_ptr=CmdPtr->first; cmd_ptr!=NULL; cmd_ptr=cmd_ptr->next) { ! if (UpdatePixelInACmd(cmd_ptr, old_color_str)) changed = TRUE; } break; case CMD_NEW: for (sel_ptr=CmdPtr->top_after; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! if (UpdatePixel(sel_ptr->obj, old_color_str)) changed = TRUE; } break; *************** *** 550,554 **** case CMD_REPLACE: for (sel_ptr=CmdPtr->top_after; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! UpdatePixel(sel_ptr->obj, old_color_str); } break; --- 553,557 ---- case CMD_REPLACE: for (sel_ptr=CmdPtr->top_after; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! if (UpdatePixel(sel_ptr->obj, old_color_str)) changed = TRUE; } break; *************** *** 556,567 **** case CMD_MANY_TO_ONE: for (sel_ptr=CmdPtr->top_before; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! UpdatePixel(sel_ptr->obj, old_color_str); } for (sel_ptr=CmdPtr->top_after; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! UpdatePixel(sel_ptr->obj, old_color_str); } break; case CMD_GOTO_PAGE: break; } } --- 559,571 ---- case CMD_MANY_TO_ONE: for (sel_ptr=CmdPtr->top_before; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! if (UpdatePixel(sel_ptr->obj, old_color_str)) changed = TRUE; } for (sel_ptr=CmdPtr->top_after; sel_ptr!=NULL; sel_ptr=sel_ptr->next) { ! if (UpdatePixel(sel_ptr->obj, old_color_str)) changed = TRUE; } break; case CMD_GOTO_PAGE: break; } + return changed; } *** color.c.orig Thu Oct 31 01:44:33 1996 --- color.c Thu Oct 31 01:44:34 1996 *************** *** 52,55 **** --- 52,56 ---- #include "imgproc.e" #include "mainloop.e" + #include "mainmenu.e" #include "mark.e" #include "menu.e" *************** *** 74,78 **** #define MAX_VERTICAL_BTNS 6 ! int maxColors = MAXCOLORS; int defaultColorIndex = 9; int colorIndex = 0; --- 75,79 ---- #define MAX_VERTICAL_BTNS 6 ! int maxColors = 0; int defaultColorIndex = 9; int colorIndex = 0; *************** *** 316,320 **** free(fname); } ! printUsingRequestedColor = FALSE; if ((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"PrintUsingRequestedColor")) != NULL && (strcmp(c_ptr, "true") == 0 || strcmp(c_ptr, "True") == 0)) { --- 317,321 ---- free(fname); } ! printUsingRequestedColor = cmdLineRequestedColor; if ((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"PrintUsingRequestedColor")) != NULL && (strcmp(c_ptr, "true") == 0 || strcmp(c_ptr, "True") == 0)) { *************** *** 749,752 **** --- 750,815 ---- } + static + int DrawAVerticalTab(color_index, x, y, skip) + int color_index, x, y, skip; + { + XPoint v[5]; + int offset; + + if (skip) return colorItemH; + + offset = ((colorItemH-7)>>1); + v[0].x = v[4].x = x; v[0].y = v[4].y = y; + v[1].x = x+scrollBarW; v[1].y = y; + v[2].x = x+scrollBarW; v[2].y = y+colorItemH; + v[3].x = x; v[3].y = y+colorItemH; + + XSetForeground(mainDisplay, defaultGC, colorPixels[color_index]); + XFillPolygon(mainDisplay, colorWindow, defaultGC, v, 5, Convex, + CoordModeOrigin); + XSetForeground(mainDisplay, defaultGC, myBgPixel); + XFillRectangle(mainDisplay, colorWindow, defaultGC, x+offset, y+offset, + 7, 7); + XSetForeground(mainDisplay, defaultGC, myFgPixel); + XDrawRectangle(mainDisplay, colorWindow, defaultGC, x+offset, y+offset, + 7, 7); + if (colorLayerOn[color_index]) { + XDrawLine(mainDisplay, colorWindow, defaultGC, x+offset, y+offset, + x+offset+7, y+offset+7); + XDrawLine(mainDisplay, colorWindow, defaultGC, x+offset, + y+offset+7, x+offset+7, y+offset); + } + XDrawRectangle(mainDisplay, colorWindow, defaultGC, x, y, + scrollBarW, colorItemH); + return colorItemH; + } + + void RedrawColorWindow() + { + int i, x=0, y; + + needToRedrawColorWindow = FALSE; + if (!colorLayers || colorWindow == None) return; + + XClearArea(mainDisplay, colorWindow, 0, 0, scrollBarW, colorWindowH, FALSE); + + y = (scrollBarW*MAX_VERTICAL_BTNS); + for (i=0; i < maxColors; i++) { + if (i >= colorWindowFirstIndex) { + int h=0; + + h = DrawAVerticalTab(i, x, y, FALSE); + y += h; + } + } + for (i=0, y=0; i < MAX_VERTICAL_BTNS; i++, y += scrollBarW) { + XSetTSOrigin(mainDisplay, rasterGC, 0, y); + XSetStipple(mainDisplay, rasterGC, scrollPixmap[i+4]); + XFillRectangle(mainDisplay, colorWindow, rasterGC, + 0, y, scrollBarW, scrollBarW); + } + XSetTSOrigin(mainDisplay, rasterGC, 0, 0); + } + int OneColorObject (ObjPtr, ColorIndex) struct ObjRec * ObjPtr; *************** *** 1170,1184 **** } if (colorLayerOn != NULL) free(colorLayerOn); ! free(colorPixels); ! free(xorColorPixels); colorLayerOn = colorPixels = xorColorPixels = NULL; ! free(tgifColors); ! free(tgifRequestedColors); tgifColors = tgifRequestedColors = NULL; ! for (i = 0; i < maxColors; i++) free(colorMenuItems[i]); ! free(colorMenuItems); colorMenuItems = NULL; ! maxColors = MAXCOLORS; defaultColorIndex = 9; colorIndex = 0; --- 1233,1253 ---- } if (colorLayerOn != NULL) free(colorLayerOn); ! if (colorPixels != NULL) free(colorPixels); ! if (xorColorPixels != NULL) free(xorColorPixels); colorLayerOn = colorPixels = xorColorPixels = NULL; ! ! if (tgifColors != NULL) free(tgifColors); ! if (tgifRequestedColors != NULL) free(tgifRequestedColors); tgifColors = tgifRequestedColors = NULL; ! ! if (colorMenuItems != NULL) { ! for (i = 0; i < maxColors; i++) { ! if (colorMenuItems[i] != NULL) free(colorMenuItems[i]); ! } ! free(colorMenuItems); ! } colorMenuItems = NULL; ! maxColors = 0; defaultColorIndex = 9; colorIndex = 0; *************** *** 1186,1253 **** static - int DrawAVerticalTab(color_index, x, y, skip) - int color_index, x, y, skip; - { - char s[20]; - XPoint v[5]; - int offset; - - if (skip) return colorItemH; - - offset = ((colorItemH-7)>>1); - v[0].x = v[4].x = x; v[0].y = v[4].y = y; - v[1].x = x+scrollBarW; v[1].y = y; - v[2].x = x+scrollBarW; v[2].y = y+colorItemH; - v[3].x = x; v[3].y = y+colorItemH; - - XSetForeground(mainDisplay, defaultGC, colorPixels[color_index]); - XFillPolygon(mainDisplay, colorWindow, defaultGC, v, 5, Convex, - CoordModeOrigin); - XSetForeground(mainDisplay, defaultGC, myBgPixel); - XFillRectangle(mainDisplay, colorWindow, defaultGC, x+offset, y+offset, - 7, 7); - XSetForeground(mainDisplay, defaultGC, myFgPixel); - XDrawRectangle(mainDisplay, colorWindow, defaultGC, x+offset, y+offset, - 7, 7); - if (colorLayerOn[color_index]) { - XDrawLine(mainDisplay, colorWindow, defaultGC, x+offset, y+offset, - x+offset+7, y+offset+7); - XDrawLine(mainDisplay, colorWindow, defaultGC, x+offset, - y+offset+7, x+offset+7, y+offset); - } - XDrawRectangle(mainDisplay, colorWindow, defaultGC, x, y, - scrollBarW, colorItemH); - return colorItemH; - } - - void RedrawColorWindow() - { - int i, x=0, y; - char s[20]; - - needToRedrawColorWindow = FALSE; - if (!colorLayers || colorWindow == None) return; - - XClearArea(mainDisplay, colorWindow, 0, 0, scrollBarW, colorWindowH, FALSE); - - y = (scrollBarW*MAX_VERTICAL_BTNS); - for (i=0; i < maxColors; i++) { - if (i >= colorWindowFirstIndex) { - int h=0; - - h = DrawAVerticalTab(i, x, y, FALSE); - y += h; - } - } - for (i=0, y=0; i < MAX_VERTICAL_BTNS; i++, y += scrollBarW) { - XSetTSOrigin(mainDisplay, rasterGC, 0, y); - XSetStipple(mainDisplay, rasterGC, scrollPixmap[i+4]); - XFillRectangle(mainDisplay, colorWindow, rasterGC, - 0, y, scrollBarW, scrollBarW); - } - XSetTSOrigin(mainDisplay, rasterGC, 0, 0); - } - - static void SetAllColorLayersState(on_state) int on_state; --- 1255,1258 ---- *************** *** 1275,1279 **** XButtonEvent *button_ev; { ! int i, index, total, x, offset; index = (int)((button_ev->y-1) / scrollBarW); --- 1280,1284 ---- XButtonEvent *button_ev; { ! int i, index, total, offset; index = (int)((button_ev->y-1) / scrollBarW); *************** *** 1399,1403 **** XMotionEvent *motion_ev; { ! int i, index, total, x, offset; index = (int)((motion_ev->y-1) / scrollBarW); --- 1404,1408 ---- XMotionEvent *motion_ev; { ! int i, index, offset; index = (int)((motion_ev->y-1) / scrollBarW); *************** *** 1752,1755 **** --- 1757,1885 ---- } } + } + + void SaveColors(FP) + FILE *FP; + { + int i; + + if (fprintf(FP, "color_info(%1d,%1d,%1d,[\n", maxColors, maxRGB, + colorLayers) == EOF) { + writeFileFailed = TRUE; + } + for (i=0; i < maxColors; i++) { + if (i == maxColors-1) { + if (fprintf(FP, "\t\"%s\", %1d, %1d, %1d, %1d, %1d, %1d, %1d\n", + colorMenuItems[i], + (int)(tgifColors[i].red), (int)(tgifColors[i].green), + (int)(tgifColors[i].blue), (int)(tgifRequestedColors[i].red), + (int)(tgifRequestedColors[i].green), + (int)(tgifRequestedColors[i].blue), + colorLayerOn==NULL ? 1 : colorLayerOn[i]) == EOF) { + writeFileFailed = TRUE; + } + } else { + if (fprintf(FP, "\t\"%s\", %1d, %1d, %1d, %1d, %1d, %1d, %1d,\n", + colorMenuItems[i], + (int)(tgifColors[i].red), (int)(tgifColors[i].green), + (int)(tgifColors[i].blue), (int)(tgifRequestedColors[i].red), + (int)(tgifRequestedColors[i].green), + (int)(tgifRequestedColors[i].blue), + colorLayerOn==NULL ? 1 : colorLayerOn[i]) == EOF) { + writeFileFailed = TRUE; + } + } + } + if (fprintf(FP, "]).\n") == EOF) { + writeFileFailed = TRUE; + } + } + + #define GETVALUE(val,name) ScanValue("%d", &(val), name, "color_info") + #define GETSTRNG(val,name) ScanValue("%s", (val), name, "color_info") + + int ReadColors(FP, Inbuf) + FILE *FP; + char *Inbuf; + { + char *c_ptr, *line; + int index=0, max_colors=0, max_rgb=0, color_layers=FALSE; + + c_ptr = FindChar((int)'(', Inbuf); + InitScan(c_ptr, "\t\n, "); + if (GETVALUE(max_colors, "maxColors") == INVALID || + GETVALUE(max_rgb, "maxRGB") == INVALID || + GETVALUE(color_layers, "colorLayers") == INVALID) { + return FALSE; + } + if (PRTGIF && cmdLineColor) { + CleanUpColors(); + maxColors = max_colors; + maxRGB = max_rgb; + /* colorLayers = color_layers; */ + colorMenuItems = (char**)malloc(maxColors*sizeof(char*)); + tgifColors = (XColor*)malloc(maxColors*sizeof(XColor)); + if (colorMenuItems == NULL || tgifColors == NULL) FailAllocMessage(); + memset(colorMenuItems, 0, maxColors*sizeof(char*)); + memset(tgifColors, 0, maxColors*sizeof(XColor)); + for (index=0; index < maxColors; index++) { + colorMenuItems[index] = (char*)malloc(COLORSTRLEN*sizeof(char)); + if (colorMenuItems[index] == NULL) FailAllocMessage(); + *colorMenuItems[index] = '\0'; + } + } + if (!PRTGIF && !importingFile) { + colorLayers = color_layers; + } + index = 0; + while ((line=UtilGetALine(FP)) != NULL) { + char color_s[40]; + int red=0, green=0, blue=0; + int requested_red=0, requested_green=0, requested_blue=0, layer_on=FALSE; + + scanLineNum++; + if (*line == ']') break; + + if (PRTGIF && cmdLineColor && index >= maxColors) { + fprintf(stderr, "Warning: too many lines in color_info.\n"); + break; + } + c_ptr = FindChar((int)'"', line); + c_ptr = ParseStr(c_ptr, (int)'"', color_s, sizeof(color_s)); + InitScan(c_ptr, "\t\n, "); + if (GETVALUE(red, "red") == INVALID || + GETVALUE(green, "green") == INVALID || + GETVALUE(blue, "blue") == INVALID || + GETVALUE(requested_red, "requested_red") == INVALID || + GETVALUE(requested_green, "requested_green") == INVALID || + GETVALUE(requested_blue, "requested_blue") == INVALID || + GETVALUE(layer_on, "layer_on") == INVALID) { + return FALSE; + } + if (PRTGIF && cmdLineColor) { + UtilStrCpy(colorMenuItems[index], COLORSTRLEN*sizeof(char), color_s); + if (cmdLineRequestedColor) { + tgifColors[index].red = red; + tgifColors[index].green = green; + tgifColors[index].blue = blue; + } else { + tgifColors[index].red = requested_red; + tgifColors[index].green = requested_green; + tgifColors[index].blue = requested_blue; + } + index++; + } + if (!PRTGIF && !importingFile) { + int new_alloc=FALSE; + int cur_index=QuickFindColorIndex(NULL, color_s, &new_alloc, TRUE); + + if (cur_index != INVALID && cur_index < maxColors && + colorLayerOn != NULL) { + colorLayerOn[cur_index] = layer_on; + } + } + free(line); + } + return TRUE; } *** cursor.c.orig Thu Oct 31 01:44:35 1996 --- cursor.c Thu Oct 31 01:44:35 1996 *************** *** 361,365 **** void CreateCursor() { ! int i, j; XGCValues values; XColor color, fg_color, bg_color; --- 361,365 ---- void CreateCursor() { ! int i; XGCValues values; XColor color, fg_color, bg_color; *** cutpaste.c.orig Thu Oct 31 01:44:37 1996 --- cutpaste.c Thu Oct 31 01:44:37 1996 *************** *** 33,39 **** #endif #include #include - #include #include #include "const.h" --- 33,40 ---- #endif + #include + #include #include #include #include #include "const.h" *** dialog.c.orig Thu Oct 31 01:44:38 1996 --- dialog.c Thu Oct 31 01:44:38 1996 *************** *** 54,61 **** --- 54,63 ---- #include "file.e" #include "font.e" + #include "grid.e" #include "mainloop.e" #include "mainmenu.e" #include "msg.e" #include "raster.e" + #include "ruler.e" #include "setup.e" #include "text.e" *************** *** 1336,1339 **** --- 1338,1342 ---- if (real_msg == NULL) { FailAllocMessage(); + if (info_bits) { } /* do nothing but reference the variable */ return INVALID; } *** drawing.c.orig Thu Oct 31 01:44:40 1996 --- drawing.c Thu Oct 31 01:44:40 1996 *************** *** 68,71 **** --- 68,72 ---- #include "grid.e" #include "group.e" + #include "help.e" #include "imgproc.e" #include "import.e" *************** *** 353,356 **** --- 354,358 ---- HideInterrupt(); } + if (intr_bits && trek_bits) { } /* do nothing but reference the variable */ } *************** *** 1732,1735 **** --- 1734,1739 ---- } else if (strcmp(name, "Copyright()") == 0) { Copyright(); + } else if (strcmp(name, "SetSelFontSize()") == 0) { + SetSelectedFontSize(); } } *** dup.c.orig Thu Oct 31 01:44:42 1996 --- dup.c Thu Oct 31 01:44:43 1996 *************** *** 33,37 **** #endif #include #include #include "const.h" --- 33,38 ---- #endif #include + #include #include #include "const.h" *** edit.c.orig Thu Oct 31 01:44:44 1996 --- edit.c Thu Oct 31 01:44:44 1996 *************** *** 73,77 **** --- 73,79 ---- #include "pattern.e" #include "poly.e" + #include "polygon.e" #include "raster.e" + #include "rect.e" #include "ruler.e" #include "select.e" *************** *** 86,89 **** --- 88,93 ---- #include "xpixmap.e" + extern int atoi ARGS_DECL((char *)); + char * editMenuStr[] = { "Redraw ^r", *************** *** 114,117 **** --- 118,122 ---- "BreakUpText ##", "SetSelLineWidth ", + "SetSelFontSize ", "AddColor ", "BreakUpBit/Pixmap", *************** *** 154,157 **** --- 159,163 ---- "Break up selected text objects into one-character text objects", "Change the line width (and arrow width/height) of selected objects", + "Change the font size of selected objects", "Add colors to the current palette", "Break selected bitmap/pixmap object into smaller objects", *************** *** 2472,2476 **** int i, num_objects=numObjSelected-1; int abs_cx, abs_cy, abs_x=ABS_X(grid_x), abs_y=ABS_Y(grid_y), dx, dy; ! double abs_radius, total_arc_radian, total_radian=0, inc_radian, angle; abs_cx = arc_ptr->xc; --- 2478,2482 ---- int i, num_objects=numObjSelected-1; int abs_cx, abs_cy, abs_x=ABS_X(grid_x), abs_y=ABS_Y(grid_y), dx, dy; ! double abs_radius, total_arc_radian, total_radian=0, inc_radian=0, angle; abs_cx = arc_ptr->xc; *************** *** 2808,2812 **** { struct SelRec *sel_ptr; ! struct ObjRec *obj_ptr, *arc_obj=NULL; int arc_obj_count=0, i, something_locked=FALSE; struct BoxInfoRec *box_info_ptr; --- 2814,2818 ---- { struct SelRec *sel_ptr; ! struct ObjRec *arc_obj=NULL; int arc_obj_count=0, i, something_locked=FALSE; struct BoxInfoRec *box_info_ptr; *************** *** 3144,3147 **** --- 3150,3154 ---- case EDIT_BREAK_TEXT: BreakUpText (); break; case EDIT_SET_SEL_LINEWIDTH: SetSelectedLineWidth (); break; + case EDIT_SET_SEL_FONT_SIZE: SetSelectedFontSize (); break; case EDIT_ADD_COLOR: AddColor (); break; case EDIT_BREAK_MAPS: BreakUpMaps (); break; *** eps.c.orig Thu Oct 31 01:44:47 1996 --- eps.c Thu Oct 31 01:44:47 1996 *************** *** 58,61 **** --- 58,62 ---- #include "obj.e" #include "pattern.e" + #include "rect.e" #include "select.e" #include "setup.e" *************** *** 69,73 **** extern char *mktemp ARGS_DECL((char*)); ! #ifdef __hpux extern double atof ARGS_DECL((const char *)); #else --- 70,74 ---- extern char *mktemp ARGS_DECL((char*)); ! #if defined (__hpux) || defined (linux) || defined(sco) extern double atof ARGS_DECL((const char *)); #else *************** *** 476,480 **** int *pnPreviewOK; { ! int bytes_to_read=0x1e, bytes_read, tiff_sz, tiff_offset, eps_sz; int need_to_check_ps=TRUE; char buf[0x20], xbm_fname[MAXPATHLENGTH+1]; --- 477,481 ---- int *pnPreviewOK; { ! int bytes_to_read=0x1e, tiff_sz, tiff_offset, eps_sz; int need_to_check_ps=TRUE; char buf[0x20], xbm_fname[MAXPATHLENGTH+1]; *************** *** 581,585 **** file_name); if (PRTGIF || mainWindow==None) { ! fprintf(stderr, "%s\n"); } else { MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); --- 582,586 ---- file_name); if (PRTGIF || mainWindow==None) { ! fprintf(stderr, "%s\n", gszMsgBox); } else { MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); *************** *** 976,979 **** --- 977,982 ---- struct XBmRec *xbm_ptr=ObjPtr->detail.xbm; struct MtrxRec mtrx; + int no_rotate=(ObjPtr->ctm==NULL || (ObjPtr->ctm->m[CTM_SIN]== 0 && + ObjPtr->ctm->m[CTM_MSIN] == 0)); if (!xbm_ptr->save_epsf) { *************** *** 1012,1016 **** ury_psu = (float)(((float)xbm_ptr->ury) / 1000.0); ! if (ObjPtr->ctm == NULL) { w_psu = (float)((float)(ObjPtr->obbox.rbx-ObjPtr->obbox.ltx) * scale); h_psu = (float)((float)(ObjPtr->obbox.rby-ObjPtr->obbox.lty) * scale); --- 1015,1019 ---- ury_psu = (float)(((float)xbm_ptr->ury) / 1000.0); ! if (no_rotate) { w_psu = (float)((float)(ObjPtr->obbox.rbx-ObjPtr->obbox.ltx) * scale); h_psu = (float)((float)(ObjPtr->obbox.rby-ObjPtr->obbox.lty) * scale); *************** *** 1034,1038 **** dy_psu = llx_psu*mtrx.m[0][1] + lly_psu*mtrx.m[1][1]; ! if (ObjPtr->ctm == NULL) { ltx_psu = (float)((float)(ObjPtr->obbox.ltx) * scale); rby_psu = (float)(((float)psDotsPerInch)*psYOff[pageStyle] - --- 1037,1041 ---- dy_psu = llx_psu*mtrx.m[0][1] + lly_psu*mtrx.m[1][1]; ! if (no_rotate) { ltx_psu = (float)((float)(ObjPtr->obbox.ltx) * scale); rby_psu = (float)(((float)psDotsPerInch)*psYOff[pageStyle] - *************** *** 1103,1107 **** psXOffStr[pageStyle], psDotsPerInch, psYOffStr[pageStyle]); fprintf(FP, "\n"); ! if (ObjPtr->ctm == NULL) { fprintf(FP, "%.3f %.3f translate %.3f %.3f scale %1d rotate\n", x_psu, y_psu, mtrx.dump_h_scale, mtrx.dump_v_scale, (-mtrx.degree)); --- 1106,1110 ---- psXOffStr[pageStyle], psDotsPerInch, psYOffStr[pageStyle]); fprintf(FP, "\n"); ! if (no_rotate) { fprintf(FP, "%.3f %.3f translate %.3f %.3f scale %1d rotate\n", x_psu, y_psu, mtrx.dump_h_scale, mtrx.dump_v_scale, (-mtrx.degree)); *** exec.c.orig Thu Oct 31 01:44:49 1996 --- exec.c Thu Oct 31 01:44:50 1996 *************** *** 93,96 **** --- 93,98 ---- #include "xpixmap.e" + extern int atoi ARGS_DECL((char*)); + int execAnimating=FALSE; int execAnimateRedraw=FALSE; *************** *** 578,582 **** while (*inbuf != '\0') { struct AttrRec *attr_ptr; ! int null_string=FALSE, found_var=FALSE, n; char *c_ptr=inbuf, *new_c_ptr=NULL, *cp, *cp1; --- 580,584 ---- while (*inbuf != '\0') { struct AttrRec *attr_ptr; ! int null_string=FALSE, n; char *c_ptr=inbuf, *new_c_ptr=NULL, *cp, *cp1; *************** *** 4073,4077 **** SaveStatusStrings(); rc = LoadRemoteFileInMem(url_attr->attr_value.s, &remote_buf, NULL, ! &remote_buf_sz, &is_html, TRUE); RestoreStatusStrings(); postingCGIQuery = FALSE; --- 4075,4079 ---- SaveStatusStrings(); rc = LoadRemoteFileInMem(url_attr->attr_value.s, &remote_buf, NULL, ! &remote_buf_sz, &is_html, TRUE, NULL, 0); RestoreStatusStrings(); postingCGIQuery = FALSE; *************** *** 4163,4181 **** } ! #ifndef _NO_EXTERN #ifdef _AIX extern void srand ARGS_DECL((unsigned int)); ! #else /* !_AIX */ #ifdef __alpha extern void srand ARGS_DECL((unsigned int)); ! #else /* !__alpha */ #ifdef sgi extern void srand ARGS_DECL((unsigned int)); ! #else extern int srand ARGS_DECL((int)); #endif /* sgi */ #endif /* __alpha */ #endif /* _AIX */ ! #endif /* !_NO_EXTERN */ extern int rand ARGS_DECL((void)); --- 4165,4186 ---- } ! #if defined (linux) || defined (sco) ! extern void srand ARGS_DECL((unsigned int)); ! #else /* ~(defined (linux) || defined (sco)) */ #ifdef _AIX extern void srand ARGS_DECL((unsigned int)); ! #else /* ~_AIX */ #ifdef __alpha extern void srand ARGS_DECL((unsigned int)); ! #else /* ~__alpha */ #ifdef sgi extern void srand ARGS_DECL((unsigned int)); ! #else /* ~sgi */ extern int srand ARGS_DECL((int)); #endif /* sgi */ #endif /* __alpha */ #endif /* _AIX */ ! #endif /* (defined (linux) || defined (sco)) */ ! extern int rand ARGS_DECL((void)); *** file.c.orig Thu Oct 31 01:44:55 1996 --- file.c Thu Oct 31 01:44:55 1996 *************** *** 94,97 **** --- 94,98 ---- #include "dup.e" #include "eps.e" + #include "exec.e" #ifndef _NO_EXTERN #include "file.e" *************** *** 149,153 **** extern char * getenv ARGS_DECL((char *)); ! #ifdef __hpux extern double atof ARGS_DECL((const char *)); #else --- 150,154 ---- extern char * getenv ARGS_DECL((char *)); ! #if defined (__hpux) || defined (linux) || defined(sco) extern double atof ARGS_DECL((const char *)); #else *************** *** 195,198 **** --- 196,201 ---- int cmdLineOneFilePerPage=FALSE; int cmdLineA4=FALSE; + int cmdLineColor=FALSE; + int cmdLineRequestedColor=FALSE; int showPageInEPS=FALSE; *************** *** 443,446 **** --- 446,450 ---- } } + SaveColors(FP); } if (Level == 0) *************** *** 2029,2033 **** { if (!importingFile) { ! char *s=FindChar((int)'(', Inbuf), *c_ptr; int dx=0, dy=0; --- 2033,2037 ---- { if (!importingFile) { ! char *s=FindChar((int)'(', Inbuf); int dx=0, dy=0; *************** *** 2062,2067 **** *ObjPtr = NULL; while ((line=UtilGetALine(FP)) != NULL) { - char *c_ptr; - scanLineNum++; if (*line == ']') return FreeBufAndReturn(line, FALSE); --- 2066,2069 ---- *************** *** 2278,2281 **** --- 2280,2290 ---- return FreeBufAndReturn(line, ok); } + else if (strcmp(obj_name, "color_info") == 0) + { + int ok=ReadColors(FP, line); + + *ObjPtr = NULL; + return FreeBufAndReturn(line, ok); + } free(line); } *************** *** 2366,2372 **** int DownloadRemoteFile(file_name, ppsz_content_type, ppsz_page_spec, ! pn_is_html, return_tmp_fname) ! char *file_name, **ppsz_content_type, **ppsz_page_spec, *return_tmp_fname; ! int *pn_is_html; /* file_name is assumed to be remote */ { --- 2375,2382 ---- int DownloadRemoteFile(file_name, ppsz_content_type, ppsz_page_spec, ! pn_is_html, return_tmp_fname, psz_final_url, cb_final_url) ! char *file_name, **ppsz_content_type, **ppsz_page_spec, *return_tmp_fname, ! *psz_final_url; ! int *pn_is_html, cb_final_url; /* file_name is assumed to be remote */ { *************** *** 2390,2394 **** SaveStatusStrings(); ok = LoadRemoteFileInMem(remote_fname, &remote_buf, ppsz_content_type, ! &remote_buf_sz, pn_is_html, navigateRefresh); RestoreStatusStrings(); if (ok && remote_buf != NULL) { --- 2400,2405 ---- SaveStatusStrings(); ok = LoadRemoteFileInMem(remote_fname, &remote_buf, ppsz_content_type, ! &remote_buf_sz, pn_is_html, navigateRefresh, psz_final_url, ! cb_final_url); RestoreStatusStrings(); if (ok && remote_buf != NULL) { *************** *** 2416,2420 **** char *rest, remote_fname[MAXPATHLENGTH+1], *remote_buf=NULL; char tmp_filename[MAXPATHLENGTH+1], *tmp_remote_fname=NULL, *page_spec=NULL; ! int short_name, read_status, remote_buf_sz=0; int tmp_linenum, file_is_remote=FALSE, interrupted; FILE *fp=NULL; --- 2427,2431 ---- char *rest, remote_fname[MAXPATHLENGTH+1], *remote_buf=NULL; char tmp_filename[MAXPATHLENGTH+1], *tmp_remote_fname=NULL, *page_spec=NULL; ! int short_name=FALSE, read_status=0, remote_buf_sz=0; int tmp_linenum, file_is_remote=FALSE, interrupted; FILE *fp=NULL; *************** *** 2433,2437 **** SaveStatusStrings(); rc = LoadRemoteFileInMem(remote_fname, &remote_buf, NULL, ! &remote_buf_sz, &is_html, TRUE); RestoreStatusStrings(); if (rc && remote_buf != NULL) { --- 2444,2448 ---- SaveStatusStrings(); rc = LoadRemoteFileInMem(remote_fname, &remote_buf, NULL, ! &remote_buf_sz, &is_html, TRUE, NULL, 0); RestoreStatusStrings(); if (rc && remote_buf != NULL) { *************** *** 2694,2702 **** myFileBgPixel = myFileFgPixel = INVALID; if (myFileFgColorStr != NULL) { ! cfree(myFileFgColorStr); myFileFgColorStr = NULL; } if (myFileBgColorStr != NULL) { ! cfree(myFileBgColorStr); myFileBgColorStr = NULL; XSetWindowBackground(mainDisplay, drawWindow, myBgPixel); --- 2705,2713 ---- myFileBgPixel = myFileFgPixel = INVALID; if (myFileFgColorStr != NULL) { ! free(myFileFgColorStr); myFileFgColorStr = NULL; } if (myFileBgColorStr != NULL) { ! free(myFileBgColorStr); myFileBgColorStr = NULL; XSetWindowBackground(mainDisplay, drawWindow, myBgPixel); *************** *** 2716,2720 **** if (myFileBgGifURL != NULL) { ! cfree(myFileBgGifURL); myFileBgGifURL = NULL; changed = TRUE; --- 2727,2731 ---- if (myFileBgGifURL != NULL) { ! free(myFileBgGifURL); myFileBgGifURL = NULL; changed = TRUE; *************** *** 2753,2756 **** --- 2764,2768 ---- myFileBgColorStr); Msg(gszMsgBox); + return FALSE; } *************** *** 2769,2772 **** --- 2781,2785 ---- myFileFgColorStr); Msg(gszMsgBox); + return FALSE; } *************** *** 2785,2789 **** *tmp_gif_fname = '\0'; if (DownloadRemoteFile(myFileBgGifURL, &content_type, &page_spec, ! &is_html, tmp_gif_fname)) { if (page_spec != NULL || is_html) { sprintf(gszMsgBox, "Invalid remote file name '%s'.", --- 2798,2802 ---- *tmp_gif_fname = '\0'; if (DownloadRemoteFile(myFileBgGifURL, &content_type, &page_spec, ! &is_html, tmp_gif_fname, NULL, 0)) { if (page_spec != NULL || is_html) { sprintf(gszMsgBox, "Invalid remote file name '%s'.", *************** *** 2902,2906 **** myFileBgPixmap = None; myFileBgPixmapW = myFileBgPixmapH = (-1); ! if (myFileBgGifURL != NULL) cfree(myFileBgGifURL); myFileBgGifURL = UtilStrDup(attr_ptr->attr_value.s); if (myFileBgGifURL == NULL) FailAllocMessage(); --- 2915,2919 ---- myFileBgPixmap = None; myFileBgPixmapW = myFileBgPixmapH = (-1); ! if (myFileBgGifURL != NULL) free(myFileBgGifURL); myFileBgGifURL = UtilStrDup(attr_ptr->attr_value.s); if (myFileBgGifURL == NULL) FailAllocMessage(); *************** *** 5334,5345 **** else { ! char * buf=NULL, * content_type=NULL; ! int rc, buf_sz=0, is_html=FALSE; ! SaveStatusStrings (); rc = LoadRemoteFileInMem(remote_fname, &buf, &content_type, ! &buf_sz, &is_html, TRUE); ! RestoreStatusStrings (); if (rc && buf != NULL) { if (LoadRemoteFileFromMem(remote_fname, buf, content_type, buf_sz, is_html)) { --- 5347,5362 ---- else { ! char *buf=NULL, *content_type=NULL, final_url[MAXPATHLENGTH+1]; ! int rc, buf_sz=0, is_html=FALSE; ! *final_url = '\0'; ! SaveStatusStrings(); rc = LoadRemoteFileInMem(remote_fname, &buf, &content_type, ! &buf_sz, &is_html, TRUE, final_url, sizeof(final_url)); ! RestoreStatusStrings(); if (rc && buf != NULL) { + if (*final_url != '\0') { + UtilStrCpy(remote_fname, sizeof(remote_fname), final_url); + } if (LoadRemoteFileFromMem(remote_fname, buf, content_type, buf_sz, is_html)) { *** font.c.orig Thu Oct 31 01:44:59 1996 --- font.c Thu Oct 31 01:44:59 1996 *************** *** 60,63 **** --- 60,64 ---- #include "ps.e" #include "raster.e" + #include "rect.e" #include "select.e" #include "setup.e" *************** *** 1390,1393 **** --- 1391,1482 ---- } + static int savedFont, savedSize, savedStyle; + static int savedJust, savedRotate, savedPen, savedFill, savedVSpace; + static int savedUnderlineOn, savedUnderline; + + void SaveCurFont() + { + savedFont = curFont; + savedSize = curSize; + savedStyle = curStyle; + savedJust = textJust; + savedRotate = curRotate; + savedPen = penPat; + savedFill = objFill; + savedVSpace = textVSpace; + savedUnderlineOn = curUnderlineOn; + savedUnderline = curUnderline; + } + + void RestoreCurFont() + { + curFont = savedFont; + curSize = savedSize; + curStyle = savedStyle; + textJust = savedJust; + curRotate = savedRotate; + penPat = savedPen; + objFill = savedFill; + textVSpace = savedVSpace; + curUnderlineOn = savedUnderlineOn; + curUnderline = savedUnderline; + + SetCanvasFont(); + } + + static int pushedFont, pushedSize, pushedStyle, pushedJust; + static int pushedColorIndex, pushedRotate, pushedPen, pushedVSpace; + static int pushedFill, pushedUnderlineOn, pushedUnderline; + + void PushCurFont() + { + pushedFont = curFont; + pushedSize = curSize; + pushedStyle = curStyle; + pushedJust = textJust; + pushedRotate = curRotate; + pushedPen = penPat; + pushedFill = objFill; + pushedVSpace = textVSpace; + pushedColorIndex = colorIndex; + pushedUnderlineOn = curUnderlineOn; + pushedUnderline = curUnderline; + } + + void PopCurFont() + { + curFont = pushedFont; + curSize = pushedSize; + curStyle = pushedStyle; + textJust = pushedJust; + curRotate = pushedRotate; + penPat = pushedPen; + objFill = pushedFill; + textVSpace = pushedVSpace; + colorIndex = pushedColorIndex; + curUnderlineOn = pushedUnderlineOn; + curUnderline = pushedUnderline; + + SetCanvasFont(); + } + + void SetPushedFontValue(which, value) + int which, value; + { + switch(which) { + case PUSH_FONT: pushedFont = value; break; + case PUSH_SIZE: pushedSize = value; break; + case PUSH_STYLE: pushedStyle = value; break; + case PUSH_JUST: pushedJust = value; break; + case PUSH_ROTATE: pushedRotate = value; break; + case PUSH_PEN: pushedPen = value; break; + case PUSH_FILL: pushedFill = value; break; + case PUSH_VSPACE: pushedVSpace = value; break; + case PUSH_COLORINDEX: pushedColorIndex = value; break; + case PUSH_UNDERLINEON: pushedUnderlineOn = value; break; + case PUSH_UNDERLINE: pushedUnderline = value; break; + } + } + static int AdjTransformedTextBBox(ObjPtr) *************** *** 1488,1491 **** --- 1577,1581 ---- if (topSel == NULL) return; } + ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; HighLightReverse(); *************** *** 1503,1507 **** if (changed) { - ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; UpdSelBBox(); RedrawAreas(botObj, ltx-GRID_ABS_SIZE(1), lty-GRID_ABS_SIZE(1), --- 1593,1596 ---- *************** *** 1584,1587 **** --- 1673,1677 ---- if (topSel == NULL) return; } + ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; HighLightReverse(); *************** *** 1599,1603 **** if (changed) { - ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; UpdSelBBox(); RedrawAreas(botObj, ltx-GRID_ABS_SIZE(1), lty-GRID_ABS_SIZE(1), --- 1689,1692 ---- *************** *** 1652,1670 **** } ! int ChangeObjTextSize(ObjPtr, SizeIndex) register struct ObjRec *ObjPtr; ! register int SizeIndex; { register struct ObjRec *obj_ptr; register int changed=FALSE, obj_changed; - int size=fontSizes[SizeIndex]; switch (ObjPtr->type) { case OBJ_TEXT: ! if (ObjPtr->detail.t->size != size) { int saved_size=ObjPtr->detail.t->size; int saved_read_only=ObjPtr->detail.t->read_only, rc; ! ObjPtr->detail.t->size = size; ObjPtr->detail.t->read_only = FALSE; changingFontSizeFromRead = FALSE; --- 1741,1770 ---- } ! int GetSizeMenuIndex() ! { ! register int i; ! ! for (i=0; i < numFontSizes; i++) { ! if (fontSizes[i] == curSize) { ! return i; ! } ! } ! return INVALID; ! } ! ! int ChangeObjTextSize(ObjPtr, Size) register struct ObjRec *ObjPtr; ! register int Size; { register struct ObjRec *obj_ptr; register int changed=FALSE, obj_changed; switch (ObjPtr->type) { case OBJ_TEXT: ! if (ObjPtr->detail.t->size != Size) { int saved_size=ObjPtr->detail.t->size; int saved_read_only=ObjPtr->detail.t->read_only, rc; ! ObjPtr->detail.t->size = Size; ObjPtr->detail.t->read_only = FALSE; changingFontSizeFromRead = FALSE; *************** *** 1701,1705 **** for (obj_ptr=ObjPtr->detail.r->last; obj_ptr != NULL; obj_ptr=obj_ptr->prev) { ! if (ChangeObjTextSize(obj_ptr, SizeIndex)) { obj_changed = TRUE; } --- 1801,1805 ---- for (obj_ptr=ObjPtr->detail.r->last; obj_ptr != NULL; obj_ptr=obj_ptr->prev) { ! if (ChangeObjTextSize(obj_ptr, Size)) { obj_changed = TRUE; } *************** *** 1749,1753 **** } if (curChoice == DRAWTEXT && textCursorShown) { ! if (ChangeObjTextSize(curTextObj, SizeIndex)) { curTextModified = TRUE; UpdCurTextBBox(); --- 1849,1853 ---- } if (curChoice == DRAWTEXT && textCursorShown) { ! if (ChangeObjTextSize(curTextObj, fontSizes[SizeIndex])) { curTextModified = TRUE; UpdCurTextBBox(); *************** *** 1765,1768 **** --- 1865,1869 ---- if (topSel == NULL) return; } + ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; HighLightReverse(); *************** *** 1770,1774 **** for (sel_ptr=botSel; sel_ptr != NULL; sel_ptr=sel_ptr->prev) { PrepareToReplaceAnObj(sel_ptr->obj); ! if (ChangeObjTextSize(sel_ptr->obj, SizeIndex)) { changed = TRUE; RecordReplaceAnObj(sel_ptr->obj); --- 1871,1875 ---- for (sel_ptr=botSel; sel_ptr != NULL; sel_ptr=sel_ptr->prev) { PrepareToReplaceAnObj(sel_ptr->obj); ! if (ChangeObjTextSize(sel_ptr->obj, fontSizes[SizeIndex])) { changed = TRUE; RecordReplaceAnObj(sel_ptr->obj); *************** *** 1780,1784 **** if (changed) { - ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; UpdSelBBox(); RedrawAreas(botObj, ltx-GRID_ABS_SIZE(1), lty-GRID_ABS_SIZE(1), --- 1881,1884 ---- *************** *** 1791,1806 **** } - int GetSizeMenuIndex() - { - register int i; - - for (i=0; i < numFontSizes; i++) { - if (fontSizes[i] == curSize) { - return i; - } - } - return INVALID; - } - int SizeMenu(X, Y, TrackMenubar) int X, Y, TrackMenubar; --- 1891,1894 ---- *************** *** 1935,1938 **** --- 2023,2027 ---- if (topSel == NULL) return; } + ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; HighLightReverse(); *************** *** 1950,1954 **** if (changed) { - ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; UpdSelBBox(); RedrawAreas(botObj, ltx-GRID_ABS_SIZE(1), lty-GRID_ABS_SIZE(1), --- 2039,2042 ---- *************** *** 2073,2076 **** --- 2161,2165 ---- if (topSel == NULL) return; } + ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; HighLightReverse(); *************** *** 2088,2092 **** if (changed) { - ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; UpdSelBBox(); RedrawAreas(botObj, ltx-GRID_ABS_SIZE(1), lty-GRID_ABS_SIZE(1), --- 2177,2180 ---- *************** *** 2099,2188 **** } ! static int savedFont, savedSize, savedStyle; ! static int savedJust, savedRotate, savedPen, savedFill, savedVSpace; ! static int savedUnderlineOn, savedUnderline; ! ! void SaveCurFont() ! { ! savedFont = curFont; ! savedSize = curSize; ! savedStyle = curStyle; ! savedJust = textJust; ! savedRotate = curRotate; ! savedPen = penPat; ! savedFill = objFill; ! savedVSpace = textVSpace; ! savedUnderlineOn = curUnderlineOn; ! savedUnderline = curUnderline; ! } ! ! void RestoreCurFont() { ! curFont = savedFont; ! curSize = savedSize; ! curStyle = savedStyle; ! textJust = savedJust; ! curRotate = savedRotate; ! penPat = savedPen; ! objFill = savedFill; ! textVSpace = savedVSpace; ! curUnderlineOn = savedUnderlineOn; ! curUnderline = savedUnderline; ! ! SetCanvasFont(); ! } ! ! static int pushedFont, pushedSize, pushedStyle, pushedJust; ! static int pushedColorIndex, pushedRotate, pushedPen, pushedVSpace; ! static int pushedFill, pushedUnderlineOn, pushedUnderline; ! ! void PushCurFont() ! { ! pushedFont = curFont; ! pushedSize = curSize; ! pushedStyle = curStyle; ! pushedJust = textJust; ! pushedRotate = curRotate; ! pushedPen = penPat; ! pushedFill = objFill; ! pushedVSpace = textVSpace; ! pushedColorIndex = colorIndex; ! pushedUnderlineOn = curUnderlineOn; ! pushedUnderline = curUnderline; ! } ! void PopCurFont() ! { ! curFont = pushedFont; ! curSize = pushedSize; ! curStyle = pushedStyle; ! textJust = pushedJust; ! curRotate = pushedRotate; ! penPat = pushedPen; ! objFill = pushedFill; ! textVSpace = pushedVSpace; ! colorIndex = pushedColorIndex; ! curUnderlineOn = pushedUnderlineOn; ! curUnderline = pushedUnderline; ! SetCanvasFont(); ! } ! void SetPushedFontValue(which, value) ! int which, value; ! { ! switch(which) { ! case PUSH_FONT: pushedFont = value; break; ! case PUSH_SIZE: pushedSize = value; break; ! case PUSH_STYLE: pushedStyle = value; break; ! case PUSH_JUST: pushedJust = value; break; ! case PUSH_ROTATE: pushedRotate = value; break; ! case PUSH_PEN: pushedPen = value; break; ! case PUSH_FILL: pushedFill = value; break; ! case PUSH_VSPACE: pushedVSpace = value; break; ! case PUSH_COLORINDEX: pushedColorIndex = value; break; ! case PUSH_UNDERLINEON: pushedUnderlineOn = value; break; ! case PUSH_UNDERLINE: pushedUnderline = value; break; } } --- 2187,2235 ---- } ! void SetSelectedFontSize() { ! register struct SelRec *sel_ptr; ! char spec[MAXSTRING+1]; ! int ltx, lty, rbx, rby; ! int font_size=(-1), changed=FALSE; ! if (topSel == NULL) { ! MsgBox("No object selected!", TOOL_NAME, INFO_MB); ! return; ! } ! *spec = '\0'; ! Dialog("Please enter font size:", "( : accept, : cancel )", spec); ! UtilTrimBlanks(spec); ! if (*spec == '\0') return; ! font_size = atoi(spec); ! if (font_size <= 0) { ! sprintf(gszMsgBox, "Font size '%s' too small.", spec); ! MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); ! return; ! } ! ltx = selLtX; lty = selLtY; rbx = selRbX; rby = selRbY; ! HighLightReverse(); ! StartCompositeCmd(); ! for (sel_ptr=botSel; sel_ptr != NULL; sel_ptr=sel_ptr->prev) { ! PrepareToReplaceAnObj(sel_ptr->obj); ! if (ChangeObjTextSize(sel_ptr->obj, font_size)) { ! changed = TRUE; ! RecordReplaceAnObj(sel_ptr->obj); ! } else { ! AbortPrepareCmd(CMD_REPLACE); ! } ! } ! EndCompositeCmd(); ! if (changed) { ! UpdSelBBox(); ! RedrawAreas(botObj, ltx-GRID_ABS_SIZE(1), lty-GRID_ABS_SIZE(1), ! rbx+GRID_ABS_SIZE(1), rby+GRID_ABS_SIZE(1), selLtX-GRID_ABS_SIZE(1), ! selLtY-GRID_ABS_SIZE(1), selRbX+GRID_ABS_SIZE(1), ! selRbY+GRID_ABS_SIZE(1)); ! SetFileModified(TRUE); } + HighLightForward(); } *** grid.c.orig Thu Oct 31 01:45:01 1996 --- grid.c Thu Oct 31 01:45:01 1996 *************** *** 61,64 **** --- 61,65 ---- #include "stretch.e" #include "text.e" + #include "util.e" #define ENGLISH_GRID_STEP 8 *** http.c.orig Thu Oct 31 01:45:03 1996 --- http.c Thu Oct 31 01:45:03 1996 *************** *** 50,55 **** --- 50,58 ---- #include #endif + #include + #include #include "const.h" + #include "types.h" #include "patchlvl.h" *************** *** 57,60 **** --- 60,64 ---- #include "http.e" #endif /* !_NO_EXTERN */ + #include "msg.e" #include "remote.e" #include "tcp.e" *************** *** 147,152 **** int buf_len; { - int return_buf_index=0; - while (buf_len > 0) { switch (buf_len) { --- 151,154 ---- *** imgproc.c.orig Thu Oct 31 01:45:05 1996 --- imgproc.c Thu Oct 31 01:45:06 1996 *************** *** 43,46 **** --- 43,47 ---- #include "types.h" + #include "auxtext.e" #include "choice.e" #include "cmd.e" *************** *** 57,68 **** --- 58,76 ---- #include "mainloop.e" #include "mainmenu.e" + #include "mark.e" #include "menu.e" + #include "move.e" #include "msg.e" #include "names.e" #include "obj.e" #include "page.e" + #include "polygon.e" #include "raster.e" + #include "rect.e" + #include "remote.e" + #include "ruler.e" #include "select.e" #include "setup.e" + #include "special.e" #include "util.e" #include "xbitmap.e" *************** *** 607,611 **** fprintf(stderr, "\t#%02x%02x%02x %6ld\n", (int)((lred>>8) & 0xff), (int)((lgreen>>8) & 0xff), ! (int)((lblue>>8) & 0xff), (int)num_points); } if (chars_per_pixel == 1) { --- 615,619 ---- fprintf(stderr, "\t#%02x%02x%02x %6ld\n", (int)((lred>>8) & 0xff), (int)((lgreen>>8) & 0xff), ! (int)((lblue>>8) & 0xff), (long)num_points); } if (chars_per_pixel == 1) { *************** *** 775,779 **** register int i, j; int pivot_index, tmp, something_swapped; ! unsigned long pivot_value; if (nMinIndex > nMaxIndex) return; --- 783,787 ---- register int i, j; int pivot_index, tmp, something_swapped; ! unsigned long pivot_value=0; if (nMinIndex > nMaxIndex) return; *************** *** 1415,1420 **** int saved_bottom=bottomExportPixelTrim, saved_where_to_print=whereToPrint; int saved_ltx, saved_lty, saved_cur_file_defined=curFileDefined; ! int ltx, lty, rbx, rby, saved_w, saved_h, saved_x, saved_y, ctm_saved=FALSE; ! int w, h, image_w, image_h, ncolors, hcars_per_pixel, first_pixel_is_bg; int rc, chars_per_pixel, *pixels=NULL, retry_count=0; struct XfrmMtrxRec saved_ctm; --- 1423,1428 ---- int saved_bottom=bottomExportPixelTrim, saved_where_to_print=whereToPrint; int saved_ltx, saved_lty, saved_cur_file_defined=curFileDefined; ! int ltx, lty, rbx, rby, saved_w, saved_h, saved_x=0, saved_y=0; ! int w, h, image_w, image_h, ncolors, first_pixel_is_bg, ctm_saved=FALSE; int rc, chars_per_pixel, *pixels=NULL, retry_count=0; struct XfrmMtrxRec saved_ctm; *************** *** 1706,1710 **** char *c_ptr, szFrom[MAXSTRING+1], szTo[MAXSTRING+1]; char szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; - XColor color_def; if (!CheckSelectionForImageProc( --- 1714,1717 ---- *************** *** 1834,1838 **** if (*s < (float)0.0) *s = (float)0.0; if (*s > SAT_TOL) { ! int hue; if (r == max_val) { --- 1841,1845 ---- if (*s < (float)0.0) *s = (float)0.0; if (*s > SAT_TOL) { ! int hue=0; if (r == max_val) { *************** *** 1988,1992 **** /* ----------------------- ChangeHue ----------------------- */ ! static int gnFromHue=0, gnToHue=0, gnZeroWithinFromAngle=FALSE; static float gfFromAngle=(float)0.0, gfToAngle=(float)0.0; static float gfFromStart=(float)0.0, gfToStart=(float)0.0; --- 1995,1999 ---- /* ----------------------- ChangeHue ----------------------- */ ! static int gnFromHue=0, gnToHue=0; static float gfFromAngle=(float)0.0, gfToAngle=(float)0.0; static float gfFromStart=(float)0.0, gfToStart=(float)0.0; *************** *** 2051,2055 **** char *szFrom=NULL, *szFromAngle=NULL, *szTo=NULL, *szToAngle=NULL; char szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1], szValue[MAXSTRING+1]; ! float sVal, fVal, fFrom=(float)0.0, fTo=(float)0.0; int vVal; XColor xcolor; --- 2058,2062 ---- char *szFrom=NULL, *szFromAngle=NULL, *szTo=NULL, *szToAngle=NULL; char szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1], szValue[MAXSTRING+1]; ! float sVal, fVal; int vVal; XColor xcolor; *************** *** 2217,2221 **** char *c_ptr, szRed[MAXSTRING+1], szGreen[MAXSTRING+1], szBlue[MAXSTRING+1]; char szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; - float fVal; if (!CheckSelectionForImageProc(imageProcMenuStr[IMAGEPROC_COLORBALANCE])) { --- 2224,2227 ---- *************** *** 2606,2610 **** int j, i, target_ncolors=gXPmTarget.ncolors, target_percent, fs_forward=TRUE; int image_w=xpm_ptr->image_w, image_h=xpm_ptr->image_h; ! int red_bits, green_bits, blue_bits; long *this_r_err, *this_g_err, *this_b_err, *tmp_err; long *next_r_err, *next_g_err, *next_b_err; --- 2612,2616 ---- int j, i, target_ncolors=gXPmTarget.ncolors, target_percent, fs_forward=TRUE; int image_w=xpm_ptr->image_w, image_h=xpm_ptr->image_h; ! int red_bits=0, green_bits=0, blue_bits=0; long *this_r_err, *this_g_err, *this_b_err, *tmp_err; long *next_r_err, *next_g_err, *next_b_err; *************** *** 2769,2773 **** struct XPmRec *xpm_ptr; { ! int i, target_ncolors=gXPmTarget.ncolors, red_bits, green_bits, blue_bits; if (gXPmTarget.color_str != NULL) { --- 2775,2780 ---- struct XPmRec *xpm_ptr; { ! int i, target_ncolors=gXPmTarget.ncolors; ! int red_bits=0, green_bits=0, blue_bits=0; if (gXPmTarget.color_str != NULL) { *************** *** 2818,2822 **** void ReduceToPixmapColors() { - char *c_ptr, szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; int i, ok=TRUE, rc, short_name; char file_name[MAXPATHLENGTH+1], *rest; --- 2825,2828 ---- *************** *** 3003,3007 **** void SetDefaultColorLevels() { ! char *c_ptr, szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; XColor xcolor; --- 3009,3013 ---- void SetDefaultColorLevels() { ! char szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; XColor xcolor; *************** *** 3053,3060 **** void ReduceToDefaultColors() { ! char *c_ptr, szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; ! int i, red, ok=TRUE, rc, ncolors, image_h; int red_bits, green_bits, blue_bits, red_levels, green_levels, blue_levels; - XEvent ev; struct XPmRec *xpm_ptr; --- 3059,3064 ---- void ReduceToDefaultColors() { ! int i, red, rc, ncolors, image_h; int red_bits, green_bits, blue_bits, red_levels, green_levels, blue_levels; struct XPmRec *xpm_ptr; *************** *** 3137,3144 **** void DefaultErrorDiffuse() { ! char *c_ptr, szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; ! int i, red, ok=TRUE, rc, ncolors, image_h; int red_bits, green_bits, blue_bits, red_levels, green_levels, blue_levels; - XEvent ev; struct XPmRec *xpm_ptr; --- 3141,3146 ---- void DefaultErrorDiffuse() { ! int i, red, rc, ncolors, image_h; int red_bits, green_bits, blue_bits, red_levels, green_levels, blue_levels; struct XPmRec *xpm_ptr; *************** *** 3328,3332 **** { char *c_ptr, szSpec[MAXSTRING+1], szSpecCopy[MAXSTRING+1]; - int j; if (!CheckSelectionForImageProc( --- 3330,3333 ---- *************** *** 3534,3538 **** int inside_flag=INSIDE_NONE, pixel; double alpha, beta; ! long red, green, blue; if (PointInRect(x, y, &gAlphaCombineBBox)) inside_flag |= INSIDE_ALPHA; --- 3535,3539 ---- int inside_flag=INSIDE_NONE, pixel; double alpha, beta; ! long red=0L, green=0L, blue=0L; if (PointInRect(x, y, &gAlphaCombineBBox)) inside_flag |= INSIDE_ALPHA; *************** *** 3767,3773 **** int x, y; { ! XColor fg_xcolor, bg_xcolor, alpha_xcolor, xcolor; int inside_flag=INSIDE_NONE, pixel; - double alpha, beta; long red, green, blue; --- 3768,3773 ---- int x, y; { ! XColor fg_xcolor, bg_xcolor, xcolor; int inside_flag=INSIDE_NONE, pixel; long red, green, blue; *************** *** 5395,5398 **** --- 5395,5399 ---- } fprintf(stderr, "Should not have come here ContourNeighbor()!\n"); + return (-1); } *** import.c.orig Thu Oct 31 01:45:09 1996 --- import.c Thu Oct 31 01:45:09 1996 *************** *** 79,84 **** --- 79,87 ---- #include "types.h" + #include "attr.e" #include "choose.e" + #include "cmd.e" #include "color.e" + #include "cursor.e" #include "dialog.e" #include "drawing.e" *************** *** 89,98 **** --- 92,107 ---- #include "import.e" #endif + #include "mainloop.e" #include "msg.e" #include "menu.e" + #include "move.e" #include "names.e" #include "obj.e" + #include "remote.e" + #include "scroll.e" #include "select.e" #include "setup.e" + #include "special.e" + #include "stretch.e" #include "text.e" #include "util.e" *************** *** 317,322 **** UtilTrimBlanks(cmd_ptr); len = strlen(cmd_ptr); ! if (len >= 2 && (*cmd_ptr == '"' && cmd_ptr[len-1] == '"') || ! (*cmd_ptr == '\'' && cmd_ptr[len-1] == '\'')) { cmd_ptr[len-1] = '\0'; cmd_ptr++; --- 326,332 ---- UtilTrimBlanks(cmd_ptr); len = strlen(cmd_ptr); ! if (len >= 2 && ! ((*cmd_ptr == '"' && cmd_ptr[len-1] == '"') || ! (*cmd_ptr == '\'' && cmd_ptr[len-1] == '\''))) { cmd_ptr[len-1] = '\0'; cmd_ptr++; *************** *** 1200,1204 **** { char name[MAXPATHLENGTH+1]; ! int interrupted=FALSE, len; DIR *dirp; DIR_ENTRY *d; --- 1210,1217 ---- { char name[MAXPATHLENGTH+1]; ! int interrupted=FALSE; ! #ifdef VMS ! int len; ! #endif /* VMS */ DIR *dirp; DIR_ENTRY *d; *** mainloop.c.orig Thu Oct 31 01:45:11 1996 --- mainloop.c Thu Oct 31 01:45:11 1996 *************** *** 85,88 **** --- 85,89 ---- #include "stk.e" #include "text.e" + #include "util.e" #include "version.e" #ifdef _TGIF_WB *************** *** 95,108 **** #ifndef _NO_EXTERN extern int fork ARGS_DECL((void)); ! #endif /* !_NO_EXTERN */ #ifdef USE_XAPPLRESDIR extern char * getenv ARGS_DECL((char *)); extern int putenv ARGS_DECL((char *)); ! #else #ifdef USE_XT_INITIALIZE Widget toplevel; ! #endif ! #endif int origArgC = 0; --- 96,109 ---- #ifndef _NO_EXTERN extern int fork ARGS_DECL((void)); ! #endif /* ~_NO_EXTERN */ #ifdef USE_XAPPLRESDIR extern char * getenv ARGS_DECL((char *)); extern int putenv ARGS_DECL((char *)); ! #else /* ~USE_XAPPLRESDIR */ #ifdef USE_XT_INITIALIZE Widget toplevel; ! #endif /* USE_XT_INITIALIZE */ ! #endif /* USE_XAPPLRESDIR */ int origArgC = 0; *************** *** 128,132 **** #ifdef USE_XAPPLRESDIR static char * xEnvStr = NULL; ! #endif int AddExtraWinInfo (win, mapped, raise, expose_handler, ev_handler, --- 129,133 ---- #ifdef USE_XAPPLRESDIR static char * xEnvStr = NULL; ! #endif /* USE_XAPPLRESDIR */ int AddExtraWinInfo (win, mapped, raise, expose_handler, ev_handler, *************** *** 304,308 **** #ifndef DONT_FREE_COLORMAP if (newColormapUsed) XFreeColormap (mainDisplay, mainColormap); ! #endif } --- 305,309 ---- #ifndef DONT_FREE_COLORMAP if (newColormapUsed) XFreeColormap (mainDisplay, mainColormap); ! #endif /* ~DONT_FREE_COLORMAP */ } *************** *** 402,405 **** --- 403,436 ---- } + #ifdef USE_XAPPLRESDIR + #ifndef XAPPLOADDIR_DEF + static + int FindXApplResDir(psz_srch_path, psz_target_dir, cb_target_dir) + char *psz_srch_path, *psz_target_dir; + int cb_target_dir; + { + char *c_ptr, *buf=UtilStrDup(psz_srch_path); + + if (buf == NULL) return FALSE; + + for (c_ptr=strtok(buf, ":"); c_ptr != NULL; c_ptr=strtok(NULL, ":")) { + int len=strlen(c_ptr); + char path[MAXPATHLENGTH+1]; + FILE *fp; + + if (len > 0 && c_ptr[len-1] == '/') c_ptr[--len] = '/'; + sprintf(path, "%s/%s", c_ptr, TOOL_NAME); + if ((fp=fopen(path, "r")) != NULL) { + UtilStrCpy(psz_target_dir, cb_target_dir, c_ptr); + UtilFree(buf); + return TRUE; + } + } + UtilFree(buf); + return FALSE; + } + #endif /* ~XAPPLOADDIR_DEF */ + #endif /* USE_XAPPLRESDIR */ + void MainLoop (Op, FileName, FuncStr, Str1, Menu1, Str2, Menu2, Str3, Menu3) char * Op, * FileName, * * FuncStr; *************** *** 407,415 **** { XEvent input; ! char * c_ptr, file_name[MAXPATHLENGTH+1], s[MAXPATHLENGTH+1]; ! char full_name[MAXPATHLENGTH+1], * rest; ! int rc, len, i, read_status, short_name; ! struct ObjRec * obj_ptr; ! FILE * fp; int tmp_linenum, obj_ext_len, need_to_check_auto_exec=FALSE; char tmp_filename[MAXPATHLENGTH+1], obj_ext_str[MAXSTRING+1]; --- 438,446 ---- { XEvent input; ! char *c_ptr=NULL, file_name[MAXPATHLENGTH+1]; ! char full_name[MAXPATHLENGTH+1], *rest, s[MAXPATHLENGTH+1]; ! int rc, len=0, i, read_status, short_name=FALSE; ! struct ObjRec *obj_ptr=NULL; ! FILE *fp=NULL; int tmp_linenum, obj_ext_len, need_to_check_auto_exec=FALSE; char tmp_filename[MAXPATHLENGTH+1], obj_ext_str[MAXSTRING+1]; *************** *** 422,425 **** --- 453,460 ---- char remote_fname[MAXPATHLENGTH+1], *tmp_remote_fname=NULL; char * remote_buf=NULL, *page_spec=NULL; + #ifdef USE_XAPPLRESDIR + FILE * xenv_fp; + char tmp_buf[MAXPATHLENGTH+1]; + #endif /* USE_XAPPLRESDIR */ if (TGIF_PATCHLEVEL == 0) *************** *** 440,460 **** if (getenv ("XENVIRONMENT") == NULL) { ! FILE * xenv_fp; ! char tmp_buf[MAXPATHLENGTH+1]; ! ! if (((c_ptr = getenv ("XAPPLRESDIR")) == NULL) || ! ((len = strlen (c_ptr)) == 0)) ! { ! strcpy (tmp_buf, XAPPLOADDIR_DEF); c_ptr = tmp_buf;; } ! len = strlen (c_ptr); ! #else if ((getenv ("XENVIRONMENT") == NULL) && ((c_ptr = getenv ("XAPPLRESDIR")) != NULL) && ((len = strlen (c_ptr)) > 0)) { ! FILE * xenv_fp; ! #endif xEnvStr = (char*)malloc( (strlen("XENVIRONMENT=")+strlen(TOOL_NAME)+len+3)*sizeof(char)); --- 475,493 ---- if (getenv ("XENVIRONMENT") == NULL) { ! if (((c_ptr=getenv("XAPPLRESDIR")) == NULL) || (*c_ptr == '\0')) { ! UtilStrCpy(tmp_buf, sizeof(tmp_buf), XAPPLOADDIR_DEF); c_ptr = tmp_buf;; } ! len = strlen(c_ptr); ! #else /* ~XAPPLOADDIR_DEF */ if ((getenv ("XENVIRONMENT") == NULL) && ((c_ptr = getenv ("XAPPLRESDIR")) != NULL) && ((len = strlen (c_ptr)) > 0)) { ! if (FindXApplResDir(c_ptr, tmp_buf, sizeof(tmp_buf))) { ! c_ptr = tmp_buf;; ! } ! len = strlen(c_ptr); ! #endif /* XAPPLOADDIR_DEF */ xEnvStr = (char*)malloc( (strlen("XENVIRONMENT=")+strlen(TOOL_NAME)+len+3)*sizeof(char)); *************** *** 478,490 **** } if ((mainDisplay = XOpenDisplay (displayName)) == 0) ! #else #ifdef USE_XT_INITIALIZE toplevel = XtInitialize (TOOL_NAME, TOOL_NAME, NULL, 0, &origArgC, origArgV); if (toplevel == NULL || (mainDisplay = XtDisplay (toplevel)) == 0) ! #else if ((mainDisplay = XOpenDisplay (displayName)) == 0) ! #endif ! #endif { if (displayName == NULL) --- 511,523 ---- } if ((mainDisplay = XOpenDisplay (displayName)) == 0) ! #else /* ~USE_XAPPLRESDIR */ #ifdef USE_XT_INITIALIZE toplevel = XtInitialize (TOOL_NAME, TOOL_NAME, NULL, 0, &origArgC, origArgV); if (toplevel == NULL || (mainDisplay = XtDisplay (toplevel)) == 0) ! #else /* ~USE_XT_INITIALIZE */ if ((mainDisplay = XOpenDisplay (displayName)) == 0) ! #endif /* USE_XT_INITIALIZE */ ! #endif /* USE_XAPPLRESDIR */ { if (displayName == NULL) *************** *** 512,516 **** #ifndef linux signal (SIGBUS, EmergencySave); ! #endif signal (SIGSEGV, EmergencySave); --- 545,549 ---- #ifndef linux signal (SIGBUS, EmergencySave); ! #endif /* ~linux */ signal (SIGSEGV, EmergencySave); *************** *** 532,539 **** { char *content_type=NULL; SaveStatusStrings (); rc = LoadRemoteFileInMem(remote_fname, &remote_buf, ! &content_type, &remote_buf_sz, &is_html, TRUE); RestoreStatusStrings (); if (rc && remote_buf != NULL && --- 565,575 ---- { char *content_type=NULL; + char final_url[MAXPATHLENGTH+1]; + *final_url = '\0'; SaveStatusStrings (); rc = LoadRemoteFileInMem(remote_fname, &remote_buf, ! &content_type, &remote_buf_sz, &is_html, TRUE, ! final_url, sizeof(final_url)); RestoreStatusStrings (); if (rc && remote_buf != NULL && *************** *** 541,544 **** --- 577,584 ---- remote_buf_sz, NULL)) != NULL) { + if (*final_url != '\0') { + UtilStrCpy(FileName, MAXPATHLENGTH+1, final_url); + UtilStrCpy(remote_fname, MAXPATHLENGTH+1, final_url); + } if (UseExternalViewer(is_html, remote_fname, content_type, tmp_remote_fname) != FALSE) { *************** *** 818,824 **** #ifdef USE_XT_INITIALIZE XtDestroyWidget (toplevel); ! #else XCloseDisplay (mainDisplay); ! #endif exitNormally = TRUE; AllocStrings (FuncStr, Str1, Menu1, Str2, Menu2, Str3, Menu3); --- 858,864 ---- #ifdef USE_XT_INITIALIZE XtDestroyWidget (toplevel); ! #else /* ~USE_XT_INITIALIZE */ XCloseDisplay (mainDisplay); ! #endif /* USE_XT_INITIALIZE */ exitNormally = TRUE; AllocStrings (FuncStr, Str1, Menu1, Str2, Menu2, Str3, Menu3); *** menu.c.orig Thu Oct 31 01:45:13 1996 --- menu.c Thu Oct 31 01:45:13 1996 *************** *** 55,58 **** --- 55,59 ---- #include "font.e" #include "grid.e" + #include "help.e" #include "imgproc.e" #include "mainloop.e" *************** *** 77,80 **** --- 78,82 ---- #include "stk.e" #include "text.e" + #include "util.e" #include "version.e" *** msg.c.orig Thu Oct 31 01:45:15 1996 --- msg.c Thu Oct 31 01:45:15 1996 *************** *** 334,337 **** --- 334,338 ---- } } + if (btn1_bits) { } } *************** *** 913,916 **** --- 914,918 ---- fprintf (stderr, "\t[-rv] [-nv] \\\n"); fprintf (stderr, "\t[-bw] \\\n"); + fprintf (stderr, "\t[-reqcolor] \\\n"); fprintf (stderr, "\t[-cwo] \\\n"); fprintf (stderr, "\t[-hyper] \\\n"); *************** *** 924,927 **** --- 926,930 ---- fprintf (stderr, "\t[-text] \\\n"); fprintf (stderr, "\t[-gray] \\\n"); + fprintf (stderr, "\t[-color | -reqcolor] \\\n"); fprintf (stderr, "\t[-adobe | -adobe=/] \\\n"); *************** *** 1033,1039 **** } else if (strcmp(*argv, "-bw") == 0) { } else if (strcmp(*argv, "-color") == 0) { ! fprintf(stderr, "Sorry, -color is not supported.\n"); ! fflush(stderr); ! return (-1); } else if (strcmp(*argv, "-adobe") == 0) { usePsAdobeString = TRUE; --- 1036,1044 ---- } else if (strcmp(*argv, "-bw") == 0) { } else if (strcmp(*argv, "-color") == 0) { ! cmdLineRequestedColor = FALSE; ! cmdLineColor = TRUE; ! } else if (strcmp(*argv, "-reqcolor") == 0) { ! cmdLineRequestedColor = TRUE; ! cmdLineColor = TRUE; } else if (strcmp(*argv, "-adobe") == 0) { usePsAdobeString = TRUE; *************** *** 1120,1123 **** --- 1125,1130 ---- } else if (strcmp(argv[i], "-bw") == 0) { cmdLineBW = TRUE; + } else if (strcmp(argv[i], "-reqcolor") == 0) { + cmdLineRequestedColor = TRUE; } else if (strcmp(argv[i], "-rv") == 0) { cmdLineRV = TRUE; *** names.c.orig Thu Oct 31 01:45:17 1996 --- names.c Thu Oct 31 01:45:17 1996 *************** *** 664,667 **** --- 664,682 ---- } + int DirInSymPath(DirName) + char *DirName; + { + register int i; + + if (symPath == NULL) return FALSE; + + for (i = 0; i < symPathNumEntries; i++) { + if (strcmp(DirName, symPath[i]) == 0) { + return TRUE; + } + } + return FALSE; + } + static int lengthOfLongestItem=INVALID; *************** *** 772,776 **** int *JustSetDir; { ! char win_name[128], other_ext_str[MAXSTRING+1], selected_str[MAXSTRING+1]; int selected_index=INVALID, selected_btn_id; struct DirNamesInfoRec dninfo; --- 787,791 ---- int *JustSetDir; { ! char win_name[128], selected_str[MAXSTRING+1]; int selected_index=INVALID, selected_btn_id; struct DirNamesInfoRec dninfo; *************** *** 1013,1031 **** } - int DirInSymPath(DirName) - char *DirName; - { - register int i; - - if (symPath == NULL) return FALSE; - - for (i = 0; i < symPathNumEntries; i++) { - if (strcmp(DirName, symPath[i]) == 0) { - return TRUE; - } - } - return FALSE; - } - static char **tmpDomainName=NULL; --- 1028,1031 ---- *************** *** 1362,1366 **** int index, num_entries=0; char **entries=NULL; ! char s[MAXPATHLENGTH], other_ext_str[MAXSTRING]; DspList *dsp_ptr, *next_dsp; --- 1362,1366 ---- int index, num_entries=0; char **entries=NULL; ! char other_ext_str[MAXSTRING]; DspList *dsp_ptr, *next_dsp; *** navigate.c.orig Thu Oct 31 01:45:18 1996 --- navigate.c Thu Oct 31 01:45:19 1996 *************** *** 505,516 **** if (FileIsRemote(full_fname)) { ! char *buf=NULL, *content_type=NULL; int rc, buf_sz=0, is_html=FALSE; SetWatchCursor(drawWindow); SetWatchCursor(mainWindow); SaveStatusStrings(); rc = LoadRemoteFileInMem(full_fname, &buf, &content_type, &buf_sz, ! &is_html, force_load); RestoreStatusStrings(); SetDefaultCursor(mainWindow); --- 505,517 ---- if (FileIsRemote(full_fname)) { ! char *buf=NULL, *content_type=NULL, final_url[MAXPATHLENGTH+1]; int rc, buf_sz=0, is_html=FALSE; + *final_url = '\0'; SetWatchCursor(drawWindow); SetWatchCursor(mainWindow); SaveStatusStrings(); rc = LoadRemoteFileInMem(full_fname, &buf, &content_type, &buf_sz, ! &is_html, force_load, final_url, sizeof(final_url)); RestoreStatusStrings(); SetDefaultCursor(mainWindow); *************** *** 518,522 **** if (rc && buf != NULL) { navigatingBackAndForth = TRUE; ! LoadRemoteFileFromMem(full_fname, buf, content_type, buf_sz, is_html); navigatingBackAndForth = FALSE; } else if (do_not_save) { --- 519,529 ---- if (rc && buf != NULL) { navigatingBackAndForth = TRUE; ! if (*final_url != '\0') { ! LoadRemoteFileFromMem(final_url, buf, content_type, buf_sz, ! is_html); ! } else { ! LoadRemoteFileFromMem(full_fname, buf, content_type, buf_sz, ! is_html); ! } navigatingBackAndForth = FALSE; } else if (do_not_save) { *************** *** 968,973 **** return TRUE; } - - static XComposeStatus c_stat; static --- 975,978 ---- *** obj.c.orig Thu Oct 31 01:45:21 1996 --- obj.c Thu Oct 31 01:45:21 1996 *************** *** 772,776 **** { register int i; ! int dx_off, dy_off, n; XPoint * v=NULL; --- 772,776 ---- { register int i; ! int dx_off, dy_off, n=0; XPoint * v=NULL; *** oval.c.orig Thu Oct 31 01:45:22 1996 --- oval.c Thu Oct 31 01:45:22 1996 *************** *** 699,702 **** --- 699,709 ---- int new_alloc, rotation, locked=FALSE; int transformed=FALSE, invisible=FALSE; + #ifdef _TGIF_WB + + char aux[10000]; + + strcpy(aux,Inbuf); + + #endif /* _TGIF_WB */ *ObjPtr = NULL; *************** *** 918,922 **** --- 925,939 ---- struct XfrmMtrxRec *ctm; + #ifdef _TGIF_WB + + s = FindChar ((int)'[', aux); + s++; + + #else /* ~_TGIF_WB */ + fgets(inbuf, MAXSTRING, FP); + + #endif /* _TGIF_WB */ + scanLineNum++; InitScan(inbuf, "\t\n, "); *** page.c.orig Thu Oct 31 01:45:24 1996 --- page.c Thu Oct 31 01:45:24 1996 *************** *** 178,182 **** { int i, x, y=1; - char s[20]; struct PageRec *page_ptr; --- 178,181 ---- *************** *** 228,236 **** } static void HandleClickInPageWindow(button_ev) XButtonEvent *button_ev; { ! int i, index=(int)(button_ev->x / scrollBarW), total, x, offset; struct PageRec *page_ptr; --- 227,279 ---- } + void GotoPageNum (new_page_num) + int new_page_num; + { + int i=1; + struct PageRec * page_ptr; + + curPage->draw_orig_x = drawOrigX; + curPage->draw_orig_y = drawOrigY; + curPage->zoom_scale = zoomScale; + curPage->zoomed_in = zoomedIn; + + for (page_ptr = firstPage; page_ptr != NULL; page_ptr = page_ptr->next, i++) + if (i == new_page_num) + break; + curPageNum = new_page_num; + curPage = page_ptr; + topObj = curPage->top; + botObj = curPage->bot; + if (curPage->draw_orig_x != drawOrigX || curPage->draw_orig_y != drawOrigY || + curPage->zoom_scale != zoomScale || curPage->zoomed_in != zoomedIn) + { + if (!PRTGIF) AdjSplineVs(); + if (!PRTGIF) AdjCaches(); + curPage->draw_orig_x = drawOrigX; + curPage->draw_orig_y = drawOrigY; + curPage->zoom_scale = zoomScale; + curPage->zoomed_in = zoomedIn; + } + } + + void SetCurPage (page_number) + int page_number; + { + if (pageLayoutMode == PAGE_TILE) return; + + MakeQuiescent (); + PrepareToRecord (CMD_GOTO_PAGE, NULL, NULL, curPageNum); + GotoPageNum (page_number); + RecordCmd (CMD_GOTO_PAGE, NULL, NULL, NULL, curPageNum); + ClearAndRedrawDrawWindow (); + RedrawTitleWindow (); + ShowPage (); + } + static void HandleClickInPageWindow(button_ev) XButtonEvent *button_ev; { ! int i, index=(int)(button_ev->x / scrollBarW), total, offset; struct PageRec *page_ptr; *************** *** 293,297 **** if (w >= offset) { ! int start=(((rulerFontWidth<<1)-7)>>1)+rulerFontWidth; if (page_ptr != curPage) { --- 336,340 ---- if (w >= offset) { ! /* int start=(((rulerFontWidth<<1)-7)>>1)+rulerFontWidth; */ if (page_ptr != curPage) { *************** *** 327,331 **** XMotionEvent *motion_ev; { ! int i, index, total, x, offset; struct PageRec *page_ptr; --- 370,374 ---- XMotionEvent *motion_ev; { ! int i, index, offset; struct PageRec *page_ptr; *************** *** 358,362 **** if (w >= offset) { ! int start=(((rulerFontWidth<<1)-7)>>1)+rulerFontWidth; if (page_ptr->name == NULL) { --- 401,405 ---- if (w >= offset) { ! /* int start=(((rulerFontWidth<<1)-7)>>1)+rulerFontWidth; */ if (page_ptr->name == NULL) { *************** *** 376,413 **** } - void PageEventHandler(input) - XEvent *input; - { - XEvent ev; - - if (input->type == Expose) { - while (XCheckWindowEvent(mainDisplay, pageWindow, ExposureMask, &ev)) ; - RedrawPageWindow(); - } else if (input->type == EnterNotify) { - SetMouseStatus("", "", ""); - } else if (input->type == MotionNotify) { - while (XCheckWindowEvent(mainDisplay,pageWindow,PointerMotionMask,&ev)) ; - if (pageLayoutMode == PAGE_TILE) { - SetMouseStatus("(none)", "Page Menu", "(none)"); - } else { - HandleMotionInPageWindow(&input->xmotion); - } - } else if (input->type == ButtonPress) { - XButtonEvent *button_ev=(&(input->xbutton)); - - if (pageLayoutMode == PAGE_TILE) { - if (button_ev->button == Button2) { - PageMenu(button_ev->x_root, button_ev->y_root, FALSE); - } - } else { - if (button_ev->button == Button1) { - HandleClickInPageWindow(button_ev); - } else if (button_ev->button == Button2) { - PageMenu(button_ev->x_root, button_ev->y_root, FALSE); - } - } - } - } - void RedrawPageDummyWindow() { --- 419,422 ---- *************** *** 444,448 **** { static int initialized=FALSE; - char *c_ptr; if (initialized) return; --- 453,456 ---- *************** *** 487,534 **** } - void GotoPageNum (new_page_num) - int new_page_num; - { - int i=1; - struct PageRec * page_ptr; - - curPage->draw_orig_x = drawOrigX; - curPage->draw_orig_y = drawOrigY; - curPage->zoom_scale = zoomScale; - curPage->zoomed_in = zoomedIn; - - for (page_ptr = firstPage; page_ptr != NULL; page_ptr = page_ptr->next, i++) - if (i == new_page_num) - break; - curPageNum = new_page_num; - curPage = page_ptr; - topObj = curPage->top; - botObj = curPage->bot; - if (curPage->draw_orig_x != drawOrigX || curPage->draw_orig_y != drawOrigY || - curPage->zoom_scale != zoomScale || curPage->zoomed_in != zoomedIn) - { - if (!PRTGIF) AdjSplineVs(); - if (!PRTGIF) AdjCaches(); - curPage->draw_orig_x = drawOrigX; - curPage->draw_orig_y = drawOrigY; - curPage->zoom_scale = zoomScale; - curPage->zoomed_in = zoomedIn; - } - } - - void SetCurPage (page_number) - int page_number; - { - if (pageLayoutMode == PAGE_TILE) return; - - MakeQuiescent (); - PrepareToRecord (CMD_GOTO_PAGE, NULL, NULL, curPageNum); - GotoPageNum (page_number); - RecordCmd (CMD_GOTO_PAGE, NULL, NULL, NULL, curPageNum); - ClearAndRedrawDrawWindow (); - RedrawTitleWindow (); - ShowPage (); - } - void NextPage () { --- 495,498 ---- *************** *** 561,565 **** } - static XComposeStatus c_stat; static int leadingChars=(-1); static char formatStr[20]; --- 525,528 ---- *************** *** 1020,1024 **** } ! #ifdef __hpux extern double atof ARGS_DECL((const char *)); #else /* !__hpux */ --- 983,987 ---- } ! #if defined (__hpux) || defined (linux) || defined(sco) extern double atof ARGS_DECL((const char *)); #else /* !__hpux */ *************** *** 1592,1595 **** --- 1555,1592 ---- PageLayoutSubMenu (index); return (index); + } + + void PageEventHandler(input) + XEvent *input; + { + XEvent ev; + + if (input->type == Expose) { + while (XCheckWindowEvent(mainDisplay, pageWindow, ExposureMask, &ev)) ; + RedrawPageWindow(); + } else if (input->type == EnterNotify) { + SetMouseStatus("", "", ""); + } else if (input->type == MotionNotify) { + while (XCheckWindowEvent(mainDisplay,pageWindow,PointerMotionMask,&ev)) ; + if (pageLayoutMode == PAGE_TILE) { + SetMouseStatus("(none)", "Page Menu", "(none)"); + } else { + HandleMotionInPageWindow(&input->xmotion); + } + } else if (input->type == ButtonPress) { + XButtonEvent *button_ev=(&(input->xbutton)); + + if (pageLayoutMode == PAGE_TILE) { + if (button_ev->button == Button2) { + PageMenu(button_ev->x_root, button_ev->y_root, FALSE); + } + } else { + if (button_ev->button == Button1) { + HandleClickInPageWindow(button_ev); + } else if (button_ev->button == Button2) { + PageMenu(button_ev->x_root, button_ev->y_root, FALSE); + } + } + } } *** pattern.c.orig Thu Oct 31 01:45:26 1996 --- pattern.c Thu Oct 31 01:45:26 1996 *************** *** 1351,1359 **** if (ChangeObjRCBRadius (ObjPtr, rcbRadius)) changed = TRUE; ! if (ChangeObjTextStyle (ObjPtr, curStyle)) changed = TRUE; ! if (ChangeObjTextJust (ObjPtr, textJust)) changed = TRUE; ! if (ChangeObjTextSize (ObjPtr, GetSizeMenuIndex ())) changed = TRUE; ! if (ChangeObjTextFont (ObjPtr, curFont)) changed = TRUE; ! if (ChangeObjVSpace (ObjPtr, textVSpace)) changed = TRUE; return (changed); --- 1351,1359 ---- if (ChangeObjRCBRadius (ObjPtr, rcbRadius)) changed = TRUE; ! if (ChangeObjTextStyle(ObjPtr, curStyle)) changed = TRUE; ! if (ChangeObjTextJust(ObjPtr, textJust)) changed = TRUE; ! if (ChangeObjTextSize(ObjPtr, fontSizes[GetSizeMenuIndex()])) changed = TRUE; ! if (ChangeObjTextFont(ObjPtr, curFont)) changed = TRUE; ! if (ChangeObjVSpace(ObjPtr, textVSpace)) changed = TRUE; return (changed); *** poly.c.orig Thu Oct 31 01:45:28 1996 --- poly.c Thu Oct 31 01:45:28 1996 *************** *** 55,58 **** --- 55,59 ---- #include "grid.e" #include "mainloop.e" + #include "mark.e" #include "msg.e" #include "obj.e" *************** *** 377,380 **** --- 378,382 ---- void AddPtToCreatePoly(AbsX, AbsY) + int AbsX, AbsY; { struct PtRec *pt_ptr=(struct PtRec *)malloc(sizeof(struct PtRec)); *************** *** 1313,1317 **** int min_index; { ! int i, j, n, n1=poly_ptr1->n, n2=poly_ptr2->n, num_pts, ltx, lty, rbx, rby; int min_val, max_val, inc; IntPoint *vs, tmp_p; --- 1315,1319 ---- int min_index; { ! int i, n, n1=poly_ptr1->n, n2=poly_ptr2->n, num_pts, ltx, lty, rbx, rby; int min_val, max_val, inc; IntPoint *vs, tmp_p; *************** *** 1442,1446 **** { struct PolyRec *poly_ptr=obj_ptr->detail.p; ! int i, j, n=poly_ptr->n, num_pts, ltx, lty, rbx, rby, coincide=FALSE; IntPoint *vs, *pv=poly_ptr->vlist; char *smooth=NULL, *ps=poly_ptr->smooth; --- 1444,1448 ---- { struct PolyRec *poly_ptr=obj_ptr->detail.p; ! int i, n=poly_ptr->n, num_pts, ltx, lty, rbx, rby, coincide=FALSE; IntPoint *vs, *pv=poly_ptr->vlist; char *smooth=NULL, *ps=poly_ptr->smooth; *************** *** 1644,1648 **** struct ObjRec *obj_ptr2; struct PolyRec *poly_ptr2; - struct AttrRec *attr_ptr, *next_attr; int x0, y0; --- 1646,1649 ---- *************** *** 2135,2141 **** /* HeadV is where the arrow tip is */ { ! int i, dx, dy; ! struct BBRec bbox; ! IntPoint v[2]; double len, sin, cos, daw; --- 2136,2140 ---- /* HeadV is where the arrow tip is */ { ! int dx, dy; double len, sin, cos, daw; *************** *** 3670,3673 **** --- 3669,3684 ---- return; + if (smooth != NULL && (smooth[0] != FALSE || smooth[num_pts-1] != FALSE)) { + smooth[0] = smooth[num_pts-1] = FALSE; + SetFileModified(TRUE); + + sprintf(gszMsgBox, "%s. Fixed.", + "Invalid poly smooth/hinge specification detected"); + if (PRTGIF) { + fprintf(stderr, "%s\n", gszMsgBox); + } else { + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + } + } if (fileVersion >= 33 && transformed) { fgets(inbuf, MAXSTRING, FP); *** polygon.c.orig Thu Oct 31 01:45:30 1996 --- polygon.c Thu Oct 31 01:45:30 1996 *************** *** 44,47 **** --- 44,48 ---- #include "attr.e" + #include "auxtext.e" #include "box.e" #include "cmd.e" *************** *** 495,498 **** --- 496,500 ---- void AddPtToCreatePolygon(AbsX, AbsY) + int AbsX, AbsY; { struct PtRec *pt_ptr=(struct PtRec *)malloc(sizeof(struct PtRec)); *** raster.c.orig Thu Oct 31 01:45:32 1996 --- raster.c Thu Oct 31 01:45:32 1996 *************** *** 44,47 **** --- 44,48 ---- #include "file.e" #include "font.e" + #include "msg.e" #include "pattern.e" #include "poly.e" *************** *** 495,501 **** sprintf(gszMsgBox, "%1d", curWidthOfLine[i]); curWidthOfLineSpec[i] = UtilStrDup(gszMsgBox); ! sprintf(gszMsgBox, "%1d", curArrowHeadWSpec[i]); curArrowHeadWSpec[i] = UtilStrDup(gszMsgBox); ! sprintf(gszMsgBox, "%1d", curArrowHeadHSpec[i]); curArrowHeadHSpec[i] = UtilStrDup(gszMsgBox); } --- 496,502 ---- sprintf(gszMsgBox, "%1d", curWidthOfLine[i]); curWidthOfLineSpec[i] = UtilStrDup(gszMsgBox); ! sprintf(gszMsgBox, "%s", curArrowHeadWSpec[i]); curArrowHeadWSpec[i] = UtilStrDup(gszMsgBox); ! sprintf(gszMsgBox, "%s", curArrowHeadHSpec[i]); curArrowHeadHSpec[i] = UtilStrDup(gszMsgBox); } *************** *** 506,510 **** if (lineWidth < 0 || lineWidth >= maxLineWidths) { fprintf(stderr, "Invalid %s*%s: '%s', 0 is used.\n", TOOL_NAME, ! "DefaultLineWidth"); } } --- 507,511 ---- if (lineWidth < 0 || lineWidth >= maxLineWidths) { fprintf(stderr, "Invalid %s*%s: '%s', 0 is used.\n", TOOL_NAME, ! "DefaultLineWidth", c_ptr); } } *** rcbox.c.orig Thu Oct 31 01:45:34 1996 --- rcbox.c Thu Oct 31 01:45:34 1996 *************** *** 57,60 **** --- 57,61 ---- #include "ps.e" #include "raster.e" + #include "rect.e" #ifndef _NO_EXTERN #include "rcbox.e" *************** *** 777,780 **** --- 778,789 ---- int rotation, new_alloc, id=0, w, locked=FALSE; int transformed=FALSE, invisible=FALSE; + #ifdef _TGIF_WB + + char aux[10000]; + + strcpy(aux,Inbuf); + + #endif /* _TGIF_WB */ + *ObjPtr = NULL; *************** *** 934,938 **** --- 943,957 ---- struct XfrmMtrxRec *ctm; + #ifdef _TGIF_WB + + s = FindChar ((int)'[', aux); + s++; + + #else /* ~_TGIF_WB */ + fgets(inbuf, MAXSTRING, FP); + + #endif /* _TGIF_WB */ + scanLineNum++; InitScan(inbuf, "\t\n, "); *** rect.c.orig Thu Oct 31 01:45:37 1996 --- rect.c Thu Oct 31 01:45:37 1996 *************** *** 42,45 **** --- 42,47 ---- #include "color.e" #include "dialog.e" + #include "drawing.e" + #include "msg.e" #include "poly.e" #ifndef _NO_EXTERN *************** *** 260,263 **** --- 262,280 ---- } + int BBoxIntersect (Rect1, Rect2) + struct BBRec Rect1, Rect2; + { + if (Rect1.ltx < Rect2.ltx) + if (Rect1.lty < Rect2.lty) + return (Rect1.rbx >= Rect2.ltx && Rect1.rby >= Rect2.lty); + else + return (Rect1.rbx >= Rect2.ltx && Rect1.lty <= Rect2.rby); + else + if (Rect1.lty < Rect2.lty) + return (Rect1.ltx <= Rect2.rbx && Rect1.rby >= Rect2.lty); + else + return (Rect1.ltx <= Rect2.rbx && Rect1.lty <= Rect2.rby); + } + int IntersectRect(BBox1, BBox2, BBox3) struct BBRec BBox1, BBox2, *BBox3; *************** *** 281,299 **** return (BBox1.ltx >= BBox2.ltx && BBox1.lty >= BBox2.lty && BBox1.rbx <= BBox2.rbx && BBox1.rby <= BBox2.rby); - } - - int BBoxIntersect (Rect1, Rect2) - struct BBRec Rect1, Rect2; - { - if (Rect1.ltx < Rect2.ltx) - if (Rect1.lty < Rect2.lty) - return (Rect1.rbx >= Rect2.ltx && Rect1.rby >= Rect2.lty); - else - return (Rect1.rbx >= Rect2.ltx && Rect1.lty <= Rect2.rby); - else - if (Rect1.lty < Rect2.lty) - return (Rect1.ltx <= Rect2.rbx && Rect1.rby >= Rect2.lty); - else - return (Rect1.ltx <= Rect2.rbx && Rect1.lty <= Rect2.rby); } --- 298,301 ---- *** remote.c.orig Thu Oct 31 01:45:39 1996 --- remote.c Thu Oct 31 01:45:39 1996 *************** *** 763,773 **** int LoadRemoteFileInMem ARGS_DECL((char *url, char **ppsz_buf, ! char **ppsz_content_type, int *pn_buf_sz, int *pn_html, int force_load)); static int LoadForwardedFileInMem(url, ppsz_buf, ppsz_content_type, pn_buf_sz, ! pn_html, force_load) ! char *url, **ppsz_buf, **ppsz_content_type; ! int *pn_buf_sz, *pn_html, force_load; { char *location=HttpHeaderGetLocation(), *dup_location; --- 763,774 ---- int LoadRemoteFileInMem ARGS_DECL((char *url, char **ppsz_buf, ! char **ppsz_content_type, int *pn_buf_sz, int *pn_html, int force_load, ! char *psz_final_url, int cb_final_url)); static int LoadForwardedFileInMem(url, ppsz_buf, ppsz_content_type, pn_buf_sz, ! pn_html, force_load, psz_final_url, cb_final_url) ! char *url, **ppsz_buf, **ppsz_content_type, *psz_final_url; ! int *pn_buf_sz, *pn_html, force_load, cb_final_url; { char *location=HttpHeaderGetLocation(), *dup_location; *************** *** 792,795 **** --- 793,799 ---- return TRUE; } + if (psz_final_url != NULL && cb_final_url > 0) { + UtilStrCpy(psz_final_url, cb_final_url, dup_location); + } sprintf(gszMsgBox, "Forwarding '%s'", url); Msg(gszMsgBox); *************** *** 803,807 **** gnForwardCount++; rc = LoadRemoteFileInMem(dup_location, ppsz_buf, ppsz_content_type, ! pn_buf_sz, pn_html, force_load); gnForwardCount--; free(dup_location); --- 807,811 ---- gnForwardCount++; rc = LoadRemoteFileInMem(dup_location, ppsz_buf, ppsz_content_type, ! pn_buf_sz, pn_html, force_load, psz_final_url, cb_final_url); gnForwardCount--; free(dup_location); *************** *** 867,871 **** gnAuthCount++; rc = LoadRemoteFileInMem(url, ppsz_buf, ppsz_content_type, pn_buf_sz, ! pn_html, force_load); gnAuthCount--; ResetAuthorization(); --- 871,875 ---- gnAuthCount++; rc = LoadRemoteFileInMem(url, ppsz_buf, ppsz_content_type, pn_buf_sz, ! pn_html, force_load, NULL, 0); gnAuthCount--; ResetAuthorization(); *************** *** 905,909 **** gnAuthCount++; rc = LoadRemoteFileInMem(url, ppsz_buf, ppsz_content_type, ! pn_buf_sz, pn_html, force_load); gnAuthCount--; ResetAuthorization(); --- 909,913 ---- gnAuthCount++; rc = LoadRemoteFileInMem(url, ppsz_buf, ppsz_content_type, ! pn_buf_sz, pn_html, force_load, NULL, 0); gnAuthCount--; ResetAuthorization(); *************** *** 917,930 **** int LoadRemoteFileInMem(url, ppsz_buf, ppsz_content_type, pn_buf_sz, pn_html, ! force_load) ! char *url, **ppsz_buf, **ppsz_content_type; ! int *pn_buf_sz, *pn_html, force_load; /* if the remote type is http, the url has an extension and it */ /* is not html but the retrieved file is html, then it's */ /* probably an error */ { ! int status=0, n_socket=0, buf_sz=0, rc; ! int port=0, proxy_port=0, protocol_is_http=FALSE, http_extracted_text=FALSE; ! char *protocol=NULL, *host=NULL, *path=NULL, *buf=NULL, *proxy_host=NULL; char port_str[20]; struct URLCacheRec *url_cache=NULL; --- 921,934 ---- int LoadRemoteFileInMem(url, ppsz_buf, ppsz_content_type, pn_buf_sz, pn_html, ! force_load, psz_final_url, cb_final_url) ! char *url, **ppsz_buf, **ppsz_content_type, *psz_final_url; ! int *pn_buf_sz, *pn_html, force_load, cb_final_url; /* if the remote type is http, the url has an extension and it */ /* is not html but the retrieved file is html, then it's */ /* probably an error */ { ! int status=0, rc; ! int port=0, protocol_is_http=FALSE, http_extracted_text=FALSE; ! char *protocol=NULL, *host=NULL, *path=NULL, *proxy_host=NULL; char port_str[20]; struct URLCacheRec *url_cache=NULL; *************** *** 992,996 **** case 302: rc = LoadForwardedFileInMem(url, ppsz_buf, ppsz_content_type, ! pn_buf_sz, pn_html, force_load); break; case 401: --- 996,1000 ---- case 302: rc = LoadForwardedFileInMem(url, ppsz_buf, ppsz_content_type, ! pn_buf_sz, pn_html, force_load, psz_final_url, cb_final_url); break; case 401: *** ruler.c.orig Thu Oct 31 01:45:41 1996 --- ruler.c Thu Oct 31 01:45:41 1996 *************** *** 39,42 **** --- 39,43 ---- #include "types.h" + #include "choice.e" #include "cursor.e" #include "dialog.e" *** select.c.orig Thu Oct 31 01:45:43 1996 --- select.c Thu Oct 31 01:45:43 1996 *************** *** 61,64 **** --- 61,65 ---- #include "msg.e" #include "names.e" + #include "navigate.e" #include "obj.e" #include "page.e" *************** *** 75,78 **** --- 76,80 ---- #include "stk.e" #include "stretch.e" + #include "util.e" #ifndef XK_KP_Left *************** *** 1693,1708 **** } if (FileIsRemote(file_name)) { ! char *buf=NULL, *content_type=NULL; int buf_sz=0, is_html=FALSE; SetWatchCursor(drawWindow); SetWatchCursor(mainWindow); SaveStatusStrings(); rc = LoadRemoteFileInMem(file_name, &buf, &content_type, &buf_sz, ! &is_html, FALSE); RestoreStatusStrings(); SetDefaultCursor(mainWindow); ShowCursor(); if (rc && buf != NULL) { LoadRemoteFileFromMem(file_name, buf, content_type, buf_sz, is_html); } else { --- 1695,1714 ---- } if (FileIsRemote(file_name)) { ! char *buf=NULL, *content_type=NULL, final_url[MAXPATHLENGTH+1]; int buf_sz=0, is_html=FALSE; + *final_url = '\0'; SetWatchCursor(drawWindow); SetWatchCursor(mainWindow); SaveStatusStrings(); rc = LoadRemoteFileInMem(file_name, &buf, &content_type, &buf_sz, ! &is_html, FALSE, final_url, sizeof(final_url)); RestoreStatusStrings(); SetDefaultCursor(mainWindow); ShowCursor(); if (rc && buf != NULL) { + if (*final_url != '\0') { + UtilStrCpy(file_name, sizeof(file_name), final_url); + } LoadRemoteFileFromMem(file_name, buf, content_type, buf_sz, is_html); } else { *** setup.c.orig Thu Oct 31 01:45:45 1996 --- setup.c Thu Oct 31 01:45:45 1996 *************** *** 78,81 **** --- 78,82 ---- #include "stretch.e" #include "text.e" + #include "util.e" #include "xbitmap.e" #include "xpixmap.e" *************** *** 83,89 **** #include "tgificon.xbm" - extern char * getenv ARGS_DECL((char *)); ! #ifdef __hpux extern double atof ARGS_DECL((const char *)); #else --- 84,89 ---- #include "tgificon.xbm" extern char * getenv ARGS_DECL((char *)); ! #if defined (__hpux) || defined (linux) || defined(sco) extern double atof ARGS_DECL((const char *)); #else *************** *** 279,282 **** --- 279,283 ---- left += w; } + if (btn1_bits) { } } *************** *** 566,569 **** --- 567,571 ---- static Window savedMainWindow=None, savedDrawWindow=None; + static Pixmap wmIconPixmap=None; void Setup () *************** *** 1513,1518 **** wmhints.icon_pixmap = None; ! if (iconWindowCreated) ! { unsigned int dummy_icon_w, dummy_icon_h; --- 1515,1519 ---- wmhints.icon_pixmap = None; ! if (iconWindowCreated) { unsigned int dummy_icon_w, dummy_icon_h; *************** *** 1526,1535 **** wmhints.icon_window = iconBaseWindow; ! if ((c_ptr = XGetDefault (mainDisplay,TOOL_NAME,"IconGeometry")) != NULL) ! { ! bitmask = XParseGeometry (c_ptr, &(sizehints.x), &(sizehints.y), &dummy_icon_w, &dummy_icon_h); ! if ((bitmask & XValue) && (bitmask & YValue)) ! { if (bitmask & XNegative) sizehints.x += DisplayWidth (mainDisplay, mainScreen) - iconWindowW - (brdrW<<1) - 1; --- 1527,1534 ---- wmhints.icon_window = iconBaseWindow; ! if ((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"IconGeometry")) != NULL) { ! bitmask = XParseGeometry(c_ptr, &(sizehints.x), &(sizehints.y), &dummy_icon_w, &dummy_icon_h); ! if ((bitmask & XValue) && (bitmask & YValue)) { if (bitmask & XNegative) sizehints.x += DisplayWidth (mainDisplay, mainScreen) - iconWindowW - (brdrW<<1) - 1; *************** *** 1542,1596 **** wmhints.icon_x = sizehints.x; wmhints.icon_y = sizehints.y; ! } ! else ! fprintf (stderr, "%s %s*IconGeometry: %s. Ignored!\n", "Invalid spec -- ", TOOL_NAME, c_ptr); } #ifdef NOTR4MODE ! XSetNormalHints (mainDisplay, iconBaseWindow, &sizehints); #else ! XSetWMNormalHints (mainDisplay, iconBaseWindow, &sizehints); #endif ! } ! else ! { if (((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"UseWMIconPixmap")) != NULL) ! && (strcmp(c_ptr,"True") == 0 || strcmp(c_ptr,"true") == 0)) ! { wmhints.initial_state = NormalState; ! wmhints.icon_pixmap = XCreateBitmapFromData (mainDisplay, mainWindow, ! (char *)tgificon_bits, tgificon_width, tgificon_height); wmhints.flags |= IconPixmapHint | StateHint; } } ! XSetWMHints (mainDisplay, mainWindow, &wmhints); ! if ((wmhints.flags & IconPixmapHint) && wmhints.icon_pixmap != None) { ! XFreePixmap(mainDisplay, wmhints.icon_pixmap); ! } wmhints.flags = InputHint; wmhints.input = True; ! XSetWMHints (mainDisplay, drawWindow, &wmhints); ! InitText (); ! InitRemote (); ! InitImageProc (); ! InitImport (); ! InitHelp (); ! InitShape (); } ! void CleanUpResiduals () { ! if (savedMainWindow != None) XDestroyWindow (mainDisplay, savedMainWindow); ! CleanUpPaperSize (); } ! int TieLooseEnds () /* returns TRUE if something got created */ /* returns FALSE otherwise */ { ! if (curChoice == DRAWTEXT) return (CreateTextObj ()); ! return (FALSE); } --- 1541,1594 ---- wmhints.icon_x = sizehints.x; wmhints.icon_y = sizehints.y; ! } else { ! fprintf(stderr, "%s %s*IconGeometry: %s. Ignored!\n", "Invalid spec -- ", TOOL_NAME, c_ptr); + } } #ifdef NOTR4MODE ! XSetNormalHints(mainDisplay, iconBaseWindow, &sizehints); #else ! XSetWMNormalHints(mainDisplay, iconBaseWindow, &sizehints); #endif ! } else { if (((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"UseWMIconPixmap")) != NULL) ! && (strcmp(c_ptr,"True") == 0 || strcmp(c_ptr,"true") == 0)) { wmhints.initial_state = NormalState; ! wmhints.icon_pixmap = wmIconPixmap = ! XCreateBitmapFromData(mainDisplay, mainWindow, ! (char*)tgificon_bits, tgificon_width, tgificon_height); wmhints.flags |= IconPixmapHint | StateHint; } } ! XSetWMHints(mainDisplay, mainWindow, &wmhints); wmhints.flags = InputHint; wmhints.input = True; ! XSetWMHints(mainDisplay, drawWindow, &wmhints); ! InitText(); ! InitRemote(); ! InitImageProc(); ! InitImport(); ! InitHelp(); ! InitShape(); } ! void CleanUpResiduals() { ! if (wmIconPixmap != None) { ! XFreePixmap(mainDisplay, wmIconPixmap); ! wmIconPixmap = None; ! } ! if (savedMainWindow != None) XDestroyWindow(mainDisplay, savedMainWindow); ! CleanUpPaperSize(); } ! int TieLooseEnds() /* returns TRUE if something got created */ /* returns FALSE otherwise */ { ! if (curChoice == DRAWTEXT) return CreateTextObj(); ! return FALSE; } *** shape.c.orig Thu Oct 31 01:45:47 1996 --- shape.c Thu Oct 31 01:45:47 1996 *************** *** 52,59 **** --- 52,63 ---- #include "drawing.e" #include "dup.e" + #include "grid.e" #include "group.e" + #include "mainloop.e" #include "menu.e" + #include "move.e" #include "msg.e" #include "obj.e" + #include "oval.e" #include "page.e" #include "pattern.e" *************** *** 61,64 **** --- 65,69 ---- #include "polygon.e" #include "raster.e" + #include "ruler.e" #include "select.e" #include "setup.e" *************** *** 245,249 **** /* if (vertex_at_right), easy */ /* if (!vertex_at_right && start_degree == 0) self-determined */ ! /* if (!vertex_at_right && start_degree != 0) start_degree is the /* real start angle in degrees */ { --- 250,254 ---- /* if (vertex_at_right), easy */ /* if (!vertex_at_right && start_degree == 0) self-determined */ ! /* if (!vertex_at_right && start_degree != 0) start_degree is the */ /* real start angle in degrees */ { *************** *** 292,296 **** void CalcParallelShapeVs() { ! int w=gnEndX-gnOrigX, h=gnEndY-gnOrigY, dx; double dval; --- 297,301 ---- void CalcParallelShapeVs() { ! int h=gnEndY-gnOrigY, dx; double dval; *************** *** 309,313 **** void CalcTrapezoidShapeVs() { ! int w=gnEndX-gnOrigX, h=gnEndY-gnOrigY, dx; double dval; --- 314,318 ---- void CalcTrapezoidShapeVs() { ! int h=gnEndY-gnOrigY, dx; double dval; *************** *** 657,661 **** if (*pn_need_to_draw && gpVertices != NULL) { int saved_draw_orig_x=drawOrigX, saved_draw_orig_y=drawOrigY; ! int saved_zoomed_in=zoomedIn, saved_zoom_scale=zoomScale, n=0; if (gpRubberVertices != NULL) free(gpRubberVertices); --- 662,666 ---- if (*pn_need_to_draw && gpVertices != NULL) { int saved_draw_orig_x=drawOrigX, saved_draw_orig_y=drawOrigY; ! int saved_zoomed_in=zoomedIn, saved_zoom_scale=zoomScale; if (gpRubberVertices != NULL) free(gpRubberVertices); *************** *** 821,825 **** { struct ObjRec *obj_ptr; ! struct SelRec *sel_ptr, *tmp_top_sel=NULL, *tmp_bot_sel=NULL; SelAllObj(FALSE); --- 826,830 ---- { struct ObjRec *obj_ptr; ! struct SelRec *tmp_top_sel=NULL, *tmp_bot_sel=NULL; SelAllObj(FALSE); *** shortcut.c.orig Thu Oct 31 01:45:49 1996 --- shortcut.c Thu Oct 31 01:45:49 1996 *************** *** 287,290 **** --- 287,291 ---- { '\0', 0, "About()", 0, }, { '\0', 0, "Copyright()", 0, }, + { '\0', 0, "SetSelFontSize()", 0, }, { '\0', 0, "", 0 } }; *** spline.c.orig Thu Oct 31 01:45:50 1996 --- spline.c Thu Oct 31 01:45:50 1996 *************** *** 42,45 **** --- 42,46 ---- #include "dialog.e" + #include "msg.e" #include "poly.e" #include "polygon.e" *** stk.c.orig Thu Oct 31 01:45:52 1996 --- stk.c Thu Oct 31 01:45:52 1996 *************** *** 236,240 **** struct ObjRec *obj_ptr; char sym_name[MAXPATHLENGTH], path_name[MAXPATHLENGTH]; ! char file_name[MAXPATHLENGTH], s[MAXPATHLENGTH], * rest; int read_status, short_name; FILE *fp; --- 236,240 ---- struct ObjRec *obj_ptr; char sym_name[MAXPATHLENGTH], path_name[MAXPATHLENGTH]; ! char file_name[MAXPATHLENGTH], *rest; int read_status, short_name; FILE *fp; *** stretch.c.orig Thu Oct 31 01:45:54 1996 --- stretch.c Thu Oct 31 01:45:54 1996 *************** *** 2695,2698 **** --- 2695,2699 ---- struct ObjRec *ObjPtr; double AngleInRadian; + int Corner; { double angle=AngleInRadian*64.0*180.0/M_PI; *************** *** 2713,2718 **** if (dx != 0 || dy != 0) { ! x = (short)round(dx*cos_val - dy*sin_val); ! y = (short)round(dx*sin_val + dy*cos_val); } x += rotatePivotX; --- 2714,2719 ---- if (dx != 0 || dy != 0) { ! x = (int)round(dx*cos_val - dy*sin_val); ! y = (int)round(dx*sin_val + dy*cos_val); } x += rotatePivotX; *************** *** 2770,2775 **** if (dx != 0 || dy != 0) { ! x = (short)round(dx*cos_val - dy*sin_val); ! y = (short)round(dx*sin_val + dy*cos_val); } x += rotatePivotX; --- 2771,2776 ---- if (dx != 0 || dy != 0) { ! x = (int)round(dx*cos_val - dy*sin_val); ! y = (int)round(dx*sin_val + dy*cos_val); } x += rotatePivotX; *************** *** 2895,2899 **** text_cursor_shown = textCursorShown; text_obj_created = TieLooseEnds(); ! curRotate = (curRotate+1) & 0x3; ShowRotate(); if (!text_obj_created && curChoice == DRAWTEXT && text_cursor_shown) { --- 2896,2902 ---- text_cursor_shown = textCursorShown; text_obj_created = TieLooseEnds(); ! textRotation += rotationIncrement; ! while (textRotation < 0) textRotation += (360<<6); ! while (textRotation >= (360<<6)) textRotation -= (360<<6); ShowRotate(); if (!text_obj_created && curChoice == DRAWTEXT && text_cursor_shown) { *************** *** 2944,2948 **** text_cursor_shown = textCursorShown; text_obj_created = TieLooseEnds(); ! curRotate = (curRotate+3) & 0x3; ShowRotate(); if (!text_obj_created && curChoice == DRAWTEXT && text_cursor_shown) { --- 2947,2953 ---- text_cursor_shown = textCursorShown; text_obj_created = TieLooseEnds(); ! textRotation -= rotationIncrement; ! while (textRotation < 0) textRotation += (360<<6); ! while (textRotation >= (360<<6)) textRotation -= (360<<6); ShowRotate(); if (!text_obj_created && curChoice == DRAWTEXT && text_cursor_shown) { *** tcp.c.orig Thu Oct 31 01:45:56 1996 --- tcp.c Thu Oct 31 01:45:56 1996 *************** *** 41,44 **** --- 41,45 ---- #include #include + #include #include #include *** text.c.orig Thu Oct 31 01:45:58 1996 --- text.c Thu Oct 31 01:45:58 1996 *************** *** 603,607 **** } ! static ShowTextRelatedInfo() { ShowJust(); --- 603,608 ---- } ! static ! void ShowTextRelatedInfo() { ShowJust(); *************** *** 911,915 **** if (editingText) { ! int x; switch (textJust) { --- 912,916 ---- if (editingText) { ! int x=0; switch (textJust) { *************** *** 946,950 **** } } else { ! int x; switch (textJust) { --- 947,951 ---- } } else { ! int x=0; switch (textJust) { *************** *** 1161,1166 **** tmpAdjY = ((textH-ABS_SIZE(textH))>>1); } else { - int new_x, new_y; - textW = obj_ptr->orig_obbox.rbx - obj_ptr->orig_obbox.ltx; textH = obj_ptr->orig_obbox.rby - obj_ptr->orig_obbox.lty; --- 1162,1165 ---- *************** *** 2778,2782 **** { struct ObjRec *obj_ptr=attr_ptr->obj; ! int abs_x, abs_y, x_off=0, y_off=0, tmp_x, tmp_y, right_index, amount, left; int inherited_attr_left_index=0, ok; int saved_grouped_text_editable=groupedTextEditable; --- 2777,2781 ---- { struct ObjRec *obj_ptr=attr_ptr->obj; ! int abs_x, abs_y, x_off=0, y_off=0, tmp_x, right_index, amount, left; int inherited_attr_left_index=0, ok; int saved_grouped_text_editable=groupedTextEditable; *** tgif.c.orig Thu Oct 31 01:46:00 1996 --- tgif.c Thu Oct 31 01:46:00 1996 *************** *** 191,195 **** if (read_status == INVALID) { ! fprintf(stderr, "File version too large (=%1d). Abort processing!\n", fileVersion); return FALSE; --- 191,195 ---- if (read_status == INVALID) { ! fprintf(stderr, "File version too large (=%1d). Processing aborted!\n", fileVersion); return FALSE; *************** *** 203,206 **** --- 203,212 ---- GotoPageNum(cmdLinePageNum); } + if (cmdLineColor && colorMenuItems == NULL) { + fprintf(stderr, "%s\n\t(%s). Processing aborted!\n", + "File does not contain enough color information", + "not saved by tgif-3.0-p10 or beyond"); + return FALSE; + } return TRUE; } *************** *** 212,216 **** { char inbuf[MAXSTRING+1]; - char *c_ptr; int len, argc_to_be; --- 218,221 ---- *************** *** 230,234 **** if (inbuf[--len] == '\n') inbuf[len] = '\0'; if (PrTgifLoad(inbuf)) { ! colorDump = FALSE; if (cmdLineOneFilePerPage) { if (pageLayoutMode == PAGE_TILE) { --- 235,239 ---- if (inbuf[--len] == '\n') inbuf[len] = '\0'; if (PrTgifLoad(inbuf)) { ! colorDump = cmdLineColor; if (cmdLineOneFilePerPage) { if (pageLayoutMode == PAGE_TILE) { *************** *** 256,259 **** --- 261,267 ---- } DelAllObj(); + if (cmdLineColor) CleanUpColors(); + } else { + fprintf(stderr, "\n"); } } *************** *** 265,269 **** lastFile = (argc == 1); if (PrTgifLoad(*argv)) { ! colorDump = FALSE; if (cmdLineOneFilePerPage) { if (pageLayoutMode == PAGE_TILE) { --- 273,277 ---- lastFile = (argc == 1); if (PrTgifLoad(*argv)) { ! colorDump = cmdLineColor; if (cmdLineOneFilePerPage) { if (pageLayoutMode == PAGE_TILE) { *************** *** 291,294 **** --- 299,305 ---- } DelAllObj(); + if (cmdLineColor) CleanUpColors(); + } else { + fprintf(stderr, "\n"); } } *************** *** 328,333 **** /* Prolog's foreign function interface. */ { ! register int i; ! char op_name[80], file_name[80]; char *sp[6], *func_strp; /* --- 339,346 ---- /* Prolog's foreign function interface. */ { ! /* ! * register int i; ! */ ! char op_name[80], file_name[MAXPATHLENGTH+1]; char *sp[6], *func_strp; /* *** tgif_dbg.c.orig Thu Oct 31 01:46:02 1996 --- tgif_dbg.c Thu Oct 31 01:46:02 1996 *************** *** 178,183 **** got_trigger(1); } ! fprintf(gpTraceFile, "g: %6d 0x%08x %d\n", ! gnCreateGCCount, (unsigned int)gc, valuemask); } return gc; --- 178,183 ---- got_trigger(1); } ! fprintf(gpTraceFile, "g: %6d 0x%08x %ld\n", ! gnCreateGCCount, (unsigned int)gc, (long)valuemask); } return gc; *** wb1.c.orig Thu Oct 31 01:46:03 1996 --- wb1.c Thu Oct 31 01:46:03 1996 *************** *** 21,32 **** --- 21,39 ---- #include "types.h" + #include "arc.e" + #include "box.e" #include "choice.e" #include "cmd.e" #include "color.e" + #include "dialog.e" #include "drawing.e" #include "file.e" + #include "group.e" + #include "move.e" #include "msg.e" #include "obj.e" + #include "oval.e" #include "page.e" + #include "rcbox.e" #include "select.e" #include "setup.e" *************** *** 693,697 **** obj_ptr_to->obbox.rbx+GRID_ABS_SIZE(1), obj_ptr_to->obbox.rby+GRID_ABS_SIZE(1)); ! } --- 700,704 ---- obj_ptr_to->obbox.rbx+GRID_ABS_SIZE(1), obj_ptr_to->obbox.rby+GRID_ABS_SIZE(1)); ! return TRUE; } *************** *** 1070,1074 **** if (strcmp (obj_name, "box") == 0) { ! ReadBoxObj (buff, ObjPtr); /* if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); --- 1077,1081 ---- if (strcmp (obj_name, "box") == 0) { ! ReadBoxObj (NULL, buff, ObjPtr); /* if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); *************** *** 1079,1083 **** else if (strcmp (obj_name, "oval") == 0) { ! ReadOvalObj (buff, ObjPtr); /* if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); --- 1086,1090 ---- else if (strcmp (obj_name, "oval") == 0) { ! ReadOvalObj (NULL, buff, ObjPtr); /* if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); *************** *** 1104,1108 **** else if (strcmp (obj_name, "arc") == 0) { ! ReadArcObj (buff, ObjPtr); /* if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); --- 1111,1115 ---- else if (strcmp (obj_name, "arc") == 0) { ! ReadArcObj (NULL, buff, ObjPtr); /* if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); *************** *** 1113,1117 **** else if (strcmp (obj_name, "rcbox") == 0) { ! ReadRCBoxObj (buff, ObjPtr); /*if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); --- 1120,1124 ---- else if (strcmp (obj_name, "rcbox") == 0) { ! ReadRCBoxObj (NULL, buff, ObjPtr); /*if (*ObjPtr == NULL) return (FALSE); */ ReadObjAttrsFromBuff (START_HAVING_ATTRS-1, buffattr, ObjPtr); *************** *** 1129,1133 **** return (TRUE); } ! } --- 1136,1140 ---- return (TRUE); } ! return FALSE; } *** wb2.c.orig Thu Oct 31 01:46:05 1996 --- wb2.c Thu Oct 31 01:46:05 1996 *************** *** 27,30 **** --- 27,32 ---- #include "dup.e" #include "file.e" + #include "font.e" + #include "msg.e" #ifndef _NO_EXTERN #include "wb2.e" *************** *** 400,405 **** { ! struct ObjRec * TextObj; ! char inbuf[MAXSTRING+1], * s, * line, * c_ptr; char * name, * value; int len, shown, nameshown, inherited, cur_size; --- 402,406 ---- { ! char * s, * line, * c_ptr; char * name, * value; int len, shown, nameshown, inherited, cur_size; *** wb3.c.orig Thu Oct 31 01:46:06 1996 --- wb3.c Thu Oct 31 01:46:07 1996 *************** *** 31,38 **** --- 31,40 ---- #include "grid.e" #include "msg.e" + #include "obj.e" #include "page.e" #include "pattern.e" #include "poly.e" #include "prtgif.e" + #include "raster.e" #include "setup.e" #include "stk.e" *************** *** 72,78 **** struct PolyRec * poly_ptr; IntPoint * v; ! char color_str[40], * s, inbuf[MAXSTRING+1], msg[MAXSTRING]; int num_pts, ltx=0, lty=0, rbx=0, rby=0, x, y, id=0; ! int initialized, rotation, count, new_alloc, j=0; int style, width=0, pen, curved, fill, dash, locked=FALSE; int aw=origArrowHeadW[6], ah=origArrowHeadH[6]; --- 74,80 ---- struct PolyRec * poly_ptr; IntPoint * v; ! char color_str[40], * s, msg[MAXSTRING]; int num_pts, ltx=0, lty=0, rbx=0, rby=0, x, y, id=0; ! int initialized, rotation, count, new_alloc; int style, width=0, pen, curved, fill, dash, locked=FALSE; int aw=origArrowHeadW[6], ah=origArrowHeadH[6]; *** xbitmap.c.orig Thu Oct 31 01:46:09 1996 --- xbitmap.c Thu Oct 31 01:46:09 1996 *************** *** 60,63 **** --- 60,64 ---- #include "mark.e" #include "menu.e" + #include "move.e" #include "msg.e" #include "names.e" *************** *** 70,73 **** --- 71,75 ---- #include "select.e" #include "setup.e" + #include "stretch.e" #include "util.e" #ifndef _NO_EXTERN *************** *** 76,82 **** #include "xpixmap.e" ! #ifdef __hpux extern double atof ARGS_DECL((const char *)); ! #else /* !__hpux */ #if __STDC__ || defined(__cplusplus) || defined(c_plusplus) extern double atof ARGS_DECL((const char *)); --- 78,86 ---- #include "xpixmap.e" ! extern int atoi ARGS_DECL((char *)); ! ! #if defined (__hpux) || defined (linux) || defined(sco) extern double atof ARGS_DECL((const char *)); ! #else /* ~__hpux */ #if __STDC__ || defined(__cplusplus) || defined(c_plusplus) extern double atof ARGS_DECL((const char *)); *************** *** 86,89 **** --- 90,113 ---- #endif /* __hpux */ + #if defined (linux) || defined (sco) + extern void srand ARGS_DECL((unsigned int)); + #else /* ~(defined (linux) || defined (sco)) */ + #ifdef _AIX + extern void srand ARGS_DECL((unsigned int)); + #else /* ~_AIX */ + #ifdef __alpha + extern void srand ARGS_DECL((unsigned int)); + #else /* ~__alpha */ + #ifdef sgi + extern void srand ARGS_DECL((unsigned int)); + #else /* ~sgi */ + extern int srand ARGS_DECL((int)); + #endif /* sgi */ + #endif /* __alpha */ + #endif /* _AIX */ + #endif /* defined (linux) || defined (sco) */ + + extern int rand ARGS_DECL((void)); + GC xbmGC = NULL; *************** *** 1077,1183 **** static - void CopyXBmProperties(DestXbmObj, SrcXbmObj) - struct ObjRec *DestXbmObj, *SrcXbmObj; - { - struct XBmRec *dest_xbm_ptr=DestXbmObj->detail.xbm; - struct XBmRec *src_xbm_ptr=SrcXbmObj->detail.xbm; - - dest_xbm_ptr->fill = src_xbm_ptr->fill; - dest_xbm_ptr->rotate = src_xbm_ptr->rotate; - DestXbmObj->color = SrcXbmObj->color; - } - - static - int FinishBreakUpXBitmap(obj_ptr, cols_and_rows, cols, rows) - struct ObjRec *obj_ptr; - int cols_and_rows, cols, rows; - { - struct XBmRec *xbm_ptr=obj_ptr->detail.xbm; - int y, image_w=xbm_ptr->image_w, image_h=xbm_ptr->image_h; - int chunk_w=0, chunk_h=0, num_cols=0, num_rows=0, total_chunks=0; - int orig_x=obj_ptr->x, orig_y=obj_ptr->y; - - if (cols_and_rows) { - chunk_w = (int)(image_w / cols); - chunk_h = (int)(image_h / rows); - } else { - chunk_w = cols; - chunk_h = rows; - } - for (y=0; y < image_h; y += chunk_h) { - int h=min(image_h-y,chunk_h), x; - - for (x=0; x < image_w; x += chunk_w) { - int w=min(image_w-x,chunk_w); - struct ObjRec *new_obj_ptr; - Pixmap dest_bitmap=None; - XImage *dest_image=NULL; - - if (w <= 0 || h <= 0 || - !ExtractBitmap(xbm_ptr->bitmap, xbm_ptr->image, x, y, w, h, - &dest_bitmap, &dest_image)) { - continue; - } - total_chunks++; - new_obj_ptr = CreateXBmObj(w, h, w, h, dest_bitmap, dest_image); - CopyXBmProperties(new_obj_ptr, obj_ptr); - AdjObjBBox(new_obj_ptr); - MoveObj(new_obj_ptr, orig_x+x, orig_y+y); - AddObj(NULL, topObj, new_obj_ptr); - } - } - if (total_chunks > 0) { - int i; - - RemoveAllSel(); - UnlinkObj(obj_ptr); - FreeObj(obj_ptr); - - for (i=0, obj_ptr=topObj; obj_ptr != NULL && i < total_chunks; i++, - obj_ptr=obj_ptr->next) { - struct SelRec *sel_ptr=(struct SelRec *)malloc(sizeof(struct SelRec)); - - if (sel_ptr == NULL) { - FailAllocMessage(); - return FALSE; - } - sel_ptr->obj = obj_ptr; - if (botSel != NULL) { - botSel->next = sel_ptr; - } else { - topSel = sel_ptr; - } - sel_ptr->prev = botSel; - sel_ptr->next = NULL; - botSel = sel_ptr; - } - } - return (total_chunks > 0); - } - - void BreakUpXBitmap(obj_ptr, cols_and_rows, cols, rows) - struct ObjRec *obj_ptr; - int cols_and_rows, cols, rows; - { - struct XBmRec *xbm_ptr=obj_ptr->detail.xbm; - - if (xbm_ptr->real_type == XBM_EPS) { - MsgBox("Cannot break up an EPS object.", TOOL_NAME, INFO_MB); - return; - } - HighLightReverse (); - PrepareToReplaceAnObj(obj_ptr); - if (FinishBreakUpXBitmap(obj_ptr, cols_and_rows, cols, rows)) { - UpdSelBBox(); - RecordCmd(CMD_ONE_TO_MANY, NULL, topSel, botSel, numObjSelected); - SetFileModified(TRUE); - justDupped = FALSE; - } else { - AbortPrepareCmd(CMD_REPLACE); - } - HighLightForward(); - } - - static void BuildObjXPmColors (ObjPtr) struct ObjRec * ObjPtr; --- 1101,1104 ---- *************** *** 2069,2073 **** int nInImageProc, nPageNumInFileName; { /* called when printing in the xbm or xpm format */ ! register int j, k, bit_count, index, data; int i, len, ltx, lty, w, h, byte_count, short_name, pixel; int left, top, right, bottom, target_percent; --- 1990,1994 ---- int nInImageProc, nPageNumInFileName; { /* called when printing in the xbm or xpm format */ ! register int j, k, bit_count, index, data=0; int i, len, ltx, lty, w, h, byte_count, short_name, pixel; int left, top, right, bottom, target_percent; *************** *** 2595,2599 **** int row, col, x, y, nibbles_per_row, image_w, image_h; int color_index, rotate, flip; ! int orig_x, orig_y; Pixmap bitmap; char * xbm_data; --- 2516,2520 ---- int row, col, x, y, nibbles_per_row, image_w, image_h; int color_index, rotate, flip; ! int orig_x=0, orig_y=0; Pixmap bitmap; char * xbm_data; *************** *** 3044,3047 **** --- 2965,3071 ---- static + void CopyXBmProperties(DestXbmObj, SrcXbmObj) + struct ObjRec *DestXbmObj, *SrcXbmObj; + { + struct XBmRec *dest_xbm_ptr=DestXbmObj->detail.xbm; + struct XBmRec *src_xbm_ptr=SrcXbmObj->detail.xbm; + + dest_xbm_ptr->fill = src_xbm_ptr->fill; + dest_xbm_ptr->rotate = src_xbm_ptr->rotate; + DestXbmObj->color = SrcXbmObj->color; + } + + static + int FinishBreakUpXBitmap(obj_ptr, cols_and_rows, cols, rows) + struct ObjRec *obj_ptr; + int cols_and_rows, cols, rows; + { + struct XBmRec *xbm_ptr=obj_ptr->detail.xbm; + int y, image_w=xbm_ptr->image_w, image_h=xbm_ptr->image_h; + int chunk_w=0, chunk_h=0, total_chunks=0; + int orig_x=obj_ptr->x, orig_y=obj_ptr->y; + + if (cols_and_rows) { + chunk_w = (int)(image_w / cols); + chunk_h = (int)(image_h / rows); + } else { + chunk_w = cols; + chunk_h = rows; + } + for (y=0; y < image_h; y += chunk_h) { + int h=min(image_h-y,chunk_h), x; + + for (x=0; x < image_w; x += chunk_w) { + int w=min(image_w-x,chunk_w); + struct ObjRec *new_obj_ptr; + Pixmap dest_bitmap=None; + XImage *dest_image=NULL; + + if (w <= 0 || h <= 0 || + !ExtractBitmap(xbm_ptr->bitmap, xbm_ptr->image, x, y, w, h, + &dest_bitmap, &dest_image)) { + continue; + } + total_chunks++; + new_obj_ptr = CreateXBmObj(w, h, w, h, dest_bitmap, dest_image); + CopyXBmProperties(new_obj_ptr, obj_ptr); + AdjObjBBox(new_obj_ptr); + MoveObj(new_obj_ptr, orig_x+x, orig_y+y); + AddObj(NULL, topObj, new_obj_ptr); + } + } + if (total_chunks > 0) { + int i; + + RemoveAllSel(); + UnlinkObj(obj_ptr); + FreeObj(obj_ptr); + + for (i=0, obj_ptr=topObj; obj_ptr != NULL && i < total_chunks; i++, + obj_ptr=obj_ptr->next) { + struct SelRec *sel_ptr=(struct SelRec *)malloc(sizeof(struct SelRec)); + + if (sel_ptr == NULL) { + FailAllocMessage(); + return FALSE; + } + sel_ptr->obj = obj_ptr; + if (botSel != NULL) { + botSel->next = sel_ptr; + } else { + topSel = sel_ptr; + } + sel_ptr->prev = botSel; + sel_ptr->next = NULL; + botSel = sel_ptr; + } + } + return (total_chunks > 0); + } + + void BreakUpXBitmap(obj_ptr, cols_and_rows, cols, rows) + struct ObjRec *obj_ptr; + int cols_and_rows, cols, rows; + { + struct XBmRec *xbm_ptr=obj_ptr->detail.xbm; + + if (xbm_ptr->real_type == XBM_EPS) { + MsgBox("Cannot break up an EPS object.", TOOL_NAME, INFO_MB); + return; + } + HighLightReverse (); + PrepareToReplaceAnObj(obj_ptr); + if (FinishBreakUpXBitmap(obj_ptr, cols_and_rows, cols, rows)) { + UpdSelBBox(); + RecordCmd(CMD_ONE_TO_MANY, NULL, topSel, botSel, numObjSelected); + SetFileModified(TRUE); + justDupped = FALSE; + } else { + AbortPrepareCmd(CMD_REPLACE); + } + HighLightForward(); + } + + static void DumpXBmData (FP, bitmap, image, W, H) FILE * FP; *************** *** 3205,3209 **** GETVALUE(ctm->m[CTM_TX], "CTM_TX") == INVALID || GETVALUE(ctm->m[CTM_TY], "CTM_TY") == INVALID) { ! return; } (*ObjPtr)->ctm = ctm; --- 3229,3233 ---- GETVALUE(ctm->m[CTM_TX], "CTM_TX") == INVALID || GETVALUE(ctm->m[CTM_TY], "CTM_TY") == INVALID) { ! return FALSE; } (*ObjPtr)->ctm = ctm; *** xpixmap.c.orig Thu Oct 31 01:46:12 1996 --- xpixmap.c Thu Oct 31 01:46:12 1996 *************** *** 55,58 **** --- 55,59 ---- #include "mainmenu.e" #include "mark.e" + #include "move.e" #include "msg.e" #include "names.e" *************** *** 64,67 **** --- 65,69 ---- #include "select.e" #include "setup.e" + #include "stretch.e" #include "util.e" #include "xbitmap.e" *************** *** 766,893 **** static - void CopyXPmProperties(DestXpmObj, SrcXpmObj) - struct ObjRec *DestXpmObj, *SrcXpmObj; - { - struct XPmRec *dest_xpm_ptr=DestXpmObj->detail.xpm; - struct XPmRec *src_xpm_ptr=SrcXpmObj->detail.xpm; - - dest_xpm_ptr->fill = src_xpm_ptr->fill; - dest_xpm_ptr->rotate = src_xpm_ptr->rotate; - DestXpmObj->color = SrcXpmObj->color; - } - - static - int FinishBreakUpXPixmap(obj_ptr, cols_and_rows, cols, rows) - struct ObjRec *obj_ptr; - int cols_and_rows, cols, rows; - { - struct XPmRec *xpm_ptr=obj_ptr->detail.xpm; - int y, image_w=xpm_ptr->image_w, image_h=xpm_ptr->image_h; - int chunk_w=0, chunk_h=0, num_cols=0, num_rows=0, total_chunks=0; - int orig_x=obj_ptr->x, orig_y=obj_ptr->y; - int ncolors, chars_per_pixel, first_pixel_is_bg; - - ncolors = xpm_ptr->ncolors; - chars_per_pixel = xpm_ptr->chars_per_pixel; - first_pixel_is_bg = xpm_ptr->first_pixel_is_bg; - - if (cols_and_rows) { - chunk_w = (int)(image_w / cols); - chunk_h = (int)(image_h / rows); - } else { - chunk_w = cols; - chunk_h = rows; - } - for (y=0; y < image_h; y += chunk_h) { - int h=min(image_h-y,chunk_h), x; - - for (x=0; x < image_w; x += chunk_w) { - int w=min(image_w-x,chunk_w), i, *pixels; - char *color_char, **color_str, *xpm_data=NULL; - struct ObjRec *new_obj_ptr; - Pixmap dest_pixmap=None, dest_bitmap=None; - XImage *dest_image=NULL, *dest_bitmap_image=NULL; - - if (w <= 0 || h <= 0 || - !ExtractPixmap(xpm_ptr->pixmap, xpm_ptr->image, xpm_ptr->bitmap, - xpm_ptr->bitmap_image, x, y, w, h, &dest_pixmap, &dest_image, - &dest_bitmap, &dest_bitmap_image)) { - continue; - } - pixels = (int*)malloc(ncolors*sizeof(int)); - if (pixels == NULL) FailAllocMessage(); - memcpy(pixels, xpm_ptr->pixels, (size_t)(ncolors*sizeof(int))); - - color_char = (char*)malloc(ncolors*chars_per_pixel*sizeof(char)); - if (color_char == NULL) FailAllocMessage(); - memcpy(color_char, xpm_ptr->color_char, - (size_t)(ncolors*chars_per_pixel*sizeof(char))); - - color_str = (char**)malloc(ncolors*sizeof(char*)); - if (color_str == NULL) FailAllocMessage(); - for (i=0; i < ncolors; i++) { - if ((color_str[i]=UtilStrDup(xpm_ptr->color_str[i])) == NULL) { - FailAllocMessage(); - } - } - total_chunks++; - new_obj_ptr = CreateXPmObj(w, h, w, h, dest_pixmap, dest_image, - dest_bitmap, dest_bitmap_image, ncolors, chars_per_pixel, - first_pixel_is_bg, color_char, color_str, pixels, xpm_data); - CopyXPmProperties(new_obj_ptr, obj_ptr); - AdjObjBBox(new_obj_ptr); - MoveObj(new_obj_ptr, orig_x+x, orig_y+y); - AddObj(NULL, topObj, new_obj_ptr); - } - } - if (total_chunks > 0) { - int i; - - RemoveAllSel(); - UnlinkObj(obj_ptr); - FreeObj(obj_ptr); - - for (i=0, obj_ptr=topObj; obj_ptr != NULL && i < total_chunks; i++, - obj_ptr=obj_ptr->next) { - struct SelRec *sel_ptr=(struct SelRec *)malloc(sizeof(struct SelRec)); - - if (sel_ptr == NULL) { - FailAllocMessage(); - return FALSE; - } - sel_ptr->obj = obj_ptr; - if (botSel != NULL) { - botSel->next = sel_ptr; - } else { - topSel = sel_ptr; - } - sel_ptr->prev = botSel; - sel_ptr->next = NULL; - botSel = sel_ptr; - } - } - return (total_chunks > 0); - } - - void BreakUpXPixmap(obj_ptr, cols_and_rows, cols, rows) - struct ObjRec *obj_ptr; - int cols_and_rows, cols, rows; - { - struct XPmRec *xpm_ptr=obj_ptr->detail.xpm; - - HighLightReverse (); - PrepareToReplaceAnObj(obj_ptr); - if (FinishBreakUpXPixmap(obj_ptr, cols_and_rows, cols, rows)) { - UpdSelBBox(); - RecordCmd(CMD_ONE_TO_MANY, NULL, topSel, botSel, numObjSelected); - SetFileModified(TRUE); - justDupped = FALSE; - } else { - AbortPrepareCmd(CMD_REPLACE); - } - HighLightForward(); - } - - static void SaveXPmColors (FP, def_color_index, xpm_ptr, ncolors, chars_per_pixel, color_char, color_str, pixels) --- 768,771 ---- *************** *** 1639,1642 **** --- 1517,1552 ---- } + int PrTgifFindColorIndex(ObjPtr, s) + struct ObjRec *ObjPtr; + char *s; + { + int i; + + for (i=0; i < maxColors; i++) { + int valid=FALSE; + char *s1=s, *s2=colorMenuItems[i]; + + if (*s1 == *s2) { + valid = TRUE; + } else if (*s1 >= 'a' && *s1 <= 'z') { + if (*s1+'A'-'a' == *s2) { + valid = TRUE; + } + } else if (*s >= 'A' && *s <= 'Z') { + if (*s1+'a'-'A' == *s2) { + valid = TRUE; + } + } + if (valid && (UtilStrICmp(++s1,++s2) == 0)) { + if (ObjPtr != NULL) { + UtilStrCpy(ObjPtr->color_str, sizeof(ObjPtr->color_str), + colorMenuItems[i]); + } + return i; + } + } + return INVALID; + } + int QuickFindColorIndex(ObjPtr, s, new_alloc, use_default) struct ObjRec *ObjPtr; *************** *** 1647,1651 **** XColor exact_def, screen_def; ! *new_alloc = FALSE; if (ObjPtr != NULL) { --- 1557,1563 ---- XColor exact_def, screen_def; ! if (new_alloc != NULL) *new_alloc = FALSE; ! ! if (PRTGIF && cmdLineColor) return PrTgifFindColorIndex(ObjPtr, s); if (ObjPtr != NULL) { *************** *** 1885,1888 **** --- 1797,1922 ---- static + void CopyXPmProperties(DestXpmObj, SrcXpmObj) + struct ObjRec *DestXpmObj, *SrcXpmObj; + { + struct XPmRec *dest_xpm_ptr=DestXpmObj->detail.xpm; + struct XPmRec *src_xpm_ptr=SrcXpmObj->detail.xpm; + + dest_xpm_ptr->fill = src_xpm_ptr->fill; + dest_xpm_ptr->rotate = src_xpm_ptr->rotate; + DestXpmObj->color = SrcXpmObj->color; + } + + static + int FinishBreakUpXPixmap(obj_ptr, cols_and_rows, cols, rows) + struct ObjRec *obj_ptr; + int cols_and_rows, cols, rows; + { + struct XPmRec *xpm_ptr=obj_ptr->detail.xpm; + int y, image_w=xpm_ptr->image_w, image_h=xpm_ptr->image_h; + int chunk_w=0, chunk_h=0, total_chunks=0; + int orig_x=obj_ptr->x, orig_y=obj_ptr->y; + int ncolors, chars_per_pixel, first_pixel_is_bg; + + ncolors = xpm_ptr->ncolors; + chars_per_pixel = xpm_ptr->chars_per_pixel; + first_pixel_is_bg = xpm_ptr->first_pixel_is_bg; + + if (cols_and_rows) { + chunk_w = (int)(image_w / cols); + chunk_h = (int)(image_h / rows); + } else { + chunk_w = cols; + chunk_h = rows; + } + for (y=0; y < image_h; y += chunk_h) { + int h=min(image_h-y,chunk_h), x; + + for (x=0; x < image_w; x += chunk_w) { + int w=min(image_w-x,chunk_w), i, *pixels; + char *color_char, **color_str, *xpm_data=NULL; + struct ObjRec *new_obj_ptr; + Pixmap dest_pixmap=None, dest_bitmap=None; + XImage *dest_image=NULL, *dest_bitmap_image=NULL; + + if (w <= 0 || h <= 0 || + !ExtractPixmap(xpm_ptr->pixmap, xpm_ptr->image, xpm_ptr->bitmap, + xpm_ptr->bitmap_image, x, y, w, h, &dest_pixmap, &dest_image, + &dest_bitmap, &dest_bitmap_image)) { + continue; + } + pixels = (int*)malloc(ncolors*sizeof(int)); + if (pixels == NULL) FailAllocMessage(); + memcpy(pixels, xpm_ptr->pixels, (size_t)(ncolors*sizeof(int))); + + color_char = (char*)malloc(ncolors*chars_per_pixel*sizeof(char)); + if (color_char == NULL) FailAllocMessage(); + memcpy(color_char, xpm_ptr->color_char, + (size_t)(ncolors*chars_per_pixel*sizeof(char))); + + color_str = (char**)malloc(ncolors*sizeof(char*)); + if (color_str == NULL) FailAllocMessage(); + for (i=0; i < ncolors; i++) { + if ((color_str[i]=UtilStrDup(xpm_ptr->color_str[i])) == NULL) { + FailAllocMessage(); + } + } + total_chunks++; + new_obj_ptr = CreateXPmObj(w, h, w, h, dest_pixmap, dest_image, + dest_bitmap, dest_bitmap_image, ncolors, chars_per_pixel, + first_pixel_is_bg, color_char, color_str, pixels, xpm_data); + CopyXPmProperties(new_obj_ptr, obj_ptr); + AdjObjBBox(new_obj_ptr); + MoveObj(new_obj_ptr, orig_x+x, orig_y+y); + AddObj(NULL, topObj, new_obj_ptr); + } + } + if (total_chunks > 0) { + int i; + + RemoveAllSel(); + UnlinkObj(obj_ptr); + FreeObj(obj_ptr); + + for (i=0, obj_ptr=topObj; obj_ptr != NULL && i < total_chunks; i++, + obj_ptr=obj_ptr->next) { + struct SelRec *sel_ptr=(struct SelRec *)malloc(sizeof(struct SelRec)); + + if (sel_ptr == NULL) { + FailAllocMessage(); + return FALSE; + } + sel_ptr->obj = obj_ptr; + if (botSel != NULL) { + botSel->next = sel_ptr; + } else { + topSel = sel_ptr; + } + sel_ptr->prev = botSel; + sel_ptr->next = NULL; + botSel = sel_ptr; + } + } + return (total_chunks > 0); + } + + void BreakUpXPixmap(obj_ptr, cols_and_rows, cols, rows) + struct ObjRec *obj_ptr; + int cols_and_rows, cols, rows; + { + HighLightReverse(); + PrepareToReplaceAnObj(obj_ptr); + if (FinishBreakUpXPixmap(obj_ptr, cols_and_rows, cols, rows)) { + UpdSelBBox(); + RecordCmd(CMD_ONE_TO_MANY, NULL, topSel, botSel, numObjSelected); + SetFileModified(TRUE); + justDupped = FALSE; + } else { + AbortPrepareCmd(CMD_REPLACE); + } + HighLightForward(); + } + + static void SaveXPmPixels (FP, xpm_ptr, pixmap, image, bitmap, bitmap_image, w, h, ncolors, chars_per_pixel, color_char, pixels) *************** *** 2545,2551 **** } if (ok) { - char *tmp_char, **tmp_str; - int *tmp_pixels; - free(*color_char); *color_char = new_color_char; --- 2579,2582 ---- *************** *** 2894,2897 **** --- 2925,2939 ---- if (UtilStrICmp(color_s, "None") == 0) { red[i] = green[i] = blue[i] = (-1); + } else if (PRTGIF && cmdLineColor) { + int found_index=PrTgifFindColorIndex(NULL, color_s); + + if (found_index != INVALID) { + red[i] = + (int)(10000*((int)tgifColors[found_index].red)/maxRGB); + green[i] = + (int)(10000*((int)tgifColors[found_index].green)/maxRGB); + blue[i] = + (int)(10000*((int)tgifColors[found_index].blue)/maxRGB); + } } } *** choose.e.orig Thu Oct 31 01:46:14 1996 --- choose.e Thu Oct 31 01:46:14 1996 *************** *** 42,51 **** #define NAMES_LOOP_MANY 0 #define NAMES_LOOP_ONCE 1 - - typedef int (GetEntriesFunc)ARGS_DECL((DspList**, char***, int *pn_num_entries, - int *pn_marked_index, char *inbuf, void*)); - typedef int (AfterLoopFunc)ARGS_DECL((DspList**, char***, int *pn_num_entries, - int *pn_marked_index, char *cur_buf, int btn_id, int selected_index, - void*)); extern void NamesSetTitle ARGS_DECL((char*)); --- 42,45 ---- *** color.e.orig Thu Oct 31 01:46:15 1996 --- color.e Thu Oct 31 01:46:15 1996 *************** *** 64,67 **** --- 64,68 ---- extern void RecalcXorPixels ARGS_DECL((void)); extern void InitColor ARGS_DECL((void)); + extern void RedrawColorWindow ARGS_DECL((void)); extern int OneColorObject ARGS_DECL((struct ObjRec *, int *ColorIndex)); extern int ChangeObjColor ARGS_DECL((struct ObjRec *, int ColorIndex)); *************** *** 72,76 **** extern int ColorMenu ARGS_DECL((int X, int Y, int TrackMenubar)); extern void CleanUpColors ARGS_DECL((void)); - extern void RedrawColorWindow ARGS_DECL((void)); extern void ColorEventHandler ARGS_DECL((XEvent*)); extern void RedrawColorDummyWindow ARGS_DECL((void)); --- 73,76 ---- *************** *** 80,83 **** --- 80,85 ---- extern int FlushColormap ARGS_DECL((void)); extern void AddColor ARGS_DECL((void)); + extern void SaveColors ARGS_DECL((FILE*)); + extern int ReadColors ARGS_DECL((FILE*, char*)); extern void DumpRGBColorLine ARGS_DECL((FILE *FP, int ColorIndex, int Indent, int EndOfLine)); *** file.e.orig Thu Oct 31 01:46:17 1996 --- file.e Thu Oct 31 01:46:17 1996 *************** *** 75,78 **** --- 75,80 ---- extern int cmdLineOneFilePerPage; extern int cmdLineA4; + extern int cmdLineColor; + extern int cmdLineRequestedColor; extern int showPageInEPS; *************** *** 109,113 **** char **ppsz_page_spec, int *pn_is_html, ! char *return_tmp_fname)); extern int ImportGivenFile ARGS_DECL((char*)); extern void ImportFile ARGS_DECL((void)); --- 111,117 ---- char **ppsz_page_spec, int *pn_is_html, ! char *return_tmp_fname, ! char *final_url, ! int cb_final_url)); extern int ImportGivenFile ARGS_DECL((char*)); extern void ImportFile ARGS_DECL((void)); *** font.e.orig Thu Oct 31 01:46:18 1996 --- font.e Thu Oct 31 01:46:18 1996 *************** *** 105,108 **** --- 105,113 ---- extern void SetCanvasFont ARGS_DECL((void)); extern void InitFonts ARGS_DECL((void)); + extern void SaveCurFont ARGS_DECL((void)); + extern void RestoreCurFont ARGS_DECL((void)); + extern void PushCurFont ARGS_DECL((void)); + extern void PopCurFont ARGS_DECL((void)); + extern void SetPushedFontValue ARGS_DECL((int Which, int Value)); extern int ChangeObjTextStyle ARGS_DECL((struct ObjRec *, int Style)); extern void ChangeFontStyle ARGS_DECL((int Style)); *************** *** 111,117 **** extern void StyleSubMenu ARGS_DECL((int Index)); extern int StyleMenu ARGS_DECL((int X, int Y, int TrackMenubar)); - extern int ChangeObjTextSize ARGS_DECL((struct ObjRec *, int SizeIndex)); - extern void ChangeFontSize ARGS_DECL((int SizeIndex)); extern int GetSizeMenuIndex ARGS_DECL((void)); extern int SizeMenu ARGS_DECL((int X, int Y, int TrackMenubar)); extern int ChangeObjTextFont ARGS_DECL((struct ObjRec *, int FontIndex)); --- 116,122 ---- extern void StyleSubMenu ARGS_DECL((int Index)); extern int StyleMenu ARGS_DECL((int X, int Y, int TrackMenubar)); extern int GetSizeMenuIndex ARGS_DECL((void)); + extern int ChangeObjTextSize ARGS_DECL((struct ObjRec *, int Index)); + extern void ChangeFontSize ARGS_DECL((int SizeIndex)); extern int SizeMenu ARGS_DECL((int X, int Y, int TrackMenubar)); extern int ChangeObjTextFont ARGS_DECL((struct ObjRec *, int FontIndex)); *************** *** 120,128 **** extern int ChangeObjVSpace ARGS_DECL((struct ObjRec *, int VSpace)); extern void ChangeVSpace ARGS_DECL((int VSpace)); ! extern void SaveCurFont ARGS_DECL((void)); ! extern void RestoreCurFont ARGS_DECL((void)); ! extern void PushCurFont ARGS_DECL((void)); ! extern void PopCurFont ARGS_DECL((void)); ! extern void SetPushedFontValue ARGS_DECL((int Which, int Value)); extern void CleanUpFonts ARGS_DECL((void)); --- 125,129 ---- extern int ChangeObjVSpace ARGS_DECL((struct ObjRec *, int VSpace)); extern void ChangeVSpace ARGS_DECL((int VSpace)); ! extern void SetSelectedFontSize ARGS_DECL((void)); extern void CleanUpFonts ARGS_DECL((void)); *** names.e.orig Thu Oct 31 01:46:19 1996 --- names.e Thu Oct 31 01:46:19 1996 *************** *** 56,59 **** --- 56,60 ---- extern void CleanUpNames ARGS_DECL((void)); + extern int DirInSymPath ARGS_DECL((char *DirName)); extern char **MakeNameDspItemArray ARGS_DECL((int Entries, DspList*)); *************** *** 64,68 **** extern int GetSymbolPath ARGS_DECL((char *SymName, char *PathName)); extern int NameInCurDir ARGS_DECL((char *FileName)); - extern int DirInSymPath ARGS_DECL((char *DirName)); extern int SelectDomain ARGS_DECL((char *SelStr)); extern int SelectSymDir ARGS_DECL((char *SelStr)); --- 65,68 ---- *** page.e.orig Thu Oct 31 01:46:21 1996 --- page.e Thu Oct 31 01:46:21 1996 *************** *** 44,53 **** extern void RedrawPageWindow ARGS_DECL((void)); ! extern void PageEventHandler ARGS_DECL((XEvent*)); extern void RedrawPageDummyWindow ARGS_DECL((void)); extern void PageDummyEventHandler ARGS_DECL((XEvent*)); extern void InitPage ARGS_DECL((void)); - extern void GotoPageNum ARGS_DECL((int)); - extern void SetCurPage ARGS_DECL((int)); extern void NextPage ARGS_DECL((void)); extern void PrevPage ARGS_DECL((void)); --- 44,52 ---- extern void RedrawPageWindow ARGS_DECL((void)); ! extern void GotoPageNum ARGS_DECL((int)); ! extern void SetCurPage ARGS_DECL((int)); extern void RedrawPageDummyWindow ARGS_DECL((void)); extern void PageDummyEventHandler ARGS_DECL((XEvent*)); extern void InitPage ARGS_DECL((void)); extern void NextPage ARGS_DECL((void)); extern void PrevPage ARGS_DECL((void)); *************** *** 69,72 **** --- 68,72 ---- extern void PageLayoutSubMenu ARGS_DECL((int Index)); extern int PageLayoutMenu ARGS_DECL((int X, int Y, int TrackMenubar)); + extern void PageEventHandler ARGS_DECL((XEvent*)); extern void CleanUpPage ARGS_DECL((void)); extern void PushPageInfo ARGS_DECL((void)); *** rect.e.orig Thu Oct 31 01:46:23 1996 --- rect.e Thu Oct 31 01:46:23 1996 *************** *** 50,54 **** extern void TransformObjectV ARGS_DECL((struct ObjRec *, IntPoint *VIn, IntPoint *VOut)); ! extern void ReverseTransformObjectV ARGS_DECL((struct ObjRec *, IntPoint *VIn, IntPoint *VOut)); --- 50,54 ---- extern void TransformObjectV ARGS_DECL((struct ObjRec *, IntPoint *VIn, IntPoint *VOut)); ! extern void ReversedTransformObjectV ARGS_DECL((struct ObjRec *, IntPoint *VIn, IntPoint *VOut)); *************** *** 61,69 **** IntPoint *)); extern void SetCTM ARGS_DECL((struct ObjRec *, struct XfrmMtrxRec *)); extern int IntersectRect ARGS_DECL((struct BBRec BBox1, struct BBRec BBox2, struct BBRec *BBox3)); extern int Inside ARGS_DECL((struct BBRec Rect1, struct BBRec Rect2)); - extern int BBoxIntersect ARGS_DECL((struct BBRec BBox1, - struct BBRec BBox2)); extern int PointInBBox ARGS_DECL((int X, int Y, struct BBRec Rect)); extern int PointInPolygon ARGS_DECL((int X, int Y, int NumPts, XPoint *)); --- 61,69 ---- IntPoint *)); extern void SetCTM ARGS_DECL((struct ObjRec *, struct XfrmMtrxRec *)); + extern int BBoxIntersect ARGS_DECL((struct BBRec BBox1, + struct BBRec BBox2)); extern int IntersectRect ARGS_DECL((struct BBRec BBox1, struct BBRec BBox2, struct BBRec *BBox3)); extern int Inside ARGS_DECL((struct BBRec Rect1, struct BBRec Rect2)); extern int PointInBBox ARGS_DECL((int X, int Y, struct BBRec Rect)); extern int PointInPolygon ARGS_DECL((int X, int Y, int NumPts, XPoint *)); *** remote.e.orig Thu Oct 31 01:46:24 1996 --- remote.e Thu Oct 31 01:46:24 1996 *************** *** 55,59 **** char **ppsz_content_type, int *pn_buf_sz, int *pn_html, ! int force_load)); extern char *WriteRemoteFileIntoTemp ARGS_DECL((char *psz_buf, int buf_sz, char *psz_ext)); --- 55,60 ---- char **ppsz_content_type, int *pn_buf_sz, int *pn_html, ! int force_load, char *psz_final, ! int cb_final)); extern char *WriteRemoteFileIntoTemp ARGS_DECL((char *psz_buf, int buf_sz, char *psz_ext)); *** xbitmap.e.orig Thu Oct 31 01:46:25 1996 --- xbitmap.e Thu Oct 31 01:46:25 1996 *************** *** 57,62 **** int *SrcW, int *SrcH)); extern void CutXBitmap ARGS_DECL((void)); - extern void BreakUpXBitmap ARGS_DECL((struct ObjRec *, int ColsAndRows, - int W, int H)); extern void GenPreviewBitmap ARGS_DECL((FILE *, int llxPage, int llyPage, int urxPage, int uryPage)); --- 57,60 ---- *************** *** 69,72 **** --- 67,72 ---- extern struct ObjRec * CreateXBmObj ARGS_DECL((int ImageW, int ImageH, int W, int H, Pixmap, XImage *)); + extern void BreakUpXBitmap ARGS_DECL((struct ObjRec *, int ColsAndRows, + int W, int H)); extern void SaveXBmObj ARGS_DECL((FILE *, struct ObjRec *)); extern void ReadXBmObj ARGS_DECL((FILE *, char *Inbuf, struct ObjRec **)); *** xpixmap.e.orig Thu Oct 31 01:46:26 1996 --- xpixmap.e Thu Oct 31 01:46:26 1996 *************** *** 53,58 **** extern void CutXPixmap ARGS_DECL((int *AbsX, int *AbsY, int *AbsW, int *AbsH)); - extern void BreakUpXPixmap ARGS_DECL((struct ObjRec *, int ColsAndRows, - int W, int H)); extern void DumpXPmObj ARGS_DECL((FILE *, struct ObjRec *)); extern int NeedsToCacheXPmObj ARGS_DECL((struct ObjRec *)); --- 53,56 ---- *************** *** 70,74 **** --- 68,75 ---- char **ColorStr, int *Pixels, char *Data)); + extern void BreakUpXPixmap ARGS_DECL((struct ObjRec *, int ColsAndRows, + int W, int H)); extern void SaveXPmObj ARGS_DECL((FILE *, struct ObjRec *)); + extern int PrTgifFindColorIndex ARGS_DECL((struct ObjRec *, char *Str)); extern int QuickFindColorIndex ARGS_DECL((struct ObjRec *, char *Str, int *NewAlloc, int UseDefault)); *** const.h.orig Thu Oct 31 01:46:28 1996 --- const.h Thu Oct 31 01:46:28 1996 *************** *** 464,478 **** #define EDIT_BREAK_TEXT 25 #define EDIT_SET_SEL_LINEWIDTH 26 ! #define EDIT_ADD_COLOR 27 ! #define EDIT_BREAK_MAPS 28 ! #define EDIT_LAYOUT_ON_ARC 29 ! #define EDIT_PRECISE_ROTATE 30 ! #define EDIT_JOIN_POLY 31 ! #define EDIT_CUT_POLY 32 ! #define EDIT_GET_BBOX 33 ! #define EDIT_SET_SHAPE_SHADOW 34 ! #define EDIT_NO_TRANSFORM 35 ! #define MAXEDITMENUS 36 /* layout menu */ --- 464,479 ---- #define EDIT_BREAK_TEXT 25 #define EDIT_SET_SEL_LINEWIDTH 26 ! #define EDIT_SET_SEL_FONT_SIZE 27 ! #define EDIT_ADD_COLOR 28 ! #define EDIT_BREAK_MAPS 29 ! #define EDIT_LAYOUT_ON_ARC 30 ! #define EDIT_PRECISE_ROTATE 31 ! #define EDIT_JOIN_POLY 32 ! #define EDIT_CUT_POLY 33 ! #define EDIT_GET_BBOX 34 ! #define EDIT_SET_SHAPE_SHADOW 35 ! #define EDIT_NO_TRANSFORM 36 ! #define MAXEDITMENUS 37 /* layout menu */ *** patchlvl.h.orig Thu Oct 31 01:46:29 1996 --- patchlvl.h Thu Oct 31 01:46:29 1996 *************** *** 34,38 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 9 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 34,38 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 10 #endif /*_TGIF_PATCHLEVEL_H_*/ *** tgif_dbg.h.orig Thu Oct 31 01:46:30 1996 --- tgif_dbg.h Thu Oct 31 01:46:30 1996 *************** *** 43,47 **** extern void *tgif_malloc ARGS_DECL((size_t)); ! extern void *tgif_recalloc ARGS_DECL((void*, size_t)); extern void tgif_free ARGS_DECL((void*)); --- 43,47 ---- extern void *tgif_malloc ARGS_DECL((size_t)); ! extern void *tgif_realloc ARGS_DECL((void*, size_t)); extern void tgif_free ARGS_DECL((void*)); *** types.h.orig Thu Oct 31 01:46:32 1996 --- types.h Thu Oct 31 01:46:32 1996 *************** *** 332,335 **** --- 332,341 ---- struct URLCacheRec *next, *prev; }; + + typedef int (GetEntriesFunc)ARGS_DECL((DspList**, char***, int *pn_num_entries, + int *pn_marked_index, char *inbuf, void*)); + typedef int (AfterLoopFunc)ARGS_DECL((DspList**, char***, int *pn_num_entries, + int *pn_marked_index, char *cur_buf, int btn_id, int selected_index, + void*)); #endif /*_TGIF_TYPES_H_*/ *** Makefile.noimake.orig Thu Oct 31 01:46:33 1996 --- Makefile.noimake Thu Oct 31 01:46:33 1996 *************** *** 262,267 **** align.o: const.h tgif_dbg.h types.h align.e auxtext.e button.e \ choice.e cmd.e color.e dialog.e drawing.e dup.e grid.e mark.e \ ! mainmenu.e menu.e move.e msg.e obj.e poly.e raster.e select.e \ ! setup.e animate.o: const.h tgif_dbg.h types.h animate.e color.e dialog.e msg.e \ poly.e raster.e select.e setup.e --- 262,267 ---- align.o: const.h tgif_dbg.h types.h align.e auxtext.e button.e \ choice.e cmd.e color.e dialog.e drawing.e dup.e grid.e mark.e \ ! mainmenu.e menu.e move.e msg.e obj.e poly.e raster.e rect.e \ ! select.e setup.e animate.o: const.h tgif_dbg.h types.h animate.e color.e dialog.e msg.e \ poly.e raster.e select.e setup.e *************** *** 269,273 **** cmd.e color.e cursor.e dialog.e dup.e file.e grid.e \ mainloop.e mark.e msg.e obj.e pattern.e poly.e ps.e raster.e \ ! ruler.e select.e setup.e special.e spline.e util.e xpixmap.e attr.o: const.h tgif_dbg.h types.h attr.e auxtext.e button.e choice.e \ choose.e cmd.e color.e cursor.e dialog.e drawing.e dup.e \ --- 269,274 ---- cmd.e color.e cursor.e dialog.e dup.e file.e grid.e \ mainloop.e mark.e msg.e obj.e pattern.e poly.e ps.e raster.e \ ! rect.e ruler.e select.e setup.e special.e spline.e util.e \ ! xpixmap.e attr.o: const.h tgif_dbg.h types.h attr.e auxtext.e button.e choice.e \ choose.e cmd.e color.e cursor.e dialog.e drawing.e dup.e \ *************** *** 276,285 **** select.e setup.e stk.e text.e util.e auxtext.o: const.h tgif_dbg.h types.h auxtext.e color.e cursor.e \ ! dialog.e file.e font.e msg.e obj.e pattern.e prtgif.e ps.e \ ! raster.e rect.e setup.e text.e util.e xbitmap.e xpixmap.e box.o: const.h tgif_dbg.h types.h attr.e auxtext.e box.e cmd.e \ color.e cursor.e file.e grid.e mainloop.e msg.e obj.e \ ! pattern.e poly.e ps.e raster.e ruler.e select.e setup.e \ ! util.e xpixmap.e button.o: const.h tgif_dbg.h types.h auxtext.e box.e button.e cursor.e \ file.e font.e mainloop.e mainmenu.e msg.e raster.e rect.e \ --- 277,287 ---- select.e setup.e stk.e text.e util.e auxtext.o: const.h tgif_dbg.h types.h auxtext.e color.e cursor.e \ ! dialog.e drawing.e file.e font.e msg.e obj.e pattern.e \ ! prtgif.e ps.e raster.e rect.e setup.e text.e util.e xbitmap.e \ ! xpixmap.e box.o: const.h tgif_dbg.h types.h attr.e auxtext.e box.e cmd.e \ color.e cursor.e file.e grid.e mainloop.e msg.e obj.e \ ! pattern.e poly.e ps.e raster.e rect.e ruler.e select.e \ ! setup.e util.e xpixmap.e button.o: const.h tgif_dbg.h types.h auxtext.e box.e button.e cursor.e \ file.e font.e mainloop.e mainmenu.e msg.e raster.e rect.e \ *************** *** 288,304 **** color.e cursor.e dialog.e drawing.e edit.e file.e font.e \ grid.e mainloop.e mainmenu.e mark.e msg.e navigate.e oval.e \ ! page.e pattern.e poly.e polygon.e raster.e rcbox.e select.e \ ! setup.e shape.e special.e stretch.e text.e xbitmap.e \ ! xbm/abc.xbm ! choose.o: const.h tgif_dbg.h types.h button.e choose.e cutpaste.e \ ! cursor.e dialog.e file.e font.e mainloop.e mainmenu.e msg.e \ ! names.e raster.e setup.e util.e cmd.o: const.h tgif_dbg.h types.h attr.e choice.e cmd.e color.e \ ! dialog.e drawing.e dup.e imgproc.e mark.e move.e msg.e obj.e \ ! page.e select.e setup.e stk.e xpixmap.e wb1.e color.o: const.h tgif_dbg.h types.h choice.e cmd.e color.e dialog.e \ ! drawing.e file.e font.e imgproc.e mainloop.e mark.e menu.e \ ! msg.e obj.e page.e pattern.e raster.e select.e setup.e text.e \ ! util.e xpixmap.e cursor.o: const.h tgif_dbg.h types.h choice.e color.e cursor.e setup.e \ xbitmap.e xbm/null.xbm xbm/nullmask.xbm xbm/text_cur.xbm \ --- 290,307 ---- color.e cursor.e dialog.e drawing.e edit.e file.e font.e \ grid.e mainloop.e mainmenu.e mark.e msg.e navigate.e oval.e \ ! page.e pattern.e poly.e polygon.e raster.e rcbox.e rect.e \ ! select.e setup.e shape.e special.e stretch.e text.e util.e \ ! xbitmap.e xbm/abc.xbm ! choose.o: const.h tgif_dbg.h types.h auxtext.e button.e choose.e \ ! cutpaste.e cursor.e dialog.e file.e font.e mainloop.e \ ! mainmenu.e msg.e names.e raster.e rect.e remote.e setup.e \ ! util.e cmd.o: const.h tgif_dbg.h types.h attr.e choice.e cmd.e color.e \ ! dialog.e drawing.e dup.e imgproc.e mainmenu.e mark.e move.e \ ! msg.e obj.e page.e select.e setup.e stk.e xpixmap.e wb1.e color.o: const.h tgif_dbg.h types.h choice.e cmd.e color.e dialog.e \ ! drawing.e file.e font.e imgproc.e mainloop.e mainmenu.e \ ! mark.e menu.e msg.e obj.e page.e pattern.e raster.e select.e \ ! setup.e text.e util.e xpixmap.e cursor.o: const.h tgif_dbg.h types.h choice.e color.e cursor.e setup.e \ xbitmap.e xbm/null.xbm xbm/nullmask.xbm xbm/text_cur.xbm \ *************** *** 311,325 **** pattern.e remote.e select.e setup.e special.e text.e dialog.o: const.h tgif_dbg.h types.h auxtext.e box.e button.e \ ! cutpaste.e cursor.e dialog.e drawing.e file.e font.e \ ! mainloop.e mainmenu.e msg.e raster.e setup.e text.e util.e \ ! xbm/info.xbm drawing.o: const.h tgif_dbg.h types.h align.e animate.e arc.e attr.e \ auxtext.e box.e choice.e cmd.e color.e cutpaste.e cursor.e \ dialog.e drawing.e dup.e edit.e eps.e exec.e file.e font.e \ ! grid.e group.e imgproc.e import.e mark.e mainloop.e menu.e \ ! msg.e navigate.e names.e obj.e oval.e page.e pattern.e poly.e \ ! polygon.e raster.e rcbox.e rect.e remote.e ruler.e scroll.e \ ! select.e setup.e shape.e shortcut.e special.e stk.e stretch.e \ ! text.e wb1.e xbitmap.e xpixmap.e xbm/intr.xbm xbm/trek.xbm dup.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ drawing.e dup.e grid.e mark.e move.e msg.e obj.e page.e \ --- 314,329 ---- pattern.e remote.e select.e setup.e special.e text.e dialog.o: const.h tgif_dbg.h types.h auxtext.e box.e button.e \ ! cutpaste.e cursor.e dialog.e drawing.e file.e font.e grid.e \ ! mainloop.e mainmenu.e msg.e raster.e ruler.e setup.e text.e \ ! util.e xbm/info.xbm drawing.o: const.h tgif_dbg.h types.h align.e animate.e arc.e attr.e \ auxtext.e box.e choice.e cmd.e color.e cutpaste.e cursor.e \ dialog.e drawing.e dup.e edit.e eps.e exec.e file.e font.e \ ! grid.e group.e help.e imgproc.e import.e mark.e mainloop.e \ ! menu.e msg.e navigate.e names.e obj.e oval.e page.e pattern.e \ ! poly.e polygon.e raster.e rcbox.e rect.e remote.e ruler.e \ ! scroll.e select.e setup.e shape.e shortcut.e special.e stk.e \ ! stretch.e text.e wb1.e xbitmap.e xpixmap.e xbm/intr.xbm \ ! xbm/trek.xbm dup.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ drawing.e dup.e grid.e mark.e move.e msg.e obj.e page.e \ *************** *** 329,337 **** drawing.e dup.e edit.e eps.e font.e grid.e group.e mainloop.e \ mark.e menu.e move.e msg.e names.e obj.e page.e pattern.e \ ! poly.e raster.e ruler.e select.e setup.e shape.e special.e \ ! spline.e stretch.e text.e util.e xbitmap.e xpixmap.e eps.o: const.h tgif_dbg.h types.h cmd.e color.e cursor.e dialog.e \ drawing.e dup.e eps.e file.e grid.e mark.e msg.e obj.e \ ! pattern.e select.e setup.e util.e xbitmap.e exec.o: const.h tgif_dbg.h types.h align.e attr.e auxtext.e cmd.e \ color.e choice.e cursor.e dialog.e drawing.e dup.e edit.e \ --- 333,342 ---- drawing.e dup.e edit.e eps.e font.e grid.e group.e mainloop.e \ mark.e menu.e move.e msg.e names.e obj.e page.e pattern.e \ ! poly.e polygon.e raster.e rect.e ruler.e select.e setup.e \ ! shape.e special.e spline.e stretch.e text.e util.e xbitmap.e \ ! xpixmap.e eps.o: const.h tgif_dbg.h types.h cmd.e color.e cursor.e dialog.e \ drawing.e dup.e eps.e file.e grid.e mark.e msg.e obj.e \ ! pattern.e rect.e select.e setup.e util.e xbitmap.e exec.o: const.h tgif_dbg.h types.h align.e attr.e auxtext.e cmd.e \ color.e choice.e cursor.e dialog.e drawing.e dup.e edit.e \ *************** *** 344,357 **** file.o: const.h tgif_dbg.h patchlvl.h types.h align.e arc.e attr.e \ auxtext.e box.e button.e choice.e cmd.e color.e cutpaste.e \ ! cursor.e dialog.e drawing.e dup.e eps.e file.e font.e grid.e \ ! group.e import.e mainloop.e mainmenu.e mark.e menu.e move.e \ ! msg.e names.e navigate.e obj.e oval.e page.e pattern.e poly.e \ ! polygon.e prtgif.e ps.e raster.e rcbox.e rect.e remote.e \ ! ruler.e scroll.e select.e setup.e shape.e special.e stk.e \ ! stretch.e text.e util.e version.e xbitmap.e xpixmap.e font.o: const.h tgif_dbg.h types.h auxtext.e choice.e cmd.e color.e \ cursor.e dialog.e drawing.e exec.e file.e font.e mainmenu.e \ mark.e menu.e msg.e obj.e pattern.e page.e ps.e raster.e \ ! select.e setup.e text.e util.e xpixmap.e frontend.o: ftp.o: const.h tgif_dbg.h ftp.e remote.e tcp.e util.e --- 349,362 ---- file.o: const.h tgif_dbg.h patchlvl.h types.h align.e arc.e attr.e \ auxtext.e box.e button.e choice.e cmd.e color.e cutpaste.e \ ! cursor.e dialog.e drawing.e dup.e eps.e exec.e file.e font.e \ ! grid.e group.e import.e mainloop.e mainmenu.e mark.e menu.e \ ! move.e msg.e names.e navigate.e obj.e oval.e page.e pattern.e \ ! poly.e polygon.e prtgif.e ps.e raster.e rcbox.e rect.e \ ! remote.e ruler.e scroll.e select.e setup.e shape.e special.e \ ! stk.e stretch.e text.e util.e version.e xbitmap.e xpixmap.e font.o: const.h tgif_dbg.h types.h auxtext.e choice.e cmd.e color.e \ cursor.e dialog.e drawing.e exec.e file.e font.e mainmenu.e \ mark.e menu.e msg.e obj.e pattern.e page.e ps.e raster.e \ ! rect.e select.e setup.e text.e util.e xpixmap.e frontend.o: ftp.o: const.h tgif_dbg.h ftp.e remote.e tcp.e util.e *************** *** 359,363 **** drawing.e dup.e file.e grid.e mainmenu.e menu.e msg.e obj.e \ page.e pattern.e raster.e ruler.e scroll.e select.e setup.e \ ! stretch.e text.e group.o: const.h tgif_dbg.h types.h attr.e choice.e cmd.e drawing.e \ dup.e file.e group.e mark.e msg.e obj.e page.e select.e \ --- 364,368 ---- drawing.e dup.e file.e grid.e mainmenu.e menu.e msg.e obj.e \ page.e pattern.e raster.e ruler.e scroll.e select.e setup.e \ ! stretch.e text.e util.e group.o: const.h tgif_dbg.h types.h attr.e choice.e cmd.e drawing.e \ dup.e file.e group.e mark.e msg.e obj.e page.e select.e \ *************** *** 365,377 **** help.o: const.h tgif_dbg.h types.h patchlvl.h color.e dialog.e help.e \ menu.e msg.e setup.e util.e version.e ! http.o: const.h tgif_dbg.h patchlvl.h http.e remote.e tcp.e util.e \ ! version.e ! imgproc.o: const.h tgif_dbg.h types.h choice.e cmd.e color.e cursor.e \ ! dialog.e drawing.e dup.e file.e grid.e imgproc.e mainloop.e \ ! mainmenu.e menu.e msg.e names.e obj.e page.e raster.e \ ! select.e setup.e util.e xbitmap.e xpixmap.e ! import.o: const.h tgif_dbg.h types.h choose.e color.e dialog.e \ ! drawing.e dup.e eps.e file.e import.e msg.e menu.e names.e \ ! obj.e select.e setup.e text.e util.e xbitmap.e xpixmap.e mainloop.o: const.h tgif_dbg.h patchlvl.h types.h animate.e auxtext.e \ choice.e cmd.e color.e cutpaste.e cursor.e dialog.e drawing.e \ --- 370,385 ---- help.o: const.h tgif_dbg.h types.h patchlvl.h color.e dialog.e help.e \ menu.e msg.e setup.e util.e version.e ! http.o: const.h tgif_dbg.h types.h patchlvl.h http.e msg.e remote.e \ ! tcp.e util.e version.e ! imgproc.o: const.h tgif_dbg.h types.h auxtext.e choice.e cmd.e color.e \ ! cursor.e dialog.e drawing.e dup.e file.e grid.e imgproc.e \ ! mainloop.e mainmenu.e mark.e menu.e move.e msg.e names.e \ ! obj.e page.e polygon.e raster.e rect.e remote.e ruler.e \ ! select.e setup.e special.e util.e xbitmap.e xpixmap.e ! import.o: const.h tgif_dbg.h types.h attr.e choose.e cmd.e color.e \ ! cursor.e dialog.e drawing.e dup.e eps.e file.e import.e \ ! mainloop.e msg.e menu.e move.e names.e obj.e remote.e \ ! scroll.e select.e setup.e special.e stretch.e text.e util.e \ ! xbitmap.e xpixmap.e mainloop.o: const.h tgif_dbg.h patchlvl.h types.h animate.e auxtext.e \ choice.e cmd.e color.e cutpaste.e cursor.e dialog.e drawing.e \ *************** *** 379,384 **** mainloop.e mainmenu.e menu.e msg.e names.e navigate.e obj.e \ page.e ps.e raster.e remote.e ruler.e scroll.e select.e \ ! setup.e shape.e shortcut.e stk.e text.e version.e wb1.e \ ! xbitmap.e xpixmap.e mainmenu.o: const.h tgif_dbg.h types.h align.e choice.e color.e cursor.e \ edit.e file.e font.e grid.e help.e imgproc.e mainloop.e \ --- 387,392 ---- mainloop.e mainmenu.e menu.e msg.e names.e navigate.e obj.e \ page.e ps.e raster.e remote.e ruler.e scroll.e select.e \ ! setup.e shape.e shortcut.e stk.e text.e util.e version.e \ ! wb1.e xbitmap.e xpixmap.e mainmenu.o: const.h tgif_dbg.h types.h align.e choice.e color.e cursor.e \ edit.e file.e font.e grid.e help.e imgproc.e mainloop.e \ *************** *** 389,396 **** menu.o: const.h tgif_dbg.h patchlvl.h types.h align.e box.e choice.e \ cmd.e color.e cursor.e dialog.e drawing.e edit.e exec.e \ ! file.e font.e grid.e imgproc.e mainloop.e mainmenu.e menu.e \ ! move.e msg.e names.e navigate.e obj.e page.e pattern.e \ raster.e rect.e remote.e select.e setup.e shape.e special.e \ ! stk.e text.e version.e move.o: const.h tgif_dbg.h types.h arc.e attr.e cmd.e cursor.e \ drawing.e dup.e grid.e mainloop.e mark.e move.e msg.e names.e \ --- 397,404 ---- menu.o: const.h tgif_dbg.h patchlvl.h types.h align.e box.e choice.e \ cmd.e color.e cursor.e dialog.e drawing.e edit.e exec.e \ ! file.e font.e grid.e help.e imgproc.e mainloop.e mainmenu.e \ ! menu.e move.e msg.e names.e navigate.e obj.e page.e pattern.e \ raster.e rect.e remote.e select.e setup.e shape.e special.e \ ! stk.e text.e util.e version.e move.o: const.h tgif_dbg.h types.h arc.e attr.e cmd.e cursor.e \ drawing.e dup.e grid.e mainloop.e mark.e move.e msg.e names.e \ *************** *** 429,444 **** poly.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e dialog.e drawing.e dup.e file.e grid.e \ ! mainloop.e msg.e obj.e pattern.e poly.e polygon.e ps.e \ raster.e rect.e ruler.e select.e setup.e spline.e stretch.e \ util.e xpixmap.e ! polygon.o: const.h tgif_dbg.h types.h attr.e box.e cmd.e color.e \ ! choice.e cursor.e dialog.e drawing.e dup.e grid.e file.e \ ! mainloop.e mark.e msg.e obj.e pattern.e poly.e polygon.e ps.e \ ! raster.e rect.e ruler.e select.e setup.e spline.e util.e \ ! xpixmap.e prtgif.o: const.h tgif_dbg.h prtgif.e ps.o: const.h tgif_dbg.h types.h msg.e ps.e util.e raster.o: const.h tgif_dbg.h types.h choice.e color.e dialog.e file.e \ ! font.e pattern.e poly.e shape.e raster.e setup.e util.e \ xbm/arrow.xbm xbm/text.xbm xbm/box.xbm xbm/oval.xbm \ xbm/poly.xbm xbm/polygon.xbm xbm/arc.xbm xbm/rcbox.xbm \ --- 437,452 ---- poly.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e dialog.e drawing.e dup.e file.e grid.e \ ! mainloop.e mark.e msg.e obj.e pattern.e poly.e polygon.e ps.e \ raster.e rect.e ruler.e select.e setup.e spline.e stretch.e \ util.e xpixmap.e ! polygon.o: const.h tgif_dbg.h types.h attr.e auxtext.e box.e cmd.e \ ! color.e choice.e cursor.e dialog.e drawing.e dup.e grid.e \ ! file.e mainloop.e mark.e msg.e obj.e pattern.e poly.e \ ! polygon.e ps.e raster.e rect.e ruler.e select.e setup.e \ ! spline.e util.e xpixmap.e prtgif.o: const.h tgif_dbg.h prtgif.e ps.o: const.h tgif_dbg.h types.h msg.e ps.e util.e raster.o: const.h tgif_dbg.h types.h choice.e color.e dialog.e file.e \ ! font.e msg.e pattern.e poly.e shape.e raster.e setup.e util.e \ xbm/arrow.xbm xbm/text.xbm xbm/box.xbm xbm/oval.xbm \ xbm/poly.xbm xbm/polygon.xbm xbm/arc.xbm xbm/rcbox.xbm \ *************** *** 485,497 **** rcbox.o: const.h tgif_dbg.h types.h attr.e auxtext.e box.e cmd.e \ color.e cursor.e file.e grid.e mainloop.e msg.e obj.e \ ! pattern.e poly.e ps.e raster.e rcbox.e ruler.e select.e \ ! setup.e spline.e util.e xpixmap.e ! rect.o: const.h tgif_dbg.h types.h arc.e color.e dialog.e poly.e \ ! rect.e setup.e spline.e remote.o: const.h tgif_dbg.h types.h patchlvl.h cutpaste.e dialog.e \ drawing.e file.e ftp.e http.e menu.e msg.e names.e navigate.e \ page.e remote.e setup.e tcp.e util.e version.e ! ruler.o: const.h tgif_dbg.h types.h cursor.e dialog.e font.e grid.e \ ! mainmenu.e msg.e raster.e ruler.e setup.e util.e scroll.o: const.h tgif_dbg.h types.h choice.e cursor.e drawing.e dup.e \ grid.e mainloop.e msg.e obj.e page.e raster.e ruler.e \ --- 493,505 ---- rcbox.o: const.h tgif_dbg.h types.h attr.e auxtext.e box.e cmd.e \ color.e cursor.e file.e grid.e mainloop.e msg.e obj.e \ ! pattern.e poly.e ps.e raster.e rect.e rcbox.e ruler.e \ ! select.e setup.e spline.e util.e xpixmap.e ! rect.o: const.h tgif_dbg.h types.h arc.e color.e dialog.e drawing.e \ ! msg.e poly.e rect.e setup.e spline.e remote.o: const.h tgif_dbg.h types.h patchlvl.h cutpaste.e dialog.e \ drawing.e file.e ftp.e http.e menu.e msg.e names.e navigate.e \ page.e remote.e setup.e tcp.e util.e version.e ! ruler.o: const.h tgif_dbg.h types.h choice.e cursor.e dialog.e font.e \ ! grid.e mainmenu.e msg.e raster.e ruler.e setup.e util.e scroll.o: const.h tgif_dbg.h types.h choice.e cursor.e drawing.e dup.e \ grid.e mainloop.e msg.e obj.e page.e raster.e ruler.e \ *************** *** 499,505 **** select.o: const.h tgif_dbg.h types.h button.e choice.e cmd.e color.e \ cursor.e dialog.e drawing.e dup.e exec.e file.e font.e grid.e \ ! group.e mainloop.e mark.e menu.e move.e msg.e names.e obj.e \ ! page.e poly.e raster.e rect.e remote.e ruler.e scroll.e \ ! select.e setup.e stk.e stretch.e setup.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e drawing.e dup.e file.e font.e grid.e help.e \ --- 507,513 ---- select.o: const.h tgif_dbg.h types.h button.e choice.e cmd.e color.e \ cursor.e dialog.e drawing.e dup.e exec.e file.e font.e grid.e \ ! group.e mainloop.e mark.e menu.e move.e msg.e names.e \ ! navigate.e obj.e page.e poly.e raster.e rect.e remote.e \ ! ruler.e scroll.e select.e setup.e stk.e stretch.e util.e setup.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e drawing.e dup.e file.e font.e grid.e help.e \ *************** *** 507,516 **** msg.e names.e page.e pattern.e ps.e raster.e remote.e ruler.e \ scroll.e select.e setup.e shape.e shortcut.e spline.e stk.e \ ! stretch.e text.e xbitmap.e xpixmap.e tgificon.xbm \ xbm/btn1.xbm shape.o: const.h tgif_dbg.h types.h arc.e attr.e auxtext.e box.e cmd.e \ ! color.e cursor.e dialog.e drawing.e dup.e group.e menu.e \ ! msg.e obj.e page.e pattern.e poly.e polygon.e raster.e \ ! select.e setup.e shape.e spline.e text.e util.e shortcut.o: const.h tgif_dbg.h types.h msg.e setup.e shortcut.e special.o: const.h tgif_dbg.h types.h animate.e attr.e auxtext.e \ --- 515,525 ---- msg.e names.e page.e pattern.e ps.e raster.e remote.e ruler.e \ scroll.e select.e setup.e shape.e shortcut.e spline.e stk.e \ ! stretch.e text.e util.e xbitmap.e xpixmap.e tgificon.xbm \ xbm/btn1.xbm shape.o: const.h tgif_dbg.h types.h arc.e attr.e auxtext.e box.e cmd.e \ ! color.e cursor.e dialog.e drawing.e dup.e grid.e group.e \ ! mainloop.e menu.e move.e msg.e obj.e oval.e page.e pattern.e \ ! poly.e polygon.e raster.e ruler.e select.e setup.e shape.e \ ! spline.e text.e util.e shortcut.o: const.h tgif_dbg.h types.h msg.e setup.e shortcut.e special.o: const.h tgif_dbg.h types.h animate.e attr.e auxtext.e \ *************** *** 520,525 **** ruler.e scroll.e select.e setup.e special.e stk.e text.e \ wb1.e util.e ! spline.o: const.h tgif_dbg.h types.h dialog.e poly.e polygon.e raster.e \ ! rect.e setup.e spline.e stk.o: const.h tgif_dbg.h types.h align.e attr.e box.e button.e \ choice.e cmd.e color.e cursor.e dialog.e drawing.e dup.e \ --- 529,534 ---- ruler.e scroll.e select.e setup.e special.e stk.e text.e \ wb1.e util.e ! spline.o: const.h tgif_dbg.h types.h dialog.e msg.e poly.e polygon.e \ ! raster.e rect.e setup.e spline.e stk.o: const.h tgif_dbg.h types.h align.e attr.e box.e button.e \ choice.e cmd.e color.e cursor.e dialog.e drawing.e dup.e \ *************** *** 547,566 **** version.o: version.e vms_comp.o: ! wb1.o: const.h tgif_dbg.h types.h choice.e cmd.e color.e drawing.e \ ! file.e msg.e obj.e page.e select.e setup.e tcp.e wb1.e wb2.e \ ! wb3.e wb2.o: const.h tgif_dbg.h types.h attr.e auxtext.e color.e dup.e \ ! file.e wb2.e wb3.e wb3.o: const.h tgif_dbg.h types.h patchlvl.h align.e auxtext.e \ ! color.e file.e font.e grid.e msg.e page.e pattern.e poly.e \ ! prtgif.e setup.e stk.e text.e version.e wb2.e wb3.e xpixmap.e xbitmap.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e dialog.e drawing.e dup.e eps.e file.e font.e \ ! grid.e imgproc.e mark.e menu.e msg.e names.e obj.e page.e \ ! pattern.e ps.e raster.e rect.e select.e setup.e util.e \ ! xbitmap.e xpixmap.e xpixmap.o: const.h tgif_dbg.h types.h attr.e choice.e cmd.e color.e \ cursor.e dialog.e drawing.e dup.e file.e font.e grid.e \ ! imgproc.e mainmenu.e mark.e msg.e names.e obj.e pattern.e \ ! ps.e raster.e rect.e select.e setup.e util.e xbitmap.e \ ! xpixmap.e --- 556,576 ---- version.o: version.e vms_comp.o: ! wb1.o: const.h tgif_dbg.h types.h arc.e box.e choice.e cmd.e color.e \ ! dialog.e drawing.e file.e group.e move.e msg.e obj.e oval.e \ ! page.e rcbox.e select.e setup.e tcp.e wb1.e wb2.e wb3.e wb2.o: const.h tgif_dbg.h types.h attr.e auxtext.e color.e dup.e \ ! file.e font.e msg.e wb2.e wb3.e wb3.o: const.h tgif_dbg.h types.h patchlvl.h align.e auxtext.e \ ! color.e file.e font.e grid.e msg.e obj.e page.e pattern.e \ ! poly.e prtgif.e raster.e setup.e stk.e text.e version.e wb2.e \ ! wb3.e xpixmap.e xbitmap.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e dialog.e drawing.e dup.e eps.e file.e font.e \ ! grid.e imgproc.e mark.e menu.e move.e msg.e names.e obj.e \ ! page.e pattern.e ps.e raster.e rect.e select.e setup.e \ ! stretch.e util.e xbitmap.e xpixmap.e xpixmap.o: const.h tgif_dbg.h types.h attr.e choice.e cmd.e color.e \ cursor.e dialog.e drawing.e dup.e file.e font.e grid.e \ ! imgproc.e mainmenu.e mark.e move.e msg.e names.e obj.e \ ! pattern.e ps.e raster.e rect.e select.e setup.e stretch.e \ ! util.e xbitmap.e xpixmap.e *** Imakefile.orig Thu Oct 31 01:46:35 1996 --- Imakefile Thu Oct 31 01:46:35 1996 *************** *** 45,49 **** XCOMM EXTRA_LDOPTIONS = ! TGIFVERSION = 3.0-p9 PROGRAMS = tgif prtgif XCOMM frontend11.o testdrive XCOMM CDEBUGFLAGS= -g --- 45,49 ---- XCOMM EXTRA_LDOPTIONS = ! TGIFVERSION = 3.0-p10 PROGRAMS = tgif prtgif XCOMM frontend11.o testdrive XCOMM CDEBUGFLAGS= -g *************** *** 72,75 **** --- 72,76 ---- XCOMM Linux: XCOMM FreeBSD: + XCOMM SCO: -D_NO_EXTERN -DPRINT_CMD=\"lp -o raw -o nobanner\" LOCAL_LIBRARIES = $(XLIB) *** tgif.man.orig Thu Oct 31 01:46:36 1996 --- tgif.man Thu Oct 31 01:46:37 1996 *************** *** 2,4 **** ! .TH TGIF n "Version 3.0 Patchlevel 8 and Above" "Tgif" .\" .SH NAME --- 2,4 ---- ! .TH TGIF n "Version 3.0 Patchlevel 10 and Above" "Tgif" .\" .SH NAME *************** *** 19,22 **** --- 19,23 ---- [\fB-nv\fR] [\fB-bw\fR] + [\fB-reqcolor\fR] [\fB-cwo\fR] [\fB-hyper\fR] *************** *** 35,38 **** --- 36,40 ---- [\fB-text\fR] [\fB-gray\fR] + [\fB-color | -reqcolor\fR] [\fB-adobe\fR | -adobe=/] [\fB-page \fR] *************** *** 65,68 **** --- 67,73 ---- in reverse-video (or normal-video) mode. If \fI-bw\fR is specified, tgif will come up in the black and white mode. + Using \fI-reqcolor\fR has the same effect as setting the + Tgif.PrintUsingRequestedColor X default to true + (see the X DEFAULTS section below). If \fI-cwo\fR is specified, only the canvas window (see TGIF SUBWINDOWS section below) will be displayed. *************** *** 83,87 **** A symbol file (see descriptions below) can also be printed by specifying the \fI.sym\fR extension explicitly. - Only non-color printing is supported. .PP In the second form, --- 88,91 ---- *************** *** 102,105 **** --- 106,114 ---- Using the \fI-gray\fR option has the same effect as setting the Tgif.UseGrayScale X default to true (see the X DEFAULTS section below). + To print in color, one can use either the \fI-color\fR or the \fI-reqcolor\fR + option. The only difference between the two is that using + \fI-reqcolor\fR has the same effect as setting the + Tgif.PrintUsingRequestedColor X default to true + (see the X DEFAULTS section below). Using the \fI-adobe\fR or the \fI-adobe=/\fR option has the same effect as specifying the *** HISTORY.orig Thu Oct 31 01:46:39 1996 --- HISTORY Thu Oct 31 01:46:39 1996 *************** *** 1,2 **** --- 1,22 ---- + -----------------------> tgif-3.0-p9 => tgif-3.0-p10 <----------------------- + Here's a short list of added features/bug fixes. + + 1) Fix some problems with rotation. Thanks to Kyle Bateman + for pointing out the problems. + 2) Improve EPS printing accuracy when the EPS object is not rotated or + sheared. + 3) Automatically fix invalid poly/open-spline smooth/hinge values. + 4) Fix a bug in handling XAPPLRESDIR when the -DUSE_XAPPLRESDIR compile + option is used. Thanks to Dieter Jurzitza for pointing out the problem. + 5) Fix a bug in handling Tgif.UseWMIconPixmap. Thanks to Dieter Jurzitza + for the patch. + 6) Support -color commandline argument to be used with -print. Since old + tgif file does not contain enough color information for color printing + in batch mode, the -color commandline argument will not work with tgif + files saved by an earlier version of tgif. + 7) Save color layer information in obj files. + 8) Add a SetSelFontSize() command to the Edit Menu to change the font + size of selected objects. + -----------------------> tgif-3.0-p8 => tgif-3.0-p9 <----------------------- Here's a short list of added features/bug fixes. *** descrip.mms.orig Thu Oct 31 01:46:41 1996 --- descrip.mms Thu Oct 31 01:46:41 1996 *************** *** 155,159 **** button.e,choice.e,cmd.e,color.e,dialog.e,drawing.e,dup.e,- grid.e,mark.e,mainmenu.e,menu.e,move.e,msg.e,obj.e,poly.e,- ! raster.e,select.e,setup.e animate.obj depends_on animate.c,const.h,tgif_dbg.h,types.h,animate.e,color.e,- dialog.e,msg.e,poly.e,raster.e,select.e,setup.e --- 155,159 ---- button.e,choice.e,cmd.e,color.e,dialog.e,drawing.e,dup.e,- grid.e,mark.e,mainmenu.e,menu.e,move.e,msg.e,obj.e,poly.e,- ! raster.e,rect.e,select.e,setup.e animate.obj depends_on animate.c,const.h,tgif_dbg.h,types.h,animate.e,color.e,- dialog.e,msg.e,poly.e,raster.e,select.e,setup.e *************** *** 161,165 **** choice.e,cmd.e,color.e,cursor.e,dialog.e,dup.e,file.e,grid.e,- mainloop.e,mark.e,msg.e,obj.e,pattern.e,poly.e,ps.e,raster.e,- ! ruler.e,select.e,setup.e,special.e,spline.e,util.e,xpixmap.e attr.obj depends_on attr.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- button.e,choice.e,choose.e,cmd.e,color.e,cursor.e,dialog.e,- --- 161,166 ---- choice.e,cmd.e,color.e,cursor.e,dialog.e,dup.e,file.e,grid.e,- mainloop.e,mark.e,msg.e,obj.e,pattern.e,poly.e,ps.e,raster.e,- ! rect.e,ruler.e,select.e,setup.e,special.e,spline.e,util.e,- ! xpixmap.e attr.obj depends_on attr.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- button.e,choice.e,choose.e,cmd.e,color.e,cursor.e,dialog.e,- *************** *** 168,177 **** rect.e,ruler.e,select.e,setup.e,stk.e,text.e,util.e auxtext.obj depends_on auxtext.c,const.h,tgif_dbg.h,types.h,auxtext.e,color.e,- ! cursor.e,dialog.e,file.e,font.e,msg.e,obj.e,pattern.e,prtgif.e,- ! ps.e,raster.e,rect.e,setup.e,text.e,util.e,xbitmap.e,xpixmap.e box.obj depends_on box.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,box.e,- cmd.e,color.e,cursor.e,file.e,grid.e,mainloop.e,msg.e,obj.e,- ! pattern.e,poly.e,ps.e,raster.e,ruler.e,select.e,setup.e,util.e,- ! xpixmap.e button.obj depends_on button.c,const.h,tgif_dbg.h,types.h,auxtext.e,box.e,- button.e,cursor.e,file.e,font.e,mainloop.e,mainmenu.e,msg.e,- --- 169,179 ---- rect.e,ruler.e,select.e,setup.e,stk.e,text.e,util.e auxtext.obj depends_on auxtext.c,const.h,tgif_dbg.h,types.h,auxtext.e,color.e,- ! cursor.e,dialog.e,drawing.e,file.e,font.e,msg.e,obj.e,- ! pattern.e,prtgif.e,ps.e,raster.e,rect.e,setup.e,text.e,util.e,- ! xbitmap.e,xpixmap.e box.obj depends_on box.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,box.e,- cmd.e,color.e,cursor.e,file.e,grid.e,mainloop.e,msg.e,obj.e,- ! pattern.e,poly.e,ps.e,raster.e,rect.e,ruler.e,select.e,setup.e,- ! util.e,xpixmap.e button.obj depends_on button.c,const.h,tgif_dbg.h,types.h,auxtext.e,box.e,- button.e,cursor.e,file.e,font.e,mainloop.e,mainmenu.e,msg.e,- *************** *** 181,196 **** font.e,grid.e,mainloop.e,mainmenu.e,mark.e,msg.e,navigate.e,- oval.e,page.e,pattern.e,poly.e,polygon.e,raster.e,rcbox.e,- ! select.e,setup.e,shape.e,special.e,stretch.e,text.e,xbitmap.e,- ! xbm/abc.xbm ! choose.obj depends_on choose.c,const.h,tgif_dbg.h,types.h,button.e,choose.e,- ! cutpaste.e,cursor.e,dialog.e,file.e,font.e,mainloop.e,- ! mainmenu.e,msg.e,names.e,raster.e,setup.e,util.e cmd.obj depends_on cmd.c,const.h,tgif_dbg.h,types.h,attr.e,choice.e,cmd.e,- ! color.e,dialog.e,drawing.e,dup.e,imgproc.e,mark.e,move.e,msg.e,- ! obj.e,page.e,select.e,setup.e,stk.e,xpixmap.e,wb1.e color.obj depends_on color.c,const.h,tgif_dbg.h,types.h,choice.e,cmd.e,color.e,- ! dialog.e,drawing.e,file.e,font.e,imgproc.e,mainloop.e,mark.e,- ! menu.e,msg.e,obj.e,page.e,pattern.e,raster.e,select.e,setup.e,- ! text.e,util.e,xpixmap.e cursor.obj depends_on cursor.c,const.h,tgif_dbg.h,types.h,choice.e,color.e,- cursor.e,setup.e,xbitmap.e,xbm/null.xbm,xbm/nullmask.xbm,- --- 183,200 ---- font.e,grid.e,mainloop.e,mainmenu.e,mark.e,msg.e,navigate.e,- oval.e,page.e,pattern.e,poly.e,polygon.e,raster.e,rcbox.e,- ! rect.e,select.e,setup.e,shape.e,special.e,stretch.e,text.e,- ! util.e,xbitmap.e,xbm/abc.xbm ! choose.obj depends_on choose.c,const.h,tgif_dbg.h,types.h,auxtext.e,button.e,- ! choose.e,cutpaste.e,cursor.e,dialog.e,file.e,font.e,mainloop.e,- ! mainmenu.e,msg.e,names.e,raster.e,rect.e,remote.e,setup.e,- ! util.e cmd.obj depends_on cmd.c,const.h,tgif_dbg.h,types.h,attr.e,choice.e,cmd.e,- ! color.e,dialog.e,drawing.e,dup.e,imgproc.e,mainmenu.e,mark.e,- ! move.e,msg.e,obj.e,page.e,select.e,setup.e,stk.e,xpixmap.e,- ! wb1.e color.obj depends_on color.c,const.h,tgif_dbg.h,types.h,choice.e,cmd.e,color.e,- ! dialog.e,drawing.e,file.e,font.e,imgproc.e,mainloop.e,- ! mainmenu.e,mark.e,menu.e,msg.e,obj.e,page.e,pattern.e,raster.e,- ! select.e,setup.e,text.e,util.e,xpixmap.e cursor.obj depends_on cursor.c,const.h,tgif_dbg.h,types.h,choice.e,color.e,- cursor.e,setup.e,xbitmap.e,xbm/null.xbm,xbm/nullmask.xbm,- *************** *** 204,217 **** dialog.obj depends_on dialog.c,const.h,tgif_dbg.h,types.h,auxtext.e,box.e,- button.e,cutpaste.e,cursor.e,dialog.e,drawing.e,file.e,font.e,- ! mainloop.e,mainmenu.e,msg.e,raster.e,setup.e,text.e,util.e,- ! xbm/info.xbm drawing.obj depends_on drawing.c,const.h,tgif_dbg.h,types.h,align.e,animate.e,- arc.e,attr.e,auxtext.e,box.e,choice.e,cmd.e,color.e,cutpaste.e,- cursor.e,dialog.e,drawing.e,dup.e,edit.e,eps.e,exec.e,file.e,- ! font.e,grid.e,group.e,imgproc.e,import.e,mark.e,mainloop.e,- ! menu.e,msg.e,navigate.e,names.e,obj.e,oval.e,page.e,pattern.e,- ! poly.e,polygon.e,raster.e,rcbox.e,rect.e,remote.e,ruler.e,- ! scroll.e,select.e,setup.e,shape.e,shortcut.e,special.e,stk.e,- ! stretch.e,text.e,wb1.e,xbitmap.e,xpixmap.e,xbm/intr.xbm,- xbm/trek.xbm dup.obj depends_on dup.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,choice.e,- --- 208,221 ---- dialog.obj depends_on dialog.c,const.h,tgif_dbg.h,types.h,auxtext.e,box.e,- button.e,cutpaste.e,cursor.e,dialog.e,drawing.e,file.e,font.e,- ! grid.e,mainloop.e,mainmenu.e,msg.e,raster.e,ruler.e,setup.e,- ! text.e,util.e,xbm/info.xbm drawing.obj depends_on drawing.c,const.h,tgif_dbg.h,types.h,align.e,animate.e,- arc.e,attr.e,auxtext.e,box.e,choice.e,cmd.e,color.e,cutpaste.e,- cursor.e,dialog.e,drawing.e,dup.e,edit.e,eps.e,exec.e,file.e,- ! font.e,grid.e,group.e,help.e,imgproc.e,import.e,mark.e,- ! mainloop.e,menu.e,msg.e,navigate.e,names.e,obj.e,oval.e,page.e,- ! pattern.e,poly.e,polygon.e,raster.e,rcbox.e,rect.e,remote.e,- ! ruler.e,scroll.e,select.e,setup.e,shape.e,shortcut.e,special.e,- ! stk.e,stretch.e,text.e,wb1.e,xbitmap.e,xpixmap.e,xbm/intr.xbm,- xbm/trek.xbm dup.obj depends_on dup.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,choice.e,- *************** *** 222,230 **** dialog.e,drawing.e,dup.e,edit.e,eps.e,font.e,grid.e,group.e,- mainloop.e,mark.e,menu.e,move.e,msg.e,names.e,obj.e,page.e,- ! pattern.e,poly.e,raster.e,ruler.e,select.e,setup.e,shape.e,- ! special.e,spline.e,stretch.e,text.e,util.e,xbitmap.e,xpixmap.e eps.obj depends_on eps.c,const.h,tgif_dbg.h,types.h,cmd.e,color.e,cursor.e,- dialog.e,drawing.e,dup.e,eps.e,file.e,grid.e,mark.e,msg.e,- ! obj.e,pattern.e,select.e,setup.e,util.e,xbitmap.e exec.obj depends_on exec.c,const.h,tgif_dbg.h,types.h,align.e,attr.e,auxtext.e,- cmd.e,color.e,choice.e,cursor.e,dialog.e,drawing.e,dup.e,- --- 226,235 ---- dialog.e,drawing.e,dup.e,edit.e,eps.e,font.e,grid.e,group.e,- mainloop.e,mark.e,menu.e,move.e,msg.e,names.e,obj.e,page.e,- ! pattern.e,poly.e,polygon.e,raster.e,rect.e,ruler.e,select.e,- ! setup.e,shape.e,special.e,spline.e,stretch.e,text.e,util.e,- ! xbitmap.e,xpixmap.e eps.obj depends_on eps.c,const.h,tgif_dbg.h,types.h,cmd.e,color.e,cursor.e,- dialog.e,drawing.e,dup.e,eps.e,file.e,grid.e,mark.e,msg.e,- ! obj.e,pattern.e,rect.e,select.e,setup.e,util.e,xbitmap.e exec.obj depends_on exec.c,const.h,tgif_dbg.h,types.h,align.e,attr.e,auxtext.e,- cmd.e,color.e,choice.e,cursor.e,dialog.e,drawing.e,dup.e,- *************** *** 237,251 **** file.obj depends_on file.c,const.h,tgif_dbg.h,patchlvl.h,types.h,align.e,arc.e,- attr.e,auxtext.e,box.e,button.e,choice.e,cmd.e,color.e,- ! cutpaste.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,file.e,- ! font.e,grid.e,group.e,import.e,mainloop.e,mainmenu.e,mark.e,- ! menu.e,move.e,msg.e,names.e,navigate.e,obj.e,oval.e,page.e,- ! pattern.e,poly.e,polygon.e,prtgif.e,ps.e,raster.e,rcbox.e,- ! rect.e,remote.e,ruler.e,scroll.e,select.e,setup.e,shape.e,- ! special.e,stk.e,stretch.e,text.e,util.e,version.e,xbitmap.e,- ! xpixmap.e font.obj depends_on font.c,const.h,tgif_dbg.h,types.h,auxtext.e,choice.e,cmd.e,- color.e,cursor.e,dialog.e,drawing.e,exec.e,file.e,font.e,- mainmenu.e,mark.e,menu.e,msg.e,obj.e,pattern.e,page.e,ps.e,- ! raster.e,select.e,setup.e,text.e,util.e,xpixmap.e frontend.obj depends_on frontend.c ftp.obj depends_on ftp.c,const.h,tgif_dbg.h,ftp.e,remote.e,tcp.e,util.e --- 242,256 ---- file.obj depends_on file.c,const.h,tgif_dbg.h,patchlvl.h,types.h,align.e,arc.e,- attr.e,auxtext.e,box.e,button.e,choice.e,cmd.e,color.e,- ! cutpaste.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,exec.e,- ! file.e,font.e,grid.e,group.e,import.e,mainloop.e,mainmenu.e,- ! mark.e,menu.e,move.e,msg.e,names.e,navigate.e,obj.e,oval.e,- ! page.e,pattern.e,poly.e,polygon.e,prtgif.e,ps.e,raster.e,- ! rcbox.e,rect.e,remote.e,ruler.e,scroll.e,select.e,setup.e,- ! shape.e,special.e,stk.e,stretch.e,text.e,util.e,version.e,- ! xbitmap.e,xpixmap.e font.obj depends_on font.c,const.h,tgif_dbg.h,types.h,auxtext.e,choice.e,cmd.e,- color.e,cursor.e,dialog.e,drawing.e,exec.e,file.e,font.e,- mainmenu.e,mark.e,menu.e,msg.e,obj.e,pattern.e,page.e,ps.e,- ! raster.e,rect.e,select.e,setup.e,text.e,util.e,xpixmap.e frontend.obj depends_on frontend.c ftp.obj depends_on ftp.c,const.h,tgif_dbg.h,ftp.e,remote.e,tcp.e,util.e *************** *** 253,257 **** cursor.e,dialog.e,drawing.e,dup.e,file.e,grid.e,mainmenu.e,- menu.e,msg.e,obj.e,page.e,pattern.e,raster.e,ruler.e,scroll.e,- ! select.e,setup.e,stretch.e,text.e group.obj depends_on group.c,const.h,tgif_dbg.h,types.h,attr.e,choice.e,cmd.e,- drawing.e,dup.e,file.e,group.e,mark.e,msg.e,obj.e,page.e,- --- 258,262 ---- cursor.e,dialog.e,drawing.e,dup.e,file.e,grid.e,mainmenu.e,- menu.e,msg.e,obj.e,page.e,pattern.e,raster.e,ruler.e,scroll.e,- ! select.e,setup.e,stretch.e,text.e,util.e group.obj depends_on group.c,const.h,tgif_dbg.h,types.h,attr.e,choice.e,cmd.e,- drawing.e,dup.e,file.e,group.e,mark.e,msg.e,obj.e,page.e,- *************** *** 259,272 **** help.obj depends_on help.c,const.h,tgif_dbg.h,types.h,patchlvl.h,color.e,- dialog.e,help.e,menu.e,msg.e,setup.e,util.e,version.e ! http.obj depends_on http.c,const.h,tgif_dbg.h,patchlvl.h,http.e,remote.e,tcp.e,- ! util.e,version.e ! imgproc.obj depends_on imgproc.c,const.h,tgif_dbg.h,types.h,choice.e,cmd.e,- ! color.e,cursor.e,dialog.e,drawing.e,dup.e,file.e,grid.e,- ! imgproc.e,mainloop.e,mainmenu.e,menu.e,msg.e,names.e,obj.e,- ! page.e,raster.e,select.e,setup.e,util.e,xbitmap.e,xpixmap.e ! import.obj depends_on import.c,const.h,tgif_dbg.h,types.h,choose.e,color.e,- ! dialog.e,drawing.e,dup.e,eps.e,file.e,import.e,msg.e,menu.e,- ! names.e,obj.e,select.e,setup.e,text.e,util.e,xbitmap.e,- ! xpixmap.e mainloop.obj depends_on mainloop.c,const.h,tgif_dbg.h,patchlvl.h,types.h,- animate.e,auxtext.e,choice.e,cmd.e,color.e,cutpaste.e,cursor.e,- --- 264,279 ---- help.obj depends_on help.c,const.h,tgif_dbg.h,types.h,patchlvl.h,color.e,- dialog.e,help.e,menu.e,msg.e,setup.e,util.e,version.e ! http.obj depends_on http.c,const.h,tgif_dbg.h,types.h,patchlvl.h,http.e,msg.e,- ! remote.e,tcp.e,util.e,version.e ! imgproc.obj depends_on imgproc.c,const.h,tgif_dbg.h,types.h,auxtext.e,choice.e,- ! cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,file.e,grid.e,- ! imgproc.e,mainloop.e,mainmenu.e,mark.e,menu.e,move.e,msg.e,- ! names.e,obj.e,page.e,polygon.e,raster.e,rect.e,remote.e,- ! ruler.e,select.e,setup.e,special.e,util.e,xbitmap.e,xpixmap.e ! import.obj depends_on import.c,const.h,tgif_dbg.h,types.h,attr.e,choose.e,- ! cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,file.e,- ! import.e,mainloop.e,msg.e,menu.e,move.e,names.e,obj.e,remote.e,- ! scroll.e,select.e,setup.e,special.e,stretch.e,text.e,util.e,- ! xbitmap.e,xpixmap.e mainloop.obj depends_on mainloop.c,const.h,tgif_dbg.h,patchlvl.h,types.h,- animate.e,auxtext.e,choice.e,cmd.e,color.e,cutpaste.e,cursor.e,- *************** *** 275,279 **** navigate.e,obj.e,page.e,ps.e,raster.e,remote.e,ruler.e,- scroll.e,select.e,setup.e,shape.e,shortcut.e,stk.e,text.e,- ! version.e,wb1.e,xbitmap.e,xpixmap.e mainmenu.obj depends_on mainmenu.c,const.h,tgif_dbg.h,types.h,align.e,choice.e,- color.e,cursor.e,edit.e,file.e,font.e,grid.e,help.e,imgproc.e,- --- 282,286 ---- navigate.e,obj.e,page.e,ps.e,raster.e,remote.e,ruler.e,- scroll.e,select.e,setup.e,shape.e,shortcut.e,stk.e,text.e,- ! util.e,version.e,wb1.e,xbitmap.e,xpixmap.e mainmenu.obj depends_on mainmenu.c,const.h,tgif_dbg.h,types.h,align.e,choice.e,- color.e,cursor.e,edit.e,file.e,font.e,grid.e,help.e,imgproc.e,- *************** *** 284,291 **** menu.obj depends_on menu.c,const.h,tgif_dbg.h,patchlvl.h,types.h,align.e,box.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,edit.e,- ! exec.e,file.e,font.e,grid.e,imgproc.e,mainloop.e,mainmenu.e,- ! menu.e,move.e,msg.e,names.e,navigate.e,obj.e,page.e,pattern.e,- ! raster.e,rect.e,remote.e,select.e,setup.e,shape.e,special.e,- ! stk.e,text.e,version.e move.obj depends_on move.c,const.h,tgif_dbg.h,types.h,arc.e,attr.e,cmd.e,- cursor.e,drawing.e,dup.e,grid.e,mainloop.e,mark.e,move.e,msg.e,- --- 291,298 ---- menu.obj depends_on menu.c,const.h,tgif_dbg.h,patchlvl.h,types.h,align.e,box.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,edit.e,- ! exec.e,file.e,font.e,grid.e,help.e,imgproc.e,mainloop.e,- ! mainmenu.e,menu.e,move.e,msg.e,names.e,navigate.e,obj.e,page.e,- ! pattern.e,raster.e,rect.e,remote.e,select.e,setup.e,shape.e,- ! special.e,stk.e,text.e,util.e,version.e move.obj depends_on move.c,const.h,tgif_dbg.h,types.h,arc.e,attr.e,cmd.e,- cursor.e,drawing.e,dup.e,grid.e,mainloop.e,mark.e,move.e,msg.e,- *************** *** 325,334 **** poly.obj depends_on poly.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,- ! file.e,grid.e,mainloop.e,msg.e,obj.e,pattern.e,poly.e,- polygon.e,ps.e,raster.e,rect.e,ruler.e,select.e,setup.e,- spline.e,stretch.e,util.e,xpixmap.e ! polygon.obj depends_on polygon.c,const.h,tgif_dbg.h,types.h,attr.e,box.e,cmd.e,- ! color.e,choice.e,cursor.e,dialog.e,drawing.e,dup.e,grid.e,- ! file.e,mainloop.e,mark.e,msg.e,obj.e,pattern.e,poly.e,- polygon.e,ps.e,raster.e,rect.e,ruler.e,select.e,setup.e,- spline.e,util.e,xpixmap.e --- 332,341 ---- poly.obj depends_on poly.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,- ! file.e,grid.e,mainloop.e,mark.e,msg.e,obj.e,pattern.e,poly.e,- polygon.e,ps.e,raster.e,rect.e,ruler.e,select.e,setup.e,- spline.e,stretch.e,util.e,xpixmap.e ! polygon.obj depends_on polygon.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- ! box.e,cmd.e,color.e,choice.e,cursor.e,dialog.e,drawing.e,dup.e,- ! grid.e,file.e,mainloop.e,mark.e,msg.e,obj.e,pattern.e,poly.e,- polygon.e,ps.e,raster.e,rect.e,ruler.e,select.e,setup.e,- spline.e,util.e,xpixmap.e *************** *** 336,340 **** ps.obj depends_on ps.c,const.h,tgif_dbg.h,types.h,msg.e,ps.e,util.e raster.obj depends_on raster.c,const.h,tgif_dbg.h,types.h,choice.e,color.e,- ! dialog.e,file.e,font.e,pattern.e,poly.e,shape.e,raster.e,- setup.e,util.e,xbm/arrow.xbm,xbm/text.xbm,xbm/box.xbm,- xbm/oval.xbm,xbm/poly.xbm,xbm/polygon.xbm,xbm/arc.xbm,- --- 343,347 ---- ps.obj depends_on ps.c,const.h,tgif_dbg.h,types.h,msg.e,ps.e,util.e raster.obj depends_on raster.c,const.h,tgif_dbg.h,types.h,choice.e,color.e,- ! dialog.e,file.e,font.e,msg.e,pattern.e,poly.e,shape.e,raster.e,- setup.e,util.e,xbm/arrow.xbm,xbm/text.xbm,xbm/box.xbm,- xbm/oval.xbm,xbm/poly.xbm,xbm/polygon.xbm,xbm/arc.xbm,- *************** *** 381,394 **** rcbox.obj depends_on rcbox.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,box.e,- cmd.e,color.e,cursor.e,file.e,grid.e,mainloop.e,msg.e,obj.e,- ! pattern.e,poly.e,ps.e,raster.e,rcbox.e,ruler.e,select.e,- setup.e,spline.e,util.e,xpixmap.e rect.obj depends_on rect.c,const.h,tgif_dbg.h,types.h,arc.e,color.e,dialog.e,- ! poly.e,rect.e,setup.e,spline.e remote.obj depends_on remote.c,const.h,tgif_dbg.h,types.h,patchlvl.h,- cutpaste.e,dialog.e,drawing.e,file.e,ftp.e,http.e,menu.e,msg.e,- names.e,navigate.e,page.e,remote.e,setup.e,tcp.e,util.e,- version.e ! ruler.obj depends_on ruler.c,const.h,tgif_dbg.h,types.h,cursor.e,dialog.e,- ! font.e,grid.e,mainmenu.e,msg.e,raster.e,ruler.e,setup.e,util.e scroll.obj depends_on scroll.c,const.h,tgif_dbg.h,types.h,choice.e,cursor.e,- drawing.e,dup.e,grid.e,mainloop.e,msg.e,obj.e,page.e,raster.e,- --- 388,402 ---- rcbox.obj depends_on rcbox.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,box.e,- cmd.e,color.e,cursor.e,file.e,grid.e,mainloop.e,msg.e,obj.e,- ! pattern.e,poly.e,ps.e,raster.e,rect.e,rcbox.e,ruler.e,select.e,- setup.e,spline.e,util.e,xpixmap.e rect.obj depends_on rect.c,const.h,tgif_dbg.h,types.h,arc.e,color.e,dialog.e,- ! drawing.e,msg.e,poly.e,rect.e,setup.e,spline.e remote.obj depends_on remote.c,const.h,tgif_dbg.h,types.h,patchlvl.h,- cutpaste.e,dialog.e,drawing.e,file.e,ftp.e,http.e,menu.e,msg.e,- names.e,navigate.e,page.e,remote.e,setup.e,tcp.e,util.e,- version.e ! ruler.obj depends_on ruler.c,const.h,tgif_dbg.h,types.h,choice.e,cursor.e,- ! dialog.e,font.e,grid.e,mainmenu.e,msg.e,raster.e,ruler.e,- ! setup.e,util.e scroll.obj depends_on scroll.c,const.h,tgif_dbg.h,types.h,choice.e,cursor.e,- drawing.e,dup.e,grid.e,mainloop.e,msg.e,obj.e,page.e,raster.e,- *************** *** 397,402 **** cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,exec.e,file.e,- font.e,grid.e,group.e,mainloop.e,mark.e,menu.e,move.e,msg.e,- ! names.e,obj.e,page.e,poly.e,raster.e,rect.e,remote.e,ruler.e,- ! scroll.e,select.e,setup.e,stk.e,stretch.e setup.obj depends_on setup.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,drawing.e,dup.e,file.e,font.e,- --- 405,411 ---- cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,exec.e,file.e,- font.e,grid.e,group.e,mainloop.e,mark.e,menu.e,move.e,msg.e,- ! names.e,navigate.e,obj.e,page.e,poly.e,raster.e,rect.e,- ! remote.e,ruler.e,scroll.e,select.e,setup.e,stk.e,stretch.e,- ! util.e setup.obj depends_on setup.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,drawing.e,dup.e,file.e,font.e,- *************** *** 404,413 **** menu.e,move.e,msg.e,names.e,page.e,pattern.e,ps.e,raster.e,- remote.e,ruler.e,scroll.e,select.e,setup.e,shape.e,shortcut.e,- ! spline.e,stk.e,stretch.e,text.e,xbitmap.e,xpixmap.e,- tgificon.xbm,xbm/btn1.xbm shape.obj depends_on shape.c,const.h,tgif_dbg.h,types.h,arc.e,attr.e,auxtext.e,- ! box.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,group.e,- ! menu.e,msg.e,obj.e,page.e,pattern.e,poly.e,polygon.e,raster.e,- ! select.e,setup.e,shape.e,spline.e,text.e,util.e shortcut.obj depends_on shortcut.c,const.h,tgif_dbg.h,types.h,msg.e,setup.e,- shortcut.e --- 413,423 ---- menu.e,move.e,msg.e,names.e,page.e,pattern.e,ps.e,raster.e,- remote.e,ruler.e,scroll.e,select.e,setup.e,shape.e,shortcut.e,- ! spline.e,stk.e,stretch.e,text.e,util.e,xbitmap.e,xpixmap.e,- tgificon.xbm,xbm/btn1.xbm shape.obj depends_on shape.c,const.h,tgif_dbg.h,types.h,arc.e,attr.e,auxtext.e,- ! box.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,grid.e,- ! group.e,mainloop.e,menu.e,move.e,msg.e,obj.e,oval.e,page.e,- ! pattern.e,poly.e,polygon.e,raster.e,ruler.e,select.e,setup.e,- ! shape.e,spline.e,text.e,util.e shortcut.obj depends_on shortcut.c,const.h,tgif_dbg.h,types.h,msg.e,setup.e,- shortcut.e *************** *** 418,423 **** remote.e,ruler.e,scroll.e,select.e,setup.e,special.e,stk.e,- text.e,wb1.e,util.e ! spline.obj depends_on spline.c,const.h,tgif_dbg.h,types.h,dialog.e,poly.e,- ! polygon.e,raster.e,rect.e,setup.e,spline.e stk.obj depends_on stk.c,const.h,tgif_dbg.h,types.h,align.e,attr.e,box.e,- button.e,choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,- --- 428,433 ---- remote.e,ruler.e,scroll.e,select.e,setup.e,special.e,stk.e,- text.e,wb1.e,util.e ! spline.obj depends_on spline.c,const.h,tgif_dbg.h,types.h,dialog.e,msg.e,- ! poly.e,polygon.e,raster.e,rect.e,setup.e,spline.e stk.obj depends_on stk.c,const.h,tgif_dbg.h,types.h,align.e,attr.e,box.e,- button.e,choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,- *************** *** 446,466 **** version.obj depends_on version.c,version.e vms_comp.obj depends_on vms_comp.c ! wb1.obj depends_on wb1.c,const.h,tgif_dbg.h,types.h,choice.e,cmd.e,color.e,- ! drawing.e,file.e,msg.e,obj.e,page.e,select.e,setup.e,tcp.e,- ! wb1.e,wb2.e,wb3.e wb2.obj depends_on wb2.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,color.e,- ! dup.e,file.e,wb2.e,wb3.e wb3.obj depends_on wb3.c,const.h,tgif_dbg.h,types.h,patchlvl.h,align.e,- ! auxtext.e,color.e,file.e,font.e,grid.e,msg.e,page.e,pattern.e,- ! poly.e,prtgif.e,setup.e,stk.e,text.e,version.e,wb2.e,wb3.e,- ! xpixmap.e xbitmap.obj depends_on xbitmap.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,- ! file.e,font.e,grid.e,imgproc.e,mark.e,menu.e,msg.e,names.e,- ! obj.e,page.e,pattern.e,ps.e,raster.e,rect.e,select.e,setup.e,- ! util.e,xbitmap.e,xpixmap.e xpixmap.obj depends_on xpixmap.c,const.h,tgif_dbg.h,types.h,attr.e,choice.e,- cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,file.e,font.e,- ! grid.e,imgproc.e,mainmenu.e,mark.e,msg.e,names.e,obj.e,- ! pattern.e,ps.e,raster.e,rect.e,select.e,setup.e,util.e,- ! xbitmap.e,xpixmap.e --- 456,476 ---- version.obj depends_on version.c,version.e vms_comp.obj depends_on vms_comp.c ! wb1.obj depends_on wb1.c,const.h,tgif_dbg.h,types.h,arc.e,box.e,choice.e,cmd.e,- ! color.e,dialog.e,drawing.e,file.e,group.e,move.e,msg.e,obj.e,- ! oval.e,page.e,rcbox.e,select.e,setup.e,tcp.e,wb1.e,wb2.e,wb3.e wb2.obj depends_on wb2.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,color.e,- ! dup.e,file.e,font.e,msg.e,wb2.e,wb3.e wb3.obj depends_on wb3.c,const.h,tgif_dbg.h,types.h,patchlvl.h,align.e,- ! auxtext.e,color.e,file.e,font.e,grid.e,msg.e,obj.e,page.e,- ! pattern.e,poly.e,prtgif.e,raster.e,setup.e,stk.e,text.e,- ! version.e,wb2.e,wb3.e,xpixmap.e xbitmap.obj depends_on xbitmap.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,- ! file.e,font.e,grid.e,imgproc.e,mark.e,menu.e,move.e,msg.e,- ! names.e,obj.e,page.e,pattern.e,ps.e,raster.e,rect.e,select.e,- ! setup.e,stretch.e,util.e,xbitmap.e,xpixmap.e xpixmap.obj depends_on xpixmap.c,const.h,tgif_dbg.h,types.h,attr.e,choice.e,- cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,file.e,font.e,- ! grid.e,imgproc.e,mainmenu.e,mark.e,move.e,msg.e,names.e,obj.e,- ! pattern.e,ps.e,raster.e,rect.e,select.e,setup.e,stretch.e,- ! util.e,xbitmap.e,xpixmap.e