*** button.c.orig Mon May 24 15:20:19 1999 --- button.c Mon May 24 15:20:19 1999 *************** *** 50,56 **** #include "setup.e" ! int ButtonWidth(Str, Len) char *Str; ! int Len; { int len=strlen(Str); --- 50,56 ---- #include "setup.e" ! int ButtonWidth(Str, MinLen) char *Str; ! int MinLen; { int len=strlen(Str); *************** *** 57,61 **** if (boldMsgFontPtr == NULL) { ! return (defaultFontWidth * max(len+2, Len)); } else { return 4+XTextWidth(boldMsgFontPtr, " CANCEL ", 10); --- 57,70 ---- if (boldMsgFontPtr == NULL) { ! return (defaultFontWidth * max(len+2, MinLen)); ! } else if (len > MinLen-2) { ! char buf[40]; ! int len1=0, len2=0; ! ! sprintf(buf, " %s ", Str); ! len1 = 4+XTextWidth(boldMsgFontPtr, buf, len+4); ! len2 = 4+XTextWidth(boldMsgFontPtr, " CANCEL ", 10); ! ! return max(len1,len2); } else { return 4+XTextWidth(boldMsgFontPtr, " CANCEL ", 10); *** choose.c.orig Mon May 24 15:20:20 1999 --- choose.c Mon May 24 15:20:20 1999 *************** *** 68,72 **** int num_btns; struct BBRec btn_bbox[MAXBUTTONS], path_bbox; ! char btn_str[MAXBUTTONS][8]; int btn_id[MAXBUTTONS]; --- 68,72 ---- int num_btns; struct BBRec btn_bbox[MAXBUTTONS], path_bbox; ! char btn_str[MAXBUTTONS][40]; int btn_id[MAXBUTTONS]; *************** *** 289,293 **** pni->first_index = INVALID; pni->marked_index = INVALID; ! pni->a_btn_w = ButtonWidth("OK",8); pni->btn_gap = defaultFontWidth; pni->screen_w = DisplayWidth(mainDisplay, mainScreen); --- 289,293 ---- pni->first_index = INVALID; pni->marked_index = INVALID; ! pni->a_btn_w = ButtonWidth("OK", 8); pni->btn_gap = defaultFontWidth; pni->screen_w = DisplayWidth(mainDisplay, mainScreen); *************** *** 356,360 **** pni->btn_id[pni->num_btns] = btn_id; strcpy(pni->btn_str[pni->num_btns], btn_str); ! pni->btn_w += pni->a_btn_w; if (pni->num_btns != 0) { pni->btn_w += pni->btn_gap; --- 356,360 ---- pni->btn_id[pni->num_btns] = btn_id; strcpy(pni->btn_str[pni->num_btns], btn_str); ! pni->btn_w += ButtonWidth(btn_str, 8); if (pni->num_btns != 0) { pni->btn_w += pni->btn_gap; *************** *** 1406,1410 **** if (ev.type == Expose || ev.type == VisibilityNotify) { ! ExposeEventHandler (&ev, TRUE); } else if (ev.type == ButtonRelease) { XUngrabPointer(mainDisplay, CurrentTime); --- 1406,1410 ---- if (ev.type == Expose || ev.type == VisibilityNotify) { ! ExposeEventHandler(&ev, TRUE); } else if (ev.type == ButtonRelease) { XUngrabPointer(mainDisplay, CurrentTime); *** dialog.c.orig Mon May 24 15:20:22 1999 --- dialog.c Mon May 24 15:20:22 1999 *************** *** 423,427 **** int i=0, max_h=0, left=0, inc=0, a_btn_w=0, a_btn_h=0, y=0, max_w=0;; ! CalcFormatStringInBox(Message, boldMsgFontPtr, MBInfoPtr->max_msg_str_total, NULL, &max_w, &max_h, &MBInfoPtr->msg_copy); --- 423,427 ---- int i=0, max_h=0, left=0, inc=0, a_btn_w=0, a_btn_h=0, y=0, max_w=0;; ! CalcFormatStringInBox(Message, defaultFontPtr, MBInfoPtr->max_msg_str_total, NULL, &max_w, &max_h, &MBInfoPtr->msg_copy); *** edit.c.orig Mon May 24 15:20:26 1999 --- edit.c Mon May 24 15:20:26 1999 *************** *** 1197,1201 **** if (input.type == Expose || input.type == VisibilityNotify) { ! ExposeEventHandler (&input, TRUE); } else if (input.type == MotionNotify || input.type == KeyPress || input.type == KeyRelease) { --- 1197,1201 ---- if (input.type == Expose || input.type == VisibilityNotify) { ! ExposeEventHandler(&input, TRUE); } else if (input.type == MotionNotify || input.type == KeyPress || input.type == KeyRelease) { *** file.c.orig Mon May 24 15:20:29 1999 --- file.c Mon May 24 15:20:29 1999 *************** *** 1326,1332 **** } if (*gzipped_fname == '\0') { ! SetCurDir(new_full_name, TRUE); } else { ! SetCurDir(gzipped_fname, TRUE); } curFileDefined = TRUE; --- 1326,1332 ---- } if (*gzipped_fname == '\0') { ! SetCurDir(new_full_name); } else { ! SetCurDir(gzipped_fname); } curFileDefined = TRUE; *************** *** 1577,1581 **** strcpy(saved_sym_dir, curSymDir); saved_cur_file_defined = curFileDefined; ! SetCurDir(new_full_name, TRUE); curFileDefined = TRUE; --- 1577,1581 ---- strcpy(saved_sym_dir, curSymDir); saved_cur_file_defined = curFileDefined; ! SetCurDir(new_full_name); curFileDefined = TRUE; *************** *** 3567,3571 **** if (!importFromLibrary && !file_is_remote) { ! SetCurDir(file_name, FALSE); } if (file_is_remote) { --- 3567,3571 ---- if (!importFromLibrary && !file_is_remote) { ! SetCurImportDir(file_name); } if (file_is_remote) { *************** *** 3998,4004 **** if (ObjFile == TRUE) { if (*gzipped_fname == '\0') { ! SetCurDir(file_name, TRUE); } else { ! SetCurDir(gzipped_fname, TRUE); } *curSymDir = '\0'; --- 3998,4004 ---- if (ObjFile == TRUE) { if (*gzipped_fname == '\0') { ! SetCurDir(file_name); } else { ! SetCurDir(gzipped_fname); } *curSymDir = '\0'; *************** *** 5073,5077 **** len -= 3; } ! if ((psz=strrchr(ps_file, '.')) == NULL) { TgAssert(FALSE, "Cannot find '.' in curFileName in SetOutputFileName()", NULL); --- 5073,5077 ---- len -= 3; } ! if ((psz=UtilStrRChr(ps_file, '.')) == NULL) { TgAssert(FALSE, "Cannot find '.' in curFileName in SetOutputFileName()", NULL); *************** *** 5268,5272 **** if (FileNameHasExtension(tmp_str, OBJ_FILE_TYPE, &gzipped, NULL) && gzipped) { ! char *psz=strrchr(tmp_str, '.'); if (psz != NULL) *psz = '\0'; --- 5268,5272 ---- if (FileNameHasExtension(tmp_str, OBJ_FILE_TYPE, &gzipped, NULL) && gzipped) { ! char *psz=UtilStrRChr(tmp_str, '.'); if (psz != NULL) *psz = '\0'; *** grid.c.orig Mon May 24 15:20:33 1999 --- grid.c Mon May 24 15:20:33 1999 *************** *** 191,195 **** int i, inc=0, abs_inc=0, step=ENGLISH_GRID_STEP; int x_start, y_start, x_end, y_end, x_grid_start, y_grid_start; ! int x_grid_end=0, y_grid_end=0, rbx=0, rby=0, x_max=0, y_max=0; if (!gridShown || (inSlideShow && !visibleGridInSlideShow)) return; --- 191,195 ---- int i, inc=0, abs_inc=0, step=ENGLISH_GRID_STEP; int x_start, y_start, x_end, y_end, x_grid_start, y_grid_start; ! int x_grid_end=0, y_grid_end=0, x_max=0, y_max=0; if (!gridShown || (inSlideShow && !visibleGridInSlideShow)) return; *** import.c.orig Mon May 24 15:20:35 1999 --- import.c Mon May 24 15:20:35 1999 *************** *** 432,436 **** justDupped = FALSE; ! if (!importFromLibrary && !remote_file) SetCurDir(xbm_fname, FALSE); sprintf(gszMsgBox, "XBitmap file (%1dx%1d) '%s' imported.", orig_w, orig_h, --- 432,436 ---- justDupped = FALSE; ! if (!importFromLibrary && !remote_file) SetCurImportDir(xbm_fname); sprintf(gszMsgBox, "XBitmap file (%1dx%1d) '%s' imported.", orig_w, orig_h, *************** *** 482,486 **** XSync(mainDisplay, False); if (XCheckMaskEvent(mainDisplay, ExposureMask, &ev)) { ! ExposeEventHandler (&ev, TRUE); } SetWatchCursor(drawWindow); --- 482,486 ---- XSync(mainDisplay, False); if (XCheckMaskEvent(mainDisplay, ExposureMask, &ev)) { ! ExposeEventHandler(&ev, TRUE); } SetWatchCursor(drawWindow); *************** *** 522,526 **** RedrawColorWindow(); } ! if (!importFromLibrary && !remote_file) SetCurDir(xpm_fname, FALSE); sprintf(gszMsgBox, "XPixmap file (%1dx%1d) '%s' imported.", image_w, image_h, --- 522,526 ---- RedrawColorWindow(); } ! if (!importFromLibrary && !remote_file) SetCurImportDir(xpm_fname); sprintf(gszMsgBox, "XPixmap file (%1dx%1d) '%s' imported.", image_w, image_h, *************** *** 583,587 **** XSync(mainDisplay, False); if (XCheckMaskEvent(mainDisplay, ExposureMask, &ev)) { ! ExposeEventHandler (&ev, TRUE); } SetWatchCursor(drawWindow); --- 583,587 ---- XSync(mainDisplay, False); if (XCheckMaskEvent(mainDisplay, ExposureMask, &ev)) { ! ExposeEventHandler(&ev, TRUE); } SetWatchCursor(drawWindow); *************** *** 635,639 **** justDupped = FALSE; ! if (!importFromLibrary && !remote_file) SetCurDir(eps_fname, FALSE); sprintf(gszMsgBox, "EPS file '%s' imported.", short_name ? rest : eps_fname); --- 635,639 ---- justDupped = FALSE; ! if (!importFromLibrary && !remote_file) SetCurImportDir(eps_fname); sprintf(gszMsgBox, "EPS file '%s' imported.", short_name ? rest : eps_fname); *************** *** 841,845 **** RedrawColorWindow(); } ! if (!importFromLibrary && !remote_file) SetCurDir(szGifPath, FALSE); if (short_name) { --- 841,845 ---- RedrawColorWindow(); } ! if (!importFromLibrary && !remote_file) SetCurImportDir(szGifPath); if (short_name) { *************** *** 1093,1097 **** SetFileModified(TRUE); justDupped = FALSE; ! if (!importFromLibrary && !remote_file) SetCurDir(szOtherPath, FALSE); sprintf(gszMsgBox, "%s file (%1dx%1d) '%s' imported.", pii->name, --- 1093,1097 ---- SetFileModified(TRUE); justDupped = FALSE; ! if (!importFromLibrary && !remote_file) SetCurImportDir(szOtherPath); sprintf(gszMsgBox, "%s file (%1dx%1d) '%s' imported.", pii->name, *************** *** 1420,1424 **** SetFileModified(TRUE); HighLightForward(); ! if (!importFromLibrary && !remote_file) SetCurDir(gif_fname, FALSE); if (colorLayers && needToRedrawColorWindow) { RedrawColorWindow(); --- 1420,1424 ---- SetFileModified(TRUE); HighLightForward(); ! if (!importFromLibrary && !remote_file) SetCurImportDir(gif_fname); if (colorLayers && needToRedrawColorWindow) { RedrawColorWindow(); *** mainloop.c.orig Mon May 24 15:20:37 1999 --- mainloop.c Mon May 24 15:20:37 1999 *************** *** 896,900 **** } if (obj_file) { ! SetCurDir(full_name, TRUE); *curSymDir = '\0'; } else { --- 896,900 ---- } if (obj_file) { ! SetCurDir(full_name); *curSymDir = '\0'; } else { *************** *** 972,976 **** curFileDefined = TRUE; if (file_is_remote) { ! SetCurDir(remote_fname, TRUE); if (!foundGoodStateObject) PasteString(remote_buf); } else { --- 972,976 ---- curFileDefined = TRUE; if (file_is_remote) { ! SetCurDir(remote_fname); if (!foundGoodStateObject) PasteString(remote_buf); } else { *************** *** 990,994 **** } if (obj_file) { ! SetCurDir(full_name, TRUE); *curSymDir = '\0'; } else { --- 990,994 ---- } if (obj_file) { ! SetCurDir(full_name); *curSymDir = '\0'; } else { *** menu.c.orig Mon May 24 15:20:39 1999 --- menu.c Mon May 24 15:20:39 1999 *************** *** 2364,2367 **** --- 2364,2368 ---- XClearWindow(mainDisplay, menubarWindow); + XSetForeground(mainDisplay, textMenuGC, myFgPixel); if (menuFontSet != NULL || menuFontPtr != NULL) { x = menuFontWidth; *************** *** 2371,2377 **** y += padding; - if (menuFontPtr != NULL) { - XSetFont(mainDisplay, defaultGC, menuFontPtr->fid); - } for (i=0; i < gnNumMenubarItems; i++) { len = strlen(_(gpMenubarItemInfos[i].menu_str)); --- 2372,2375 ---- *************** *** 2381,2391 **** y += menuFontHeight+padding; } ! MyDrawMenuString(mainDisplay, menubarWindow, defaultGC, x+padding, y+padding, _(gpMenubarItemInfos[i].menu_str), len); x += w+gap+padding; } - if (menuFontPtr != NULL) { - XSetFont(mainDisplay, defaultGC, defaultFontPtr->fid); - } } else { x = 2; --- 2379,2386 ---- y += menuFontHeight+padding; } ! MyDrawMenuString(mainDisplay, menubarWindow, textMenuGC, x+padding, y+padding, _(gpMenubarItemInfos[i].menu_str), len); x += w+gap+padding; } } else { x = 2; *************** *** 2402,2406 **** y += initialMenubarWindowH+padding; } ! MyDrawMenuString(mainDisplay, menubarWindow, defaultGC, x+padding, y+padding, _(gpMenubarItemInfos[i].menu_str), len); x += w+gap+padding; --- 2397,2401 ---- y += initialMenubarWindowH+padding; } ! MyDrawMenuString(mainDisplay, menubarWindow, textMenuGC, x+padding, y+padding, _(gpMenubarItemInfos[i].menu_str), len); x += w+gap+padding; *** names.c.orig Mon May 24 15:20:44 1999 --- names.c Mon May 24 15:20:44 1999 *************** *** 74,77 **** --- 74,79 ---- int ignoreDirectoryFlag=FALSE; + static char curImportDir[MAXPATHLENGTH+1]; + static DspList *symbolList=NULL; static int numSymbols=0; *************** *** 582,585 **** --- 584,588 ---- strcpy(curDir, bootDir); strcpy(curLocalDir, bootDir); + strcpy(curImportDir, bootDir); if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "DoubleClickInterval")) != *************** *** 773,776 **** --- 776,783 ---- return TRUE; } else { + char status_buf[MAX_STATUS_BTNS+1][MAXSTRING+1]; + int one_line_status=FALSE; + + SaveStatusStringsIntoBuf(status_buf, &one_line_status); sprintf(gszMsgBox, "Getting directory listing of '%s', please wait ...", cur_buf); *************** *** 777,785 **** SetStringStatus(gszMsgBox); XSync(mainDisplay, False); if ((topOfDirLinkList=DirListing(cur_buf, p_dninfo->ext_str, p_dninfo->other_ext_str)) == NULL) { ! RestoreStatusStrings(); return FALSE; } *pn_num_entries = numDirEntries; if (topOfDirLinkList == NULL) { --- 784,794 ---- SetStringStatus(gszMsgBox); XSync(mainDisplay, False); + if ((topOfDirLinkList=DirListing(cur_buf, p_dninfo->ext_str, p_dninfo->other_ext_str)) == NULL) { ! RestoreStatusStringsFromBuf(status_buf, one_line_status); return FALSE; } + RestoreStatusStringsFromBuf(status_buf, one_line_status); *pn_num_entries = numDirEntries; if (topOfDirLinkList == NULL) { *************** *** 878,882 **** NamesSetTitle(TopStr); NamesAddButton("Ok", BUTTON_OK); ! NamesAddButton("SetDir", BUTTON_SETDIR); NamesAddButton("Cancel", BUTTON_CANCEL); NamesSetEntries(NULL, NULL, 0, NULL, TRUE, INVALID, 0); --- 887,893 ---- NamesSetTitle(TopStr); NamesAddButton("Ok", BUTTON_OK); ! if (!(importingFile || (curFileDefined && curDirIsLocal))) { ! NamesAddButton("SetWorkingDir", BUTTON_SETDIR); ! } NamesAddButton("Cancel", BUTTON_CANCEL); NamesSetEntries(NULL, NULL, 0, NULL, TRUE, INVALID, 0); *************** *** 884,888 **** NamesSetCallback((GetEntriesFunc*)GetNamesEntries, (AfterLoopFunc*)NamesAfterLoop, NULL); ! if (curDirIsLocal) { NamesSetDir(curDir); } else { --- 895,901 ---- NamesSetCallback((GetEntriesFunc*)GetNamesEntries, (AfterLoopFunc*)NamesAfterLoop, NULL); ! if (importingFile) { ! NamesSetDir(curImportDir); ! } else if (curDirIsLocal) { NamesSetDir(curDir); } else { *************** *** 889,896 **** NamesSetDir(curLocalDir); } ! if (importingFile) { ! Msg("Click on 'SETDIR' to set Import directory."); ! } else { ! Msg("Click on 'SETDIR' to set Open/SaveAs directory."); } *selected_str = '\0'; --- 902,907 ---- NamesSetDir(curLocalDir); } ! if (!(importingFile || (curFileDefined && curDirIsLocal))) { ! Msg("Click on the 'SetWorkingDir' button to set Open/SaveAs directory."); } *selected_str = '\0'; *************** *** 911,915 **** *SelStr = '\0'; *JustSetDir = FALSE; ! sprintf(gszMsgBox, "SETDIR not supported for '%s'.", selected_str); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); } else { --- 922,927 ---- *SelStr = '\0'; *JustSetDir = FALSE; ! sprintf(gszMsgBox, "SetWorkingDir not supported for '%s'.", ! selected_str); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); } else { *************** *** 983,988 **** } RedrawTitleWindow(); ! sprintf(gszMsgBox, "%s '%s'.", ! "Current open/save/import directory change to", curDir); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); Msg(""); --- 995,1001 ---- } RedrawTitleWindow(); ! sprintf(gszMsgBox, "%s '%s'.\n\n(%s '%s'.)", ! "Current open/save directory change to", curDir, ! "Current import directory remains", curImportDir); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); Msg(""); *************** *** 1028,1033 **** } RedrawTitleWindow(); ! sprintf(gszMsgBox, "%s '%s'.", ! "Current open/save/import directory change to", curDir); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); Msg(""); --- 1041,1047 ---- } RedrawTitleWindow(); ! sprintf(gszMsgBox, "%s '%s'.\n\n(%s '%s'.)", ! "Current open/save directory change to", curDir, ! "Current import directory remains", curImportDir); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); Msg(""); *************** *** 1057,1067 **** if ((index=DirNames(MsgStr, ExtStr, SelStr, &just_set_dir)) == INVALID) { if (just_set_dir) { ! if (curDirIsLocal) { ! strcpy(curDir, SelStr); ! } else { ! strcpy(curLocalDir, SelStr); ! } ! sprintf(gszMsgBox, "%s '%s'.", ! "Current open/save/import directory change to", curDir); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); } --- 1071,1082 ---- if ((index=DirNames(MsgStr, ExtStr, SelStr, &just_set_dir)) == INVALID) { if (just_set_dir) { ! /* This should not happen since SetDir is removed during importing. */ ! strcpy(curImportDir, SelStr); ! sprintf(gszMsgBox, "Importing directory changed to %s.", ! curImportDir); ! Msg(gszMsgBox); ! sprintf(gszMsgBox, "%s '%s'.\n\n(%s '%s'.)", ! "Current importing directory changed to", curImportDir, ! "Current open/save directory remains", curDir); MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); } *************** *** 1506,1515 **** } ! void SetCurDir(FileName, ChangeFileName) char *FileName; - int ChangeFileName; { ! int i; ! char file_name[MAXPATHLENGTH+1]; strcpy(file_name, FileName); --- 1521,1528 ---- } ! void SetCurDir(FileName) char *FileName; { ! char file_name[MAXPATHLENGTH+1], *psz=NULL; strcpy(file_name, FileName); *************** *** 1525,1538 **** *curLocalDir = '\0'; } ! for (i=strlen(file_name)-1; i>=0 && file_name[i]!=DIR_SEP; i--) ; ! ! if (i < 0) { ! TwoLineMsg("Error: No directory-separator found in SetCurDir().", ! " curDir set to '.'."); ! strcpy(curDir, "."); ! if (ChangeFileName) strcpy(curFileName, FileName); } else { ! if (ChangeFileName) strcpy(curFileName, &file_name[i+1]); ! file_name[i] = '\0'; strcpy(curDir, file_name); } --- 1538,1551 ---- *curLocalDir = '\0'; } ! if ((psz=UtilStrRChr(file_name, DIR_SEP)) == NULL) { ! sprintf(gszMsgBox, "Error: %s.\n\n%s '%s'.", ! "No directory-separator found in SetCurDir()", ! "Current working directory set to", bootDir); ! MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); ! strcpy(curDir, bootDir); ! strcpy(curFileName, FileName); } else { ! *psz++ = '\0'; ! strcpy(curFileName, psz); strcpy(curDir, file_name); } *************** *** 1544,1549 **** char *FileName; { ! int i; ! char file_name[MAXPATHLENGTH+1]; strcpy(file_name, FileName); --- 1557,1561 ---- char *FileName; { ! char file_name[MAXPATHLENGTH+1], *psz=NULL; strcpy(file_name, FileName); *************** *** 1550,1564 **** UtilShrinkName(file_name); ! for (i = strlen(file_name)-1; i>=0 && file_name[i]!=DIR_SEP; i--) ; ! ! if (i < 0) { ! TwoLineMsg("Error: No directory-separator found in SetCurSymDir().", ! " curSymDir set to '.'."); ! strcpy(curSymDir, "."); strcpy(curFileName, FileName); } else { ! strcpy(curFileName, &file_name[i+1]); ! file_name[i] = '\0'; strcpy(curSymDir, file_name); } } --- 1562,1596 ---- UtilShrinkName(file_name); ! if ((psz=UtilStrRChr(file_name, DIR_SEP)) == NULL) { ! sprintf(gszMsgBox, "Error: %s.\n\n%s '%s'.", ! "No directory-separator found in SetCurSymDir()", ! "Current symbol directory set to", bootDir); ! MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); ! strcpy(curSymDir, bootDir); strcpy(curFileName, FileName); } else { ! *psz++ = '\0'; ! strcpy(curFileName, psz); strcpy(curSymDir, file_name); } } + + void SetCurImportDir(FileName) + char *FileName; + { + char file_name[MAXPATHLENGTH+1], *psz=NULL; + + strcpy(file_name, FileName); + UtilShrinkName(file_name); + + if ((psz=UtilStrRChr(file_name, DIR_SEP)) == NULL) { + sprintf(gszMsgBox, "Error: %s.\n\n%s '%s'.", + "No directory-separator found in SetCurImportDir()", + "Current import directory set to", bootDir); + MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); + strcpy(curImportDir, bootDir); + } else { + *psz = '\0'; + strcpy(curImportDir, file_name); + } + } *** remote.c.orig Mon May 24 15:20:45 1999 --- remote.c Mon May 24 15:20:45 1999 *************** *** 2019,2023 **** PasteString(psz_buf); } ! SetCurDir(psz_url, TRUE); curFileDefined = TRUE; RedrawTitleWindow(); --- 2019,2023 ---- PasteString(psz_buf); } ! SetCurDir(psz_url); curFileDefined = TRUE; RedrawTitleWindow(); *** stk.c.orig Mon May 24 15:20:49 1999 --- stk.c Mon May 24 15:20:49 1999 *************** *** 468,472 **** if (!deserializingFile) Msg(gszMsgBox); ! SetCurDir(fname, TRUE); } else { sprintf(gszMsgBox, --- 468,472 ---- if (!deserializingFile) Msg(gszMsgBox); ! SetCurDir(fname); } else { sprintf(gszMsgBox, *** tgif.c.orig Mon May 24 15:20:51 1999 --- tgif.c Mon May 24 15:20:51 1999 *************** *** 227,231 **** curFileDefined = TRUE; if (obj_file) { ! SetCurDir(file_path, TRUE); *curSymDir = '\0'; } else { --- 227,231 ---- curFileDefined = TRUE; if (obj_file) { ! SetCurDir(file_path); *curSymDir = '\0'; } else { *** names.e.orig Mon May 24 15:20:55 1999 --- names.e Mon May 24 15:20:55 1999 *************** *** 75,80 **** extern int SelectFromLibrary ARGS_DECL((char *MsgStr, char *ExtStr, char *SelStr, char *PathStr)); ! extern void SetCurDir ARGS_DECL((char *FileName, int ChangeFileName)); extern void SetCurSymDir ARGS_DECL((char *FileName)); #ifdef _INCLUDE_FROM_NAMES_C_ --- 75,81 ---- extern int SelectFromLibrary ARGS_DECL((char *MsgStr, char *ExtStr, char *SelStr, char *PathStr)); ! extern void SetCurDir ARGS_DECL((char *FileName)); extern void SetCurSymDir ARGS_DECL((char *FileName)); + extern void SetCurImportDir ARGS_DECL((char *FileName)); #ifdef _INCLUDE_FROM_NAMES_C_ *** patchlvl.h.orig Mon May 24 15:20:58 1999 --- patchlvl.h Mon May 24 15:20:58 1999 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 12 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 13 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig Mon May 24 15:20:59 1999 --- Imakefile Mon May 24 15:20:59 1999 *************** *** 53,57 **** $(MOREDEFINES) ! TGIFVERSION = 4.1.12 XCOMM Things to try to add to the DEFINES line above: --- 53,57 ---- $(MOREDEFINES) ! TGIFVERSION = 4.1.13 XCOMM Things to try to add to the DEFINES line above: *** HISTORY.orig Mon May 24 15:21:00 1999 --- HISTORY Mon May 24 15:21:00 1999 *************** *** 1,2 **** --- 1,9 ---- + -----------------------> tgif-4.1.12 => tgif-4.1.13 <----------------------- + Here's a short list of added features/bug fixes. + + 1) Fix a bug that importing a XBM/XPM/GIF file changes the working directory. + Thanks to Ralphe Neill for + pointing out the problem. + -----------------------> tgif-4.1.11 => tgif-4.1.12 <----------------------- Here's a short list of added features/bug fixes.