*** arc.c.orig Fri May 24 16:48:52 1996 --- arc.c Fri May 24 16:48:53 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/arc.c,v 3.0 1996/05/06 16:03:39 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/arc.c,v 3.1 1996/05/24 19:54:40 william Exp $"; #endif *************** *** 1329,1333 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "r=%s,[%s,%s]", r_buf, x_buf, y_buf); StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); XGrabPointer(mainDisplay, drawWindow, FALSE, --- 1329,1333 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "r=%s\nx=%s\ny=%s", r_buf, x_buf, y_buf); StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); XGrabPointer(mainDisplay, drawWindow, FALSE, *************** *** 1349,1353 **** angle1, angle2); PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s,degree=%1d", r_buf, abs(angle2>>6)); } else { XDrawLine(mainDisplay, drawWindow, drawGC, OrigX, OrigY, --- 1349,1353 ---- angle1, angle2); PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s\ndegree=%1d", r_buf, abs(angle2>>6)); } else { XDrawLine(mainDisplay, drawWindow, drawGC, OrigX, OrigY, *************** *** 1361,1365 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s,[%s,%s]", r_buf, x_buf, y_buf); } EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); --- 1361,1365 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s\nx=%s\ny=%s", r_buf, x_buf, y_buf); } EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); *************** *** 1373,1377 **** angle1, angle2); PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s,degree=%1d", r_buf, abs(angle2>>6)); EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); done = TRUE; --- 1373,1377 ---- angle1, angle2); PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s\ndegree=%1d", r_buf, abs(angle2>>6)); EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); done = TRUE; *************** *** 1386,1390 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s,[%s,%s]", r_buf, x_buf, y_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); XDrawLine(mainDisplay, drawWindow, drawGC, OrigX, OrigY, --- 1386,1390 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s\nx=%s\ny=%s", r_buf, x_buf, y_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); XDrawLine(mainDisplay, drawWindow, drawGC, OrigX, OrigY, *************** *** 1403,1411 **** Msg("Please specify the end of the arc."); PixelToMeasurementUnit(r_buf, radius); ! sprintf(buf, "r=%s,degree=0", r_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); if (done) { PixelToMeasurementUnit(r_buf, radius); ! sprintf(buf, "r=%s,degree=0", r_buf); EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); } --- 1403,1411 ---- Msg("Please specify the end of the arc."); PixelToMeasurementUnit(r_buf, radius); ! sprintf(buf, "r=%s\ndegree=0", r_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); if (done) { PixelToMeasurementUnit(r_buf, radius); ! sprintf(buf, "r=%s\ndegree=0", r_buf); EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); } *************** *** 1415,1419 **** if (drawing_arc) { PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s,degree=%1d", r_buf, abs(angle2>>6)); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } else { --- 1415,1419 ---- if (drawing_arc) { PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s\ndegree=%1d", r_buf, abs(angle2>>6)); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } else { *************** *** 1425,1429 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s,[%s,%s]", r_buf, x_buf, y_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } --- 1425,1429 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s\nx=%s\ny=%s", r_buf, x_buf, y_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } *************** *** 1470,1474 **** if (drawing_arc) { PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s,degree=%1d", r_buf, abs(angle2>>6)); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } else { --- 1470,1474 ---- if (drawing_arc) { PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s\ndegree=%1d", r_buf, abs(angle2>>6)); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } else { *************** *** 1480,1484 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s,[%s,%s]", r_buf, x_buf, y_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } --- 1480,1484 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s\nx=%s\ny=%s", r_buf, x_buf, y_buf); ShowMeasureCursor(saved_x, saved_y, buf, TRUE); } *************** *** 1497,1501 **** angle1, angle2); PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s,degree=%1d", r_buf, abs(angle2>>6)); } else { XDrawLine(mainDisplay, drawWindow, drawGC, OrigX, OrigY, --- 1497,1501 ---- angle1, angle2); PixelToMeasurementUnit(r_buf, w>>1); ! sprintf(buf, "r=%s\ndegree=%1d", r_buf, abs(angle2>>6)); } else { XDrawLine(mainDisplay, drawWindow, drawGC, OrigX, OrigY, *************** *** 1509,1513 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s,[%s,%s]", r_buf, x_buf, y_buf); } EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); --- 1509,1513 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "r=%s\nx=%s\ny=%s", r_buf, x_buf, y_buf); } EndShowMeasureCursor(saved_x, saved_y, buf, TRUE); *** attr.c.orig Fri May 24 16:48:57 1996 --- attr.c Fri May 24 16:48:57 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/attr.c,v 3.0 1996/05/06 16:03:44 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/attr.c,v 3.1 1996/05/24 19:54:53 william Exp $"; #endif *************** *** 1185,1190 **** PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! StartShowMeasureCursor (ltx, lty-defaultFontHeight, buf, TRUE); while (placing) { --- 1185,1190 ---- PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! StartShowMeasureCursor(ltx, lty-(defaultFontHeight<<1), buf, TRUE); while (placing) { *************** *** 1195,1200 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! ShowMeasureCursor (ltx+dx, lty-defaultFontHeight+dy, buf, TRUE); SelBox (drawWindow, revDefaultGC, ltx+dx, lty+dy, rbx+dx, rby+dy); ExposeEventHandler (&input, TRUE); --- 1195,1200 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! ShowMeasureCursor (ltx+dx, lty-(defaultFontHeight<<1)+dy, buf, TRUE); SelBox (drawWindow, revDefaultGC, ltx+dx, lty+dy, rbx+dx, rby+dy); ExposeEventHandler (&input, TRUE); *************** *** 1202,1207 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! ShowMeasureCursor (ltx+dx, lty-defaultFontHeight+dy, buf, TRUE); } else if (input.type == MotionNotify) --- 1202,1207 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! ShowMeasureCursor (ltx+dx, lty-(defaultFontHeight<<1)+dy, buf, TRUE); } else if (input.type == MotionNotify) *************** *** 1215,1220 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! ShowMeasureCursor (ltx+dx, lty-defaultFontHeight+dy, buf, TRUE); SelBox (drawWindow, revDefaultGC, ltx+dx, lty+dy, rbx+dx, rby+dy); dx = grid_x - grid_orig_x; --- 1215,1220 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! ShowMeasureCursor(ltx+dx, lty-(defaultFontHeight<<1)+dy, buf, TRUE); SelBox (drawWindow, revDefaultGC, ltx+dx, lty+dy, rbx+dx, rby+dy); dx = grid_x - grid_orig_x; *************** *** 1223,1228 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! ShowMeasureCursor (ltx+dx, lty-defaultFontHeight+dy, buf, TRUE); MarkRulers (grid_x, grid_y); } --- 1223,1228 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! ShowMeasureCursor(ltx+dx, lty-(defaultFontHeight<<1)+dy, buf, TRUE); MarkRulers (grid_x, grid_y); } *************** *** 1236,1241 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! EndShowMeasureCursor (ltx+dx, lty-defaultFontHeight+dy, buf, TRUE); Msg (""); SetMouseStatus ("", "", ""); --- 1236,1241 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! EndShowMeasureCursor(ltx+dx, lty-(defaultFontHeight<<1)+dy, buf, TRUE); Msg (""); SetMouseStatus ("", "", ""); *** box.c.orig Fri May 24 16:49:00 1996 --- box.c Fri May 24 16:49:01 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/box.c,v 3.0 1996/05/06 16:03:52 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/box.c,v 3.1 1996/05/24 19:54:34 william Exp $"; #endif *************** *** 414,418 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); BeginIntervalRulers (grid_x, grid_y, grid_x, grid_y); --- 414,418 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); BeginIntervalRulers (grid_x, grid_y, grid_x, grid_y); *************** *** 436,440 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); done = TRUE; --- 436,440 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); done = TRUE; *************** *** 473,477 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); MyBox (drawWindow, drawGC, OrigX, OrigY, saved_x, saved_y); --- 473,477 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); MyBox (drawWindow, drawGC, OrigX, OrigY, saved_x, saved_y); *************** *** 483,487 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); } --- 483,487 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); } *************** *** 505,509 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); abort = TRUE; --- 505,509 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); abort = TRUE; *** choice.c.orig Fri May 24 16:49:04 1996 --- choice.c Fri May 24 16:49:05 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/choice.c,v 3.1 1996/05/14 12:55:55 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/choice.c,v 3.2 1996/05/24 19:55:17 william Exp $"; #endif *************** *** 1238,1247 **** } ! void FormatAngle(angle, buf) ! int angle; /* degrees*64 */ char *buf; { char int_buf[80], frac_buf[4]; ! float fval=(((float)rotationIncrement)/64.0*1000.0); int ival=round(fval), len; --- 1238,1247 ---- } ! void FormatFloat(pfval, buf) ! float *pfval; char *buf; { char int_buf[80], frac_buf[4]; ! float fval=((*pfval)*1000.0); int ival=round(fval), len; *************** *** 1270,1273 **** --- 1270,1282 ---- sprintf(buf, "%s.%s", int_buf, frac_buf); } + } + + void FormatAngle(angle, buf) + int angle; /* degrees*64 */ + char *buf; + { + float fval=(((float)angle)/64.0); + + FormatFloat(&fval, buf); } *** edit.c.orig Fri May 24 16:49:08 1996 --- edit.c Fri May 24 16:49:09 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/edit.c,v 3.1 1996/05/12 05:17:27 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/edit.c,v 3.2 1996/05/24 19:55:04 william Exp $"; #endif *************** *** 1364,1368 **** PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); --- 1364,1369 ---- PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); *************** *** 1440,1444 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); if (splineRubberband) { --- 1441,1446 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); if (splineRubberband) { *************** *** 1481,1485 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } --- 1483,1488 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } *************** *** 1498,1502 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { --- 1501,1506 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { *************** *** 1505,1509 **** PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); } --- 1509,1514 ---- PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); } *************** *** 1613,1617 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { --- 1618,1623 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { *************** *** 1620,1624 **** PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); } --- 1626,1631 ---- PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); } *************** *** 1746,1750 **** PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); --- 1753,1758 ---- PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); *************** *** 1808,1812 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (v[1].x, v[1].y, buf, FALSE); if (splineRubberband) { --- 1816,1821 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (v[1].x, v[1].y, buf, FALSE); if (splineRubberband) { *************** *** 1857,1861 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } --- 1866,1871 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } *************** *** 1874,1878 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { --- 1884,1889 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { *************** *** 1881,1885 **** PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); } --- 1892,1897 ---- PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(tx), OFFSET_Y(ty), buf, FALSE); } *************** *** 2028,2032 **** PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { --- 2040,2045 ---- PixelToMeasurementUnit(x_buf, ABS_X(v[1].x)); PixelToMeasurementUnit(y_buf, ABS_Y(v[1].y)); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(v[1].x, v[1].y, buf, FALSE); } else { *************** *** 2035,2039 **** PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: %sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(x), OFFSET_Y(y), buf, FALSE); } --- 2048,2053 ---- PixelToMeasurementUnit(x_buf, tx); PixelToMeasurementUnit(y_buf, ty); ! sprintf(buf, "ADD: dx=%s\n dy=%s\n x=%s\n y=%s", ! w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(OFFSET_X(x), OFFSET_Y(y), buf, FALSE); } *** eps.c.orig Fri May 24 16:49:12 1996 --- eps.c Fri May 24 16:49:13 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/eps.c,v 3.1 1996/05/11 05:40:45 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/eps.c,v 3.2 1996/05/24 19:55:27 william Exp $"; #endif *************** *** 1005,1009 **** * scale's unit is psu/px. */ ! scale = ((float)psDotsPerInch)/((float)PIX_PER_INCH*100)*((float)printMag); llx_psu = (float)(((float)xbm_ptr->llx) / 1000.0); --- 1005,1009 ---- * scale's unit is psu/px. */ ! scale = ((float)psDotsPerInch)/((float)PIX_PER_INCH*100.0)*printMag; llx_psu = (float)(((float)xbm_ptr->llx) / 1000.0); *************** *** 1097,1101 **** fprintf(FP, "0 setgray 0 setlinecap 1 setlinewidth\n"); fprintf(FP, "0 setlinejoin 10 setmiterlimit [] 0 setdash newpath\n"); ! fprintf(FP, "1 %1d %1d div %1d mul 100 div div dup neg scale\n", psDotsPerInch, PIX_PER_INCH, printMag); fprintf(FP, "%1d %s mul neg %1d %s mul neg translate\n", psDotsPerInch, --- 1097,1101 ---- fprintf(FP, "0 setgray 0 setlinecap 1 setlinewidth\n"); fprintf(FP, "0 setlinejoin 10 setmiterlimit [] 0 setdash newpath\n"); ! fprintf(FP, "1 %1d %1d div %.3f mul 100 div div dup neg scale\n", psDotsPerInch, PIX_PER_INCH, printMag); fprintf(FP, "%1d %s mul neg %1d %s mul neg translate\n", psDotsPerInch, *** file.c.orig Fri May 24 16:49:17 1996 --- file.c Fri May 24 16:49:18 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/file.c,v 3.1 1996/05/11 05:40:50 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/file.c,v 3.2 1996/05/24 19:55:09 william Exp $"; #endif *************** *** 162,169 **** int importingFile=FALSE; int psDotsPerInch=72; ! int printMag=100; int saveTmpOnReturn=TRUE; int warpToWinCenter=TRUE; ! float tiledPageScaling=0.9; char *psXOffStr[MAXPAGESTYLES] = {"0","0"}; --- 162,169 ---- int importingFile=FALSE; int psDotsPerInch=72; ! float printMag=(float)100.0; int saveTmpOnReturn=TRUE; int warpToWinCenter=TRUE; ! float tiledPageScaling=(float)0.9; char *psXOffStr[MAXPAGESTYLES] = {"0","0"}; *************** *** 372,376 **** } ! if (fprintf (FP, "state(%1d,%1d,%1d,", pageStyle, CUR_VERSION, printMag) == EOF) writeFileFailed = TRUE; --- 372,376 ---- } ! if (fprintf (FP, "state(%1d,%1d,%.3f,", pageStyle, CUR_VERSION, printMag) == EOF) writeFileFailed = TRUE; *************** *** 403,408 **** (pageLayoutMode == PAGE_STACK) ? lastPageNum : paperRow, pageLineShownInTileMode, colorDump, ! round(((float)onePageWidth)*((float)printMag)/100.0), ! round(((float)onePageHeight)*((float)printMag)/100.0), stretchableText, textRotation, rotationIncrement) == EOF) writeFileFailed = TRUE; --- 403,408 ---- (pageLayoutMode == PAGE_STACK) ? lastPageNum : paperRow, pageLineShownInTileMode, colorDump, ! round(((float)onePageWidth)*printMag/100.0), ! round(((float)onePageHeight)*printMag/100.0), stretchableText, textRotation, rotationIncrement) == EOF) writeFileFailed = TRUE; *************** *** 1234,1252 **** if (fileVersion <= 13) { ! switch (page_style) ! { ! case PORTRAIT: printMag = 100; break; ! case LANDSCAPE: printMag = 100; break; ! case HIGHPORT: printMag = 50; page_style = PORTRAIT; break; ! case HIGHLAND: printMag = 50; page_style = LANDSCAPE; break; ! case SLIDEPORT: printMag = 200; page_style = PORTRAIT; break; ! case SLIDELAND: printMag = 200; page_style = LANDSCAPE; break; ! default: ! sprintf(gszMsgBox, "Unrecognizable page style '%1d'.", ! page_style); ! TwoLineMsg(gszMsgBox, "Portrait style assumed."); ! page_style = PORTRAIT; ! printMag = 100; ! break; } } --- 1234,1251 ---- if (fileVersion <= 13) { ! switch (page_style) { ! case PORTRAIT: printMag = (float)100.0; break; ! case LANDSCAPE: printMag = (float)100.0; break; ! case HIGHPORT: printMag = (float)50.0; page_style = PORTRAIT; break; ! case HIGHLAND: printMag = (float)50.0; page_style = LANDSCAPE; break; ! case SLIDEPORT: printMag = (float)200.0; page_style = PORTRAIT; break; ! case SLIDELAND: printMag = (float)200.0; page_style = LANDSCAPE; break; ! default: ! sprintf(gszMsgBox, "Unrecognizable page style '%1d'.", ! page_style); ! TwoLineMsg(gszMsgBox, "Portrait style assumed."); ! page_style = PORTRAIT; ! printMag = (float)100.0; ! break; } } *************** *** 1260,1264 **** } s = FindChar((int)',', s); ! sscanf (s, "%d", &printMag); } pageStyle = page_style; --- 1259,1263 ---- } s = FindChar((int)',', s); ! sscanf(s, "%f", &printMag); } pageStyle = page_style; *************** *** 3591,3596 **** InitNeedA4(); if (!psA4PaperSize) return FALSE; ! width_to_match = (int)(825*PIX_PER_INCH/printMag); ! height_to_match = (int)(117*PIX_PER_INCH*10/printMag); return (onePageWidth == width_to_match && onePageHeight == height_to_match); } --- 3590,3595 ---- InitNeedA4(); if (!psA4PaperSize) return FALSE; ! width_to_match = (int)(825.0*PIX_PER_INCH/printMag); ! height_to_match = (int)(117.0*PIX_PER_INCH*10.0/printMag); return (onePageWidth == width_to_match && onePageHeight == height_to_match); } *************** *** 3916,3920 **** psXOffStr[pageStyle], psDotsPerInch, psYOffStr[pageStyle]); ! fprintf(dumpFP, "%1d %1d div %1d mul 100 div dup neg scale\n\n", psDotsPerInch, PIX_PER_INCH, printMag); --- 3915,3919 ---- psXOffStr[pageStyle], psDotsPerInch, psYOffStr[pageStyle]); ! fprintf(dumpFP, "%1d %1d div %.3f mul 100 div dup neg scale\n\n", psDotsPerInch, PIX_PER_INCH, printMag); *************** *** 3992,4003 **** } } ! f_rbx = (float)(((float)PIX_PER_INCH) * 100.0 / ((float)printMag) * psPageWidthInInch[pageStyle]); ! f_rby = (float)(((float)PIX_PER_INCH) * 100.0 / ((float)printMag) * psPageHeightInInch[pageStyle]); x_dist = (float)(((float)PIX_PER_INCH) * psPageWidthInInch[pageStyle] * ! (1.0-tiledPageScaling) * 50.0 / ((float)printMag)); y_dist = (float)(((float)PIX_PER_INCH) * psPageHeightInInch[pageStyle] * ! (1.0-tiledPageScaling) * 50.0 / ((float)printMag)); for (row = 0; row < paperRow; row++) { --- 3991,4002 ---- } } ! f_rbx = (float)(((float)PIX_PER_INCH) * 100.0 / printMag * psPageWidthInInch[pageStyle]); ! f_rby = (float)(((float)PIX_PER_INCH) * 100.0 / printMag * psPageHeightInInch[pageStyle]); x_dist = (float)(((float)PIX_PER_INCH) * psPageWidthInInch[pageStyle] * ! (1.0-tiledPageScaling) * 50.0 / printMag); y_dist = (float)(((float)PIX_PER_INCH) * psPageHeightInInch[pageStyle] * ! (1.0-tiledPageScaling) * 50.0 / printMag); for (row = 0; row < paperRow; row++) { *************** *** 4057,4061 **** psYOffStr[pageStyle]); ! fprintf(dumpFP, "%1d %1d div %1d mul 100 div dup neg scale\n\n", psDotsPerInch, PIX_PER_INCH, printMag); --- 4056,4060 ---- psYOffStr[pageStyle]); ! fprintf(dumpFP, "%1d %1d div %.3f mul 100 div dup neg scale\n\n", psDotsPerInch, PIX_PER_INCH, printMag); *************** *** 4071,4078 **** real_ltx = (float)(((float)col) * ((float)psPageWidthInInch[pageStyle]) * ! ((float)PIX_PER_INCH) * 100.0 / ((float)printMag)); real_lty = (float)(((float)row) * ((float)psPageHeightInInch[pageStyle]) * ! ((float)PIX_PER_INCH) * 100.0 / ((float)printMag)); fprintf(dumpFP, "newpath\n"); fprintf(dumpFP, " %.3f %.3f moveto\n", real_ltx, real_lty); --- 4070,4077 ---- real_ltx = (float)(((float)col) * ((float)psPageWidthInInch[pageStyle]) * ! ((float)PIX_PER_INCH) * 100.0 / printMag); real_lty = (float)(((float)row) * ((float)psPageHeightInInch[pageStyle]) * ! ((float)PIX_PER_INCH) * 100.0 / printMag); fprintf(dumpFP, "newpath\n"); fprintf(dumpFP, " %.3f %.3f moveto\n", real_ltx, real_lty); *************** *** 4898,4902 **** void SetPrintReduction () { ! int value; char buf[MAXSTRING+1]; --- 4897,4901 ---- void SetPrintReduction () { ! float fval; char buf[MAXSTRING+1]; *************** *** 4905,4910 **** if (*buf == '\0') return; ! value = atoi(buf); ! if (value <= 0) { sprintf(gszMsgBox, "Invalid reduction '%s'.", buf); Msg(gszMsgBox); --- 4904,4908 ---- if (*buf == '\0') return; ! if (sscanf(buf, "%f", &fval) != 1) { sprintf(gszMsgBox, "Invalid reduction '%s'.", buf); Msg(gszMsgBox); *************** *** 4911,4915 **** return; } ! printMag = value; if (UpdPageStyle(pageStyle)) { UpdDrawWinBBox(); --- 4909,4913 ---- return; } ! printMag = fval; if (UpdPageStyle(pageStyle)) { UpdDrawWinBBox(); *************** *** 4921,4928 **** RedrawTitleWindow(); SetFileModified(TRUE); ! if (printMag <= 100) { ! sprintf(gszMsgBox, "New reduction is %1d%%.", printMag); } else { ! sprintf(gszMsgBox, "New enlargement is %1d%%.", printMag); } Msg(gszMsgBox); --- 4919,4928 ---- RedrawTitleWindow(); SetFileModified(TRUE); ! ! FormatFloat(&printMag, buf); ! if (printMag <= 100.0) { ! sprintf(gszMsgBox, "New reduction is %s%%.", buf); } else { ! sprintf(gszMsgBox, "New enlargement is %s%%.", buf); } Msg(gszMsgBox); *** grid.c.orig Fri May 24 16:49:22 1996 --- grid.c Fri May 24 16:49:22 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/grid.c,v 3.0 1996/05/06 16:05:21 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/grid.c,v 3.1 1996/05/24 19:55:13 william Exp $"; #endif *************** *** 577,581 **** sprintf(gszMsgBox, "Please enter '%s' (%s):", ! " [pixel|cm|in]/", "e.g., 36 in/yd or 0.1 in/mil"); Dialog(gszMsgBox, "( : accept, : cancel )", spec); UtilTrimBlanks(spec); --- 577,581 ---- sprintf(gszMsgBox, "Please enter '%s' (%s):", ! " {pixel|cm|in}/", "e.g., 36 in/yd or 0.1 in/mil"); Dialog(gszMsgBox, "( : accept, : cancel )", spec); UtilTrimBlanks(spec); *************** *** 1042,1048 **** pageStyle = NewPageStyle; onePageWidth = ! round(psPageWidthInInch[NewPageStyle]*PIX_PER_INCH*100/printMag); onePageHeight = ! round(psPageHeightInInch[NewPageStyle]*PIX_PER_INCH*100/printMag); paperWidth = onePageWidth * paperCol; paperHeight = onePageHeight * paperRow; --- 1042,1048 ---- pageStyle = NewPageStyle; onePageWidth = ! round(psPageWidthInInch[NewPageStyle]*PIX_PER_INCH*100.0/printMag); onePageHeight = ! round(psPageHeightInInch[NewPageStyle]*PIX_PER_INCH*100.0/printMag); paperWidth = onePageWidth * paperCol; paperHeight = onePageHeight * paperRow; *** imgproc.c.orig Fri May 24 16:49:27 1996 --- imgproc.c Fri May 24 16:49:28 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/imgproc.c,v 3.0 1996/05/06 16:05:35 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/imgproc.c,v 3.1 1996/05/24 19:54:59 william Exp $"; #endif *************** *** 4398,4403 **** static ! void ContinueCrop(nStartXOff, nStartYOff, pnEndXOff, pnEndYOff) ! int nStartXOff, nStartYOff, *pnEndXOff, *pnEndYOff; { int end_x, end_y, cropping=TRUE; --- 4398,4404 ---- static ! void ContinueCrop(nObjAbsLtX, nObjAbsLtY, nStartXOff, nStartYOff, ! pnEndXOff, pnEndYOff) ! int nObjAbsLtX, nObjAbsLtY, nStartXOff, nStartYOff, *pnEndXOff, *pnEndYOff; { int end_x, end_y, cropping=TRUE; *************** *** 4409,4415 **** PixelToMeasurementUnit(w_buf, 0); PixelToMeasurementUnit(h_buf, 0); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(end_x, end_y, buf, TRUE); XGrabPointer(mainDisplay, drawWindow, False, --- 4410,4416 ---- PixelToMeasurementUnit(w_buf, 0); PixelToMeasurementUnit(h_buf, 0); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)-nObjAbsLtX); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)-nObjAbsLtY); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); StartShowMeasureCursor(end_x, end_y, buf, TRUE); XGrabPointer(mainDisplay, drawWindow, False, *************** *** 4428,4434 **** PixelToMeasurementUnit(w_buf, ABS_SIZE(abs(end_x-nStartXOff))); PixelToMeasurementUnit(h_buf, ABS_SIZE(abs(end_y-nStartYOff))); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(end_x, end_y, buf, TRUE); SelBox(drawWindow, revDefaultGC, nStartXOff, nStartYOff, end_x, end_y); --- 4429,4435 ---- PixelToMeasurementUnit(w_buf, ABS_SIZE(abs(end_x-nStartXOff))); PixelToMeasurementUnit(h_buf, ABS_SIZE(abs(end_y-nStartYOff))); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)-nObjAbsLtX); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)-nObjAbsLtY); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor(end_x, end_y, buf, TRUE); SelBox(drawWindow, revDefaultGC, nStartXOff, nStartYOff, end_x, end_y); *************** *** 4445,4451 **** PixelToMeasurementUnit(w_buf, ABS_SIZE(abs(end_x-nStartXOff))); PixelToMeasurementUnit(h_buf, ABS_SIZE(abs(end_y-nStartYOff))); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(end_x, end_y, buf, TRUE); SelBox(drawWindow, revDefaultGC, nStartXOff, nStartYOff, end_x, end_y); --- 4446,4452 ---- PixelToMeasurementUnit(w_buf, ABS_SIZE(abs(end_x-nStartXOff))); PixelToMeasurementUnit(h_buf, ABS_SIZE(abs(end_y-nStartYOff))); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)-nObjAbsLtX); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)-nObjAbsLtY); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(end_x, end_y, buf, TRUE); SelBox(drawWindow, revDefaultGC, nStartXOff, nStartYOff, end_x, end_y); *************** *** 4454,4460 **** PixelToMeasurementUnit(w_buf, ABS_SIZE(abs(end_x-nStartXOff))); PixelToMeasurementUnit(h_buf, ABS_SIZE(abs(end_y-nStartYOff))); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(end_x, end_y, buf, TRUE); --- 4455,4461 ---- PixelToMeasurementUnit(w_buf, ABS_SIZE(abs(end_x-nStartXOff))); PixelToMeasurementUnit(h_buf, ABS_SIZE(abs(end_y-nStartYOff))); ! PixelToMeasurementUnit(x_buf, ABS_X(end_x)-nObjAbsLtX); ! PixelToMeasurementUnit(y_buf, ABS_Y(end_y)-nObjAbsLtY); ! sprintf(buf, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor(end_x, end_y, buf, TRUE); *************** *** 4468,4472 **** static ! int GetCropArea(pbbox) struct BBRec *pbbox; { --- 4469,4474 ---- static ! int GetCropArea(obj_abs_ltx, obj_abs_lty, pbbox) ! int obj_abs_ltx, obj_abs_lty; struct BBRec *pbbox; { *************** *** 4481,4485 **** int end_x=mouse_x, end_y=mouse_y; ! ContinueCrop(mouse_x, mouse_y, &end_x, &end_y); if (pbbox != NULL) { CalcBBox(mouse_x, mouse_y, end_x, end_y, --- 4483,4487 ---- int end_x=mouse_x, end_y=mouse_y; ! ContinueCrop(obj_abs_ltx, obj_abs_lty, mouse_x, mouse_y, &end_x, &end_y); if (pbbox != NULL) { CalcBBox(mouse_x, mouse_y, end_x, end_y, *************** *** 4519,4523 **** HighLightReverse(); XSync(mainDisplay, False); ! if (!GetCropArea(&crop_bbox)) { HighLightForward(); return; --- 4521,4525 ---- HighLightReverse(); XSync(mainDisplay, False); ! if (!GetCropArea(ltx, lty, &crop_bbox)) { HighLightForward(); return; *** menu.c.orig Fri May 24 16:49:32 1996 --- menu.c Fri May 24 16:49:32 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/menu.c,v 3.0 1996/05/06 16:06:00 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/menu.c,v 3.1 1996/05/24 19:55:19 william Exp $"; #endif *************** *** 1045,1051 **** c_ptr = name; } ! sprintf(s, "%s:%s (%1d%%)", curDomainName, c_ptr, printMag); } else { ! sprintf(s, "%s:[Unnamed] (%1d%%)", curDomainName, printMag); } if (pageLayoutMode==PAGE_STACK && curPage!=NULL) { --- 1045,1053 ---- c_ptr = name; } ! FormatFloat(&printMag, gszMsgBox); ! sprintf(s, "%s:%s (%s%%)", curDomainName, c_ptr, gszMsgBox); } else { ! FormatFloat(&printMag, gszMsgBox); ! sprintf(s, "%s:[Unnamed] (%s%%)", curDomainName, gszMsgBox); } if (pageLayoutMode==PAGE_STACK && curPage!=NULL) { *** move.c.orig Fri May 24 16:49:36 1996 --- move.c Fri May 24 16:49:36 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/move.c,v 3.0 1996/05/06 16:06:05 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/move.c,v 3.1 1996/05/24 19:54:35 william Exp $"; #endif *************** *** 580,589 **** ruler_rbx = OFFSET_X(selObjRbX); ruler_rby = OFFSET_Y(selObjRbY); ! SelBox (drawWindow, revDefaultGC, sel_ltx, sel_lty, sel_rbx, sel_rby); PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! StartShowMeasureCursor (OrigX, OrigY, buf, TRUE); ! BeginIntervalRulers (ruler_ltx, ruler_lty, ruler_rbx, ruler_rby); switch (ObjPtr->type) --- 580,589 ---- ruler_rbx = OFFSET_X(selObjRbX); ruler_rby = OFFSET_Y(selObjRbY); ! SelBox(drawWindow, revDefaultGC, sel_ltx, sel_lty, sel_rbx, sel_rby); PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! StartShowMeasureCursor(OrigX, OrigY, buf, TRUE); ! BeginIntervalRulers(ruler_ltx, ruler_lty, ruler_rbx, ruler_rby); switch (ObjPtr->type) *************** *** 916,925 **** break; } ! EndIntervalRulers (grid_x, grid_y); PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! SelBox (drawWindow, revDefaultGC, sel_ltx+dx, sel_lty+dy, sel_rbx+dx, sel_rby+dy); --- 916,925 ---- break; } ! EndIntervalRulers(grid_x, grid_y); PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! SelBox(drawWindow, revDefaultGC, sel_ltx+dx, sel_lty+dy, sel_rbx+dx, sel_rby+dy); *************** *** 990,995 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! ShowMeasureCursor (grid_x, grid_y, buf, TRUE); x = input.xmotion.x; y = input.xmotion.y; --- 990,995 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! ShowMeasureCursor(grid_x, grid_y, buf, TRUE); x = input.xmotion.x; y = input.xmotion.y; *************** *** 1101,1112 **** dy = grid_y - OrigY; ! DrawIntervalRulers (ruler_ltx+dx, ruler_lty+dy, ruler_rbx+dx, ruler_rby+dy); ! SelBox (drawWindow, revDefaultGC, sel_ltx+dx, sel_lty+dy, sel_rbx+dx, sel_rby+dy); PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! ShowMeasureCursor (grid_x, grid_y, buf, TRUE); switch (ObjPtr->type) { --- 1101,1112 ---- dy = grid_y - OrigY; ! DrawIntervalRulers(ruler_ltx+dx, ruler_lty+dy, ruler_rbx+dx, ruler_rby+dy); ! SelBox(drawWindow, revDefaultGC, sel_ltx+dx, sel_lty+dy, sel_rbx+dx, sel_rby+dy); PixelToMeasurementUnit(x_buf, ABS_SIZE(dx)); PixelToMeasurementUnit(y_buf, ABS_SIZE(dy)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! ShowMeasureCursor(grid_x, grid_y, buf, TRUE); switch (ObjPtr->type) { *************** *** 1743,1747 **** PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf(buf, "dx=%s,dy=%s", x_buf, y_buf); StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); --- 1743,1747 ---- PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); *************** *** 1762,1766 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-OrigX)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-OrigY)); ! sprintf(buf, "dx=%s,dy=%s", x_buf, y_buf); EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); MarkRulers(grid_x, grid_y); --- 1762,1766 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-OrigX)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-OrigY)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); MarkRulers(grid_x, grid_y); *************** *** 1784,1788 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-OrigX)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-OrigY)); ! sprintf(buf, "dx=%s,dy=%s", x_buf, y_buf); ShowMeasureCursor(grid_x, grid_y, buf, TRUE); MarkVs(REVERSE, grid_x-OrigX, grid_y-OrigY); --- 1784,1788 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-OrigX)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-OrigY)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ShowMeasureCursor(grid_x, grid_y, buf, TRUE); MarkVs(REVERSE, grid_x-OrigX, grid_y-OrigY); *************** *** 1876,1880 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-OrigX)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-OrigY)); ! sprintf(buf, "dx=%s,dy=%s", x_buf, y_buf); ShowMeasureCursor(grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent(mainDisplay, PointerMotionMask, &ev)) ; --- 1876,1880 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-OrigX)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-OrigY)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ShowMeasureCursor(grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent(mainDisplay, PointerMotionMask, &ev)) ; *** oval.c.orig Fri May 24 16:49:40 1996 --- oval.c Fri May 24 16:49:41 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/oval.c,v 3.0 1996/05/06 16:06:29 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/oval.c,v 3.1 1996/05/24 19:54:42 william Exp $"; #endif *************** *** 519,526 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! BeginIntervalRulers (grid_x, grid_y, grid_x, grid_y); ! XGrabPointer (mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 519,526 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! BeginIntervalRulers(grid_x, grid_y, grid_x, grid_y); ! XGrabPointer(mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 541,545 **** PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); done = TRUE; --- 541,545 ---- PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); done = TRUE; *************** *** 578,582 **** PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); MyOval (drawWindow, drawGC, bbox); --- 578,582 ---- PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); MyOval (drawWindow, drawGC, bbox); *************** *** 588,592 **** PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); } --- 588,592 ---- PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); } *************** *** 610,614 **** PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); abort = TRUE; --- 610,614 ---- PixelToMeasurementUnit(x_buf, ABS_X(bbox.rbx)); PixelToMeasurementUnit(y_buf, ABS_Y(bbox.rby)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (bbox.rbx, bbox.rby, buf, TRUE); abort = TRUE; *** poly.c.orig Fri May 24 16:49:45 1996 --- poly.c Fri May 24 16:49:45 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/poly.c,v 3.0 1996/05/06 16:06:45 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/poly.c,v 3.1 1996/05/24 19:54:44 william Exp $"; #endif *************** *** 460,466 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%s%s", x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 460,466 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s", x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 474,480 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonPressMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 474,480 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonPressMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 499,503 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%s%s", x_buf, y_buf); } else --- 499,503 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s", x_buf, y_buf); } else *************** *** 507,511 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); } ShowMeasureCursor (grid_x, grid_y, buf, TRUE); --- 507,511 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); } ShowMeasureCursor (grid_x, grid_y, buf, TRUE); *************** *** 669,673 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%s%s", x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); } --- 669,673 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s", x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); } *************** *** 793,797 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; --- 793,797 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; *************** *** 804,808 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); --- 804,808 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); *************** *** 897,913 **** } ! switch (button_ev->button) ! { ! case Button1: ! OrigX = grid_x; OrigY = grid_y; ! PixelToMeasurementUnit(w_buf, 0); ! PixelToMeasurementUnit(h_buf, 0); ! PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); ! PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! break; ! case Button2: done = TRUE; break; ! case Button3: done = TRUE; break; } } --- 897,912 ---- } ! switch (button_ev->button) { ! case Button1: ! OrigX = grid_x; OrigY = grid_y; ! PixelToMeasurementUnit(w_buf, 0); ! PixelToMeasurementUnit(h_buf, 0); ! PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); ! PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! break; ! case Button2: done = TRUE; break; ! case Button3: done = TRUE; break; } } *************** *** 916,920 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%s%s", x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); --- 915,919 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s", x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); *************** *** 946,950 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%s%s", x_buf, y_buf); } else --- 945,949 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s", x_buf, y_buf); } else *************** *** 954,958 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); } EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); --- 953,958 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", ! w_buf, h_buf, x_buf, y_buf); } EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); *** polygon.c.orig Fri May 24 16:49:49 1996 --- polygon.c Fri May 24 16:49:49 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/polygon.c,v 3.0 1996/05/06 16:06:49 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/polygon.c,v 3.1 1996/05/24 19:54:47 william Exp $"; #endif *************** *** 571,578 **** } } ! SaveStatusStrings (); ! SetMouseStatus ("Add a vertex", "Close the polygon/spline", "Close the polygon/spline"); ! Msg ("Click middle or right button to end polygon."); PixelToMeasurementUnit(w_buf, 0); PixelToMeasurementUnit(h_buf, 0); --- 571,578 ---- } } ! SaveStatusStrings(); ! SetMouseStatus("Add a vertex", "Close the polygon/spline", "Close the polygon/spline"); ! Msg("Click middle or right button to end polygon."); PixelToMeasurementUnit(w_buf, 0); PixelToMeasurementUnit(h_buf, 0); *************** *** 579,585 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonPressMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 579,585 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonPressMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 609,613 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); abort = TRUE; --- 609,613 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); abort = TRUE; *************** *** 621,625 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); if (curSpline != LT_STRAIGHT && splineRubberband) --- 621,625 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); if (curSpline != LT_STRAIGHT && splineRubberband) *************** *** 685,689 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; --- 685,689 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; *************** *** 695,699 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); button_ev = &(input.xbutton); --- 695,699 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); button_ev = &(input.xbutton); *************** *** 783,788 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); break; case Button2: --- 783,789 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", ! w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); break; case Button2: *** rcbox.c.orig Fri May 24 16:49:52 1996 --- rcbox.c Fri May 24 16:49:53 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/rcbox.c,v 3.0 1996/05/06 16:07:05 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/rcbox.c,v 3.1 1996/05/24 19:54:48 william Exp $"; #endif *************** *** 603,610 **** PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! BeginIntervalRulers (grid_x, grid_y, grid_x, grid_y); ! XGrabPointer (mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 603,610 ---- PixelToMeasurementUnit(x_buf, ABS_X(grid_x)); PixelToMeasurementUnit(y_buf, ABS_Y(grid_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! BeginIntervalRulers(grid_x, grid_y, grid_x, grid_y); ! XGrabPointer(mainDisplay, drawWindow, FALSE, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 626,630 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); done = TRUE; --- 626,630 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); done = TRUE; *************** *** 663,667 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); MyRCBox (drawWindow,drawGC,OrigX,OrigY,saved_x,saved_y,radius); --- 663,667 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); MyRCBox (drawWindow,drawGC,OrigX,OrigY,saved_x,saved_y,radius); *************** *** 674,678 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); } --- 674,678 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (saved_x, saved_y, buf, TRUE); } *************** *** 696,700 **** PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); abort = TRUE; --- 696,700 ---- PixelToMeasurementUnit(x_buf, ABS_X(saved_x)); PixelToMeasurementUnit(y_buf, ABS_Y(saved_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (saved_x, saved_y, buf, TRUE); abort = TRUE; *** ruler.c.orig Fri May 24 16:49:56 1996 --- ruler.c Fri May 24 16:49:56 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/ruler.c,v 3.0 1996/05/06 16:07:18 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/ruler.c,v 3.1 1996/05/24 19:54:32 william Exp $"; #endif *************** *** 62,66 **** static float gfPixelsPerUnit=(float)1.0; static float gfNumUnits=(float)1.0; ! static char numUnitStr[80], baseUnitStr[80], unitStr[80]; static GC rulerGC; --- 62,67 ---- static float gfPixelsPerUnit=(float)1.0; static float gfNumUnits=(float)1.0; ! static float gfNumFracUnits=(float)1.0; ! static char numUnitStr[80], baseUnitStr[80], unitStr[80], formatUnitStr[80]; static GC rulerGC; *************** *** 102,105 **** --- 103,144 ---- } + static + int VerifyFormatUnitStr(format_unit_str) + char *format_unit_str; + { + char *c_ptr=format_unit_str, *semi_ptr=NULL; + int seek_percent=TRUE, count=0; + + if ((semi_ptr=strchr(format_unit_str, ';')) == NULL) { + return FALSE; + } else { + float fval; + + *semi_ptr++ = '\0'; + UtilTrimBlanks(semi_ptr); + if (sscanf(semi_ptr, "%f", &fval) != 1) { + return FALSE; + } + gfNumFracUnits = fval; + } + for (c_ptr=format_unit_str; *c_ptr != NULL; c_ptr++) { + if (seek_percent) { + if (*c_ptr == '%') { + seek_percent = FALSE; + } + } else if (*c_ptr == 'f') { + seek_percent = TRUE; + count++; + } else if (!(*c_ptr == '.' || (*c_ptr >= '0' && *c_ptr <= '9'))) { + return FALSE; + } + } + if (seek_percent && count==2) { + strcpy(formatUnitStr, format_unit_str); + return TRUE; + } + return FALSE; + } + int SetUnit(spec) char *spec; *************** *** 106,113 **** { char *spec_copy=UtilStrDup(spec); ! char *num_ptr=NULL, *base_ptr=NULL, *unit_ptr=NULL; int ok=TRUE; ! if (spec_copy == NULL) return FALSE; if ((num_ptr=strtok(spec_copy, " \t\n\r")) != NULL && (base_ptr=strtok(NULL, "/ \t\n\r")) != NULL && --- 145,162 ---- { char *spec_copy=UtilStrDup(spec); ! char *num_ptr=NULL, *base_ptr=NULL, *unit_ptr=NULL, *semi_ptr=NULL; int ok=TRUE; ! if (spec_copy == NULL) { ! return FALSE; ! } ! if ((semi_ptr=strchr(spec_copy, ';')) != NULL) { ! *semi_ptr++ = '\0'; ! if (!VerifyFormatUnitStr(semi_ptr)) { ! ok = BadUnit(spec); ! } ! } else { ! *formatUnitStr = '\0'; ! } if ((num_ptr=strtok(spec_copy, " \t\n\r")) != NULL && (base_ptr=strtok(NULL, "/ \t\n\r")) != NULL && *************** *** 150,154 **** if (!ok) { gfPixelsPerUnit = gfNumUnits = (float)1.0; ! *numUnitStr = *baseUnitStr = *unitStr = '\0'; } free(spec_copy); --- 199,203 ---- if (!ok) { gfPixelsPerUnit = gfNumUnits = (float)1.0; ! *numUnitStr = *baseUnitStr = *unitStr = *formatUnitStr = '\0'; } free(spec_copy); *************** *** 181,185 **** gfPixelsPerUnit = gfNumUnits = (float)1.0; ! *numUnitStr = *baseUnitStr = *unitStr = '\0'; if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "ShowMeasurementUnit")) != NULL) { --- 230,234 ---- gfPixelsPerUnit = gfNumUnits = (float)1.0; ! *numUnitStr = *baseUnitStr = *unitStr = *formatUnitStr = '\0'; if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "ShowMeasurementUnit")) != NULL) { *************** *** 625,629 **** ival = ((int)round(fval)); fval = ((float)ival)/((float)1000.0); ! sprintf(Buf, "%+.3f%s", fval, unitStr); } } --- 674,687 ---- ival = ((int)round(fval)); fval = ((float)ival)/((float)1000.0); ! if (*formatUnitStr == '\0') { ! sprintf(Buf, "%+.3f%s", fval, unitStr); ! } else { ! float frac; ! ! ival = (int)fval; ! frac = ((ival >= 0) ? fval-((float)ival) : ((float)ival)-fval); ! fval = (float)ival; ! sprintf(Buf, formatUnitStr, fval, frac); ! } } } *************** *** 637,646 **** FreezeMarkRulerText(); if (Str != NULL && *Str != '\0') { ! if (ExtraSpace) { ! XDrawString(mainDisplay, drawWindow, revDefaultGC, XOff+18, ! YOff+defaultFontAsc, Str, strlen(Str)); ! } else { ! XDrawString(mainDisplay, drawWindow, revDefaultGC, XOff+4, ! YOff+defaultFontAsc, Str, strlen(Str)); } } --- 695,713 ---- FreezeMarkRulerText(); if (Str != NULL && *Str != '\0') { ! int x=(ExtraSpace ? XOff+18 : XOff+4), y=YOff+defaultFontAsc; ! char *c_ptr=strchr(Str, '\n'), *line=Str; ! ! while (line != NULL) { ! if (c_ptr != NULL) *c_ptr = '\0'; ! XDrawString(mainDisplay, drawWindow, revDefaultGC, x, y, ! line, strlen(line)); ! if (c_ptr != NULL) { ! *c_ptr++ = '\n'; ! line = c_ptr; ! c_ptr = strchr(line, '\n'); ! y += defaultFontHeight; ! } else { ! break; ! } } } *************** *** 653,662 **** if (!showMeasurement) return; if (Str != NULL && *Str != '\0') { ! if (ExtraSpace) { ! XDrawString(mainDisplay, drawWindow, revDefaultGC, XOff+18, ! YOff+defaultFontAsc, Str, strlen(Str)); ! } else { ! XDrawString(mainDisplay, drawWindow, revDefaultGC, XOff+4, ! YOff+defaultFontAsc, Str, strlen(Str)); } } --- 720,738 ---- if (!showMeasurement) return; if (Str != NULL && *Str != '\0') { ! int x=(ExtraSpace ? XOff+18 : XOff+4), y=YOff+defaultFontAsc; ! char *c_ptr=strchr(Str, '\n'), *line=Str; ! ! while (line != NULL) { ! if (c_ptr != NULL) *c_ptr = '\0'; ! XDrawString(mainDisplay, drawWindow, revDefaultGC, x, y, ! line, strlen(line)); ! if (c_ptr != NULL) { ! *c_ptr++ = '\n'; ! line = c_ptr; ! c_ptr = strchr(line, '\n'); ! y += defaultFontHeight; ! } else { ! break; ! } } } *************** *** 669,678 **** if (!showMeasurement) return; if (Str != NULL && *Str != '\0') { ! if (ExtraSpace) { ! XDrawString(mainDisplay, drawWindow, revDefaultGC, XOff+18, ! YOff+defaultFontAsc, Str, strlen(Str)); ! } else { ! XDrawString(mainDisplay, drawWindow, revDefaultGC, XOff+4, ! YOff+defaultFontAsc, Str, strlen(Str)); } } --- 745,763 ---- if (!showMeasurement) return; if (Str != NULL && *Str != '\0') { ! int x=(ExtraSpace ? XOff+18 : XOff+4), y=YOff+defaultFontAsc; ! char *c_ptr=strchr(Str, '\n'), *line=Str; ! ! while (line != NULL) { ! if (c_ptr != NULL) *c_ptr = '\0'; ! XDrawString(mainDisplay, drawWindow, revDefaultGC, x, y, ! line, strlen(line)); ! if (c_ptr != NULL) { ! *c_ptr++ = '\n'; ! line = c_ptr; ! c_ptr = strchr(line, '\n'); ! y += defaultFontHeight; ! } else { ! break; ! } } } *** select.c.orig Fri May 24 16:50:00 1996 --- select.c Fri May 24 16:50:00 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/select.c,v 3.0 1996/05/06 16:07:26 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/select.c,v 3.2 1996/05/24 19:54:50 william Exp $"; #endif *************** *** 1120,1124 **** end_y = YOff; ! SelBox (drawWindow, revDefaultGC, XOff, YOff, end_x, end_y); PixelToMeasurementUnit(w_buf, 0); PixelToMeasurementUnit(h_buf, 0); --- 1120,1124 ---- end_y = YOff; ! SelBox(drawWindow, revDefaultGC, XOff, YOff, end_x, end_y); PixelToMeasurementUnit(w_buf, 0); PixelToMeasurementUnit(h_buf, 0); *************** *** 1125,1131 **** PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor (end_x, end_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 1125,1131 ---- PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ! StartShowMeasureCursor(end_x, end_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 1144,1148 **** PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (end_x, end_y, buf, TRUE); SelBox (drawWindow, revDefaultGC, XOff, YOff, end_x, end_y); --- 1144,1148 ---- PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); EndShowMeasureCursor (end_x, end_y, buf, TRUE); SelBox (drawWindow, revDefaultGC, XOff, YOff, end_x, end_y); *************** *** 1159,1163 **** PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (end_x, end_y, buf, TRUE); SelBox (drawWindow, revDefaultGC, XOff, YOff, end_x, end_y); --- 1159,1163 ---- PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (end_x, end_y, buf, TRUE); SelBox (drawWindow, revDefaultGC, XOff, YOff, end_x, end_y); *************** *** 1168,1172 **** PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf (buf, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (end_x, end_y, buf, TRUE); --- 1168,1172 ---- PixelToMeasurementUnit(x_buf, ABS_X(end_x)); PixelToMeasurementUnit(y_buf, ABS_Y(end_y)); ! sprintf(buf, "x=%s\ny=%s\nw=%s\nh=%s", w_buf, h_buf, x_buf, y_buf); ShowMeasureCursor (end_x, end_y, buf, TRUE); *************** *** 2040,2043 **** --- 2040,2044 ---- { int delete_it=FALSE, extra_vertex=FALSE; + char *smooth=NULL; obj_ptr = vsel_ptr->obj; *************** *** 2050,2053 **** --- 2051,2055 ---- v = poly_ptr->vlist; n = poly_ptr->n; + smooth = poly_ptr->smooth; if (vsel_ptr->n >= n-1) delete_it = TRUE; *************** *** 2057,2060 **** --- 2059,2063 ---- v = polygon_ptr->vlist; n = polygon_ptr->n; + smooth = polygon_ptr->smooth; for (j=0; j < vsel_ptr->n; j++) *************** *** 2113,2118 **** if (mark[i]) { ! for (j=i+1; j < n; j++) v[j-1] = v[j]; n--; } --- 2116,2130 ---- if (mark[i]) { ! for (j=i+1; j < n; j++) { v[j-1] = v[j]; + if (smooth != NULL) smooth[j-1] = smooth[j]; + } + if (smooth != NULL) { + if (i == 0) { + smooth[0] = FALSE; + } else if (i == n-1) { + smooth[n-2] = FALSE; + } + } n--; } *************** *** 2126,2135 **** break; case OBJ_POLYGON: ! for (i=n-1; i >= 0; i--) { if (mark[i]) { ! for (j=i+1; j < n; j++) v[j-1] = v[j]; n--; } } --- 2138,2153 ---- break; case OBJ_POLYGON: ! for (i=n-2; i >= 0; i--) { if (mark[i]) { ! for (j=i+1; j < n; j++) { ! v[j-1] = v[j]; ! if (smooth != NULL) smooth[j-1] = smooth[j]; ! } n--; + if (smooth != NULL && i == 0) { + smooth[n-1] = smooth[0]; + } } } *************** *** 2137,2141 **** if (extra_vertex) v[polygon_ptr->n++] = v[0]; AdjObjSplineVs (obj_ptr); ! if (poly_ptr->curved != LT_INTSPLINE) UpdPolyBBox (obj_ptr, polygon_ptr->n, polygon_ptr->vlist); else --- 2155,2159 ---- if (extra_vertex) v[polygon_ptr->n++] = v[0]; AdjObjSplineVs (obj_ptr); ! if (polygon_ptr->curved != LT_INTSPLINE) UpdPolyBBox (obj_ptr, polygon_ptr->n, polygon_ptr->vlist); else *** setup.c.orig Fri May 24 16:50:04 1996 --- setup.c Fri May 24 16:50:04 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/setup.c,v 3.0 1996/05/06 16:07:31 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/setup.c,v 3.2 1996/05/24 19:55:21 william Exp $"; #endif *************** *** 794,801 **** } ! groupedTextEditable = FALSE; if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "GroupedTextEditable")) != ! NULL && UtilStrICmp(c_ptr, "true") == 0) { ! groupedTextEditable = TRUE; } --- 794,801 ---- } ! groupedTextEditable = TRUE; if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "GroupedTextEditable")) != ! NULL && UtilStrICmp(c_ptr, "false") == 0) { ! groupedTextEditable = FALSE; } *************** *** 880,897 **** InitPaperSize (); ! printMag = 100; ! if ((c_ptr = XGetDefault (mainDisplay,TOOL_NAME,"PercentPrintReduction")) != ! NULL) ! { ! int print_reduction = atoi (c_ptr); ! if (print_reduction <= 0) ! { ! fprintf (stderr, "Invalid %s*PercentPrintReduction: '%s', %s.\n", TOOL_NAME, c_ptr, "100 is used"); ! print_reduction = 100; } ! if (printMag != print_reduction) ! { printMag = print_reduction; paper_size_set = TRUE; --- 880,894 ---- InitPaperSize (); ! printMag = (float)100.0; ! if ((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,"PercentPrintReduction")) != ! NULL) { ! float print_reduction=(float)0.0; ! if (sscanf(c_ptr, "%f", &print_reduction) != 1) { ! fprintf(stderr, "Invalid %s*PercentPrintReduction: '%s', %s.\n", TOOL_NAME, c_ptr, "100 is used"); ! print_reduction = (float)100.0; } ! if (printMag != print_reduction) { printMag = print_reduction; paper_size_set = TRUE; *** shape.c.orig Fri May 24 16:50:07 1996 --- shape.c Fri May 24 16:50:08 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/shape.c,v 3.0 1996/05/06 16:07:35 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/shape.c,v 3.1 1996/05/24 19:54:38 william Exp $"; #endif *************** *** 54,57 **** --- 54,58 ---- #include "msg.e" #include "obj.e" + #include "page.e" #include "pattern.e" #include "poly.e" *************** *** 818,822 **** saved_top_obj = topObj; saved_bot_obj = botObj; ! topObj = botObj = NULL; switch (curShape) { --- 819,823 ---- saved_top_obj = topObj; saved_bot_obj = botObj; ! curPage->top = curPage->bot = topObj = botObj = NULL; switch (curShape) { *************** *** 899,904 **** tmp_top_obj = topObj; tmp_bot_obj = botObj; ! topObj = saved_top_obj; ! botObj = saved_bot_obj; CreateGroupObj(tmp_top_obj, tmp_bot_obj); return label_attr; --- 900,905 ---- tmp_top_obj = topObj; tmp_bot_obj = botObj; ! curPage->top = topObj = saved_top_obj; ! curPage->bot = botObj = saved_bot_obj; CreateGroupObj(tmp_top_obj, tmp_bot_obj); return label_attr; *************** *** 921,925 **** PixelToMeasurementUnit(x_buf, ABS_X(x)); PixelToMeasurementUnit(y_buf, ABS_Y(y)); ! sprintf(gszMsgBox, "%sx%s%s%s", w_buf, h_buf, x_buf, y_buf); switch (which) { case START_SHOW: StartShowMeasureCursor(x, y, gszMsgBox, TRUE); break; --- 922,926 ---- PixelToMeasurementUnit(x_buf, ABS_X(x)); PixelToMeasurementUnit(y_buf, ABS_Y(y)); ! sprintf(gszMsgBox, "w=%s\nh=%s\nx=%s\ny=%s", w_buf, h_buf, x_buf, y_buf); switch (which) { case START_SHOW: StartShowMeasureCursor(x, y, gszMsgBox, TRUE); break; *** special.c.orig Fri May 24 16:50:11 1996 --- special.c Fri May 24 16:50:11 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/special.c,v 3.0 1996/05/06 16:07:43 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/special.c,v 3.1 1996/05/24 19:55:24 william Exp $"; #endif *************** *** 1265,1269 **** return; } ! printMag = 100; UpdPageStyle(PORTRAIT); } --- 1265,1269 ---- return; } ! printMag = (float)100.0; UpdPageStyle(PORTRAIT); } *** stretch.c.orig Fri May 24 16:50:15 1996 --- stretch.c Fri May 24 16:50:16 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/stretch.c,v 3.1 1996/05/12 08:08:26 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/stretch.c,v 3.5 1996/05/24 20:20:48 william Exp $"; #endif *************** *** 513,519 **** PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); --- 513,519 ---- PixelToMeasurementUnit(x_buf, 0); PixelToMeasurementUnit(y_buf, 0); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, handCursor, CurrentTime); *************** *** 536,540 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-XGridOff)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-YGridOff)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); x = input.xmotion.x; --- 536,540 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-XGridOff)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-YGridOff)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); x = input.xmotion.x; *************** *** 625,629 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-XGridOff)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-YGridOff)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; --- 625,629 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-XGridOff)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-YGridOff)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; *************** *** 632,637 **** PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-XGridOff)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-YGridOff)); ! sprintf (buf, "dx=%s,dy=%s", x_buf, y_buf); ! EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); if (dx != 0 || dy != 0) { --- 632,637 ---- PixelToMeasurementUnit(x_buf, ABS_SIZE(grid_x-XGridOff)); PixelToMeasurementUnit(y_buf, ABS_SIZE(grid_y-YGridOff)); ! sprintf(buf, "dx=%s\ndy=%s", x_buf, y_buf); ! EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); if (dx != 0 || dy != 0) { *************** *** 988,991 **** --- 988,1007 ---- MoveObj(ObjPtr, (*RealLtX)-new_ltx, (*RealLtY)-new_lty); } + if (ObjPtr->ctm->m[CTM_SX] >= 999 && ObjPtr->ctm->m[CTM_SX] <= 1001 && + ObjPtr->ctm->m[CTM_SY] >= 999 && ObjPtr->ctm->m[CTM_SY] <= 1001 && + ObjPtr->ctm->m[CTM_SIN] >= (-1) && ObjPtr->ctm->m[CTM_SIN] <= 1 && + ObjPtr->ctm->m[CTM_MSIN] >= (-1) && ObjPtr->ctm->m[CTM_MSIN] <= 1) { + int dx=ObjPtr->ctm->m[CTM_TX], dy=ObjPtr->ctm->m[CTM_TY]; + + free(ObjPtr->ctm); + ObjPtr->ctm = NULL; + + memcpy(&ObjPtr->obbox, &ObjPtr->orig_obbox, sizeof(struct BBRec)); + if (ObjPtr->type == OBJ_TEXT) { + memcpy(&ObjPtr->bbox, &ObjPtr->detail.t->orig_bbox, + sizeof(struct BBRec)); + } + MoveObj(ObjPtr, dx, dy); + } break; } *************** *** 1525,1541 **** static ! void GetMeasurement (ObjPtr, buf) ! struct ObjRec * ObjPtr; ! char * buf; { ! int ltx, lty, rbx, rby, real_ltx, real_lty, real_rbx, real_rby; ! char x_buf[80], y_buf[80]; ! StretchedAbsXY (ObjPtr->obbox.ltx, ObjPtr->obbox.lty, <x, <y); ! StretchedAbsXY (ObjPtr->obbox.rbx, ObjPtr->obbox.rby, &rbx, &rby); ! CalcBBox (ltx, lty, rbx, rby, &real_ltx, &real_lty, &real_rbx, &real_rby); PixelToMeasurementUnit(x_buf, abs(real_rbx-real_ltx)); PixelToMeasurementUnit(y_buf, abs(real_rby-real_lty)); ! sprintf (buf, "%sx%s", x_buf, y_buf); } --- 1541,1583 ---- static ! int DiagonalDistance(dx, dy) ! double dx, dy; { ! double dval=sqrt(dx*dx+dy*dy); ! return round(dval); ! } ! ! static ! double DiagonalAngle(dx, dy) ! int dx, dy; ! { ! double theta=((dx==0) ? ((dy>=0) ? M_PI/2.0 : -M_PI/2.0) : ! atan2((double)(dy), (double)(dx))); ! ! return theta*((double)180.0)/M_PI; ! } ! ! static ! void GetMeasurement(ObjPtr, buf, buf1) ! struct ObjRec *ObjPtr; ! char *buf, *buf1; ! { ! int ltx, lty, rbx, rby, real_ltx, real_lty, real_rbx, real_rby, dx, dy; ! char x_buf[80], y_buf[80], d_buf[80]; ! double diag_angle; ! ! StretchedAbsXY(ObjPtr->obbox.ltx, ObjPtr->obbox.lty, <x, <y); ! StretchedAbsXY(ObjPtr->obbox.rbx, ObjPtr->obbox.rby, &rbx, &rby); ! CalcBBox(ltx, lty, rbx, rby, &real_ltx, &real_lty, &real_rbx, &real_rby); PixelToMeasurementUnit(x_buf, abs(real_rbx-real_ltx)); PixelToMeasurementUnit(y_buf, abs(real_rby-real_lty)); ! sprintf(buf, "x=%s\ny=%s", x_buf, y_buf); ! dx = real_rbx-real_ltx; ! dy = real_rby-real_lty; ! PixelToMeasurementUnit(d_buf, abs(DiagonalDistance((double)dx, (double)dy))); ! diag_angle = DiagonalAngle(dx, dy); ! sprintf(buf1, "Diagonal: length=%s angle=%.2f or %.2f", d_buf, ! (float)diag_angle, (float)(((double)360.0)-diag_angle)); } *************** *** 1553,1557 **** int sel_obj_ltx, sel_obj_lty, sel_obj_rbx, sel_obj_rby; int grid_x = XGridOff, grid_y = YGridOff, proportional=FALSE; ! char buf[80], x_buf[80], y_buf[80]; double obj_w, obj_h; XEvent input, ev; --- 1595,1599 ---- int sel_obj_ltx, sel_obj_lty, sel_obj_rbx, sel_obj_rby; int grid_x = XGridOff, grid_y = YGridOff, proportional=FALSE; ! char buf[80], buf1[80]; double obj_w, obj_h; XEvent input, ev; *************** *** 1609,1612 **** --- 1651,1655 ---- return; } + SaveStatusStrings(); obj_w = (double)(moveX - pivotX); *************** *** 1613,1620 **** obj_h = (double)(moveY - pivotY); ! PixelToMeasurementUnit(x_buf, ObjPtr->obbox.rbx-ObjPtr->obbox.ltx); ! PixelToMeasurementUnit(y_buf, ObjPtr->obbox.rby-ObjPtr->obbox.lty); ! sprintf (buf, "%sx%s", x_buf, y_buf); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); BeginIntervalRulers (ruler_ltx, ruler_lty, ruler_rbx, ruler_rby); XGrabPointer (mainDisplay, drawWindow, False, --- 1656,1663 ---- obj_h = (double)(moveY - pivotY); ! GetMeasurement(ObjPtr, buf, buf1); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! if (showMeasurement) SetStringStatus(buf1); ! BeginIntervalRulers (ruler_ltx, ruler_lty, ruler_rbx, ruler_rby); XGrabPointer (mainDisplay, drawWindow, False, *************** *** 1639,1644 **** proportional = input.xmotion.state & (ShiftMask|ControlMask); ! GetMeasurement (ObjPtr, buf); ! EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); x = input.xmotion.x; --- 1682,1688 ---- proportional = input.xmotion.state & (ShiftMask|ControlMask); ! GetMeasurement(ObjPtr, buf, buf1); ! EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! if (showMeasurement) SetStringStatus(buf1); x = input.xmotion.x; *************** *** 1710,1721 **** SelBox (drawWindow, revDefaultGC, stretched_ltx, stretched_lty, stretched_rbx, stretched_rby); ! GetMeasurement (ObjPtr, buf); ! EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; } } ! EndIntervalRulers (grid_x, grid_y); ! GetMeasurement (ObjPtr, buf); ! EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); SelBox (drawWindow, revDefaultGC, stretched_ltx, stretched_lty, stretched_rbx, stretched_rby); --- 1754,1770 ---- SelBox (drawWindow, revDefaultGC, stretched_ltx, stretched_lty, stretched_rbx, stretched_rby); ! GetMeasurement(ObjPtr, buf, buf1); ! EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! if (showMeasurement) SetStringStatus(buf1); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; } } ! EndIntervalRulers(grid_x, grid_y); ! GetMeasurement(ObjPtr, buf, buf1); ! EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! if (showMeasurement) SetStringStatus(buf1); ! ! RestoreStatusStrings(); ! SelBox (drawWindow, revDefaultGC, stretched_ltx, stretched_lty, stretched_rbx, stretched_rby); *************** *** 2620,2623 **** --- 2669,2688 ---- MoveRotatedObjCache(ObjPtr, dx, dy); } + if (ObjPtr->ctm->m[CTM_SX] >= 999 && ObjPtr->ctm->m[CTM_SX] <= 1001 && + ObjPtr->ctm->m[CTM_SY] >= 999 && ObjPtr->ctm->m[CTM_SY] <= 1001 && + ObjPtr->ctm->m[CTM_SIN] >= (-1) && ObjPtr->ctm->m[CTM_SIN] <= 1 && + ObjPtr->ctm->m[CTM_MSIN] >= (-1) && ObjPtr->ctm->m[CTM_MSIN] <= 1) { + int dx=ObjPtr->ctm->m[CTM_TX], dy=ObjPtr->ctm->m[CTM_TY]; + + free(ObjPtr->ctm); + ObjPtr->ctm = NULL; + + memcpy(&ObjPtr->obbox, &ObjPtr->orig_obbox, sizeof(struct BBRec)); + if (ObjPtr->type == OBJ_TEXT) { + memcpy(&ObjPtr->bbox, &ObjPtr->detail.t->orig_bbox, + sizeof(struct BBRec)); + } + MoveObj(ObjPtr, dx, dy); + } break; } *************** *** 3392,3397 **** grid_y = moveY; FormatAngleForRotate(buf, 0); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, rotatingCursor, CurrentTime); --- 3457,3462 ---- grid_y = moveY; FormatAngleForRotate(buf, 0); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, rotatingCursor, CurrentTime); *************** *** 3424,3428 **** { FormatAngleForRotate(buf, d_angle); ! ShowMeasureCursor (grid_x, grid_y, buf, TRUE); if (ObjPtr->type==OBJ_POLY || ObjPtr->type==OBJ_POLYGON) XDrawLines (mainDisplay, drawWindow, revDefaultGC, vs, n, --- 3489,3493 ---- { FormatAngleForRotate(buf, d_angle); ! ShowMeasureCursor(grid_x, grid_y, buf, TRUE); if (ObjPtr->type==OBJ_POLY || ObjPtr->type==OBJ_POLYGON) XDrawLines (mainDisplay, drawWindow, revDefaultGC, vs, n, *************** *** 3466,3470 **** } FormatAngleForRotate(buf, d_angle); ! ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; } --- 3531,3535 ---- } FormatAngleForRotate(buf, d_angle); ! ShowMeasureCursor(grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; } *************** *** 3915,3921 **** grid_x = moveX; grid_y = moveY; ! sprintf (buf, "dx=0,dy=0"); ! StartShowMeasureCursor (grid_x, grid_y, buf, TRUE); ! XGrabPointer (mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, --- 3980,3986 ---- grid_x = moveX; grid_y = moveY; ! sprintf(buf, "dx=0\ndy=0"); ! StartShowMeasureCursor(grid_x, grid_y, buf, TRUE); ! XGrabPointer(mainDisplay, drawWindow, False, PointerMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, *************** *** 3936,3941 **** XSync (mainDisplay, False); shearing = FALSE; ! sprintf (buf, "dx=%1d,dy=%1d", dx, dy); ! EndShowMeasureCursor (grid_x, grid_y, buf, TRUE); XDrawLines (mainDisplay, drawWindow, revDefaultGC, obj_obbox_vs, 5, CoordModeOrigin); --- 4001,4006 ---- XSync (mainDisplay, False); shearing = FALSE; ! sprintf(buf, "dx=%1d\ndy=%1d", dx, dy); ! EndShowMeasureCursor(grid_x, grid_y, buf, TRUE); XDrawLines (mainDisplay, drawWindow, revDefaultGC, obj_obbox_vs, 5, CoordModeOrigin); *************** *** 3945,3950 **** else if (input.type == MotionNotify) { ! sprintf (buf, "dx=%1d,dy=%1d", dx, dy); ! ShowMeasureCursor (grid_x, grid_y, buf, TRUE); XDrawLines (mainDisplay, drawWindow, revDefaultGC, obj_obbox_vs, 5, CoordModeOrigin); --- 4010,4015 ---- else if (input.type == MotionNotify) { ! sprintf(buf, "dx=%1d\ndy=%1d", dx, dy); ! ShowMeasureCursor(grid_x, grid_y, buf, TRUE); XDrawLines (mainDisplay, drawWindow, revDefaultGC, obj_obbox_vs, 5, CoordModeOrigin); *************** *** 3973,3978 **** XDrawLines (mainDisplay, drawWindow, revDefaultGC, obj_obbox_vs, 5, CoordModeOrigin); ! sprintf (buf, "dx=%1d,dy=%1d", dx, dy); ! ShowMeasureCursor (grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; } --- 4038,4043 ---- XDrawLines (mainDisplay, drawWindow, revDefaultGC, obj_obbox_vs, 5, CoordModeOrigin); ! sprintf(buf, "dx=%1d\ndy=%1d", dx, dy); ! ShowMeasureCursor(grid_x, grid_y, buf, TRUE); while (XCheckMaskEvent (mainDisplay, PointerMotionMask, &ev)) ; } *** text.c.orig Fri May 24 16:50:22 1996 --- text.c Fri May 24 16:50:23 1996 *************** *** 30,34 **** #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/text.c,v 3.1 1996/05/14 12:55:58 william Exp $"; #endif --- 30,34 ---- #ifndef lint static char RCSid[] = ! "@(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/text.c,v 3.2 1996/05/24 02:16:53 william Exp $"; #endif *************** *** 2751,2755 **** struct ObjRec *obj_ptr=attr_ptr->obj; int abs_x, abs_y, x_off=0, y_off=0, tmp_x, tmp_y, right_index, amount, left; ! int inherited_attr_left_index=0; char *c_ptr, buf[80], cur_char; --- 2751,2756 ---- struct ObjRec *obj_ptr=attr_ptr->obj; int abs_x, abs_y, x_off=0, y_off=0, tmp_x, tmp_y, right_index, amount, left; ! int inherited_attr_left_index=0, ok; ! int saved_grouped_text_editable=groupedTextEditable; char *c_ptr, buf[80], cur_char; *************** *** 2762,2766 **** abs_y = ((obj_ptr->obbox.lty+obj_ptr->obbox.rby)>>1); } ! if (FindTextObj(OFFSET_X(abs_x), OFFSET_Y(abs_y), obj_ptr) != obj_ptr) { return; } --- 2763,2770 ---- abs_y = ((obj_ptr->obbox.lty+obj_ptr->obbox.rby)>>1); } ! groupedTextEditable = TRUE; ! ok = (FindTextObj(OFFSET_X(abs_x), OFFSET_Y(abs_y), obj_ptr) == obj_ptr); ! groupedTextEditable = saved_grouped_text_editable; ! if (!ok) { return; } *** wb1.c.orig Fri May 24 16:50:26 1996 --- wb1.c Fri May 24 16:50:27 1996 *************** *** 2,6 **** * Author: Renato Santana, in January, 1996. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/wb1.c,v 3.0 1996/05/06 16:12:54 william Exp $ */ --- 2,6 ---- * Author: Renato Santana, in January, 1996. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/wb1.c,v 3.1 1996/05/24 19:55:29 william Exp $ */ *************** *** 430,434 **** if (read(sock, buff, sizeof(buff) ) > 0) { ! if (strlen(buff) > 0) { CmdReceived(buff); --- 430,434 ---- if (read(sock, buff, sizeof(buff) ) > 0) { ! if ((int)strlen(buff) > 0) { CmdReceived(buff); *************** *** 531,535 **** buff += 1; ! for (; (strlen(buff)) > 2 ;) { buff = ParseStr (buff,(int) '#', aux, strlen(buff)); --- 531,535 ---- buff += 1; ! for (; ((int)strlen(buff)) > 2 ;) { buff = ParseStr (buff,(int) '#', aux, strlen(buff)); *************** *** 1404,1408 **** { memset(buff, 0, sizeof(buff)); ! if ( (read(sock, buff, sizeof(buff)) > 0) && (strlen(buff) > 0) ) { ParseStr (buff,(int) '#', aux, strlen(buff)); --- 1404,1408 ---- { memset(buff, 0, sizeof(buff)); ! if ( (read(sock, buff, sizeof(buff)) > 0) && ((int)strlen(buff) > 0) ) { ParseStr (buff,(int) '#', aux, strlen(buff)); *** wb3.c.orig Fri May 24 16:50:30 1996 --- wb3.c Fri May 24 16:50:31 1996 *************** *** 2,6 **** * Author: Renato Santana, in January, 1996. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/wb3.c,v 3.0 1996/05/06 16:13:00 william Exp $ */ --- 2,6 ---- * Author: Renato Santana, in January, 1996. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/wb3.c,v 3.1 1996/05/24 19:55:25 william Exp $ */ *************** *** 1220,1233 **** GetPSFontStr (curFont, curStyle, font_str); ! if (TGIF_PATCHLEVEL == 0) ! { sprintf (buff, "%s%%TGIF %s\n", buff, versionString); } - else - { - sprintf (buff, "%s%%TGIF %s-p%1d\n", buff, versionString, TGIF_PATCHLEVEL); - } ! sprintf (buff, "%sstate(%1d,%1d,%1d,", buff, pageStyle, CUR_VERSION, printMag); sprintf (buff, "%s%1d,%1d,%1d,%1d,%1d,%1d,", buff, drawOrigX, drawOrigY, --- 1220,1231 ---- GetPSFontStr (curFont, curStyle, font_str); ! if (TGIF_PATCHLEVEL == 0) { sprintf (buff, "%s%%TGIF %s\n", buff, versionString); + } else { + sprintf (buff, "%s%%TGIF %s-p%1d\n", buff, versionString, + TGIF_PATCHLEVEL); } ! sprintf (buff, "%sstate(%1d,%1d,%.3f,", buff, pageStyle, CUR_VERSION, printMag); sprintf (buff, "%s%1d,%1d,%1d,%1d,%1d,%1d,", buff, drawOrigX, drawOrigY, *************** *** 1246,1251 **** (pageLayoutMode == PAGE_STACK) ? lastPageNum : paperRow, pageLineShownInTileMode, colorDump, ! round(((float)onePageWidth)*((float)printMag)/100.0), ! round(((float)onePageHeight)*((float)printMag)/100.0)); sprintf (buff, "%s%%\n%% @%s%s\n", buff, "(#)$H", "eader$"); sprintf (buff, "%s%% %s\n%%\n", buff, "%W%"); --- 1244,1249 ---- (pageLayoutMode == PAGE_STACK) ? lastPageNum : paperRow, pageLineShownInTileMode, colorDump, ! round(((float)onePageWidth)*printMag/100.0), ! round(((float)onePageHeight)*printMag/100.0)); sprintf (buff, "%s%%\n%% @%s%s\n", buff, "(#)$H", "eader$"); sprintf (buff, "%s%% %s\n%%\n", buff, "%W%"); *** choice.e.orig Fri May 24 16:50:33 1996 --- choice.e Fri May 24 16:50:34 1996 *************** *** 28,32 **** * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/choice.e,v 3.0 1996/05/06 16:04:02 william Exp $ */ --- 28,32 ---- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/choice.e,v 3.1 1996/05/24 19:55:08 william Exp $ */ *************** *** 97,100 **** --- 97,101 ---- extern void SetCurChoice ARGS_DECL((int NewChoice)); extern void PushCurChoice ARGS_DECL((void)); + extern void FormatFloat ARGS_DECL((float *pfval, char *buf)); extern void FormatAngle ARGS_DECL((int DegreeTimes64, char *buf)); extern int ChoiceEventHandler ARGS_DECL((XEvent *)); *** file.e.orig Fri May 24 16:50:36 1996 --- file.e Fri May 24 16:50:37 1996 *************** *** 28,32 **** * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/file.e,v 3.0 1996/05/06 16:05:05 william Exp $ */ --- 28,32 ---- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/file.e,v 3.1 1996/05/24 19:55:07 william Exp $ */ *************** *** 41,45 **** extern int importingFile; extern int psDotsPerInch; ! extern int printMag; extern int saveTmpOnReturn; extern int warpToWinCenter; --- 41,45 ---- extern int importingFile; extern int psDotsPerInch; ! extern float printMag; extern int saveTmpOnReturn; extern int warpToWinCenter; *** patchlvl.h.orig Fri May 24 16:50:40 1996 --- patchlvl.h Fri May 24 16:50:40 1996 *************** *** 28,32 **** * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/patchlvl.h,v 3.5 1996/05/15 17:33:07 william Exp $ */ --- 28,32 ---- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/patchlvl.h,v 3.6 1996/05/24 02:16:57 william Exp $ */ *************** *** 34,38 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 5 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 34,38 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 6 #endif /*_TGIF_PATCHLEVEL_H_*/ *** types.h.orig Fri May 24 16:50:44 1996 --- types.h Fri May 24 16:50:44 1996 *************** *** 28,32 **** * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/types.h,v 3.0 1996/05/06 16:12:41 william Exp $ */ --- 28,32 ---- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/types.h,v 3.1 1996/05/24 19:55:15 william Exp $ */ *************** *** 78,81 **** --- 78,82 ---- char color_str[40]; /* copy of the color name in file */ XPoint rotated_obbox[5]; /* offsets */ + void * userdata; } * ObjRecPtr; *************** *** 94,97 **** --- 95,99 ---- struct ObjRec * owner; /* ptr to owner obj of the record */ struct AttrRec * next, * prev; /* next and prev attributes */ + void * userdata; } * AttrRecPtr; *************** *** 216,220 **** int color, h_align, v_align, line_w, line_s; int fill, pen, dash, just, font, f_style, f_size; ! int print_mag, v_space, grid_shown, move_mode; int text_rotate, rcb_radius, underline_on, underline; char name[MAXPATHLENGTH+1], domain[MAXPATHLENGTH+1]; --- 218,223 ---- int color, h_align, v_align, line_w, line_s; int fill, pen, dash, just, font, f_style, f_size; ! float print_mag; ! int v_space, grid_shown, move_mode; int text_rotate, rcb_radius, underline_on, underline; char name[MAXPATHLENGTH+1], domain[MAXPATHLENGTH+1]; *** Makefile.noimake.orig Fri May 24 16:50:48 1996 --- Makefile.noimake Fri May 24 16:50:49 1996 *************** *** 24,28 **** # PERFORMANCE OF THIS SOFTWARE. # ! # @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/Makefile.noimake,v 3.0 1996/05/06 17:02:15 william Exp $ # --- 24,28 ---- # PERFORMANCE OF THIS SOFTWARE. # ! # @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/Makefile.noimake,v 3.2 1996/05/24 20:43:45 william Exp $ # *************** *** 325,333 **** pattern.e select.e setup.e util.e xbitmap.e exec.o: const.h tgif_dbg.h types.h align.e attr.e auxtext.e cmd.e \ ! color.e choice.e cursor.e dialog.e drawing.e dup.e eps.e \ ! exec.e expr.e file.e font.e mainloop.e menu.e move.e msg.e \ ! names.e navigate.e obj.e pattern.e poly.e raster.e remote.e \ ! select.e setup.e stk.e stretch.e text.e util.e xbitmap.e \ ! xpixmap.e expr.o: const.h tgif_dbg.h types.h dialog.e expr.e msg.e setup.e \ util.e --- 325,333 ---- pattern.e select.e setup.e util.e xbitmap.e exec.o: const.h tgif_dbg.h types.h align.e attr.e auxtext.e cmd.e \ ! color.e choice.e cursor.e dialog.e drawing.e dup.e edit.e \ ! eps.e exec.e expr.e file.e font.e mainloop.e menu.e move.e \ ! msg.e names.e navigate.e obj.e pattern.e poly.e raster.e \ ! remote.e select.e setup.e shortcut.e stk.e stretch.e text.e \ ! util.e xbitmap.e xpixmap.e expr.o: const.h tgif_dbg.h types.h dialog.e expr.e msg.e setup.e \ util.e *************** *** 344,348 **** mark.e menu.e msg.e obj.e pattern.e page.e ps.e raster.e \ select.e setup.e text.e util.e xpixmap.e - frontend.o: ftp.o: const.h tgif_dbg.h ftp.e remote.e tcp.e util.e grid.o: const.h tgif_dbg.h types.h choice.e color.e cursor.e dialog.e \ --- 344,347 ---- *************** *** 501,507 **** shape.o: const.h tgif_dbg.h types.h arc.e attr.e cmd.e color.e \ cursor.e dialog.e drawing.e dup.e group.e menu.e msg.e obj.e \ ! pattern.e poly.e polygon.e raster.e select.e setup.e shape.e \ ! spline.e text.e util.e ! shortcut.o: const.h tgif_dbg.h types.h setup.e shortcut.e special.o: const.h tgif_dbg.h types.h animate.e attr.e auxtext.e \ choice.e cmd.e color.e cutpaste.e cursor.e dialog.e drawing.e \ --- 500,506 ---- shape.o: const.h tgif_dbg.h types.h arc.e attr.e cmd.e color.e \ cursor.e dialog.e drawing.e dup.e group.e menu.e msg.e obj.e \ ! page.e pattern.e poly.e polygon.e raster.e select.e setup.e \ ! shape.e spline.e text.e util.e ! shortcut.o: const.h tgif_dbg.h types.h msg.e setup.e shortcut.e special.o: const.h tgif_dbg.h types.h animate.e attr.e auxtext.e \ choice.e cmd.e color.e cutpaste.e cursor.e dialog.e drawing.e \ *************** *** 531,541 **** tgif.o: const.h tgif_dbg.h types.h color.e file.e mainloop.e msg.e \ obj.e page.e setup.e util.e - tgif_dbg.o: util.o: const.h tgif_dbg.h remote.e util.e vms_comp.o: vms_comp.h ! version.o: version.e ! wb1.o: ! wb2.o: ! wb3.o: xbitmap.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e dialog.e drawing.e dup.e eps.e file.e font.e \ --- 530,540 ---- tgif.o: const.h tgif_dbg.h types.h color.e file.e mainloop.e msg.e \ obj.e page.e setup.e util.e util.o: const.h tgif_dbg.h remote.e util.e + tgif_dbg.o: vms_comp.o: vms_comp.h ! wb1.o: ! wb2.o: ! wb3.o: ! version.o: version.e xbitmap.o: const.h tgif_dbg.h types.h attr.e auxtext.e choice.e cmd.e \ color.e cursor.e dialog.e drawing.e dup.e eps.e file.e font.e \ *** Imakefile.orig Fri May 24 16:50:53 1996 --- Imakefile Fri May 24 16:50:53 1996 *************** *** 36,40 **** XCOMM PERFORMANCE OF THIS SOFTWARE. XCOMM ! XCOMM @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/Imakefile,v 3.6 1996/05/15 17:33:06 william Exp $ XCOMM --- 36,40 ---- XCOMM PERFORMANCE OF THIS SOFTWARE. XCOMM ! XCOMM @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/Imakefile,v 3.9 1996/05/24 20:38:32 william Exp $ XCOMM *************** *** 45,49 **** XCOMM EXTRA_LDOPTIONS = ! TGIFVERSION = 3.0-p5 PROGRAMS = tgif prtgif XCOMM frontend11.o testdrive XCOMM CDEBUGFLAGS= -g --- 45,49 ---- XCOMM EXTRA_LDOPTIONS = ! TGIFVERSION = 3.0-p6 PROGRAMS = tgif prtgif XCOMM frontend11.o testdrive XCOMM CDEBUGFLAGS= -g *************** *** 241,245 **** HISTORY /**/*.uu testdrive.pl frontend.pl ! distr: tar version uu: --- 241,245 ---- HISTORY /**/*.uu testdrive.pl frontend.pl ! distr: tar versioninfo uu: *************** *** 273,279 **** rm -f tgif-$(TGIFVERSION).tar tar cvf tgif-$(TGIFVERSION).tar tgif-$(TGIFVERSION) gzip -c tgif-$(TGIFVERSION).tar > tgif-$(TGIFVERSION).tar.gz compress tgif-$(TGIFVERSION).tar - rm -rf tgif-$(TGIFVERSION) MAN_1 = README /**/*.man Imakefile Copyright --- 273,279 ---- rm -f tgif-$(TGIFVERSION).tar tar cvf tgif-$(TGIFVERSION).tar tgif-$(TGIFVERSION) + rm -rf tgif-$(TGIFVERSION) gzip -c tgif-$(TGIFVERSION).tar > tgif-$(TGIFVERSION).tar.gz compress tgif-$(TGIFVERSION).tar MAN_1 = README /**/*.man Imakefile Copyright *************** *** 332,336 **** shar -otgif-$(TGIFVERSION).shar.38 -n38 -e38 $(SPICE_1) ! version: what .psmac /**/*.c /**/*.e /**/*.h Makefile.noimake Imakefile \ /**/*.man tgif.pl README example.tex HISTORY \ --- 332,336 ---- shar -otgif-$(TGIFVERSION).shar.38 -n38 -e38 $(SPICE_1) ! versioninfo: what .psmac /**/*.c /**/*.e /**/*.h Makefile.noimake Imakefile \ /**/*.man tgif.pl README example.tex HISTORY \ *** HISTORY.orig Fri May 24 16:50:56 1996 --- HISTORY Fri May 24 16:50:57 1996 *************** *** 1,27 **** ! -----------------------> tgif-3.0-p4 => tgif-3.0-p5 <----------------------- ! I've just put tgif-3.0-patch5 (5th patch for tgif-3.0) in ! the following places for anonymous ftp (binaries are still not ! available at the time of this release, please check ! for availability): ! ftp://ftp.x.org/contrib/applications/tgif/tgif-3.0-patch5.gz ! ftp://ftp.cs.ucla.edu/pub/tgif/tgif-3.0-patch5.gz ! ftp://bourbon.cs.ucla.edu/pub/tgif-3.0-patch5.gz ! Tgif is an Xlib-based 2-D drawing tool. It's also a hyper-graphics (or ! hyper-structured-graphics) browser on the World-Wide-Web. Its hyper-text home ! page is at and its hyper-graphics ! home page is at . ! (Please note that the Content-type of a tgif file sent by the httpd at ! bourbon.cs.ucla.edu:8001 is applications/x-tgif.) ! ! Tgif is free, but please read the Copyright file in the distribution ! (or select Copyright from the Help Menu in tgif) for restrictions. ! ! (Pelase note that tgif is NEITHER an html viewer NOR an html editor. ! It is also NOT directly related to GIF nor Transparent GIF.) ! ! Please gunzip and then apply the patch with ! 'patch -p -N < tgif-3.0-patch5'. Here's a short list of added features/bug fixes. --- 1,16 ---- ! -----------------------> tgif-3.0-p5 => tgif-3.0-p6 <----------------------- ! Here's a short list of added features/bug fixes. ! 1) Fix a crashing bug with shapes. This bug causes objects to disappear ! after Save() and seg faults. Thanks to Renato Santana ! for pointing out the problem. ! 2) Fix a crashing bug with deleting vertices. Thanks to Niek Lambert ! for pointing out the problem. ! 3) Fix a bug with shapes. When a shape is created, tgif should edit the ! text centered in the shape. ! 4) The default value of Tgif*GroupedTextEditable X resource is changed to ! TRUE. ! -----------------------> tgif-3.0-p4 => tgif-3.0-p5 <----------------------- Here's a short list of added features/bug fixes. *************** *** 30,58 **** Jaap Haalboom for pointing out the problem. - -----------------------> tgif-3.0-p3 => tgif-3.0-p4 <----------------------- - I've just put tgif-3.0-patch4 (4th patch for tgif-3.0) in - the following places for anonymous ftp (binaries are still not - available at the time of this release, please check - for availability): ! ftp://ftp.x.org/contrib/applications/tgif/tgif-3.0-patch4.gz ! ftp://ftp.cs.ucla.edu/pub/tgif/tgif-3.0-patch4.gz ! ftp://bourbon.cs.ucla.edu/pub/tgif-3.0-patch4.gz ! ! Tgif is an Xlib-based 2-D drawing tool. It's also a hyper-graphics (or ! hyper-structured-graphics) browser on the World-Wide-Web. Its hyper-text home ! page is at and its hyper-graphics ! home page is at . ! (Please note that the Content-type of a tgif file sent by the httpd at ! bourbon.cs.ucla.edu:8001 is applications/x-tgif.) ! ! Tgif is free, but please read the Copyright file in the distribution ! (or select Copyright from the Help Menu in tgif) for restrictions. ! ! (Pelase note that tgif is NEITHER an html viewer NOR an html editor. ! It is also NOT directly related to GIF nor Transparent GIF.) ! ! Please gunzip and then apply the patch with ! 'patch -p -N < tgif-3.0-patch4'. Here's a short list of added features/bug fixes. --- 19,24 ---- Jaap Haalboom for pointing out the problem. ! -----------------------> tgif-3.0-p3 => tgif-3.0-p4 <----------------------- Here's a short list of added features/bug fixes. *************** *** 70,98 **** end_animate(); enable_undo(); - -----------------------> tgif-3.0-p2 => tgif-3.0-p3 <----------------------- - I've just put tgif-3.0-patch3 (3rd patch for tgif-3.0) in - the following places for anonymous ftp (binaries are still not - available at the time of this release, please check - for availability): ! ftp://ftp.x.org/contrib/applications/tgif/tgif-3.0-patch3.gz ! ftp://ftp.cs.ucla.edu/pub/tgif/tgif-3.0-patch3.gz ! ftp://bourbon.cs.ucla.edu/pub/tgif-3.0-patch3.gz ! ! Tgif is an Xlib-based 2-D drawing tool. It's also a hyper-graphics (or ! hyper-structured-graphics) browser on the World-Wide-Web. Its hyper-text home ! page is at and its hyper-graphics ! home page is at . ! (Please note that the Content-type of a tgif file sent by the httpd at ! bourbon.cs.ucla.edu:8001 is applications/x-tgif.) ! ! Tgif is free, but please read the Copyright file in the distribution ! (or select Copyright from the Help Menu in tgif) for restrictions. ! ! (Pelase note that tgif is NEITHER an html viewer NOR an html editor. ! It is also NOT directly related to GIF nor Transparent GIF.) ! ! Please gunzip and then apply the patch with ! 'patch -p -N < tgif-3.0-patch3'. Here's a short list of added features/bug fixes. --- 36,41 ---- end_animate(); enable_undo(); ! -----------------------> tgif-3.0-p2 => tgif-3.0-p3 <----------------------- Here's a short list of added features/bug fixes. *************** *** 114,142 **** do_it=rotate_selected_obj(10); - -----------------------> tgif-3.0-p1 => tgif-3.0-p2 <----------------------- - I've just put tgif-3.0-patch2 (2nd patch for tgif-3.0) in - the following places for anonymous ftp (binaries are still not - available at the time of this release, please check - for availability): ! ftp://ftp.x.org/contrib/applications/tgif/tgif-3.0-patch2.gz ! ftp://ftp.cs.ucla.edu/pub/tgif/tgif-3.0-patch2.gz ! ftp://bourbon.cs.ucla.edu/pub/tgif-3.0-patch2.gz ! ! Tgif is an Xlib-based 2-D drawing tool. It's also a hyper-graphics (or ! hyper-structured-graphics) browser on the World-Wide-Web. Its hyper-text home ! page is at and its hyper-graphics ! home page is at . ! (Please note that the Content-type of a tgif file sent by the httpd at ! bourbon.cs.ucla.edu:8001 is applications/x-tgif.) ! ! Tgif is free, but please read the Copyright file in the distribution ! (or select Copyright from the Help Menu in tgif) for restrictions. ! ! (Pelase note that tgif is NEITHER an html viewer NOR an html editor. ! It is also NOT directly related to GIF nor Transparent GIF.) ! ! Please gunzip and then apply the patch with ! 'patch -p -N < tgif-3.0-patch2'. Here's a short list of added features/bug fixes. --- 57,62 ---- do_it=rotate_selected_obj(10); ! -----------------------> tgif-3.0-p1 => tgif-3.0-p2 <----------------------- Here's a short list of added features/bug fixes. *************** *** 143,146 **** --- 63,67 ---- 1) Fix a few bugs related to generating PS/EPS files. Thanks to Frank Prengel for pointing out the problems. + -----------------------> tgif-3.0 => tgif-3.0-p1 <----------------------- I've just put tgif-3.0-patch1 (1st patch for tgif-3.0) in *************** *** 175,178 **** --- 96,100 ---- 2) The number of colors is incorrect when printing in XPM3 format. Thanks to Ralphe Neill for pointing out the problem! + -----------------------> tgif-3.0 <----------------------- It's been 9 months since the last release. Finally, I've got rotation *************** *** 215,218 **** /* ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/HISTORY,v 3.8 1996/05/15 17:44:13 william Exp $ */ --- 137,140 ---- /* ! * @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/HISTORY,v 3.9 1996/05/24 20:24:28 william Exp $ */ *** descrip.mms.orig Fri May 24 16:51:00 1996 --- descrip.mms Fri May 24 16:51:00 1996 *************** *** 6,10 **** ! $ DEFINE SYS SYS$LIBRARY ! ! ! @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/descrip.mms,v 3.0 1996/05/06 16:04:27 william Exp $ ! --- 6,10 ---- ! $ DEFINE SYS SYS$LIBRARY ! ! ! @(#)$Header: /n/opus/u/guest/william/src/tgif/v3/RCS/descrip.mms,v 3.1 1996/05/24 20:45:42 william Exp $ ! *************** *** 227,235 **** obj.e,pattern.e,select.e,setup.e,util.e,xbitmap.e exec.obj depends_on exec.c,const.h,tgif_dbg.h,types.h,align.e,attr.e,auxtext.e,- ! cmd.e,color.e,choice.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,- ! exec.e,expr.e,file.e,font.e,mainloop.e,menu.e,move.e,msg.e,- ! names.e,navigate.e,obj.e,pattern.e,poly.e,raster.e,remote.e,- ! select.e,setup.e,stk.e,stretch.e,text.e,util.e,xbitmap.e,- ! xpixmap.e expr.obj depends_on expr.c,const.h,tgif_dbg.h,types.h,dialog.e,expr.e,msg.e,- setup.e,util.e --- 227,235 ---- obj.e,pattern.e,select.e,setup.e,util.e,xbitmap.e exec.obj depends_on exec.c,const.h,tgif_dbg.h,types.h,align.e,attr.e,auxtext.e,- ! cmd.e,color.e,choice.e,cursor.e,dialog.e,drawing.e,dup.e,- ! edit.e,eps.e,exec.e,expr.e,file.e,font.e,mainloop.e,menu.e,- ! move.e,msg.e,names.e,navigate.e,obj.e,pattern.e,poly.e,- ! raster.e,remote.e,select.e,setup.e,shortcut.e,stk.e,stretch.e,- ! text.e,util.e,xbitmap.e,xpixmap.e expr.obj depends_on expr.c,const.h,tgif_dbg.h,types.h,dialog.e,expr.e,msg.e,- setup.e,util.e *************** *** 246,250 **** mainmenu.e,mark.e,menu.e,msg.e,obj.e,pattern.e,page.e,ps.e,- raster.e,select.e,setup.e,text.e,util.e,xpixmap.e - frontend.obj depends_on frontend.c ftp.obj depends_on ftp.c,const.h,tgif_dbg.h,ftp.e,remote.e,tcp.e,util.e grid.obj depends_on grid.c,const.h,tgif_dbg.h,types.h,choice.e,color.e,- --- 246,249 ---- *************** *** 406,412 **** shape.obj depends_on shape.c,const.h,tgif_dbg.h,types.h,arc.e,attr.e,cmd.e,- color.e,cursor.e,dialog.e,drawing.e,dup.e,group.e,menu.e,msg.e,- ! obj.e,pattern.e,poly.e,polygon.e,raster.e,select.e,setup.e,- ! shape.e,spline.e,text.e,util.e ! shortcut.obj depends_on shortcut.c,const.h,tgif_dbg.h,types.h,setup.e,- shortcut.e special.obj depends_on special.c,const.h,tgif_dbg.h,types.h,animate.e,attr.e,- --- 405,411 ---- shape.obj depends_on shape.c,const.h,tgif_dbg.h,types.h,arc.e,attr.e,cmd.e,- color.e,cursor.e,dialog.e,drawing.e,dup.e,group.e,menu.e,msg.e,- ! obj.e,page.e,pattern.e,poly.e,polygon.e,raster.e,select.e,- ! setup.e,shape.e,spline.e,text.e,util.e ! shortcut.obj depends_on shortcut.c,const.h,tgif_dbg.h,types.h,msg.e,setup.e,- shortcut.e special.obj depends_on special.c,const.h,tgif_dbg.h,types.h,animate.e,attr.e,- *************** *** 438,448 **** tgif.obj depends_on tgif.c,const.h,tgif_dbg.h,types.h,color.e,file.e,- mainloop.e,msg.e,obj.e,page.e,setup.e,util.e - tgif_dbg.obj depends_on tgif_dbg.c util.obj depends_on util.c,const.h,tgif_dbg.h,remote.e,util.e ! version.obj depends_on version.c,version.e ! vms_comp.obj depends_on vms_comp.c,vms_comp.h wb1.obj depends_on wb1.c wb2.obj depends_on wb2.c wb3.obj depends_on wb3.c xbitmap.obj depends_on xbitmap.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,- --- 437,447 ---- tgif.obj depends_on tgif.c,const.h,tgif_dbg.h,types.h,color.e,file.e,- mainloop.e,msg.e,obj.e,page.e,setup.e,util.e util.obj depends_on util.c,const.h,tgif_dbg.h,remote.e,util.e ! tgif_dbg.obj depends_on tgif_dbg.c ! vms_comp.obj depends_on vms_comp.c, vms_comp.h wb1.obj depends_on wb1.c wb2.obj depends_on wb2.c wb3.obj depends_on wb3.c + version.obj depends_on version.c,version.e xbitmap.obj depends_on xbitmap.c,const.h,tgif_dbg.h,types.h,attr.e,auxtext.e,- choice.e,cmd.e,color.e,cursor.e,dialog.e,drawing.e,dup.e,eps.e,-