*** choice.c.orig Sun Jan 10 20:41:25 1999 --- choice.c Sun Jan 10 20:41:25 1999 *************** *** 50,53 **** --- 50,54 ---- #include "font.e" #include "grid.e" + #include "inmethod.e" #include "mainloop.e" #include "mainmenu.e" *************** *** 381,384 **** --- 382,387 ---- void ShowCurFont() { + static int snPrevShowDoubleByteFont=INVALID; + char *choice_char=GetShowFontChar(curFont); int x, y, w, h, choice_len=(choice_char==NULL ? 0 : strlen(choice_char)); *************** *** 470,473 **** --- 473,486 ---- recs[0].height = choiceWindowH; XSetClipRectangles(mainDisplay, choiceGC, 0, 0, recs, 1, YXBanded); + + if (gnInputMethod != TGIM_NONE) { + if (snPrevShowDoubleByteFont != INVALID && + snPrevShowDoubleByteFont && !canvasFontDoubleByte && + tgIMDeactiveOnCreateText(mainDisplay, drawWindow)) { + if (tgIMHandleCreateText(mainDisplay, drawWindow)) { + } + } + snPrevShowDoubleByteFont = canvasFontDoubleByte; + } } *** choose.c.orig Sun Jan 10 20:41:26 1999 --- choose.c Sun Jan 10 20:41:26 1999 *************** *** 699,702 **** --- 699,703 ---- XSetWMNormalHints(mainDisplay, pni->base_win, &sizehints); #endif + RegisterWM_DELETE_WINDOW(pni->base_win); XStoreName(mainDisplay, pni->base_win, win_name); *************** *** 2011,2014 **** --- 2012,2023 ---- } else if (input.type == ButtonPress) { ButtonPressInNames(&input.xbutton, &changing, &selected_btn_index); + } else if ((input.xany.window==pni->base_win || + input.xany.window==pni->dsp_base_win || + input.xany.window==pni->dsp_win || + input.xany.window==pni->scroll_win) && + IsWM_DELETE_WINDOW(&input)) { + KeyPressInNames(&input.xkey, &changing, &selected_btn_index); + changing = FALSE; + selected_btn_index = INVALID; } } *** cli_xcin.c.orig Sun Jan 10 20:41:28 1999 --- cli_xcin.c Sun Jan 10 20:41:28 1999 *************** *** 64,68 **** int my_endian=0; ! static Window connect_xcin(Display *display) { /*Window twin;*/ --- 64,69 ---- int my_endian=0; ! static Window connect_xcin(display) ! Display *display; { /*Window twin;*/ *************** *** 74,78 **** } ! void send_FocusIn(Display *display, Window window) { XClientMessageEvent event; --- 75,81 ---- } ! void send_FocusIn(display, window) ! Display *display; ! Window window; { XClientMessageEvent event; *************** *** 93,97 **** } ! void send_FocusOut(Display *display, Window window) { XClientMessageEvent event; --- 96,102 ---- } ! void send_FocusOut(display, window) ! Display *display; ! Window window; { XClientMessageEvent event; *************** *** 112,116 **** } ! static void big_little(char *i) { char t; --- 117,122 ---- } ! static void big_little(i) ! char *i; { char t; *************** *** 118,122 **** t=*(i+1); *(i+1)=*(i+2); *(i+2)=t; } ! static int read_keys(Display *display, char *buf) { Atom actual_type; --- 124,130 ---- t=*(i+1); *(i+1)=*(i+2); *(i+2)=t; } ! static int read_keys(display, buf) ! Display *display; ! char *buf; { Atom actual_type; *************** *** 160,164 **** static XComposeStatus compose_status = {NULL, 0}; ! int send_key(Display *display, Window win, XKeyEvent *eve, char *buf) { XClientMessageEvent event; --- 168,176 ---- static XComposeStatus compose_status = {NULL, 0}; ! int send_key(display, win, eve, buf) ! Display *display; ! Window win; ! XKeyEvent *eve; ! char *buf; { XClientMessageEvent event; *** convxim.c.orig Sun Jan 10 20:41:33 1999 --- convxim.c Sun Jan 10 20:41:33 1999 *************** *** 32,35 **** --- 32,37 ---- #ifndef _NO_LOCALE_SUPPORT #include + #else /* _NO_LOCALE_SUPPORT */ + #include #endif /* ~_NO_LOCALE_SUPPORT */ *** dialog.c.orig Sun Jan 10 20:41:36 1999 --- dialog.c Sun Jan 10 20:41:37 1999 *************** *** 759,762 **** --- 759,763 ---- XSetWMNormalHints(mainDisplay, MBInfoPtr->main_win, &sizehints); #endif /* NOTR4MODE */ + RegisterWM_DELETE_WINDOW(MBInfoPtr->main_win); XStoreName(mainDisplay, MBInfoPtr->main_win, Title); *************** *** 922,925 **** --- 923,946 ---- static + int HandleDeleteMsgBox(MBInfoPtr) + struct MBRec *MBInfoPtr; + { + int bg_pixel=(threeDLook ? myLtGryPixel : myBgPixel); + + if (MBInfoPtr->is_dialog) { + /* for Dialog(), same as is pressed */ + if (MBInfoPtr->exposed) { + /* erase the old cursor */ + PutCursor(MBInfoPtr->btn_win, MBInfoPtr->cursor_x, MBInfoPtr->cursor_y, + bg_pixel); + } + if (MBInfoPtr->return_str != NULL) *MBInfoPtr->return_str = '\0'; + return INVALID; + } + /* for MsgBox(), return a button id */ + return MB_ID_CANCEL; + } + + static void HandlePasteInDialog(MBInfoPtr, input) struct MBRec *MBInfoPtr; *************** *** 1213,1216 **** --- 1234,1240 ---- break; } + } else if (IsWM_DELETE_WINDOW(&input)) { + rc = HandleDeleteMsgBox(&mbInfo); + break; } } *************** *** 1308,1311 **** --- 1332,1339 ---- } else if (input.type==ButtonPress && input.xany.window==mbInfo.btn_win) { HandlePasteInDialog(&mbInfo, &input); + } else if (IsWM_DELETE_WINDOW(&input)) { + looping = FALSE; + rc = INVALID; + break; } } *** drawing.c.orig Sun Jan 10 20:41:38 1999 --- drawing.c Sun Jan 10 20:41:38 1999 *************** *** 1590,1593 **** --- 1590,1598 ---- if (tgIMActiveOnCntrlSpace(mainDisplay, drawWindow)) { if (tgIMHandleCntrlSpace(mainDisplay, drawWindow)) { + if (gnInputMethod != TGIM_NONE && gnOverTheSpot) { + if (!tgIMTellCursorPosition(mainDisplay, drawWindow, + textCurX, textCurBaselineY+curStrBlock->seg->des)) { + } + } } } else { *** file.c.orig Sun Jan 10 20:41:49 1999 --- file.c Sun Jan 10 20:41:49 1999 *************** *** 374,377 **** --- 374,419 ---- static + int CondensePostScriptFile(read_fname, buf_sz) + char *read_fname; + int buf_sz; + { + char write_fname[MAXSTRING+1]; + FILE *read_fp=NULL, *write_fp=NULL; + + sprintf(write_fname, "%sTgifXXXXXX", TMP_DIR); + mktemp(write_fname); + unlink(write_fname); + + if ((read_fp=fopen(read_fname, "r")) == NULL) { + sprintf(gszMsgBox, "Cannot open '%s' for reading, print aborted.", + read_fname); + if (PRTGIF) { + fprintf(stderr, "%s\n", gszMsgBox); + } else { + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + } + return FALSE; + } + if ((write_fp=fopen(write_fname, "w")) == NULL) { + sprintf(gszMsgBox, "Cannot open '%s' for writing, print aborted.", + write_fname); + if (PRTGIF) { + fprintf(stderr, "%s\n", gszMsgBox); + } else { + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + } + fclose(read_fp); + return FALSE; + } + CondenseAndCopyPostScriptFile(read_fp, write_fp, read_fname, TRUE); + fclose(read_fp); + fclose(write_fp); + unlink(read_fname); + UtilStrCpyN(read_fname, buf_sz, write_fname); + + return TRUE; + } + + static int CopyAFile(file1, file2, condense) char *file1, *file2; *************** *** 680,683 **** --- 722,733 ---- writeFileFailed = TRUE; } + if (fprintf(FP, "fg_bg_colors('%s','%s').\n", + colorMenuItems[colorIndex], myBgColorStr) == EOF) { + /* + * The above should use colorMenuItmes[bgColorIndex] + * and not myBgColorStr. + */ + writeFileFailed = TRUE; + } } } *************** *** 1638,1641 **** --- 1688,1693 ---- } + static int gnCannotFindColorMsg=FALSE; + static int ReadState(Inbuf) *************** *** 1659,1662 **** --- 1711,1716 ---- if (fileVersion > CUR_VERSION) return FALSE; + gnCannotFindColorMsg = FALSE; + if (!importingFile) { if (fileVersion <= 13) { *************** *** 2310,2313 **** --- 2364,2368 ---- colorMenuItems[defaultColorIndex], "as the current color"); colorIndex = defaultColorIndex; + gnCannotFindColorMsg = TRUE; } SetCanvasFont(); *************** *** 2530,2533 **** --- 2585,2620 ---- static + int ReadFgBgColors(Inbuf) + char *Inbuf; + { + if (!importingFile) { + int new_alloc=FALSE, bg_color_index=INVALID; + char *s=FindChar((int)'(', Inbuf), fg_color_str[40], bg_color_str[40]; + + s = ParseStr(s, (int)',', fg_color_str, sizeof(fg_color_str)); + s = ParseStr(s, (int)')', bg_color_str, sizeof(bg_color_str)); + UtilTrimBlanks(fg_color_str); + UtilTrimBlanks(bg_color_str); + allocColorFailed = FALSE; + colorIndex = QuickFindColorIndex(NULL, fg_color_str, &new_alloc, + TRUE); + if (gnCannotFindColorMsg && !allocColorFailed) { + fprintf(stderr, " (%s '%s'.)\n", + "Current color is corrected to be", colorMenuItems[colorIndex]); + } + bg_color_index = QuickFindColorIndex(NULL, bg_color_str, &new_alloc, + FALSE); + if (bg_color_index == INVALID) { + /* + * Should find the color that's closest to myBgColor. + */ + } else { + /* bgColorIndex = bg_color_index; */ + } + } + return TRUE; + } + + static int FreeBufAndReturn(buf, rc) char *buf; *************** *** 2782,2785 **** --- 2869,2877 ---- *ObjPtr = NULL; return FreeBufAndReturn(line, ok); + } else if (strcmp(obj_name, "fg_bg_colors") == 0) { + int ok=ReadFgBgColors(line); + + *ObjPtr = NULL; + return FreeBufAndReturn(line, ok); } free(line); *************** *** 4363,4369 **** static ! void GenTiffFile(tmp_fname, epsi_fname, condense) char *tmp_fname, *epsi_fname; ! int condense; { register int i; --- 4455,4461 ---- static ! void GenTiffFile(tmp_fname, epsi_fname, condense, condensed_already) char *tmp_fname, *epsi_fname; ! int condense, condensed_already; { register int i; *************** *** 4464,4468 **** if (!writeFileFailed) { CondenseAndCopyPostScriptFile(tmp_fp, epsi_fp, tmp_fname, ! (condense && !dontCondense)); } fclose(tmp_fp); --- 4556,4560 ---- if (!writeFileFailed) { CondenseAndCopyPostScriptFile(tmp_fp, epsi_fp, tmp_fname, ! (!condensed_already && condense && !dontCondense)); } fclose(tmp_fp); *************** *** 5287,5291 **** } if (whereToPrint == EPSI_FILE && generateTiffEPSI) { ! int saved_colordump=colorDump; SaveStatusStrings(); --- 5379,5383 ---- } if (whereToPrint == EPSI_FILE && generateTiffEPSI) { ! int saved_colordump=colorDump, consensed_already=FALSE, ok=TRUE; SaveStatusStrings(); *************** *** 5296,5300 **** colorDump = saved_colordump; ! GenTiffFile(tmpFile, ps_file, psUseShortHand); RestoreStatusStrings(); unlink(tmpFile); --- 5388,5401 ---- colorDump = saved_colordump; ! if (psUseShortHand && !dontCondense) { ! if (CondensePostScriptFile(tmpFile, sizeof(tmpFile))) { ! consensed_already = TRUE; ! } else { ! ok = FALSE; ! } ! } ! if (ok) { ! GenTiffFile(tmpFile, ps_file, psUseShortHand, consensed_already); ! } RestoreStatusStrings(); unlink(tmpFile); *** mainmenu.c.orig Sun Jan 10 20:42:07 1999 --- mainmenu.c Sun Jan 10 20:42:07 1999 *************** *** 146,154 **** CWSaveUnder | CWOverrideRedirect, &win_attrs); - if (!titledPinnedMenu) { - XSetTransientForHint(mainDisplay, mainMenuWindow, mainWindow); - } - XStoreName(mainDisplay, mainMenuWindow, "Main Menu"); - XSelectInput(mainDisplay, mainMenuWindow, StructureNotifyMask | ExposureMask | ButtonPressMask | ButtonReleaseMask | KeyPressMask | --- 146,149 ---- *************** *** 172,175 **** --- 167,176 ---- XSetWMHints(mainDisplay, mainMenuWindow, &wmhints); + if (!titledPinnedMenu) { + XSetTransientForHint(mainDisplay, mainMenuWindow, mainWindow); + } + RegisterWM_DELETE_WINDOW(mainMenuWindow); + XStoreName(mainDisplay, mainMenuWindow, "Main Menu"); + InitPinnedMenus(); } *************** *** 708,711 **** --- 709,720 ---- break; } + } else if (IsWM_DELETE_WINDOW(input)) { + XDestroyWindow(mainDisplay, subMenuInfo[menu_index].win); + subMenuInfo[menu_index].win = None; + extraWinInfo[subMenuInfo[menu_index].extra_index].window = None; + TgDestroyMenu(menu, TRUE); + win_info->userdata = NULL; + clicked_menu = NULL; + clicked_index = INVALID; } return rc; *************** *** 759,765 **** item_info->cmdid == activeMenu) { XStoreName(mainDisplay, win, item_info->status_str); } } - sizehints.flags = PSize | PMinSize | PMaxSize; sizehints.width = sizehints.min_width = sizehints.max_width = win_w; --- 768,774 ---- item_info->cmdid == activeMenu) { XStoreName(mainDisplay, win, item_info->status_str); + break; } } sizehints.flags = PSize | PMinSize | PMaxSize; sizehints.width = sizehints.min_width = sizehints.max_width = win_w; *************** *** 777,780 **** --- 786,791 ---- XSetWMHints(mainDisplay, win, &wmhints); + RegisterWM_DELETE_WINDOW(win); + #ifdef MAPBEFORESELECT XMapWindow(mainDisplay, win); *** menu.c.orig Sun Jan 10 20:42:10 1999 --- menu.c Sun Jan 10 20:42:10 1999 *************** *** 1038,1041 **** --- 1038,1042 ---- menu->selected_index = INVALID; + RegisterWM_DELETE_WINDOW(menu->window); XSetTransientForHint(mainDisplay, menu->window, mainWindow); *** miniline.c.orig Sun Jan 10 20:42:13 1999 --- miniline.c Sun Jan 10 20:42:13 1999 *************** *** 387,391 **** case SB_SIMPLE: return BlankStrSeg(pStrBlock->seg); ! case SB_CHAR_SPACE: return FALSE; case SB_SUPSUB_LEFT: --- 387,391 ---- case SB_SIMPLE: return BlankStrSeg(pStrBlock->seg); ! case SB_CHAR_SPACE: return (pStrBlock->special_char_w == 0); case SB_SUPSUB_LEFT: *************** *** 1192,1195 **** --- 1192,1237 ---- static + void GetMinilineHomeXY(pMiniLine, pn_x, pn_baseline_y) + MiniLineInfo *pMiniLine; + int *pn_x, *pn_baseline_y; + { + #ifdef _TGIF_DBG + TgAssert(pMiniLine->first_block->type == SB_SIMPLE || + pMiniLine->first_block->type == SB_SUPSUB_CENTER, + "First StrBlock has invalid type in GetMinilineHomeXY()", + NULL); + #endif /* _TGIF_DBG */ + GetTextXY(pMiniLine->first_block, 0, pn_x, pn_baseline_y); + } + + static + void GetMinilineEndXY(pMiniLine, pn_x, pn_baseline_y) + MiniLineInfo *pMiniLine; + int *pn_x, *pn_baseline_y; + { + StrBlockInfo *pStrBlock=NULL; + int index=INVALID; + + for (pStrBlock=pMiniLine->first_block; pStrBlock->next != NULL; + pStrBlock=pStrBlock->next) { + } + switch (pStrBlock->type) { + case SB_SIMPLE: + case SB_SUPSUB_CENTER: + index = pStrBlock->seg->dyn_str.sz-1; + break; + case SB_CHAR_SPACE: + #ifdef _TGIF_DBG + TgAssert(FALSE, + "Last StrBlock has type of SB_CHAR_SPACE in GetMinilineEndXY()", + NULL); + #endif /* _TGIF_DBG */ + index = 1; + break; + } + GetTextXY(pStrBlock, index, pn_x, pn_baseline_y); + } + + static void PaintTextHighlight() { *************** *** 1781,1785 **** } break; ! case SB_CHAR_SPACE: break; case SB_SUPSUB_LEFT: --- 1823,1836 ---- } break; ! case SB_CHAR_SPACE: ! if (pStrBlock->special_char_w == 0) { ! UnlinkStrBlock(pStrBlock); ! FreeStrBlock(pStrBlock); ! *pn_retry = TRUE; ! changed = TRUE; ! advance = FALSE; ! pStrBlock = pNextStrBlock; ! } ! break; case SB_SUPSUB_LEFT: *************** *** 1882,1885 **** --- 1933,1941 ---- case SB_CHAR_SPACE: if (pStrBlockToMatch == pStrBlock) { + #ifdef _TGIF_DBG + TgAssert(FALSE, + "StrBlock has type of SB_CHAR_SPACE in GetTextXYInStrBlock()", + NULL); + #endif /* _TGIF_DBG */ if (index_to_match == 1) { *pn_dx += pStrBlock->special_char_w; *************** *** 2054,2086 **** } - void GetMinilineHomeXY(pMiniLine, pn_x, pn_baseline_y) - MiniLineInfo *pMiniLine; - int *pn_x, *pn_baseline_y; - { - GetTextXY(pMiniLine->first_block, 0, pn_x, pn_baseline_y); - } - - void GetMinilineEndXY(pMiniLine, pn_x, pn_baseline_y) - MiniLineInfo *pMiniLine; - int *pn_x, *pn_baseline_y; - { - StrBlockInfo *pStrBlock=NULL; - int index=INVALID; - - for (pStrBlock=pMiniLine->first_block; pStrBlock->next != NULL; - pStrBlock=pStrBlock->next) { - } - switch (pStrBlock->type) { - case SB_SIMPLE: - case SB_SUPSUB_CENTER: - index = pStrBlock->seg->dyn_str.sz-1; - break; - case SB_CHAR_SPACE: - index = 1; - break; - } - GetTextXY(pStrBlock, index, pn_x, pn_baseline_y); - } - int CurStrBlockInStrBlock(pStrBlock) StrBlockInfo *pStrBlock; --- 2110,2113 ---- *************** *** 2220,2223 **** --- 2247,2255 ---- case SB_CHAR_SPACE: + #ifdef _TGIF_DBG + TgAssert(FALSE, + "StrBlock has type SB_CHAR_SPACE in GetCursorPositionInStrBlock()", + NULL); + #endif /* _TGIF_DBG */ *ppStrBlock = pStrBlock; *pn_dx += pStrBlock->special_char_w; *************** *** 2311,2315 **** int w=pStrBlock->w; ! if (pStrBlock->next == NULL || dx < w) { GetCursorPositionInStrBlock(pStrBlock, dx, dy, pn_dx, pn_dy, ppStrBlock, pnIndex); --- 2343,2348 ---- int w=pStrBlock->w; ! if (pStrBlock->type != SB_CHAR_SPACE && ! (pStrBlock->next == NULL || dx < w)) { GetCursorPositionInStrBlock(pStrBlock, dx, dy, pn_dx, pn_dy, ppStrBlock, pnIndex); *************** *** 3802,3805 **** --- 3835,3839 ---- switch (pStrBlock->type) { case SB_SIMPLE: return CanBreakStrSegIntoWords(pStrBlock->seg); + case SB_CHAR_SPACE: return TRUE; *** setup.c.orig Sun Jan 10 20:42:44 1999 --- setup.c Sun Jan 10 20:42:44 1999 *************** *** 258,261 **** --- 258,283 ---- static int baseScrollBarW=SCROLLBAR_W; + void RegisterWM_DELETE_WINDOW(win) + Window win; + { + #ifndef NOTR4MODE + XSetWMProtocols(mainDisplay, win, &protocolAtom, 1); + #endif + } + + int IsWM_DELETE_WINDOW(pXEvent) + XEvent *pXEvent; + { + if (pXEvent->type == ClientMessage) { + char *psz=XGetAtomName(mainDisplay, pXEvent->xclient.message_type); + + if (strcmp("WM_PROTOCOLS", psz) == 0 && + pXEvent->xclient.data.l[0] == protocolAtom) { + return TRUE; + } + } + return FALSE; + } + void UpdDrawWinWH() { *************** *** 1688,1694 **** executeCmdByIDAtom = XInternAtom(mainDisplay, "TGIF_EXECUTE_CMD_BY_ID", False); ! #ifndef NOTR4MODE ! XSetWMProtocols(mainDisplay, mainWindow, &protocolAtom, 1); ! #endif /* ~NOTR4MODE */ #ifdef MAPBEFORESELECT --- 1710,1714 ---- executeCmdByIDAtom = XInternAtom(mainDisplay, "TGIF_EXECUTE_CMD_BY_ID", False); ! RegisterWM_DELETE_WINDOW(mainWindow); #ifdef MAPBEFORESELECT *** text.c.orig Sun Jan 10 20:42:58 1999 --- text.c Sun Jan 10 20:42:58 1999 *************** *** 110,113 **** --- 110,115 ---- static int tmpAdjAbsX=0, tmpAdjAbsY=0; /* absolute coordinates */ + static int lengthLimit256InInsertChar=TRUE; + /* --------------------- DynStr Routines --------------------- */ *************** *** 335,338 **** --- 337,346 ---- deleteNextCharWithDelKey = FALSE; } + lengthLimit256InInsertChar = TRUE; + if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, + "LengthLimit256InInsertChar")) != NULL && + UtilStrICmp("false", c_ptr) == 0) { + lengthLimit256InInsertChar = FALSE; + } } *************** *** 572,575 **** --- 580,586 ---- } + static int gnDontRedrawDuringPaste=FALSE; + static int gnPastingLineNum=0; + static void EndChangeCurText() *************** *** 581,606 **** curTextModified = TRUE; ! UpdTextBBox(curTextObj); ! new_first_miniline_asc = text_ptr->minilines.first->asc; ! if (new_first_miniline_asc > saved_first_miniline_asc) { ! int saved_orig_y=textOrigY; ! textAbsY -= (new_first_miniline_asc - saved_first_miniline_asc); ! textOrigY = OFFSET_Y(textAbsY); ! textCurY += (textOrigY - saved_orig_y); ! } ! w = text_ptr->minilines.w; ! h = (textOrigBaselineY - textOrigY) + ! (text_ptr->minilines.h - new_first_miniline_asc); ! SetTextCurXY(); ! if (textHighlight) SetTextEndXY(); ! UpdateEditTextArea(w, h, text_ptr->minilines.min_lbearing, ! text_ptr->minilines.max_rextra); ! RedrawCurText(); ! InvalidateTextCache(text_ptr); } --- 592,618 ---- curTextModified = TRUE; ! if (!gnDontRedrawDuringPaste) { ! UpdTextBBox(curTextObj); ! new_first_miniline_asc = text_ptr->minilines.first->asc; ! if (new_first_miniline_asc > saved_first_miniline_asc) { ! int saved_orig_y=textOrigY; ! textAbsY -= (new_first_miniline_asc - saved_first_miniline_asc); ! textOrigY = OFFSET_Y(textAbsY); ! textCurY += (textOrigY - saved_orig_y); ! } ! w = text_ptr->minilines.w; ! h = (textOrigBaselineY - textOrigY) + ! (text_ptr->minilines.h - new_first_miniline_asc); ! SetTextCurXY(); ! if (textHighlight) SetTextEndXY(); ! UpdateEditTextArea(w, h, text_ptr->minilines.min_lbearing, ! text_ptr->minilines.max_rextra); ! RedrawCurText(); ! } InvalidateTextCache(text_ptr); } *************** *** 1696,1700 **** pressed_in_same_text = TRUE; } else { ! CreateTextObj(FALSE); /* end editing on the old text */ curTextModified = FALSE; } --- 1708,1712 ---- pressed_in_same_text = TRUE; } else { ! CreateTextObj(TRUE); /* end editing on the old text */ curTextModified = FALSE; } *************** *** 1969,1973 **** EndChangeCurText(); ! ScrollTo(textCurX, textCurBaselineY); } --- 1981,1991 ---- EndChangeCurText(); ! if (!gnDontRedrawDuringPaste) { ! ScrollTo(textCurX, textCurBaselineY); ! } else { ! gnPastingLineNum++; ! sprintf(gszMsgBox, "Pasting line %1d...", gnPastingLineNum+1); ! SetStringStatus(gszMsgBox); ! } } *************** *** 2114,2119 **** int double_byte; { - char buf[MAXSTRING+1]; - if (curStrBlock->seg->double_byte && !double_byte) { if (curStrBlock->type == SB_SUPSUB_CENTER) { --- 2132,2135 ---- *************** *** 2128,2132 **** } } else { ! if (curStrBlock->seg->dyn_str.sz-1+(double_byte ? 1 : 0) >= MAXSTRING) { sprintf(gszMsgBox, "String length exceeds %1d. Character ignored.", MAXSTRING); --- 2144,2152 ---- } } else { ! char *buf=NULL; ! int cur_index_is_last=(textCurIndex==curStrBlock->seg->dyn_str.sz-1); ! ! if (lengthLimit256InInsertChar && ! curStrBlock->seg->dyn_str.sz-1+(double_byte ? 2 : 1) >= MAXSTRING) { sprintf(gszMsgBox, "String length exceeds %1d. Character ignored.", MAXSTRING); *************** *** 2134,2137 **** --- 2154,2160 ---- return FALSE; } + buf = (char*)malloc((curStrBlock->seg->dyn_str.sz+7)*sizeof(char)); + if (buf == NULL) FailAllocMessage(); + if (double_byte) { char tmp_s[3]; *************** *** 2138,2156 **** tmp_s[0] = curStrBlock->seg->dyn_str.s[textCurIndex]; - if (tmp_s[0] != '\0') { - tmp_s[1] = curStrBlock->seg->dyn_str.s[textCurIndex+1]; - } curStrBlock->seg->dyn_str.s[textCurIndex] = '\0'; if (tmp_s[0] != '\0') { curStrBlock->seg->dyn_str.s[textCurIndex+1] = '\0'; - } - textCurIndex += 2; - if (tmp_s[0] != '\0') { sprintf(buf, "%s%c%c%c%c%s", curStrBlock->seg->dyn_str.s, Str[0], Str[1], tmp_s[0], tmp_s[1], ! &curStrBlock->seg->dyn_str.s[textCurIndex]); } else { sprintf(buf, "%s%c%c", curStrBlock->seg->dyn_str.s, Str[0], Str[1]); } } else { char tmp_char=curStrBlock->seg->dyn_str.s[textCurIndex]; --- 2161,2176 ---- tmp_s[0] = curStrBlock->seg->dyn_str.s[textCurIndex]; curStrBlock->seg->dyn_str.s[textCurIndex] = '\0'; if (tmp_s[0] != '\0') { + tmp_s[1] = curStrBlock->seg->dyn_str.s[textCurIndex+1]; curStrBlock->seg->dyn_str.s[textCurIndex+1] = '\0'; sprintf(buf, "%s%c%c%c%c%s", curStrBlock->seg->dyn_str.s, Str[0], Str[1], tmp_s[0], tmp_s[1], ! (cur_index_is_last ? "" : ! (&curStrBlock->seg->dyn_str.s[textCurIndex+2]))); } else { sprintf(buf, "%s%c%c", curStrBlock->seg->dyn_str.s, Str[0], Str[1]); } + textCurIndex += 2; } else { char tmp_char=curStrBlock->seg->dyn_str.s[textCurIndex]; *************** *** 2158,2164 **** curStrBlock->seg->dyn_str.s[textCurIndex] = '\0'; sprintf(buf, "%s%c%c%s", curStrBlock->seg->dyn_str.s, *Str, tmp_char, ! &curStrBlock->seg->dyn_str.s[++textCurIndex]); } DynStrSet(&curStrBlock->seg->dyn_str, buf); } EndChangeCurText(); --- 2178,2187 ---- curStrBlock->seg->dyn_str.s[textCurIndex] = '\0'; sprintf(buf, "%s%c%c%s", curStrBlock->seg->dyn_str.s, *Str, tmp_char, ! (cur_index_is_last ? "" : ! (&curStrBlock->seg->dyn_str.s[textCurIndex+1]))); ! textCurIndex++; } DynStrSet(&curStrBlock->seg->dyn_str, buf); + free(buf); } EndChangeCurText(); *************** *** 2197,2205 **** XEvent ev; ! RedrawCurText(); while (XCheckWindowEvent(mainDisplay, drawWindow, KeyPressMask, &ev)) ; return; } ! ScrollTo(textCurX, textCurBaselineY); } --- 2220,2232 ---- XEvent ev; ! if (!gnDontRedrawDuringPaste) { ! RedrawCurText(); ! } while (XCheckWindowEvent(mainDisplay, drawWindow, KeyPressMask, &ev)) ; return; } ! if (!gnDontRedrawDuringPaste) { ! ScrollTo(textCurX, textCurBaselineY); ! } } *************** *** 2218,2222 **** return; } ! CreateTextObj(FALSE); curTextModified = FALSE; --- 2245,2249 ---- return; } ! CreateTextObj(TRUE); curTextModified = FALSE; *************** *** 2656,2661 **** case '\b': Msg("Cannot paste ."); break; case '\033': Msg("Cannot paste ."); break; - case '\t': Msg("Cannot paste ."); break; default: HandleChar(s); --- 2683,2691 ---- case '\b': Msg("Cannot paste ."); break; case '\033': Msg("Cannot paste ."); break; + case '\t': + Msg("Cannot paste , replaced by ."); + s[0] = ' '; + /* drop through */ default: HandleChar(s); *************** *** 2677,2683 **** case '\b': Msg("Cannot paste ."); break; case '\033': Msg("Cannot paste ."); break; ! case '\t': Msg("Cannot paste ."); break; ! ! default: HandleChar(s); break; } } --- 2707,2717 ---- case '\b': Msg("Cannot paste ."); break; case '\033': Msg("Cannot paste ."); break; ! case '\t': ! Msg("Cannot paste , replaced by ."); ! s[0] = ' '; ! /* drop through */ ! default: ! HandleChar(s); ! break; } } *************** *** 2882,2887 **** Msg("An key press is ignored."); } HandleInputFromBuffer(cut_buffer); ! PutTextCursor(); MarkRulers(textCurX, textCurY); SetFileModified(TRUE); --- 2916,2942 ---- Msg("An key press is ignored."); } + SaveStatusStrings(); + gnPastingLineNum = 0; + gnDontRedrawDuringPaste = TRUE; + HandleInputFromBuffer(cut_buffer); ! ! gnDontRedrawDuringPaste = FALSE; ! RestoreStatusStrings(); ! ! sprintf(gszMsgBox, "%1d lines pasted.", gnPastingLineNum); ! Msg(gszMsgBox); ! ! UpdTextBBox(curTextObj); ! SetTextCurXY(); ! if (textHighlight) SetTextEndXY(); ! UpdateEditTextArea( ! curTextObj->detail.t->minilines.w, ! curTextObj->detail.t->minilines.h, ! curTextObj->detail.t->minilines.min_lbearing, ! curTextObj->detail.t->minilines.max_rextra); ! ! RedrawCurText(); ! ScrollTo(textCurX, textCurBaselineY); MarkRulers(textCurX, textCurY); SetFileModified(TRUE); *************** *** 2963,2966 **** --- 3018,3022 ---- HandleInputFromBuffer(psz_buf); free(psz_buf); + SetFileModified(TRUE); } } *************** *** 4944,4948 **** int *pnSplitAtIndex, *pnInsertBefore; { ! if (textCurIndex == 0) { if (curStrBlock->prev == NULL || curStrBlock->prev->type != SB_SIMPLE) { --- 5000,5004 ---- int *pnSplitAtIndex, *pnInsertBefore; { ! if (textCurIndex == 0 && curStrBlock->seg->dyn_str.sz != 1) { if (curStrBlock->prev == NULL || curStrBlock->prev->type != SB_SIMPLE) { *************** *** 5203,5206 **** --- 5259,5273 ---- int type, *pnJustMove, *pnSplitAtIndex, *pnInsertBefore; { + if (textCurIndex == 0 && curStrBlock->seg->dyn_str.sz == 1) { + if (type == SB_SUPSUB_LEFT && curStrBlock->prev != NULL && + curStrBlock->prev->type == type) { + *pnJustMove = TRUE; + return; + } else if (type == SB_SUPSUB_RIGHT && curStrBlock->next != NULL && + curStrBlock->next->type == type) { + *pnJustMove = TRUE; + return; + } + } if (textCurIndex == 0) { if (curStrBlock->prev == NULL) { *************** *** 5221,5225 **** *pnInsertBefore = FALSE; } else { ! if (curStrBlock->next->type != SB_SIMPLE) { *pnJustMove = TRUE; } else { --- 5288,5292 ---- *pnInsertBefore = FALSE; } else { ! if (curStrBlock->next->type == type) { *pnJustMove = TRUE; } else { *************** *** 5281,5285 **** if (just_move) { ! if (textCurIndex == 0) { pSupSubStrBlock = curStrBlock->prev; } else { --- 5348,5352 ---- if (just_move) { ! if (type == SB_SUPSUB_LEFT) { pSupSubStrBlock = curStrBlock->prev; } else { *** xprtfltr.c.orig Sun Jan 10 20:43:13 1999 --- xprtfltr.c Sun Jan 10 20:43:13 1999 *************** *** 36,39 **** --- 36,42 ---- #ifndef _NO_DL_SUPPORT #include + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif /* ~RTLD_GLOBAL */ #endif /* ~_NO_DL_SUPPORT */ *** align.e.orig Sun Jan 10 20:43:14 1999 --- align.e Sun Jan 10 20:43:14 1999 *************** *** 61,65 **** --- 61,67 ---- #ifdef _INCLUDE_FROM_ALIGN_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_ALIGN_C_*/ *** animate.e.orig Sun Jan 10 20:43:15 1999 --- animate.e Sun Jan 10 20:43:15 1999 *************** *** 47,51 **** --- 47,53 ---- #ifdef _INCLUDE_FROM_ANIMATE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_ANIMATE_C_*/ *** arc.e.orig Sun Jan 10 20:43:16 1999 --- arc.e Sun Jan 10 20:43:17 1999 *************** *** 80,84 **** --- 80,86 ---- #ifdef _INCLUDE_FROM_ARC_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_ARC_C_*/ *** attr.e.orig Sun Jan 10 20:43:17 1999 --- attr.e Sun Jan 10 20:43:17 1999 *************** *** 82,86 **** --- 82,88 ---- #ifdef _INCLUDE_FROM_ATTR_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_ATTR_C_*/ *** auxtext.e.orig Sun Jan 10 20:43:18 1999 --- auxtext.e Sun Jan 10 20:43:18 1999 *************** *** 113,117 **** --- 113,119 ---- #ifdef _INCLUDE_FROM_AUXTEXT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_AUXTEXT_C_*/ *** box.e.orig Sun Jan 10 20:43:19 1999 --- box.e Sun Jan 10 20:43:19 1999 *************** *** 57,61 **** --- 57,63 ---- #ifdef _INCLUDE_FROM_BOX_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_BOX_C_*/ *** button.e.orig Sun Jan 10 20:43:20 1999 --- button.e Sun Jan 10 20:43:20 1999 *************** *** 47,51 **** --- 47,53 ---- #ifdef _INCLUDE_FROM_BUTTON_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_BUTTON_C_*/ *** chinput.e.orig Sun Jan 10 20:43:21 1999 --- chinput.e Sun Jan 10 20:43:21 1999 *************** *** 265,269 **** --- 265,271 ---- #ifdef _INCLUDE_FROM_CHINPUT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CHINPUT_C_*/ *** choice.e.orig Sun Jan 10 20:43:22 1999 --- choice.e Sun Jan 10 20:43:22 1999 *************** *** 107,111 **** --- 107,113 ---- #ifdef _INCLUDE_FROM_CHOICE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CHOICE_C_*/ *** choose.e.orig Sun Jan 10 20:43:23 1999 --- choose.e Sun Jan 10 20:43:23 1999 *************** *** 65,69 **** --- 65,71 ---- #ifdef _INCLUDE_FROM_CHOOSE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CHOOSE_C_*/ *** cli_xcin.e.orig Sun Jan 10 20:43:24 1999 --- cli_xcin.e Sun Jan 10 20:43:24 1999 *************** *** 21,25 **** --- 21,27 ---- #ifdef _INCLUDE_FROM_CLI_XCIN_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CLI_XCIN_C_*/ *** cmd.e.orig Sun Jan 10 20:43:25 1999 --- cmd.e Sun Jan 10 20:43:25 1999 *************** *** 94,98 **** --- 94,100 ---- #ifdef _INCLUDE_FROM_CMD_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CMD_C_*/ *** color.e.orig Sun Jan 10 20:43:26 1999 --- color.e Sun Jan 10 20:43:26 1999 *************** *** 96,100 **** --- 96,102 ---- #ifdef _INCLUDE_FROM_COLOR_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_COLOR_C_*/ *** convkinput.e.orig Sun Jan 10 20:43:27 1999 --- convkinput.e Sun Jan 10 20:43:27 1999 *************** *** 60,64 **** --- 60,66 ---- #ifdef _INCLUDE_FROM_CONVKINPUT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CONVKINPUT_C_*/ *** convxim.e.orig Sun Jan 10 20:43:28 1999 --- convxim.e Sun Jan 10 20:43:28 1999 *************** *** 56,60 **** --- 56,62 ---- #ifdef _INCLUDE_FROM_CONVXIM_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CONVXIM_C_*/ *** cursor.e.orig Sun Jan 10 20:43:29 1999 --- cursor.e Sun Jan 10 20:43:29 1999 *************** *** 84,88 **** --- 84,90 ---- #ifdef _INCLUDE_FROM_CURSOR_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CURSOR_C_*/ *** cutpaste.e.orig Sun Jan 10 20:43:30 1999 --- cutpaste.e Sun Jan 10 20:43:30 1999 *************** *** 78,82 **** --- 78,84 ---- #ifdef _INCLUDE_FROM_CUTPASTE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_CUTPASTE_C_*/ *** dialog.e.orig Sun Jan 10 20:43:31 1999 --- dialog.e Sun Jan 10 20:43:31 1999 *************** *** 54,58 **** --- 54,60 ---- #ifdef _INCLUDE_FROM_DIALOG_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_DIALOG_C_*/ *** drawing.e.orig Sun Jan 10 20:43:31 1999 --- drawing.e Sun Jan 10 20:43:32 1999 *************** *** 96,100 **** --- 96,102 ---- #ifdef _INCLUDE_FROM_DRAWING_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_DRAWING_C_*/ *** dup.e.orig Sun Jan 10 20:43:33 1999 --- dup.e Sun Jan 10 20:43:33 1999 *************** *** 83,87 **** --- 83,89 ---- #ifdef _INCLUDE_FROM_DUP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_DUP_C_*/ *** edit.e.orig Sun Jan 10 20:43:34 1999 --- edit.e Sun Jan 10 20:43:34 1999 *************** *** 90,94 **** --- 90,96 ---- #ifdef _INCLUDE_FROM_EDIT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_EDIT_C_*/ *** eps.e.orig Sun Jan 10 20:43:34 1999 --- eps.e Sun Jan 10 20:43:34 1999 *************** *** 63,67 **** --- 63,69 ---- #ifdef _INCLUDE_FROM_EPS_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_EPS_C_*/ *** exec.e.orig Sun Jan 10 20:43:35 1999 --- exec.e Sun Jan 10 20:43:35 1999 *************** *** 81,85 **** --- 81,87 ---- #ifdef _INCLUDE_FROM_EXEC_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_EXEC_C_*/ *** expr.e.orig Sun Jan 10 20:43:36 1999 --- expr.e Sun Jan 10 20:43:37 1999 *************** *** 46,50 **** --- 46,52 ---- #ifdef _INCLUDE_FROM_EXPR_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_EXPR_C_*/ *** file.e.orig Sun Jan 10 20:43:38 1999 --- file.e Sun Jan 10 20:43:38 1999 *************** *** 201,205 **** --- 201,207 ---- #ifdef _INCLUDE_FROM_FILE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_FILE_C_*/ *** font.e.orig Sun Jan 10 20:43:39 1999 --- font.e Sun Jan 10 20:43:39 1999 *************** *** 183,187 **** --- 183,189 ---- #ifdef _INCLUDE_FROM_FONT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_FONT_C_*/ *** ftp.e.orig Sun Jan 10 20:43:39 1999 --- ftp.e Sun Jan 10 20:43:40 1999 *************** *** 54,58 **** --- 54,60 ---- #ifdef _INCLUDE_FROM_FTP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_FTP_C_*/ *** grid.e.orig Sun Jan 10 20:43:40 1999 --- grid.e Sun Jan 10 20:43:40 1999 *************** *** 134,138 **** --- 134,140 ---- #ifdef _INCLUDE_FROM_GRID_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_GRID_C_*/ *** group.e.orig Sun Jan 10 20:43:42 1999 --- group.e Sun Jan 10 20:43:42 1999 *************** *** 59,63 **** --- 59,65 ---- #ifdef _INCLUDE_FROM_GROUP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_GROUP_C_*/ *** help.e.orig Sun Jan 10 20:43:43 1999 --- help.e Sun Jan 10 20:43:43 1999 *************** *** 53,57 **** --- 53,59 ---- #ifdef _INCLUDE_FROM_HELP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_HELP_C_*/ *** http.e.orig Sun Jan 10 20:43:44 1999 --- http.e Sun Jan 10 20:43:44 1999 *************** *** 84,88 **** --- 84,90 ---- #ifdef _INCLUDE_FROM_HTTP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_HTTP_C_*/ *** imgproc.e.orig Sun Jan 10 20:43:45 1999 --- imgproc.e Sun Jan 10 20:43:45 1999 *************** *** 98,102 **** --- 98,104 ---- #ifdef _INCLUDE_FROM_IMGPROC_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_IMGPROC_C_*/ *** import.e.orig Sun Jan 10 20:43:46 1999 --- import.e Sun Jan 10 20:43:46 1999 *************** *** 65,69 **** --- 65,71 ---- #ifdef _INCLUDE_FROM_IMPORT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_IMPORT_C_*/ *** ini.e.orig Sun Jan 10 20:43:47 1999 --- ini.e Sun Jan 10 20:43:47 1999 *************** *** 185,189 **** --- 185,191 ---- #ifdef _INCLUDE_FROM_INI_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_INI_C_*/ *** inmethod.e.orig Sun Jan 10 20:43:48 1999 --- inmethod.e Sun Jan 10 20:43:48 1999 *************** *** 97,101 **** --- 97,103 ---- #ifdef _INCLUDE_FROM_INMETHOD_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_INMETHOD_C_*/ *** mainloop.e.orig Sun Jan 10 20:43:49 1999 --- mainloop.e Sun Jan 10 20:43:49 1999 *************** *** 87,91 **** --- 87,93 ---- #ifdef _INCLUDE_FROM_MAINLOOP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MAINLOOP_C_*/ *** mainmenu.e.orig Sun Jan 10 20:43:50 1999 --- mainmenu.e Sun Jan 10 20:43:50 1999 *************** *** 69,73 **** --- 69,75 ---- #ifdef _INCLUDE_FROM_MAINMENU_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MAINMENU_C_*/ *** mark.e.orig Sun Jan 10 20:43:51 1999 --- mark.e Sun Jan 10 20:43:51 1999 *************** *** 48,52 **** --- 48,54 ---- #ifdef _INCLUDE_FROM_MARK_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MARK_C_*/ *** menu.e.orig Sun Jan 10 20:43:52 1999 --- menu.e Sun Jan 10 20:43:52 1999 *************** *** 102,106 **** --- 102,108 ---- #ifdef _INCLUDE_FROM_MENU_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MENU_C_*/ *** menuinfo.e.orig Sun Jan 10 20:43:53 1999 --- menuinfo.e Sun Jan 10 20:43:53 1999 *************** *** 92,96 **** --- 92,98 ---- #ifdef _INCLUDE_FROM_MENUINFO_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MENUINFO_C_*/ *** miniline.e.orig Sun Jan 10 20:43:54 1999 --- miniline.e Sun Jan 10 20:43:54 1999 *************** *** 75,79 **** extern int textHighlight; ! struct ObjRec *curTextObj; extern struct BBRec curTextOBBox, curTextBBox; --- 75,79 ---- extern int textHighlight; ! extern struct ObjRec *curTextObj; extern struct BBRec curTextOBBox, curTextBBox; *************** *** 182,189 **** extern void SetTextCurXY ARGS_DECL((void)); extern void SetTextEndXY ARGS_DECL((void)); - extern void GetMinilineHomeXY ARGS_DECL((MiniLineInfo*, - int *pn_x, int *pn_baseline_y)); - extern void GetMinilineEndXY ARGS_DECL((MiniLineInfo*, - int *pn_x, int *pn_baseline_y)); extern int CurStrBlockInStrBlock ARGS_DECL((StrBlockInfo*)); extern int CurStrBlockInMiniLine ARGS_DECL((MiniLineInfo*)); --- 182,185 ---- *************** *** 249,253 **** --- 245,251 ---- #ifdef _INCLUDE_FROM_MINILINE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MINILINE_C_*/ *** move.e.orig Sun Jan 10 20:43:55 1999 --- move.e Sun Jan 10 20:43:55 1999 *************** *** 56,60 **** --- 56,62 ---- #ifdef _INCLUDE_FROM_MOVE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MOVE_C_*/ *** msg.e.orig Sun Jan 10 20:43:56 1999 --- msg.e Sun Jan 10 20:43:56 1999 *************** *** 86,90 **** --- 86,92 ---- #ifdef _INCLUDE_FROM_MSG_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_MSG_C_*/ *** names.e.orig Sun Jan 10 20:43:57 1999 --- names.e Sun Jan 10 20:43:57 1999 *************** *** 82,86 **** --- 82,88 ---- #ifdef _INCLUDE_FROM_NAMES_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_NAMES_C_*/ *** navigate.e.orig Sun Jan 10 20:43:58 1999 --- navigate.e Sun Jan 10 20:43:58 1999 *************** *** 89,93 **** --- 89,95 ---- #ifdef _INCLUDE_FROM_NAVIGATE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_NAVIGATE_C_*/ *** nkf.e.orig Sun Jan 10 20:43:59 1999 --- nkf.e Sun Jan 10 20:43:59 1999 *************** *** 27,31 **** --- 27,33 ---- #ifdef _INCLUDE_FROM_NKF_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_NKF_C_*/ *** obj.e.orig Sun Jan 10 20:44:00 1999 --- obj.e Sun Jan 10 20:44:00 1999 *************** *** 62,66 **** --- 62,68 ---- #ifdef _INCLUDE_FROM_OBJ_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_OBJ_C_*/ *** oval.e.orig Sun Jan 10 20:44:01 1999 --- oval.e Sun Jan 10 20:44:01 1999 *************** *** 58,62 **** --- 58,64 ---- #ifdef _INCLUDE_FROM_OVAL_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_OVAL_C_*/ *** page.e.orig Sun Jan 10 20:44:01 1999 --- page.e Sun Jan 10 20:44:01 1999 *************** *** 85,89 **** --- 85,91 ---- #ifdef _INCLUDE_FROM_PAGE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_PAGE_C_*/ *** pattern.e.orig Sun Jan 10 20:44:02 1999 --- pattern.e Sun Jan 10 20:44:02 1999 *************** *** 112,116 **** --- 112,118 ---- #ifdef _INCLUDE_FROM_PATTERN_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_PATTERN_C_*/ *** pin.e.orig Sun Jan 10 20:44:03 1999 --- pin.e Sun Jan 10 20:44:03 1999 *************** *** 58,62 **** --- 58,64 ---- #ifdef _INCLUDE_FROM_PIN_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_PIN_C_*/ *** poly.e.orig Sun Jan 10 20:44:04 1999 --- poly.e Sun Jan 10 20:44:04 1999 *************** *** 97,101 **** --- 97,103 ---- #ifdef _INCLUDE_FROM_POLY_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_POLY_C_*/ *** polygon.e.orig Sun Jan 10 20:44:05 1999 --- polygon.e Sun Jan 10 20:44:05 1999 *************** *** 67,71 **** --- 67,73 ---- #ifdef _INCLUDE_FROM_POLYGON_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_POLYGON_C_*/ *** prtgif.e.orig Sun Jan 10 20:44:06 1999 --- prtgif.e Sun Jan 10 20:44:06 1999 *************** *** 50,54 **** --- 50,56 ---- #ifdef _INCLUDE_FROM_PRTGIF_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_PRTGIF_C_*/ *** ps.e.orig Sun Jan 10 20:44:07 1999 --- ps.e Sun Jan 10 20:44:07 1999 *************** *** 76,80 **** --- 76,82 ---- #ifdef _INCLUDE_FROM_PS_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_PS_C_*/ *** raster.e.orig Sun Jan 10 20:44:08 1999 --- raster.e Sun Jan 10 20:44:08 1999 *************** *** 107,111 **** --- 107,113 ---- #ifdef _INCLUDE_FROM_RASTER_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_RASTER_C_*/ *** rcbox.e.orig Sun Jan 10 20:44:09 1999 --- rcbox.e Sun Jan 10 20:44:09 1999 *************** *** 60,64 **** --- 60,66 ---- #ifdef _INCLUDE_FROM_RCBOX_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_RCBOX_C_*/ *** rect.e.orig Sun Jan 10 20:44:10 1999 --- rect.e Sun Jan 10 20:44:10 1999 *************** *** 112,116 **** --- 112,118 ---- #ifdef _INCLUDE_FROM_RECT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_RECT_C_*/ *** remote.e.orig Sun Jan 10 20:44:10 1999 --- remote.e Sun Jan 10 20:44:10 1999 *************** *** 84,88 **** --- 84,90 ---- #ifdef _INCLUDE_FROM_REMOTE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_REMOTE_C_*/ *** ruler.e.orig Sun Jan 10 20:44:11 1999 --- ruler.e Sun Jan 10 20:44:11 1999 *************** *** 75,79 **** --- 75,81 ---- #ifdef _INCLUDE_FROM_RULER_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_RULER_C_*/ *** scroll.e.orig Sun Jan 10 20:44:12 1999 --- scroll.e Sun Jan 10 20:44:12 1999 *************** *** 73,77 **** --- 73,79 ---- #ifdef _INCLUDE_FROM_SCROLL_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SCROLL_C_*/ *** select.e.orig Sun Jan 10 20:44:13 1999 --- select.e Sun Jan 10 20:44:13 1999 *************** *** 108,112 **** --- 108,114 ---- #ifdef _INCLUDE_FROM_SELECT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SELECT_C_*/ *** setup.e.orig Sun Jan 10 20:44:14 1999 --- setup.e Sun Jan 10 20:44:14 1999 *************** *** 159,162 **** --- 159,164 ---- #endif /*_INCLUDE_FROM_SETUP_C_*/ + extern void RegisterWM_DELETE_WINDOW ARGS_DECL((Window)); + extern int IsWM_DELETE_WINDOW ARGS_DECL((XEvent*)); extern void UpdDrawWinWH ARGS_DECL((void)); extern void UpdDrawWinBBox ARGS_DECL((void)); *************** *** 178,182 **** --- 180,186 ---- #ifdef _INCLUDE_FROM_SETUP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SETUP_C_*/ *** shape.e.orig Sun Jan 10 20:44:15 1999 --- shape.e Sun Jan 10 20:44:15 1999 *************** *** 57,61 **** --- 57,63 ---- #ifdef _INCLUDE_FROM_SHAPE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SHAPE_C_*/ *** shortcut.e.orig Sun Jan 10 20:44:16 1999 --- shortcut.e Sun Jan 10 20:44:16 1999 *************** *** 52,56 **** --- 52,58 ---- #ifdef _INCLUDE_FROM_SHORTCUT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SHORTCUT_C_*/ *** special.e.orig Sun Jan 10 20:44:17 1999 --- special.e Sun Jan 10 20:44:17 1999 *************** *** 61,65 **** --- 61,67 ---- #ifdef _INCLUDE_FROM_SPECIAL_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SPECIAL_C_*/ *** spline.e.orig Sun Jan 10 20:44:18 1999 --- spline.e Sun Jan 10 20:44:18 1999 *************** *** 97,101 **** --- 97,103 ---- #ifdef _INCLUDE_FROM_SPLINE_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_SPLINE_C_*/ *** stk.e.orig Sun Jan 10 20:44:19 1999 --- stk.e Sun Jan 10 20:44:19 1999 *************** *** 56,60 **** --- 56,62 ---- #ifdef _INCLUDE_FROM_STK_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_STK_C_*/ *** stream.e.orig Sun Jan 10 20:44:20 1999 --- stream.e Sun Jan 10 20:44:20 1999 *************** *** 53,57 **** --- 53,59 ---- #ifdef _INCLUDE_FROM_STREAM_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_STREAM_C_*/ *** stretch.e.orig Sun Jan 10 20:44:21 1999 --- stretch.e Sun Jan 10 20:44:21 1999 *************** *** 94,98 **** --- 94,100 ---- #ifdef _INCLUDE_FROM_STRETCH_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_STRETCH_C_*/ *** tangram2.e.orig Sun Jan 10 20:44:22 1999 --- tangram2.e Sun Jan 10 20:44:22 1999 *************** *** 80,84 **** --- 80,86 ---- #ifdef _INCLUDE_FROM_TANGRAM2_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_TANGRAM2_C_*/ *** tcp.e.orig Sun Jan 10 20:44:23 1999 --- tcp.e Sun Jan 10 20:44:23 1999 *************** *** 50,54 **** --- 50,56 ---- #ifdef _INCLUDE_FROM_TCP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_TCP_C_*/ *** text.e.orig Sun Jan 10 20:44:24 1999 --- text.e Sun Jan 10 20:44:24 1999 *************** *** 138,142 **** --- 138,144 ---- #ifdef _INCLUDE_FROM_TEXT_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_TEXT_C_*/ *** util.e.orig Sun Jan 10 20:44:24 1999 --- util.e Sun Jan 10 20:44:24 1999 *************** *** 68,72 **** --- 68,74 ---- #ifdef _INCLUDE_FROM_UTIL_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_UTIL_C_*/ *** version.e.orig Sun Jan 10 20:44:25 1999 --- version.e Sun Jan 10 20:44:25 1999 *************** *** 58,62 **** --- 58,64 ---- #ifdef _INCLUDE_FROM_VERSION_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_VERSION_C_*/ *** wb.e.orig Sun Jan 10 20:44:26 1999 --- wb.e Sun Jan 10 20:44:26 1999 *************** *** 97,101 **** --- 97,103 ---- #ifdef _INCLUDE_FROM_WB_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_WB_C_*/ *** wb1.e.orig Sun Jan 10 20:44:27 1999 --- wb1.e Sun Jan 10 20:44:27 1999 *************** *** 26,30 **** --- 26,32 ---- #ifdef _INCLUDE_FROM_WB1_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_WB1_C_*/ *** wb2.e.orig Sun Jan 10 20:44:28 1999 --- wb2.e Sun Jan 10 20:44:28 1999 *************** *** 33,37 **** --- 33,39 ---- #ifdef _INCLUDE_FROM_WB2_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_WB2_C_*/ *** wb3.e.orig Sun Jan 10 20:44:29 1999 --- wb3.e Sun Jan 10 20:44:29 1999 *************** *** 26,30 **** --- 26,32 ---- #ifdef _INCLUDE_FROM_WB3_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_WB3_C_*/ *** xbitmap.e.orig Sun Jan 10 20:44:30 1999 --- xbitmap.e Sun Jan 10 20:44:30 1999 *************** *** 93,97 **** --- 93,99 ---- #ifdef _INCLUDE_FROM_XBITMAP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_XBITMAP_C_*/ *** xpixmap.e.orig Sun Jan 10 20:44:31 1999 --- xpixmap.e Sun Jan 10 20:44:31 1999 *************** *** 101,105 **** --- 101,107 ---- #ifdef _INCLUDE_FROM_XPIXMAP_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_XPIXMAP_C_*/ *** xprtfltr.e.orig Sun Jan 10 20:44:32 1999 --- xprtfltr.e Sun Jan 10 20:44:32 1999 *************** *** 61,65 **** --- 61,67 ---- #ifdef _INCLUDE_FROM_XPRTFLTR_C_ #undef extern + #ifndef _NO_RECURSIVE_EXTERN #define extern extern + #endif /* ~_NO_RECURSIVE_EXTERN */ #endif /*_INCLUDE_FROM_XPRTFLTR_C_*/ *** const.h.orig Sun Jan 10 20:44:33 1999 --- const.h Sun Jan 10 20:44:33 1999 *************** *** 555,640 **** #define FILEMENUENTRIES 31 - /* edit menu */ - - #define EDIT_REDRAW 0 - #define EDIT_DUP 1 - #define EDIT_DELETE 2 - #define EDIT_SELALL 3 - #define EDIT_UNDO 4 - #define EDIT_REDO 5 - #define EDIT_DEL_POINT 6 - #define EDIT_ADD_POINT 7 - #define EDIT_COPY 8 - #define EDIT_CUT 9 - #define EDIT_PASTE 10 - #define EDIT_PASTE_FROM_FILE 11 - #define EDIT_COPY_PROP 12 - #define EDIT_PASTE_PROP 13 - #define EDIT_SAVE_PROP 14 - #define EDIT_RESTORE_PROP 15 - #define EDIT_UPDATE 16 - #define EDIT_SCALE 17 - #define EDIT_FLUSH_UNDO 18 - #define EDIT_PRINT_MSG_BUF 19 - #define EDIT_INV_XBM 20 - #define EDIT_PUSH_CUR_CHOICE 21 - #define EDIT_MAKE_PREC_ARC 22 - #define EDIT_CUT_MAPS 23 - #define EDIT_RESTORE_MAPS 24 - #define EDIT_UPDATE_EPS 25 - #define EDIT_CV_INTSPLINE 26 - #define EDIT_SMOOTH_HINGE 27 - #define EDIT_MAKE_REGULAR 28 - #define EDIT_BREAK_TEXT 29 - #define EDIT_SET_SEL_LINEWIDTH 30 - #define EDIT_SET_SEL_FONT_SIZE 31 - #define EDIT_ADD_COLOR 32 - #define EDIT_BREAK_MAPS 33 - #define EDIT_LAYOUT_ON_ARC 34 - #define EDIT_PRECISE_ROTATE 35 - #define EDIT_JOIN_POLY 36 - #define EDIT_CUT_POLY 37 - #define EDIT_GET_BBOX 38 - #define EDIT_SET_SHAPE_SHADOW 39 - #define EDIT_NO_TRANSFORM 40 - #define EDIT_SET_EDIT_TEXT_SIZE 41 - #define EDIT_FIND_CASE 42 - #define EDIT_FIND_NOCASE 43 - #define EDIT_FIND_AGAIN 44 - /* #define EDIT_CONNECT_PINS 45 */ /* Pins are not implemented yet! */ - - #define MAXEDITMENUS 45 - - /* layout menu */ - - #define LAYOUT_INCGRID 0 - #define LAYOUT_DECGRID 1 - #define LAYOUT_GRID 2 - #define LAYOUT_SNAP 3 - #define LAYOUT_GOHOME 4 - #define LAYOUT_SETHOME 5 - #define LAYOUT_ZOOMIN 6 - #define LAYOUT_ZOOMOUT 7 - #define LAYOUT_DEFZOOM 8 - #define LAYOUT_ZOOMWAYOUT 9 - #define LAYOUT_LAND 10 - #define LAYOUT_PORT 11 - #define LAYOUT_PRINTMAG 12 - #define LAYOUT_TOGGLE_WHERE_TO_PRINT 13 - #define LAYOUT_TOGGLE_COLOR_PS 14 - #define LAYOUT_TOGGLE_MOVE_MODE 15 - #define LAYOUT_TOGGLE_GRID_SYSTEM 16 - #define LAYOUT_TOGGLE_MAP_SHOWN 17 - #define LAYOUT_TOGGLE_USE_GRAY 18 - #define LAYOUT_TOGGLE_SHOW_MEASURE 19 - #define LAYOUT_TOGGLE_SET_MEASURE_UNIT 20 - #define LAYOUT_TOGGLE_SHOW_MENUBAR 21 - #define LAYOUT_TOGGLE_SHOW_STATUS 22 - #define LAYOUT_TOGGLE_ONEMOTION_SELMOVE 23 - /* make sure the LAYOUT_TOGGLE_COLOR_LAYERS is the last one */ - #define LAYOUT_TOGGLE_COLOR_LAYERS 24 - - #define MAXLAYOUTMENUS 25 - /* move mode stuff */ --- 555,558 ---- *************** *** 653,684 **** /* arrange menu */ ! #define ARRANGE_FRONT 0 ! #define ARRANGE_BACK 1 ! #define ARRANGE_GROUP 2 ! #define ARRANGE_UNGROUP 3 ! #define ARRANGE_LOCK 4 ! #define ARRANGE_UNLOCK 5 ! #define ARRANGE_ALIGNOBJ 6 ! #define ARRANGE_ALIGNGRID 7 ! #define ARRANGE_ALIGNPAGE 8 ! #define ARRANGE_DISTROBJ 9 ! #define FLIP_HORIZONTAL 10 ! #define FLIP_VERTICAL 11 ! #define ROTATE_CLOCKWISE 12 ! #define ROTATE_COUNTER 13 ! #define SET_TEXT_ROTATE 14 ! #define SET_ROTATE_INC 15 ! #define ALIGN_OBJ_TOP 16 ! #define ALIGN_OBJ_MIDDLE 17 ! #define ALIGN_OBJ_BOTTOM 18 ! #define ALIGN_OBJ_LEFT 19 ! #define ALIGN_OBJ_CENTER 20 ! #define ALIGN_OBJ_RIGHT 21 ! #define ABUT_HORIZONTAL 22 ! #define ABUT_VERTICAL 23 ! #define ALIGN_CENTERANENDPOINT 24 - #define MAXARRANGEMENUS 25 - /* nagivate menu */ --- 571,577 ---- /* arrange menu */ ! #define ABUT_HORIZONTAL 0 ! #define ABUT_VERTICAL 1 /* nagivate menu */ *************** *** 693,733 **** #define MAXNAVIGATEMENUS 7 - /* special menu */ - - #define SPECIAL_SYM 0 - #define SPECIAL_UNSYM 1 - #define SPECIAL_INST 2 - #define SPECIAL_ICON 3 - #define SPECIAL_UNICON 4 - #define SPECIAL_PUSH 5 - #define SPECIAL_POP 6 - #define SPECIAL_ADDATTR 7 - #define SPECIAL_DETACHATTR 8 - #define SPECIAL_SHOWATTR 9 - #define SPECIAL_SHOWATTRNAME 10 - #define SPECIAL_HIDEATTR 11 - #define SPECIAL_HIDEATTRNAME 12 - #define SPECIAL_MOVEATTR 13 - #define SPECIAL_EDITATTR 14 - #define SPECIAL_ANIMATESEND 15 - #define SPECIAL_ANIMATEFLASH 16 - #define SPECIAL_ADDFILEATTR 17 - #define SPECIAL_DETACHFILEATTR 18 - #define SPECIAL_EDITFILEATTR 19 - #define SPECIAL_UPDATESYMS 20 - #define SPECIAL_IMPORT_ATTRS 21 - #define SPECIAL_EXPORT_ATTRS 22 - #define SPECIAL_MERGE_WITH_TABLE 23 - #define SPECIAL_EXPORT_TO_TABLE 24 - #ifdef _TGIF_WB - #define SPECIAL_WHITE_BOARD 25 - #endif /* _TGIF_WB */ - - #ifdef _TGIF_WB - #define MAXSPECIALMENUS 26 - #else /* ~_TGIF_WB */ - #define MAXSPECIALMENUS 25 - #endif /* _TGIF_WB */ - /* page menu */ --- 586,589 ---- *** expfdefs.h.orig Sun Jan 10 20:44:34 1999 --- expfdefs.h Sun Jan 10 20:44:34 1999 *************** *** 56,60 **** --- 56,64 ---- #include "tgifdefs.h" + #ifdef _DL_EXPORT_UNDERSCORE + #define TGEF_MAIN_NAME "_TgifExportFilterMain" + #else /* ~_DL_EXPORT_UNDERSCORE */ #define TGEF_MAIN_NAME "TgifExportFilterMain" + #endif /* _DL_EXPORT_UNDERSCORE */ typedef void *TGEF_USER_INFO; *** patchlvl.h.orig Sun Jan 10 20:44:34 1999 --- patchlvl.h Sun Jan 10 20:44:34 1999 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 2 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 3 #endif /*_TGIF_PATCHLEVEL_H_*/ *** tgifdefs.h.orig Sun Jan 10 20:44:35 1999 --- tgifdefs.h Sun Jan 10 20:44:35 1999 *************** *** 94,100 **** #ifdef __NetBSD__ ! #ifndef RTLD_GLOBAL ! #define RTLD_GLOBAL 0 ! #endif /* ~RTLD_GLOBAL */ #endif /* __NetBSD__ */ --- 94,98 ---- #ifdef __NetBSD__ ! /* Do we need anything here? */ #endif /* __NetBSD__ */ *** Imakefile.orig Sun Jan 10 20:44:36 1999 --- Imakefile Sun Jan 10 20:44:36 1999 *************** *** 53,58 **** $(MOREDEFINES) ! TGIFVERSION = 4.0.2 OBJ1 = align.o animate.o arc.o attr.o auxtext.o \ box.o button.o \ --- 53,211 ---- $(MOREDEFINES) ! TGIFVERSION = 4.0.3 + XCOMM Things to try to add to the DEFINES line above: + XCOMM + XCOMM RS6000: -D_BSD + XCOMM Solaris: + XCOMM Irix: + XCOMM SunOS: + XCOMM HP-UX: -D_NO_LOCALE_SUPPORT + XCOMM VMS: -D_NO_GETTIMEOFDAY + XCOMM Linux: + XCOMM FreeBSD: + XCOMM SCO: -DPRINT_CMD=\""lp -o raw -o nobanner"\" + + XCOMM -D_NO_RECURSIVE_EXTERN + XCOMM Include the above line if your C compiler cannot handle + XCOMM "#define extern extern". The /bin/cc compiler on HP-UX reports a + XCOMM Recursion in macro "extern" when the above define is used. + XCOMM -D_DL_EXPORT_UNDERSCORE + XCOMM Include the above line if you use export filters and there is an entry + XCOMM point to an export filter named "_TgifExportFilterMain" (and there's + XCOMM no entry point named "TgifExportFilterMain"). One can see all the + XCOMM entry points to an export filter by running 'nm' against it. + XCOMM -D_NO_XCIN + XCOMM Include the above line if you do not want to include the code + XCOMM that handles xcin. Please also remove "cli_xcin.o" from + XCOMM OBJ1 in Imakefile. + XCOMM -D_NO_CHINPUT + XCOMM Include the above line if you do not want to include the code + XCOMM that handles chinput. Please also remove "chinput.o" from + XCOMM OBJ1 in Imakefile. + XCOMM -D_NO_KINPUT + XCOMM Include the above line if you do not want to include the code + XCOMM that handles kinput. Please also remove "convkinput.o" from + XCOMM OBJ1 in Imakefile. + XCOMM -D_NO_XIM + XCOMM Include the above line if you do not want to include the code + XCOMM that handles X Input Method. Please also remove "convxim.o" from + XCOMM OBJ1 in Imakefile. + XCOMM -D_NO_NKF + XCOMM Include the above line if you do not want to include the code + XCOMM that handles Network Kanji Filter (NKF). Please also remove + XCOMM "nkf.o" from OBJ1 in Imakefile. + XCOMM -D_NO_DL_SUPPORT + XCOMM Include the above line if you don't have . If you define + XCOMM _NO_DL_SUPPORT, please use the SYS_LIBRARIES that does not contain + XCOMM -ldl above. + XCOMM -D_NO_LOCALE_SUPPORT + XCOMM Include the above line if you don't have . If this + XCOMM is the case and you don't have , you must also use + XCOMM -D_NO_XIM because "convxim.c" assumes that you have . + XCOMM -D_METRIC_PIX_PER_INCH + XCOMM Include the above line if you want to use 127 pixels per inch + XCOMM when printing in the metric system. If this line is not + XCOMM included, 128 pixels per inch is used. + XCOMM -D_NO_GETTIMEOFDAY + XCOMM Include the above line if you do not have the gettimeofday() + XCOMM function but have the ftime() function. + XCOMM -D_TANGRAM_II + XCOMM Include the above line if you want to include the Tangram-II features + XCOMM by Carlos Fisch de Brito, Luiz Rogerio Goncalves de Carvalho, and + XCOMM Denise Jorge de Oliveira of the + XCOMM Tangram-II team of the Universidade Federal do Rio de Janeiro. These + XCOMM features are under development and highly experimental. + XCOMM -D_TGIF_WB + XCOMM Include the above line if you want to include the whiteboard feature + XCOMM by Renato Santana . This feature is under + XCOMM development and highly experimental. + XCOMM -DBSD_COMP + XCOMM Include the above line if you are compiling on a Solaris (or + XCOMM possibly an SGI) machine which requires it in . + XCOMM (If you see the error that FIONBIO is not defined when compiling + XCOMM tcp.c, then you probably need this.) + XCOMM -D_BACKGROUND_DONT_FORK + XCOMM Try the above line if there are defunct tgif child processes. + XCOMM -D_NO_LSTAT + XCOMM Include the above line if lstat() is not available. In this case, + XCOMM using BrowseXBitmap and BrowseXPixmap under the File Menu may cause + XCOMM infinite loop if the directory structure is infinitely recursive. + XCOMM -D_USE_XDRAWPOINT_TO_PUT_A_POINT + XCOMM Include the above line if the grid points are not visible. This can + XCOMM be used to bypass some X server bugs (such as certain Linux X server + XCOMM using VGA16 screen) where the XDrawLine() Xlib call does not work + XCOMM properly. + XCOMM -D_NO_EXTERN (obsoleted) + XCOMM Include the above line in the DEFINES if you don't want to include + XCOMM the extern definition for functions defined in a module. For example, + XCOMM if this option is set, then file "foo.c" will not include "foo.e", + XCOMM and certain other extern definition in "foo.c" will be omitted. + XCOMM -D_NO_PROTO + XCOMM Include the above line in the DEFINES if checking for function + XCOMM prototypes is not desired. Checking for function prototypes + XCOMM are automatically enabled if you are using an ANSI or C++ compilor. + XCOMM However, not all ANSI/C++ compilors are created equal. + XCOMM -D_BSD + XCOMM Include the above line in the DEFINES if the select() function can + XCOMM does not be found for AIX systems (such as RS6000). Also, on AIX + XCOMM systems, if you see garbage file names when you try to open files, + XCOMM try this flag to make direct and dirent equivalent (in ). + XCOMM -DNO_STRSTR + XCOMM Include the above line in the DEFINES if you do not have the strstr() + XCOMM function in your system's string library. + XCOMM -DINVERT_CTM_BUG + XCOMM Include the above line in the DEFINES if you are using PostScript + XCOMM utilities which fails when trying to invert non-invertible CTM + XCOMM (e.g., muluti.ps from ftp.ucc.su.oz.au:/pub/ps_printing/multi). + XCOMM -DHP_LINE_BUG + XCOMM Include the above line in the DEFINES if two-vertices horizontal and + XCOMM verticle line segments don't draw properly on a buggy HP server. + XCOMM -DDONTFREECOLORS + XCOMM Include the above line in the DEFINES if you don't want the black and + XCOMM the white colors to be freed when tgif initializes itself. You should + XCOMM not need to do this unless you need to get around some server bugs. + XCOMM -DUSE_XAPPLRESDIR + XCOMM Include the above line in the DEFINES if $XAPPLRESDIR/Tgif is used to + XCOMM specify the resource file. If your system does not have putenv() + XCOMM (such as IBM-RT), then this won't work. + XCOMM -DXAPPLOADDIR_DEF + XCOMM If you define USE_XAPPLRESDIR, define this to a default directory + XCOMM to use in case $XAPPLRESDIR isn't set. + XCOMM -DUSE_XT_INITIALIZE + XCOMM This will cause the XToolkit to be initialized so that the X defaults + XCOMM are obtained from the Xt directories. This should only be used when + XCOMM USE_XAPPLRESDIR option is NOT used. Please remember to use the + XCOMM LOCAL_LIBRARIES with $(XTOOLLIB) $(XMULIB) above. + XCOMM -DNO_THIN_LINE + XCOMM Include the above line in the DEFINES if a line width of 0 causes + XCOMM your server to crash. This is to get around a bug in some X servers. + XCOMM -DTHIN_OVAL_AND_ARC + XCOMM Include the above line in the DEFINES if you want 0 width arcs to + XCOMM be used when the width of an arc is less than or equal to 1. + XCOMM (Sun3 server has a bug that makes drawing ovals and arcs with + XCOMM width other than 0 VERY slow). + XCOMM -DKEEP_WHEN_PRINT + XCOMM Include the above line in the DEFINES if you don't want the temp + XCOMM file to be deleted after sending the print job to the printer. + XCOMM (Some VMS systems might require this flag to be used.) + XCOMM -DPRINT_CMD=\"lpr\" + XCOMM Include the above line in the DEFINES if you want to configure tgif + XCOMM to use a default print command. + XCOMM -DNOTR4MODE + XCOMM Include the above line in the DEFINES if you are running X11R3. + XCOMM This will cause tgif NOT to use some X11R4 window manager related + XCOMM functions that's not present in R3. + XCOMM -DMAPBEFORESELECT + XCOMM Include the above line in the DEFINES to call XMapWindow() before + XCOMM calling XSelectInput(). This might be needed to get around some + XCOMM server bugs. + XCOMM -DDONT_FREE_COLORMAP + XCOMM Include the above line in the DEFINES if you don't want the colormap + XCOMM to be freed when tgif exits. + XCOMM -DA4PAPER + XCOMM Include the above line in the DEFINES if you want to print on A4 paper + XCOMM (8.25in by 11.7in or about 21cm by 29.7cm). + OBJ1 = align.o animate.o arc.o attr.o auxtext.o \ box.o button.o \ *** Tgif.tmpl.orig Sun Jan 10 20:44:37 1999 --- Tgif.tmpl Sun Jan 10 20:44:37 1999 *************** *** 42,57 **** #endif - XCOMM On Solaris, you probably need to uncomment the next few lines: - XCOMM - XCOMM CC = cc - XCOMM PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) - XCOMM EXTRA_LDOPTIONS = - XCOMM EXTRA_LIBRARIES = -lsocket -lnsl -lgen - XCOMM - XCOMM On IRIX, you probably need to uncomment the next few lines: - XCOMM - XCOMM OPTIMIZER = -O2 -Olimit 1500 - XCOMM EXTRA_LDOPTIONS = - PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive XCOMM CDEBUGFLAGS= -g -Wall --- 42,45 ---- *************** *** 71,85 **** MOREDEFINES = ! XCOMM Things to try to add to the DEFINES line above: ! XCOMM ! XCOMM RS6000: -D_BSD ! XCOMM Solaris: ! XCOMM Irix: ! XCOMM SunOS: ! XCOMM HP-UX: -D_NO_LOCALE_SUPPORT ! XCOMM VMS: -D_NO_GETTIMEOFDAY ! XCOMM Linux: ! XCOMM FreeBSD: ! XCOMM SCO: -DPRINT_CMD=\""lp -o raw -o nobanner"\" DEPLIBS = $(DEPXLIB) --- 59,65 ---- MOREDEFINES = ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ! XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DEPLIBS = $(DEPXLIB) *************** *** 89,220 **** XCOMM SYS_LIBRARIES = -lm ! XCOMM -D_NO_XCIN ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles xcin. Please also remove "cli_xcin.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_CHINPUT ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles chinput. Please also remove "chinput.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_KINPUT ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles kinput. Please also remove "convkinput.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_XIM ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles X Input Method. Please also remove "convxim.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_NKF ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles Network Kanji Filter (NKF). Please also remove ! XCOMM "nkf.o" from OBJ1 in Imakefile. ! XCOMM -D_NO_DL_SUPPORT ! XCOMM Include the above line if you don't have . If you define ! XCOMM _NO_DL_SUPPORT, please use the SYS_LIBRARIES that does not contain ! XCOMM -ldl above. ! XCOMM -D_NO_LOCALE_SUPPORT ! XCOMM Include the above line if you don't have . ! XCOMM -D_METRIC_PIX_PER_INCH ! XCOMM Include the above line if you want to use 127 pixels per inch ! XCOMM when printing in the metric system. If this line is not ! XCOMM included, 128 pixels per inch is used. ! XCOMM -D_NO_GETTIMEOFDAY ! XCOMM Include the above line if you do not have the gettimeofday() ! XCOMM function but have the ftime() function. ! XCOMM -D_TANGRAM_II ! XCOMM Include the above line if you want to include the Tangram-II features ! XCOMM by Carlos Fisch de Brito, Luiz Rogerio Goncalves de Carvalho, and ! XCOMM Denise Jorge de Oliveira of the ! XCOMM Tangram-II team of the Universidade Federal do Rio de Janeiro. These ! XCOMM features are under development and highly experimental. ! XCOMM -D_TGIF_WB ! XCOMM Include the above line if you want to include the whiteboard feature ! XCOMM by Renato Santana . This feature is under ! XCOMM development and highly experimental. ! XCOMM -DBSD_COMP ! XCOMM Include the above line if you are compiling on a Solaris (or ! XCOMM possibly an SGI) machine which requires it in . ! XCOMM (If you see the error that FIONBIO is not defined when compiling ! XCOMM tcp.c, then you probably need this.) ! XCOMM -D_BACKGROUND_DONT_FORK ! XCOMM Try the above line if there are defunct tgif child processes. ! XCOMM -D_NO_LSTAT ! XCOMM Include the above line if lstat() is not available. In this case, ! XCOMM using BrowseXBitmap and BrowseXPixmap under the File Menu may cause ! XCOMM infinite loop if the directory structure is infinitely recursive. ! XCOMM -D_USE_XDRAWPOINT_TO_PUT_A_POINT ! XCOMM Include the above line if the grid points are not visible. This can ! XCOMM be used to bypass some X server bugs (such as certain Linux X server ! XCOMM using VGA16 screen) where the XDrawLine() Xlib call does not work ! XCOMM properly. ! XCOMM -D_NO_EXTERN (obsoleted) ! XCOMM Include the above line in the DEFINES if you don't want to include ! XCOMM the extern definition for functions defined in a module. For example, ! XCOMM if this option is set, then file "foo.c" will not include "foo.e", ! XCOMM and certain other extern definition in "foo.c" will be omitted. ! XCOMM -D_NO_PROTO ! XCOMM Include the above line in the DEFINES if checking for function ! XCOMM prototypes is not desired. Checking for function prototypes ! XCOMM are automatically enabled if you are using an ANSI or C++ compilor. ! XCOMM However, not all ANSI/C++ compilors are created equal. ! XCOMM -D_BSD ! XCOMM Include the above line in the DEFINES if the select() function can ! XCOMM does not be found for AIX systems (such as RS6000). Also, on AIX ! XCOMM systems, if you see garbage file names when you try to open files, ! XCOMM try this flag to make direct and dirent equivalent (in ). ! XCOMM -DNO_STRSTR ! XCOMM Include the above line in the DEFINES if you do not have the strstr() ! XCOMM function in your system's string library. ! XCOMM -DINVERT_CTM_BUG ! XCOMM Include the above line in the DEFINES if you are using PostScript ! XCOMM utilities which fails when trying to invert non-invertible CTM ! XCOMM (e.g., muluti.ps from ftp.ucc.su.oz.au:/pub/ps_printing/multi). ! XCOMM -DHP_LINE_BUG ! XCOMM Include the above line in the DEFINES if two-vertices horizontal and ! XCOMM verticle line segments don't draw properly on a buggy HP server. ! XCOMM -DDONTFREECOLORS ! XCOMM Include the above line in the DEFINES if you don't want the black and ! XCOMM the white colors to be freed when tgif initializes itself. You should ! XCOMM not need to do this unless you need to get around some server bugs. ! XCOMM -DUSE_XAPPLRESDIR ! XCOMM Include the above line in the DEFINES if $XAPPLRESDIR/Tgif is used to ! XCOMM specify the resource file. If your system does not have putenv() ! XCOMM (such as IBM-RT), then this won't work. ! XCOMM -DXAPPLOADDIR_DEF ! XCOMM If you define USE_XAPPLRESDIR, define this to a default directory ! XCOMM to use in case $XAPPLRESDIR isn't set. ! XCOMM -DUSE_XT_INITIALIZE ! XCOMM This will cause the XToolkit to be initialized so that the X defaults ! XCOMM are obtained from the Xt directories. This should only be used when ! XCOMM USE_XAPPLRESDIR option is NOT used. Please remember to use the ! XCOMM LOCAL_LIBRARIES with $(XTOOLLIB) $(XMULIB) above. ! XCOMM -DNO_THIN_LINE ! XCOMM Include the above line in the DEFINES if a line width of 0 causes ! XCOMM your server to crash. This is to get around a bug in some X servers. ! XCOMM -DTHIN_OVAL_AND_ARC ! XCOMM Include the above line in the DEFINES if you want 0 width arcs to ! XCOMM be used when the width of an arc is less than or equal to 1. ! XCOMM (Sun3 server has a bug that makes drawing ovals and arcs with ! XCOMM width other than 0 VERY slow). ! XCOMM -DKEEP_WHEN_PRINT ! XCOMM Include the above line in the DEFINES if you don't want the temp ! XCOMM file to be deleted after sending the print job to the printer. ! XCOMM (Some VMS systems might require this flag to be used.) ! XCOMM -DPRINT_CMD=\"lpr\" ! XCOMM Include the above line in the DEFINES if you want to configure tgif ! XCOMM to use a default print command. ! XCOMM -DNOTR4MODE ! XCOMM Include the above line in the DEFINES if you are running X11R3. ! XCOMM This will cause tgif NOT to use some X11R4 window manager related ! XCOMM functions that's not present in R3. ! XCOMM -DMAPBEFORESELECT ! XCOMM Include the above line in the DEFINES to call XMapWindow() before ! XCOMM calling XSelectInput(). This might be needed to get around some ! XCOMM server bugs. ! XCOMM -DDONT_FREE_COLORMAP ! XCOMM Include the above line in the DEFINES if you don't want the colormap ! XCOMM to be freed when tgif exits. ! XCOMM -DA4PAPER ! XCOMM Include the above line in the DEFINES if you want to print on A4 paper ! XCOMM (8.25in by 11.7in or about 21cm by 29.7cm). ! --- 69,74 ---- XCOMM SYS_LIBRARIES = -lm ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM ! XCOMM This file has been tested under (uname -s -r): XCOMM ! XCOMM Linux 2.0.35 XCOMM ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM *** HISTORY.orig Sun Jan 10 20:44:39 1999 --- HISTORY Sun Jan 10 20:44:39 1999 *************** *** 1,2 **** --- 1,33 ---- + -----------------------> tgif-4.0.2 => tgif-4.0.3 <----------------------- + Here's a short list of added features/bug fixes. + + 1) Fix crashing bugs with super/subscripts. Thanks to Levente NOVAK + for pointing out the problem. + 2) Make tgif compile under HP-UX. On an HP 9000/735, /bin/cc does not + like "#define extern extern" which appears in all the .e files. + 3) Add "#include " if _NO_LOCALE_SUPPORT is defined in "convxim.c". + Thanks to Ralphe Neill for pointing out the + problem. + 4) Fix offset into the tiff image is incorrect when exporting in the + TiffEPSI format. Thanks for Leana Golubchik for + pointing out the problem. + 5) Handle window manager Delete's properly. Thanks to Dick Wesseling + for the patch. + 6) Don't repaint so much when pasting. Thanks to Francis Ngoh + for pointing out the problem. + 7) Fix the following problems when dealing with inputing Japanese characters. + a) The File Modified flag was not set when inputing Japanese characters. + b) After switching to a single-byte font, tgif was still talking to the + input method. + c) If Tgif.PreeditType is set to overthespot, the kinput2's window + position was wrong. + Thanks to TAKAHASHI Hitoshi pointing + out the problems. + 8) Add the following files: + + Tgif.tmpl-netbsd + Tgif.tmpl-irix + Tgif.tmpl-hpux + -----------------------> tgif-4.0.1 => tgif-4.0.2 <----------------------- Here's a short list of added features/bug fixes. *** make.comdep.orig Sun Jan 10 20:44:40 1999 --- make.comdep Sun Jan 10 20:44:40 1999 *************** *** 40,48 **** choice$(O) : tgifdefs.h const.h tgif_dbg.h types.h expfdefs.h align.e \ arc.e auxtext.e box.e choice.e color.e cursor.e dialog.e \ ! drawing.e edit.e file.e font.e grid.e mainloop.e mainmenu.e \ ! mark.e menu.e menuinfo.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 \ ! xprtfltr.e $(XBM)abc.xbm choose$(O) : tgifdefs.h const.h tgif_dbg.h types.h auxtext.e button.e \ choose.e cutpaste.e cursor.e dialog.e file.e font.e \ --- 40,48 ---- choice$(O) : tgifdefs.h const.h tgif_dbg.h types.h expfdefs.h align.e \ arc.e auxtext.e box.e choice.e color.e cursor.e dialog.e \ ! drawing.e edit.e file.e font.e grid.e inmethod.e mainloop.e \ ! mainmenu.e mark.e menu.e menuinfo.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 xprtfltr.e $(XBM)abc.xbm choose$(O) : tgifdefs.h const.h tgif_dbg.h types.h auxtext.e button.e \ choose.e cutpaste.e cursor.e dialog.e file.e font.e \ *** Tgif.tmpl-freebsd.orig Sun Jan 10 20:44:41 1999 --- Tgif.tmpl-freebsd Sun Jan 10 20:44:41 1999 *************** *** 42,57 **** #endif - XCOMM On Solaris, you probably need to uncomment the next few lines: - XCOMM - XCOMM CC = cc - XCOMM PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) - XCOMM EXTRA_LDOPTIONS = - XCOMM EXTRA_LIBRARIES = -lsocket -lnsl -lgen - XCOMM - XCOMM On IRIX, you probably need to uncomment the next few lines: - XCOMM - XCOMM OPTIMIZER = -O2 -Olimit 1500 - XCOMM EXTRA_LDOPTIONS = - PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive XCOMM CDEBUGFLAGS= -g -Wall --- 42,45 ---- *************** *** 71,85 **** MOREDEFINES = ! XCOMM Things to try to add to the DEFINES line above: ! XCOMM ! XCOMM RS6000: -D_BSD ! XCOMM Solaris: ! XCOMM Irix: ! XCOMM SunOS: ! XCOMM HP-UX: -D_NO_LOCALE_SUPPORT ! XCOMM VMS: -D_NO_GETTIMEOFDAY ! XCOMM Linux: ! XCOMM FreeBSD: ! XCOMM SCO: -DPRINT_CMD=\""lp -o raw -o nobanner"\" DEPLIBS = $(DEPXLIB) --- 59,65 ---- MOREDEFINES = ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ! XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DEPLIBS = $(DEPXLIB) *************** *** 88,220 **** XCOMM SYS_LIBRARIES = -ldl -lm SYS_LIBRARIES = -lm - - XCOMM -D_NO_XCIN - XCOMM Include the above line if you do not want to include the code - XCOMM that handles xcin. Please also remove "cli_xcin.o" from - XCOMM OBJ1 in Imakefile. - XCOMM -D_NO_CHINPUT - XCOMM Include the above line if you do not want to include the code - XCOMM that handles chinput. Please also remove "chinput.o" from - XCOMM OBJ1 in Imakefile. - XCOMM -D_NO_KINPUT - XCOMM Include the above line if you do not want to include the code - XCOMM that handles kinput. Please also remove "convkinput.o" from - XCOMM OBJ1 in Imakefile. - XCOMM -D_NO_XIM - XCOMM Include the above line if you do not want to include the code - XCOMM that handles X Input Method. Please also remove "convxim.o" from - XCOMM OBJ1 in Imakefile. - XCOMM -D_NO_NKF - XCOMM Include the above line if you do not want to include the code - XCOMM that handles Network Kanji Filter (NKF). Please also remove - XCOMM "nkf.o" from OBJ1 in Imakefile. - XCOMM -D_NO_DL_SUPPORT - XCOMM Include the above line if you don't have . If you define - XCOMM _NO_DL_SUPPORT, please use the SYS_LIBRARIES that does not contain - XCOMM -ldl above. - XCOMM -D_NO_LOCALE_SUPPORT - XCOMM Include the above line if you don't have . - XCOMM -D_METRIC_PIX_PER_INCH - XCOMM Include the above line if you want to use 127 pixels per inch - XCOMM when printing in the metric system. If this line is not - XCOMM included, 128 pixels per inch is used. - XCOMM -D_NO_GETTIMEOFDAY - XCOMM Include the above line if you do not have the gettimeofday() - XCOMM function but have the ftime() function. - XCOMM -D_TANGRAM_II - XCOMM Include the above line if you want to include the Tangram-II features - XCOMM by Carlos Fisch de Brito, Luiz Rogerio Goncalves de Carvalho, and - XCOMM Denise Jorge de Oliveira of the - XCOMM Tangram-II team of the Universidade Federal do Rio de Janeiro. These - XCOMM features are under development and highly experimental. - XCOMM -D_TGIF_WB - XCOMM Include the above line if you want to include the whiteboard feature - XCOMM by Renato Santana . This feature is under - XCOMM development and highly experimental. - XCOMM -DBSD_COMP - XCOMM Include the above line if you are compiling on a Solaris (or - XCOMM possibly an SGI) machine which requires it in . - XCOMM (If you see the error that FIONBIO is not defined when compiling - XCOMM tcp.c, then you probably need this.) - XCOMM -D_BACKGROUND_DONT_FORK - XCOMM Try the above line if there are defunct tgif child processes. - XCOMM -D_NO_LSTAT - XCOMM Include the above line if lstat() is not available. In this case, - XCOMM using BrowseXBitmap and BrowseXPixmap under the File Menu may cause - XCOMM infinite loop if the directory structure is infinitely recursive. - XCOMM -D_USE_XDRAWPOINT_TO_PUT_A_POINT - XCOMM Include the above line if the grid points are not visible. This can - XCOMM be used to bypass some X server bugs (such as certain Linux X server - XCOMM using VGA16 screen) where the XDrawLine() Xlib call does not work - XCOMM properly. - XCOMM -D_NO_EXTERN (obsoleted) - XCOMM Include the above line in the DEFINES if you don't want to include - XCOMM the extern definition for functions defined in a module. For example, - XCOMM if this option is set, then file "foo.c" will not include "foo.e", - XCOMM and certain other extern definition in "foo.c" will be omitted. - XCOMM -D_NO_PROTO - XCOMM Include the above line in the DEFINES if checking for function - XCOMM prototypes is not desired. Checking for function prototypes - XCOMM are automatically enabled if you are using an ANSI or C++ compilor. - XCOMM However, not all ANSI/C++ compilors are created equal. - XCOMM -D_BSD - XCOMM Include the above line in the DEFINES if the select() function can - XCOMM does not be found for AIX systems (such as RS6000). Also, on AIX - XCOMM systems, if you see garbage file names when you try to open files, - XCOMM try this flag to make direct and dirent equivalent (in ). - XCOMM -DNO_STRSTR - XCOMM Include the above line in the DEFINES if you do not have the strstr() - XCOMM function in your system's string library. - XCOMM -DINVERT_CTM_BUG - XCOMM Include the above line in the DEFINES if you are using PostScript - XCOMM utilities which fails when trying to invert non-invertible CTM - XCOMM (e.g., muluti.ps from ftp.ucc.su.oz.au:/pub/ps_printing/multi). - XCOMM -DHP_LINE_BUG - XCOMM Include the above line in the DEFINES if two-vertices horizontal and - XCOMM verticle line segments don't draw properly on a buggy HP server. - XCOMM -DDONTFREECOLORS - XCOMM Include the above line in the DEFINES if you don't want the black and - XCOMM the white colors to be freed when tgif initializes itself. You should - XCOMM not need to do this unless you need to get around some server bugs. - XCOMM -DUSE_XAPPLRESDIR - XCOMM Include the above line in the DEFINES if $XAPPLRESDIR/Tgif is used to - XCOMM specify the resource file. If your system does not have putenv() - XCOMM (such as IBM-RT), then this won't work. - XCOMM -DXAPPLOADDIR_DEF - XCOMM If you define USE_XAPPLRESDIR, define this to a default directory - XCOMM to use in case $XAPPLRESDIR isn't set. - XCOMM -DUSE_XT_INITIALIZE - XCOMM This will cause the XToolkit to be initialized so that the X defaults - XCOMM are obtained from the Xt directories. This should only be used when - XCOMM USE_XAPPLRESDIR option is NOT used. Please remember to use the - XCOMM LOCAL_LIBRARIES with $(XTOOLLIB) $(XMULIB) above. - XCOMM -DNO_THIN_LINE - XCOMM Include the above line in the DEFINES if a line width of 0 causes - XCOMM your server to crash. This is to get around a bug in some X servers. - XCOMM -DTHIN_OVAL_AND_ARC - XCOMM Include the above line in the DEFINES if you want 0 width arcs to - XCOMM be used when the width of an arc is less than or equal to 1. - XCOMM (Sun3 server has a bug that makes drawing ovals and arcs with - XCOMM width other than 0 VERY slow). - XCOMM -DKEEP_WHEN_PRINT - XCOMM Include the above line in the DEFINES if you don't want the temp - XCOMM file to be deleted after sending the print job to the printer. - XCOMM (Some VMS systems might require this flag to be used.) - XCOMM -DPRINT_CMD=\"lpr\" - XCOMM Include the above line in the DEFINES if you want to configure tgif - XCOMM to use a default print command. - XCOMM -DNOTR4MODE - XCOMM Include the above line in the DEFINES if you are running X11R3. - XCOMM This will cause tgif NOT to use some X11R4 window manager related - XCOMM functions that's not present in R3. - XCOMM -DMAPBEFORESELECT - XCOMM Include the above line in the DEFINES to call XMapWindow() before - XCOMM calling XSelectInput(). This might be needed to get around some - XCOMM server bugs. - XCOMM -DDONT_FREE_COLORMAP - XCOMM Include the above line in the DEFINES if you don't want the colormap - XCOMM to be freed when tgif exits. - XCOMM -DA4PAPER - XCOMM Include the above line in the DEFINES if you want to print on A4 paper - XCOMM (8.25in by 11.7in or about 21cm by 29.7cm). - --- 68,69 ---- *** Tgif.tmpl-hpux.orig Sun Jan 10 20:44:42 1999 --- Tgif.tmpl-hpux Sun Jan 10 20:44:42 1999 *************** *** 0 **** --- 1,74 ---- + XCOMM + XCOMM Author: William Chia-Wei Cheng (william@cs.ucla.edu) + XCOMM + XCOMM Copyright (C) 1990-1999, William Chia-Wei Cheng. + XCOMM + XCOMM Permission limited to the use, copy, display, distribute without + XCOMM charging for a fee, and produce derivative works of "tgif" and + XCOMM its documentation for not-for-profit purpose is hereby granted by + XCOMM the Author, provided that the above copyright notice appears in + XCOMM all copies made of "tgif" and that both the copyright notice + XCOMM and this permission notice appear in supporting documentation, + XCOMM and that the name of the Author not be used in advertising or + XCOMM publicity pertaining to distribution of the software without + XCOMM specific, written prior permission. The Author makes no + XCOMM representations about the suitability of this software for any + XCOMM purpose. It is provided "as is" without express or implied + XCOMM warranty. All other rights (including, but not limited to, the + XCOMM right to sell "tgif", the right to sell or distribute derivative + XCOMM works of "tgif", the right to distribute "tgif" for a fee, and + XCOMM the right to include "tgif" or derivative works of "tgif" in a + XCOMM for-sale product) are reserved by the Author. + XCOMM + XCOMM THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + XCOMM INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + XCOMM EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR + XCOMM CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + XCOMM USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + XCOMM OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + XCOMM PERFORMANCE OF THIS SOFTWARE. + XCOMM + XCOMM @(#)$Header: /mm/src/tgif/v4/RCS/Tgif.tmpl-hpux,v 4.5 1999/01/07 20:43:27 william Exp $ + XCOMM + + #if ProjectX == 5 + #if BuildXimp + XIMPDEFINES = + #else + XIMPDEFINES = -D_NO_XIMP + #endif + #elif ProjectX > 5 + XIMPDEFINES = + #endif + + PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive + XCOMM CDEBUGFLAGS= -g -Wall + XCOMM INSTPGMFLAGS= -s + XCOMM BINDIR = /u/halfmoon/bin + XCOMM MANPATH = /u/halfmoon/man + XCOMM TGIFDIR = /u/halfmoon/lib/X11/tgif + TGIFDIR = $(LIBDIR)/tgif + DIRDEFINES = -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\ + -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\ + -DLAUNCH_ATTR=\"launch=\" -DEXEC_ATTR=\"exec=\" + EXTDEFINES = -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\ + -DXBM_FILE_EXT=\"xbm\" -DXPM_FILE_EXT=\"xpm\" \@@\ + -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\ + -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" + MISCDEFINES = -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT + MOREDEFINES = -D_NO_DL_SUPPORT -D_NO_LOCALE_SUPPORT -D_NO_RECURSIVE_EXTERN + + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + DEPLIBS = $(DEPXLIB) + LOCAL_LIBRARIES = $(XLIB) + XCOMM LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) + XCOMM SYS_LIBRARIES = -ldl -lm + SYS_LIBRARIES = -lm + + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM + XCOMM This file has been tested under (uname -s -r -m): XCOMM + XCOMM HP-UX A.09.07 9000/735 XCOMM + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM *** Tgif.tmpl-irix.orig Sun Jan 10 20:44:43 1999 --- Tgif.tmpl-irix Sun Jan 10 20:44:43 1999 *************** *** 0 **** --- 1,77 ---- + XCOMM + XCOMM Author: William Chia-Wei Cheng (william@cs.ucla.edu) + XCOMM + XCOMM Copyright (C) 1990-1999, William Chia-Wei Cheng. + XCOMM + XCOMM Permission limited to the use, copy, display, distribute without + XCOMM charging for a fee, and produce derivative works of "tgif" and + XCOMM its documentation for not-for-profit purpose is hereby granted by + XCOMM the Author, provided that the above copyright notice appears in + XCOMM all copies made of "tgif" and that both the copyright notice + XCOMM and this permission notice appear in supporting documentation, + XCOMM and that the name of the Author not be used in advertising or + XCOMM publicity pertaining to distribution of the software without + XCOMM specific, written prior permission. The Author makes no + XCOMM representations about the suitability of this software for any + XCOMM purpose. It is provided "as is" without express or implied + XCOMM warranty. All other rights (including, but not limited to, the + XCOMM right to sell "tgif", the right to sell or distribute derivative + XCOMM works of "tgif", the right to distribute "tgif" for a fee, and + XCOMM the right to include "tgif" or derivative works of "tgif" in a + XCOMM for-sale product) are reserved by the Author. + XCOMM + XCOMM THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + XCOMM INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + XCOMM EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR + XCOMM CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + XCOMM USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + XCOMM OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + XCOMM PERFORMANCE OF THIS SOFTWARE. + XCOMM + XCOMM @(#)$Header: /mm/src/tgif/v4/RCS/Tgif.tmpl-irix,v 4.1 1999/01/07 20:25:04 william Exp $ + XCOMM + + #if ProjectX == 5 + #if BuildXimp + XIMPDEFINES = + #else + XIMPDEFINES = -D_NO_XIMP + #endif + #elif ProjectX > 5 + XIMPDEFINES = + #endif + + OPTIMIZER = -O2 -Olimit 1500 + EXTRA_LDOPTIONS = + + PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive + XCOMM CDEBUGFLAGS= -g -Wall + XCOMM INSTPGMFLAGS= -s + XCOMM BINDIR = /u/halfmoon/bin + XCOMM MANPATH = /u/halfmoon/man + XCOMM TGIFDIR = /u/halfmoon/lib/X11/tgif + TGIFDIR = $(LIBDIR)/tgif + DIRDEFINES = -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\ + -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\ + -DLAUNCH_ATTR=\"launch=\" -DEXEC_ATTR=\"exec=\" + EXTDEFINES = -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\ + -DXBM_FILE_EXT=\"xbm\" -DXPM_FILE_EXT=\"xpm\" \@@\ + -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\ + -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" + MISCDEFINES = -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT + MOREDEFINES = + + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + DEPLIBS = $(DEPXLIB) + LOCAL_LIBRARIES = $(XLIB) + XCOMM LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) + XCOMM SYS_LIBRARIES = -ldl -lm + SYS_LIBRARIES = -lm + + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM + XCOMM This file has been tested under (uname -s -r): XCOMM + XCOMM IRIX 5.3 XCOMM + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM *** Tgif.tmpl-linux.orig Sun Jan 10 20:44:44 1999 --- Tgif.tmpl-linux Sun Jan 10 20:44:44 1999 *************** *** 42,57 **** #endif - XCOMM On Solaris, you probably need to uncomment the next few lines: - XCOMM - XCOMM CC = cc - XCOMM PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) - XCOMM EXTRA_LDOPTIONS = - XCOMM EXTRA_LIBRARIES = -lsocket -lnsl -lgen - XCOMM - XCOMM On IRIX, you probably need to uncomment the next few lines: - XCOMM - XCOMM OPTIMIZER = -O2 -Olimit 1500 - XCOMM EXTRA_LDOPTIONS = - PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive XCOMM CDEBUGFLAGS= -g -Wall --- 42,45 ---- *************** *** 71,85 **** MOREDEFINES = ! XCOMM Things to try to add to the DEFINES line above: ! XCOMM ! XCOMM RS6000: -D_BSD ! XCOMM Solaris: ! XCOMM Irix: ! XCOMM SunOS: ! XCOMM HP-UX: -D_NO_LOCALE_SUPPORT ! XCOMM VMS: -D_NO_GETTIMEOFDAY ! XCOMM Linux: ! XCOMM FreeBSD: ! XCOMM SCO: -DPRINT_CMD=\""lp -o raw -o nobanner"\" DEPLIBS = $(DEPXLIB) --- 59,65 ---- MOREDEFINES = ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ! XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DEPLIBS = $(DEPXLIB) *************** *** 89,220 **** XCOMM SYS_LIBRARIES = -lm ! XCOMM -D_NO_XCIN ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles xcin. Please also remove "cli_xcin.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_CHINPUT ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles chinput. Please also remove "chinput.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_KINPUT ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles kinput. Please also remove "convkinput.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_XIM ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles X Input Method. Please also remove "convxim.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_NKF ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles Network Kanji Filter (NKF). Please also remove ! XCOMM "nkf.o" from OBJ1 in Imakefile. ! XCOMM -D_NO_DL_SUPPORT ! XCOMM Include the above line if you don't have . If you define ! XCOMM _NO_DL_SUPPORT, please use the SYS_LIBRARIES that does not contain ! XCOMM -ldl above. ! XCOMM -D_NO_LOCALE_SUPPORT ! XCOMM Include the above line if you don't have . ! XCOMM -D_METRIC_PIX_PER_INCH ! XCOMM Include the above line if you want to use 127 pixels per inch ! XCOMM when printing in the metric system. If this line is not ! XCOMM included, 128 pixels per inch is used. ! XCOMM -D_NO_GETTIMEOFDAY ! XCOMM Include the above line if you do not have the gettimeofday() ! XCOMM function but have the ftime() function. ! XCOMM -D_TANGRAM_II ! XCOMM Include the above line if you want to include the Tangram-II features ! XCOMM by Carlos Fisch de Brito, Luiz Rogerio Goncalves de Carvalho, and ! XCOMM Denise Jorge de Oliveira of the ! XCOMM Tangram-II team of the Universidade Federal do Rio de Janeiro. These ! XCOMM features are under development and highly experimental. ! XCOMM -D_TGIF_WB ! XCOMM Include the above line if you want to include the whiteboard feature ! XCOMM by Renato Santana . This feature is under ! XCOMM development and highly experimental. ! XCOMM -DBSD_COMP ! XCOMM Include the above line if you are compiling on a Solaris (or ! XCOMM possibly an SGI) machine which requires it in . ! XCOMM (If you see the error that FIONBIO is not defined when compiling ! XCOMM tcp.c, then you probably need this.) ! XCOMM -D_BACKGROUND_DONT_FORK ! XCOMM Try the above line if there are defunct tgif child processes. ! XCOMM -D_NO_LSTAT ! XCOMM Include the above line if lstat() is not available. In this case, ! XCOMM using BrowseXBitmap and BrowseXPixmap under the File Menu may cause ! XCOMM infinite loop if the directory structure is infinitely recursive. ! XCOMM -D_USE_XDRAWPOINT_TO_PUT_A_POINT ! XCOMM Include the above line if the grid points are not visible. This can ! XCOMM be used to bypass some X server bugs (such as certain Linux X server ! XCOMM using VGA16 screen) where the XDrawLine() Xlib call does not work ! XCOMM properly. ! XCOMM -D_NO_EXTERN (obsoleted) ! XCOMM Include the above line in the DEFINES if you don't want to include ! XCOMM the extern definition for functions defined in a module. For example, ! XCOMM if this option is set, then file "foo.c" will not include "foo.e", ! XCOMM and certain other extern definition in "foo.c" will be omitted. ! XCOMM -D_NO_PROTO ! XCOMM Include the above line in the DEFINES if checking for function ! XCOMM prototypes is not desired. Checking for function prototypes ! XCOMM are automatically enabled if you are using an ANSI or C++ compilor. ! XCOMM However, not all ANSI/C++ compilors are created equal. ! XCOMM -D_BSD ! XCOMM Include the above line in the DEFINES if the select() function can ! XCOMM does not be found for AIX systems (such as RS6000). Also, on AIX ! XCOMM systems, if you see garbage file names when you try to open files, ! XCOMM try this flag to make direct and dirent equivalent (in ). ! XCOMM -DNO_STRSTR ! XCOMM Include the above line in the DEFINES if you do not have the strstr() ! XCOMM function in your system's string library. ! XCOMM -DINVERT_CTM_BUG ! XCOMM Include the above line in the DEFINES if you are using PostScript ! XCOMM utilities which fails when trying to invert non-invertible CTM ! XCOMM (e.g., muluti.ps from ftp.ucc.su.oz.au:/pub/ps_printing/multi). ! XCOMM -DHP_LINE_BUG ! XCOMM Include the above line in the DEFINES if two-vertices horizontal and ! XCOMM verticle line segments don't draw properly on a buggy HP server. ! XCOMM -DDONTFREECOLORS ! XCOMM Include the above line in the DEFINES if you don't want the black and ! XCOMM the white colors to be freed when tgif initializes itself. You should ! XCOMM not need to do this unless you need to get around some server bugs. ! XCOMM -DUSE_XAPPLRESDIR ! XCOMM Include the above line in the DEFINES if $XAPPLRESDIR/Tgif is used to ! XCOMM specify the resource file. If your system does not have putenv() ! XCOMM (such as IBM-RT), then this won't work. ! XCOMM -DXAPPLOADDIR_DEF ! XCOMM If you define USE_XAPPLRESDIR, define this to a default directory ! XCOMM to use in case $XAPPLRESDIR isn't set. ! XCOMM -DUSE_XT_INITIALIZE ! XCOMM This will cause the XToolkit to be initialized so that the X defaults ! XCOMM are obtained from the Xt directories. This should only be used when ! XCOMM USE_XAPPLRESDIR option is NOT used. Please remember to use the ! XCOMM LOCAL_LIBRARIES with $(XTOOLLIB) $(XMULIB) above. ! XCOMM -DNO_THIN_LINE ! XCOMM Include the above line in the DEFINES if a line width of 0 causes ! XCOMM your server to crash. This is to get around a bug in some X servers. ! XCOMM -DTHIN_OVAL_AND_ARC ! XCOMM Include the above line in the DEFINES if you want 0 width arcs to ! XCOMM be used when the width of an arc is less than or equal to 1. ! XCOMM (Sun3 server has a bug that makes drawing ovals and arcs with ! XCOMM width other than 0 VERY slow). ! XCOMM -DKEEP_WHEN_PRINT ! XCOMM Include the above line in the DEFINES if you don't want the temp ! XCOMM file to be deleted after sending the print job to the printer. ! XCOMM (Some VMS systems might require this flag to be used.) ! XCOMM -DPRINT_CMD=\"lpr\" ! XCOMM Include the above line in the DEFINES if you want to configure tgif ! XCOMM to use a default print command. ! XCOMM -DNOTR4MODE ! XCOMM Include the above line in the DEFINES if you are running X11R3. ! XCOMM This will cause tgif NOT to use some X11R4 window manager related ! XCOMM functions that's not present in R3. ! XCOMM -DMAPBEFORESELECT ! XCOMM Include the above line in the DEFINES to call XMapWindow() before ! XCOMM calling XSelectInput(). This might be needed to get around some ! XCOMM server bugs. ! XCOMM -DDONT_FREE_COLORMAP ! XCOMM Include the above line in the DEFINES if you don't want the colormap ! XCOMM to be freed when tgif exits. ! XCOMM -DA4PAPER ! XCOMM Include the above line in the DEFINES if you want to print on A4 paper ! XCOMM (8.25in by 11.7in or about 21cm by 29.7cm). ! --- 69,74 ---- XCOMM SYS_LIBRARIES = -lm ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM ! XCOMM This file has been tested under (uname -s -r): XCOMM ! XCOMM Linux 2.0.35 XCOMM ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM *** Tgif.tmpl-netbsd.orig Sun Jan 10 20:44:44 1999 --- Tgif.tmpl-netbsd Sun Jan 10 20:44:44 1999 *************** *** 0 **** --- 1,69 ---- + XCOMM + XCOMM Author: William Chia-Wei Cheng (william@cs.ucla.edu) + XCOMM + XCOMM Copyright (C) 1990-1999, William Chia-Wei Cheng. + XCOMM + XCOMM Permission limited to the use, copy, display, distribute without + XCOMM charging for a fee, and produce derivative works of "tgif" and + XCOMM its documentation for not-for-profit purpose is hereby granted by + XCOMM the Author, provided that the above copyright notice appears in + XCOMM all copies made of "tgif" and that both the copyright notice + XCOMM and this permission notice appear in supporting documentation, + XCOMM and that the name of the Author not be used in advertising or + XCOMM publicity pertaining to distribution of the software without + XCOMM specific, written prior permission. The Author makes no + XCOMM representations about the suitability of this software for any + XCOMM purpose. It is provided "as is" without express or implied + XCOMM warranty. All other rights (including, but not limited to, the + XCOMM right to sell "tgif", the right to sell or distribute derivative + XCOMM works of "tgif", the right to distribute "tgif" for a fee, and + XCOMM the right to include "tgif" or derivative works of "tgif" in a + XCOMM for-sale product) are reserved by the Author. + XCOMM + XCOMM THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + XCOMM INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + XCOMM EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR + XCOMM CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + XCOMM USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + XCOMM OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + XCOMM PERFORMANCE OF THIS SOFTWARE. + XCOMM + XCOMM @(#)$Header: /mm/src/tgif/v4/RCS/Tgif.tmpl-netbsd,v 4.2 1999/01/06 19:34:26 william Exp $ + XCOMM + + #if ProjectX == 5 + #if BuildXimp + XIMPDEFINES = + #else + XIMPDEFINES = -D_NO_XIMP + #endif + #elif ProjectX > 5 + XIMPDEFINES = + #endif + + PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive + XCOMM CDEBUGFLAGS= -g -Wall + XCOMM INSTPGMFLAGS= -s + XCOMM BINDIR = /u/halfmoon/bin + XCOMM MANPATH = /u/halfmoon/man + XCOMM TGIFDIR = /u/halfmoon/lib/X11/tgif + TGIFDIR = $(LIBDIR)/tgif + DIRDEFINES = -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\ + -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\ + -DLAUNCH_ATTR=\"launch=\" -DEXEC_ATTR=\"exec=\" + EXTDEFINES = -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\ + -DXBM_FILE_EXT=\"xbm\" -DXPM_FILE_EXT=\"xpm\" \@@\ + -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\ + -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" + MISCDEFINES = -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT + MOREDEFINES = -D_DL_EXPORT_UNDERSCORE + + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above + XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + DEPLIBS = $(DEPXLIB) + LOCAL_LIBRARIES = $(XLIB) + XCOMM LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) + XCOMM SYS_LIBRARIES = -ldl -lm + SYS_LIBRARIES = -lm *** Tgif.tmpl-solaris.orig Sun Jan 10 20:44:45 1999 --- Tgif.tmpl-solaris Sun Jan 10 20:44:46 1999 *************** *** 42,47 **** #endif - XCOMM On Solaris, you probably need to uncomment the next few lines: - XCOMM CC = cc PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) --- 42,45 ---- *************** *** 48,56 **** EXTRA_LDOPTIONS = EXTRA_LIBRARIES = -lsocket -lnsl -lgen - XCOMM - XCOMM On IRIX, you probably need to uncomment the next few lines: - XCOMM - XCOMM OPTIMIZER = -O2 -Olimit 1500 - XCOMM EXTRA_LDOPTIONS = PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive --- 46,49 ---- *************** *** 71,85 **** MOREDEFINES = ! XCOMM Things to try to add to the DEFINES line above: ! XCOMM ! XCOMM RS6000: -D_BSD ! XCOMM Solaris: ! XCOMM Irix: ! XCOMM SunOS: ! XCOMM HP-UX: -D_NO_LOCALE_SUPPORT ! XCOMM VMS: -D_NO_GETTIMEOFDAY ! XCOMM Linux: ! XCOMM FreeBSD: ! XCOMM SCO: -DPRINT_CMD=\""lp -o raw -o nobanner"\" DEPLIBS = $(DEPXLIB) --- 64,70 ---- MOREDEFINES = ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ! XCOMM Please see Imakefile for more defines to be added to MOREDEFINES above ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DEPLIBS = $(DEPXLIB) *************** *** 89,220 **** XCOMM SYS_LIBRARIES = -lm ! XCOMM -D_NO_XCIN ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles xcin. Please also remove "cli_xcin.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_CHINPUT ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles chinput. Please also remove "chinput.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_KINPUT ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles kinput. Please also remove "convkinput.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_XIM ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles X Input Method. Please also remove "convxim.o" from ! XCOMM OBJ1 in Imakefile. ! XCOMM -D_NO_NKF ! XCOMM Include the above line if you do not want to include the code ! XCOMM that handles Network Kanji Filter (NKF). Please also remove ! XCOMM "nkf.o" from OBJ1 in Imakefile. ! XCOMM -D_NO_DL_SUPPORT ! XCOMM Include the above line if you don't have . If you define ! XCOMM _NO_DL_SUPPORT, please use the SYS_LIBRARIES that does not contain ! XCOMM -ldl above. ! XCOMM -D_NO_LOCALE_SUPPORT ! XCOMM Include the above line if you don't have . ! XCOMM -D_METRIC_PIX_PER_INCH ! XCOMM Include the above line if you want to use 127 pixels per inch ! XCOMM when printing in the metric system. If this line is not ! XCOMM included, 128 pixels per inch is used. ! XCOMM -D_NO_GETTIMEOFDAY ! XCOMM Include the above line if you do not have the gettimeofday() ! XCOMM function but have the ftime() function. ! XCOMM -D_TANGRAM_II ! XCOMM Include the above line if you want to include the Tangram-II features ! XCOMM by Carlos Fisch de Brito, Luiz Rogerio Goncalves de Carvalho, and ! XCOMM Denise Jorge de Oliveira of the ! XCOMM Tangram-II team of the Universidade Federal do Rio de Janeiro. These ! XCOMM features are under development and highly experimental. ! XCOMM -D_TGIF_WB ! XCOMM Include the above line if you want to include the whiteboard feature ! XCOMM by Renato Santana . This feature is under ! XCOMM development and highly experimental. ! XCOMM -DBSD_COMP ! XCOMM Include the above line if you are compiling on a Solaris (or ! XCOMM possibly an SGI) machine which requires it in . ! XCOMM (If you see the error that FIONBIO is not defined when compiling ! XCOMM tcp.c, then you probably need this.) ! XCOMM -D_BACKGROUND_DONT_FORK ! XCOMM Try the above line if there are defunct tgif child processes. ! XCOMM -D_NO_LSTAT ! XCOMM Include the above line if lstat() is not available. In this case, ! XCOMM using BrowseXBitmap and BrowseXPixmap under the File Menu may cause ! XCOMM infinite loop if the directory structure is infinitely recursive. ! XCOMM -D_USE_XDRAWPOINT_TO_PUT_A_POINT ! XCOMM Include the above line if the grid points are not visible. This can ! XCOMM be used to bypass some X server bugs (such as certain Linux X server ! XCOMM using VGA16 screen) where the XDrawLine() Xlib call does not work ! XCOMM properly. ! XCOMM -D_NO_EXTERN (obsoleted) ! XCOMM Include the above line in the DEFINES if you don't want to include ! XCOMM the extern definition for functions defined in a module. For example, ! XCOMM if this option is set, then file "foo.c" will not include "foo.e", ! XCOMM and certain other extern definition in "foo.c" will be omitted. ! XCOMM -D_NO_PROTO ! XCOMM Include the above line in the DEFINES if checking for function ! XCOMM prototypes is not desired. Checking for function prototypes ! XCOMM are automatically enabled if you are using an ANSI or C++ compilor. ! XCOMM However, not all ANSI/C++ compilors are created equal. ! XCOMM -D_BSD ! XCOMM Include the above line in the DEFINES if the select() function can ! XCOMM does not be found for AIX systems (such as RS6000). Also, on AIX ! XCOMM systems, if you see garbage file names when you try to open files, ! XCOMM try this flag to make direct and dirent equivalent (in ). ! XCOMM -DNO_STRSTR ! XCOMM Include the above line in the DEFINES if you do not have the strstr() ! XCOMM function in your system's string library. ! XCOMM -DINVERT_CTM_BUG ! XCOMM Include the above line in the DEFINES if you are using PostScript ! XCOMM utilities which fails when trying to invert non-invertible CTM ! XCOMM (e.g., muluti.ps from ftp.ucc.su.oz.au:/pub/ps_printing/multi). ! XCOMM -DHP_LINE_BUG ! XCOMM Include the above line in the DEFINES if two-vertices horizontal and ! XCOMM verticle line segments don't draw properly on a buggy HP server. ! XCOMM -DDONTFREECOLORS ! XCOMM Include the above line in the DEFINES if you don't want the black and ! XCOMM the white colors to be freed when tgif initializes itself. You should ! XCOMM not need to do this unless you need to get around some server bugs. ! XCOMM -DUSE_XAPPLRESDIR ! XCOMM Include the above line in the DEFINES if $XAPPLRESDIR/Tgif is used to ! XCOMM specify the resource file. If your system does not have putenv() ! XCOMM (such as IBM-RT), then this won't work. ! XCOMM -DXAPPLOADDIR_DEF ! XCOMM If you define USE_XAPPLRESDIR, define this to a default directory ! XCOMM to use in case $XAPPLRESDIR isn't set. ! XCOMM -DUSE_XT_INITIALIZE ! XCOMM This will cause the XToolkit to be initialized so that the X defaults ! XCOMM are obtained from the Xt directories. This should only be used when ! XCOMM USE_XAPPLRESDIR option is NOT used. Please remember to use the ! XCOMM LOCAL_LIBRARIES with $(XTOOLLIB) $(XMULIB) above. ! XCOMM -DNO_THIN_LINE ! XCOMM Include the above line in the DEFINES if a line width of 0 causes ! XCOMM your server to crash. This is to get around a bug in some X servers. ! XCOMM -DTHIN_OVAL_AND_ARC ! XCOMM Include the above line in the DEFINES if you want 0 width arcs to ! XCOMM be used when the width of an arc is less than or equal to 1. ! XCOMM (Sun3 server has a bug that makes drawing ovals and arcs with ! XCOMM width other than 0 VERY slow). ! XCOMM -DKEEP_WHEN_PRINT ! XCOMM Include the above line in the DEFINES if you don't want the temp ! XCOMM file to be deleted after sending the print job to the printer. ! XCOMM (Some VMS systems might require this flag to be used.) ! XCOMM -DPRINT_CMD=\"lpr\" ! XCOMM Include the above line in the DEFINES if you want to configure tgif ! XCOMM to use a default print command. ! XCOMM -DNOTR4MODE ! XCOMM Include the above line in the DEFINES if you are running X11R3. ! XCOMM This will cause tgif NOT to use some X11R4 window manager related ! XCOMM functions that's not present in R3. ! XCOMM -DMAPBEFORESELECT ! XCOMM Include the above line in the DEFINES to call XMapWindow() before ! XCOMM calling XSelectInput(). This might be needed to get around some ! XCOMM server bugs. ! XCOMM -DDONT_FREE_COLORMAP ! XCOMM Include the above line in the DEFINES if you don't want the colormap ! XCOMM to be freed when tgif exits. ! XCOMM -DA4PAPER ! XCOMM Include the above line in the DEFINES if you want to print on A4 paper ! XCOMM (8.25in by 11.7in or about 21cm by 29.7cm). ! --- 74,79 ---- XCOMM SYS_LIBRARIES = -lm ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM ! XCOMM This file has been tested under (uname -s -r): XCOMM ! XCOMM SunOS 5.5 XCOMM ! XCOMM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ XCOMM