diff options
| -rw-r--r-- | bigreqscope.h | 3 | ||||
| -rw-r--r-- | decode_render.c | 55 | ||||
| -rw-r--r-- | lbxscope.h | 5 | ||||
| -rw-r--r-- | print_render.c | 63 | ||||
| -rw-r--r-- | randrscope.h | 5 | ||||
| -rw-r--r-- | renderscope.h | 12 | ||||
| -rw-r--r-- | shmscope.h | 6 | ||||
| -rw-r--r-- | wcpscope.h | 4 | ||||
| -rw-r--r-- | x11.h | 32 |
9 files changed, 148 insertions, 37 deletions
diff --git a/bigreqscope.h b/bigreqscope.h index a7c3456..80648f1 100644 --- a/bigreqscope.h +++ b/bigreqscope.h @@ -1,9 +1,6 @@ #ifndef _BIGREQSCOPE_H_ #define _BIGREQSCOPE_H_ -#define BIGREQREQUEST 148 -#define BIGREQREPLY 149 - #define BIGREQREQUESTHEADER "BIGREQREQUEST" #define BIGREQREPLYHEADER "BIGREQREPLY" diff --git a/decode_render.c b/decode_render.c index 63e4bbd..8e52d54 100644 --- a/decode_render.c +++ b/decode_render.c @@ -92,7 +92,7 @@ render_decode_error(fd, buf) FD fd; unsigned char *buf; { - short error = IByte(&buf[0]) - RENDERError; + short error = IByte(&buf[1]) - RENDERError; switch (error) { case 0: RenderPictFormatError (fd, buf); break; @@ -179,6 +179,47 @@ PrintRENDERCOLOR(buf) return(8); } +PrintFIXED(buf) + unsigned char *buf; +{ + /* print a PICTURE */ + long n = ILong (buf); + fprintf (stdout, "FIXED %7.2f", n / 65536.0); + return 4; +} + +PrintPOINTFIXED(buf) + unsigned char *buf; +{ + long x = ILong (buf); + long y = ILong (buf+4); + fprintf (stdout, "POINT %7.2f, %7.2f", x / 65536.0, y / 65536.0); + return 8; +} + +PrintTRAPEZOID(buf) + unsigned char *buf; +{ + /* print a TRAPEZOID */ + PrintField (buf, 0, 4, FIXED, "top"); + PrintField (buf, 4, 4, FIXED, "bottom"); + PrintField (buf, 8, 8, POINTFIXED, "left top"); + PrintField (buf, 16, 8, POINTFIXED, "left bottom"); + PrintField (buf, 24, 8, POINTFIXED, "right top"); + PrintField (buf, 32, 8, POINTFIXED, "right bottom"); + return 40; +} + +PrintTRIANGLE(buf) + unsigned char *buf; +{ + /* print a TRIANGLE */ + PrintField (buf, 0, 8, POINTFIXED, "p1"); + PrintField (buf, 8, 8, POINTFIXED, "p2"); + PrintField (buf,16, 8, POINTFIXED, "p3"); + return 24; +} + InitializeRENDER(buf) unsigned char *buf; { @@ -190,7 +231,12 @@ InitializeRENDER(buf) DefineEValue (&TD[REQUEST], (unsigned long) RENDERRequest, "RenderRequest"); DefineEValue (&TD[REPLY], (unsigned long) RENDERRequest, "RenderReply"); - DefineEValue (&TD[ERROR], (unsigned long) RENDERError, "RenderError"); + + DefineEValue (&TD[ERROR], (unsigned long) RENDERError + 0, "BadPictFormat"); + DefineEValue (&TD[ERROR], (unsigned long) RENDERError + 1, "BadPicture"); + DefineEValue (&TD[ERROR], (unsigned long) RENDERError + 2, "BadPictOp"); + DefineEValue (&TD[ERROR], (unsigned long) RENDERError + 3, "BadGlyphSet"); + DefineEValue (&TD[ERROR], (unsigned long) RENDERError + 4, "BadGlyph"); p = DefineType(RENDERREQUEST, ENUMERATED, "RENDERREQUEST", PrintENUMERATED); DefineEValue(p, 0L, "RenderQueryVersion"); @@ -264,4 +310,9 @@ InitializeRENDER(buf) DefineEValue (p, 11L, "Xor"); DefineEValue (p, 12L, "Add"); DefineEValue (p, 13L, "Saturate"); + + DefineType(FIXED, BUILTIN, "FIXED", PrintFIXED); + DefineType(POINTFIXED, BUILTIN, "POINTFIXED", PrintPOINTFIXED); + DefineType(TRIANGLE, RECORD, "TRIANGLE", PrintTRIANGLE); + DefineType(TRAPEZOID, RECORD, "TRAPEZOID", PrintTRAPEZOID); } @@ -27,11 +27,6 @@ SOFTWARE. #ifndef _LBXSCOPE_H_ #define _LBXSCOPE_H_ -#define LBXREQUEST 121 -#define LBXREPLY 122 -#define LBXEVENT 123 -#define LBXERROR 124 - #define LBXREQUESTHEADER "LBXREQUEST" #define LBXREPLYHEADER "LBXREPLY" #define LBXEVENTHEADER "LBXEVENT" diff --git a/print_render.c b/print_render.c index 4e3aacb..398020f 100644 --- a/print_render.c +++ b/print_render.c @@ -210,6 +210,7 @@ RenderScale (FD fd, unsigned char *buf) } RenderTrapezoids (FD fd, unsigned char *buf) { + int n; PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; PrintField (buf, 1, 1, RENDERREQUEST, RENDERREQUESTHEADER) /* RenderSwitch */ ; if (Verbose < 1) @@ -218,9 +219,19 @@ RenderTrapezoids (FD fd, unsigned char *buf) PrintField(SBf, 0, 4, CARD32, "sequence number"); printfield(buf, 2, 2, CONST2(2), "request length"); + PrintField (buf, 4, 1, PICTOP, "op"); + PrintField(buf, 8, 4, PICTURE, "source"); + PrintField(buf, 12, 4, PICTURE, "dest"); + PrintField(buf, 16, 4, PICTFORMAT, "mask format"); + PrintField(buf, 20, 2, CARD16, "source x"); + PrintField(buf, 22, 2, CARD16, "source y"); + n = (CS[fd].requestLen - 6) / 10; + PrintList(&buf[24], (long)n, TRAPEZOID, "trapezoids"); } + RenderTriangles (FD fd, unsigned char *buf) { + long n; PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; PrintField (buf, 1, 1, RENDERREQUEST, RENDERREQUESTHEADER) /* RenderSwitch */ ; if (Verbose < 1) @@ -229,6 +240,14 @@ RenderTriangles (FD fd, unsigned char *buf) PrintField(SBf, 0, 4, CARD32, "sequence number"); printfield(buf, 2, 2, CONST2(2), "request length"); + PrintField (buf, 4, 1, PICTOP, "op"); + PrintField(buf, 8, 4, PICTURE, "source"); + PrintField(buf, 12, 4, PICTURE, "dest"); + PrintField(buf, 16, 4, PICTFORMAT, "mask format"); + PrintField(buf, 20, 2, CARD16, "source x"); + PrintField(buf, 22, 2, CARD16, "source y"); + n = (CS[fd].requestLen - 6) / 6; + PrintList(&buf[24], (long)n, TRIANGLE, "triangles"); } RenderTriStrip (FD fd, unsigned char *buf) { @@ -319,6 +338,7 @@ RenderFreeGlyphSet (FD fd, unsigned char *buf) PrintField(SBf, 0, 4, CARD32, "sequence number"); printfield(buf, 2, 2, CONST2(2), "request length"); + PrintField(buf, 4, 4, GLYPHSET, "glyphset"); } extern char Leader[]; @@ -377,6 +397,7 @@ RenderAddGlyphsFromPicture (FD fd, unsigned char *buf) } RenderFreeGlyphs (FD fd, unsigned char *buf) { + unsigned short n; PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; PrintField (buf, 1, 1, RENDERREQUEST, RENDERREQUESTHEADER) /* RenderSwitch */ ; if (Verbose < 1) @@ -385,6 +406,9 @@ RenderFreeGlyphs (FD fd, unsigned char *buf) PrintField(SBf, 0, 4, CARD32, "sequence number"); printfield(buf, 2, 2, CONST2(2), "request length"); + PrintField(buf, 4, 4, GLYPHSET, "glyphset"); + n = (IShort(&buf[2]) - 2); + (void)PrintList(&buf[8], (long)n, CARD32, "glyphs"); } extern char Leader[]; @@ -510,16 +534,55 @@ RenderFillRectangles (FD fd, unsigned char *buf) } RenderPictFormatError (fd, buf) { + PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; + if (Verbose < 1) + return; + printfield(buf, 2, 2, CARD16, "sequence number"); + PrintField(buf, 4, 4, PICTFORMAT, "format"); + PrintField(buf, 8, 2, CARD16, "minor opcode"); + PrintField(buf, 10, 1, CARD8, "major opcode"); } + RenderPictureError (fd, buf) { + PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; + if (Verbose < 1) + return; + printfield(buf, 2, 2, CARD16, "sequence number"); + PrintField(buf, 4, 4, PICTURE, "picture"); + PrintField(buf, 8, 2, CARD16, "minor opcode"); + PrintField(buf, 10, 1, CARD8, "major opcode"); } + RenderPictOpError (fd, buf) { + PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; + if (Verbose < 1) + return; + printfield(buf, 2, 2, CARD16, "sequence number"); + PrintField(buf, 4, 4, PICTOP, "pictop"); + PrintField(buf, 8, 2, CARD16, "minor opcode"); + PrintField(buf, 10, 1, CARD8, "major opcode"); } + RenderGlyphSetError (fd, buf) { + PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; + if (Verbose < 1) + return; + printfield(buf, 2, 2, CARD16, "sequence number"); + PrintField(buf, 4, 4, GLYPHSET, "glyphset"); + PrintField(buf, 8, 2, CARD16, "minor opcode"); + PrintField(buf, 10, 1, CARD8, "major opcode"); } + RenderGlyphError (fd, buf) { + PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; + if (Verbose < 1) + return; + printfield(buf, 2, 2, CARD16, "sequence number"); + PrintField(buf, 4, 4, CARD32, "glyph"); + PrintField(buf, 8, 2, CARD16, "minor opcode"); + PrintField(buf, 10, 1, CARD8, "major opcode"); } diff --git a/randrscope.h b/randrscope.h index 58b5e0c..bb95728 100644 --- a/randrscope.h +++ b/randrscope.h @@ -1,11 +1,6 @@ #ifndef _RANDRSCOPE_H_ #define _RANDRSCOPE_H_ -#define RANDRREQUEST 141 -#define RANDRREPLY 142 -#define RANDRERROR 143 - - #define RANDRREQUESTHEADER "RANDRREQUEST" #define RANDRREPLYHEADER "RANDRREPLY" diff --git a/renderscope.h b/renderscope.h index 0f28673..a539c1e 100644 --- a/renderscope.h +++ b/renderscope.h @@ -1,18 +1,6 @@ #ifndef _RENDERSCOPE_H_ #define _RENDERSCOPE_H_ -#define RENDERREQUEST 132 -#define RENDERREPLY 133 -#define RENDERERROR 134 - -#define PICTURE 135 -#define PICTFORMAT 136 -#define PICTURE_BITMASK 137 -#define PICTOP 138 -#define GLYPHSET 139 -#define RENDERCOLOR 140 -#define PICTFORMINFO 141 - #define RENDERREQUESTHEADER "RENDERREQUEST" #define RENDERREPLYHEADER "RENDERREPLY" @@ -1,12 +1,6 @@ #ifndef _MITSHMSCOPE_H_ #define _MITSHMSCOPE_H_ -#define MITSHMREQUEST 144 -#define MITSHMREPLY 145 -#define MITSHMEVENT 146 -#define MITSHMERROR 147 - - #define MITSHMREQUESTHEADER "MITSHMREQUEST" #define MITSHMREPLYHEADER "MITSHMREPLY" @@ -26,10 +26,6 @@ #ifndef _WCPSCOPE_H_ #define _WCPSCOPE_H_ -#define WCPREQUEST 129 -#define WCPREPLY 130 -#define WCPERROR 131 - #define WCPREQUESTHEADER "WCPREQUEST" #define WCPREPLYHEADER "WCPREPLY" @@ -197,6 +197,38 @@ #define NASEVENT 127 #define NASERROR 128 +#define WCPREQUEST 129 +#define WCPREPLY 130 +#define WCPERROR 131 + +#define RENDERREQUEST 132 +#define RENDERREPLY 133 +#define RENDERERROR 134 + +#define PICTURE 135 +#define PICTFORMAT 136 +#define PICTURE_BITMASK 137 +#define PICTOP 138 +#define GLYPHSET 139 +#define RENDERCOLOR 140 +#define PICTFORMINFO 141 +#define TRAPEZOID 142 +#define TRIANGLE 143 +#define POINTFIXED 144 +#define FIXED 145 + +#define RANDRREQUEST 150 +#define RANDRREPLY 151 +#define RANDRERROR 152 + +#define MITSHMREQUEST 153 +#define MITSHMREPLY 154 +#define MITSHMEVENT 155 +#define MITSHMERROR 156 + +#define BIGREQREQUEST 157 +#define BIGREQREPLY 158 + #define MaxTypes 256 extern char ScopeEnabled; |