aboutsummaryrefslogtreecommitdiff
path: root/nexgb/xf86vidmode/xf86vidmode.go
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2013-12-28 10:02:18 -0500
committerPřemysl Janouch <p@janouch.name>2018-09-08 16:49:21 +0200
commit33509dbeb0acd7abbbb9e8c434d0c3f0ce8a3230 (patch)
treece7d66adcb2e7fd3802a884b0fae618dfa1533a6 /nexgb/xf86vidmode/xf86vidmode.go
parentad9c35a02f190ea5da59c9c4a3aeddcf7e8a5c1f (diff)
downloadhaven-33509dbeb0acd7abbbb9e8c434d0c3f0ce8a3230.tar.gz
haven-33509dbeb0acd7abbbb9e8c434d0c3f0ce8a3230.tar.xz
haven-33509dbeb0acd7abbbb9e8c434d0c3f0ce8a3230.zip
It appears that the "Str" type (which is built into the core X protocol)
doesn't specify any padding. So it has to be treated as a special case. Close #12.
Diffstat (limited to 'nexgb/xf86vidmode/xf86vidmode.go')
-rw-r--r--nexgb/xf86vidmode/xf86vidmode.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/nexgb/xf86vidmode/xf86vidmode.go b/nexgb/xf86vidmode/xf86vidmode.go
index 5a3f63d..44228c4 100644
--- a/nexgb/xf86vidmode/xf86vidmode.go
+++ b/nexgb/xf86vidmode/xf86vidmode.go
@@ -1543,7 +1543,7 @@ func getMonitorReply(buf []byte) *GetMonitorReply {
byteString := make([]byte, v.VendorLength)
copy(byteString[:v.VendorLength], buf[b:])
v.Vendor = string(byteString)
- b += xgb.Pad(int(v.VendorLength))
+ b += int(v.VendorLength)
}
v.AlignmentPad = make([]byte, (((int(v.VendorLength) + 3) & -4) - int(v.VendorLength)))
@@ -1554,7 +1554,7 @@ func getMonitorReply(buf []byte) *GetMonitorReply {
byteString := make([]byte, v.ModelLength)
copy(byteString[:v.ModelLength], buf[b:])
v.Model = string(byteString)
- b += xgb.Pad(int(v.ModelLength))
+ b += int(v.ModelLength)
}
return v