diff --git a/tests/generator/enum.py b/tests/generator/enum.py new file mode 100644 --- /dev/null +++ b/tests/generator/enum.py @@ -0,0 +1,39 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class DeviceUse: + IsXPointer = 0 + IsXKeyboard = 1 + IsXExtensionDevice = 2 + IsXExtensionKeyboard = 3 + IsXExtensionPointer = 4 +class EventMask: + NoEvent = 0 + KeyPress = 1 << 0 + KeyRelease = 1 << 1 + ButtonPress = 1 << 2 + ButtonRelease = 1 << 3 + EnterWindow = 1 << 4 + LeaveWindow = 1 << 5 + PointerMotion = 1 << 6 + PointerMotionHint = 1 << 7 + Button1Motion = 1 << 8 + Button2Motion = 1 << 9 + Button3Motion = 1 << 10 + Button4Motion = 1 << 11 + Button5Motion = 1 << 12 + ButtonMotion = 1 << 13 + KeymapState = 1 << 14 + Exposure = 1 << 15 + VisibilityChange = 1 << 16 + StructureNotify = 1 << 17 + ResizeRedirect = 1 << 18 + SubstructureNotify = 1 << 19 + SubstructureRedirect = 1 << 20 + FocusChange = 1 << 21 + PropertyChange = 1 << 22 + ColorMapChange = 1 << 23 + OwnerGrabButton = 1 << 24 +xcffib._add_ext(key, enumExtension, _events, _errors) diff --git a/tests/generator/enum.xml b/tests/generator/enum.xml new file mode 100644 --- /dev/null +++ b/tests/generator/enum.xml @@ -0,0 +1,41 @@ + + + + + 0 + 1 + 2 + 3 + 4 + + + + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + + + diff --git a/tests/generator/error.py b/tests/generator/error.py new file mode 100644 --- /dev/null +++ b/tests/generator/error.py @@ -0,0 +1,22 @@ +import xcffib +import struct +import six +MAJOR_VERSION = 2 +MINOR_VERSION = 2 +key = xcffib.ExtensionKey("ERROR") +_events = {} +_errors = {} +class RequestError(xcffib.Error): + def __init__(self, unpacker): + xcffib.Error.__init__(self, unpacker) + base = unpacker.offset + self.bad_value, self.minor_opcode, self.major_opcode = unpacker.unpack("xx2xIHBx") + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=B", 1)) + buf.write(struct.pack("=x2xIHBx", self.bad_value, self.minor_opcode, self.major_opcode)) + return buf.getvalue() +BadRequest = RequestError +_errors[1] = RequestError +xcffib._add_ext(key, errorExtension, _events, _errors) diff --git a/tests/generator/error.xml b/tests/generator/error.xml new file mode 100644 --- /dev/null +++ b/tests/generator/error.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/tests/generator/event.py b/tests/generator/event.py new file mode 100644 --- /dev/null +++ b/tests/generator/event.py @@ -0,0 +1,24 @@ +import xcffib +import struct +import six +MAJOR_VERSION = 1 +MINOR_VERSION = 4 +key = xcffib.ExtensionKey("EVENT") +_events = {} +_errors = {} +class ScreenChangeNotifyEvent(xcffib.Event): + def __init__(self, unpacker): + xcffib.Event.__init__(self, unpacker) + base = unpacker.offset + self.rotation, self.timestamp, self.config_timestamp, self.root, self.request_window, self.sizeID, self.subpixel_order, self.width, self.height, self.mwidth, self.mheight = unpacker.unpack("xB2xIIIIHHHHHH") + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=B", 0)) + buf.write(struct.pack("=B2xIIIIHHHHHH", self.rotation, self.timestamp, self.config_timestamp, self.root, self.request_window, self.sizeID, self.subpixel_order, self.width, self.height, self.mwidth, self.mheight)) + buf_len = len(buf.getvalue()) + if buf_len < 32: + buf.write(struct.pack("x" * (32 - buf_len))) + return buf.getvalue() +_events[0] = ScreenChangeNotifyEvent +xcffib._add_ext(key, eventExtension, _events, _errors) diff --git a/tests/generator/event.xml b/tests/generator/event.xml new file mode 100644 --- /dev/null +++ b/tests/generator/event.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tests/generator/no_sequence.py b/tests/generator/no_sequence.py new file mode 100644 --- /dev/null +++ b/tests/generator/no_sequence.py @@ -0,0 +1,22 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class KeymapNotifyEvent(xcffib.Event): + def __init__(self, unpacker): + xcffib.Event.__init__(self, unpacker) + base = unpacker.offset + unpacker.unpack("x") + self.keys = xcffib.List(unpacker, "B", 31) + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=B", 11)) + buf.write(xcffib.pack_list(self.keys, "B")) + buf_len = len(buf.getvalue()) + if buf_len < 32: + buf.write(struct.pack("x" * (32 - buf_len))) + return buf.getvalue() +_events[11] = KeymapNotifyEvent +xcffib._add_ext(key, no_sequenceExtension, _events, _errors) diff --git a/tests/generator/no_sequence.xml b/tests/generator/no_sequence.xml new file mode 100644 --- /dev/null +++ b/tests/generator/no_sequence.xml @@ -0,0 +1,5 @@ + + + 31 + + diff --git a/tests/generator/render_1.7.py b/tests/generator/render_1.7.py new file mode 100644 --- /dev/null +++ b/tests/generator/render_1.7.py @@ -0,0 +1,63 @@ +import xcffib +import struct +import six +MAJOR_VERSION = 0 +MINOR_VERSION = 11 +key = xcffib.ExtensionKey("RENDER") +_events = {} +_errors = {} +class PictOp: + Clear = 0 + Src = 1 + Dst = 2 + Over = 3 + OverReverse = 4 + In = 5 + InReverse = 6 + Out = 7 + OutReverse = 8 + Atop = 9 + AtopReverse = 10 + Xor = 11 + Add = 12 + Saturate = 13 + DisjointClear = 16 + DisjointSrc = 17 + DisjointDst = 18 + DisjointOver = 19 + DisjointOverReverse = 20 + DisjointIn = 21 + DisjointInReverse = 22 + DisjointOut = 23 + DisjointOutReverse = 24 + DisjointAtop = 25 + DisjointAtopReverse = 26 + DisjointXor = 27 + ConjointClear = 32 + ConjointSrc = 33 + ConjointDst = 34 + ConjointOver = 35 + ConjointOverReverse = 36 + ConjointIn = 37 + ConjointInReverse = 38 + ConjointOut = 39 + ConjointOutReverse = 40 + ConjointAtop = 41 + ConjointAtopReverse = 42 + ConjointXor = 43 + Multiply = 48 + Screen = 49 + Overlay = 50 + Darken = 51 + Lighten = 52 + ColorDodge = 53 + ColorBurn = 54 + HardLight = 55 + SoftLight = 56 + Difference = 57 + Exclusion = 58 + HSLHue = 59 + HSLSaturation = 60 + HSLColor = 61 + HSLLuminosity = 62 +xcffib._add_ext(key, render_1._7Extension, _events, _errors) diff --git a/tests/generator/render_1.7.xml b/tests/generator/render_1.7.xml new file mode 100644 --- /dev/null +++ b/tests/generator/render_1.7.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + 16 + + + + + + + + + + + + + 32 + + + + + + + + + + + + + + 48 + + + + + + + + + + + + + + + + diff --git a/tests/generator/request.py b/tests/generator/request.py new file mode 100644 --- /dev/null +++ b/tests/generator/request.py @@ -0,0 +1,13 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class requestExtension(xcffib.Extension): + def CreateWindow(self, depth, wid, parent, x, y, width, height, border_width, _class, visual, value_mask, value_list, is_checked=False): + buf = six.BytesIO() + buf.write(struct.pack("=xB2xIIhhHHHHI", depth, wid, parent, x, y, width, height, border_width, _class, visual)) + buf.write(struct.pack("=I", value_mask)) + buf.write(xcffib.pack_list(value_list, "I")) + return self.send_request(1, buf, is_checked=is_checked) +xcffib._add_ext(key, requestExtension, _events, _errors) diff --git a/tests/generator/request.xml b/tests/generator/request.xml new file mode 100644 --- /dev/null +++ b/tests/generator/request.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + Creates a window + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/generator/request_reply.py b/tests/generator/request_reply.py new file mode 100644 --- /dev/null +++ b/tests/generator/request_reply.py @@ -0,0 +1,32 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class STR(xcffib.Struct): + def __init__(self, unpacker): + xcffib.Struct.__init__(self, unpacker) + base = unpacker.offset + self.name_len, = unpacker.unpack("B") + self.name = xcffib.List(unpacker, "c", self.name_len) + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=B", self.name_len)) + buf.write(xcffib.pack_list(self.name, "c")) + return buf.getvalue() +class ListExtensionsReply(xcffib.Reply): + def __init__(self, unpacker): + xcffib.Reply.__init__(self, unpacker) + base = unpacker.offset + self.names_len, = unpacker.unpack("xB2x4x24x") + self.names = xcffib.List(unpacker, STR, self.names_len) + self.bufsize = unpacker.offset - base +class ListExtensionsCookie(xcffib.Cookie): + reply_type = ListExtensionsReply +class request_replyExtension(xcffib.Extension): + def ListExtensions(self, is_checked=True): + buf = six.BytesIO() + buf.write(struct.pack("=xx2x")) + return self.send_request(99, buf, ListExtensionsCookie, is_checked=is_checked) +xcffib._add_ext(key, request_replyExtension, _events, _errors) diff --git a/tests/generator/request_reply.xml b/tests/generator/request_reply.xml new file mode 100644 --- /dev/null +++ b/tests/generator/request_reply.xml @@ -0,0 +1,21 @@ + + + + + + + name_len + + + + + + + + + names_len + + + + + diff --git a/tests/generator/struct.py b/tests/generator/struct.py new file mode 100644 --- /dev/null +++ b/tests/generator/struct.py @@ -0,0 +1,29 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class AxisInfo(xcffib.Struct): + def __init__(self, unpacker): + xcffib.Struct.__init__(self, unpacker) + base = unpacker.offset + self.resolution, self.minimum, self.maximum = unpacker.unpack("Iii") + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=Iii", self.resolution, self.minimum, self.maximum)) + return buf.getvalue() + fixed_size = 12 +class ValuatorInfo(xcffib.Struct): + def __init__(self, unpacker): + xcffib.Struct.__init__(self, unpacker) + base = unpacker.offset + self.class_id, self.len, self.axes_len, self.mode, self.motion_size = unpacker.unpack("BBBBI") + self.axes = xcffib.List(unpacker, AxisInfo, self.axes_len) + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=BBBBI", self.class_id, self.len, self.axes_len, self.mode, self.motion_size)) + buf.write(xcffib.pack_list(self.axes, AxisInfo)) + return buf.getvalue() +xcffib._add_ext(key, structExtension, _events, _errors) diff --git a/tests/generator/struct.xml b/tests/generator/struct.xml new file mode 100644 --- /dev/null +++ b/tests/generator/struct.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + axes_len + + + + diff --git a/tests/generator/type_pad.py b/tests/generator/type_pad.py new file mode 100644 --- /dev/null +++ b/tests/generator/type_pad.py @@ -0,0 +1,51 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class CHARINFO(xcffib.Struct): + def __init__(self, unpacker): + xcffib.Struct.__init__(self, unpacker) + base = unpacker.offset + self.left_side_bearing, self.right_side_bearing, self.character_width, self.ascent, self.descent, self.attributes = unpacker.unpack("hhhhhH") + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=hhhhhH", self.left_side_bearing, self.right_side_bearing, self.character_width, self.ascent, self.descent, self.attributes)) + return buf.getvalue() + fixed_size = 12 +class FONTPROP(xcffib.Struct): + def __init__(self, unpacker): + xcffib.Struct.__init__(self, unpacker) + base = unpacker.offset + self.name, self.value = unpacker.unpack("II") + self.bufsize = unpacker.offset - base + def pack(self): + buf = six.BytesIO() + buf.write(struct.pack("=II", self.name, self.value)) + return buf.getvalue() + fixed_size = 8 +class ListFontsWithInfoReply(xcffib.Reply): + def __init__(self, unpacker): + xcffib.Reply.__init__(self, unpacker) + base = unpacker.offset + self.name_len, = unpacker.unpack("xB2x4x") + self.min_bounds = CHARINFO(unpacker) + unpacker.unpack("4x") + unpacker.pad(CHARINFO) + self.max_bounds = CHARINFO(unpacker) + self.min_char_or_byte2, self.max_char_or_byte2, self.default_char, self.properties_len, self.draw_direction, self.min_byte1, self.max_byte1, self.all_chars_exist, self.font_ascent, self.font_descent, self.replies_hint = unpacker.unpack("4xHHHHBBBBhhI") + unpacker.pad(FONTPROP) + self.properties = xcffib.List(unpacker, FONTPROP, self.properties_len) + unpacker.pad("c") + self.name = xcffib.List(unpacker, "c", self.name_len) + self.bufsize = unpacker.offset - base +class ListFontsWithInfoCookie(xcffib.Cookie): + reply_type = ListFontsWithInfoReply +class type_padExtension(xcffib.Extension): + def ListFontsWithInfo(self, max_names, pattern_len, pattern, is_checked=True): + buf = six.BytesIO() + buf.write(struct.pack("=xx2xHH", max_names, pattern_len)) + buf.write(xcffib.pack_list(pattern, "c")) + return self.send_request(50, buf, ListFontsWithInfoCookie, is_checked=is_checked) +xcffib._add_ext(key, type_padExtension, _events, _errors) diff --git a/tests/generator/type_pad.xml b/tests/generator/type_pad.xml new file mode 100644 --- /dev/null +++ b/tests/generator/type_pad.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + pattern_len + + + + + + + + + + + + + + + + + + + + properties_len + + + name_len + + + + + + + + + + + + + + + + + + + get matching font names and information + + + + + + + + + diff --git a/tests/generator/union.py b/tests/generator/union.py new file mode 100644 --- /dev/null +++ b/tests/generator/union.py @@ -0,0 +1,16 @@ +import xcffib +import struct +import six +_events = {} +_errors = {} +class ClientMessageData(xcffib.Union): + def __init__(self, unpacker): + xcffib.Union.__init__(self, unpacker) + self.data8 = xcffib.List(unpacker.copy(), "B", 20) + self.data16 = xcffib.List(unpacker.copy(), "H", 10) + self.data32 = xcffib.List(unpacker.copy(), "I", 5) + def pack(self): + buf = six.BytesIO() + buf.write(xcffib.pack_list(self.data8, "B")) + return buf.getvalue() +xcffib._add_ext(key, unionExtension, _events, _errors) diff --git a/tests/generator/union.xml b/tests/generator/union.xml new file mode 100644 --- /dev/null +++ b/tests/generator/union.xml @@ -0,0 +1,12 @@ + + + + + + 20 + 10 + 5 + + + diff --git a/tests/generator/xproto_1.7.py b/tests/generator/xproto_1.7.py new file mode 100644 --- /dev/null +++ b/tests/generator/xproto_1.7.py @@ -0,0 +1,80 @@ +import xcffib +import struct +import six +MAJOR_VERSION = 0 +MINOR_VERSION = 11 +key = xcffib.ExtensionKey("XPROTO") +_events = {} +_errors = {} +class Atom: + _None = 0 + Any = 0 + PRIMARY = 1 + SECONDARY = 2 + ARC = 3 + ATOM = 4 + BITMAP = 5 + CARDINAL = 6 + COLORMAP = 7 + CURSOR = 8 + CUT_BUFFER0 = 9 + CUT_BUFFER1 = 10 + CUT_BUFFER2 = 11 + CUT_BUFFER3 = 12 + CUT_BUFFER4 = 13 + CUT_BUFFER5 = 14 + CUT_BUFFER6 = 15 + CUT_BUFFER7 = 16 + DRAWABLE = 17 + FONT = 18 + INTEGER = 19 + PIXMAP = 20 + POINT = 21 + RECTANGLE = 22 + RESOURCE_MANAGER = 23 + RGB_COLOR_MAP = 24 + RGB_BEST_MAP = 25 + RGB_BLUE_MAP = 26 + RGB_DEFAULT_MAP = 27 + RGB_GRAY_MAP = 28 + RGB_GREEN_MAP = 29 + RGB_RED_MAP = 30 + STRING = 31 + VISUALID = 32 + WINDOW = 33 + WM_COMMAND = 34 + WM_HINTS = 35 + WM_CLIENT_MACHINE = 36 + WM_ICON_NAME = 37 + WM_ICON_SIZE = 38 + WM_NAME = 39 + WM_NORMAL_HINTS = 40 + WM_SIZE_HINTS = 41 + WM_ZOOM_HINTS = 42 + MIN_SPACE = 43 + NORM_SPACE = 44 + MAX_SPACE = 45 + END_SPACE = 46 + SUPERSCRIPT_X = 47 + SUPERSCRIPT_Y = 48 + SUBSCRIPT_X = 49 + SUBSCRIPT_Y = 50 + UNDERLINE_POSITION = 51 + UNDERLINE_THICKNESS = 52 + STRIKEOUT_ASCENT = 53 + STRIKEOUT_DESCENT = 54 + ITALIC_ANGLE = 55 + X_HEIGHT = 56 + QUAD_WIDTH = 57 + WEIGHT = 58 + POINT_SIZE = 59 + RESOLUTION = 60 + COPYRIGHT = 61 + NOTICE = 62 + FONT_NAME = 63 + FAMILY_NAME = 64 + FULL_NAME = 65 + CAP_HEIGHT = 66 + WM_CLASS = 67 + WM_TRANSIENT_FOR = 68 +xcffib._add_ext(key, xproto_1._7Extension, _events, _errors) diff --git a/tests/generator/xproto_1.7.xml b/tests/generator/xproto_1.7.xml new file mode 100644 --- /dev/null +++ b/tests/generator/xproto_1.7.xml @@ -0,0 +1,81 @@ + + + + + + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xcffib.cabal b/xcffib.cabal --- a/xcffib.cabal +++ b/xcffib.cabal @@ -1,5 +1,5 @@ name: xcffib -version: 0.2.1 +version: 0.2.2 synopsis: A cffi-based python binding for X homepage: http://github.com/tych0/xcffib license: OtherLicense @@ -11,6 +11,13 @@ cabal-version: >=1.8 bug-reports: https://github.com/tych0/xcffib/issues description: A cffi-based python binding for X, comparable to xpyb +extra-source-files: tests/generator/*.py, + tests/generator/*.xml, + -- cabal's wildcarding is broken if the filename contains + -- extra dots: + -- https://github.com/haskell/cabal/issues/784 + tests/generator/*.7.py, + tests/generator/*.7.xml source-repository head type: git