commit 41e0f84ca63bc829155647d99041ca3f2b1778f7 from: rsc date: Wed Feb 02 22:04:41 2005 UTC break x11 for sure commit - 568e208e3768e303d21836bbaa0d7c2fbef8c10c commit + 41e0f84ca63bc829155647d99041ca3f2b1778f7 blob - 7b3723376f92678d43bc8094023a7d6a3a950995 blob + da115f31a1f1796c3df08277743aaa58afd44882 --- src/libdraw/mkfile +++ src/libdraw/mkfile @@ -85,21 +85,6 @@ OFILES=\ ml-ltofront.$O\ ml-ltorear.$O\ ml-unload.$O\ - x11-alloc.$O\ - x11-cload.$O\ - x11-draw.$O\ - x11-event.$O\ - x11-fill.$O\ - x11-get.$O\ - x11-init.$O\ - x11-itrans.$O\ - x11-keyboard.$O\ - x11-keysym2ucs.$O\ - x11-load.$O\ - x11-mouse.$O\ - x11-pixelbits.$O\ - x11-unload.$O\ - x11-wsys.$O\ devdraw.$O\ unix.$O\ @@ -111,11 +96,34 @@ HFILES=\ $PLAN9/include/cursor.h\ $PLAN9/include/mouse.h\ $PLAN9/include/keyboard.h\ + +# some of these should move to wsysofiles + +XHFILES=\ x11-inc.h\ x11-memdraw.h\ -CFLAGS=$CFLAGS -I$X11/include +<|sh ./mkwsysrules.sh +WSYSOFILES=\ + $WSYSTYPE-alloc.$O\ + $WSYSTYPE-cload.$O\ + $WSYSTYPE-draw.$O\ + $WSYSTYPE-event.$O\ + $WSYSTYPE-fill.$O\ + $WSYSTYPE-get.$O\ + $WSYSTYPE-init.$O\ + $WSYSTYPE-itrans.$O\ + $WSYSTYPE-keyboard.$O\ + $WSYSTYPE-keysym2ucs.$O\ + $WSYSTYPE-load.$O\ + $WSYSTYPE-mouse.$O\ + $WSYSTYPE-pixelbits.$O\ + $WSYSTYPE-unload.$O\ + $WSYSTYPE-wsys.$O\ + +OFILES=$OFILES $WSYSOFILES + <$PLAN9/src/mksyslib test: test.o $PLAN9/lib/$LIB blob - /dev/null blob + 9d7f4b9ac2917568c1ccbb6aecc5b5ce653885e7 (mode 644) --- /dev/null +++ src/libdraw/mkwsysrules.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +[ -f $PLAN9/config ] && . $PLAN9/config + +if [ "x$X11" = "x" ]; then + if [ -d /usr/X11R6 ]; then + X11=/usr/X11R6 + elif [ -d /usr/local/X11R6 ]; then + X11=/usr/local/X11R6 + else + X11=noX11dir + fi +fi + +if [ "x$WSYSTYPE" = "x" ]; then + if [ -d "$X11/include" ]; then + WSYSTYPE=x11 + else + WSYSTYPE=nowsys + fi +fi + +echo 'WSYSTYPE='$WSYSTYPE +echo 'X11='$X11 + +if [ WSYSTYPE = x11 ]; then + echo 'HFILES=$HFILES $XHFILES' +fi + + blob - /dev/null blob + 2c92f6feefdfeccbbb2f0eadba4a8dc3f07e4871 (mode 644) --- /dev/null +++ src/libdraw/nowsys-alloc.c @@ -0,0 +1,17 @@ +#include +#include +#include +#include + +Memimage* +allocmemimage(Rectangle r, u32int chan) +{ + return _allocmemimage(r, chan); +} + +void +freememimage(Memimage *m) +{ + _freememimage(m); +} + blob - /dev/null blob + 3d5261d12e938d72f580f8e51c5b414a266a8307 (mode 644) --- /dev/null +++ src/libdraw/nowsys-cload.c @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +int +cloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) +{ + return _cloadmemimage(i, r, data, ndata); +} + blob - /dev/null blob + 5eac24f0d43a27315dfc8351012a8f13f553c97e (mode 644) --- /dev/null +++ src/libdraw/nowsys-draw.c @@ -0,0 +1,15 @@ +#include +#include +#include +#include + +void +memimagedraw(Memimage *dst, Rectangle r, Memimage *src, Point sp, + Memimage *mask, Point mp, int op) +{ + Memdrawparam *par; + + if((par = _memimagedrawsetup(dst, r, src, sp, mask, mp, op)) == nil) + return; + _memimagedraw(par); +} blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + d75459f1780b5ed24f9e690dea080479877b60b7 (mode 644) --- /dev/null +++ src/libdraw/nowsys-fill.c @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +void +memfillcolor(Memimage *m, u32int val) +{ + _memfillcolor(m, val); +} + blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + b0d5fcee18d715c9b7f1327dcf6b113bc45328e1 (mode 644) --- /dev/null +++ src/libdraw/nowsys-load.c @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +int +loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) +{ + return _loadmemimage(i, r, data, ndata); +} + blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644) blob - /dev/null blob + de744b969e175db57481c82750ffaf1b0717f17d (mode 644) --- /dev/null +++ src/libdraw/nowsys-pixelbits.c @@ -0,0 +1,12 @@ +#include +#include +#include +#include + +u32int +pixelbits(Memimage *m, Point p) +{ + return _pixelbits(m, p); +} + + blob - /dev/null blob + 3859321379e5384073273728aa498d1209fdb41d (mode 644) --- /dev/null +++ src/libdraw/nowsys-unload.c @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +int +unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) +{ + return _unloadmemimage(i, r, data, ndata); +} + blob - /dev/null blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644)