tbreak x11 for sure - plan9port - [fork] Plan 9 from user space (HTM) git clone git://src.adamsgaard.dk/plan9port (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 41e0f84ca63bc829155647d99041ca3f2b1778f7 (DIR) parent 568e208e3768e303d21836bbaa0d7c2fbef8c10c (HTM) Author: rsc <devnull@localhost> Date: Wed, 2 Feb 2005 22:04:41 +0000 break x11 for sure Diffstat: M src/libdraw/mkfile | 40 +++++++++++++++++++------------- A src/libdraw/mkwsysrules.sh | 30 ++++++++++++++++++++++++++++++ A src/libdraw/nowsys-alloc.c | 17 +++++++++++++++++ A src/libdraw/nowsys-cload.c | 11 +++++++++++ A src/libdraw/nowsys-draw.c | 15 +++++++++++++++ A src/libdraw/nowsys-event.c | 0 A src/libdraw/nowsys-fill.c | 11 +++++++++++ A src/libdraw/nowsys-get.c | 0 A src/libdraw/nowsys-init.c | 0 A src/libdraw/nowsys-itrans.c | 0 A src/libdraw/nowsys-keyboard.c | 0 A src/libdraw/nowsys-keysym2ucs.c | 0 A src/libdraw/nowsys-load.c | 11 +++++++++++ A src/libdraw/nowsys-mouse.c | 0 A src/libdraw/nowsys-pixelbits.c | 12 ++++++++++++ A src/libdraw/nowsys-unload.c | 11 +++++++++++ A src/libdraw/nowsys-wsys.c | 0 17 files changed, 142 insertions(+), 16 deletions(-) --- (DIR) diff --git a/src/libdraw/mkfile b/src/libdraw/mkfile t@@ -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\ t@@ -111,10 +96,33 @@ 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 (DIR) diff --git a/src/libdraw/mkwsysrules.sh b/src/libdraw/mkwsysrules.sh t@@ -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 + + (DIR) diff --git a/src/libdraw/nowsys-alloc.c b/src/libdraw/nowsys-alloc.c t@@ -0,0 +1,17 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +Memimage* +allocmemimage(Rectangle r, u32int chan) +{ + return _allocmemimage(r, chan); +} + +void +freememimage(Memimage *m) +{ + _freememimage(m); +} + (DIR) diff --git a/src/libdraw/nowsys-cload.c b/src/libdraw/nowsys-cload.c t@@ -0,0 +1,11 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +int +cloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) +{ + return _cloadmemimage(i, r, data, ndata); +} + (DIR) diff --git a/src/libdraw/nowsys-draw.c b/src/libdraw/nowsys-draw.c t@@ -0,0 +1,15 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +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); +} (DIR) diff --git a/src/libdraw/nowsys-event.c b/src/libdraw/nowsys-event.c (DIR) diff --git a/src/libdraw/nowsys-fill.c b/src/libdraw/nowsys-fill.c t@@ -0,0 +1,11 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +void +memfillcolor(Memimage *m, u32int val) +{ + _memfillcolor(m, val); +} + (DIR) diff --git a/src/libdraw/nowsys-get.c b/src/libdraw/nowsys-get.c (DIR) diff --git a/src/libdraw/nowsys-init.c b/src/libdraw/nowsys-init.c (DIR) diff --git a/src/libdraw/nowsys-itrans.c b/src/libdraw/nowsys-itrans.c (DIR) diff --git a/src/libdraw/nowsys-keyboard.c b/src/libdraw/nowsys-keyboard.c (DIR) diff --git a/src/libdraw/nowsys-keysym2ucs.c b/src/libdraw/nowsys-keysym2ucs.c (DIR) diff --git a/src/libdraw/nowsys-load.c b/src/libdraw/nowsys-load.c t@@ -0,0 +1,11 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +int +loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) +{ + return _loadmemimage(i, r, data, ndata); +} + (DIR) diff --git a/src/libdraw/nowsys-mouse.c b/src/libdraw/nowsys-mouse.c (DIR) diff --git a/src/libdraw/nowsys-pixelbits.c b/src/libdraw/nowsys-pixelbits.c t@@ -0,0 +1,12 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +u32int +pixelbits(Memimage *m, Point p) +{ + return _pixelbits(m, p); +} + + (DIR) diff --git a/src/libdraw/nowsys-unload.c b/src/libdraw/nowsys-unload.c t@@ -0,0 +1,11 @@ +#include <u.h> +#include <libc.h> +#include <draw.h> +#include <memdraw.h> + +int +unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) +{ + return _unloadmemimage(i, r, data, ndata); +} + (DIR) diff --git a/src/libdraw/nowsys-wsys.c b/src/libdraw/nowsys-wsys.c