[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/xelb 4e42bf2 04/42: Cleanup code
|
From: |
Chris Feng |
|
Subject: |
[elpa] externals/xelb 4e42bf2 04/42: Cleanup code |
|
Date: |
Thu, 17 Sep 2015 23:16:38 +0000 |
branch: externals/xelb
commit 4e42bf2430fb5388ea15c0febf6099bbd683fb09
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>
Cleanup code
Also make <pad> counter more robust.
---
Makefile | 1 -
el_client.el | 9 ++---
xcb-xinput.el | 108 ++++++++++++++++++++++++++++----------------------------
xcb-xkb.el | 40 ++++++++++----------
xcb.el | 4 --
5 files changed, 78 insertions(+), 84 deletions(-)
diff --git a/Makefile b/Makefile
index 9b2fe7d..efa17da 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ EMACS_BIN := emacs -Q
EXTENSIONS := bigreq dpms ge present render shape xf86dri xinerama xprint \
xtest composite dri2 glx randr res shm xc_misc xf86vidmode xinput xvmc \
damage dri3 record screensaver sync xevie xfixes xkb xselinux xv
-# EXTENSIONS := render randr xkb
LIBS = xcb-xproto.el $(addprefix xcb-,$(addsuffix .el,$(EXTENSIONS)))
diff --git a/el_client.el b/el_client.el
index 66d7a89..b464607 100644
--- a/el_client.el
+++ b/el_client.el
@@ -56,6 +56,9 @@
(defvar event-alist nil "Record X events in this module.")
(make-variable-buffer-local 'event-alist)
+(defvar pad-count 0 "<pad> node counter.")
+(make-variable-buffer-local 'pad-count)
+
;;;; Helper functions
(defsubst node-name (node)
@@ -150,6 +153,7 @@
(defun parse-top-level-element (node)
"Parse a top-level element."
+ (setq pad-count 0)
(pcase (node-name node)
(`import (parse-import node))
(`struct (parse-struct node))
@@ -176,7 +180,6 @@
"Parse <struct>."
(let ((name (intern (concat prefix (node-attr node 'name))))
(contents (node-subnodes node))
- (pad-count 0)
result)
(setq contents
(apply 'nconc
@@ -240,7 +243,6 @@ The `combine-adjacent' attribute is simply ignored."
(opcode (string-to-int (node-attr node 'opcode)))
(contents `((~opcode :initform ,opcode :type xcb:-u1)))
(subnodes (node-subnodes node))
- (pad-count 0)
(reply-pad-count 0)
expressions
result reply-result reply-name reply-contents)
@@ -297,7 +299,6 @@ KeymapNotify event; instead, we handle this case in
`xcb:unmarshal'."
(event-number (string-to-int (node-attr node 'number)))
(xge (node-attr node 'xge))
(contents (node-subnodes node))
- (pad-count 0)
result)
(setq contents
(apply 'nconc
@@ -325,7 +326,6 @@ KeymapNotify event; instead, we handle this case in
`xcb:unmarshal'."
(let ((name (intern (concat prefix (node-attr node 'name))))
(error-number (string-to-int (node-attr node 'number)))
(contents (node-subnodes node))
- (pad-count 0)
result)
(setq contents
(apply 'nconc
@@ -432,7 +432,6 @@ KeymapNotify event; instead, we handle this case in
`xcb:unmarshal'."
(let ((name (intern (node-attr-escape node 'name)))
(expression (parse-expression (car (node-subnodes node))))
(cases (cdr (node-subnodes node)))
- (pad-count 10) ;avoid naming duplication (as only one <swith> allowed)
fields fields-name)
;; Avoid duplicated slot names by appending "*" if necessary
(let (names name)
diff --git a/xcb-xinput.el b/xcb-xinput.el
index 75c992b..3b23ded 100644
--- a/xcb-xinput.el
+++ b/xcb-xinput.el
@@ -111,7 +111,7 @@
(xcb:-fieldref 'class-id)
cases
(((xcb:xinput:InputClass:Key)
- min-keycode max-keycode num-keys pad~10)
+ min-keycode max-keycode num-keys pad~0)
((xcb:xinput:InputClass:Button)
num-buttons)
((xcb:xinput:InputClass:Valuator)
@@ -120,7 +120,7 @@
(min-keycode :initarg :min-keycode :type xcb:xinput:KeyCode)
(max-keycode :initarg :max-keycode :type xcb:xinput:KeyCode)
(num-keys :initarg :num-keys :type xcb:CARD16)
- (pad~10 :initform 2 :type xcb:-pad)
+ (pad~0 :initform 2 :type xcb:-pad)
(num-buttons :initarg :num-buttons :type xcb:CARD16)
(axes-len :initarg :axes-len :type xcb:CARD8)
(mode :initarg :mode :type xcb:CARD8)
@@ -542,9 +542,9 @@
(xcb:-fieldref 'class-id)
cases
(((xcb:xinput:FeedbackClass:Keyboard)
- pitch duration led-mask led-values global-auto-repeat click
percent pad~10 auto-repeats)
+ pitch duration led-mask led-values global-auto-repeat click
percent pad~0 auto-repeats)
((xcb:xinput:FeedbackClass:Pointer)
- pad~11 accel-num accel-denom threshold)
+ pad~1 accel-num accel-denom threshold)
((xcb:xinput:FeedbackClass:String)
max-symbols num-keysyms keysyms)
((xcb:xinput:FeedbackClass:Integer)
@@ -552,7 +552,7 @@
((xcb:xinput:FeedbackClass:Led)
led-mask* led-values*)
((xcb:xinput:FeedbackClass:Bell)
- percent* pad~12 pitch* duration*)))
+ percent* pad~2 pitch* duration*)))
:type xcb:-switch)
(pitch :initarg :pitch :type xcb:CARD16)
(duration :initarg :duration :type xcb:CARD16)
@@ -561,12 +561,12 @@
(global-auto-repeat :initarg :global-auto-repeat :type xcb:BOOL)
(click :initarg :click :type xcb:CARD8)
(percent :initarg :percent :type xcb:CARD8)
- (pad~10 :initform 1 :type xcb:-pad)
+ (pad~0 :initform 1 :type xcb:-pad)
(auto-repeats :initarg :auto-repeats :type xcb:-ignore)
(auto-repeats~ :initform
'(name auto-repeats type xcb:CARD8 size 32)
:type xcb:-list)
- (pad~11 :initform 2 :type xcb:-pad)
+ (pad~1 :initform 2 :type xcb:-pad)
(accel-num :initarg :accel-num :type xcb:CARD16)
(accel-denom :initarg :accel-denom :type xcb:CARD16)
(threshold :initarg :threshold :type xcb:CARD16)
@@ -583,7 +583,7 @@
(led-mask* :initarg :led-mask* :type xcb:CARD32)
(led-values* :initarg :led-values* :type xcb:CARD32)
(percent* :initarg :percent* :type xcb:CARD8)
- (pad~12 :initform 3 :type xcb:-pad)
+ (pad~2 :initform 3 :type xcb:-pad)
(pitch* :initarg :pitch* :type xcb:CARD16)
(duration* :initarg :duration* :type xcb:CARD16)))
@@ -677,15 +677,15 @@
(((xcb:xinput:FeedbackClass:Keyboard)
key auto-repeat-mode key-click-percent bell-percent bell-pitch
bell-duration led-mask led-values)
((xcb:xinput:FeedbackClass:Pointer)
- pad~10 num denom threshold)
+ pad~0 num denom threshold)
((xcb:xinput:FeedbackClass:String)
- pad~11 num-keysyms keysyms)
+ pad~1 num-keysyms keysyms)
((xcb:xinput:FeedbackClass:Integer)
int-to-display)
((xcb:xinput:FeedbackClass:Led)
led-mask* led-values*)
((xcb:xinput:FeedbackClass:Bell)
- percent pad~12 pitch duration)))
+ percent pad~2 pitch duration)))
:type xcb:-switch)
(key :initarg :key :type xcb:xinput:KeyCode)
(auto-repeat-mode :initarg :auto-repeat-mode :type xcb:CARD8)
@@ -695,11 +695,11 @@
(bell-duration :initarg :bell-duration :type xcb:INT16)
(led-mask :initarg :led-mask :type xcb:CARD32)
(led-values :initarg :led-values :type xcb:CARD32)
- (pad~10 :initform 2 :type xcb:-pad)
+ (pad~0 :initform 2 :type xcb:-pad)
(num :initarg :num :type xcb:INT16)
(denom :initarg :denom :type xcb:INT16)
(threshold :initarg :threshold :type xcb:INT16)
- (pad~11 :initform 2 :type xcb:-pad)
+ (pad~1 :initform 2 :type xcb:-pad)
(num-keysyms :initarg :num-keysyms :type xcb:CARD16)
(keysyms :initarg :keysyms :type xcb:-ignore)
(keysyms~ :initform
@@ -710,7 +710,7 @@
(led-mask* :initarg :led-mask* :type xcb:CARD32)
(led-values* :initarg :led-values* :type xcb:CARD32)
(percent :initarg :percent :type xcb:INT8)
- (pad~12 :initform 3 :type xcb:-pad)
+ (pad~2 :initform 3 :type xcb:-pad)
(pitch :initarg :pitch :type xcb:INT16)
(duration :initarg :duration :type xcb:INT16)))
@@ -887,20 +887,20 @@
(xcb:-fieldref 'class-id)
cases
(((xcb:xinput:InputClass:Key)
- num-keys pad~10 keys)
+ num-keys pad~0 keys)
((xcb:xinput:InputClass:Button)
- num-buttons pad~11 buttons)
+ num-buttons pad~1 buttons)
((xcb:xinput:InputClass:Valuator)
num-valuators mode valuators)))
:type xcb:-switch)
(num-keys :initarg :num-keys :type xcb:CARD8)
- (pad~10 :initform 1 :type xcb:-pad)
+ (pad~0 :initform 1 :type xcb:-pad)
(keys :initarg :keys :type xcb:-ignore)
(keys~ :initform
'(name keys type xcb:CARD8 size 32)
:type xcb:-list)
(num-buttons :initarg :num-buttons :type xcb:CARD8)
- (pad~11 :initform 1 :type xcb:-pad)
+ (pad~1 :initform 1 :type xcb:-pad)
(buttons :initarg :buttons :type xcb:-ignore)
(buttons~ :initform
'(name buttons type xcb:CARD8 size 32)
@@ -1056,9 +1056,9 @@
((xcb:xinput:DeviceControl:abs_calib)
min-x max-x min-y max-y flip-x flip-y rotation button-threshold)
((xcb:xinput:DeviceControl:core)
- status iscore pad~10)
+ status iscore pad~0)
((xcb:xinput:DeviceControl:enable)
- enable pad~11)
+ enable pad~1)
((xcb:xinput:DeviceControl:abs_area)
offset-x offset-y width height screen following)))
:type xcb:-switch)
@@ -1088,9 +1088,9 @@
(button-threshold :initarg :button-threshold :type xcb:CARD32)
(status :initarg :status :type xcb:CARD8)
(iscore :initarg :iscore :type xcb:CARD8)
- (pad~10 :initform 2 :type xcb:-pad)
+ (pad~0 :initform 2 :type xcb:-pad)
(enable :initarg :enable :type xcb:CARD8)
- (pad~11 :initform 3 :type xcb:-pad)
+ (pad~1 :initform 3 :type xcb:-pad)
(offset-x :initarg :offset-x :type xcb:CARD32)
(offset-y :initarg :offset-y :type xcb:CARD32)
(width :initarg :width :type xcb:CARD32)
@@ -1171,19 +1171,19 @@
(xcb:-fieldref 'control-id)
cases
(((xcb:xinput:DeviceControl:resolution)
- first-valuator num-valuators pad~10 resolution-values)
+ first-valuator num-valuators pad~0 resolution-values)
((xcb:xinput:DeviceControl:abs_calib)
min-x max-x min-y max-y flip-x flip-y rotation button-threshold)
((xcb:xinput:DeviceControl:core)
- status pad~11)
+ status pad~1)
((xcb:xinput:DeviceControl:enable)
- enable pad~12)
+ enable pad~2)
((xcb:xinput:DeviceControl:abs_area)
offset-x offset-y width height screen following)))
:type xcb:-switch)
(first-valuator :initarg :first-valuator :type xcb:CARD8)
(num-valuators :initarg :num-valuators :type xcb:CARD8)
- (pad~10 :initform 2 :type xcb:-pad)
+ (pad~0 :initform 2 :type xcb:-pad)
(resolution-values :initarg :resolution-values :type xcb:-ignore)
(resolution-values~ :initform
'(name resolution-values type xcb:CARD32 size
@@ -1198,9 +1198,9 @@
(rotation :initarg :rotation :type xcb:CARD32)
(button-threshold :initarg :button-threshold :type xcb:CARD32)
(status :initarg :status :type xcb:CARD8)
- (pad~11 :initform 3 :type xcb:-pad)
+ (pad~1 :initform 3 :type xcb:-pad)
(enable :initarg :enable :type xcb:CARD8)
- (pad~12 :initform 3 :type xcb:-pad)
+ (pad~2 :initform 3 :type xcb:-pad)
(offset-x :initarg :offset-x :type xcb:CARD32)
(offset-y :initarg :offset-y :type xcb:CARD32)
(width :initarg :width :type xcb:INT32)
@@ -1256,9 +1256,9 @@
(xcb:-fieldref 'format)
cases
(((xcb:xinput:PropertyFormat:8Bits)
- data8 pad~10)
+ data8 pad~1)
((xcb:xinput:PropertyFormat:16Bits)
- data16 pad~11)
+ data16 pad~2)
((xcb:xinput:PropertyFormat:32Bits)
data32)))
:type xcb:-switch)
@@ -1267,13 +1267,13 @@
'(name data8 type xcb:CARD8 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~10 :initform 4 :type xcb:-pad-align)
+ (pad~1 :initform 4 :type xcb:-pad-align)
(data16 :initarg :data16 :type xcb:-ignore)
(data16~ :initform
'(name data16 type xcb:CARD16 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~11 :initform 4 :type xcb:-pad-align)
+ (pad~2 :initform 4 :type xcb:-pad-align)
(data32 :initarg :data32 :type xcb:-ignore)
(data32~ :initform
'(name data32 type xcb:CARD32 size
@@ -1311,9 +1311,9 @@
(xcb:-fieldref 'format)
cases
(((xcb:xinput:PropertyFormat:8Bits)
- data8 pad~10)
+ data8 pad~1)
((xcb:xinput:PropertyFormat:16Bits)
- data16 pad~11)
+ data16 pad~2)
((xcb:xinput:PropertyFormat:32Bits)
data32)))
:type xcb:-switch)
@@ -1322,13 +1322,13 @@
'(name data8 type xcb:CARD8 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~10 :initform 4 :type xcb:-pad-align)
+ (pad~1 :initform 4 :type xcb:-pad-align)
(data16 :initarg :data16 :type xcb:-ignore)
(data16~ :initform
'(name data16 type xcb:CARD16 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~11 :initform 4 :type xcb:-pad-align)
+ (pad~2 :initform 4 :type xcb:-pad-align)
(data32 :initarg :data32 :type xcb:-ignore)
(data32~ :initform
'(name data32 type xcb:CARD32 size
@@ -1455,13 +1455,13 @@
(xcb:-fieldref 'type)
cases
(((xcb:xinput:HierarchyChangeType:AddMaster)
- name-len send-core enable name pad~10)
+ name-len send-core enable name pad~0)
((xcb:xinput:HierarchyChangeType:RemoveMaster)
- deviceid return-mode pad~11 return-pointer return-keyboard)
+ deviceid return-mode pad~1 return-pointer return-keyboard)
((xcb:xinput:HierarchyChangeType:AttachSlave)
deviceid* master)
((xcb:xinput:HierarchyChangeType:DetachSlave)
- deviceid** pad~12)))
+ deviceid** pad~2)))
:type xcb:-switch)
(name-len :initarg :name-len :type xcb:CARD16)
(send-core :initarg :send-core :type xcb:BOOL)
@@ -1471,16 +1471,16 @@
'(name name type xcb:char size
(xcb:-fieldref 'name-len))
:type xcb:-list)
- (pad~10 :initform 4 :type xcb:-pad-align)
+ (pad~0 :initform 4 :type xcb:-pad-align)
(deviceid :initarg :deviceid :type xcb:xinput:DeviceId)
(return-mode :initarg :return-mode :type xcb:CARD8)
- (pad~11 :initform 1 :type xcb:-pad)
+ (pad~1 :initform 1 :type xcb:-pad)
(return-pointer :initarg :return-pointer :type xcb:xinput:DeviceId)
(return-keyboard :initarg :return-keyboard :type xcb:xinput:DeviceId)
(deviceid* :initarg :deviceid* :type xcb:xinput:DeviceId)
(master :initarg :master :type xcb:xinput:DeviceId)
(deviceid** :initarg :deviceid** :type xcb:xinput:DeviceId)
- (pad~12 :initform 2 :type xcb:-pad)))
+ (pad~2 :initform 2 :type xcb:-pad)))
(defclass xcb:xinput:XIChangeHierarchy
(xcb:-request)
@@ -1674,9 +1674,9 @@
((xcb:xinput:DeviceClassType:Button)
num-buttons state labels)
((xcb:xinput:DeviceClassType:Valuator)
- number label min max value resolution mode pad~10)
+ number label min max value resolution mode pad~0)
((xcb:xinput:DeviceClassType:Scroll)
- number* scroll-type pad~11 flags increment)
+ number* scroll-type pad~1 flags increment)
((xcb:xinput:DeviceClassType:Touch)
mode* num-touches)))
:type xcb:-switch)
@@ -1708,10 +1708,10 @@
(value :initarg :value :type xcb:xinput:FP3232)
(resolution :initarg :resolution :type xcb:CARD32)
(mode :initarg :mode :type xcb:CARD8)
- (pad~10 :initform 3 :type xcb:-pad)
+ (pad~0 :initform 3 :type xcb:-pad)
(number* :initarg :number* :type xcb:CARD16)
(scroll-type :initarg :scroll-type :type xcb:CARD16)
- (pad~11 :initform 2 :type xcb:-pad)
+ (pad~1 :initform 2 :type xcb:-pad)
(flags :initarg :flags :type xcb:CARD32)
(increment :initarg :increment :type xcb:xinput:FP3232)
(mode* :initarg :mode* :type xcb:CARD8)
@@ -1924,9 +1924,9 @@
(xcb:-fieldref 'format)
cases
(((xcb:xinput:PropertyFormat:8Bits)
- data8 pad~10)
+ data8 pad~0)
((xcb:xinput:PropertyFormat:16Bits)
- data16 pad~11)
+ data16 pad~1)
((xcb:xinput:PropertyFormat:32Bits)
data32)))
:type xcb:-switch)
@@ -1935,13 +1935,13 @@
'(name data8 type xcb:CARD8 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~10 :initform 4 :type xcb:-pad-align)
+ (pad~0 :initform 4 :type xcb:-pad-align)
(data16 :initarg :data16 :type xcb:-ignore)
(data16~ :initform
'(name data16 type xcb:CARD16 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~11 :initform 4 :type xcb:-pad-align)
+ (pad~1 :initform 4 :type xcb:-pad-align)
(data32 :initarg :data32 :type xcb:-ignore)
(data32~ :initform
'(name data32 type xcb:CARD32 size
@@ -1978,9 +1978,9 @@
(xcb:-fieldref 'format)
cases
(((xcb:xinput:PropertyFormat:8Bits)
- data8 pad~10)
+ data8 pad~1)
((xcb:xinput:PropertyFormat:16Bits)
- data16 pad~11)
+ data16 pad~2)
((xcb:xinput:PropertyFormat:32Bits)
data32)))
:type xcb:-switch)
@@ -1989,13 +1989,13 @@
'(name data8 type xcb:CARD8 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~10 :initform 4 :type xcb:-pad-align)
+ (pad~1 :initform 4 :type xcb:-pad-align)
(data16 :initarg :data16 :type xcb:-ignore)
(data16~ :initform
'(name data16 type xcb:CARD16 size
(xcb:-fieldref 'num-items))
:type xcb:-list)
- (pad~11 :initform 4 :type xcb:-pad-align)
+ (pad~2 :initform 4 :type xcb:-pad-align)
(data32 :initarg :data32 :type xcb:-ignore)
(data32~ :initform
'(name data32 type xcb:CARD32 size
diff --git a/xcb-xkb.el b/xcb-xkb.el
index 71583ef..f21b9c4 100644
--- a/xcb-xkb.el
+++ b/xcb-xkb.el
@@ -1118,11 +1118,11 @@
cases
((xcb:xkb:MapPart:KeyTypes types-rtrn)
(xcb:xkb:MapPart:KeySyms syms-rtrn)
- (xcb:xkb:MapPart:KeyActions acts-rtrn-count pad~10 acts-rtrn-acts)
+ (xcb:xkb:MapPart:KeyActions acts-rtrn-count pad~1 acts-rtrn-acts)
(xcb:xkb:MapPart:KeyBehaviors behaviors-rtrn)
- (xcb:xkb:MapPart:VirtualMods vmods-rtrn pad~11)
- (xcb:xkb:MapPart:ExplicitComponents explicit-rtrn pad~12)
- (xcb:xkb:MapPart:ModifierMap modmap-rtrn pad~13)
+ (xcb:xkb:MapPart:VirtualMods vmods-rtrn pad~2)
+ (xcb:xkb:MapPart:ExplicitComponents explicit-rtrn pad~3)
+ (xcb:xkb:MapPart:ModifierMap modmap-rtrn pad~4)
(xcb:xkb:MapPart:VirtualModMap vmodmap-rtrn)))
:type xcb:-switch)
(types-rtrn :initarg :types-rtrn :type xcb:-ignore)
@@ -1140,7 +1140,7 @@
'(name acts-rtrn-count type xcb:CARD8 size
(xcb:-fieldref 'nKeyActions))
:type xcb:-list)
- (pad~10 :initform 4 :type xcb:-pad-align)
+ (pad~1 :initform 4 :type xcb:-pad-align)
(acts-rtrn-acts :initarg :acts-rtrn-acts :type xcb:-ignore)
(acts-rtrn-acts~ :initform
'(name acts-rtrn-acts type xcb:xkb:Action size
@@ -1157,19 +1157,19 @@
(xcb:-popcount
(xcb:-fieldref 'virtualMods)))
:type xcb:-list)
- (pad~11 :initform 4 :type xcb:-pad-align)
+ (pad~2 :initform 4 :type xcb:-pad-align)
(explicit-rtrn :initarg :explicit-rtrn :type xcb:-ignore)
(explicit-rtrn~ :initform
'(name explicit-rtrn type xcb:xkb:SetExplicit size
(xcb:-fieldref 'totalKeyExplicit))
:type xcb:-list)
- (pad~12 :initform 4 :type xcb:-pad-align)
+ (pad~3 :initform 4 :type xcb:-pad-align)
(modmap-rtrn :initarg :modmap-rtrn :type xcb:-ignore)
(modmap-rtrn~ :initform
'(name modmap-rtrn type xcb:xkb:KeyModMap size
(xcb:-fieldref 'totalModMapKeys))
:type xcb:-list)
- (pad~13 :initform 4 :type xcb:-pad-align)
+ (pad~4 :initform 4 :type xcb:-pad-align)
(vmodmap-rtrn :initarg :vmodmap-rtrn :type xcb:-ignore)
(vmodmap-rtrn~ :initform
'(name vmodmap-rtrn type xcb:xkb:KeyVModMap size
@@ -1701,18 +1701,18 @@
(xcb:-fieldref 'reported)
cases
(((logior xcb:xkb:GBNDetail:Types xcb:xkb:GBNDetail:ClientSymbols
xcb:xkb:GBNDetail:ServerSymbols)
- nil getmap-type nil typeDeviceID nil getmap-sequence
getmap-length nil pad~10 typeMinKeyCode typeMaxKeyCode present firstType nTypes
totalTypes firstKeySym totalSyms nKeySyms firstKeyAction totalActions
nKeyActions firstKeyBehavior nKeyBehaviors totalKeyBehaviors firstKeyExplicit
nKeyExplicit totalKeyExplicit firstModMapKey nModMapKeys totalModMapKeys
firstVModMapKey nVModMapKeys totalVModMapKeys pad~11 virtualMods map)
- (xcb:xkb:GBNDetail:CompatMap nil compatmap-type compatDeviceID
compatmap-sequence compatmap-length nil groupsRtrn pad~12 firstSIRtrn nSIRtrn
nTotalSI pad~13 si-rtrn group-rtrn)
- (xcb:xkb:GBNDetail:IndicatorMaps nil indicatormap-type
indicatorDeviceID indicatormap-sequence indicatormap-length nil which
realIndicators nIndicators pad~14 maps)
+ nil getmap-type nil typeDeviceID nil getmap-sequence
getmap-length nil pad~1 typeMinKeyCode typeMaxKeyCode present firstType nTypes
totalTypes firstKeySym totalSyms nKeySyms firstKeyAction totalActions
nKeyActions firstKeyBehavior nKeyBehaviors totalKeyBehaviors firstKeyExplicit
nKeyExplicit totalKeyExplicit firstModMapKey nModMapKeys totalModMapKeys
firstVModMapKey nVModMapKeys totalVModMapKeys pad~2 virtualMods map)
+ (xcb:xkb:GBNDetail:CompatMap nil compatmap-type compatDeviceID
compatmap-sequence compatmap-length nil groupsRtrn pad~3 firstSIRtrn nSIRtrn
nTotalSI pad~4 si-rtrn group-rtrn)
+ (xcb:xkb:GBNDetail:IndicatorMaps nil indicatormap-type
indicatorDeviceID indicatormap-sequence indicatormap-length nil which
realIndicators nIndicators pad~5 maps)
((logior xcb:xkb:GBNDetail:KeyNames xcb:xkb:GBNDetail:OtherNames)
- nil keyname-type keyDeviceID keyname-sequence keyname-length
nil which* keyMinKeyCode keyMaxKeyCode nTypes* groupNames virtualMods* firstKey
nKeys indicators nRadioGroups nKeyAliases nKTLevels pad~15 valueList)
- (xcb:xkb:GBNDetail:Geometry nil geometry-type geometryDeviceID
geometry-sequence geometry-length nil name geometryFound pad~16 widthMM
heightMM nProperties nColors nShapes nSections nDoodads nKeyAliases*
baseColorNdx labelColorNdx labelFont nil nil)))
+ nil keyname-type keyDeviceID keyname-sequence keyname-length
nil which* keyMinKeyCode keyMaxKeyCode nTypes* groupNames virtualMods* firstKey
nKeys indicators nRadioGroups nKeyAliases nKTLevels pad~6 valueList)
+ (xcb:xkb:GBNDetail:Geometry nil geometry-type geometryDeviceID
geometry-sequence geometry-length nil name geometryFound pad~7 widthMM heightMM
nProperties nColors nShapes nSections nDoodads nKeyAliases* baseColorNdx
labelColorNdx labelFont nil nil)))
:type xcb:-switch)
(getmap-type :initarg :getmap-type :type xcb:CARD8)
(typeDeviceID :initarg :typeDeviceID :type xcb:CARD8)
(getmap-sequence :initarg :getmap-sequence :type xcb:CARD16)
(getmap-length :initarg :getmap-length :type xcb:CARD32)
- (pad~10 :initform 2 :type xcb:-pad)
+ (pad~1 :initform 2 :type xcb:-pad)
(typeMinKeyCode :initarg :typeMinKeyCode :type xcb:KEYCODE)
(typeMaxKeyCode :initarg :typeMaxKeyCode :type xcb:KEYCODE)
(present :initarg :present :type xcb:CARD16)
@@ -1737,7 +1737,7 @@
(firstVModMapKey :initarg :firstVModMapKey :type xcb:KEYCODE)
(nVModMapKeys :initarg :nVModMapKeys :type xcb:CARD8)
(totalVModMapKeys :initarg :totalVModMapKeys :type xcb:CARD8)
- (pad~11 :initform 1 :type xcb:-pad)
+ (pad~2 :initform 1 :type xcb:-pad)
(virtualMods :initarg :virtualMods :type xcb:CARD16)
(map :initform
'(expression
@@ -1803,11 +1803,11 @@
(compatmap-sequence :initarg :compatmap-sequence :type xcb:CARD16)
(compatmap-length :initarg :compatmap-length :type xcb:CARD32)
(groupsRtrn :initarg :groupsRtrn :type xcb:CARD8)
- (pad~12 :initform 1 :type xcb:-pad)
+ (pad~3 :initform 1 :type xcb:-pad)
(firstSIRtrn :initarg :firstSIRtrn :type xcb:CARD16)
(nSIRtrn :initarg :nSIRtrn :type xcb:CARD16)
(nTotalSI :initarg :nTotalSI :type xcb:CARD16)
- (pad~13 :initform 16 :type xcb:-pad)
+ (pad~4 :initform 16 :type xcb:-pad)
(si-rtrn :initarg :si-rtrn :type xcb:-ignore)
(si-rtrn~ :initform
'(name si-rtrn type xcb:xkb:SymInterpret size
@@ -1826,7 +1826,7 @@
(which :initarg :which :type xcb:CARD32)
(realIndicators :initarg :realIndicators :type xcb:CARD32)
(nIndicators :initarg :nIndicators :type xcb:CARD8)
- (pad~14 :initform 15 :type xcb:-pad)
+ (pad~5 :initform 15 :type xcb:-pad)
(maps :initarg :maps :type xcb:-ignore)
(maps~ :initform
'(name maps type xcb:xkb:IndicatorMap size
@@ -1848,7 +1848,7 @@
(nRadioGroups :initarg :nRadioGroups :type xcb:CARD8)
(nKeyAliases :initarg :nKeyAliases :type xcb:CARD8)
(nKTLevels :initarg :nKTLevels :type xcb:CARD16)
- (pad~15 :initform 4 :type xcb:-pad)
+ (pad~6 :initform 4 :type xcb:-pad)
(valueList :initform
'(expression
(xcb:-fieldref 'which)
@@ -1929,7 +1929,7 @@
(geometry-length :initarg :geometry-length :type xcb:CARD32)
(name :initarg :name :type xcb:ATOM)
(geometryFound :initarg :geometryFound :type xcb:BOOL)
- (pad~16 :initform 1 :type xcb:-pad)
+ (pad~7 :initform 1 :type xcb:-pad)
(widthMM :initarg :widthMM :type xcb:CARD16)
(heightMM :initarg :heightMM :type xcb:CARD16)
(nProperties :initarg :nProperties :type xcb:CARD16)
diff --git a/xcb.el b/xcb.el
index 66ec07a..0f5ae1a 100644
--- a/xcb.el
+++ b/xcb.el
@@ -323,10 +323,6 @@ classes of EVENT (since they have the same event number)."
(setf (slot-value obj 'event-plist)
(plist-put plist event-number (append listeners (list listener))))))
-;; (cl-defmethod xcb:connection-has-error ((obj xcb:connection))
-;; "Determine if X connection has error."
-;; (not (slot-value obj 'connected)))
-
(cl-defmethod xcb:flush ((obj xcb:connection))
"Flush request data to X server."
(let ((cache (slot-value obj 'request-cache)))
- [elpa] externals/xelb 1916894 07/42: Fix integer overflow on 32-bit platform, (continued)
- [elpa] externals/xelb 1916894 07/42: Fix integer overflow on 32-bit platform, Chris Feng, 2015/09/17
- [elpa] externals/xelb c042d3f 08/42: Provide more verbose message when connection failed or auth required, Chris Feng, 2015/09/17
- [elpa] externals/xelb 6a7bccc 09/42: Disable concurrency of events, Chris Feng, 2015/09/17
- [elpa] externals/xelb 11005f2 10/42: Fix ch11ng/exwm#16 (cursor size not matching), Chris Feng, 2015/09/17
- [elpa] externals/xelb cd67b51 11/42: Set the `display` slot of `xcb:connection` in `xcb:connect-to-socket`, Chris Feng, 2015/09/17
- [elpa] externals/xelb 23cb30b 12/42: Fix an emacsclient bug, Chris Feng, 2015/09/17
- [elpa] externals/xelb 946d3ed 14/42: Fix keyboard mapping update problem, Chris Feng, 2015/09/17
- [elpa] externals/xelb 76246b4 13/42: Check `length` slot in `xcb:icccm:-GetProperty~reply`, Chris Feng, 2015/09/17
- [elpa] externals/xelb bf39d9b 15/42: allow key mappings without mode switch or NumLock keys, Chris Feng, 2015/09/17
- [elpa] externals/xelb 518b17a 16/42: Merge branch 'pipcet-no-num-lock', Chris Feng, 2015/09/17
- [elpa] externals/xelb 4e42bf2 04/42: Cleanup code,
Chris Feng <=
- [elpa] externals/xelb 1cea22d 20/42: Provide a way to disable auto-padding, Chris Feng, 2015/09/17
- [elpa] externals/xelb 247d6d2 17/42: Make the manipulation of message cache more robust, Chris Feng, 2015/09/17
- [elpa] externals/xelb 677623a 19/42: Disable auto-padding for xcb-xim, Chris Feng, 2015/09/17
- [elpa] externals/xelb 7c194e7 21/42: Don't assume key events are numbers; they can be symbols., Chris Feng, 2015/09/17
- [elpa] externals/xelb f465091 22/42: It's valid for WM_NORMAL_HINTS responses only to have 15 words., Chris Feng, 2015/09/17
- [elpa] externals/xelb aaddcd9 18/42: Add implicit paddings after variable-length <list>, Chris Feng, 2015/09/17
- [elpa] externals/xelb e153829 23/42: Merge pull request #2 from pipcet/shift-keypad-fix, Chris Feng, 2015/09/17
- [elpa] externals/xelb 520120a 24/42: Merge pull request #3 from pipcet/ignore-missing-values, Chris Feng, 2015/09/17
- [elpa] externals/xelb 1e20b20 26/42: Adjust to unmarshalling API changes., Chris Feng, 2015/09/17
- [elpa] externals/xelb ad845df 28/42: Merge pull request #4 from pipcet/data-offset, Chris Feng, 2015/09/17