Location: lg@xxxxxxxxxxxxxx http://arch.xwem.org/2005/
Revision: xwem--main--2.1--patch-43
Archive: lg@xxxxxxxxxxxxxx
Creator: Zajcev Evgeny <lg@xxxxxxxx>
Date: Mon Apr 4 22:22:56 MSD 2005
Standard-date: 2005-04-04 18:22:56 GMT
Modified-files: lisp/xwem-events.el lisp/xwem-keyboard.el
New-patches: dev@xxxxxxxxxxxxxxxx/xwem--dev--2.1--patch-36
lg@xxxxxxxxxxxxxx/xwem--main--2.1--patch-43
Summary: Bad bug fix.
Keywords: event, client
* lisp/xwem-events.el (xwem-event-client): [bug fix] Consider selected
client in case of if event is generated for dummy client. Selected
client can be the dummy client however. This fixes bug, which was
causing invalid command looking up when prefix argument is used.
* added files
{arch}/xwem/xwem--dev/xwem--dev--2.1/dev@xxxxxxxxxxxxxxxx/patch-log/patch-36
{arch}/xwem/xwem--main/xwem--main--2.1/lg@xxxxxxxxxxxxxx/patch-log/patch-43
* modified files
--- orig/lisp/xwem-events.el
+++ mod/lisp/xwem-events.el
@@ -126,10 +126,13 @@
;;;###xwem-autoload
(defun xwem-event-client (xev)
"Return client where X event XEV occured."
- (or (and (X-Event-p xev)
- (X-Win-p (X-Event-win xev))
- (xwem-xwin-cl (X-Event-win xev)))
- (xwem-cl-selected)))
+ (let ((ecl (and (X-Event-p xev)
+ (X-Win-p (X-Event-win xev))
+ (xwem-xwin-cl (X-Event-win xev)))))
+ (if (or (not (xwem-cl-alive-p ecl))
+ (eq ecl (xwem-dummy-client)))
+ (xwem-cl-selected)
+ ecl)))
;;;###xwem-autoload
(defun xwem-next-event (&optional timeout evt-list)
--- orig/lisp/xwem-keyboard.el
+++ mod/lisp/xwem-keyboard.el
@@ -1360,8 +1360,7 @@
(if xwem-kbd-now-grabbing
(unless (xwem-keymacro-executing-p)
(XGrabKeyboard (xwem-dpy) (or (xwem-cl-xwin (xwem-dummy-client))
- (xwem-rootwin))
- nil)
+ (xwem-rootwin)))
(xwem-mouse-grab xwem-kbd-now-grabbing)
(XAllowEvents (xwem-dpy) X-SyncBoth))
(unless (xwem-keymacro-executing-p)
|