emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/xelb 944981e99e 3/5: Fix ambiguous :initform warnings (


From: ELPA Syncer
Subject: [elpa] externals/xelb 944981e99e 3/5: Fix ambiguous :initform warnings (Fix #3)
Date: Sat, 13 Jan 2024 19:52:01 -0500 (EST)

branch: externals/xelb
commit 944981e99e14a3dca8118f302f67b7e547ce7bff
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Fix ambiguous :initform warnings (Fix #3)
---
 xcb-ewmh.el       | 298 +++++++++++++++++++++++++++---------------------------
 xcb-icccm.el      |  90 ++++++++---------
 xcb-systemtray.el |  28 ++---
 xcb-xembed.el     |  38 +++----
 xcb-xim.el        | 120 +++++++++++-----------
 5 files changed, 287 insertions(+), 287 deletions(-)

diff --git a/xcb-ewmh.el b/xcb-ewmh.el
index 1551b413b5..98bdd97b23 100644
--- a/xcb-ewmh.el
+++ b/xcb-ewmh.el
@@ -169,59 +169,59 @@ EWMH")
 ;;;; Abstract classes for getting/changing (UTF-8) string properties
 
 (defclass xcb:ewmh:-GetProperty-utf8 (xcb:icccm:-GetProperty-text)
-  ((type :initform xcb:Atom:UTF8_STRING))
+  ((type :initform 'xcb:Atom:UTF8_STRING))
   :documentation "Get an EWMH UTF-8 text property (request part).")
 (defclass xcb:ewmh:-GetProperty-utf8~reply (xcb:icccm:-GetProperty-text~reply)
   nil
   :documentation "Get an EWMH UTF-8 text property (reply part).")
 (defclass xcb:ewmh:-ChangeProperty-utf8 (xcb:icccm:-ChangeProperty-text)
-  ((type :initform xcb:Atom:UTF8_STRING))
+  ((type :initform 'xcb:Atom:UTF8_STRING))
   :documentation "Change an EWMH UTF-8 text property.")
 
 ;;;; Root Window Properties (and Related Messages)
 
 ;; _NET_SUPPORTED
 (defclass xcb:ewmh:get-_NET_SUPPORTED (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_SUPPORTED)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_SUPPORTED)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:ewmh:get-_NET_SUPPORTED~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_SUPPORTED (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_SUPPORTED)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_SUPPORTED)
+   (type :initform 'xcb:Atom:ATOM)))
 
 ;; _NET_CLIENT_LIST
 (defclass xcb:ewmh:get-_NET_CLIENT_LIST (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_CLIENT_LIST)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_CLIENT_LIST)
+   (type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:ewmh:get-_NET_CLIENT_LIST~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_CLIENT_LIST (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_CLIENT_LIST)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_CLIENT_LIST)
+   (type :initform 'xcb:Atom:WINDOW)))
 
 ;; _NET_CLIENT_LIST_STACKING
 (defclass xcb:ewmh:get-_NET_CLIENT_LIST_STACKING (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_CLIENT_LIST_STACKING)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_CLIENT_LIST_STACKING)
+   (type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:ewmh:get-_NET_CLIENT_LIST_STACKING~reply
   (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_CLIENT_LIST_STACKING (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_CLIENT_LIST_STACKING)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_CLIENT_LIST_STACKING)
+   (type :initform 'xcb:Atom:WINDOW)))
 
 ;; _NET_NUMBER_OF_DESKTOPS
 (defclass xcb:ewmh:get-_NET_NUMBER_OF_DESKTOPS (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_NUMBER_OF_DESKTOPS)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_NUMBER_OF_DESKTOPS)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_NUMBER_OF_DESKTOPS~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_NUMBER_OF_DESKTOPS
   (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_NUMBER_OF_DESKTOPS)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_NUMBER_OF_DESKTOPS)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_DESKTOP_GEOMETRY
 (defclass xcb:ewmh:-_NET_DESKTOP_GEOMETRY (xcb:--struct)
@@ -229,106 +229,106 @@ EWMH")
    (height :initarg :height :type xcb:-ignore)))
 ;;
 (defclass xcb:ewmh:get-_NET_DESKTOP_GEOMETRY (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_DESKTOP_GEOMETRY)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_GEOMETRY)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 2)))
 (defclass xcb:ewmh:get-_NET_DESKTOP_GEOMETRY~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_DESKTOP_GEOMETRY)
   nil)
 (defclass xcb:ewmh:set-_NET_DESKTOP_GEOMETRY
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_DESKTOP_GEOMETRY)
-  ((property :initform xcb:Atom:_NET_DESKTOP_GEOMETRY)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_GEOMETRY)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:_NET_DESKTOP_GEOMETRY
   (xcb:ewmh:-ClientMessage xcb:ewmh:-_NET_DESKTOP_GEOMETRY)
-  ((type :initform xcb:Atom:_NET_DESKTOP_GEOMETRY)))
+  ((type :initform 'xcb:Atom:_NET_DESKTOP_GEOMETRY)))
 
 ;; _NET_DESKTOP_VIEWPORT
 (defclass xcb:ewmh:get-_NET_DESKTOP_VIEWPORT (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_DESKTOP_VIEWPORT)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_VIEWPORT)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_DESKTOP_VIEWPORT~reply
   (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_DESKTOP_VIEWPORT (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_DESKTOP_VIEWPORT)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_VIEWPORT)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:_NET_DESKTOP_VIEWPORT (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_DESKTOP_VIEWPORT)
+  ((type :initform 'xcb:Atom:_NET_DESKTOP_VIEWPORT)
    (new-vx :initarg :new-vx :type xcb:CARD32)
    (new-vy :initarg :new-vy :type xcb:CARD32)))
 
 ;; _NET_CURRENT_DESKTOP
 (defclass xcb:ewmh:get-_NET_CURRENT_DESKTOP (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_CURRENT_DESKTOP)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_CURRENT_DESKTOP)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_CURRENT_DESKTOP~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_CURRENT_DESKTOP (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_CURRENT_DESKTOP)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_CURRENT_DESKTOP)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:_NET_CURRENT_DESKTOP (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_CURRENT_DESKTOP)
+  ((type :initform 'xcb:Atom:_NET_CURRENT_DESKTOP)
    (new-index :initarg :new-index :type xcb:CARD32)
    (timestamp :initarg :timestamp :type xcb:CARD32)))
 
 ;; _NET_DESKTOP_NAMES
 (defclass xcb:ewmh:get-_NET_DESKTOP_NAMES (xcb:ewmh:-GetProperty-utf8)
-  ((property :initform xcb:Atom:_NET_DESKTOP_NAMES)))
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_NAMES)))
 (defclass xcb:ewmh:get-_NET_DESKTOP_NAMES~reply
   (xcb:ewmh:-GetProperty-utf8~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_DESKTOP_NAMES (xcb:ewmh:-ChangeProperty-utf8)
-  ((property :initform xcb:Atom:_NET_DESKTOP_NAMES)))
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_NAMES)))
 
 ;; _NET_ACTIVE_WINDOW
 (defclass xcb:ewmh:get-_NET_ACTIVE_WINDOW (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_ACTIVE_WINDOW)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_ACTIVE_WINDOW)
+   (type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:ewmh:get-_NET_ACTIVE_WINDOW~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_ACTIVE_WINDOW (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_ACTIVE_WINDOW)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_ACTIVE_WINDOW)
+   (type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:ewmh:_NET_ACTIVE_WINDOW (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_ACTIVE_WINDOW)
+  ((type :initform 'xcb:Atom:_NET_ACTIVE_WINDOW)
    (source-indication :initarg :source-indication :type xcb:CARD32)
    (timestamp :initarg :timestamp :type xcb:CARD32)
    (current-active-window :initarg :current-active-window :type xcb:WINDOW)))
 
 ;; _NET_WORKAREA
 (defclass xcb:ewmh:get-_NET_WORKAREA (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_WORKAREA)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WORKAREA)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WORKAREA~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WORKAREA (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_WORKAREA)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WORKAREA)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_SUPPORTING_WM_CHECK
 (defclass xcb:ewmh:get-_NET_SUPPORTING_WM_CHECK (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_SUPPORTING_WM_CHECK)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_SUPPORTING_WM_CHECK)
+   (type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:ewmh:get-_NET_SUPPORTING_WM_CHECK~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_SUPPORTING_WM_CHECK
   (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_SUPPORTING_WM_CHECK)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_SUPPORTING_WM_CHECK)
+   (type :initform 'xcb:Atom:WINDOW)))
 
 ;; _NET_VIRTUAL_ROOTS
 (defclass xcb:ewmh:get-_NET_VIRTUAL_ROOTS (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_VIRTUAL_ROOTS)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_VIRTUAL_ROOTS)
+   (type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:ewmh:get-_NET_VIRTUAL_ROOTS~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_VIRTUAL_ROOTS (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_VIRTUAL_ROOTS)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:_NET_VIRTUAL_ROOTS)
+   (type :initform 'xcb:Atom:WINDOW)))
 
 ;; _NET_DESKTOP_LAYOUT
 ;; Orientations
@@ -347,42 +347,42 @@ EWMH")
    (starting-corner :initarg :starting-corner :type xcb:-ignore)))
 ;;
 (defclass xcb:ewmh:get-_NET_DESKTOP_LAYOUT (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_DESKTOP_LAYOUT)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_LAYOUT)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 4)))
 (defclass xcb:ewmh:get-_NET_DESKTOP_LAYOUT~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_DESKTOP_LAYOUT)
   nil)
 (defclass xcb:ewmh:set-_NET_DESKTOP_LAYOUT
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_DESKTOP_LAYOUT)
-  ((property :initform xcb:Atom:_NET_DESKTOP_LAYOUT)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_DESKTOP_LAYOUT)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_SHOWING_DESKTOP
 (defclass xcb:ewmh:get-_NET_SHOWING_DESKTOP (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_SHOWING_DESKTOP)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_SHOWING_DESKTOP)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_SHOWING_DESKTOP~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_SHOWING_DESKTOP (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_SHOWING_DESKTOP)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_SHOWING_DESKTOP)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:_NET_SHOWING_DESKTOP (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_SHOWING_DESKTOP)
+  ((type :initform 'xcb:Atom:_NET_SHOWING_DESKTOP)
    (show :initarg :show :type xcb:CARD32)))
 
 ;;;; Other Root Window Messages
 
 ;; _NET_CLOSE_WINDOW
 (defclass xcb:ewmh:_NET_CLOSE_WINDOW (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_CLOSE_WINDOW)
+  ((type :initform 'xcb:Atom:_NET_CLOSE_WINDOW)
    (timestamp :initarg :timestamp :type xcb:CARD32)
    (source-indication :initarg :source-indication :type xcb:CARD32)))
 
 ;; _NET_MOVERESIZE_WINDOW
 (defclass xcb:ewmh:_NET_MOVERESIZE_WINDOW (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_MOVERESIZE_WINDOW)
+  ((type :initform 'xcb:Atom:_NET_MOVERESIZE_WINDOW)
    (gravity-and-flags :initarg :gravity-and-flags :type xcb:CARD32)
    (x :initarg :x :type xcb:CARD32)
    (y :initarg :y :type xcb:CARD32)
@@ -404,7 +404,7 @@ EWMH")
 (defconst xcb:ewmh:_NET_WM_MOVERESIZE_CANCEL 11)
 ;;
 (defclass xcb:ewmh:_NET_WM_MOVERESIZE (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_WM_MOVERESIZE)
+  ((type :initform 'xcb:Atom:_NET_WM_MOVERESIZE)
    (x-root :initarg :x-root :type xcb:CARD32)
    (y-root :initarg :y-root :type xcb:CARD32)
    (direction :initarg :direction :type xcb:CARD32)
@@ -413,77 +413,77 @@ EWMH")
 
 ;; _NET_RESTACK_WINDOW
 (defclass xcb:ewmh:_NET_RESTACK_WINDOW (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_RESTACK_WINDOW)
+  ((type :initform 'xcb:Atom:_NET_RESTACK_WINDOW)
    (source-indication :initarg :source-indication :type xcb:CARD32)
    (sibling :initarg :sibling :type xcb:WINDOW)
    (detail :initarg :detail :type xcb:CARD32)))
 
 ;; _NET_REQUEST_FRAME_EXTENTS
 (defclass xcb:ewmh:_NET_REQUEST_FRAME_EXTENTS (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_REQUEST_FRAME_EXTENTS)))
+  ((type :initform 'xcb:Atom:_NET_REQUEST_FRAME_EXTENTS)))
 
 ;;;; Application Window Properties
 
 ;; _NET_WM_NAME
 (defclass xcb:ewmh:get-_NET_WM_NAME (xcb:ewmh:-GetProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_NAME)))
 (defclass xcb:ewmh:get-_NET_WM_NAME~reply (xcb:ewmh:-GetProperty-utf8~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_NAME (xcb:ewmh:-ChangeProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_NAME)))
 
 ;; _NET_WM_VISIBLE_NAME
 (defclass xcb:ewmh:get-_NET_WM_VISIBLE_NAME (xcb:ewmh:-GetProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_VISIBLE_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_VISIBLE_NAME)))
 (defclass xcb:ewmh:get-_NET_WM_VISIBLE_NAME~reply
   (xcb:ewmh:-GetProperty-utf8~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_VISIBLE_NAME (xcb:ewmh:-ChangeProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_VISIBLE_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_VISIBLE_NAME)))
 
 ;; _NET_WM_ICON_NAME
 (defclass xcb:ewmh:get-_NET_WM_ICON_NAME (xcb:ewmh:-GetProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_ICON_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_ICON_NAME)))
 (defclass xcb:ewmh:get-_NET_WM_ICON_NAME~reply
   (xcb:ewmh:-GetProperty-utf8~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_ICON_NAME (xcb:ewmh:-ChangeProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_ICON_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_ICON_NAME)))
 
 ;; _NET_WM_VISIBLE_ICON_NAME
 (defclass xcb:ewmh:get-_NET_WM_VISIBLE_ICON_NAME (xcb:ewmh:-GetProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_VISIBLE_ICON_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_VISIBLE_ICON_NAME)))
 (defclass xcb:ewmh:get-_NET_WM_VISIBLE_ICON_NAME~reply
   (xcb:ewmh:-GetProperty-utf8~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_VISIBLE_ICON_NAME
   (xcb:ewmh:-ChangeProperty-utf8)
-  ((property :initform xcb:Atom:_NET_WM_VISIBLE_ICON_NAME)))
+  ((property :initform 'xcb:Atom:_NET_WM_VISIBLE_ICON_NAME)))
 
 ;; _NET_WM_DESKTOP
 (defclass xcb:ewmh:get-_NET_WM_DESKTOP (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_DESKTOP)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_DESKTOP)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WM_DESKTOP~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_DESKTOP (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_DESKTOP)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_DESKTOP)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:_NET_WM_DESKTOP (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_WM_DESKTOP)
+  ((type :initform 'xcb:Atom:_NET_WM_DESKTOP)
    (new-desktop :initarg :new-desktop :type xcb:CARD32)
    (source-indication :initarg :source-indication :type xcb:CARD32)))
 
 ;; _NET_WM_WINDOW_TYPE
 (defclass xcb:ewmh:get-_NET_WM_WINDOW_TYPE (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_WM_WINDOW_TYPE)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_WINDOW_TYPE)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:ewmh:get-_NET_WM_WINDOW_TYPE~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_WINDOW_TYPE (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_WM_WINDOW_TYPE)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_WINDOW_TYPE)
+   (type :initform 'xcb:Atom:ATOM)))
 
 ;; _NET_WM_STATE
 (defconst xcb:ewmh:_NET_WM_STATE_REMOVE 0)
@@ -491,15 +491,15 @@ EWMH")
 (defconst xcb:ewmh:_NET_WM_STATE_TOGGLE 2)
 ;;
 (defclass xcb:ewmh:get-_NET_WM_STATE (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_WM_STATE)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_STATE)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:ewmh:get-_NET_WM_STATE~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_STATE (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_WM_STATE)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_STATE)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:ewmh:_NET_WM_STATE (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:_NET_WM_STATE)
+  ((type :initform 'xcb:Atom:_NET_WM_STATE)
    (action :initarg :action :type xcb:CARD32)
    (first-property :initarg :first-property :type xcb:CARD32)
    (second-property :initarg :second-property :type xcb:CARD32)
@@ -507,14 +507,14 @@ EWMH")
 
 ;; _NET_WM_ALLOWED_ACTIONS
 (defclass xcb:ewmh:get-_NET_WM_ALLOWED_ACTIONS (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_WM_ALLOWED_ACTIONS)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_ALLOWED_ACTIONS)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:ewmh:get-_NET_WM_ALLOWED_ACTIONS~reply
   (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_ALLOWED_ACTIONS (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_WM_ALLOWED_ACTIONS)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_ALLOWED_ACTIONS)
+   (type :initform 'xcb:Atom:ATOM)))
 
 ;; _NET_WM_STRUT
 (defclass xcb:ewmh:-_NET_WM_STRUT (xcb:--struct)
@@ -524,16 +524,16 @@ EWMH")
    (bottom :initarg :bottom :type xcb:-ignore)))
 ;;
 (defclass xcb:ewmh:get-_NET_WM_STRUT (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_WM_STRUT)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_WM_STRUT)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 4)))
 (defclass xcb:ewmh:get-_NET_WM_STRUT~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_WM_STRUT)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_STRUT
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_WM_STRUT)
-  ((property :initform xcb:Atom:_NET_WM_STRUT)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_STRUT)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_STRUT_PARTIAL
 (defclass xcb:ewmh:-_NET_WM_STRUT_PARTIAL (xcb:--struct)
@@ -551,16 +551,16 @@ EWMH")
    (bottom-end-x :initarg :bottom-end-x :type xcb:-ignore)))
 ;;
 (defclass xcb:ewmh:get-_NET_WM_STRUT_PARTIAL (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_WM_STRUT_PARTIAL)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_WM_STRUT_PARTIAL)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 12)))
 (defclass xcb:ewmh:get-_NET_WM_STRUT_PARTIAL~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_WM_STRUT_PARTIAL)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_STRUT_PARTIAL
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_WM_STRUT_PARTIAL)
-  ((property :initform xcb:Atom:_NET_WM_STRUT_PARTIAL)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_STRUT_PARTIAL)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_ICON_GEOMETRY
 (defclass xcb:ewmh:-_NET_WM_ICON_GEOMETRY (xcb:--struct)
@@ -570,70 +570,70 @@ EWMH")
    (height :initarg :height :type xcb:-ignore)))
 ;;
 (defclass xcb:ewmh:get-_NET_WM_ICON_GEOMETRY (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_WM_ICON_GEOMETRY)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_WM_ICON_GEOMETRY)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 4)))
 (defclass xcb:ewmh:get-_NET_WM_ICON_GEOMETRY~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_WM_ICON_GEOMETRY)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_ICON_GEOMETRY
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_WM_ICON_GEOMETRY)
-  ((property :initform xcb:Atom:_NET_WM_ICON_GEOMETRY)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_ICON_GEOMETRY)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_ICON
 (defclass xcb:ewmh:-get-_NET_WM_ICON (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_WM_ICON)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_ICON)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:-get-_NET_WM_ICON~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:-set-_NET_WM_ICON (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_WM_ICON)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_ICON)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_PID
 (defclass xcb:ewmh:get-_NET_WM_PID (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_PID)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_PID)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WM_PID~reply (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_PID (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_PID)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_PID)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_HANDLED_ICONS
 (defclass xcb:ewmh:get-_NET_WM_HANDLED_ICONS (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_HANDLED_ICONS)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_HANDLED_ICONS)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WM_HANDLED_ICONS~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_HANDLED_ICONS (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_HANDLED_ICONS)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_HANDLED_ICONS)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_USER_TIME
 (defclass xcb:ewmh:get-_NET_WM_USER_TIME (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_USER_TIME)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_USER_TIME)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WM_USER_TIME~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_USER_TIME (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_USER_TIME)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_USER_TIME)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_USER_TIME_WINDOW
 (defclass xcb:ewmh:get-_NET_WM_USER_TIME_WINDOW (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_USER_TIME_WINDOW)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_USER_TIME_WINDOW)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WM_USER_TIME_WINDOW~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_USER_TIME_WINDOW
   (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_USER_TIME_WINDOW)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_USER_TIME_WINDOW)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_FRAME_EXTENTS
 (defclass xcb:ewmh:-_NET_FRAME_EXTENTS (xcb:--struct)
@@ -643,54 +643,54 @@ EWMH")
    (bottom :initarg :bottom :type xcb:-ignore)))
 ;;
 (defclass xcb:ewmh:get-_NET_FRAME_EXTENTS (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_FRAME_EXTENTS)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_FRAME_EXTENTS)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 4)))
 (defclass xcb:ewmh:get-_NET_FRAME_EXTENTS~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_FRAME_EXTENTS)
   nil)
 (defclass xcb:ewmh:set-_NET_FRAME_EXTENTS
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_FRAME_EXTENTS)
-  ((property :initform xcb:Atom:_NET_FRAME_EXTENTS)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_FRAME_EXTENTS)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_OPAQUE_REGION
 (defclass xcb:ewmh:get-_NET_WM_OPAQUE_REGION (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:_NET_WM_OPAQUE_REGION)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_OPAQUE_REGION)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:ewmh:get-_NET_WM_OPAQUE_REGION~reply
   (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_OPAQUE_REGION (xcb:icccm:-ChangeProperty)
-  ((property :initform xcb:Atom:_NET_WM_OPAQUE_REGION)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:_NET_WM_OPAQUE_REGION)
+   (type :initform 'xcb:Atom:ATOM)))
 
 ;; _NET_WM_BYPASS_COMPOSITOR
 (defclass xcb:ewmh:get-_NET_WM_BYPASS_COMPOSITOR
   (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_BYPASS_COMPOSITOR)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_BYPASS_COMPOSITOR)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:get-_NET_WM_BYPASS_COMPOSITOR~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_BYPASS_COMPOSITOR
   (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_WM_BYPASS_COMPOSITOR)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_BYPASS_COMPOSITOR)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;;;; Window Manager Protocols
 
 ;; _NET_WM_PING
 (defclass xcb:ewmh:_NET_WM_PING (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:WM_PROTOCOLS)
-   (protocol :initform xcb:Atom:_NET_WM_PING :type xcb:CARD32)
+  ((type :initform 'xcb:Atom:WM_PROTOCOLS)
+   (protocol :initform 'xcb:Atom:_NET_WM_PING :type xcb:CARD32)
    (timestamp :initarg :timestamp :type xcb:CARD32)
    (client-window :initarg :client-window :type xcb:WINDOW)))
 
 ;; _NET_WM_SYNC_REQUEST
 (defclass xcb:ewmh:_NET_WM_SYNC_REQUEST (xcb:ewmh:-ClientMessage)
-  ((type :initform xcb:Atom:WM_PROTOCOLS)
-   (protocol :initform xcb:Atom:_NET_WM_SYNC_REQUEST :type xcb:CARD32)
+  ((type :initform 'xcb:Atom:WM_PROTOCOLS)
+   (protocol :initform 'xcb:Atom:_NET_WM_SYNC_REQUEST :type xcb:CARD32)
    (timestamp :initarg :timestamp :type xcb:CARD32)
    (low :initarg :low :type xcb:CARD32)
    (high :initarg :high :type xcb:CARD32)))
@@ -702,8 +702,8 @@ EWMH")
 ;;
 (defclass xcb:ewmh:get-_NET_WM_SYNC_REQUEST_COUNTER
   (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_WM_SYNC_REQUEST_COUNTER)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_WM_SYNC_REQUEST_COUNTER)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 2)))
 (defclass xcb:ewmh:get-_NET_WM_SYNC_REQUEST_COUNTER~reply
   (xcb:icccm:-GetProperty-explicit~reply
@@ -711,8 +711,8 @@ EWMH")
   nil)
 (defclass xcb:ewmh:set-_NET_WM_SYNC_REQUEST_COUNTER
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_WM_SYNC_REQUEST_COUNTER)
-  ((property :initform xcb:Atom:_NET_WM_SYNC_REQUEST_COUNTER)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_SYNC_REQUEST_COUNTER)
+   (type :initform 'xcb:Atom:CARDINAL)))
 
 ;; _NET_WM_FULLSCREEN_MONITORS
 (defclass xcb:ewmh:-_NET_WM_FULLSCREEN_MONITORS (xcb:--struct)
@@ -723,19 +723,19 @@ EWMH")
 ;;
 (defclass xcb:ewmh:get-_NET_WM_FULLSCREEN_MONITORS
   (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_NET_WM_FULLSCREEN_MONITORS)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_WM_FULLSCREEN_MONITORS)
+   (type :initform 'xcb:Atom:CARDINAL)
    (long-length :initform 4)))
 (defclass xcb:ewmh:get-_NET_WM_FULLSCREEN_MONITORS~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:ewmh:-_NET_WM_FULLSCREEN_MONITORS)
   nil)
 (defclass xcb:ewmh:set-_NET_WM_FULLSCREEN_MONITORS
   (xcb:icccm:-ChangeProperty-explicit xcb:ewmh:-_NET_WM_FULLSCREEN_MONITORS)
-  ((property :initform xcb:Atom:_NET_WM_FULLSCREEN_MONITORS)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_WM_FULLSCREEN_MONITORS)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:ewmh:_NET_WM_FULLSCREEN_MONITORS
   (xcb:ewmh:-ClientMessage xcb:ewmh:-_NET_WM_FULLSCREEN_MONITORS)
-  ((type :initform xcb:Atom:_NET_WM_FULLSCREEN_MONITORS)))
+  ((type :initform 'xcb:Atom:_NET_WM_FULLSCREEN_MONITORS)))
 
 ;;;; Other Properties
 
diff --git a/xcb-icccm.el b/xcb-icccm.el
index e9edae56ce..8d78667622 100644
--- a/xcb-icccm.el
+++ b/xcb-icccm.el
@@ -86,7 +86,7 @@ The value of these atoms will be available in `xcb:Atom' 
namespace."
 
 (defclass xcb:icccm:SendEvent (xcb:SendEvent)
   ((propagate :initform 0)
-   (event-mask :initform xcb:EventMask:NoEvent))
+   (event-mask :initform 'xcb:EventMask:NoEvent))
   :documentation "A fork of `xcb:SendEvent' to send ICCCM client messages.")
 
 (defclass xcb:icccm:--ClientMessage (xcb:--struct)
@@ -96,7 +96,7 @@ The value of these atoms will be available in `xcb:Atom' 
namespace."
 (defclass xcb:icccm:-ClientMessage
   (xcb:icccm:--ClientMessage xcb:ClientMessage)
   ((format :initform 32)
-   (type :initform xcb:Atom:WM_PROTOCOLS)
+   (type :initform 'xcb:Atom:WM_PROTOCOLS)
    (protocol :type xcb:ATOM)                 ;new slot
    (time :initarg :time :type xcb:TIMESTAMP) ;new slot
    (pad~0 :initform 12 :type xcb:-pad))      ;new slot
@@ -104,12 +104,12 @@ The value of these atoms will be available in `xcb:Atom' 
namespace."
 protocol and time.")
 
 (defclass xcb:icccm:WM_DELETE_WINDOW (xcb:icccm:-ClientMessage)
-  ((protocol :initform xcb:Atom:WM_DELETE_WINDOW)
-   (time :initform xcb:Time:CurrentTime))
+  ((protocol :initform 'xcb:Atom:WM_DELETE_WINDOW)
+   (time :initform 'xcb:Time:CurrentTime))
   :documentation "Delete a window using the WM_DELETE_WINDOW client message.")
 
 (defclass xcb:icccm:WM_TAKE_FOCUS (xcb:icccm:-ClientMessage)
-  ((protocol :initform xcb:Atom:WM_TAKE_FOCUS))
+  ((protocol :initform 'xcb:Atom:WM_TAKE_FOCUS))
   :documentation "Set a focus using the WM_TAKE_FOCUS client message.
 
 A valid timestamp (rather than `xcb:Time:CurrentTime') must be supplied.")
@@ -167,7 +167,7 @@ This method automatically format the value as 8, 16 or 32 
bits array."
     retval))
 
 (defclass xcb:icccm:-ChangeProperty (xcb:ChangeProperty)
-  ((mode :initform xcb:PropMode:Replace)
+  ((mode :initform 'xcb:PropMode:Replace)
    (format :initform 32)
    (data :initform nil))
   :documentation "Change an ICCCM property.")
@@ -193,7 +193,7 @@ This method automatically sets the data length."
 ;;;; Abstract classes for getting/changing text properties
 
 (defclass xcb:icccm:-GetProperty-text (xcb:icccm:-GetProperty)
-  ((type :initform xcb:GetPropertyType:Any))
+  ((type :initform 'xcb:GetPropertyType:Any))
   :documentation "Get an ICCCM text property (request part).")
 
 (defclass xcb:icccm:-GetProperty-text~reply (xcb:icccm:-GetProperty~reply)
@@ -224,7 +224,7 @@ This method automatically decodes the value (as string)."
     retval))
 
 (defclass xcb:icccm:-ChangeProperty-text (xcb:icccm:-ChangeProperty)
-  ((type :initform xcb:Atom:STRING)     ;may be changed
+  ((type :initform 'xcb:Atom:STRING)     ;may be changed
    (format :initform 8))
   :documentation "Change an ICCCM text property.")
 ;;
@@ -331,19 +331,19 @@ whose fields are explicitly listed out."
 
 ;; WM_NAME
 (defclass xcb:icccm:get-WM_NAME (xcb:icccm:-GetProperty-text)
-  ((property :initform xcb:Atom:WM_NAME)))
+  ((property :initform 'xcb:Atom:WM_NAME)))
 (defclass xcb:icccm:get-WM_NAME~reply (xcb:icccm:-GetProperty-text~reply)
   nil)
 (defclass xcb:icccm:set-WM_NAME (xcb:icccm:-ChangeProperty-text)
-  ((property :initform xcb:Atom:WM_NAME)))
+  ((property :initform 'xcb:Atom:WM_NAME)))
 
 ;; WM_ICON_NAME
 (defclass xcb:icccm:get-WM_ICON_NAME (xcb:icccm:-GetProperty-text)
-  ((property :initform xcb:Atom:WM_ICON_NAME)))
+  ((property :initform 'xcb:Atom:WM_ICON_NAME)))
 (defclass xcb:icccm:get-WM_ICON_NAME~reply (xcb:icccm:-GetProperty-text~reply)
   nil)
 (defclass xcb:icccm:set-WM_ICON_NAME (xcb:icccm:-ChangeProperty-text)
-  ((property :initform xcb:Atom:WM_ICON_NAME)))
+  ((property :initform 'xcb:Atom:WM_ICON_NAME)))
 
 ;; WM_SIZE_HINTS
 (defconst xcb:icccm:WM_SIZE_HINTS:USPosition  1)
@@ -378,25 +378,25 @@ whose fields are explicitly listed out."
    (win-gravity :initarg :win-gravity :initform 0 :type xcb:-ignore)))
 ;;
 (defclass xcb:icccm:get-WM_SIZE_HINTS (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:WM_SIZE_HINTS)
-   (type :initform xcb:Atom:WM_SIZE_HINTS)
+  ((property :initform 'xcb:Atom:WM_SIZE_HINTS)
+   (type :initform 'xcb:Atom:WM_SIZE_HINTS)
    (long-length :initform 18)))         ;fixed
 (defclass xcb:icccm:get-WM_SIZE_HINTS~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:icccm:-WM_SIZE_HINTS)
   nil)
 (defclass xcb:icccm:set-WM_SIZE_HINTS
   (xcb:icccm:-ChangeProperty-explicit xcb:icccm:-WM_SIZE_HINTS)
-  ((property :initform xcb:Atom:WM_SIZE_HINTS)
-   (type :initform xcb:Atom:WM_SIZE_HINTS)))
+  ((property :initform 'xcb:Atom:WM_SIZE_HINTS)
+   (type :initform 'xcb:Atom:WM_SIZE_HINTS)))
 
 ;; WM_NORMAL_HINTS
 (defclass xcb:icccm:get-WM_NORMAL_HINTS (xcb:icccm:get-WM_SIZE_HINTS)
-  ((property :initform xcb:Atom:WM_NORMAL_HINTS)))
+  ((property :initform 'xcb:Atom:WM_NORMAL_HINTS)))
 (defclass xcb:icccm:get-WM_NORMAL_HINTS~reply
   (xcb:icccm:get-WM_SIZE_HINTS~reply)
   nil)
 (defclass xcb:icccm:set-WM_NORMAL_HINTS (xcb:icccm:set-WM_SIZE_HINTS)
-  ((property :initform xcb:Atom:WM_NORMAL_HINTS)))
+  ((property :initform 'xcb:Atom:WM_NORMAL_HINTS)))
 
 ;; WM_HINTS
 (defconst xcb:icccm:WM_HINTS:InputHint 1)
@@ -422,21 +422,21 @@ whose fields are explicitly listed out."
 ;;
 (defclass xcb:icccm:get-WM_HINTS (xcb:icccm:-GetProperty-explicit)
   ;; (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:WM_HINTS)
-   (type :initform xcb:Atom:WM_HINTS)
+  ((property :initform 'xcb:Atom:WM_HINTS)
+   (type :initform 'xcb:Atom:WM_HINTS)
    (long-length :initform 9)))          ;fixed
 (defclass xcb:icccm:get-WM_HINTS~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:icccm:-WM_HINTS)
   nil)
 (defclass xcb:icccm:set-WM_HINTS
   (xcb:icccm:-ChangeProperty-explicit xcb:icccm:-WM_HINTS)
-  ((property :initform xcb:Atom:WM_HINTS)
-   (type :initform xcb:Atom:WM_HINTS)))
+  ((property :initform 'xcb:Atom:WM_HINTS)
+   (type :initform 'xcb:Atom:WM_HINTS)))
 
 ;; WM_CLASS
 (defclass xcb:icccm:get-WM_CLASS (xcb:icccm:-GetProperty-text)
-  ((property :initform xcb:Atom:WM_CLASS)
-   (type :initform xcb:Atom:STRING)))
+  ((property :initform 'xcb:Atom:WM_CLASS)
+   (type :initform 'xcb:Atom:STRING)))
 (defclass xcb:icccm:get-WM_CLASS~reply (xcb:icccm:-GetProperty-text~reply)
   ((instance-name :type xcb:-ignore)
    (class-name :type xcb:-ignore)))
@@ -452,8 +452,8 @@ whose fields are explicitly listed out."
     retval))
 ;;
 (defclass xcb:icccm:set-WM_CLASS (xcb:icccm:-ChangeProperty-text)
-  ((property :initform xcb:Atom:WM_CLASS)
-   (type :initform xcb:Atom:STRING)
+  ((property :initform 'xcb:Atom:WM_CLASS)
+   (type :initform 'xcb:Atom:STRING)
    (instance-name :initarg :instance-name :type xcb:-ignore)
    (class-name :initarg :class-name :type xcb:-ignore)))
 ;;
@@ -464,44 +464,44 @@ whose fields are explicitly listed out."
 
 ;; WM_TRANSIENT_FOR
 (defclass xcb:icccm:get-WM_TRANSIENT_FOR (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:WM_TRANSIENT_FOR)
-   (type :initform xcb:Atom:WINDOW)
+  ((property :initform 'xcb:Atom:WM_TRANSIENT_FOR)
+   (type :initform 'xcb:Atom:WINDOW)
    (long-length :initform 1)))
 (defclass xcb:icccm:get-WM_TRANSIENT_FOR~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:icccm:set-WM_TRANSIENT_FOR (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:WM_TRANSIENT_FOR)
-   (type :initform xcb:Atom:WINDOW)))
+  ((property :initform 'xcb:Atom:WM_TRANSIENT_FOR)
+   (type :initform 'xcb:Atom:WINDOW)))
 
 ;; WM_PROTOCOLS
 (defclass xcb:icccm:get-WM_PROTOCOLS (xcb:icccm:-GetProperty)
-  ((property :initform xcb:Atom:WM_PROTOCOLS)
-   (type :initform xcb:Atom:ATOM)))
+  ((property :initform 'xcb:Atom:WM_PROTOCOLS)
+   (type :initform 'xcb:Atom:ATOM)))
 (defclass xcb:icccm:get-WM_PROTOCOLS~reply (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:icccm:set-WM_PROTOCOLS (xcb:icccm:-ChangeProperty)
-  ((type :initform xcb:Atom:ATOM)
+  ((type :initform 'xcb:Atom:ATOM)
    (format :initform 32)))
 
 ;; WM_COLORMAP_WINDOWS
 (defclass xcb:icccm:get-WM_COLORMAP_WINDOWS (xcb:icccm:-GetProperty)
-  ((type :initform xcb:Atom:WINDOW)))
+  ((type :initform 'xcb:Atom:WINDOW)))
 (defclass xcb:icccm:get-WM_COLORMAP_WINDOWS~reply
   (xcb:icccm:-GetProperty~reply)
   nil)
 (defclass xcb:icccm:set-WM_COLORMAP_WINDOWS (xcb:icccm:-ChangeProperty)
-  ((type :initform xcb:Atom:WINDOW)
+  ((type :initform 'xcb:Atom:WINDOW)
    (format :initform 32)))
 
 ;; WM_CLIENT_MACHINE
 (defclass xcb:icccm:get-WM_CLIENT_MACHINE (xcb:icccm:-GetProperty-text)
-  ((property :initform xcb:Atom:WM_CLIENT_MACHINE)))
+  ((property :initform 'xcb:Atom:WM_CLIENT_MACHINE)))
 (defclass xcb:icccm:get-WM_CLIENT_MACHINE~reply
   (xcb:icccm:-GetProperty-text~reply)
   nil)
 (defclass xcb:icccm:set-WM_CLIENT_MACHINE (xcb:icccm:-ChangeProperty-text)
-  ((property :initform xcb:Atom:WM_CLIENT_MACHINE)))
+  ((property :initform 'xcb:Atom:WM_CLIENT_MACHINE)))
 
 ;;;; Window Manager Properties
 
@@ -515,16 +515,16 @@ whose fields are explicitly listed out."
    (icon :initarg :icon :type xcb:-ignore)))
 ;;
 (defclass xcb:icccm:get-WM_STATE (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:WM_STATE)
-   (type :initform xcb:Atom:WM_STATE)
+  ((property :initform 'xcb:Atom:WM_STATE)
+   (type :initform 'xcb:Atom:WM_STATE)
    (long-length :initform 2)))
 (defclass xcb:icccm:get-WM_STATE~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:icccm:-WM_STATE)
   nil)
 (defclass xcb:icccm:set-WM_STATE
   (xcb:icccm:-ChangeProperty-explicit xcb:icccm:-WM_STATE)
-  ((property :initform xcb:Atom:WM_STATE)
-   (type :initform xcb:Atom:WM_STATE)))
+  ((property :initform 'xcb:Atom:WM_STATE)
+   (type :initform 'xcb:Atom:WM_STATE)))
 
 ;; WM_ICON_SIZE
 (defclass xcb:icccm:-WM_ICON_SIZE (xcb:--struct)
@@ -536,16 +536,16 @@ whose fields are explicitly listed out."
    (height-inc :initarg :height-inc :type xcb:-ignore)))
 ;;
 (defclass xcb:icccm:get-WM_ICON_SIZE (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:WM_ICON_SIZE)
-   (type :initform xcb:Atom:WM_ICON_SIZE)
+  ((property :initform 'xcb:Atom:WM_ICON_SIZE)
+   (type :initform 'xcb:Atom:WM_ICON_SIZE)
    (long-length :initform 6)))
 (defclass xcb:icccm:get-WM_ICON_SIZE~reply
   (xcb:icccm:-GetProperty-explicit~reply xcb:icccm:-WM_ICON_SIZE)
   nil)
 (defclass xcb:icccm:set-WM_ICON_SIZE
   (xcb:icccm:-ChangeProperty-explicit xcb:icccm:-WM_ICON_SIZE)
-  ((property :initform xcb:Atom:WM_ICON_SIZE)
-   (type :initform xcb:Atom:WM_ICON_SIZE)))
+  ((property :initform 'xcb:Atom:WM_ICON_SIZE)
+   (type :initform 'xcb:Atom:WM_ICON_SIZE)))
 
 
 
diff --git a/xcb-systemtray.el b/xcb-systemtray.el
index b7aa4b849f..03d47dfaa6 100644
--- a/xcb-systemtray.el
+++ b/xcb-systemtray.el
@@ -68,25 +68,25 @@ This method must be called before using any other method in 
this module."
 
 (defclass xcb:systemtray:SendEvent (xcb:SendEvent)
   ((propagate :initform 0)
-   (event-mask :initform xcb:EventMask:NoEvent))
+   (event-mask :initform 'xcb:EventMask:NoEvent))
   :documentation "Send system tray opcode message.")
 
 (defclass xcb:systemtray:-ClientMessage
   (xcb:icccm:--ClientMessage xcb:ClientMessage)
   ((format :initform 32)
-   (type :initform xcb:Atom:_NET_SYSTEM_TRAY_OPCODE)
+   (type :initform 'xcb:Atom:_NET_SYSTEM_TRAY_OPCODE)
    (time :initarg :time :type xcb:TIMESTAMP)   ;new slot
    (opcode :initarg :opcode :type xcb:CARD32)) ;new slot
   :documentation "An system tray opcode message.")
 
 (defclass xcb:systemtray:REQUEST-DOCK (xcb:systemtray:-ClientMessage)
-  ((opcode :initform xcb:systemtray:opcode:REQUEST-DOCK)
+  ((opcode :initform 'xcb:systemtray:opcode:REQUEST-DOCK)
    (id :initarg :id :type xcb:CARD32)
    (pad~0 :initform 8 :type xcb:-pad))
   :documentation "Dock a tray icon.")
 
 (defclass xcb:systemtray:BEGIN-MESSAGE (xcb:systemtray:-ClientMessage)
-  ((opcode :initform xcb:systemtray:opcode:BEGIN-MESSAGE)
+  ((opcode :initform 'xcb:systemtray:opcode:BEGIN-MESSAGE)
    (timeout :initarg :timeout :type xcb:TIMESTAMP)
    (length :initarg :length :type xcb:CARD32)
    (id :initarg :id :type xcb:CARD32))
@@ -95,12 +95,12 @@ This method must be called before using any other method in 
this module."
 (defclass xcb:systemtray:MESSAGE-DATA
   (xcb:icccm:--ClientMessage xcb:ClientMessage)
   ((format :initform 8)
-   (type :initform xcb:Atom:_NET_SYSTEM_TRAY_MESSAGE_DATA)
+   (type :initform 'xcb:Atom:_NET_SYSTEM_TRAY_MESSAGE_DATA)
    (data~ :initform '(name data type xcb:CARD8 size 20) :type xcb:-list)
    (data :initarg :data :type xcb:-ignore)))
 
 (defclass xcb:systemtray:CANCEL-MESSAGE (xcb:systemtray:-ClientMessage)
-  ((opcode :initform xcb:systemtray:opcode:CANCEL-MESSAGE)
+  ((opcode :initform 'xcb:systemtray:opcode:CANCEL-MESSAGE)
    (id :initarg :id :type xcb:CARD32)
    (pad~0 :initform 8 :type xcb:-pad))
   :documentation "Cancel balloon message.")
@@ -111,28 +111,28 @@ This method must be called before using any other method 
in this module."
 
 (defclass xcb:xembed:get-_NET_SYSTEM_TRAY_ORIENTATION
   (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_SYSTEM_TRAY_ORIENTATION)
-   (type :initform xcb:Atom:CARDINAL)))
+  ((property :initform 'xcb:Atom:_NET_SYSTEM_TRAY_ORIENTATION)
+   (type :initform 'xcb:Atom:CARDINAL)))
 (defclass xcb:xembed:get-_NET_SYSTEM_TRAY_ORIENTATION~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:xembed:set-_NET_SYSTEM_TRAY_ORIENTATION
   (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_SYSTEM_TRAY_ORIENTATION)
-   (type :initform xcb:Atom:CARDINAL)
+  ((property :initform 'xcb:Atom:_NET_SYSTEM_TRAY_ORIENTATION)
+   (type :initform 'xcb:Atom:CARDINAL)
    (format :initform 32)))
 
 (defclass xcb:xembed:get-_NET_SYSTEM_TRAY_VISUAL
   (xcb:icccm:-GetProperty-single)
-  ((property :initform xcb:Atom:_NET_SYSTEM_TRAY_VISUAL)
-   (type :initform xcb:Atom:VISUALID)))
+  ((property :initform 'xcb:Atom:_NET_SYSTEM_TRAY_VISUAL)
+   (type :initform 'xcb:Atom:VISUALID)))
 (defclass xcb:xembed:get-_NET_SYSTEM_TRAY_VISUAL~reply
   (xcb:icccm:-GetProperty-single~reply)
   nil)
 (defclass xcb:xembed:set-_NET_SYSTEM_TRAY_VISUAL
   (xcb:icccm:-ChangeProperty-single)
-  ((property :initform xcb:Atom:_NET_SYSTEM_TRAY_VISUAL)
-   (type :initform xcb:Atom:VISUALID)
+  ((property :initform 'xcb:Atom:_NET_SYSTEM_TRAY_VISUAL)
+   (type :initform 'xcb:Atom:VISUALID)
    (format :initform 32)))
 
 
diff --git a/xcb-xembed.el b/xcb-xembed.el
index 83addc0c3c..c5273e8e4f 100644
--- a/xcb-xembed.el
+++ b/xcb-xembed.el
@@ -72,48 +72,48 @@ This method must be called before using any other method in 
this module."
 (defconst xcb:xembed:MAPPED 1)
 
 (defclass xcb:xembed:get-_XEMBED_INFO (xcb:icccm:-GetProperty-explicit)
-  ((property :initform xcb:Atom:_XEMBED_INFO)
-   (type :initform xcb:Atom:_XEMBED_INFO)))
+  ((property :initform 'xcb:Atom:_XEMBED_INFO)
+   (type :initform 'xcb:Atom:_XEMBED_INFO)))
 (defclass xcb:xembed:get-_XEMBED_INFO~reply
   (xcb:icccm:-GetProperty-explicit~reply)
   ((version :type xcb:-ignore)
    (flags :type xcb:-ignore)))
 (defclass xcb:xembed:set-_XEMBED_INFO (xcb:icccm:-ChangeProperty-explicit)
-  ((property :initform xcb:Atom:_XEMBED_INFO)
-   (type :initform xcb:Atom:_XEMBED_INFO)
+  ((property :initform 'xcb:Atom:_XEMBED_INFO)
+   (type :initform 'xcb:Atom:_XEMBED_INFO)
    (format :initform 32)
    (version :initarg :version :type xcb:-ignore)
    (flags :initarg :flags :type xcb:-ignore)))
 
 (defclass xcb:xembed:SendEvent (xcb:SendEvent)
   ((propagate :initform 0)
-   (event-mask :initform xcb:EventMask:NoEvent))
+   (event-mask :initform 'xcb:EventMask:NoEvent))
   :documentation "Send XEmbed message.")
 
 (defclass xcb:xembed:-ClientMessage
   (xcb:icccm:--ClientMessage xcb:ClientMessage)
   ((format :initform 32)
-   (type :initform xcb:Atom:_XEMBED)
+   (type :initform 'xcb:Atom:_XEMBED)
    (time :initarg :time :type xcb:TIMESTAMP)               ;new slot
    (opcode :initarg :opcode :type xcb:CARD32)              ;new slot
    (detail :initarg :detail :initform 0 :type xcb:CARD32)) ;new slot
   :documentation "An XEmbed client message.")
 
 (defclass xcb:xembed:EMBEDDED-NOTIFY (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:EMBEDDED-NOTIFY)
+  ((opcode :initform 'xcb:xembed:opcode:EMBEDDED-NOTIFY)
    (embedder :initarg :embedder :type xcb:WINDOW)
    (version :initarg :version :type xcb:CARD32)))
 
 (defclass xcb:xembed:WINDOW-ACTIVATE (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:WINDOW-ACTIVATE)
+  ((opcode :initform 'xcb:xembed:opcode:WINDOW-ACTIVATE)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 (defclass xcb:xembed:WINDOW-DEACTIVATE (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:WINDOW-DEACTIVATE)
+  ((opcode :initform 'xcb:xembed:opcode:WINDOW-DEACTIVATE)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 (defclass xcb:xembed:REQUEST-FOCUS (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:REQUEST-FOCUS)
+  ((opcode :initform 'xcb:xembed:opcode:REQUEST-FOCUS)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 ;; Details for xcb:xembed:FOCUS-IN.
@@ -127,21 +127,21 @@ This method must be called before using any other method 
in this module."
 (defconst xcb:xembed:DIRECTION:LEFT-RIGHT 2)
 
 (defclass xcb:xembed:FOCUS-IN (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:FOCUS-IN)
+  ((opcode :initform 'xcb:xembed:opcode:FOCUS-IN)
    (direction :initarg :direction :initform 0 :type xcb:CARD32)
    (pad~0 :initform 4 :type xcb:-pad)))
 
 (defclass xcb:xembed:FOCUS-OUT (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:FOCUS-OUT)
+  ((opcode :initform 'xcb:xembed:opcode:FOCUS-OUT)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 (defclass xcb:xembed:FOCUS-NEXT (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:FOCUS-NEXT)
+  ((opcode :initform 'xcb:xembed:opcode:FOCUS-NEXT)
    (direction :initarg :direction :initform 0 :type xcb:CARD32)
    (pad~0 :initform 4 :type xcb:-pad)))
 
 (defclass xcb:xembed:FOCUS-PREV (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:FOCUS-PREV)
+  ((opcode :initform 'xcb:xembed:opcode:FOCUS-PREV)
    (direction :initarg :direction :initform 0 :type xcb:CARD32)
    (pad~0 :initform 4 :type xcb:-pad)))
 
@@ -153,28 +153,28 @@ This method must be called before using any other method 
in this module."
 (defconst xcb:xembed:MODIFIER:HYPER   16)
 
 (defclass xcb:xembed:REGISTER-ACCELERATOR (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:REGISTER-ACCELERATOR)
+  ((opcode :initform 'xcb:xembed:opcode:REGISTER-ACCELERATOR)
    (keysym :initarg :keysym :type xcb:KEYSYM)
    (modifier :initarg :modifier :type xcb:CARD32)))
 
 (defclass xcb:xembed:UNREGISTER-ACCELERATOR (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:UNREGISTER-ACCELERATOR)
+  ((opcode :initform 'xcb:xembed:opcode:UNREGISTER-ACCELERATOR)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 ;; Flags for XEMBED-ACTIVATE-ACCELERATOR.
 (defconst xcb:xembed:ACCELERATOR:OVERLOADED 1)
 
 (defclass xcb:xembed:ACTIVATE-ACCELERATOR (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:ACTIVATE-ACCELERATOR)
+  ((opcode :initform 'xcb:xembed:opcode:ACTIVATE-ACCELERATOR)
    (flags :initarg :flags :type xcb:CARD32)
    (pad~0 :initform 4 :type xcb:-pad)))
 
 (defclass xcb:xembed:MODALITY-ON (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:MODALITY-ON)
+  ((opcode :initform 'xcb:xembed:opcode:MODALITY-ON)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 (defclass xcb:xembed:MODALITY-OFF (xcb:xembed:-ClientMessage)
-  ((opcode :initform xcb:xembed:opcode:MODALITY-OFF)
+  ((opcode :initform 'xcb:xembed:opcode:MODALITY-OFF)
    (pad~0 :initform 8 :type xcb:-pad)))
 
 
diff --git a/xcb-xim.el b/xcb-xim.el
index 874659808e..be71f5bdb9 100644
--- a/xcb-xim.el
+++ b/xcb-xim.el
@@ -332,7 +332,7 @@ Consider let-bind it rather than change its global value."))
 ;;;; Error notification
 
 (defclass xim:error (xim:-request)
-  ((~major-opcode :initform xim:opcode:error)
+  ((~major-opcode :initform 'xim:opcode:error)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (flag :initarg :flag :type xim:BITMASK16)
@@ -369,7 +369,7 @@ Consider let-bind it rather than change its global value."))
 ;;;; Connection establishment
 
 (defclass xim:connect (xim:-request)
-  ((~major-opcode :initform xim:opcode:connect)
+  ((~major-opcode :initform 'xim:opcode:connect)
    (byte-order :initarg :byte-order :type xcb:-u1)
    (pad~0 :initform 1 :type xcb:-pad)
    (major-version :initarg :major-version :type xcb:CARD16)
@@ -384,7 +384,7 @@ Consider let-bind it rather than change its global value."))
 (defconst xim:connect-byte-order:lsb-first #x6c)
 
 (defclass xim:auth-required (xim:-request)
-  ((~major-opcode :initform xim:opcode:auth-required)
+  ((~major-opcode :initform 'xim:opcode:auth-required)
    (index :initarg :index :type xcb:CARD8)
    (pad~0 :initform 3 :type xcb:-pad)
    (length :initarg :length :type xcb:-u2)
@@ -395,7 +395,7 @@ Consider let-bind it rather than change its global value."))
    (pad~1 :initform '(xim:PADDING (slot-value length)) :type xcb:-pad)))
 
 (defclass xim:auth-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:auth-reply)
+  ((~major-opcode :initform 'xim:opcode:auth-reply)
    (length :initarg :length :type xcb:-u2)
    (pad~0 :initform 2 :type xcb:-pad)
    (data :initarg :data :type xcb:-ignore)
@@ -404,7 +404,7 @@ Consider let-bind it rather than change its global value."))
    (pad~1 :initform '(xim:PADDING (xcb:-fieldref 'length)) :type xcb:-pad)))
 
 (defclass xim:auth-next (xim:-request)
-  ((~major-opcode :initform xim:opcode:auth-next)
+  ((~major-opcode :initform 'xim:opcode:auth-next)
    (length :initarg :length :type xcb:-u2)
    (pad~0 :initform 2 :type xcb:-pad)
    (data :initarg :data :type xcb:-ignore)
@@ -413,7 +413,7 @@ Consider let-bind it rather than change its global value."))
    (pad~1 :initform '(xim:PADDING (xcb:-fieldref 'length)) :type xcb:-pad)))
 
 (defclass xim:auth-setup (xim:-request)
-  ((~major-opcode :initform xim:opcode:auth-setup)
+  ((~major-opcode :initform 'xim:opcode:auth-setup)
    (number :initarg :number :type xcb:CARD16)
    (pad~0 :initform 2 :type xcb:-pad)
    (names :initarg :names :type xcb:-ignore)
@@ -421,29 +421,29 @@ Consider let-bind it rather than change its global 
value."))
            :type xcb:-list)))
 
 (defclass xim:auth-ng (xim:-request)
-  ((~major-opcode :initform xim:opcode:auth-ng)))
+  ((~major-opcode :initform 'xim:opcode:auth-ng)))
 
 (defclass xim:connect-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:connect-reply)
+  ((~major-opcode :initform 'xim:opcode:connect-reply)
    ;; Default to version 1.0
    (major-version :initarg :major-version :initform 1 :type xcb:CARD16)
    (minor-version :initarg :minor-version :initform 0 :type xcb:CARD16)))
 
 (defclass xim:disconnect (xim:-request)
-  ((~major-opcode :initform xim:opcode:disconnect)))
+  ((~major-opcode :initform 'xim:opcode:disconnect)))
 
 (defclass xim:disconnect-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:disconnect-reply)))
+  ((~major-opcode :initform 'xim:opcode:disconnect-reply)))
 
 (defclass xim:open (xim:-request)
-  ((~major-opcode :initform xim:opcode:open)
+  ((~major-opcode :initform 'xim:opcode:open)
    (locale-name :initarg :locale-name :type xim:STR)
    (pad~0 :initform '(xim:PADDING (1+ (slot-value (xcb:-fieldref 'locale-name)
                                                   'length)))
           :type xcb:-pad)))
 
 (defclass xim:open-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:open-reply)
+  ((~major-opcode :initform 'xim:opcode:open-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (im-attrs-length :initarg :im-attrs-length :type xcb:-u2)
    (im-attrs :initarg :im-attrs :type xcb:-ignore)
@@ -484,24 +484,24 @@ Consider let-bind it rather than change its global 
value."))
     retval))
 
 (defclass xim:close (xim:-request)
-  ((~major-opcode :initform xim:opcode:close)
+  ((~major-opcode :initform 'xim:opcode:close)
    (im-id :initarg :im-id :type xcb:CARD16)
    (pad~0 :initform 2 :type xcb:-pad)))
 
 (defclass xim:close-reply (xim:close)
-  ((~major-opcode :initform xim:opcode:close-reply)))
+  ((~major-opcode :initform 'xim:opcode:close-reply)))
 
 ;;;; Event flow control
 
 (defclass xim:set-event-mask (xim:-request)
-  ((~major-opcode :initform xim:opcode:set-event-mask)
+  ((~major-opcode :initform 'xim:opcode:set-event-mask)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (forward-event-mask :initarg :forward-event-mask :type xcb:-u4)
    (synchronous-event-mask :initarg :synchronous-event-mask :type xcb:-u4)))
 
 (defclass xim:register-triggerkeys (xim:-request)
-  ((~major-opcode :initform xim:opcode:register-triggerkeys)
+  ((~major-opcode :initform 'xim:opcode:register-triggerkeys)
    (im-id :initarg :im-id :type xcb:CARD16)
    (pad~0 :initform 2 :type xcb:-pad)
    (on-keys-length :initarg :on-keys-length :type xcb:-u4)
@@ -516,7 +516,7 @@ Consider let-bind it rather than change its global value."))
               :type xcb:-list)))
 
 (defclass xim:trigger-nofity (xim:-request)
-  ((~major-opcode :initform xim:opcode:trigger-notify)
+  ((~major-opcode :initform 'xim:opcode:trigger-notify)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (flag :initarg :flag :type xcb:CARD32)
@@ -528,14 +528,14 @@ Consider let-bind it rather than change its global 
value."))
 (defconst xim:trigger-nofity-flag:off-keys 1)
 
 (defclass xim:trigger-nofity-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:trigger-notify-reply)
+  ((~major-opcode :initform 'xim:opcode:trigger-notify-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Encoding negotiation
 
 (defclass xim:encoding-negotiation (xim:-request)
-  ((~major-opcode :initform xim:opcode:encoding-negotiation)
+  ((~major-opcode :initform 'xim:opcode:encoding-negotiation)
    (im-id :initarg :im-id :type xcb:CARD16)
    (names-length :initarg :names-length :type xcb:-u2)
    (names :initarg :names :type xcb:-ignore)
@@ -579,7 +579,7 @@ Consider let-bind it rather than change its global value."))
     retval))
 
 (defclass xim:encoding-negotiation-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:encoding-negotiation-reply)
+  ((~major-opcode :initform 'xim:opcode:encoding-negotiation-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (category :initarg :category :type xcb:CARD16)
    (index :initarg :index :type xcb:INT16)
@@ -591,7 +591,7 @@ Consider let-bind it rather than change its global value."))
 ;;;; Query the supported extension protocol list
 
 (defclass xim:query-extension (xim:-request)
-  ((~major-opcode :initform xim:opcode:query-extension)
+  ((~major-opcode :initform 'xim:opcode:query-extension)
    (im-id :initarg :im-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
    (extensions :initarg :extensions :type xcb:-ignore)
@@ -618,7 +618,7 @@ Consider let-bind it rather than change its global value."))
     retval))
 
 (defclass xim:query-extension-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:query-extension-reply)
+  ((~major-opcode :initform 'xim:opcode:query-extension-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
    (extensions :initarg :extensions :type xcb:-ignore)
@@ -646,7 +646,7 @@ Consider let-bind it rather than change its global value."))
 ;;;; Setting IM values
 
 (defclass xim:set-im-values (xim:-request)
-  ((~major-opcode :initform xim:opcode:set-im-values)
+  ((~major-opcode :initform 'xim:opcode:set-im-values)
    (im-id :initarg :im-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
    (im-attributes :initarg :im-attributes :type xcb:-ignore)
@@ -662,14 +662,14 @@ Consider let-bind it rather than change its global 
value."))
     (cl-call-next-method obj)))
 
 (defclass xim:set-im-values-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:set-im-values-reply)
+  ((~major-opcode :initform 'xim:opcode:set-im-values-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (pad~0 :initform 2 :type xcb:-pad)))
 
 ;;;; Getting IM values
 
 (defclass xim:get-im-values (xim:-request)
-  ((~major-opcode :initform xim:opcode:get-im-values)
+  ((~major-opcode :initform 'xim:opcode:get-im-values)
    (im-id :initarg :im-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
    (im-attributes-id :initarg :im-attributes-id :type xcb:-ignore)
@@ -678,12 +678,12 @@ Consider let-bind it rather than change its global 
value."))
                       :type xcb:-list)))
 
 (defclass xim:get-im-values-reply (xim:set-im-values)
-  ((~major-opcode :initform xim:opcode:get-im-values-reply)))
+  ((~major-opcode :initform 'xim:opcode:get-im-values-reply)))
 
 ;;;; Creating an IC
 
 (defclass xim:create-ic (xim:-request)
-  ((~major-opcode :initform xim:opcode:create-ic)
+  ((~major-opcode :initform 'xim:opcode:create-ic)
    (im-id :initarg :im-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
    (ic-attributes :initarg :ic-attributes :type xcb:-ignore)
@@ -710,26 +710,26 @@ Consider let-bind it rather than change its global 
value."))
     retval))
 
 (defclass xim:create-ic-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:create-ic-reply)
+  ((~major-opcode :initform 'xim:opcode:create-ic-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Destroy the IC
 
 (defclass xim:destroy-ic (xim:-request)
-  ((~major-opcode :initform xim:opcode:destroy-ic)
+  ((~major-opcode :initform 'xim:opcode:destroy-ic)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 (defclass xim:destroy-ic-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:destroy-ic-reply)
+  ((~major-opcode :initform 'xim:opcode:destroy-ic-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Setting IC values
 
 (defclass xim:set-ic-values (xim:-request)
-  ((~major-opcode :initform xim:opcode:set-ic-values)
+  ((~major-opcode :initform 'xim:opcode:set-ic-values)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
@@ -747,14 +747,14 @@ Consider let-bind it rather than change its global 
value."))
     (cl-call-next-method obj)))
 
 (defclass xim:set-ic-values-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:set-ic-values-reply)
+  ((~major-opcode :initform 'xim:opcode:set-ic-values-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Getting IC values
 
 (defclass xim:get-ic-values (xim:-request)
-  ((~major-opcode :initform xim:opcode:get-ic-values)
+  ((~major-opcode :initform 'xim:opcode:get-ic-values)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
@@ -766,26 +766,26 @@ Consider let-bind it rather than change its global 
value."))
           :type xcb:-pad)))
 
 (defclass xim:get-ic-values-reply (xim:set-ic-values)
-  ((~major-opcode :initform xim:opcode:get-ic-values-reply)))
+  ((~major-opcode :initform 'xim:opcode:get-ic-values-reply)))
 
 ;;;; Setting IC focus
 
 (defclass xim:set-ic-focus (xim:-request)
-  ((~major-opcode :initform xim:opcode:set-ic-focus)
+  ((~major-opcode :initform 'xim:opcode:set-ic-focus)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Unsetting IC focus
 
 (defclass xim:unset-ic-focus (xim:-request)
-  ((~major-opcode :initform xim:opcode:unset-ic-focus)
+  ((~major-opcode :initform 'xim:opcode:unset-ic-focus)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Filtering events
 
 (defclass xim:forward-event (xim:-request)
-  ((~major-opcode :initform xim:opcode:forward-event)
+  ((~major-opcode :initform 'xim:opcode:forward-event)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (flag :initarg :flag :type xim:BITMASK16)
@@ -800,19 +800,19 @@ Consider let-bind it rather than change its global 
value."))
 ;;;; Synchronizing with the IM server
 
 (defclass xim:sync (xim:-request)
-  ((~major-opcode :initform xim:opcode:sync)
+  ((~major-opcode :initform 'xim:opcode:sync)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 (defclass xim:sync-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:sync-reply)
+  ((~major-opcode :initform 'xim:opcode:sync-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;;;; Sending a committed string
 
 (defclass xim:commit (xim:-request)
-  ((~major-opcode :initform xim:opcode:commit)
+  ((~major-opcode :initform 'xim:opcode:commit)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (flag :initarg :flag :type xim:BITMASK16)))
@@ -824,12 +824,12 @@ Consider let-bind it rather than change its global 
value."))
 (defconst xim:commit-flag:x-lookup-both 6)
 
 (defclass xim:commit-x-lookup-key-sym (xim:commit)
-  ((flag :initform xim:commit-flag:x-lookup-key-sym)
+  ((flag :initform 'xim:commit-flag:x-lookup-key-sym)
    (pad~0 :initform 2 :type xcb:-pad)
    (key-sym :initarg :key-sym :type xcb:KEYSYM)))
 
 (defclass xim:commit-x-lookup-chars (xim:commit)
-  ((flag :initform xim:commit-flag:x-lookup-chars)
+  ((flag :initform 'xim:commit-flag:x-lookup-chars)
    (length :initarg :length :type xcb:-u2)
    (string :initarg :string :type xcb:-ignore)
    (string~ :initform '(name string type xcb:BYTE size (xcb:-fieldref 'length))
@@ -838,19 +838,19 @@ Consider let-bind it rather than change its global 
value."))
 
 (defclass xim:commit-x-lookup-both (xim:commit-x-lookup-key-sym
                                     xim:commit-x-lookup-chars)
-  ((flag :initform xim:commit-flag:x-lookup-both)
+  ((flag :initform 'xim:commit-flag:x-lookup-both)
    (pad~1 :initform '(xim:PADDING (+ 2 (xcb:-fieldref 'length)))
           :type xcb:-pad)))
 
 ;;;; Reset IC
 
 (defclass xim:reset-ic (xim:-request)
-  ((~major-opcode :initform xim:opcode:reset-ic)
+  ((~major-opcode :initform 'xim:opcode:reset-ic)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 (defclass xim:reset-ic-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:reset-ic-reply)
+  ((~major-opcode :initform 'xim:opcode:reset-ic-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (length :initarg :length :type xcb:-u2)
@@ -864,13 +864,13 @@ Consider let-bind it rather than change its global 
value."))
 
 ;; Negotiating geometry
 (defclass xim:geometry (xim:-request)
-  ((~major-opcode :initform xim:opcode:geometry)
+  ((~major-opcode :initform 'xim:opcode:geometry)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;; Converting a string
 (defclass xim:str-conversion (xim:-request)
-  ((~major-opcode :initform xim:opcode:str-conversion)
+  ((~major-opcode :initform 'xim:opcode:str-conversion)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (position :initarg :position :type xcb:CARD16)
@@ -897,7 +897,7 @@ Consider let-bind it rather than change its global value."))
 (defconst xim:string-conversion-operation:retrieval 2)
 
 (defclass xim:str-conversion-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:str-conversion-reply)
+  ((~major-opcode :initform 'xim:opcode:str-conversion-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (feedback :initarg :feedback :type xcb:CARD32)
@@ -905,18 +905,18 @@ Consider let-bind it rather than change its global 
value."))
 
 ;; Preedit callbacks
 (defclass xim:preedit-start (xim:-request)
-  ((~major-opcode :initform xim:opcode:preedit-start)
+  ((~major-opcode :initform 'xim:opcode:preedit-start)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 (defclass xim:preedit-start-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:preedit-start-reply)
+  ((~major-opcode :initform 'xim:opcode:preedit-start-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (return-value :initarg :return-value :type xcb:INT32)))
 
 (defclass xim:preedit-draw (xim:-request)
-  ((~major-opcode :initform xim:opcode:preedit-draw)
+  ((~major-opcode :initform 'xim:opcode:preedit-draw)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (caret :initarg :caret :type xcb:INT32)
@@ -941,7 +941,7 @@ Consider let-bind it rather than change its global value."))
 (defconst xim:preedit-draw-status:no-feedback 2)
 
 (defclass xim:preedit-caret (xim:-request)
-  ((~major-opcode :initform xim:opcode:preedit-caret)
+  ((~major-opcode :initform 'xim:opcode:preedit-caret)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (position :initarg :position :type xcb:INT32)
@@ -953,19 +953,19 @@ Consider let-bind it rather than change its global 
value."))
 (defconst xim:preedit-caret-style:secondary 2)
 
 (defclass xim:preedit-caret-reply (xim:-request)
-  ((~major-opcode :initform xim:opcode:preedit-caret-reply)
+  ((~major-opcode :initform 'xim:opcode:preedit-caret-reply)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (position :initarg :position :type xcb:CARD32)))
 
 (defclass xim:preedit-done (xim:-request)
-  ((~major-opcode :initform xim:opcode:preedit-done)
+  ((~major-opcode :initform 'xim:opcode:preedit-done)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 ;; Preedit state notify
 (defclass xim:preeditstate (xim:-request)
-  ((~major-opcode :initform xim:opcode:preeditstate)
+  ((~major-opcode :initform 'xim:opcode:preeditstate)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (state :initarg :state :type xim:BITMASK32)))
@@ -976,12 +976,12 @@ Consider let-bind it rather than change its global 
value."))
 
 ;; Status callbacks
 (defclass xim:status-start (xim:-request)
-  ((~major-opcode :initform xim:opcode:status-start)
+  ((~major-opcode :initform 'xim:opcode:status-start)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 
 (defclass xim:status-draw (xim:-request)
-  ((~major-opcode :initform xim:opcode:status-draw)
+  ((~major-opcode :initform 'xim:opcode:status-draw)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)
    (type :initarg :type :type xcb:CARD32)))
@@ -990,7 +990,7 @@ Consider let-bind it rather than change its global value."))
 (defconst xim:status-draw-type:bitmap 1)
 
 (defclass xim:status-draw-text (xim:status-draw)
-  ((type :initarg :type :initform xim:status-draw-type:text)
+  ((type :initarg :type :initform 'xim:status-draw-type:text)
    (status :initarg :status :type xim:BITMASK32)
    (string-length :initarg :string-length :type xcb:-u2)
    (string :initarg :string :type xcb:-ignore)
@@ -1007,11 +1007,11 @@ Consider let-bind it rather than change its global 
value."))
               :type xcb:-list)))
 
 (defclass xim:status-draw-bitmap (xim:status-draw)
-  ((type :initarg :type :initform xim:status-draw-type:bitmap)
+  ((type :initarg :type :initform 'xim:status-draw-type:bitmap)
    (pixmap-data :initarg :pixmap-data :type xcb:PIXMAP)))
 
 (defclass xim:status-done (xim:-request)
-  ((~major-opcode :initform xim:opcode:status-done)
+  ((~major-opcode :initform 'xim:opcode:status-done)
    (im-id :initarg :im-id :type xcb:CARD16)
    (ic-id :initarg :ic-id :type xcb:CARD16)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]