Import Upstream version 5d6upstream/5d6

1 files changed, 16 insertions, 3 deletions

diff --git a/x.h b/x.h
index 1207e6a..4423211 100644
--- a/x.h
+++ b/x.h
@@ -5,7 +5,9 @@ SCM make_xdisplay(Display *d);
 SCM make_xgcontext(SCM d, int screen_number, GC gc, int rootp);
 SCM make_xcursor(SCM display, Cursor cursor);
 SCM make_xfont(SCM display, Font font, SCM name);
-SCM make_xvisual(Visual *vsl);
+SCM make_xvisual(XVisualInfo *vsl);
+SCM CCC2SCM_P(XcmsCCC ccc);
+SCM CCC2SCM(XcmsCCC ccc);
 SCM make_xevent(XEvent *e);
 size_t x_free_xevent(CELLPTR ptr);
 void scm2XPoint(int signp, SCM dat, XPoint *ipr, char *pos, char *s_caller);
@@ -25,8 +27,10 @@ SCM x_display_debug(SCM sd, SCM si);
 SCM x_default_screen(SCM sdpy);
 SCM x_create_window(SCM swin, SCM spos, SCM sargs);
 SCM x_create_pixmap(SCM obj, SCM s_size, SCM s_depth);
+SCM x_window_ref(SCM oargs);
 SCM x_window_set(SCM args);
 SCM x_window_geometry(SCM swin);
+SCM x_window_geometry_set(SCM args);
 SCM x_close(SCM obj);
 SCM x_flush(SCM sd, SCM si);
 SCM x_create_colormap(SCM swin, SCM s_vis, SCM s_alloc);
@@ -38,7 +42,6 @@ SCM x_find_color(SCM scmap, SCM dat);
 SCM x_color_set(SCM scmap, SCM s_pix, SCM dat);
 SCM x_color_ref(SCM scmap, SCM sidx);
 SCM x_map_window(SCM swin);
-SCM x_map_raised(SCM swin);
 SCM x_map_subwindows(SCM swin);
 SCM x_unmap_window(SCM swin);
 SCM x_unmap_subwindows(SCM swin);
@@ -65,14 +68,21 @@ SCM x_screen_size(SCM sd, SCM si);
 SCM x_screen_dimm(SCM sd, SCM si);
 SCM x_screen_black(SCM sd, SCM si);
 SCM x_screen_white(SCM sd, SCM si);
+XVisualInfo *visual2visualinfo(Display *dsp, Visual *vis);
 SCM x_make_visual(SCM sd, SCM sdepth, SCM sclass);
+SCM x_visual_geometry(SCM svsl);
+SCM x_visual_class(SCM svsl);
 SCM x_root_window(SCM sdpy, SCM sscr);
 SCM x_default_colormap(SCM sdpy, SCM sscr);
 SCM x_default_gcontext(SCM sdpy, SCM sscr);
 SCM x_default_visual(SCM sdpy, SCM sscr);
+SCM x_default_ccc(SCM sdpy, SCM sscr);
+SCM x_propdata2scm(Atom type, int format, unsigned long nitems, unsigned char *data);
+SCM x_get_window_property(SCM swin, SCM sprop, SCM sargs);
+SCM x_list_properties(SCM swin);
 SCM x_clear_area(SCM swin, SCM spos, SCM sargs);
 SCM x_fill_rectangle(SCM swin, SCM sgc, SCM sargs);
-void xldraw_string(SCM sdbl, SCM sgc, SCM sargs, int (*proc)(), char *s_caller);
+void xldraw_string(SCM sdbl, SCM sgc, SCM sargs, int (*proc)(void), char *s_caller);
 SCM x_draw_string(SCM sdbl, SCM sgc, SCM sargs);
 SCM x_image_string(SCM sdbl, SCM sgc, SCM sargs);
 SCM x_draw_points(SCM sdbl, SCM sgc, SCM sargs);
@@ -80,7 +90,10 @@ SCM xldraw_lines(SCM sdbl, SCM sgc, SCM sargs, int funcod, char *s_caller);
 SCM x_draw_segments(SCM sdbl, SCM sgc, SCM sargs);
 SCM x_draw_lines(SCM sdbl, SCM sgc, SCM sargs);
 SCM x_fill_poly(SCM sdbl, SCM sgc, SCM sargs);
+SCM x_read_bitmap_file(SCM sdbl, SCM sfname);
 SCM x_make_bool(int f);
 SCM x_event_ref(SCM sevent, SCM sfield);
+SCM x_event_keysym(SCM sevent);
+char *xvisualclass2name(int class);
 void x_scm_final(void);
 void init_x(void);