Commit 889a86ea authored by Iban Hatchondo's avatar Iban Hatchondo
Browse files

Fix initial-coordinates to work the with net-workarea property.

Fix ice & SM system load whan not loaded from the eclipse directory.
parent c0ef6118
;;; -*- Mode: Lisp; Package: User -*-
;;; $Id: system.lisp,v 1.14 2004/04/08 21:22:32 ihatchondo Exp $
;;; $Id: system.lisp,v 1.15 2005/02/25 14:00:30 ihatchondo Exp $
;;;
;;; This file is part of Eclipse.
;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO
......@@ -37,10 +37,11 @@
#-:clx (require :clx)
#-:loop (require :loop))
;; For session management & connection.
;;;; Load the ICE and SM lib systems for session management.
(load "lib/ice/system.lisp")
(load "lib/sm/system.lisp")
(let ((dir (make-pathname :defaults cl-user::*eclipse-src-directory*)))
(load (merge-pathnames (parse-namestring "lib/ice/system.lisp") dir))
(load (merge-pathnames (parse-namestring "lib/sm/system.lisp") dir)))
;;;; ECLIPSE SYSTEM.
......
;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*-
;;; $Id: wm.lisp,v 1.49 2005/02/10 23:45:44 ihatchondo Exp $
;;; $Id: wm.lisp,v 1.50 2005/03/01 22:41:31 ihatchondo Exp $
;;;
;;; ECLIPSE. The Common Lisp Window Manager.
;;; Copyright (C) 2000, 2001, 2002 Iban HATCHONDO
......@@ -375,8 +375,13 @@
(:south-west (values x (- y vmargin)))
(:static (values (- x left-margin) (- y top-margin)))
(t (values x y))))
(multiple-value-bind (x y) (window-position app-window)
(values (max 0 (- x left-margin)) (max 0 (- y top-margin))))))))
(let* ((n (or (window-desktop-num app-window) 0))
(k (if (= +any-desktop+ n) 0 (* 4 n)))
(areas (netwm:net-workarea *root-window*))
(ax (aref areas k)) (ay (aref areas (1+ k))))
(multiple-value-bind (x y) (window-position app-window)
(values (max ax (- x left-margin))
(max ay (- y top-margin)))))))))
(defun make-decoration (app-window application &key theme)
"Returns a newly initialized decoration to hold the given application."
......
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