Summary for xwem--main--2.2--patch-4

[Zajcev Evgeny <lg@xxxxxxxx>]

Location: lg@xxxxxxxxxxxxxx http://arch.xwem.org/2005/

Revision: xwem--main--2.2--patch-4
Archive: lg@xxxxxxxxxxxxxx
Creator: Zajcev Evgeny <lg@xxxxxxxx>
Date: Tue Apr 12 01:26:34 MSD 2005
Standard-date: 2005-04-11 21:26:34 GMT
Modified-files: lisp/xwem-help.el lisp/xwem-mouse.el
    utils/xwem-osd.el
New-patches: lg@xxxxxxxxxxxxxx/xwem--main--2.2--patch-4
Summary: Minor fixes
Keywords: help, menu, osd

* lisp/xwem-help.el (xwem-help): [fix] Class is doted cons cell.

* lisp/xwem-mouse.el (xwem-applications-submenu): [fix] Default xterm
  entry.

* utils/xwem-osd.el (xwem-osd-instance-destroy): [fix] XFreeColors
  commented out to avoid X Access errors.

* utils/xwem-osd.el (xwem-osd-instance-set-color): [fix] Ditto.


* added files

    {arch}/xwem/xwem--main/xwem--main--2.2/lg@xxxxxxxxxxxxxx/patch-log/patch-4

* modified files

--- orig/lisp/xwem-help.el
+++ mod/lisp/xwem-help.el
@@ -86,7 +86,7 @@
            (let ((clclass (xwem-hints-wm-class (xwem-cl-hints el)))
                  (clgeom (xwem-cl-xgeom el)))
              (when (not (string= curr-classn (cdr clclass)))
-               (setq curr-classn (cadr clclass))
+               (setq curr-classn (cdr clclass))
                (insert (format "\n= Begin for class name: <%s> =\n"
                                curr-classn)))
              (when (not (string= curr-classi (car clclass)))


--- orig/lisp/xwem-mouse.el
+++ mod/lisp/xwem-mouse.el
@@ -94,7 +94,7 @@
                             (make-frame nil (default-x-device))
                           (switch-to-buffer "*scratch*"))])
     ("XTerm"
-     ["Default xterm" (xwem-launch-xterm nil)]
+     ["Default xterm" (xwem-launch-xterm 1)]
      ["2 xterm" (xwem-launch-xterm 2)]
      ["3 xterm" (xwem-launch-xterm 3)]
      ["4 xterm" (xwem-launch-xterm 4)])


--- orig/utils/xwem-osd.el
+++ mod/utils/xwem-osd.el
@@ -199,8 +199,9 @@
   "Destroy osd instance OSIN."
   (let ((xdpy (xwem-osd-instance-xdpy osin)))
     (XDestroyWindow xdpy (xwem-osd-instance-xwin osin))
-    (XFreeColors xdpy (XDefaultColormap xdpy)
-                 (list (xwem-osd-instance-color osin)) nil)
+    ;; Do not free colour to avoid X Access errors
+;    (XFreeColors xdpy (XDefaultColormap xdpy)
+;                 (list (xwem-osd-instance-color osin)) nil)
     (XFreePixmap xdpy (xwem-osd-instance-xmask osin))
 
     (X-invalidate-cl-struct osin)))
@@ -270,8 +271,9 @@
 (defun xwem-osd-instance-set-color (osin new-color)
   "Set new color."
   (let ((xdpy (xwem-osd-instance-xdpy osin)))
-    (XFreeColors xdpy (XDefaultColormap xdpy)
-                 (list (xwem-osd-instance-color osin)) nil)
+    ;; Do not free colour to avoid X Access errors
+;    (XFreeColors xdpy (XDefaultColormap xdpy)
+;                 (list (xwem-osd-instance-color osin)) nil)
     (setf (xwem-osd-instance-color osin)
           (XAllocNamedColor xdpy (XDefaultColormap xdpy)
                             new-color))