diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1996-09-03 01:33:08 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1996-09-03 01:33:08 +0000 |
commit | e3b6b56b0b73e029f790d0af7c280e4d86447b1e (patch) | |
tree | a73fa6191e1838d2ecc8174359d52e6256bc7c19 /x11/xfedor | |
parent | realloc()ing a just freed pointer is a bad idea. (diff) |
Font/Bitmap/Pixmap/Mouse editor.
ATTENTION: It not work in > 256 colors modes, anyone who knows
X in this place, fix it, please.
Notes
Notes:
svn path=/head/; revision=3733
Diffstat (limited to 'x11/xfedor')
-rw-r--r-- | x11/xfedor/Makefile | 41 | ||||
-rw-r--r-- | x11/xfedor/distinfo | 1 | ||||
-rw-r--r-- | x11/xfedor/files/default.sos | 1 | ||||
-rw-r--r-- | x11/xfedor/files/patch-aa | 24 | ||||
-rw-r--r-- | x11/xfedor/files/patch-ab | 19 | ||||
-rw-r--r-- | x11/xfedor/files/patch-ac | 19 | ||||
-rw-r--r-- | x11/xfedor/files/patch-ad | 57 | ||||
-rw-r--r-- | x11/xfedor/files/patch-ae | 54 | ||||
-rw-r--r-- | x11/xfedor/pkg-comment | 1 | ||||
-rw-r--r-- | x11/xfedor/pkg-descr | 30 | ||||
-rw-r--r-- | x11/xfedor/pkg-plist | 20 |
11 files changed, 267 insertions, 0 deletions
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile new file mode 100644 index 000000000000..a3dceaaa04ba --- /dev/null +++ b/x11/xfedor/Makefile @@ -0,0 +1,41 @@ +# New ports collection makefile for: xfedor +# Version required: ? +# Date created: 3 Sep 1996 +# Whom: ache +# +# ATTENTION: It not work in > 256 colors modes, please fix it +# if you can. +# +# $Id: Makefile,v 1.11 1996/06/26 23:06:49 gpalmer Exp $ +# + +DISTNAME= xfedor +PKGNAME= xfedor-1.0 +CATEGORIES+= x11 +MASTER_SITES= ftp://ftp.uni-trier.de/pub/unix/X11/R6/contrib/programs/ + +LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm + +MAINTAINER= ache@FreeBSD.ORG + +USE_IMAKE= yes + +XFHELP= ${X11BASE}/lib/X11/xfedor # See patches too +XCAT1= ${X11BASE}/man/cat1 + +do-install: + cd ${WRKSRC}; \ + ${INSTALL} -c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} xfedor ${PREFIX}/bin + -mkdir -p ${XFHELP} + chown ${SHAREOWN}.${SHAREGRP} ${XFHELP} + chmod 755 ${XFHELP} + cd ${WRKSRC}/help; \ + ${INSTALL} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} * ${XFHELP} + ${INSTALL} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} ${FILESDIR}/default.sos ${XFHELP} + -mkdir -p ${XCAT1} + chown ${MANOWN}.${MANGRP} ${XCAT1} + chmod 755 ${XCAT1} + cd ${WRKSRC}; \ + ${INSTALL} -c -m ${MANMODE} -o ${MANOWN} -g ${MANGRP} xfedor.txt ${XCAT1}/xfedor.1 + +.include <bsd.port.mk> diff --git a/x11/xfedor/distinfo b/x11/xfedor/distinfo new file mode 100644 index 000000000000..92cccbc3c670 --- /dev/null +++ b/x11/xfedor/distinfo @@ -0,0 +1 @@ +MD5 (xfedor.tar.gz) = 09166cec44c5091af0bb383ca18e6533 diff --git a/x11/xfedor/files/default.sos b/x11/xfedor/files/default.sos new file mode 100644 index 000000000000..1c3db10bf302 --- /dev/null +++ b/x11/xfedor/files/default.sos @@ -0,0 +1 @@ +No help on this subject diff --git a/x11/xfedor/files/patch-aa b/x11/xfedor/files/patch-aa new file mode 100644 index 000000000000..e132ba51d3ce --- /dev/null +++ b/x11/xfedor/files/patch-aa @@ -0,0 +1,24 @@ +*** Imakefile.orig Thu May 26 20:56:29 1994 +--- Imakefile Tue Sep 3 01:15:19 1996 +*************** +*** 1,11 **** +! XCOMM Specify here your Xpm installation directories +! XPM_INCLUDEDIR = /project/motif/build/Xpm3.4/source/lib +! XPM_LIBDIR = /project/motif/build/Xpm3.4/sun/lib +! +! EXTRA_INCLUDES = -I$(XPM_INCLUDEDIR) + + DEPLIBS = $(DEPXLIB) +! LOCAL_LIBRARIES = $(XLIB) -L$(XPM_LIBDIR) -lXpm + SYS_LIBRARIES = -lm + + SRCS = couchex.c myrast.c dialogue.c popup.c\ +--- 1,8 ---- +! DEFINES = -DDIRSOS=\"${X11BASE}/lib/X11/xfedor\" +! EXTRA_INCLUDES = -I$(INCROOT)/X11 + + DEPLIBS = $(DEPXLIB) +! LOCAL_LIBRARIES = $(XLIB) -lXpm + SYS_LIBRARIES = -lm + + SRCS = couchex.c myrast.c dialogue.c popup.c\ diff --git a/x11/xfedor/files/patch-ab b/x11/xfedor/files/patch-ab new file mode 100644 index 000000000000..fa4b4a99939f --- /dev/null +++ b/x11/xfedor/files/patch-ab @@ -0,0 +1,19 @@ +*** sos.c.bak Thu May 26 21:59:13 1994 +--- sos.c Tue Sep 3 01:15:19 1996 +*************** +*** 36,42 **** + { + + if ((dirsos = getenv("SOS"))==0) +! if (UnixFileNameMode) dirsos = "/usr/local/lib/X11/xfedor" ; + else dirsos = ""; + if (UnixFileNameMode) { + newdirsos = (char *)malloc(strlen(dirsos)+2); +--- 36,42 ---- + { + + if ((dirsos = getenv("SOS"))==0) +! if (UnixFileNameMode) dirsos = DIRSOS; + else dirsos = ""; + if (UnixFileNameMode) { + newdirsos = (char *)malloc(strlen(dirsos)+2); diff --git a/x11/xfedor/files/patch-ac b/x11/xfedor/files/patch-ac new file mode 100644 index 000000000000..f8e1920a9ee3 --- /dev/null +++ b/x11/xfedor/files/patch-ac @@ -0,0 +1,19 @@ +*** bitmaps/bull.bak Mon Jun 13 17:59:16 1988 +--- bitmaps/bull Tue Sep 3 01:46:36 1996 +*************** +*** 1,7 **** + #define bull_width 70 + #define bull_height 75 + #define bull_x_hot 0 +! #define bull-y_hot -1 + static char bull_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0x5f, 0xfe, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0x29, 0xfc, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0, +--- 1,7 ---- + #define bull_width 70 + #define bull_height 75 + #define bull_x_hot 0 +! #define bull_y_hot -1 + static char bull_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0x5f, 0xfe, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0x29, 0xfc, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0, diff --git a/x11/xfedor/files/patch-ad b/x11/xfedor/files/patch-ad new file mode 100644 index 000000000000..8e56c774e669 --- /dev/null +++ b/x11/xfedor/files/patch-ad @@ -0,0 +1,57 @@ +*** couchex.c.orig Thu May 26 21:59:03 1994 +--- couchex.c Tue Sep 3 02:09:18 1996 +*************** +*** 366,377 **** + { + XEvent rep ; + static int ZoneCour = 0 ; +! int i, keysym ; + char s[1] ; + + do { + XNextEvent(Dpl,&rep) ; +! if (rep.type == KeyPress) XLookupString(&rep,s,1,&keysym,NULL); + } while ( ((rep.type != Expose) || (rep.xexpose.count != 0)) && + ((rep.type != KeyPress) || (IsModifierKey(keysym))) && + (rep.type != ButtonPress) && +--- 366,378 ---- + { + XEvent rep ; + static int ZoneCour = 0 ; +! int i ; +! KeySym keysym ; + char s[1] ; + + do { + XNextEvent(Dpl,&rep) ; +! if (rep.type == KeyPress) XLookupString(&rep.xkey,s,1,&keysym,NULL); + } while ( ((rep.type != Expose) || (rep.xexpose.count != 0)) && + ((rep.type != KeyPress) || (IsModifierKey(keysym))) && + (rep.type != ButtonPress) && +*************** +*** 788,798 **** + int wd ; + { + int px, py ; +! long bidon ; + XWindowAttributes watt ; + + XGetWindowAttributes(Dpl,wd,&watt); +! XQueryPointer(Dpl,root,&bidon,&bidon,&px,&py,&bidon,&bidon,&bidon); + + if ((px + watt.width/2) > DisplayWidth(Dpl,screen)) + px = DisplayWidth(Dpl,screen) - watt.width/2 ; +--- 789,801 ---- + int wd ; + { + int px, py ; +! Window bidon ; +! int fake; +! unsigned int mfake; + XWindowAttributes watt ; + + XGetWindowAttributes(Dpl,wd,&watt); +! XQueryPointer(Dpl,root,&bidon,&bidon,&px,&py,&fake,&fake,&mfake); + + if ((px + watt.width/2) > DisplayWidth(Dpl,screen)) + px = DisplayWidth(Dpl,screen) - watt.width/2 ; diff --git a/x11/xfedor/files/patch-ae b/x11/xfedor/files/patch-ae new file mode 100644 index 000000000000..08100cd93f76 --- /dev/null +++ b/x11/xfedor/files/patch-ae @@ -0,0 +1,54 @@ +*** filer.c.bak Tue Sep 3 02:38:19 1996 +--- filer.c Tue Sep 3 02:37:19 1996 +*************** +*** 85,91 **** + { + int i ; + int nchars ; +! char * filename[138] ; + int bytesperrow ; + unsigned char * vidmem ; + int vidwidth ; +--- 85,91 ---- + { + int i ; + int nchars ; +! char filename[138] ; + int bytesperrow ; + unsigned char * vidmem ; + int vidwidth ; +*************** +*** 187,193 **** + fprintf(stderr,"\n"); + fprintf(stderr, msg, p1, p2, p3, p4); + fprintf(stderr,"\n"); +! fclose(pF); + return -1 ; + } + +--- 187,194 ---- + fprintf(stderr,"\n"); + fprintf(stderr, msg, p1, p2, p3, p4); + fprintf(stderr,"\n"); +! if (pF != NULL) +! fclose(pF); + return -1 ; + } + +*************** +*** 300,306 **** + + if (!Extension(filename,".bdf")) strcat(filename,".bdf"); + +! if ((pF = fopen( filename, "r")) == NULL) return fatal("Can't open file"); + + getline(linebuf); + if ((sscanf(linebuf, "STARTFONT %s", namebuf) != 1) || +--- 301,307 ---- + + if (!Extension(filename,".bdf")) strcat(filename,".bdf"); + +! if ((pF = fopen( filename, "r")) == NULL) return fatal("Can't open file %s", filename); + + getline(linebuf); + if ((sscanf(linebuf, "STARTFONT %s", namebuf) != 1) || diff --git a/x11/xfedor/pkg-comment b/x11/xfedor/pkg-comment new file mode 100644 index 000000000000..3c44906d744c --- /dev/null +++ b/x11/xfedor/pkg-comment @@ -0,0 +1 @@ +a .bdf fonts/.xbm bitmaps/.xpm colored pixmaps/mouse cursor editor diff --git a/x11/xfedor/pkg-descr b/x11/xfedor/pkg-descr new file mode 100644 index 000000000000..1e148b5e4411 --- /dev/null +++ b/x11/xfedor/pkg-descr @@ -0,0 +1,30 @@ +It not work in > 256 colors modes, please fix it, if you can. + Ache +--------------------------- Original README ------------------------------- +Xfedor is a bdf/xbm/xpm/mouse editor. +It has been achieved before Xt or Motif were available, so it is only +based on Xlib :-| + +Known problems: + - very very old proprietary/personal:-) look&feelsick + - C comments in french + - filer.c module (BDF reader/writer) has to be reviewed for new BDF + stuff and some bugs (COMMENT lines lost, unexpected changes in + read/write only actions...) + - non Xt based => icccm problems, fixed geometry, lack of resources... + - not even X based originally, so don't expect something great. + (visual problem I would say on weird X server). + +Otherwise, it can still help to create mouse cursors, colored pixmaps and +possibly fonts (if you don't care about XLFD compliance...). + +Xfedor needs the Xpm library to link. + + + +Daniel Dardailler. +daniel@osf.org +Last updated: May 26 1994 + +PS: I do *not* support this code anylonger. Nobody does. + diff --git a/x11/xfedor/pkg-plist b/x11/xfedor/pkg-plist new file mode 100644 index 000000000000..f99c26e42c1a --- /dev/null +++ b/x11/xfedor/pkg-plist @@ -0,0 +1,20 @@ +bin/xfedor +lib/X11/xfedor/BEZIERS.sos +lib/X11/xfedor/CIRCLE.sos +lib/X11/xfedor/CUTAP.sos +lib/X11/xfedor/EDIT.sos +lib/X11/xfedor/FILL.sos +lib/X11/xfedor/FONT.sos +lib/X11/xfedor/GARB.sos +lib/X11/xfedor/LINE.sos +lib/X11/xfedor/METRIC.sos +lib/X11/xfedor/NUM.sos +lib/X11/xfedor/RECTANGLE.sos +lib/X11/xfedor/RESIZE.sos +lib/X11/xfedor/ROTATE.sos +lib/X11/xfedor/SAVE.sos +lib/X11/xfedor/SOS.sos +lib/X11/xfedor/TRANSLATE.sos +lib/X11/xfedor/WRITE.sos +lib/X11/xfedor/default.sos +man/cat1/xfedor.1 |