Import from FreeBSD tree.

This commit is contained in:
don 1997-12-20 02:47:06 +00:00
parent 91fa01f914
commit 843cbb2c42
17 changed files with 310 additions and 0 deletions

25
x11/xloadimage/Makefile Normal file
View File

@ -0,0 +1,25 @@
# OpenBSD makefile for: xloadimage
# Version required: 3.03
# Date created: December 17, 1997
# Whom: Don Schmidt
#
# $OpenBSD: Makefile,v 1.1.1.1 1997/12/20 02:47:06 don Exp $
#
DISTNAME= xloadimage
PKGNAME= xloadimage-3.03
CATEGORIES= x11
MASTER_SITES= ftp://gatekeeper.dec.com/pub/X11-contrib/
DISTFILES= xloadimage.3.03.tar.Z
MAINTAINER= don@OpenBSD.ORG
NO_WRKSUBDIR= yes
USE_IMAKE= yes
MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/cat1 \
XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
pre-install:
@${MKDIR} -p ${PREFIX}/lib/X11/app-defaults
.include <bsd.port.mk>

1
x11/xloadimage/files/md5 Normal file
View File

@ -0,0 +1 @@
MD5 (xloadimage.3.03.tar.Z) = abccaa1f38a2f18721943bb16ea3b920

View File

@ -0,0 +1,15 @@
*** image.h~ Mon Nov 16 20:09:57 1992
--- image.h Sun Jan 8 22:57:55 1995
***************
*** 9,15 ****
--- 9,18 ----
*/
#include "copyright.h"
+
+ #define zopen stdio_zopen
#include <stdio.h>
+ #undef zopen
#if defined(SYSV) || defined(VMS)
#include <string.h>

View File

@ -0,0 +1,14 @@
*** xloadimage.h~ Mon Nov 16 20:10:19 1992
--- xloadimage.h Sun Jan 8 22:58:41 1995
***************
*** 7,13 ****
--- 7,15 ----
*/
#include "copyright.h"
+ #define zopen stdio_zopen
#include <stdio.h>
+ #undef zopen
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>

View File

@ -0,0 +1,12 @@
*** rlelib.c~ Mon Nov 16 20:10:11 1992
--- rlelib.c Sun Jan 8 22:59:18 1995
***************
*** 10,16 ****
*
*/
- #include <stdio.h>
#include <math.h>
#include <varargs.h>
#include <ctype.h>
--- 10,15 ----

View File

@ -0,0 +1,12 @@
*** rle.c~ Mon Nov 16 20:10:10 1992
--- rle.c Sun Jan 8 22:59:56 1995
***************
*** 20,26 ****
#define MIN(a,b) ( (a)<(b) ? (a) : (b))
#include <math.h>
- #include <stdio.h>
#include "image.h"
#include "rle.h"
--- 20,25 ----

View File

@ -0,0 +1,12 @@
*** mac.c~ Mon Nov 16 20:10:03 1992
--- mac.c Sun Jan 8 23:00:34 1995
***************
*** 18,24 ****
04/15/91 2 nazgul Check for end of file instead of using -1 as a runlength!
*/
- # include <stdio.h>
# include <math.h>
# include <ctype.h>
# include "image.h"
--- 18,23 ----

View File

@ -0,0 +1,12 @@
*** img.c~ Mon Nov 16 20:09:58 1992
--- img.c Sun Jan 8 23:01:09 1995
***************
*** 9,15 ****
** (see file "tgncpyrght.h" for complete copyright information)
*/
- #include <stdio.h>
#include "tgncpyrght.h"
#include "image.h"
#include "img.h"
--- 9,14 ----

View File

@ -0,0 +1,19 @@
*** fbm.c~ Mon Nov 16 20:09:55 1992
--- fbm.c Sun Jan 8 23:01:38 1995
***************
*** 14,20 ****
* Copyright 1990 Mark Majhor (see the included file
* "mrmcpyrght.h" for complete copyright information)
*/
! # include <stdio.h>
# include <math.h>
# include <ctype.h>
# include "image.h"
--- 14,20 ----
* Copyright 1990 Mark Majhor (see the included file
* "mrmcpyrght.h" for complete copyright information)
*/
!
# include <math.h>
# include <ctype.h>
# include "image.h"

View File

@ -0,0 +1,26 @@
*** misc.c~ Mon Nov 16 20:10:05 1992
--- misc.c Sun Jan 8 23:08:24 1995
***************
*** 251,257 ****
else
return(0);
}
!
/*
strstr - public-domain implementation of standard C library function
--- 251,257 ----
else
return(0);
}
! #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
/*
strstr - public-domain implementation of standard C library function
***************
*** 333,335 ****
--- 333,336 ----
}
}
+ #endif /* !defined(__FreeBSD__) && !defined(__OpenBSD__) */

View File

@ -0,0 +1,12 @@
*** pcx.c~ Mon Nov 16 20:10:09 1992
--- pcx.c Sun Jan 8 23:09:54 1995
***************
*** 26,32 ****
** ARPA: mike@relgyro.stanford.edu
*/
- #include <stdio.h>
#include "image.h"
#include "tgncpyrght.h"
#include "pcx.h"
--- 26,31 ----

View File

@ -0,0 +1,19 @@
*** send.c~ Mon Nov 16 20:10:12 1992
--- send.c Sun Jan 8 23:11:45 1995
***************
*** 10,16 ****
#include "copyright.h"
#include "xloadimage.h"
!
static int GotError;
static int pixmapErrorTrap(disp, pErrorEvent)
--- 10,16 ----
#include "copyright.h"
#include "xloadimage.h"
! #include <X11/Xlibint.h>
static int GotError;
static int pixmapErrorTrap(disp, pErrorEvent)

View File

@ -0,0 +1,44 @@
*** root.c.orig Tue Dec 9 21:30:34 1997
--- root.c Tue Dec 9 21:46:35 1997
***************
*** 65,75 ****
Display *dpy;
Window w;
{
! Pixmap *pm;
Atom actual_type; /* NOTUSED */
int format;
! int nitems;
! int bytes_after;
/* intern the property name */
Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
--- 65,75 ----
Display *dpy;
Window w;
{
! unsigned char *pm;
Atom actual_type; /* NOTUSED */
int format;
! unsigned long nitems;
! unsigned long bytes_after;
/* intern the property name */
Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
***************
*** 82,88 ****
if ((actual_type == XA_PIXMAP) && (format == 32) &&
(nitems == 1) && (bytes_after == 0)) {
/* blast it away */
! XKillClient(dpy, (Pixmap *) *pm);
XFree(pm);
}
else if (actual_type != None) {
--- 82,88 ----
if ((actual_type == XA_PIXMAP) && (format == 32) &&
(nitems == 1) && (bytes_after == 0)) {
/* blast it away */
! XKillClient(dpy, (XID) *pm);
XFree(pm);
}
else if (actual_type != None) {

View File

@ -0,0 +1,53 @@
*** window.c.orig Tue Dec 9 21:33:33 1997
--- window.c Tue Dec 9 22:01:03 1997
***************
*** 234,240 ****
cmap_windows[0]= ImageWindow;
cmap_windows[1]= ViewportWin;
XChangeProperty(disp, ViewportWin, cmap_atom, XA_WINDOW, 32,
! PropModePrepend, cmap_windows, 2);
}
}
--- 234,240 ----
cmap_windows[0]= ImageWindow;
cmap_windows[1]= ViewportWin;
XChangeProperty(disp, ViewportWin, cmap_atom, XA_WINDOW, 32,
! PropModePrepend, (unsigned char *) cmap_windows, 2);
}
}
***************
*** 674,680 ****
delete_atom = XInternAtom(disp, "WM_DELETE_WINDOW", False);
if ((proto_atom != None) && (delete_atom != None))
XChangeProperty(disp, ViewportWin, proto_atom, XA_ATOM, 32,
! PropModePrepend, &delete_atom, 1);
paint= 0;
}
else {
--- 674,680 ----
delete_atom = XInternAtom(disp, "WM_DELETE_WINDOW", False);
if ((proto_atom != None) && (delete_atom != None))
XChangeProperty(disp, ViewportWin, proto_atom, XA_ATOM, 32,
! PropModePrepend, (unsigned char *) &delete_atom, 1);
paint= 0;
}
else {
***************
*** 911,917 ****
mousex= event.button.x;
mousey= event.button.y;
/*XSync(disp, False); */
! while (XCheckTypedEvent(disp, MotionNotify, &event) == True) {
mousex= event.button.x;
mousey= event.button.y;
}
--- 911,917 ----
mousex= event.button.x;
mousey= event.button.y;
/*XSync(disp, False); */
! while (XCheckTypedEvent(disp, MotionNotify, (XEvent *) &event) == True) {
mousex= event.button.x;
mousey= event.button.y;
}

View File

@ -0,0 +1 @@
X11 Image Loading Utility.

28
x11/xloadimage/pkg/DESCR Normal file
View File

@ -0,0 +1,28 @@
This utility will view several types of images under X11, or load
images onto the root window. The current version supports:
CMU Window Manager raster files
Faces Project images
Fuzzy Bitmap (FBM) images
GEM bit images
GIF images
G3 FAX images
JFIF-style JPEG images
McIDAS areafiles
MacPaint images
PC Paintbrush (PCX) images
Portable Bitmap (PBM, PGM, PPM) images
Sun monochrome rasterfiles
Sun color RGB rasterfiles
Utah Raster Toolkit (RLE) files
X pixmap files
X10 bitmap files
X11 bitmap files
X Window Dump (except XYPixmap, TrueColor and DirectColor)
A variety of options are available to modify images prior to viewing.
These options include clipping, dithering, depth reduction, zoom
(either X or Y axis independently or both at once), brightening or
darkening, and image merging. When applicable, these options are done
automatically (eg a color image to be displayed on a monochrome screen
will be dithered automatically).

5
x11/xloadimage/pkg/PLIST Normal file
View File

@ -0,0 +1,5 @@
bin/xloadimage
bin/xview
bin/xsetbg
lib/X11/app-defaults/Xloadimage
man/man1/xloadimage.0