lehors@avahi.inria.fr (Arnaud Le Hors) (09/08/90)
Now, the XPM functions deal with compressed files.
First, a general remark:
It is obvious for anyone that images must be able to be stored in a compressed
format. Following the distribution of the new version of XPM, I have been said
that it has not "the saving grace of being compressed." But, we think that
compression by compress is much better than run-length encoding, and better
not put a compression method (which is subject to changes and enhancements)
in the format.
So now, the XPM functions deal with compressing/uncompressing files by forking
a compress/uncompress process.
This new feature works as follows:
While reading a file using XReadPixmapFile, if the given name ends by .Z it is
assumed to be a compressed file. In case the file name does not end so,
XReadPixmapFile first looks for a file of which the name is the given one
followed by .Z; then if such a file does not exist, it looks for the given file
(assumed as not compressed).
While writting using XWritePixmapFile, if the given file name ends by .Z it is
assumed to be a compressed file.
Patch:
To end, follows a patch which should be applied to the version 2.3. This patch
includes the compress/uncompress feature, the modification of the
documentation,
and a fix to the demo which now deals with window managers.
*** Note :***
The latest release of the XPM library is always available on expo.lcs.mit.edu
and avahi.inria.fr. In addition, for those who do not have latex, a compressed
postscript documentation file is available on avahi.inria.fr.
--
Arnaud LE HORS
BULL Research FRANCE -- Koala Project | Email : lehors@mirsa.inria.fr
Inria - Sophia Antipolis | Phone : (33) 93 65 77 71
2004, Route des Lucioles | Telex : 97 00 50 F
06565 Valbonne CEDEX France | Fax : (33) 93 65 77 66
--- cut here ---
Go into the XPM v2.3 source directory, and pipe this file into "patch -p"
You may want to clean the directory afterwards by a:
find . \( -name \*.orig -o -size 0 \) -exec rm {} \;
diff -c1 -r -N ./Makefile /tmp/xpm-new/Makefile
*** ./Makefile Thu Sep 6 14:36:56 1990
--- /tmp/xpm-new/Makefile Thu Sep 6 14:36:53 1990
***************
*** 3,5 ****
# XPM Makefile - Arnaud LE HORS
! # $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
#
--- 3,5 ----
# XPM Makefile - Arnaud LE HORS
! # $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
#
diff -c1 -r -N ./README /tmp/xpm-new/README
*** ./README Thu Sep 6 14:36:56 1990
--- /tmp/xpm-new/README Thu Sep 6 14:36:53 1990
***************
*** 1,2 ****
! $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
--- 1,2 ----
! $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
diff -c1 -r -N ./XCrPFData.c /tmp/xpm-new/XCrPFData.c
*** ./XCrPFData.c Thu Sep 6 14:36:56 1990
--- /tmp/xpm-new/XCrPFData.c Thu Sep 6 14:36:53 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
***************
*** 31,41 ****
*width_return = *height_return = 0;
- if (! (mdata = (MData *)malloc(sizeof(MData)))) {
- XpmErrorStatus = PixmapNoMemory;
- return(NULL);
- }
- mdata->type = MARRAY;
- mdata->stream = (void*) data;
- mdata->cptr = *data;
- mdata->line = 0;
XpmErrorStatus = PixmapSuccess;
*pixmap_return = CreatePixmap(display, visual, d, colormap, mdata, depth,
--- 31,38 ----
*width_return = *height_return = 0;
XpmErrorStatus = PixmapSuccess;
+
+ mdata = mdataopen(data);
+ if (XpmErrorStatus != PixmapSuccess)
+ return(XpmErrorStatus);
+
*pixmap_return = CreatePixmap(display, visual, d, colormap, mdata, depth,
***************
*** 44,46 ****
colorsymbols, numsymbols, infos);
! free(mdata);
return(XpmErrorStatus);
--- 41,43 ----
colorsymbols, numsymbols, infos);
! mclose(mdata);
return(XpmErrorStatus);
diff -c1 -r -N ./XRdPixF.c /tmp/xpm-new/XRdPixF.c
*** ./XRdPixF.c Thu Sep 6 14:36:56 1990
--- /tmp/xpm-new/XRdPixF.c Thu Sep 6 14:36:53 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
***************
*** 36,47 ****
! if (! (mdata = (MData *)malloc(sizeof(MData)))) {
! return(XpmErrorStatus = PixmapNoMemory);
! }
! mdata->type = MFILE;
! if (! (mdata->stream = (void*) fopen(filename, "r"))) {
! free(mdata);
! return(XpmErrorStatus = PixmapOpenFailed);
! }
! mdata->cptr = NULL;
! mdata->line = 0;
--- 36,40 ----
! mdata = mreadopen(filename);
! if (XpmErrorStatus != PixmapSuccess)
! return(XpmErrorStatus);
***************
*** 90,93 ****
}
! fclose((FILE *) mdata->stream);
! free(mdata);
return(XpmErrorStatus);
--- 83,86 ----
}
! mclose(mdata);
!
return(XpmErrorStatus);
diff -c1 -r -N ./XWrPixF.c /tmp/xpm-new/XWrPixF.c
*** ./XWrPixF.c Thu Sep 6 14:36:56 1990
--- /tmp/xpm-new/XWrPixF.c Thu Sep 6 14:36:53 1990
***************
*** 5,7 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 5,7 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
***************
*** 20,22 ****
} \
! fclose(stream); \
return(XpmErrorStatus = status); }
--- 20,22 ----
} \
! mclose(mdata); \
return(XpmErrorStatus = status); }
***************
*** 34,36 ****
! { FILE *stream;
XImage *ximage = NULL;
--- 34,36 ----
! { MData *mdata;
XImage *ximage = NULL;
***************
*** 51,55 ****
- if (! (stream = fopen(filename, "w"))) {
- return(XpmErrorStatus = PixmapOpenFailed);
- }
XpmErrorStatus = PixmapSuccess;
--- 51,52 ----
***************
*** 56,57 ****
--- 53,58 ----
+ mdata = mwriteopen(filename);
+ if (XpmErrorStatus != PixmapSuccess)
+ return(XpmErrorStatus);
+
if (!(name = rindex(filename, '/')))
***************
*** 187,192 ****
*/
! fprintf(stream, "%s XPM2 %s %s", DataTypes[n].Bcmt, DataTypes[n].type,
! DataTypes[n].Ecmt);
if (n != 0) /* print the assignment line */
! fprintf(stream, "%s %s %s", DataTypes[n].Dec, name,
DataTypes[n].Boa);
--- 188,193 ----
*/
! fprintf(mdata->stream.file, "%s XPM2 %s %s", DataTypes[n].Bcmt,
! DataTypes[n].type, DataTypes[n].Ecmt);
if (n != 0) /* print the assignment line */
! fprintf(mdata->stream.file, "%s %s %s", DataTypes[n].Dec, name,
DataTypes[n].Boa);
***************
*** 196,198 ****
if (infos && infos->hints_cmt) /* print hints comment line */
! fprintf(stream, "%s%s%s", DataTypes[n].Bcmt,
infos->hints_cmt, DataTypes[n].Ecmt);
--- 197,199 ----
if (infos && infos->hints_cmt) /* print hints comment line */
! fprintf(mdata->stream.file, "%s%s%s", DataTypes[n].Bcmt,
infos->hints_cmt, DataTypes[n].Ecmt);
***************
*** 199,204 ****
! if (DataTypes[n].Bos) fprintf(stream, "%c", DataTypes[n].Bos);
! fprintf(stream, "%d %d %d %d", width, height, ncolors, cpp);
! if (DataTypes[n].Eos) fprintf(stream, "%c", DataTypes[n].Eos);
! fprintf(stream, DataTypes[n].Strs);
--- 200,205 ----
! if (DataTypes[n].Bos) fprintf(mdata->stream.file, "%c", DataTypes[n].Bos);
! fprintf(mdata->stream.file, "%d %d %d %d", width, height, ncolors, cpp);
! if (DataTypes[n].Eos) fprintf(mdata->stream.file, "%c", DataTypes[n].Eos);
! fprintf(mdata->stream.file, DataTypes[n].Strs);
***************
*** 207,209 ****
if (infos && infos->colors_cmt) /* print colors comment line */
! fprintf(stream, "%s%s%s", DataTypes[n].Bcmt,
infos->colors_cmt, DataTypes[n].Ecmt);
--- 208,210 ----
if (infos && infos->colors_cmt) /* print colors comment line */
! fprintf(mdata->stream.file, "%s%s%s", DataTypes[n].Bcmt,
infos->colors_cmt, DataTypes[n].Ecmt);
***************
*** 211,215 ****
for (a = 0; a < ncolors; a++) {
! if (DataTypes[n].Bos) fprintf(stream, "%c", DataTypes[n].Bos);
for (b = 0; b < cpp; b++)
! fprintf(stream, "%c", *(*(colorStrings + a) + b));
c = 1;
--- 212,217 ----
for (a = 0; a < ncolors; a++) {
! if (DataTypes[n].Bos)
! fprintf(mdata->stream.file, "%c", DataTypes[n].Bos);
for (b = 0; b < cpp; b++)
! fprintf(mdata->stream.file, "%c", *(*(colorStrings + a) + b));
c = 1;
***************
*** 223,225 ****
if (*(*(infos->colorTable + b) + key))
! fprintf(stream, " %s %s", ColorKeys[key - 1],
*(*(infos->colorTable + b) + key));
--- 225,228 ----
if (*(*(infos->colorTable + b) + key))
! fprintf(mdata->stream.file, " %s %s",
! ColorKeys[key - 1],
*(*(infos->colorTable + b) + key));
***************
*** 229,234 ****
if (c)
! fprintf(stream, " c #%04X%04X%04X", (xcolors + a)->red,
! (xcolors + a)->green, (xcolors + a)->blue);
! if (DataTypes[n].Eos) fprintf(stream, "%c", DataTypes[n].Eos);
! fprintf(stream, DataTypes[n].Strs);
}
--- 232,239 ----
if (c)
! fprintf(mdata->stream.file, " c #%04X%04X%04X",
! (xcolors + a)->red, (xcolors + a)->green,
! (xcolors + a)->blue);
! if (DataTypes[n].Eos)
! fprintf(mdata->stream.file, "%c", DataTypes[n].Eos);
! fprintf(mdata->stream.file, DataTypes[n].Strs);
}
***************
*** 238,240 ****
if (infos && infos->pixels_cmt) /* print pixels comment line */
! fprintf(stream, "%s%s%s", DataTypes[n].Bcmt,
infos->pixels_cmt, DataTypes[n].Ecmt);
--- 243,245 ----
if (infos && infos->pixels_cmt) /* print pixels comment line */
! fprintf(mdata->stream.file, "%s%s%s", DataTypes[n].Bcmt,
infos->pixels_cmt, DataTypes[n].Ecmt);
***************
*** 243,245 ****
for (y = 0; y < height; y++) {
! if (DataTypes[n].Bos) fprintf(stream, "%c", DataTypes[n].Bos);
for (x = 0; x < width; x++) {
--- 248,251 ----
for (y = 0; y < height; y++) {
! if (DataTypes[n].Bos)
! fprintf(mdata->stream.file, "%c", DataTypes[n].Bos);
for (x = 0; x < width; x++) {
***************
*** 246,248 ****
for (b = 0; b < cpp; b++) {
! fprintf(stream, "%c",
*(*(colorStrings + memToVal(dptr, pixlen)) + b));
--- 252,254 ----
for (b = 0; b < cpp; b++) {
! fprintf(mdata->stream.file, "%c",
*(*(colorStrings + memToVal(dptr, pixlen)) + b));
***************
*** 251,255 ****
}
! if (DataTypes[n].Eos) fprintf(stream, "%c", DataTypes[n].Eos);
if (y < height - 1)
! fprintf(stream, DataTypes[n].Strs);
for (c = 0; c < pixgap; c++) dptr += pixlen; /* skip extra pixels */
--- 257,262 ----
}
! if (DataTypes[n].Eos)
! fprintf(mdata->stream.file, "%c", DataTypes[n].Eos);
if (y < height - 1)
! fprintf(mdata->stream.file, DataTypes[n].Strs);
for (c = 0; c < pixgap; c++) dptr += pixlen; /* skip extra pixels */
***************
*** 256,260 ****
}
! fprintf(stream, DataTypes[n].Eoa);
! fclose(stream);
free(index);
--- 263,267 ----
}
! fprintf(mdata->stream.file, DataTypes[n].Eoa);
! free(mdata);
free(index);
diff -c1 -r -N ./create.c /tmp/xpm-new/create.c
*** ./create.c Thu Sep 6 14:36:57 1990
--- /tmp/xpm-new/create.c Thu Sep 6 14:36:53 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
diff -c1 -r -N ./demo.c /tmp/xpm-new/demo.c
*** ./demo.c Thu Sep 6 14:36:57 1990
--- /tmp/xpm-new/demo.c Thu Sep 6 14:36:53 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
***************
*** 51,52 ****
--- 51,55 ----
static XSetWindowAttributes xswa;
+ static XSizeHints hints ;
+ static XClassHint classhint ;
+ static XWMHints wmhints ;
static char **command ;
***************
*** 66,67 ****
--- 69,71 ----
int winx, winy, winw, winh;
+ int flag ;
char *display = NULL ;
***************
*** 114,116 ****
if (geom) {
! XParseGeometry(geom, &winx, &winy, &winw, &winh) ;
}
--- 118,120 ----
if (geom) {
! flag = XParseGeometry(geom, &winx, &winy, &winw, &winh) ;
}
***************
*** 123,125 ****
! xswa.background_pixel = WhitePixel(dpy,DefaultScreen(dpy)) ;
xswa.event_mask = ButtonPressMask;
--- 127,130 ----
! xswa.background_pixel = WhitePixel(dpy, screen) ;
! xswa.border_pixel = BlackPixel(dpy, screen);
xswa.event_mask = ButtonPressMask;
***************
*** 126,128 ****
xswa.save_under = True ;
- xswa.override_redirect = True ;
win = XCreateWindow(dpy,root,
--- 131,132 ----
***************
*** 132,133 ****
--- 136,163 ----
CWOverrideRedirect|CWSaveUnder, &xswa);
+
+ hints.flags = (((flag && XValue) || (flag && YValue))?
+ USPosition : PPosition)|
+ (((flag && WidthValue) || (flag && HeightValue))?
+ USSize : PSize) ;
+ hints.x = winx ;
+ hints.y = winy ;
+ hints.width = winw ;
+ hints.height = winh ;
+
+ XSetStandardProperties(dpy, win,
+ command[0],
+ command[0],
+ None,
+ command,argc,
+ &hints);
+ XSetNormalHints(dpy, win, &hints);
+
+ classhint.res_name = command[0] ;
+ classhint.res_class = "demo" ;
+ XSetClassHint(dpy, win, &classhint);
+
+ wmhints.input = True;
+ wmhints.initial_state = NormalState;
+ wmhints.flags = InputHint | StateHint;
+ XSetWMHints(dpy, win, &wmhints);
diff -c1 -r -N ./free.c /tmp/xpm-new/free.c
*** ./free.c Thu Sep 6 14:36:57 1990
--- /tmp/xpm-new/free.c Thu Sep 6 14:36:53 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
diff -c1 -r -N ./mio.c /tmp/xpm-new/mio.c
*** ./mio.c Thu Sep 6 14:36:57 1990
--- /tmp/xpm-new/mio.c Thu Sep 6 14:36:53 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
***************
*** 10,11 ****
--- 10,13 ----
#include "xpmP.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
***************
*** 31,33 ****
case MARRAY:
! mdata->cptr = ((char **)mdata->stream)[++mdata->line];
break;
--- 33,35 ----
case MARRAY:
! mdata->cptr = (mdata->stream.data)[++mdata->line];
break;
***************
*** 34,35 ****
--- 36,38 ----
case MFILE:
+ case MPIPE:
while ((c = mgetc(mdata)) != EOS && c != EOF);
***************
*** 59,61 ****
case MFILE:
! c = getc((FILE *)mdata->stream);
if (BCMT && c == BCMT[0]) {
--- 62,65 ----
case MFILE:
! case MPIPE:
! c = getc(mdata->stream.file);
if (BCMT && c == BCMT[0]) {
***************
*** 64,66 ****
*/
! while ((Comment[n] = getc((FILE *)mdata->stream)) == BCMT[n]
&& BCMT[n] != '\0' && Comment[n] != EOF) n++;
--- 68,70 ----
*/
! while ((Comment[n] = getc(mdata->stream.file)) == BCMT[n]
&& BCMT[n] != '\0' && Comment[n] != EOF) n++;
***************
*** 78,80 ****
while (Comment[n] != ECMT[0] && Comment[n] != EOF)
! Comment[++n] = getc((FILE *)mdata->stream);
CommentLength = n++;
--- 82,84 ----
while (Comment[n] != ECMT[0] && Comment[n] != EOF)
! Comment[++n] = getc(mdata->stream.file);
CommentLength = n++;
***************
*** 81,83 ****
a = 1;
! while ((Comment[n] = getc((FILE *)mdata->stream)) == ECMT[a]
&& ECMT[a] != '\0' && Comment[n] != EOF) { a++; n++; }
--- 85,87 ----
a = 1;
! while ((Comment[n] = getc(mdata->stream.file)) == ECMT[a]
&& ECMT[a] != '\0' && Comment[n] != EOF) { a++; n++; }
***************
*** 103,105 ****
case MFILE:
! return(ungetc(c, (FILE *)mdata->stream));
}
--- 107,110 ----
case MFILE:
! case MPIPE:
! return(ungetc(c, mdata->stream.file));
}
***************
*** 118,119 ****
--- 123,125 ----
case MFILE:
+ case MPIPE:
while ((c = mgetc(mdata)) == SPC || c == TAB);
***************
*** 138,139 ****
--- 144,146 ----
case MFILE:
+ case MPIPE:
while ((buf[n] = mgetc(mdata)) != SPC
***************
*** 140,142 ****
&& buf[n] != TAB && buf[n] != EOS && buf[n] != EOF) n++;
! ungetc(buf[n],(FILE *)mdata->stream);
break;
--- 147,149 ----
&& buf[n] != TAB && buf[n] != EOS && buf[n] != EOF) n++;
! ungetc(buf[n],mdata->stream.file);
break;
***************
*** 154,155 ****
--- 161,163 ----
case MFILE:
+ case MPIPE:
if (CommentLength) {
***************
*** 163,164 ****
--- 171,282 ----
}
+ }
+
+
+ MData* mreadopen(filename)
+ char *filename;
+ { MData* mdata;
+ char *compressfile, buf[BUFSIZ];
+ struct stat status;
+
+ if (! (mdata = (MData *)malloc(sizeof(MData)))) {
+ XpmErrorStatus = PixmapNoMemory;
+ return(NULL);
+ }
+ if ((strlen(filename) > 2) &&
+ !strcmp(".Z", filename + (strlen(filename) - 2))) {
+ mdata->type= MPIPE;
+ sprintf(buf, "uncompress -c %s", filename);
+ if (! (mdata->stream.file = popen(buf, "r"))) {
+ free(mdata);
+ XpmErrorStatus = PixmapOpenFailed;
+ return(NULL);
+ }
+ } else {
+ if (! (compressfile = (char*)malloc(strlen(filename) + 3))) {
+ free(mdata);
+ XpmErrorStatus = PixmapNoMemory;
+ return(NULL);
+ }
+ strcpy(compressfile, filename);
+ strcat(compressfile, ".Z");
+ if (!stat(compressfile, &status)) {
+ sprintf(buf, "uncompress -c %s", compressfile);
+ if (! (mdata->stream.file = popen(buf, "r"))) {
+ free(mdata);
+ free(compressfile);
+ XpmErrorStatus = PixmapOpenFailed;
+ return(NULL);
+ }
+ mdata->type= MPIPE;
+ } else {
+ if (! (mdata->stream.file = fopen(filename, "r"))) {
+ free(mdata);
+ free(compressfile);
+ XpmErrorStatus = PixmapOpenFailed;
+ return(NULL);
+ }
+ mdata->type = MFILE;
+ }
+ free(compressfile);
+ }
+ return(mdata);
+ }
+
+ MData* mwriteopen(filename)
+ char *filename;
+ { MData* mdata;
+ char buf[BUFSIZ];
+
+ if (! (mdata = (MData *)malloc(sizeof(MData)))) {
+ XpmErrorStatus = PixmapNoMemory;
+ return(NULL);
+ }
+ if ((strlen(filename) > 2) &&
+ !strcmp(".Z", filename + (strlen(filename) - 2))) {
+ sprintf(buf, "compress > %s", filename);
+ if (! (mdata->stream.file = popen(buf, "w"))) {
+ free(mdata);
+ XpmErrorStatus = PixmapOpenFailed;
+ return(NULL);
+ }
+ mdata->type = MPIPE;
+ } else {
+ if (! (mdata->stream.file = fopen(filename, "w"))) {
+ free(mdata);
+ XpmErrorStatus = PixmapOpenFailed;
+ return(NULL);
+ }
+ mdata->type = MFILE;
+ }
+ return(mdata);
+ }
+
+ MData* mdataopen(data)
+ char **data;
+ { MData *mdata;
+
+ if (! (mdata = (MData *)malloc(sizeof(MData)))) {
+ XpmErrorStatus = PixmapNoMemory;
+ return(NULL);
+ }
+ mdata->type = MARRAY;
+ mdata->stream.data = data;
+ mdata->cptr = *data;
+ mdata->line = 0;
+ return(mdata);
+ }
+
+ mclose(mdata)
+ MData *mdata;
+ {
+ switch(mdata->type) {
+ case MARRAY:
+ break;
+ case MFILE:
+ fclose(mdata->stream.file);
+ break;
+ case MPIPE:
+ pclose(mdata->stream.file);
+ }
+ free(mdata);
}
diff -c1 -r -N ./value.c /tmp/xpm-new/value.c
*** ./value.c Thu Sep 6 14:36:58 1990
--- /tmp/xpm-new/value.c Thu Sep 6 14:36:54 1990
***************
*** 26,28 ****
*
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 26,28 ----
*
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
diff -c1 -r -N ./visual.c /tmp/xpm-new/visual.c
*** ./visual.c Thu Sep 6 14:36:58 1990
--- /tmp/xpm-new/visual.c Thu Sep 6 14:36:54 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
diff -c1 -r -N ./xpm.h /tmp/xpm-new/xpm.h
*** ./xpm.h Thu Sep 6 14:36:58 1990
--- /tmp/xpm-new/xpm.h Thu Sep 6 14:36:54 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
diff -c1 -r -N ./xpm.tex /tmp/xpm-new/xpm.tex
*** ./xpm.tex Thu Sep 6 14:36:59 1990
--- /tmp/xpm-new/xpm.tex Thu Sep 6 14:36:54 1990
***************
*** 4,6 ****
! % $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
%
--- 4,6 ----
! % $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
%
***************
*** 51,53 ****
\begin{center}
! \Large Version \RCSRevVersion$Version: 2.1 $\\
\end{center}
--- 51,53 ----
\begin{center}
! \Large Version \RCSRevVersion$Version: 2.4 $\\
\end{center}
***************
*** 132,133 ****
--- 132,134 ----
\item allow comments to be included in the file.
+ \item compression must be managed apart of the format.
\end{itemize}
***************
*** 340,347 ****
! {\bf XReadPixmapFile} returns the pixmap's height and width, as read from
the
! file, to width\_return and height\_return. It reads the colors and pixels
data
! from the file. It allocates colors, as read from the file or possibly
! overridden as specified in the given colorsymbols array. The colors are
! allocated dependently on the type of visual and on the default colors. If no
! default value exits for the specified visual, it first looks for other
defaults nearer to the monochrome visual type and secondly nearer to the
color
--- 341,348 ----
! {\bf XReadPixmapFile} returns the pixmap's height and width, as read
! from the file, to width\_return and height\_return. It reads the colors and
! pixels data from the file. It allocates colors, as read from the file or
! possibly overridden as specified in the given colorsymbols array. The
colors
! are allocated dependently on the type of visual and on the default colors.
If
! no default value exits for the specified visual, it first looks for other
defaults nearer to the monochrome visual type and secondly nearer to the
color
***************
*** 355,356 ****
--- 356,364 ----
+ {\bf XReadPixmapFile} deals with compressed files by forking an uncompress
+ process and reading from the piped result. It assumes that the specified
file
+ is compressed if the given file name ends by .Z. In case the file name does
+ not end so, {\bf XReadPixmapFile} first looks for a file of which the name
is
+ the given one followed by .Z; then if such a file does not exist, it looks
for
+ the given file (assumed as not compressed).
+
\vspace{.5cm}
***************
*** 400,401 ****
--- 408,412 ----
stored informations such as comments, and color defaults and symbols.
+
+ If the given file name ends by .Z it is assumed to be a compressed file.
Then,
+ {\bf XWritePixmapFile} writes to a piped compress process.
diff -c1 -r -N ./xpmP.h /tmp/xpm-new/xpmP.h
*** ./xpmP.h Thu Sep 6 14:36:59 1990
--- /tmp/xpm-new/xpmP.h Thu Sep 6 14:36:54 1990
***************
*** 6,8 ****
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.3 90/08/30 16:31:37 lehors Exp $
*/
--- 6,8 ----
* Developped by Arnaud Le Hors
! * $Id: xpm.shar,v 2.4 90/09/06 14:36:25 lehors Exp $
*/
***************
*** 26,28 ****
unsigned int type;
! void *stream;
char *cptr;
--- 26,31 ----
unsigned int type;
! union {
! FILE *file;
! char **data;
! } stream;
char *cptr;
***************
*** 41,42 ****
--- 44,46 ----
#define MFILE 1
+ #define MPIPE 2
***************
*** 177,178 ****
--- 181,186 ----
FUNC(mgetcmt, int, (MData *mdata, char **cmt));
+ FUNC(mreadopen, MData*, (char *filename));
+ FUNC(mwriteopen, MData*, (char *filename));
+ FUNC(mdataopen, MData*, (char **data));
+ FUNC(mclose, int, (MData *mdata));