File xfig.3.2.5.dif of Package xfig
--- Fig-color.ad
+++ Fig-color.ad 2006-07-31 17:56:25.000000000 +0200
@@ -79,6 +79,12 @@ Fig*MenuButton*background: gray83
! in the color editor popup
Fig*mixedEdit.background: gray83
+Fig*mode_panel.background: gray67
+Fig*mode_panel*topShadow:: white
+Fig*mode_panel*bottomShadow: gray17
+Fig*mode_panel*topShadowPixel: white
+Fig*mode_panel*bottomShadowPixel: gray17
+
Fig*cancel.background: gray88
Fig*dismiss.background: gray88
Fig*commands*background: gray88
@@ -88,12 +94,35 @@ Fig*horizontal.background: gray88
Fig*topruler.background: gray95
Fig*sideruler.background: gray95
+Fig*topruler.foreground: black
+Fig*sideruler.foreground: black
! file panel and scrollbar
Fig*FigList*background: gray95
Fig*List*background: gray95
-Fig*Scrollbar.background: gray95
+Fig*Scrollbar.background: gray77
+Fig*Scrollbar.foreground: gray37
+Fig*ScrollbarBackground: gray67
+Fig*ScrollbarForeground: gray37
+
+Fig*horizontal.shadowWidth: 2
+Fig*horizontal.topShadowPixel: gray95
+Fig*horizontal.bottomShadowPixel: gray37
+Fig*horizontal.topShadow: gray95
+Fig*horizontal.bottomShadow: gray37
+
+Fig*Scrollbar.shadowWidth: 2
+Fig*Scrollbar.topShadow: gray95
+Fig*Scrollbar.bottomShadow: gray37
+Fig*Scrollbar.topShadowPixel: gray95
+Fig*Scrollbar.bottomShadowPixel: gray37
+
+Fig*stdColor.shadowWidth: 2
+Fig*stdColor.topShadow: gray95
+Fig*stdColor.bottomShadow: gray37
+Fig*stdColor.topShadowPixel: gray95
+Fig*stdColor.bottomShadowPixel: gray37
Fig*Label.background: gray80
Fig*ind_box.background: gray80
--- Fig.ad
+++ Fig.ad 2006-07-31 17:56:25.000000000 +0200
@@ -10,6 +10,8 @@ Fig.version: 3.2.5-alpha6
Fig*AllowShellResize: false
+Fig.inches: false
+
! Image editor - can edit imported image
Fig.image_editor: xv
@@ -20,7 +22,7 @@ Fig.ghostscript: gs
! This is for viewing the xfig html reference.
! For netscape, this command will open the help pages in a running netscape,
! or start a new netscape if one isn't already running
-Fig.browser: netscape -remote 'openFile(%f)' || netscape %f
+Fig.browser: /usr/X11R6/lib/X11/xfig/browser %f
! pdfviewer - put your favorite pdf viewer here.
! This is for viewing the xfig how-to guide and man pages
@@ -110,60 +112,62 @@ Fig.internalborderwidth: 1
! I include both for compatibility. Be sure to change both values when
! modifying them.
- Fig*horizontal.shadowWidth: 0
- Fig*horizontal.topShadowPixel: black
- Fig*horizontal.bottomShadowPixel: white
- Fig*horizontal.topShadow: black
- Fig*horizontal.bottomShadow: white
+Fig*horizontal.shadowWidth: 0
+Fig*horizontal.topShadowPixel: black
+Fig*horizontal.bottomShadowPixel: white
+Fig*horizontal.topShadow: black
+Fig*horizontal.bottomShadow: white
! the following is done so the widget set doesn't try to make shades of
! the scrollbar shadows (even though the width is 0 it takes more colors)
- Fig*Scrollbar.shadowWidth: 0
- Fig*Scrollbar.topShadow: black
- Fig*Scrollbar.bottomShadow: white
- Fig*Scrollbar.topShadowPixel: black
- Fig*Scrollbar.bottomShadowPixel: white
+
+Fig*Scrollbar.shadowWidth: 0
+Fig*Scrollbar.topShadow: black
+Fig*Scrollbar.bottomShadow: white
+Fig*Scrollbar.topShadowPixel: black
+Fig*Scrollbar.bottomShadowPixel: white
! this is for the standard color buttons in the color panel
- Fig*stdColor.shadowWidth: 2
- Fig*stdColor.topShadow: black
- Fig*stdColor.bottomShadow: white
- Fig*stdColor.topShadowPixel: black
- Fig*stdColor.bottomShadowPixel: white
+
+Fig*stdColor.shadowWidth: 2
+Fig*stdColor.topShadow: black
+Fig*stdColor.bottomShadow: white
+Fig*stdColor.topShadowPixel: black
+Fig*stdColor.bottomShadowPixel: white
! turn off any shadows for the user color cells
- Fig*colorMemory.shadowWidth: 0
+Fig*colorMemory.shadowWidth: 0
! You may need or want to adjust the highlight thickness for the mode
! and indicator panels depending on the results. If it is too thick
! it will erase part of the button graphics.
- Fig*mode_panel*highlightThickness: 1
- Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
+Fig*mode_panel*highlightThickness: 1
+Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
! Same for the popup panels from the indicator panel
- Fig*set_indicator_panel*Command.highlightThickness: 1
+Fig*set_indicator_panel*Command.highlightThickness: 1
! If you use the 3D Athena widget set and the small icons for the mode panel
! (because you have a small screen; see Imakefile) you may want to reduce
! the shadow width to 1 or 0. Uncomment the following in that case:
-! Fig*mode_panel*shadowWidth: 1
+Fig*mode_panel*shadowWidth: 1
! The following is for the update marker in the upper-right corner of the
! indicator buttons. You may not want any highlight thickness because
! the boxes are so small.
- Fig*ind_panel.ind_box.button_form.update.highlightThickness: 0
+Fig*ind_panel.ind_box.button_form.update.highlightThickness: 1
! This sets the shadows for the spinner arrows
- Fig*spinup.shadowWidth: 2
- Fig*spindown.shadowWidth: 2
+Fig*spinup.shadowWidth: 0
+Fig*spindown.shadowWidth: 0
! This gets rid of that funny black line that sometimes borders the canvas
- Fig*canvas.shadowWidth: 0
+Fig*canvas.shadowWidth: 0
!if on monochrome server, or no Fig-color app-defaults file
! This background resource shows between the buttons like a border
- Fig*mode_panel.background: black
- Fig*mode_panel.foreground: black
+Fig*mode_panel.background: black
+Fig*mode_panel.foreground: black
! Specify a private Compose key database file. If this resource contains a "/"
! then the wired-in name of the xfig global directory won't be prefixed to it.
--- Imakefile
+++ Imakefile 2007-05-07 16:44:13.756022210 +0200
@@ -55,11 +55,11 @@ XCOMM the 3d Athena Widget Set (highly r
XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
-XCOMM #define XAW3D1_5E
+#define XAW3D1_5E
#ifdef XAW3D1_5E
DUSEXAW3D = -DXAW3D -DXAW3D1_5E
- XAWLIB = -lXaw3d15e
+ XAWLIB = -lXaw3d
#else
XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
@@ -73,7 +73,7 @@ XCOMM Redefine the following if your PNG
XCOMM are in different places
PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGINC = -I/usr/include
ZLIBDIR = $(USRLIBDIR)
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
@@ -93,8 +93,8 @@ XCOMM You must have version 5b or newer
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = /usr/lib
+JPEGINC = -I/usr/include
#else
JPEGLIBDIR = ../jpeg
JPEGINC = -I$(JPEGLIBDIR)
@@ -116,8 +116,8 @@ XCOMM Change XPMINC if necessary to poin
#define USEXPM_ICON
#ifdef USEXPM
-XPMLIBDIR = /usr/local/lib
-XPMINC = -I/usr/local/include/X11
+XPMLIBDIR = $(USRLIBDIR)
+XPMINC = -I$(USRLIBDIR)
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -158,7 +158,7 @@ XCOMM uncomment the following line if yo
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
@@ -166,16 +166,18 @@ XCOMM be sure to comment out the second
XCOMM XFIGLIBDIR = $(LIBDIR)
XCOMM use this if you want the multi-key data base file in the standard X11 tree
-XFIGLIBDIR = $(LIBDIR)/xfig
+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
+XFIGLIBDIR = _DATA/xfig
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XCOMM XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = /usr/share/doc/packages/xfig
XCOMM MANDIR tells where the standard man pages should go (no need to change it
XCOMM if you want the man pages installed in the standard place on your system
XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-MANDIR = /usr/local/xfig/man
+MANDIR = /usr/share/man/man1
XCOMM If your system doesn't have strstr undefine the following definition
XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
@@ -205,7 +207,7 @@ XCOMM instead.
XCOMM Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
XCOMM A cache size of zero turns caching off.
-CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=300
+CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=512 -DMAXNUMPTS=50000 -DBSDLPR
XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
@@ -219,6 +221,7 @@ XCOMM number of vertices.
XCOMM If you want a compiler other than "cc", define it here
XCOMM CC = /opt/SUNWspro/bin/cc
+CC = gcc
XCOMM *****************************************************
XCOMM *****************************************************
@@ -241,7 +244,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
#endif /* USEJPEG */
#ifdef I18N
-I18N_DEFS = -DI18N -DSETLOCALE
+I18N_DEFS = -DI18N
I18N_SRC = w_i18n.c
I18N_OBJ = w_i18n.o
#endif
--- fig.h
+++ fig.h 2006-07-31 17:56:25.000000000 +0200
@@ -29,6 +29,7 @@ extern char *my_strdup(char *str);
#endif
#include <sys/types.h> /* for stat structure */
#endif
+#include <sys/param.h>
#include <sys/stat.h>
#if defined(__convex__) && defined(__STDC__)
--- w_menuentry.c
+++ w_menuentry.c 2006-07-31 17:56:25.000000000 +0200
@@ -169,7 +169,8 @@ Redisplay(Widget w, XEvent *event, Regio
gc = entry->sme_bsb.norm_gray_gc;
}
- if (entry->sme_bsb.label != NULL) {
+/* if (entry->sme_bsb.label != NULL) { */
+ if (entry->sme_bsb.label == XtName((Widget)(entry))) {
int x_loc = entry->sme_bsb.left_margin;
int len = strlen(entry->sme_bsb.label);
char * label = entry->sme_bsb.label;
