Commit e85fbbe0 authored by Iban Hatchondo's avatar Iban Hatchondo
Browse files

Fix event-mask wrong value: nil isn't an window-event-mask.

parent d4542011
;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*-
;;; $Id: eclipse.lisp,v 1.20 2004/06/18 22:01:53 ihatchondo Exp $
;;; $Id: eclipse.lisp,v 1.21 2004/11/30 23:48:10 ihatchondo Exp $
;;;
;;; ECLIPSE. The Common Lisp Window Manager.
;;; Copyright (C) 2002 Iban HATCHONDO
......@@ -221,7 +221,8 @@
;; This is for releasing any previous pointer grab.
(ignore-errors
(grab-root-pointer)
(xlib:ungrab-pointer *display*))
(xlib:display-finish-output *display*))
(xlib:ungrab-pointer *display*)
;; Create a socket connection to communicate with the window manager.
;; Works only for CMUCL -x86- (unless you compile this mp package).
......
;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*-
;;; $Id: virtual-screen.lisp,v 1.20 2004/03/08 23:40:34 ihatchondo Exp $
;;; $Id: virtual-screen.lisp,v 1.21 2004/03/10 17:13:14 ihatchondo Exp $
;;;
;;;Copyright (C) 2002 Iban HATCHONDO
;;; contact : hatchond@yahoo.fr
......@@ -113,7 +113,7 @@
(setf (application-wants-focus-p widget) t))))
(xlib:set-input-focus *display* :pointer-root :pointer-root)
(xlib:with-server-grabbed (*display*)
(with-pointer-grabbed (rw nil)
(with-pointer-grabbed (rw (xlib:make-event-mask))
(map-or-unmap-vscreen #'xlib:unmap-window cur)
(map-or-unmap-vscreen #'xlib:map-window new))))
(setf (gnome:win-workspace rw) new
......@@ -175,7 +175,7 @@
(first (lookup-widget (car windows))))
;; Grab the pointer to avoid enter notify events race concurrence
;; between the window hierarchy change and the warp-pointer call.
(with-pointer-grabbed ((widget-window root) nil)
(with-pointer-grabbed ((widget-window root) (xlib:make-event-mask))
(when (and (/= length 1) icon-p (application-wants-iconic-p first))
(iconify first))
(flet ((set-window-priority (window sibling priority)
......
;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*-
;;; $Id: wm.lisp,v 1.44 2004/03/15 00:00:22 ihatchondo Exp $
;;; $Id: wm.lisp,v 1.45 2004/03/19 15:09:45 ihatchondo Exp $
;;;
;;; ECLIPSE. The Common Lisp Window Manager.
;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO
......@@ -83,10 +83,9 @@
(with-slots (window frame-style) master
(let* ((app-win (get-child master :application :window t))
(netwm-prop (netwm:net-wm-state app-win))
(gnome-prop (or (gnome:win-state app-win :result-type t) 0))
(shaded-p (member :_net_wm_state_shaded netwm-prop)))
(gnome-prop (or (gnome:win-state app-win :result-type t) 0)))
(setf gnome-prop (logand gnome-prop #x3DF)) ; supress :win_state_shaded
(if shaded-p
(if (member :_net_wm_state_shaded netwm-prop)
(with-event-mask (window)
;; unshade.
(xlib:map-window app-win)
......@@ -281,7 +280,7 @@
(slot-value title 'parent) parent-window
(getf children :title-bar) title
(xlib:window-background parent-window) :parent-relative
(xlib:window-event-mask parent-window) nil)
(xlib:window-event-mask parent-window) 0)
(if horizontal-p
(setf (slot-value title 'hmargin) (+ bcw mbw))
(setf (slot-value title 'vmargin) (+ bch mbh)))
......@@ -811,7 +810,7 @@
(2 (when (root-sm-conn *root*)
(close-sm-connection *root* :exit-p nil))
(xlib:display-finish-output *display*)
(setf (xlib:window-event-mask *root-window*) '())
(setf (xlib:window-event-mask *root-window*) 0)
(let ((win (netwm:net-supporting-wm-check *root-window*)))
(xlib:destroy-window win))
(xlib:display-finish-output *display*)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment