[Commit] xcb/lib/XCB xcb_shm.m4,NONE,1.1 .cvsignore,1.1,1.2 Imakefile,1.1,1.2

Jamey Sharp commit@keithp.com
Fri, 25 Apr 2003 13:46:37 -0700


Committed by: jamey

Update of /local/src/CVS/xcb/lib/XCB
In directory home.keithp.com:/tmp/cvs-serv18126/lib/XCB

Modified Files:
	.cvsignore Imakefile 
Added Files:
	xcb_shm.m4 
Log Message:
Added shm implementation; some build system changes.

--- NEW FILE: xcb_shm.m4 ---
XCBGEN(xcb_shm, `
Copyright (C) 2001-2002 Bart Massey and Jamey Sharp.
All Rights Reserved.  See the file COPYING in this directory
for licensing information.
')
BEGINEXTENSION(MIT-SHM, Shm)
XIDTYPE(SHMSEG)
HEADERONLY(`
EVENT(ShmCompletion, 0, `
    PAD(1)
    REPLY(DRAWABLE, `drawable')
    REPLY(SHMSEG, `shmseg')
    REPLY(CARD16, `minor_event')
    REPLY(BYTE, `major_event')
    PAD(1)
    REPLY(CARD32, `offset')
')

ERRORCOPY(BadShmSeg, 0, Value)
')

REQUEST(ShmQueryVersion, `
    OPCODE(0)
', `
    REPLY(BOOL, `shared_pixmaps')
    REPLY(CARD16, `major_version')
    REPLY(CARD16, `minor_version')
    REPLY(CARD16, `uid')
    REPLY(CARD16, `gid')
    REPLY(CARD8, `pixmap_format')
')

VOIDREQUEST(ShmAttach, `
    OPCODE(1)
    PARAM(SHMSEG, `shmseg')
    PARAM(CARD32, `shmid')
    PARAM(BOOL, `read_only')
')

VOIDREQUEST(ShmDetach, `
    OPCODE(2)
    PARAM(SHMSEG, `shmseg')
')

VOIDREQUEST(ShmPutImage, `
    OPCODE(3)
    PARAM(DRAWABLE, `drawable')
    PARAM(GCONTEXT, `gc')
    PARAM(CARD16, `total_width')
    PARAM(CARD16, `total_height')
    PARAM(CARD16, `src_x')
    PARAM(CARD16, `src_y')
    PARAM(CARD16, `src_width')
    PARAM(CARD16, `src_height')
    PARAM(INT16, `dst_x')
    PARAM(INT16, `dst_y')
    PARAM(CARD8, `depth')
    PARAM(CARD8, `format')
    PARAM(CARD8, `send_event')
    PAD(1)
    PARAM(SHMSEG, `shmseg')
    PARAM(CARD32, `offset')
')

REQUEST(ShmGetImage, `
    OPCODE(4)
    PARAM(DRAWABLE, `drawable')
    PARAM(INT16, `x')
    PARAM(INT16, `y')
    PARAM(CARD16, `width')
    PARAM(CARD16, `height')
    PARAM(CARD32, `plane_mask')
    PARAM(CARD8, `format')
    PAD(3)
    PARAM(SHMSEG, `shmseg')
    PARAM(CARD32, `offset')
', `
    REPLY(CARD8, `depth')
    REPLY(VISUALID, `visual')
    REPLY(CARD32, `size')
')

VOIDREQUEST(ShmCreatePixmap, `
    OPCODE(5)
    PARAM(PIXMAP, `pid')
    PARAM(DRAWABLE, `drawable')
    PARAM(CARD16, `width')
    PARAM(CARD16, `height')
    PARAM(CARD8, `depth')
    PAD(3)
    PARAM(SHMSEG, `shmseg')
    PARAM(CARD32, `offset')
')

ENDEXTENSION
ENDXCBGEN

Index: .cvsignore
===================================================================
RCS file: /local/src/CVS/xcb/lib/XCB/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	8 Jul 2002 13:09:04 -0000	1.1
+++ .cvsignore	25 Apr 2003 20:46:34 -0000	1.2
@@ -11,6 +11,8 @@
 xcb_dpms.h
 xcb_render.c
 xcb_render.h
+xcb_shm.c
+xcb_shm.h
 xcb_shape.c
 xcb_shape.h
 xcb_types.c

Index: Imakefile
===================================================================
RCS file: /local/src/CVS/xcb/lib/XCB/Imakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Imakefile	26 Mar 2003 07:54:37 -0000	1.1
+++ Imakefile	25 Apr 2003 20:46:34 -0000	1.2
@@ -16,30 +16,29 @@
 
 SOXCBREV = 1.0
 INCLUDES = -I../../exports/include
+REQUIREDLIBS = -L$(USRLIBDIR) -lXau
 
 XCOMM Turn any of these on to trace calls through XCB:
 XCOMM DEFINES = -DXCBTRACEREQ -DXCBTRACEMARSHAL -DXCBTRACEREP -DXCBTRACEEVENT
 
-#include <Threads.tmpl>
-
     GENMACROS = generics.m4 macros-c.m4 macros-xcb.m4
 
     SRCMACROS = xcb_conn.m4 \
-		xcb_dpms.m4 xcb_shape.m4 \
+		xcb_dpms.m4 xcb_shape.m4 xcb_shm.m4 \
 		xcb_types.m4 xcb.m4 xcb_render.m4
 
        MACROS = $(GENMACROS) $(SRCMACROS)
 
          SRCS = xcb_conn.c xcb_list.c xcb_io.c xcb_extension.c \
-		xcb_dpms.c xcb_shape.c xcb_render.c \
+		xcb_dpms.c xcb_shape.c xcb_shm.c xcb_render.c \
 		xcb.c xcb_event.c xcb_types.c
 
          OBJS = xcb_conn.o xcb_list.o xcb_io.o xcb_extension.o \
-		xcb_dpms.o xcb_shape.o xcb_render.o \
+		xcb_dpms.o xcb_shape.o xcb_shm.o xcb_render.o \
 		xcb.o xcb_event.o xcb_types.o
 
       HEADERS = xcb_conn.h xcb_list.h xcb_io.h xcb_extension.h \
-		xcb_dpms.h xcb_shape.h xcb_render.h \
+		xcb_dpms.h xcb_shape.h xcb_shm.h xcb_render.h \
 		xcb.h xcb_event.h xcb_types.h xcb_consts.h xcb_trace.h
 
 .SUFFIXES: .m4