scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added new types and files.

This commit is contained in:
frese 2001-07-19 15:29:18 +00:00
parent 122b2b4397
commit e691622d29
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
c/xlib/Makefile
View File

@ -1,8 +1,9 @@
OBJECTS = main.o display.o window.o type.o color.o colormap.o pixel.o gcontext.o event.o pixmap.o graphics.o font.o
$(OBJECTS): xlib.h
.c.o: .c.o:
gcc -g -c -I /usr/X11R6/include/ -I /afs/wsi/home/dfreese/scsh-0.6/c/ -o $@ $< gcc -g -c -I /usr/X11R6/include/ -I /afs/wsi/home/dfreese/scsh-0.6/c/ -o $@ $<
OBJECTS = main.o display.o window.o type.o color.o colormap.o pixel.o gcontext.o event.o pixmap.o graphics.o
test: $(OBJECTS) test: $(OBJECTS)
gcc -g -o test -L /afs/wsi/home/dfreese/i386_fbsd43/scsh-0.6/lib/scsh/ \ gcc -g -o test -L /afs/wsi/home/dfreese/i386_fbsd43/scsh-0.6/lib/scsh/ \
-L /usr/X11R6/lib \ -L /usr/X11R6/lib \

2
c/xlib/main.c
View File

@ -10,6 +10,7 @@ extern void s48_init_gcontext();
extern void s48_init_event(); extern void s48_init_event();
extern void s48_init_pixmap(); extern void s48_init_pixmap();
extern void s48_init_graphics(); extern void s48_init_graphics();
extern void s48_init_font();
int main(){ int main(){
s48_add_external_init(s48_init_window); s48_add_external_init(s48_init_window);
@ -23,6 +24,7 @@ int main(){
s48_add_external_init(s48_init_event); s48_add_external_init(s48_init_event);
s48_add_external_init(s48_init_pixmap); s48_add_external_init(s48_init_pixmap);
s48_add_external_init(s48_init_graphics); s48_add_external_init(s48_init_graphics);
s48_add_external_init(s48_init_font);
s48_main(8000000, 64000, s48_main(8000000, 64000,
"/afs/wsi/home/dfreese/i386_fbsd43/scsh-0.6/lib/scheme48/scsh.image", "/afs/wsi/home/dfreese/i386_fbsd43/scsh-0.6/lib/scheme48/scsh.image",

9
c/xlib/xlib.h
View File

@ -21,9 +21,10 @@
#define S48_NULL_P(x) S48_EQ(x, S48_NULL) #define S48_NULL_P(x) S48_EQ(x, S48_NULL)
#define S48_FALSE_P(x) S48_EQ(x, S48_FALSE) #define S48_FALSE_P(x) S48_EQ(x, S48_FALSE)
#define S48_TRUE_P(x) S48_EQ(x, S48_TRUE)
extern char* s48_extract_symbol(s48_value);
/* Extraction-Macros for the new types, from their s48_value wrapping. /* Extraction-Macros for the new types, from their s48_value wrapping.
*/ */
@ -48,8 +49,10 @@
#define EXTRACT_TIME(x) S48_SYMBOL_P(x) ? CurrentTime : (int)s48_extract_integer(x) #define EXTRACT_TIME(x) S48_SYMBOL_P(x) ? CurrentTime : (int)s48_extract_integer(x)
// TODO: // TODO:
#define ENTER_VISUAL(x) S48_FALSE #define ENTER_VISUAL(x) S48_FALSE
#define ENTER_FONT(x) S48_FALSE #define ENTER_FONT(x) s48_enter_integer((long)x)
#define EXTRACT_FONT(x) (Font)0 #define EXTRACT_FONT(x) (Font)s48_extract_integer(x)
#define ENTER_FONTSTRUCT(x) s48_enter_integer((long)x)
#define EXTRACT_FONTSTRUCT(x) (XFontStruct*)s48_extract_integer(x)
/* /*