Skip to content

protocol/request: fix XGetImage/XPutImage support #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vasily-v-ryabov merged 3 commits into from
Sep 3, 2017
Merged

protocol/request: fix XGetImage/XPutImage support #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3c8ed2
test: update little-endian tests
benoit-pierre Sep 3, 2017
bc133a5
test: update big-endian tests
benoit-pierre Sep 3, 2017
61faba2
protocol/request: fix XGetImage/XPutImage support
benoit-pierre Sep 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Xlib/protocol/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ class PutImage(rq.Request):
rq.Card8('left_pad'),
rq.Card8('depth'),
rq.Pad(2),
rq.String8('data'),
rq.Binary('data'),
)

class GetImage(rq.ReplyRequest):
Expand All @@ -1089,7 +1089,7 @@ class GetImage(rq.ReplyRequest):
rq.ReplyLength(),
rq.Card32('visual'),
rq.Pad(20),
rq.String8('data'),
rq.Binary('data'),
)

class PolyText8(rq.Request):
Expand Down
6 changes: 3 additions & 3 deletions test/gen/genprottest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ def rand(x, rmin = rmin, rmax = rmax):
#
# byte-char string
#
elif isinstance(f, rq.String8):
elif isinstance(f, (rq.String8, rq.Binary)):
vfstr = vardefs[i]
vflen = len(vfstr)

Expand Down Expand Up @@ -933,7 +933,7 @@ def build_bin(bin):
'FillPoly': (('Point', 3), ),
'PolyFillRectangle': (('Rectangle', 2), ),
'PolyFillArc': (('Arc', 1), ),
'PutImage': ('bit map data', ),
'PutImage': (b'\xe9\x10\xf2o\x7f{\xae-\xe6\x18\xce\x83', ),
'ImageText8': ('showme', ),
'ImageText16': ('showmore', ),
'AllocNamedColor': ('octarin', ),
Expand Down Expand Up @@ -967,7 +967,7 @@ def build_bin(bin):
'ListFontsWithInfo': (('FontProp', 1), 'fontfont'),
'GetFontPath': [(['path1', 'path2232'], ),
([], ) ],
'GetImage': ('this is real ly imag e b-map', ),
'GetImage': (b'\xeb?:\xa7\xc6\x8b\xc2\x96o-S\xe6\xd6z6\x94\xd7v\xd2R.\xa2\xeaw\t\x13\x95\x85',),
'ListInstalledColormaps': (2, ),
'AllocColorCells': [(17, 3),
(0, 0) ],
Expand Down
Empty file modified test/test_events_be.py
100644 → 100755
View file
Open in desktop
Empty file.
Loading