Location: lg@xxxxxxxxxxxxxx http://arch.xwem.org/2005/
Revision: xlib--main--2.1--patch-11
Archive: lg@xxxxxxxxxxxxxx
Creator: Zajcev Evgeny <lg@xxxxxxxx>
Date: Sat Feb 26 20:48:25 MSK 2005
Standard-date: 2005-02-26 17:48:25 GMT
Modified-files: lisp/xlib-xrecord.el lisp/xlib-xwin.el
New-patches: dev@xxxxxxxxxxxxxxxx/xlib--dev--2.1--patch-6
lg@xxxxxxxxxxxxxx/xlib--main--2.1--patch-11
Summary: merge from ckent, compilation warnings elimination
Keywords: merge, compiler, warnings
* lisp/xlib-xrecord.el (predicateds): Some predicateds moved on top.
* lisp/xlib-xwin.el (predicateds): Some predicateds moved on top.
* added files
{arch}/xlib/xlib--dev/xlib--dev--2.1/dev@xxxxxxxxxxxxxxxx/patch-log/patch-6
{arch}/xlib/xlib--main/xlib--main--2.1/lg@xxxxxxxxxxxxxx/patch-log/patch-11
* modified files
--- orig/lisp/xlib-xrecord.el
+++ mod/lisp/xlib-xrecord.el
@@ -72,6 +72,33 @@
(defconst X-XRecordEndOfData 5)
+;; Message generators
+(defsubst X-RecordRange8-message (xrr8)
+ "Return a string representing the record range8 XRR8."
+ (if (null xrr8)
+ (make-string 2 ?\x00)
+ (concat (int->string1 (car xrr8)) (int->string1 (cdr xrr8)))))
+
+(defsubst X-RecordRange16-message (xrr16)
+ "Return a string representing the record range16 XRR16."
+ (if (null xrr16)
+ (make-string 4 ?\x00)
+ (concat (int->string2 (car xrr16)) (int->string2 (cdr xrr16)))))
+
+(defsubst X-RecordExtrange-message (xer)
+ "Return a string representing the extrange XER."
+ (if (null xer)
+ (make-string 12 ?\x00)
+ (concat (X-RecordRange8-message (car xer)) (X-RecordRange16-message (cdr
xer)))))
+
+(defsubst X-RecordRange-message (xrr)
+ "Return a string representing the record range XRR."
+ (X-Generate-simple-message 'X-RecordRange xrr))
+
+(defsubst X-RecordClientSpec-message (xrcs)
+ "Return a string representing the client spec XRCS."
+ (int->string4 xrcs))
+
(defstruct (X-RecordContext (:predicate X-RecordContext-isrc-p))
dpy id
props) ; User defined plist
@@ -155,33 +182,6 @@
(defsubst X-RecordClientInfo-p (xrci &optional sig)
(X-Generic-p 'X-RecordClientInfo 'X-RecordClientInfo-isrci-p xrci sig))
-;; Message generators
-(defsubst X-RecordRange8-message (xrr8)
- "Return a string representing the record range8 XRR8."
- (if (null xrr8)
- (make-string 2 ?\x00)
- (concat (int->string1 (car xrr8)) (int->string1 (cdr xrr8)))))
-
-(defsubst X-RecordRange16-message (xrr16)
- "Return a string representing the record range16 XRR16."
- (if (null xrr16)
- (make-string 4 ?\x00)
- (concat (int->string2 (car xrr16)) (int->string2 (cdr xrr16)))))
-
-(defsubst X-RecordExtrange-message (xer)
- "Return a string representing the extrange XER."
- (if (null xer)
- (make-string 12 ?\x00)
- (concat (X-RecordRange8-message (car xer)) (X-RecordRange16-message (cdr
xer)))))
-
-(defsubst X-RecordRange-message (xrr)
- "Return a string representing the record range XRR."
- (X-Generate-simple-message 'X-RecordRange xrr))
-
-(defsubst X-RecordClientSpec-message (xrcs)
- "Return a string representing the client spec XRCS."
- (int->string4 xrcs))
-
;;; Functions
(defun X-XRecordQueryVersion (xdpy &optional major minor)
--- orig/lisp/xlib-xwin.el
+++ mod/lisp/xlib-xwin.el
@@ -312,7 +312,29 @@
(defconst XA-wm-class (make-X-Atom :id 67.0 :name "WM_CLASS") "Atom wm-class
eoncoding.")
(defconst XA-wm-transient-for (make-X-Atom :id 68.0 :name "WM_TRANSIENT_FOR")
"Atom wm-transient-for eoncoding.")
-;; Attributes operations
+
+;;; Common predicates
+(defsubst X-Win-p (win &optional sig)
+ "Return non-nil if WIN is X-Win structure.
+If SIG is given and WIN is not X-Win structure, SIG will
+be signaled."
+ (X-Generic-p 'X-Win 'X-Win-iswin-p win sig))
+
+(defsubst X-Pixmap-p (pixmap &optional sig)
+ "Return non-nil if PIXMAP is X-Pixmap structure.
+If SIG is given and PIXMAP is not X-Pixmap structure, SIG will be signaled."
+ (X-Generic-p 'X-Pixmap 'X-Pixmap-ispixmap-p pixmap sig))
+
+(defsubst X-Colormap-p (cmap &optional sig)
+ "Return non-nil if CMAP is X-Colormap structure.
+If SIG is given and CMAP is not X-Colormap structure, SIG will be signaled."
+ (X-Generic-p 'X-Colormap 'X-Colormap-iscmap-p cmap sig))
+
+(defsubst X-Cursor-p (cursor &optional sig)
+ (X-Generic-p 'X-Cursor 'X-Cursor-iscursor-p cursor sig))
+
+
+;;; Attributes operations
(defstruct (X-Attr (:predicate X-Attr-isattr-p))
;; any *-pixel is X-Color structure
dpy id
@@ -386,7 +408,6 @@
"Return a string representing the attributes ATTR."
(X-Generate-message 'X-Attr attr))
-
;;;Configure window structure
;;
(defstruct (X-Conf (:predicate X-Conf-isconf-p))
@@ -497,12 +518,6 @@
Signal `X-Events-stop' to stop events processing."
(X-EventHandler-runall (X-Win-event-handlers win) xev))
-(defsubst X-Win-p (win &optional sig)
- "Return non-nil if WIN is X-Win structure.
-If SIG is given and WIN is not X-Win structure, SIG will
-be signaled."
- (X-Generic-p 'X-Win 'X-Win-iswin-p win sig))
-
(defun X-Win-find (xdpy wid)
"Find X-Win with id WID on XDPY."
(X-Dpy-p xdpy 'X-Win-find)
@@ -528,11 +543,6 @@
plist) ; User defined plist
-(defsubst X-Pixmap-p (pixmap &optional sig)
- "Return non-nil if PIXMAP is X-Pixmap structure.
-If SIG is given and PIXMAP is not X-Pixmap structure, SIG will be signaled."
- (X-Generic-p 'X-Pixmap 'X-Pixmap-ispixmap-p pixmap sig))
-
(defun X-Pixmap-find-or-make (dpy id)
(make-X-Pixmap :dpy dpy :id id))
@@ -600,11 +610,6 @@
dpy id
colors) ; list of X-Color [unused]
-(defsubst X-Colormap-p (cmap &optional sig)
- "Return non-nil if CMAP is X-Colormap structure.
-If SIG is given and CMAP is not X-Colormap structure, SIG will be signaled."
- (X-Generic-p 'X-Colormap 'X-Colormap-iscmap-p cmap sig))
-
(defun X-Colormap-lookup-by-rgb (cmap col)
"Lookup color in colormap CMAP by R G B values of X-Color COL."
(let ((cols (X-Colormap-colors cmap)))
@@ -889,9 +894,6 @@
(cons 'X-Cursor-bggreen 2)
(cons 'X-Cursor-bgblue 2))))
-(defsubst X-Cursor-p (cursor &optional sig)
- (X-Generic-p 'X-Cursor 'X-Cursor-iscursor-p cursor sig))
-
(defun X-Cursor-find-or-make (dpy id)
(make-X-Cursor :dpy dpy :id id))
|