[elpa] externals/xelb 9bfb054: Rename `xcb:-fd' to `xcb:fd' and sync with upstream protocol

[Chris Feng]

branch: externals/xelb
commit 9bfb054999ee3d72c2dc00550a4f0c894118db1f
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>

    Rename `xcb:-fd' to `xcb:fd' and sync with upstream protocol
---
 el_client.el   |   6 ++--
 xcb-dri3.el    | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 xcb-present.el |   4 ++-
 xcb-randr.el   |  81 +++++++++++++++++++++++++++++++++++-----------
 xcb-shm.el     |   4 +--
 xcb-types.el   |   2 +-
 6 files changed, 166 insertions(+), 31 deletions(-)

diff --git a/el_client.el b/el_client.el
index fbaf249..9b7077f 100644
--- a/el_client.el
+++ b/el_client.el
@@ -87,7 +87,7 @@
                                        (replace-regexp-in-string "^xproto:" ""
                                                                  type-name))))
             type
-          (error "Undefined type :%s" type-name))
+          (error "Undefined type: %s" type-name))
       (if (setq type (or (intern-soft (concat xelb-prefix type-name))
                          (intern-soft (concat "xcb:" type-name))))
           ;; Defined by the core protocol or this extension.
@@ -101,7 +101,7 @@
             ;; Defined by an imported extension.
             type
           ;; Not defined.
-          (error "Undefined type :%s" type-name))))))
+          (error "Undefined type: %s" type-name))))))
 
 (defsubst xelb-escape-name (name)
   "Replace underscores in NAME with dashes."
@@ -537,7 +537,7 @@ The `combine-adjacent' attribute is simply ignored."
 (defun xelb-parse-fd (node)
   "Parse <fd>."
   (let ((name (intern (xelb-node-attr-escape node 'name))))
-    `((,name :type xcb:-fd))))
+    `((,name :type xcb:fd))))
 
 (defun xelb-parse-list (node)
   "Parse <list>."
diff --git a/xcb-dri3.el b/xcb-dri3.el
index 0afa3b1..6fd34f3 100644
--- a/xcb-dri3.el
+++ b/xcb-dri3.el
@@ -29,7 +29,7 @@
 (defconst xcb:dri3:-extension-xname "DRI3")
 (defconst xcb:dri3:-extension-name "DRI3")
 (defconst xcb:dri3:-major-version 1)
-(defconst xcb:dri3:-minor-version 0)
+(defconst xcb:dri3:-minor-version 2)
 
 (require 'xcb-xproto)
 
@@ -56,7 +56,7 @@
   ((nfd :initarg :nfd :type xcb:CARD8)
    (~sequence :type xcb:CARD16)
    (length :type xcb:CARD32)
-   (device-fd :type xcb:-fd)
+   (device-fd :type xcb:fd)
    (pad~0 :initform 24 :type xcb:-pad)))
 
 (defclass xcb:dri3:PixmapFromBuffer
@@ -70,7 +70,7 @@
    (stride :initarg :stride :type xcb:CARD16)
    (depth :initarg :depth :type xcb:CARD8)
    (bpp :initarg :bpp :type xcb:CARD8)
-   (pixmap-fd :type xcb:-fd)))
+   (pixmap-fd :type xcb:fd)))
 
 (defclass xcb:dri3:BufferFromPixmap
   (xcb:-request)
@@ -87,7 +87,7 @@
    (stride :initarg :stride :type xcb:CARD16)
    (depth :initarg :depth :type xcb:CARD8)
    (bpp :initarg :bpp :type xcb:CARD8)
-   (pixmap-fd :type xcb:-fd)
+   (pixmap-fd :type xcb:fd)
    (pad~0 :initform 12 :type xcb:-pad)))
 
 (defclass xcb:dri3:FenceFromFD
@@ -97,7 +97,7 @@
    (fence :initarg :fence :type xcb:CARD32)
    (initially-triggered :initarg :initially-triggered :type xcb:BOOL)
    (pad~0 :initform 3 :type xcb:-pad)
-   (fence-fd :type xcb:-fd)))
+   (fence-fd :type xcb:fd)))
 
 (defclass xcb:dri3:FDFromFence
   (xcb:-request)
@@ -109,9 +109,97 @@
   ((nfd :initarg :nfd :type xcb:CARD8)
    (~sequence :type xcb:CARD16)
    (length :type xcb:CARD32)
-   (fence-fd :type xcb:-fd)
+   (fence-fd :type xcb:fd)
    (pad~0 :initform 24 :type xcb:-pad)))
 
+(defclass xcb:dri3:GetSupportedModifiers
+  (xcb:-request)
+  ((~opcode :initform 6 :type xcb:-u1)
+   (window :initarg :window :type xcb:CARD32)
+   (depth :initarg :depth :type xcb:CARD8)
+   (bpp :initarg :bpp :type xcb:CARD8)
+   (pad~0 :initform 2 :type xcb:-pad)))
+(defclass xcb:dri3:GetSupportedModifiers~reply
+  (xcb:-reply)
+  ((pad~0 :initform 1 :type xcb:-pad)
+   (~sequence :type xcb:CARD16)
+   (length :type xcb:CARD32)
+   (num-window-modifiers :initarg :num-window-modifiers :type xcb:CARD32)
+   (num-screen-modifiers :initarg :num-screen-modifiers :type xcb:CARD32)
+   (pad~1 :initform 16 :type xcb:-pad)
+   (window-modifiers :initarg :window-modifiers :type xcb:-ignore)
+   (window-modifiers~ :initform
+                     '(name window-modifiers type xcb:CARD64 size
+                            (xcb:-fieldref 'num-window-modifiers))
+                     :type xcb:-list)
+   (pad~2 :initform 4 :type xcb:-pad-align)
+   (screen-modifiers :initarg :screen-modifiers :type xcb:-ignore)
+   (screen-modifiers~ :initform
+                     '(name screen-modifiers type xcb:CARD64 size
+                            (xcb:-fieldref 'num-screen-modifiers))
+                     :type xcb:-list)))
+
+(defclass xcb:dri3:PixmapFromBuffers
+  (xcb:-request)
+  ((~opcode :initform 7 :type xcb:-u1)
+   (pixmap :initarg :pixmap :type xcb:PIXMAP)
+   (window :initarg :window :type xcb:WINDOW)
+   (num-buffers :initarg :num-buffers :type xcb:CARD8)
+   (pad~0 :initform 3 :type xcb:-pad)
+   (width :initarg :width :type xcb:CARD16)
+   (height :initarg :height :type xcb:CARD16)
+   (stride0 :initarg :stride0 :type xcb:CARD32)
+   (offset0 :initarg :offset0 :type xcb:CARD32)
+   (stride1 :initarg :stride1 :type xcb:CARD32)
+   (offset1 :initarg :offset1 :type xcb:CARD32)
+   (stride2 :initarg :stride2 :type xcb:CARD32)
+   (offset2 :initarg :offset2 :type xcb:CARD32)
+   (stride3 :initarg :stride3 :type xcb:CARD32)
+   (offset3 :initarg :offset3 :type xcb:CARD32)
+   (depth :initarg :depth :type xcb:CARD8)
+   (bpp :initarg :bpp :type xcb:CARD8)
+   (pad~1 :initform 2 :type xcb:-pad)
+   (modifier :initarg :modifier :type xcb:CARD64)
+   (buffers :initarg :buffers :type xcb:-ignore)
+   (buffers~ :initform
+            '(name buffers type xcb:fd size
+                   (xcb:-fieldref 'num-buffers))
+            :type xcb:-list)))
+
+(defclass xcb:dri3:BuffersFromPixmap
+  (xcb:-request)
+  ((~opcode :initform 8 :type xcb:-u1)
+   (pixmap :initarg :pixmap :type xcb:PIXMAP)))
+(defclass xcb:dri3:BuffersFromPixmap~reply
+  (xcb:-reply)
+  ((nfd :initarg :nfd :type xcb:CARD8)
+   (~sequence :type xcb:CARD16)
+   (length :type xcb:CARD32)
+   (width :initarg :width :type xcb:CARD16)
+   (height :initarg :height :type xcb:CARD16)
+   (pad~0 :initform 4 :type xcb:-pad)
+   (modifier :initarg :modifier :type xcb:CARD64)
+   (depth :initarg :depth :type xcb:CARD8)
+   (bpp :initarg :bpp :type xcb:CARD8)
+   (pad~1 :initform 6 :type xcb:-pad)
+   (strides :initarg :strides :type xcb:-ignore)
+   (strides~ :initform
+            '(name strides type xcb:CARD32 size
+                   (xcb:-fieldref 'nfd))
+            :type xcb:-list)
+   (pad~2 :initform 4 :type xcb:-pad-align)
+   (offsets :initarg :offsets :type xcb:-ignore)
+   (offsets~ :initform
+            '(name offsets type xcb:CARD32 size
+                   (xcb:-fieldref 'nfd))
+            :type xcb:-list)
+   (pad~3 :initform 4 :type xcb:-pad-align)
+   (buffers :initarg :buffers :type xcb:-ignore)
+   (buffers~ :initform
+            '(name buffers type xcb:fd size
+                   (xcb:-fieldref 'nfd))
+            :type xcb:-list)))
+
 
 
 (provide 'xcb-dri3)
diff --git a/xcb-present.el b/xcb-present.el
index c15014a..92472b5 100644
--- a/xcb-present.el
+++ b/xcb-present.el
@@ -29,7 +29,7 @@
 (defconst xcb:present:-extension-xname "Present")
 (defconst xcb:present:-extension-name "Present")
 (defconst xcb:present:-major-version 1)
-(defconst xcb:present:-minor-version 0)
+(defconst xcb:present:-minor-version 2)
 
 (require 'xcb-xproto)
 
@@ -54,6 +54,7 @@
 (defconst xcb:present:Option:Async 1)
 (defconst xcb:present:Option:Copy 2)
 (defconst xcb:present:Option:UST 4)
+(defconst xcb:present:Option:Suboptimal 8)
 
 (defconst xcb:present:Capability:None 0)
 (defconst xcb:present:Capability:Async 1)
@@ -66,6 +67,7 @@
 (defconst xcb:present:CompleteMode:Copy 0)
 (defconst xcb:present:CompleteMode:Flip 1)
 (defconst xcb:present:CompleteMode:Skip 2)
+(defconst xcb:present:CompleteMode:SuboptimalCopy 3)
 
 (defclass xcb:present:Notify
   (xcb:-struct)
diff --git a/xcb-randr.el b/xcb-randr.el
index 204dd6d..9cbc8b9 100644
--- a/xcb-randr.el
+++ b/xcb-randr.el
@@ -29,7 +29,7 @@
 (defconst xcb:randr:-extension-xname "RANDR")
 (defconst xcb:randr:-extension-name "RandR")
 (defconst xcb:randr:-major-version 1)
-(defconst xcb:randr:-minor-version 5)
+(defconst xcb:randr:-minor-version 6)
 
 (require 'xcb-xproto)
 
@@ -43,6 +43,8 @@
 
 (xcb:deftypealias 'xcb:randr:PROVIDER 'xcb:-u4)
 
+(xcb:deftypealias 'xcb:randr:LEASE 'xcb:-u4)
+
 (defclass xcb:randr:BadOutput
   (xcb:-error)
   ((~code :initform 0)))
@@ -129,6 +131,7 @@
 (defconst xcb:randr:NotifyMask:ProviderChange 16)
 (defconst xcb:randr:NotifyMask:ProviderProperty 32)
 (defconst xcb:randr:NotifyMask:ResourceChange 64)
+(defconst xcb:randr:NotifyMask:Lease 128)
 
 (defclass xcb:randr:SelectInput
   (xcb:-request)
@@ -954,6 +957,7 @@
 (defconst xcb:randr:Notify:ProviderChange 3)
 (defconst xcb:randr:Notify:ProviderProperty 4)
 (defconst xcb:randr:Notify:ResourceChange 5)
+(defconst xcb:randr:Notify:Lease 6)
 
 (defclass xcb:randr:CrtcChange
   (xcb:-struct)
@@ -1011,23 +1015,6 @@
    (window :initarg :window :type xcb:WINDOW)
    (pad~0 :initform 20 :type xcb:-pad)))
 
-(defclass xcb:randr:NotifyData
-  (xcb:-union)
-  ((~size :initform 28)
-   (cc :initarg :cc :type xcb:randr:CrtcChange)
-   (oc :initarg :oc :type xcb:randr:OutputChange)
-   (op :initarg :op :type xcb:randr:OutputProperty)
-   (pc :initarg :pc :type xcb:randr:ProviderChange)
-   (pp :initarg :pp :type xcb:randr:ProviderProperty)
-   (rc :initarg :rc :type xcb:randr:ResourceChange)))
-
-(defclass xcb:randr:Notify
-  (xcb:-event)
-  ((~code :initform 1)
-   (subCode :initarg :subCode :type xcb:CARD8)
-   (~sequence :type xcb:CARD16)
-   (u :initarg :u :type xcb:randr:NotifyData)))
-
 (defclass xcb:randr:MonitorInfo
   (xcb:-struct)
   ((name :initarg :name :type xcb:ATOM)
@@ -1078,6 +1065,64 @@
    (window :initarg :window :type xcb:WINDOW)
    (name :initarg :name :type xcb:ATOM)))
 
+(defclass xcb:randr:CreateLease
+  (xcb:-request)
+  ((~opcode :initform 45 :type xcb:-u1)
+   (window :initarg :window :type xcb:WINDOW)
+   (lid :initarg :lid :type xcb:randr:LEASE)
+   (num-crtcs :initarg :num-crtcs :type xcb:CARD16)
+   (num-outputs :initarg :num-outputs :type xcb:CARD16)
+   (crtcs :initarg :crtcs :type xcb:-ignore)
+   (crtcs~ :initform
+          '(name crtcs type xcb:randr:CRTC size
+                 (xcb:-fieldref 'num-crtcs))
+          :type xcb:-list)
+   (pad~0 :initform 4 :type xcb:-pad-align)
+   (outputs :initarg :outputs :type xcb:-ignore)
+   (outputs~ :initform
+            '(name outputs type xcb:randr:OUTPUT size
+                   (xcb:-fieldref 'num-outputs))
+            :type xcb:-list)))
+(defclass xcb:randr:CreateLease~reply
+  (xcb:-reply)
+  ((nfd :initarg :nfd :type xcb:CARD8)
+   (~sequence :type xcb:CARD16)
+   (length :type xcb:CARD32)
+   (master-fd :type xcb:fd)
+   (pad~0 :initform 24 :type xcb:-pad)))
+
+(defclass xcb:randr:FreeLease
+  (xcb:-request)
+  ((~opcode :initform 46 :type xcb:-u1)
+   (lid :initarg :lid :type xcb:randr:LEASE)
+   (terminate :initarg :terminate :type xcb:BYTE)))
+
+(defclass xcb:randr:LeaseNotify
+  (xcb:-struct)
+  ((timestamp :initarg :timestamp :type xcb:TIMESTAMP)
+   (window :initarg :window :type xcb:WINDOW)
+   (lease :initarg :lease :type xcb:randr:LEASE)
+   (created :initarg :created :type xcb:CARD8)
+   (pad~0 :initform 15 :type xcb:-pad)))
+
+(defclass xcb:randr:NotifyData
+  (xcb:-union)
+  ((~size :initform 28)
+   (cc :initarg :cc :type xcb:randr:CrtcChange)
+   (oc :initarg :oc :type xcb:randr:OutputChange)
+   (op :initarg :op :type xcb:randr:OutputProperty)
+   (pc :initarg :pc :type xcb:randr:ProviderChange)
+   (pp :initarg :pp :type xcb:randr:ProviderProperty)
+   (rc :initarg :rc :type xcb:randr:ResourceChange)
+   (lc :initarg :lc :type xcb:randr:LeaseNotify)))
+
+(defclass xcb:randr:Notify
+  (xcb:-event)
+  ((~code :initform 1)
+   (subCode :initarg :subCode :type xcb:CARD8)
+   (~sequence :type xcb:CARD16)
+   (u :initarg :u :type xcb:randr:NotifyData)))
+
 (defconst xcb:randr:error-number-class-alist
   '((0 . xcb:randr:BadOutput)
     (1 . xcb:randr:BadCrtc)
diff --git a/xcb-shm.el b/xcb-shm.el
index 4abebfd..6afee7b 100644
--- a/xcb-shm.el
+++ b/xcb-shm.el
@@ -136,7 +136,7 @@
   (xcb:-request)
   ((~opcode :initform 6 :type xcb:-u1)
    (shmseg :initarg :shmseg :type xcb:shm:SEG)
-   (shm-fd :type xcb:-fd)
+   (shm-fd :type xcb:fd)
    (read-only :initarg :read-only :type xcb:BOOL)
    (pad~0 :initform 3 :type xcb:-pad)))
 
@@ -152,7 +152,7 @@
   ((nfd :initarg :nfd :type xcb:CARD8)
    (~sequence :type xcb:CARD16)
    (length :type xcb:CARD32)
-   (shm-fd :type xcb:-fd)
+   (shm-fd :type xcb:fd)
    (pad~0 :initform 24 :type xcb:-pad)))
 
 (defconst xcb:shm:error-number-class-alist
diff --git a/xcb-types.el b/xcb-types.el
index 789e997..f5c1a3c 100644
--- a/xcb-types.el
+++ b/xcb-types.el
@@ -414,7 +414,7 @@
 ;; <pad> with align attribute
 (cl-deftype xcb:-pad-align () t)
 ;; <fd>
-(xcb:deftypealias 'xcb:-fd 'xcb:-i4)
+(xcb:deftypealias 'xcb:fd 'xcb:-i4)
 ;; <list>
 (cl-deftype xcb:-list () t)
 ;; <switch>