eclipse-cvs November 2003

eclipse-cvs@common-lisp.net

1 participants
22 discussions

[Eclipse-cvs] CVS update: CVSROOT/loginfo
by Iban Hatchondo 28 Nov '03

28 Nov '03

Update of /project/eclipse/cvsroot/CVSROOT In directory common-lisp.net:/tmp/cvs-serv32717 Modified Files: loginfo Log Message: test !!! Date: Fri Nov 28 06:05:44 2003 Author: ihatchondo

1 0

[Eclipse-cvs] CVS update: CVSROOT/loginfo
by Iban Hatchondo 28 Nov '03

28 Nov '03

Update of /project/eclipse/cvsroot/CVSROOT In directory common-lisp.net:/tmp/cvs-serv29961 Modified Files: loginfo Log Message: a try to call my own script from this one. Date: Fri Nov 28 06:00:28 2003 Author: ihatchondo Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.2 CVSROOT/loginfo:1.3 --- CVSROOT/loginfo:1.2 Wed Oct 1 09:20:58 2003 +++ CVSROOT/loginfo Fri Nov 28 06:00:27 2003 @@ -24,4 +24,8 @@ #DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -DEFAULT /custom/bin/cvslog.py eclipse-cvs(a)common-lisp.net %{sVv} + + +#DEFAULT /custom/bin/cvslog.py eclipse-cvs(a)common-lisp.net %{sVv} + +DEFAULT /home/hatchond/cvslog.py eclipse-cvs(a)common-lisp.net %{sVv}

1 0

[Eclipse-cvs] CVS update: eclipse/gestures.lisp eclipse/input.lisp eclipse/misc.lisp eclipse/package.lisp eclipse/widgets.lisp eclipse/wm.lisp
by Iban Hatchondo 28 Nov '03

28 Nov '03

Update of /project/eclipse/cvsroot/eclipse In directory common-lisp.net:/tmp/cvs-serv6546 Modified Files: gestures.lisp input.lisp misc.lisp package.lisp widgets.lisp wm.lisp Log Message: add support for icon as described in the exwm spec. - decode-netwm-icon-pixmap (misc.lisp) - small impacts in gestures.lisp & widgets.lisp. add a new callback on the application list root menu: when no window on a desktop then releasing the mouse button on such an entry will put you on that desktop. (wm.lisp) package.lisp updated. Date: Fri Nov 28 05:13:48 2003 Author: ihatchondo Index: eclipse/gestures.lisp diff -u eclipse/gestures.lisp:1.11 eclipse/gestures.lisp:1.12 --- eclipse/gestures.lisp:1.11 Wed Nov 19 05:29:08 2003 +++ eclipse/gestures.lisp Fri Nov 28 05:13:47 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: gestures.lisp,v 1.11 2003/11/19 10:29:08 ihatchondo Exp $ +;;; $Id: gestures.lisp,v 1.12 2003/11/28 10:13:47 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2002 Iban HATCHONDO @@ -255,7 +255,7 @@ (default-modifiers-p t) (modifiers :any) fun) -" modifiers can be: + " modifiers can be: - composition of modifiers as '(:and :ALT-LEFT :CONTROL-RIGHT) - a simple modifier as :ALT-LEFT or 18 (a modifier mask) - a list of possible modifiers as '(:ALT-LEFT :CONTOL-RIGHT)" @@ -276,7 +276,7 @@ (default-modifiers-p t) (modifiers :any) fun) -" modifiers can be: + " modifiers can be: - composition of modifiers as '(:and :ALT-LEFT :CONTROL-RIGHT) - a simple modifier as :ALT-LEFT or 18 (a modifier mask) - a list of possible modifiers as '(:ALT-LEFT :CONTOL-RIGHT)" @@ -386,9 +386,10 @@ (when (eq direction :below) (incf depth-aux)) (rotatef (nth 0 *windows*) (nth depth-aux *windows*))))) (when (and *verbose-window-cycling* (car *windows*)) - (with-slots (window) (lookup-widget (car *windows*)) + (with-slots (window icon) (lookup-widget (car *windows*)) (setf (message-pixmap *current-widget-info*) - (clx-ext::wm-hints-icon-pixmap window)) + (or (icon-pixmap-to-free icon) + (clx-ext::wm-hints-icon-pixmap window))) (setf (button-item-to-draw *current-widget-info*) (wm-name window))) (with-slots (window) *current-widget-info* (xlib:map-window window) Index: eclipse/input.lisp diff -u eclipse/input.lisp:1.23 eclipse/input.lisp:1.24 --- eclipse/input.lisp:1.23 Mon Nov 24 08:44:50 2003 +++ eclipse/input.lisp Fri Nov 28 05:13:47 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: input.lisp,v 1.23 2003/11/24 13:44:50 ihatchondo Exp $ +;;; $Id: input.lisp,v 1.24 2003/11/28 10:13:47 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -374,16 +374,16 @@ (let* ((cur-desk (window-desktop-num window)) (new-desk (aref data 0)) (master-window (and master (widget-window master))) - (unmap-p (/= new-desk +any-desktop+ (current-desk)))) + (unmap-p (/= new-desk +any-desktop+ (current-desk))) + (operation (if unmap-p #'xlib:unmap-window #'xlib:map-window))) (unless (= cur-desk new-desk) (when (shaded-p application) (shade application)) (setf (window-desktop-num window) new-desk) - (let ((operation (if unmap-p #'xlib:unmap-window #'xlib:map-window))) - (with-event-mask (*root-window*) - (funcall operation (or master-window window)) - (when master-window - (with-event-mask (master-window) - (funcall operation window))))) + (with-event-mask (*root-window*) + (funcall operation (or master-window window)) + (when master-window + (with-event-mask (master-window) + (funcall operation window)))) (when unmap-p (xlib:set-input-focus *display* :pointer-root :pointer-root))))) (:_NET_CLOSE_WINDOW (close-widget application)) @@ -488,4 +488,4 @@ ;;; Events for Message Box (defmethod event-process ((event visibility-notify) (box box-button)) - (setf (xlib:window-priority (widget-window box)) :above)) \ No newline at end of file + (setf (xlib:window-priority (widget-window box)) :above)) Index: eclipse/misc.lisp diff -u eclipse/misc.lisp:1.14 eclipse/misc.lisp:1.15 --- eclipse/misc.lisp:1.14 Wed Nov 19 05:29:08 2003 +++ eclipse/misc.lisp Fri Nov 28 05:13:47 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: misc.lisp,v 1.14 2003/11/19 10:29:08 ihatchondo Exp $ +;;; $Id: misc.lisp,v 1.15 2003/11/28 10:13:47 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2002 Iban HATCHONDO @@ -29,7 +29,6 @@ "~/")) directory)) - ;;;; Helpers macros. (defmacro with-gensym (symbols &body body) @@ -115,6 +114,32 @@ (or (ignore-errors (netwm:net-wm-icon-name window)) (ignore-errors (xlib:wm-icon-name window)) "incognito")) + +(defun decode-netwm-icon-pixmap (window property-vector) + "Return a pixmap containing the first icon of the property or NIL." + ;;(declare (optimize (speed 3) (safety 1))) + (declare (type (or null (simple-vector *)) property-vector)) + (unless property-vector (return-from decode-netwm-icon-pixmap nil)) + (loop with depth of-type ppm::card-8 = (xlib:drawable-depth window) + with bits-per-pixel = (ppm::find-bits-per-pixel depth) + with type = `(unsigned-byte ,depth) + with width of-type ppm::card-16 = (aref property-vector 0) + with height of-type ppm::card-16 = (aref property-vector 1) + with size of-type ppm::card-32 = (* width height) + with data = (make-array (list height width) :element-type type) + with tmp = (make-array size :displaced-to data :element-type type) + for i of-type ppm::card-32 from 2 below (+ 2 size) + for argb of-type ppm::card-32 = (aref property-vector i) + for r of-type ppm::card-8 = (ldb (byte 8 16) argb) + for g of-type ppm::card-8 = (ldb (byte 8 8) argb) + for b of-type ppm::card-8 = (ldb (byte 8 0) argb) + do (setf (aref tmp (- i 2)) (ppm::get-color r g b)) + finally (return + (xlib:image-pixmap + window + (xlib:create-image + :width width :height height :depth depth + :bits-per-pixel bits-per-pixel :data data))))) (defun window-desktop-num (window) (or (netwm:net-wm-desktop window) (gnome:win-workspace window))) Index: eclipse/package.lisp diff -u eclipse/package.lisp:1.11 eclipse/package.lisp:1.12 --- eclipse/package.lisp:1.11 Mon Nov 24 11:57:46 2003 +++ eclipse/package.lisp Fri Nov 28 05:13:47 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: User -*- -;;; $Id: package.lisp,v 1.11 2003/11/24 16:57:46 ihatchondo Exp $ +;;; $Id: package.lisp,v 1.12 2003/11/28 10:13:47 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2002 Iban HATCHONDO @@ -80,6 +80,7 @@ "CREATE-ICON" ;function "CREATE-MESSAGE-BOX" ;function "CURRENT-VSCREEN" ;function + "DECODE-NETWM-ICON-PIXMAP" ;function "DECORATION-P" ;function "DECORATION-THEME" ;setf function "DECORE-APPLICATION" ;function Index: eclipse/widgets.lisp diff -u eclipse/widgets.lisp:1.20 eclipse/widgets.lisp:1.21 --- eclipse/widgets.lisp:1.20 Mon Nov 24 08:12:02 2003 +++ eclipse/widgets.lisp Fri Nov 28 05:13:47 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: widgets.lisp,v 1.20 2003/11/24 13:12:02 ihatchondo Exp $ +;;; $Id: widgets.lisp,v 1.21 2003/11/28 10:13:47 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -557,33 +557,37 @@ (defclass icon (push-button) ((desiconify-p :initform nil :accessor icon-desiconify-p) (creation-time :initform (get-universal-time) :accessor icon-creation-time) - (application :initarg :application :reader icon-application))) + (application :initarg :application :reader icon-application) + (pixmap-to-free :initform nil :reader icon-pixmap-to-free))) (defun icon-p (widget) (typep widget 'icon)) (defun create-icon (application master &optional (bg-color *black*)) (with-slots (window icon gcontext) application - (let ((background (clx-ext::wm-hints-icon-pixmap window)) - (width 45) (height 20)) + (let* ((bkgrd (decode-netwm-icon-pixmap window (netwm:net-wm-icon window))) + (width 45) (height 20) (pixmap-to-free bkgrd)) + (unless bkgrd + (setf bkgrd (ignore-errors (clx-ext::wm-hints-icon-pixmap window)))) (ignore-errors - (if (typep background 'xlib:pixmap) - (multiple-value-setq (width height) (drawable-sizes background)) - (setf background nil))) + (if (typep bkgrd 'xlib:pixmap) + (multiple-value-setq (width height) (drawable-sizes bkgrd)) + (setf bkgrd nil))) (ignore-errors - (when (and background (= 1 (xlib:drawable-depth background))) + (when (and bkgrd (= 1 (xlib:drawable-depth bkgrd))) (let ((pix (xlib:create-pixmap :drawable window :width width :height height :depth (xlib:drawable-depth window)))) - (xlib:copy-plane background gcontext 1 0 0 width height pix 0 0) - (setf background pix)))) + (xlib:copy-plane bkgrd gcontext 1 0 0 width height pix 0 0) + (setf bkgrd pix)))) (setf icon (create-button 'icon :parent *root-window* :master master :x 0 :y 0 :width width :height height - :item (unless background (wm-icon-name window)) - :background (or background bg-color)) - (slot-value icon 'application) application) + :item (unless bkgrd (wm-icon-name window)) + :background (or bkgrd bg-color))) + (setf (slot-value icon 'pixmap-to-free) pixmap-to-free) + (setf (slot-value icon 'application) application) icon))) (defun icon-sort-creation-order (icon1 icon2) @@ -651,6 +655,11 @@ (xlib:with-state (icon-window) (setf (window-position icon-window) (values basex basey))))) (setq prev-icon-window icon-window))))))) + +(defmethod remove-widget :after ((widget icon)) + (with-slots (pixmap-to-free) widget + (when pixmap-to-free + (xlib:free-pixmap pixmap-to-free)))) (defmethod repaint ((widget icon) theme-name focus) (declare (ignorable theme-name focus)) Index: eclipse/wm.lisp diff -u eclipse/wm.lisp:1.24 eclipse/wm.lisp:1.25 --- eclipse/wm.lisp:1.24 Mon Nov 24 11:57:46 2003 +++ eclipse/wm.lisp Fri Nov 28 05:13:47 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: wm.lisp,v 1.24 2003/11/24 16:57:46 ihatchondo Exp $ +;;; $Id: wm.lisp,v 1.25 2003/11/28 10:13:47 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -592,11 +592,13 @@ (1 (change-vscreen root :n index)) (3 (uniconify (slot-value (lookup-widget window) 'icon)))) (put-on-top (lookup-widget window)))) - (make-desktop-entries (index) - (loop for w in (screen-content index :iconify-p t) + (make-desktop-entries (i) + (loop for w in (screen-content i :iconify-p t) for state = (= 1 (first (wm-state w))) - collect (cons (format nil "~:[[ ~A ]~;~A~]" state (wm-name w)) - (raise w index))))) + for name = (format nil "~:[[ ~A ]~;~A~]" state (wm-name w)) + collect (cons name (raise w i)) into entries + finally + (return (or entries (lambda () (change-vscreen root :n i))))))) (make-desktop-menu root #'make-desktop-entries :realize t))) (defun make-menu-button-menu (master)

1 0

[Eclipse-cvs] CVS update: eclipse/lib/netwm-manager.lisp
by Iban Hatchondo 26 Nov '03

26 Nov '03

Update of /project/eclipse/cvsroot/eclipse/lib In directory common-lisp.net:/tmp/cvs-serv30586/lib Modified Files: netwm-manager.lisp Log Message: a first try to implement net-wm-icon. Date: Wed Nov 26 10:13:53 2003 Author: ihatchondo Index: eclipse/lib/netwm-manager.lisp diff -u eclipse/lib/netwm-manager.lisp:1.9 eclipse/lib/netwm-manager.lisp:1.10 --- eclipse/lib/netwm-manager.lisp:1.9 Thu Nov 20 19:04:08 2003 +++ eclipse/lib/netwm-manager.lisp Wed Nov 26 10:13:46 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: EXTENDED-WINDOW-MANAGER-HINTS -*- -;;; $Id: netwm-manager.lisp,v 1.9 2003/11/21 00:04:08 ihatchondo Exp $ +;;; $Id: netwm-manager.lisp,v 1.10 2003/11/26 15:13:46 ihatchondo Exp $ ;;; ;;; This is the CLX support for the managing with gnome. ;;; @@ -415,10 +415,12 @@ ;; _NET_WM_ICON -;; FIXME: (defun net-wm-icon (window) - (declare (ignore window)) - (values)) + "Returnsa vector of possible icons for the client. This is an vector of + (unsigned-byte 32) ARGB with high byte being A, low byte being B. The + first two cardinals are width, height. Data is in rows, left to right + and top to bottom." + (get-property window :_NET_WM_ICON :result-type 'vector)) ;; _NET_WM_HANDLED_ICONS

1 0

[Eclipse-cvs] CVS update: eclipse/rectangles.lisp eclipse/wm.lisp eclipse/package.lisp eclipse/system.lisp
by Iban Hatchondo 24 Nov '03

24 Nov '03

Update of /project/eclipse/cvsroot/eclipse In directory common-lisp.net:/tmp/cvs-serv22947 Modified Files: wm.lisp package.lisp system.lisp Added Files: rectangles.lisp Log Message: Maximize fill implemented: - new file rectangles.lisp. - maximize-window modified to use the maximize-fill operaion. - new user configuration option: *maximize-fill* We now support the netwm-strut{-partial}, and don't overlap panels that should not be overlapped (gnome panels for exemple) package.lisp, system.lisp updated. Date: Mon Nov 24 11:57:46 2003 Author: ihatchondo Index: eclipse/wm.lisp diff -u eclipse/wm.lisp:1.23 eclipse/wm.lisp:1.24 --- eclipse/wm.lisp:1.23 Wed Nov 19 05:29:08 2003 +++ eclipse/wm.lisp Mon Nov 24 11:57:46 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: wm.lisp,v 1.23 2003/11/19 10:29:08 ihatchondo Exp $ +;;; $Id: wm.lisp,v 1.24 2003/11/24 16:57:46 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -53,34 +53,14 @@ (let ((widget (getf (decoration-children master) label))) (if (and widget window) (widget-window widget) widget))) -(defmethod decoration-min-width ((master decoration)) - (with-slots (hmargin) (decoration-frame-style master) - (+ hmargin (aref (slot-value master 'wm-size-hints) 0)))) -(defmethod decoration-min-height ((master decoration)) - (with-slots (vmargin) (decoration-frame-style master) - (+ vmargin (aref (slot-value master 'wm-size-hints) 1)))) -(defmethod decoration-max-width ((master decoration)) - (with-slots (hmargin) (decoration-frame-style master) - (+ hmargin (aref (slot-value master 'wm-size-hints) 2)))) -(defmethod decoration-max-height ((master decoration)) - (with-slots (vmargin) (decoration-frame-style master) - (+ vmargin (aref (slot-value master 'wm-size-hints) 3)))) -(defmethod decoration-base-width ((master decoration)) - (with-slots (hmargin) (decoration-frame-style master) - (+ hmargin (aref (slot-value master 'wm-size-hints) 6)))) -(defmethod decoration-base-height ((master decoration)) - (with-slots (vmargin) (decoration-frame-style master) - (+ vmargin (aref (slot-value master 'wm-size-hints) 7)))) -(defmethod decoration-inc-sizes ((master decoration)) - (with-slots (wm-size-hints) master - (values (aref wm-size-hints 4) (aref wm-size-hints 5)))) - (defmethod decoration-wm-hints ((master decoration)) - (with-slots (wm-size-hints) master - (values (decoration-min-width master) (decoration-min-height master) - (decoration-max-width master) (decoration-max-height master) - (aref wm-size-hints 4) (aref wm-size-hints 5) - (decoration-base-width master) (decoration-base-height master)))) + "return as a multiple value: minw minh maxw maxh incw inch basew baseh." + (with-slots (frame-style (wmsh wm-size-hints)) master + (with-slots ((hm hmargin) (vm vmargin)) frame-style + (values (+ hm (aref wmsh 0)) (+ vm (aref wmsh 1)) + (+ hm (aref wmsh 2)) (+ vm (aref wmsh 3)) + (aref wmsh 4) (aref wmsh 5) + (+ hm (aref wmsh 6)) (+ vm (aref wmsh 7)))))) (defmethod focused-p ((master decoration)) (focused-p (get-child master :application))) @@ -431,57 +411,80 @@ (when map (xlib:map-window window)) master)) -(defun maximize-window (application button-code) +(defun find-max-geometry (application direction fill-p &key x y w h) + (multiple-value-bind (ulx uly lrx lry) + (find-largest-empty-area + application + :area-include-me-p (or (/= 1 direction) fill-p) + :panels-only-p (not fill-p) + :direction (case direction (2 :vertical) (3 :horizontal) (t :both))) + (with-slots (window master) application + (with-slots ((hm hmargin) (vm vmargin)) + (if master (decoration-frame-style master) + (theme-default-style (lookup-theme "no-decoration"))) + (symbol-macrolet ((minw (aref wmsh 0)) (minh (aref wmsh 1)) + (maxw (aref wmsh 2)) (maxh (aref wmsh 3)) + (incw (aref wmsh 4)) (inch (aref wmsh 5)) + (basew (aref wmsh 6)) (baseh (aref wmsh 7))) + (let* ((wmsh (recompute-wm-normal-hints window hm vm)) + (ww (or w (check-size (- lrx ulx hm) basew incw minw maxw))) + (hh (or h (check-size (- lry uly vm) baseh inch minh maxh)))) + (when (> (+ ww hm) (- lrx ulx)) (decf ww incw)) + (when (> (+ hh vm) (- lry uly)) (decf hh inch)) + (make-geometry :w ww :h hh :x (or x ulx) :y (or y uly)))))))) + +(defun compute-max-geometry + (application x y w h direction fill-p vert-p horz-p) + (symbol-macrolet + ((ix (geometry-x initial-geometry)) (iy (geometry-y initial-geometry)) + (iw (geometry-w initial-geometry)) (ih (geometry-h initial-geometry))) + (with-slots (initial-geometry) application + (case direction + ;; Unmaximize or Maximize in both directions + (1 (if (or horz-p vert-p) + (copy-geometry initial-geometry) + (find-max-geometry application direction fill-p))) + ;; Unmaximize or Maximize Vertically + (2 (if vert-p + (make-geometry :x x :y iy :w w :h ih) + (find-max-geometry application direction fill-p :x x :w w))) + ;; Unmaximize or Maximize Horizontally + (3 (if horz-p + (make-geometry :x ix :y y :w iw :h h) + (find-max-geometry application direction fill-p :y y :h h))))))) + +(defun maximize-window (application code &key (fill-p *maximize-fill*)) (with-slots ((app-window window) initial-geometry full-geometry master) application (when (shaded-p master) (shade master)) - (let* ((new-sizes) + (let* ((new-g) (m-window (if master (widget-window master) app-window)) (prop (netwm:net-wm-state app-window)) (fullscreen-p (member :_net_wm_state_fullscreen prop)) - (vert-p (member :_net_wm_state_maximized_vert prop)) - (horz-p (member :_net_wm_state_maximized_horz prop)) - (wm-size-hints (if master - (slot-value master 'wm-size-hints) - (recompute-wm-normal-hints app-window 0 0)))) + (vert-p (car (member :_net_wm_state_maximized_vert prop))) + (horz-p (car (member :_net_wm_state_maximized_horz prop)))) (multiple-value-bind (x y) (window-position m-window) (multiple-value-bind (w h) (drawable-sizes app-window) (unless (or horz-p vert-p) (if fullscreen-p (setf initial-geometry (copy-geometry full-geometry)) (setf (geometry initial-geometry) (values x y w h)))) - (symbol-macrolet ((ix (geometry-x initial-geometry)) - (iy (geometry-y initial-geometry)) - (iw (geometry-w initial-geometry)) - (ih (geometry-h initial-geometry)) - (maxw (aref wm-size-hints 2)) - (maxh (aref wm-size-hints 3))) - (case button-code - ;; Unmaximize or Maximize in both directions - (1 (if (or horz-p vert-p) - (setf new-sizes (copy-geometry initial-geometry) - horz-p t vert-p t) - (setf new-sizes (make-geometry :w maxw :h maxh)))) - ;; Unmaximize or Maximize Vertically - (2 (if vert-p - (setf new-sizes (make-geometry :x x :y iy :w w :h ih)) - (setf new-sizes (make-geometry :x x :w w :h maxh)))) - ;; Unmaximize or Maximize Horizontally - (3 (if horz-p - (setf new-sizes (make-geometry :x ix :y y :w iw :h h)) - (setf new-sizes (make-geometry :y y :w maxw :h h)))))))) - (unless (= 3 button-code) + (setf new-g (compute-max-geometry + application x y w h code fill-p vert-p horz-p)))) + (when (and (= 1 code) (or horz-p vert-p)) + (setf (values horz-p vert-p) (values t t))) + (unless (= 3 code) (if vert-p (setf prop (delete :_net_wm_state_maximized_vert prop)) (pushnew :_net_wm_state_maximized_vert prop))) - (unless (= 2 button-code) + (unless (= 2 code) (if horz-p (setf prop (delete :_net_wm_state_maximized_horz prop)) (pushnew :_net_wm_state_maximized_horz prop))) (if fullscreen-p - (setf full-geometry new-sizes) - (setf (window-position m-window) (geometry-coordinates new-sizes) - (drawable-sizes app-window) (geometry-sizes new-sizes))) + (setf full-geometry new-g) + (setf (window-position m-window) (geometry-coordinates new-g) + (drawable-sizes app-window) (geometry-sizes new-g))) (setf (netwm:net-wm-state app-window) prop)))) ;;;; Focus management. According to ICCCM Index: eclipse/package.lisp diff -u eclipse/package.lisp:1.10 eclipse/package.lisp:1.11 --- eclipse/package.lisp:1.10 Thu Oct 9 07:40:38 2003 +++ eclipse/package.lisp Mon Nov 24 11:57:46 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: User -*- -;;; $Id: package.lisp,v 1.10 2003/10/09 11:40:38 ihatchondo Exp $ +;;; $Id: package.lisp,v 1.11 2003/11/24 16:57:46 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2002 Iban HATCHONDO @@ -235,15 +235,8 @@ "CLOSE-WIDGET" ;generic function "DECORATION-ACTIVE-P" ;generic function "DECORATION-APPLICATION-GRAVITY" ;generic function - "DECORATION-BASE-HEIGHT" ;generic function - "DECORATION-BASE-WIDTH" ;generic function "DECORATION-CHILDREN" ;generic function "DECORATION-FRAME-STYLE" ;generic function - "DECORATION-INC-SIZES" ;generic function - "DECORATION-MAX-HEIGHT" ;generic function - "DECORATION-MAX-WIDTH" ;generic function - "DECORATION-MIN-HEIGHT" ;generic function - "DECORATION-MIN-WIDTH" ;generic function "DECORATION-PRECEDENT-TIME" ;generic function "DECORATION-WM-HINTS" ;generic function "DECORATION-WM-SIZE-HINTS" ;generic function @@ -352,16 +345,21 @@ ;; user custom. "*CHANGE-DESKTOP-MESSAGE-ACTIVE-P*" ;variable "*CLOSE-DISPLAY-P*" ;variable + "*CYCLE-ICONS-P*" ;variable "*DOUBLE-CLICK-SPEED*" ;variable "*FOCUS-TYPE*" ;variable "*FOCUS-NEW-MAPPED-WINDOW*" ;variable "*FOCUS-WHEN-WINDOW-CYCLE*" ;variable "*ICON-BOX-SORT-FUNCTION*" ;variable "*ICON-HINTS*" ;variable + "*MAXIMIZE-FILL*" ;variable "*MENU-1-ITEMS*" ;variable "*MOVE-MODE*" ;variable "*RESIZE-MODE*" ;variable + "*SCREEN-EDGE-RESISTANT-P*" ;variable + "*STANDARD-WINDOW-EDGE-RESISTANT-P*" ;variable "*VERBOSE-MOVE*" ;variable "*VERBOSE-RESIZE*" ;variable + "*VERBOSE-WINDOW-CYCLING*" ;variable "*WARP-POINTER-WHEN-CYCLE*" ;variable )) Index: eclipse/system.lisp diff -u eclipse/system.lisp:1.7 eclipse/system.lisp:1.8 --- eclipse/system.lisp:1.7 Mon Nov 10 05:02:53 2003 +++ eclipse/system.lisp Mon Nov 24 11:57:46 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: User -*- -;;; $Id: system.lisp,v 1.7 2003/11/10 10:02:53 ihatchondo Exp $ +;;; $Id: system.lisp,v 1.8 2003/11/24 16:57:46 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -72,6 +72,7 @@ "gestures" "widgets" "virtual-screen" + "rectangles" "wm" "input" "move-resize"

1 0

[Eclipse-cvs] CVS update: eclipse/virtual-screen.lisp
by Iban Hatchondo 24 Nov '03

24 Nov '03

Update of /project/eclipse/cvsroot/eclipse In directory common-lisp.net:/tmp/cvs-serv18618 Modified Files: virtual-screen.lisp Log Message: surround the map-or-unmap calls in change-vscreen with a with-server-grabbed to improve a bit performances. Date: Mon Nov 24 11:42:59 2003 Author: ihatchondo Index: eclipse/virtual-screen.lisp diff -u eclipse/virtual-screen.lisp:1.13 eclipse/virtual-screen.lisp:1.14 --- eclipse/virtual-screen.lisp:1.13 Mon Nov 24 08:12:01 2003 +++ eclipse/virtual-screen.lisp Mon Nov 24 11:42:59 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: virtual-screen.lisp,v 1.13 2003/11/24 13:12:01 ihatchondo Exp $ +;;; $Id: virtual-screen.lisp,v 1.14 2003/11/24 16:42:59 ihatchondo Exp $ ;;; ;;; Copyright (C) 2002 Iban HATCHONDO ;;; contact : hatchond(a)yahoo.fr @@ -42,6 +42,8 @@ (member :_net_wm_window_type_dock netwm-type))))))) (defun map-or-unmap-vscreen (fun scr-num) + (declare (optimize (speed 3) (safety 0))) + (declare (type function fun)) (loop for widget being each hash-value in *widget-table* when (application-p widget) do (with-slots (window master) widget @@ -109,9 +111,10 @@ (when (application-p widget) (setf (application-wants-focus-p widget) t)))) (xlib:set-input-focus *display* :pointer-root :pointer-root) - (with-pointer-grabbed (window nil) - (map-or-unmap-vscreen #'xlib:unmap-window cur) - (map-or-unmap-vscreen #'xlib:map-window new))) + (xlib:with-server-grabbed (*display*) + (with-pointer-grabbed (window nil) + (map-or-unmap-vscreen #'xlib:unmap-window cur) + (map-or-unmap-vscreen #'xlib:map-window new)))) (setf (gnome:win-workspace window) new (netwm:net-current-desktop window) new) (when *change-desktop-message-active-p*

1 0

[Eclipse-cvs] CVS update: eclipse/input.lisp eclipse/move-resize.lisp
by Iban Hatchondo 24 Nov '03

24 Nov '03

Update of /project/eclipse/cvsroot/eclipse In directory common-lisp.net:/tmp/cvs-serv3695 Modified Files: input.lisp move-resize.lisp Log Message: more hacking. Date: Mon Nov 24 08:44:50 2003 Author: ihatchondo Index: eclipse/input.lisp diff -u eclipse/input.lisp:1.22 eclipse/input.lisp:1.23 --- eclipse/input.lisp:1.22 Mon Nov 24 08:12:01 2003 +++ eclipse/input.lisp Mon Nov 24 08:44:50 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: input.lisp,v 1.22 2003/11/24 13:12:01 ihatchondo Exp $ +;;; $Id: input.lisp,v 1.23 2003/11/24 13:44:50 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -373,23 +373,19 @@ (:_NET_WM_DESKTOP (let* ((cur-desk (window-desktop-num window)) (new-desk (aref data 0)) - (master-window (and master (widget-window master)))) + (master-window (and master (widget-window master))) + (unmap-p (/= new-desk +any-desktop+ (current-desk)))) (unless (= cur-desk new-desk) (when (shaded-p application) (shade application)) (setf (window-desktop-num window) new-desk) - (if (/= new-desk +any-desktop+ (current-desk)) - (progn - (with-event-mask (*root-window*) - (xlib:unmap-window (or master-window window)) - (when master - (with-event-mask (master-window) - (xlib:unmap-window window)))) - (xlib:set-input-focus *display* :pointer-root :pointer-root)) - (if master - (with-event-mask (master-window) - (xlib:map-window window) - (xlib:map-window master-window)) - (xlib:map-window window)))))) + (let ((operation (if unmap-p #'xlib:unmap-window #'xlib:map-window))) + (with-event-mask (*root-window*) + (funcall operation (or master-window window)) + (when master-window + (with-event-mask (master-window) + (funcall operation window))))) + (when unmap-p + (xlib:set-input-focus *display* :pointer-root :pointer-root))))) (:_NET_CLOSE_WINDOW (close-widget application)) (:_NET_ACTIVE_WINDOW (cond ((shaded-p application) (shade application)) Index: eclipse/move-resize.lisp diff -u eclipse/move-resize.lisp:1.9 eclipse/move-resize.lisp:1.10 --- eclipse/move-resize.lisp:1.9 Wed Nov 19 05:29:08 2003 +++ eclipse/move-resize.lisp Mon Nov 24 08:44:50 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: move-resize.lisp,v 1.9 2003/11/19 10:29:08 ihatchondo Exp $ +;;; $Id: move-resize.lisp,v 1.10 2003/11/24 13:44:50 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -294,8 +294,7 @@ (declare (optimize (speed 3) (safety 0))) (declare (type (signed-byte 16) x y x2 y2)) (declare (type (unsigned-byte 16) w h w2 h2)) - (or (and (<= x (+ x2 w2)) (<= x2 (+ x w)) (<= y (+ y2 h2)) (<= y2 (+ y h))) - (and (<= x2 (+ x w)) (<= x (+ x2 w2)) (<= y2 (+ y h)) (<= y (+ y2 h2))))) + (and (<= x (+ x2 w2)) (<= x2 (+ x w)) (<= y (+ y2 h2)) (<= y2 (+ y h)))) (defun region-intersect-window-in-screen (x y w h &rest windows-to-skip) "Returns a window list that has an intersection with the given region

1 0

[Eclipse-cvs] CVS update: eclipse/global.lisp
by Iban Hatchondo 24 Nov '03

24 Nov '03

Update of /project/eclipse/cvsroot/eclipse In directory common-lisp.net:/tmp/cvs-serv21473 Modified Files: global.lisp Log Message: +netwm-protocols+ updated. Date: Mon Nov 24 08:12:26 2003 Author: ihatchondo Index: eclipse/global.lisp diff -u eclipse/global.lisp:1.13 eclipse/global.lisp:1.14 --- eclipse/global.lisp:1.13 Thu Oct 9 07:36:18 2003 +++ eclipse/global.lisp Mon Nov 24 08:12:26 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: global.lisp,v 1.13 2003/10/09 11:36:18 ihatchondo Exp $ +;;; $Id: global.lisp,v 1.14 2003/11/24 13:12:26 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2001, 2002 Iban HATCHONDO @@ -35,7 +35,12 @@ (defconstant +netwm-protocol+ '(:_net_client_list :_net_client_list_stacking :_net_number_of_desktops :_net_current_desktop :_net_active_window :_net_close_window :_net_wm_state - :_net_wm_desktop :_net_wm_window_type :_net_desktop_names + :_net_wm_desktop :_net_wm_window_type :_net_desktop_names :_net_wm_strut + :_net_wm_strut_partial + :_net_wm_window_type_desktop :_net_wm_window_type_dock + :_net_wm_window_type_toolbar :_net_wm_window_type_menu + :_net_wm_window_type_utility :_net_wm_window_type_splash + :_net_wm_window_type_dialog :_net_wm_window_type_normal :_net_wm_state_maximized_horz :_net_wm_state_maximized_vert :_net_wm_state_skip_taskbar :_net_wm_state_skip_pager :_net_wm_state_shaded :_net_wm_state_sticky :_net_wm_state_fullscreen :_net_wm_state_hidden @@ -74,7 +79,9 @@ (defparameter *focus-type* :none "values are: :none :on-click") (defparameter *font-name* "-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1") - +(defparameter *maximize-fill* nil + "Indicate if the action of maximizing window should making it filling whether + the largest area around (excluding overlapped windows) or screen area.") (defparameter *icon-hints* t "if you don't want eclipse to display miniature window for icons say nil") (defparameter *icon-box* '#(-75 5 -5 -5)

1 0

[Eclipse-cvs] CVS update: eclipse/input.lisp eclipse/virtual-screen.lisp eclipse/widgets.lisp
by Iban Hatchondo 24 Nov '03

24 Nov '03

Update of /project/eclipse/cvsroot/eclipse In directory common-lisp.net:/tmp/cvs-serv20635 Modified Files: input.lisp virtual-screen.lisp widgets.lisp Log Message: We now (un)map the application window and the master window (if it exists) when mapping/unmapping a desktop. Date: Mon Nov 24 08:12:02 2003 Author: ihatchondo Index: eclipse/input.lisp diff -u eclipse/input.lisp:1.21 eclipse/input.lisp:1.22 --- eclipse/input.lisp:1.21 Thu Nov 13 06:12:27 2003 +++ eclipse/input.lisp Mon Nov 24 08:12:01 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: input.lisp,v 1.21 2003/11/13 11:12:27 ihatchondo Exp $ +;;; $Id: input.lisp,v 1.22 2003/11/24 13:12:01 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -377,10 +377,19 @@ (unless (= cur-desk new-desk) (when (shaded-p application) (shade application)) (setf (window-desktop-num window) new-desk) - (if (or (= new-desk +any-desktop+) (= new-desk (current-desk))) - (xlib:map-window (or master-window window)) - (with-event-mask (*root-window*) - (xlib:unmap-window (or master-window window))))))) + (if (/= new-desk +any-desktop+ (current-desk)) + (progn + (with-event-mask (*root-window*) + (xlib:unmap-window (or master-window window)) + (when master + (with-event-mask (master-window) + (xlib:unmap-window window)))) + (xlib:set-input-focus *display* :pointer-root :pointer-root)) + (if master + (with-event-mask (master-window) + (xlib:map-window window) + (xlib:map-window master-window)) + (xlib:map-window window)))))) (:_NET_CLOSE_WINDOW (close-widget application)) (:_NET_ACTIVE_WINDOW (cond ((shaded-p application) (shade application)) Index: eclipse/virtual-screen.lisp diff -u eclipse/virtual-screen.lisp:1.12 eclipse/virtual-screen.lisp:1.13 --- eclipse/virtual-screen.lisp:1.12 Wed Nov 19 05:29:08 2003 +++ eclipse/virtual-screen.lisp Mon Nov 24 08:12:01 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: virtual-screen.lisp,v 1.12 2003/11/19 10:29:08 ihatchondo Exp $ +;;; $Id: virtual-screen.lisp,v 1.13 2003/11/24 13:12:01 ihatchondo Exp $ ;;; ;;; Copyright (C) 2002 Iban HATCHONDO ;;; contact : hatchond(a)yahoo.fr @@ -47,7 +47,11 @@ (with-slots (window master) widget (when (and (eq (window-desktop-num window) scr-num) (eq (car (wm-state window)) 1)) - (funcall fun (if master (widget-window master) window)))))) + (let ((mwindow (when master (widget-window master)))) + (funcall fun (or mwindow window)) + (when mwindow + (with-event-mask (mwindow) + (funcall fun window)))))))) ;;;; Public @@ -106,8 +110,8 @@ (setf (application-wants-focus-p widget) t)))) (xlib:set-input-focus *display* :pointer-root :pointer-root) (with-pointer-grabbed (window nil) - (map-or-unmap-vscreen #'xlib:map-window new) - (map-or-unmap-vscreen #'xlib:unmap-window cur))) + (map-or-unmap-vscreen #'xlib:unmap-window cur) + (map-or-unmap-vscreen #'xlib:map-window new))) (setf (gnome:win-workspace window) new (netwm:net-current-desktop window) new) (when *change-desktop-message-active-p* Index: eclipse/widgets.lisp diff -u eclipse/widgets.lisp:1.19 eclipse/widgets.lisp:1.20 --- eclipse/widgets.lisp:1.19 Sat Nov 8 14:54:13 2003 +++ eclipse/widgets.lisp Mon Nov 24 08:12:02 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: widgets.lisp,v 1.19 2003/11/08 19:54:13 ihatchondo Exp $ +;;; $Id: widgets.lisp,v 1.20 2003/11/24 13:12:02 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO @@ -664,6 +664,8 @@ (when (shaded-p application) (shade application)) (setf iconic-p t wants-focus-p t) + (when (eq (xlib:window-map-state window) :unmapped) + (setf (wm-state window) 3)) (xlib:unmap-window window) (when master (xlib:unmap-window (widget-window master)))

1 0

[Eclipse-cvs] CVS update: eclipse/lib/netwm-manager.lisp
by Iban Hatchondo 21 Nov '03

21 Nov '03

Update of /project/eclipse/cvsroot/eclipse/lib In directory common-lisp.net:/tmp/cvs-serv24305/lib Modified Files: netwm-manager.lisp Log Message: fix invalid array range. Date: Thu Nov 20 19:04:08 2003 Author: ihatchondo Index: eclipse/lib/netwm-manager.lisp diff -u eclipse/lib/netwm-manager.lisp:1.8 eclipse/lib/netwm-manager.lisp:1.9 --- eclipse/lib/netwm-manager.lisp:1.8 Thu Nov 20 18:48:54 2003 +++ eclipse/lib/netwm-manager.lisp Thu Nov 20 19:04:08 2003 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: EXTENDED-WINDOW-MANAGER-HINTS -*- -;;; $Id: netwm-manager.lisp,v 1.8 2003/11/20 23:48:54 ihatchondo Exp $ +;;; $Id: netwm-manager.lisp,v 1.9 2003/11/21 00:04:08 ihatchondo Exp $ ;;; ;;; This is the CLX support for the managing with gnome. ;;; @@ -375,7 +375,7 @@ "return the strut property as a multiple value (left right top bottom)." (let ((v (get-property window :_NET_WM_STRUT :result-type 'vector))) (declare (type (or null (simple-array integer (4))) v)) - (when v (values (aref v 1) (aref v 2) (aref v 3) (aref v 4))))) + (when v (values (aref v 0) (aref v 1) (aref v 2) (aref v 3))))) (defsetf net-wm-strut (window) (strut) "set the strut property. The given strut is expected to be a list or a @@ -393,9 +393,9 @@ (let ((v (get-property window :_NET_WM_STRUT_PARTIAL :result-type 'vector))) (declare (type (or null (simple-array integer (12))) v)) (when v - (values (aref v 1) (aref v 2) (aref v 3) (aref v 4) - (aref v 5) (aref v 6) (aref v 7) (aref v 8) - (aref v 9) (aref v 10) (aref v 11) (aref v 12))))) + (values (aref v 0) (aref v 1) (aref v 2) (aref v 3) + (aref v 4) (aref v 5) (aref v 6) (aref v 7) + (aref v 8) (aref v 9) (aref v 10) (aref v 11))))) (defsetf net-wm-strut-partial (window) (strut) "set the strut partial property. The given strut is expected to be a

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

eclipse-cvs November 2003