Update of /project/eclipse/cvsroot/eclipse In directory clnet:/tmp/cvs-serv20203 Modified Files: input.lisp misc.lisp Log Message: fix: nil event window --- /project/eclipse/cvsroot/eclipse/input.lisp 2008/04/25 16:02:49 1.49 +++ /project/eclipse/cvsroot/eclipse/input.lisp 2008/04/28 12:29:38 1.50 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: input.lisp,v 1.49 2008/04/25 16:02:49 ihatchondo Exp $ +;;; $Id: input.lisp,v 1.50 2008/04/28 12:29:38 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -91,7 +91,7 @@ (if (eq *focus-type* :on-click) (give-focus-to-next-widget-in-desktop) (multiple-value-bind (x y s child) - (xlib:query-pointer (xlib:drawable-root window)) + (xlib:query-pointer (xlib:drawable-root (widget-window widget))) (declare (ignore x y s)) (let ((e (make-event :enter-notify :kind :nonlinear :mode :normal))) (event-process e (or (lookup-widget child) *root*)))))))) --- /project/eclipse/cvsroot/eclipse/misc.lisp 2008/04/25 16:02:49 1.42 +++ /project/eclipse/cvsroot/eclipse/misc.lisp 2008/04/28 12:29:39 1.43 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: misc.lisp,v 1.42 2008/04/25 16:02:49 ihatchondo Exp $ +;;; $Id: misc.lisp,v 1.43 2008/04/28 12:29:39 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2002 Iban HATCHONDO @@ -91,16 +91,14 @@ (defsetf wm-state (window &key (icon-id 0)) (state) "Sets the wm_state property of a window. Note that its _net_wm_state property will be updated accordingly to the value given for the wm_state." - (with-gensym (_window _state _net-wm-state) - `(let* ((,_window ,window) - (,_state ,state) - (,_net-wm-state (netwm:net-wm-state ,_window))) - (if (or (= ,_state 3) (= ,_state 0)) - (pushnew :_net_wm_state_hidden ,_net-wm-state) - (setf ,_net-wm-state (delete :_net_wm_state_hidden ,_net-wm-state))) - (setf (netwm:net-wm-state ,_window) ,_net-wm-state) - (xlib:change-property ,_window :WM_STATE - (list ,_state ,icon-id) + (let ((net-wm-state (gensym))) + `(let* ((,net-wm-state (netwm:net-wm-state ,window))) + (if (or (= ,state 3) (= ,state 0)) + (pushnew :_net_wm_state_hidden ,net-wm-state) + (setf ,net-wm-state (delete :_net_wm_state_hidden ,net-wm-state))) + (setf (netwm:net-wm-state ,window) ,net-wm-state) + (xlib:change-property ,window :WM_STATE + (list ,state ,icon-id) :WM_STATE 32))))