Mercurial > hg > xemacs-beta
view lisp/setup-paths.el @ 5043:d0c14ea98592
various frame-geometry fixes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-15 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameResize):
* console-msw-impl.h:
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT):
* device-tty.c:
* device-tty.c (tty_asynch_device_change):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-msw.c:
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_frame_size):
* frame-msw.c (mswindows_size_frame_internal):
* frame-msw.c (msprinter_init_frame_3):
* frame.c:
* frame.c (enum):
* frame.c (Fmake_frame):
* frame.c (adjust_frame_size):
* frame.c (store_minibuf_frame_prop):
* frame.c (Fframe_property):
* frame.c (Fframe_properties):
* frame.c (Fframe_displayable_pixel_height):
* frame.c (Fframe_displayable_pixel_width):
* frame.c (internal_set_frame_size):
* frame.c (Fset_frame_height):
* frame.c (Fset_frame_pixel_height):
* frame.c (Fset_frame_displayable_pixel_height):
* frame.c (Fset_frame_width):
* frame.c (Fset_frame_pixel_width):
* frame.c (Fset_frame_displayable_pixel_width):
* frame.c (Fset_frame_size):
* frame.c (Fset_frame_pixel_size):
* frame.c (Fset_frame_displayable_pixel_size):
* frame.c (frame_conversion_internal_1):
* frame.c (get_frame_displayable_pixel_size):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* frame.c (generate_title_string):
* frame.h:
* gtk-xemacs.c:
* gtk-xemacs.c (gtk_xemacs_size_request):
* gtk-xemacs.c (gtk_xemacs_size_allocate):
* gtk-xemacs.c (gtk_xemacs_paint):
* gutter.c:
* gutter.c (update_gutter_geometry):
* redisplay.c (end_hold_frame_size_changes):
* redisplay.c (redisplay_frame):
* toolbar.c:
* toolbar.c (update_frame_toolbars_geometry):
* window.c:
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
Various fixes to frame geometry to make it a bit easier to understand
and fix some bugs.
1. IMPORTANT: Some renamings. Will need to be applied carefully to
the carbon repository, in the following order:
-- pixel_to_char_size -> pixel_to_frame_unit_size
-- char_to_pixel_size -> frame_unit_to_pixel_size
-- pixel_to_real_char_size -> pixel_to_char_size
-- char_to_real_pixel_size -> char_to_pixel_size
-- Reverse second and third arguments of change_frame_size() and
change_frame_size_1() to try to make functions consistent in
putting width before height.
-- Eliminate old round_size_to_char, because it didn't really
do anything differently from round_size_to_real_char()
-- round_size_to_real_char -> round_size_to_char; any places that
called the old round_size_to_char should just call the new one.
2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed
sizes in "frame units", like all other frame-sizing functions,
rather than some hacked-up combination of char-cell units and
total pixel size. This only affects window systems that use
"pixelated geometry", and I'm not sure if Carbon is one of them.
MS Windows is pixelated, X and GTK are not. For pixelated-geometry
systems, the size in set_frame_size() is in displayable pixels
rather than total pixels and needs to be converted appropriately;
take a look at the changes made to mswindows_set_frame_size()
method if necessary.
3. Add a big long comment in frame.c describing how frame geometry
works.
4. Remove MS Windows-specific character height and width fields,
duplicative and unused.
5. frame-displayable-pixel-* and set-frame-displayable-pixel-*
didn't use to work on MS Windows, but they do now.
6. In general, clean up the handling of "pixelated geometry" so
that fewer functions have to worry about this. This is really
an abomination that should be removed entirely but that will
have to happen later. Fix some buggy code in
frame_conversion_internal() that happened to "work" because it
was countered by oppositely buggy code in change_frame_size().
7. Clean up some frame-size code in toolbar.c and use functions
already provided in frame.c instead of rolling its own.
8. Fix check_frame_size() in window.c, which formerly didn't take
pixelated geometry into account.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Feb 2010 22:14:11 -0600 |
parents | 6b6b0f8ab749 |
children | 54700d784be9 |
line wrap: on
line source
;;; setup-paths.el --- setup various XEmacs paths ;; Copyright (C) 1985-1986, 1990, 1992-1997 Free Software Foundation, Inc. ;; Copyright (c) 1993, 1994 Sun Microsystems, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois ;; Copyright (C) 2003 Ben Wing. ;; Author: Mike Sperber <mike@xemacs.orgx> ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; This file contains functions and variables that describe and construct ;; the various paths into the XEmacs hierarchy from a global viewpoint. ;; This file doesn't actually set any global variable, and doesn't ;; contain any state---it just contains the functionality for ;; searching directories and constructing paths. ;; It requires find-paths.el and packages.el. ;;; Code: ;(setq debug-paths t) (defvar paths-core-load-path-depth 0 "Depth of load-path searches in core Lisp paths.") (defvar paths-site-load-path-depth 1 "Depth of load-path searches in site Lisp paths.") (defvar paths-mule-load-path-depth 0 "Depth of load-path searches in Mule Lisp paths.") (defvar paths-module-load-path-depth 1 "Depth of load-path searches in module paths.") (defvar paths-default-info-directories (mapcar (function (lambda (dirlist) (paths-construct-path dirlist (char-to-string directory-sep-char)))) '(("usr" "local" "info") ("usr" "info") ("usr" "local" "share" "info") ("usr" "share" "info"))) "Directories appended to the end of the info path by default.") ;;; Basic utility functions. (defun paths-emacs-root-p (directory) "Check if DIRECTORY is a plausible installation root." (or ;; installed (paths-file-readable-directory-p (paths-construct-path (list directory "lib" (construct-emacs-version-name)))) ;; in-place or windows-nt. windows-nt equivalent of --srcdir is ;; BUILD_DIR in config.inc, and has no lisp/ or etc/ since symlinks ;; don't exist. instead, xemacs.mak points configure-lisp-directory and ;; configure-data-directory at the right places. (and (or configure-exec-directory (paths-file-readable-directory-p (paths-construct-path (list directory "lib-src"))) (eq system-type 'windows-nt)) (or configure-lisp-directory (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))) (or configure-data-directory (paths-file-readable-directory-p (paths-construct-path (list directory "etc"))))))) (defun paths-emacs-data-root-p (directory) "Check if DIRECTORY is a plausible data installation root. A data installation root is one containing data files that may be shared among multiple different versions of XEmacs, the packages in particular. This serves as an additional filter to narrow down the list of plausible installation roots." (or ;; installed (paths-file-readable-directory-p (paths-construct-path (list directory "share" emacs-program-name))) (paths-file-readable-directory-p (paths-construct-path (list directory "share" (construct-emacs-version-name)))) ;; in-place or windows-nt (and (paths-file-readable-directory-p (paths-construct-path (list directory "lisp"))) (paths-file-readable-directory-p (paths-construct-path (list directory "etc")))) ;; searching for a package directory (and (string-match "win32" system-configuration) (paths-file-readable-directory-p (paths-construct-path (list directory "xemacs-packages")))))) (defun paths-find-invocation-roots (invocation-directory invocation-name root-p) "Find the list of run-time roots of XEmacs. INVOCATION-DIRECTORY is a directory containing the XEmacs executable. INVOCATION-NAME is the name of the executable itself ROOT-P is a function that tests whether a root is plausible." (let* ((executable-file-name (paths-chase-symlink (concat invocation-directory invocation-name))) (executable-directory (file-name-directory executable-file-name)) (maybe-root-1 (file-name-as-directory (paths-construct-path '("..") executable-directory))) (maybe-root-2 (file-name-as-directory (paths-construct-path '(".." "..") executable-directory)))) (delete-if-not root-p (list maybe-root-1 maybe-root-2)))) (defun paths-find-emacs-roots (invocation-directory invocation-name root-p) "Find all plausible installation roots for XEmacs. This is a list of plausible directories in which to search for the important directories used by XEmacs at run-time, for example `exec-directory', `data-directory' and `lisp-directory'. ROOT-P is a function that tests whether a root is plausible." (let* ((invocation-roots (paths-find-invocation-roots invocation-directory invocation-name root-p)) (potential-installation-roots (delete-duplicates (append (and configure-exec-prefix-directory (list (file-name-as-directory configure-exec-prefix-directory))) (and configure-prefix-directory (list (file-name-as-directory configure-prefix-directory)))) :test #'equal)) (installation-roots (remove-if-not root-p potential-installation-roots))) (delete-duplicates (nconc invocation-roots installation-roots) :test #'equal))) (defun paths-find-site-lisp-directory (roots) "Find the site Lisp directory of the XEmacs hierarchy. ROOTS is a list of installation roots." (paths-find-site-directory roots (list "site-lisp") nil nil configure-site-directory)) (defun paths-find-site-module-directory (roots) "Find the site modules directory of the XEmacs hierarchy. ROOTS is a list of installation roots." (paths-find-site-directory roots (list "site-modules") t nil configure-site-module-directory)) (defun paths-find-lisp-directory (roots) "Find the main Lisp directory of the XEmacs hierarchy. ROOTS is a list of installation roots." (paths-find-version-directory roots (list "lisp") nil nil configure-lisp-directory)) (defun paths-find-mule-lisp-directory (roots &optional lisp-directory) "Find the Mule Lisp directory of the XEmacs hierarchy. ROOTS is a list of installation roots." ;; #### kludge (if lisp-directory (let ((guess (file-name-as-directory (paths-construct-path (list lisp-directory "mule"))))) (if (paths-file-readable-directory-p guess) guess (paths-find-version-directory roots (list "mule-lisp") nil nil configure-mule-lisp-directory))))) (defun paths-find-module-directory (roots) "Find the main modules directory of the XEmacs hierarchy. ROOTS is a list of installation roots." (paths-find-architecture-directory roots (list "modules") nil configure-module-directory)) (defun paths-construct-load-path (roots early-package-load-path late-package-load-path last-package-load-path lisp-directory &optional site-lisp-directory mule-lisp-directory) "Construct the complete load path. ROOTS is the list of installation roots. EARLY-PACKAGE-LOAD-PATH, LATE-PACKAGE-LOAD-PATH, and LAST-PACKAGE-LOAD-PATH are the load paths for the package hierarchies. SITE-LISP-DIRECTORY and MULE-LISP-DIRECTORY are optional directories to be included in the load path---SITE-LISP-DIRECTORY for the obsolete site-specific Lisp files, and MULE-LISP-DIRECTORY for the Mule Lisp files, which exist only in Mule installations." (let* ((envvar-value (getenv "EMACSLOADPATH")) (env-load-path (and envvar-value (paths-decode-directory-path envvar-value 'drop-empties))) (site-lisp-load-path (and site-lisp-directory (paths-find-recursive-load-path (list site-lisp-directory) paths-site-load-path-depth))) (mule-lisp-load-path (and mule-lisp-directory (paths-find-recursive-load-path (list mule-lisp-directory) paths-mule-load-path-depth))) (lisp-load-path (and lisp-directory (paths-find-recursive-load-path (list lisp-directory) paths-core-load-path-depth)))) (append env-load-path early-package-load-path site-lisp-load-path late-package-load-path mule-lisp-load-path lisp-load-path last-package-load-path))) (defun paths-construct-module-load-path (root module-directory &optional site-module-directory) "Construct the modules load path." (let* ((envvar-value (getenv "EMACSMODULEPATH")) (env-module-path (and envvar-value (paths-decode-directory-path envvar-value 'drop-empties))) (site-module-load-path (and site-module-directory (paths-find-recursive-load-path (list site-module-directory) paths-site-load-path-depth))) (module-load-path (and module-directory (paths-find-recursive-load-path (list module-directory) paths-module-load-path-depth)))) (append env-module-path site-module-load-path module-load-path))) (defun paths-construct-info-path (roots early-package-hierarchies late-package-hierarchies last-package-hierarchies) "Construct the info path. ROOTS is the list of installation roots. EARLY-PACKAGE-HIERARCHIES, LATE-PACKAGE-HIERARCHIES, and LAST-PACKAGE-HIERARCHIES are lists of package hierarchy roots, respectively." (let ((info-path-envval (getenv "INFOPATH"))) (delete-duplicates (nconc (append (let ((info-directory (paths-find-version-directory roots (list "info") nil nil configure-info-directory))) (and info-directory (list info-directory))) (packages-find-package-info-path early-package-hierarchies) (packages-find-package-info-path late-package-hierarchies) (packages-find-package-info-path last-package-hierarchies) (and info-path-envval (paths-decode-directory-path info-path-envval 'drop-empties))) (and (null info-path-envval) (delete-duplicates (nconc (paths-directories-which-exist configure-info-path) (paths-directories-which-exist paths-default-info-directories)) :test #'equal))) :test #'equal))) (defun paths-find-doc-directory (roots) "Find the documentation directory. ROOTS is the list of installation roots." (paths-find-architecture-directory roots (list "lib-src") nil configure-doc-directory)) (defun paths-find-exec-directory (roots) "Find the binary directory. ROOTS is the list of installation roots." (paths-find-architecture-directory roots (list "lib-src") nil configure-exec-directory)) (defun paths-construct-exec-path (roots exec-directory early-package-hierarchies late-package-hierarchies last-package-hierarchies) "Find the binary path. ROOTS is the list of installation roots. EARLY-PACKAGE-HIERARCHIES, LATE-PACKAGE-HIERARCHIES, and LAST-PACKAGE-HIERARCHIES are lists of package hierarchy roots, respectively. EXEC-DIRECTORY is the directory of architecture-dependent files that come with XEmacs. EARLY-PACKAGES, LATE-PACKAGES, and LAST-PACKAGES are lists of package hierarchy roots, respectively." (append (let ((path-envval (getenv "PATH"))) (if path-envval (paths-decode-directory-path path-envval 'drop-empties))) (packages-find-package-exec-path early-package-hierarchies) (packages-find-package-exec-path late-package-hierarchies) (let ((emacspath-envval (getenv "EMACSPATH"))) (and emacspath-envval (split-path emacspath-envval))) (and exec-directory (list exec-directory)) (packages-find-package-exec-path last-package-hierarchies))) (defun paths-find-data-directory (roots) "Find the data directory. ROOTS is the list of installation roots." (paths-find-version-directory roots (list "etc") nil "EMACSDATA" configure-data-directory)) (defun paths-construct-data-directory-list (data-directory early-package-hierarchies late-package-hierarchies last-package-hierarchies) "Construct the data path. DATA-DIRECTORY is the data directory of the XEmacs installation. EARLY-PACKAGE-HIERARCHIES, LATE-PACKAGE-HIERARCHIES, and LAST-PACKAGE-HIERARCHIES are lists of package hierarchy roots, respectively." (append (packages-find-package-data-path early-package-hierarchies) (packages-find-package-data-path late-package-hierarchies) (list data-directory) (packages-find-package-data-path last-package-hierarchies))) ;;; setup-paths.el ends here