*** cutpaste.c.orig 2011-06-27 22:17:47.000000000 -0700 --- cutpaste.c 2011-06-27 19:04:57.000000000 -0700 *************** *** 16,20 **** * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /mm2/home/cvs/bc-src/tgif/cutpaste.c,v 1.62 2011/06/18 22:11:03 cvsps Exp $ */ --- 16,20 ---- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /mm2/home/cvs/bc-src/tgif/cutpaste.c,v 1.63 2011/06/25 22:36:42 cvsps Exp $ */ *************** *** 264,270 **** int sz_unit=pStrSeg->sz_unit, double_byte=pStrSeg->double_byte, font=pStrSeg->font, style=pStrSeg->style; int underline_on=pStrSeg->underline_on, overline_on=pStrSeg->overline_on; if (SingleFontText(text_ptr, &sz_unit, &double_byte, &font, &style, ! &underline_on, &overline_on)) { /* since it's a simple text object, don't copy it as a TGIF object */ return FALSE; --- 264,272 ---- int sz_unit=pStrSeg->sz_unit, double_byte=pStrSeg->double_byte, font=pStrSeg->font, style=pStrSeg->style; int underline_on=pStrSeg->underline_on, overline_on=pStrSeg->overline_on; + int color_index=INVALID; if (SingleFontText(text_ptr, &sz_unit, &double_byte, &font, &style, ! &underline_on, &overline_on) && ! SingleColorText(text_ptr, &color_index)) { /* since it's a simple text object, don't copy it as a TGIF object */ return FALSE; *************** *** 412,415 **** --- 414,418 ---- copyInDrawTextMode = FALSE; } else { + #ifdef NOT_DEFINED char *cut_buffer=NULL; int cut_buffer_size=0; *************** *** 428,431 **** --- 431,435 ---- free(cut_buffer); } + #endif /* NOT_DEFINED */ /* * create a partial text object with only the minilines, this *************** *** 1233,1249 **** ev.xselection.property, compound_text, pulLen, True); if (cut_buffer == NULL || (pulLen != NULL && *pulLen == 0L)) { ! if (need_to_try_text) { ! need_to_try_text = FALSE; ! need_to_try_utf8 = TRUE; ! XConvertSelection(mainDisplay, which_selection, ! textAtom, tmpSelectionAtom, mainWindow, ! lastKeyOrBtnEvInfo.time); ! continue; ! } else if (need_to_try_utf8) { ! need_to_try_utf8 = FALSE; ! XConvertSelection(mainDisplay, which_selection, ! utf8StringAtom, tmpSelectionAtom, mainWindow, ! lastKeyOrBtnEvInfo.time); ! continue; } } --- 1237,1270 ---- ev.xselection.property, compound_text, pulLen, True); if (cut_buffer == NULL || (pulLen != NULL && *pulLen == 0L)) { ! if (paste_utf8_string) { ! if (need_to_try_utf8) { ! need_to_try_utf8 = FALSE; ! need_to_try_text = TRUE; ! XConvertSelection(mainDisplay, which_selection, ! utf8StringAtom, tmpSelectionAtom, mainWindow, ! lastKeyOrBtnEvInfo.time); ! continue; ! } else if (need_to_try_text) { ! need_to_try_text = FALSE; ! XConvertSelection(mainDisplay, which_selection, ! textAtom, tmpSelectionAtom, mainWindow, ! lastKeyOrBtnEvInfo.time); ! continue; ! } ! } else { ! if (need_to_try_text) { ! need_to_try_text = FALSE; ! need_to_try_utf8 = TRUE; ! XConvertSelection(mainDisplay, which_selection, ! textAtom, tmpSelectionAtom, mainWindow, ! lastKeyOrBtnEvInfo.time); ! continue; ! } else if (need_to_try_utf8) { ! need_to_try_utf8 = FALSE; ! XConvertSelection(mainDisplay, which_selection, ! utf8StringAtom, tmpSelectionAtom, mainWindow, ! lastKeyOrBtnEvInfo.time); ! continue; ! } } } *** patchlvl.h.orig 2011-06-27 22:17:47.000000000 -0700 --- patchlvl.h 2011-06-27 19:04:58.000000000 -0700 *************** *** 16,20 **** * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /mm2/home/cvs/bc-src/tgif/patchlvl.h,v 1.16 2011/05/24 00:47:56 william Exp $ */ --- 16,20 ---- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /mm2/home/cvs/bc-src/tgif/patchlvl.h,v 1.19 2011/06/26 02:00:11 william Exp $ */ *************** *** 22,26 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 4 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 22,26 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 5 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig 2011-06-27 22:17:47.000000000 -0700 --- Imakefile 2011-06-27 19:05:00.000000000 -0700 *************** *** 32,39 **** XCOMM WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. XCOMM ! XCOMM @(#)$Header: /mm2/home/cvs/bc-src/tgif/Imakefile,v 1.203 2011/06/18 04:40:05 william Exp $ XCOMM ! TGIFVERSION = 4.2.4 EXTDEFINES = -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\ --- 32,39 ---- XCOMM WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. XCOMM ! XCOMM @(#)$Header: /mm2/home/cvs/bc-src/tgif/Imakefile,v 1.205 2011/06/26 02:02:01 william Exp $ XCOMM ! TGIFVERSION = 4.2.5 EXTDEFINES = -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\ *** HISTORY.orig 2011-06-27 22:17:47.000000000 -0700 --- HISTORY 2011-06-27 19:04:57.000000000 -0700 *************** *** 1,2 **** --- 1,6 ---- + -----------------------> tgif-4.2.4 => tgif-4.2.5 <----------------------- + 1) Fix a crashing bug when copying a string with non-simple text (e.g., has + superscript or subscript). + -----------------------> tgif-4.2.3 => tgif-4.2.4 <----------------------- 1) Fix a bug that caused a crash during a Patse operation after the *************** *** 1469,1473 **** /* ! * @(#)$Header: /mm2/home/cvs/bc-src/tgif/HISTORY,v 1.112 2011/06/18 04:40:05 william Exp $ */ --- 1473,1477 ---- /* ! * @(#)$Header: /mm2/home/cvs/bc-src/tgif/HISTORY,v 1.114 2011/06/28 02:12:04 william Exp $ */ *** make.comdep.orig 2011-06-27 22:17:47.000000000 -0700 --- make.comdep 2011-06-27 19:04:58.000000000 -0700 *************** *** 1,4 **** # ! # @(#)$Header: /mm2/home/cvs/bc-src/tgif/make.comdep,v 1.29 2010/09/04 22:31:02 william Exp $ # # This file is included at the end of Makefile.noimake and descrip.mms. --- 1,4 ---- # ! # @(#)$Header: /mm2/home/cvs/bc-src/tgif/make.comdep,v 1.30 2011/06/19 14:57:50 william Exp $ # # This file is included at the end of Makefile.noimake and descrip.mms. *************** *** 34,40 **** xpixmap.e box$(O) : tgifdefs.h const.h tgif_dbg.h types.h attr.e auxtext.e box.e \ ! cmd.e color.e cursor.e cutpaste.e drawing.e file.e grid.e \ ! mainloop.e msg.e obj.e pattern.e poly.e list.e ps.e raster.e \ ! rect.e ruler.e select.e setup.e strtbl.e util.e xpixmap.e button$(O) : tgifdefs.h const.h tgif_dbg.h types.h auxtext.e box.e \ button.e cursor.e file.e font.e mainloop.e mainmenu.e menu.e \ --- 34,41 ---- xpixmap.e box$(O) : tgifdefs.h const.h tgif_dbg.h types.h attr.e auxtext.e box.e \ ! choice.e cmd.e color.e cursor.e cutpaste.e dialog.e drawing.e \ ! dup.e file.e grid.e mainloop.e mark.e msg.e obj.e pattern.e \ ! poly.e list.e ps.e raster.e rect.e ruler.e select.e setup.e \ ! strtbl.e util.e xpixmap.e button$(O) : tgifdefs.h const.h tgif_dbg.h types.h auxtext.e box.e \ button.e cursor.e file.e font.e mainloop.e mainmenu.e menu.e \ *************** *** 224,230 **** special.e stream.e stretch.e tangram2.e text.e xbitmap.e miniline$(O) : tgifdefs.h const.h tgif_dbg.h types.h auxtext.e choice.e \ ! color.e dialog.e drawing.e dup.e file.e font.e inmethod.e \ ! miniline.e move.e msg.e obj.e pattern.e ps.e raster.e rect.e \ ! setup.e strtbl.e text.e util.e wb.e move$(O) : tgifdefs.h const.h tgif_dbg.h types.h arc.e attr.e choice.e \ cmd.e cursor.e dialog.e drawing.e dup.e exec.e list.e grid.e \ --- 225,231 ---- special.e stream.e stretch.e tangram2.e text.e xbitmap.e miniline$(O) : tgifdefs.h const.h tgif_dbg.h types.h auxtext.e choice.e \ ! color.e cutpaste.e dialog.e drawing.e dup.e file.e font.e \ ! inmethod.e miniline.e move.e msg.e obj.e pattern.e ps.e \ ! raster.e rect.e setup.e strtbl.e text.e util.e wb.e move$(O) : tgifdefs.h const.h tgif_dbg.h types.h arc.e attr.e choice.e \ cmd.e cursor.e dialog.e drawing.e dup.e exec.e list.e grid.e \ *************** *** 256,263 **** stretch.e text.e xbitmap.e xpixmap.e oval$(O) : tgifdefs.h const.h tgif_dbg.h types.h attr.e auxtext.e \ ! choice.e cmd.e color.e cursor.e cutpaste.e drawing.e file.e \ ! grid.e mainloop.e msg.e obj.e oval.e pattern.e poly.e list.e \ ! ps.e raster.e rect.e ruler.e select.e setup.e spline.e \ ! strtbl.e util.e xpixmap.e page$(O) : tgifdefs.h const.h tgif_dbg.h types.h expfdefs.h attr.e \ auxtext.e button.e cmd.e choice.e choose.e color.e cursor.e \ --- 257,264 ---- stretch.e text.e xbitmap.e xpixmap.e oval$(O) : tgifdefs.h const.h tgif_dbg.h types.h attr.e auxtext.e \ ! choice.e cmd.e color.e cursor.e cutpaste.e dialog.e drawing.e \ ! dup.e file.e grid.e mainloop.e mark.e msg.e obj.e oval.e \ ! pattern.e poly.e list.e ps.e raster.e rect.e ruler.e select.e \ ! setup.e spline.e strtbl.e util.e xpixmap.e page$(O) : tgifdefs.h const.h tgif_dbg.h types.h expfdefs.h attr.e \ auxtext.e button.e cmd.e choice.e choose.e color.e cursor.e \ *************** *** 359,366 **** $(XBM)question.xbm $(XBM)info.xbm $(XBM)dialog.xbm rcbox$(O) : tgifdefs.h const.h tgif_dbg.h types.h attr.e auxtext.e box.e \ ! cmd.e color.e cursor.e cutpaste.e drawing.e file.e grid.e \ ! mainloop.e msg.e obj.e pattern.e poly.e list.e ps.e raster.e \ ! rect.e rcbox.e ruler.e select.e setup.e spline.e strtbl.e \ ! util.e xpixmap.e rect$(O) : tgifdefs.h const.h tgif_dbg.h types.h arc.e color.e dialog.e \ drawing.e file.e msg.e poly.e list.e ps.e rect.e setup.e \ --- 360,367 ---- $(XBM)question.xbm $(XBM)info.xbm $(XBM)dialog.xbm rcbox$(O) : tgifdefs.h const.h tgif_dbg.h types.h attr.e auxtext.e box.e \ ! cmd.e color.e choice.e cursor.e cutpaste.e dialog.e drawing.e \ ! dup.e file.e grid.e mainloop.e mark.e msg.e obj.e pattern.e \ ! poly.e list.e ps.e raster.e rect.e rcbox.e ruler.e select.e \ ! setup.e spline.e strtbl.e util.e xpixmap.e rect$(O) : tgifdefs.h const.h tgif_dbg.h types.h arc.e color.e dialog.e \ drawing.e file.e msg.e poly.e list.e ps.e rect.e setup.e \