diff options
author | rsc <devnull@localhost> | 2005-01-13 04:49:19 +0000 |
---|---|---|
committer | rsc <devnull@localhost> | 2005-01-13 04:49:19 +0000 |
commit | c8b6342d3c2a167dec16931815926e9e4387e7ef (patch) | |
tree | 80d3ec6ea074462b30639168113def880476dad6 /src/libdraw | |
parent | 741f510ce758f77ed5193256fb693a09a7daecce (diff) | |
download | plan9port-c8b6342d3c2a167dec16931815926e9e4387e7ef.tar.gz plan9port-c8b6342d3c2a167dec16931815926e9e4387e7ef.tar.bz2 plan9port-c8b6342d3c2a167dec16931815926e9e4387e7ef.zip |
Many small edits.
Diffstat (limited to 'src/libdraw')
-rw-r--r-- | src/libdraw/mkfile | 2 | ||||
-rw-r--r-- | src/libdraw/readcolmap.c | 49 | ||||
-rw-r--r-- | src/libdraw/writecolmap.c | 35 | ||||
-rw-r--r-- | src/libdraw/x11-init.c | 4 |
4 files changed, 1 insertions, 89 deletions
diff --git a/src/libdraw/mkfile b/src/libdraw/mkfile index fbbe68e4..7b372337 100644 --- a/src/libdraw/mkfile +++ b/src/libdraw/mkfile @@ -36,7 +36,6 @@ OFILES=\ mkfont.$O\ openfont.$O\ poly.$O\ - readcolmap.$O\ readimage.$O\ readsubfont.$O\ rectclip.$O\ @@ -52,7 +51,6 @@ OFILES=\ subfontname.$O\ unloadimage.$O\ window.$O\ - writecolmap.$O\ writeimage.$O\ writesubfont.$O\ md-alloc.$O\ diff --git a/src/libdraw/readcolmap.c b/src/libdraw/readcolmap.c deleted file mode 100644 index 6eb8ee26..00000000 --- a/src/libdraw/readcolmap.c +++ /dev/null @@ -1,49 +0,0 @@ -#include <u.h> -#include <libc.h> -#include <draw.h> -#include <bio.h> - -static ulong -getval(char **p) -{ - ulong v; - char *q; - - v = strtoul(*p, &q, 0); - v |= v<<8; - v |= v<<16; - *p = q; - return v; -} - -void -readcolmap(Display *d, RGB *colmap) -{ - int i; - char *p, *q; - Biobuf *b; - char buf[128]; - - USED(screen); - - sprint(buf, "/dev/draw/%d/colormap", d->dirno); - b = Bopen(buf, OREAD); - if(b == 0) - drawerror(d, "rdcolmap: can't open colormap device"); - - for(;;) { - p = Brdline(b, '\n'); - if(p == 0) - break; - i = strtoul(p, &q, 0); - if(i < 0 || i > 255) { - fprint(2, "rdcolmap: bad index\n"); - exits("bad"); - } - p = q; - colmap[255-i].red = getval(&p); - colmap[255-i].green = getval(&p); - colmap[255-i].blue = getval(&p); - } - Bterm(b); -} diff --git a/src/libdraw/writecolmap.c b/src/libdraw/writecolmap.c deleted file mode 100644 index 30b026f9..00000000 --- a/src/libdraw/writecolmap.c +++ /dev/null @@ -1,35 +0,0 @@ -#include <u.h> -#include <libc.h> -#include <draw.h> - -/* - * This code (and the devdraw interface) will have to change - * if we ever get bitmaps with ldepth > 3, because the - * colormap will have to be written in chunks - */ - -void -writecolmap(Display *d, RGB *m) -{ - int i, n, fd; - char buf[64], *t; - ulong r, g, b; - - sprint(buf, "/dev/draw/%d/colormap", d->dirno); - fd = open(buf, OWRITE); - if(fd < 0) - drawerror(d, "wrcolmap: open colormap failed"); - t = malloc(8192); - n = 0; - for(i = 0; i < 256; i++) { - r = m[i].red>>24; - g = m[i].green>>24; - b = m[i].blue>>24; - n += sprint(t+n, "%d %lud %lud %lud\n", 255-i, r, g, b); - } - i = write(fd, t, n); - free(t); - close(fd); - if(i != n) - drawerror(d, "wrcolmap: bad write"); -} diff --git a/src/libdraw/x11-init.c b/src/libdraw/x11-init.c index fea08e4f..b1afcf19 100644 --- a/src/libdraw/x11-init.c +++ b/src/libdraw/x11-init.c @@ -346,9 +346,7 @@ xattach(char *label) display_resources = XResourceManagerString(_x.display); if(display_resources == nil){ - home = getenv("home"); - if(home == nil) - home = getenv("HOME"); + home = getenv("HOME"); if(home!=nil && (file=smprint("%s/.Xdefaults", home)) != nil){ XrmCombineFileDatabase(file, &database, False); free(file); |