Mercurial > emacs
view lisp/emacs-lisp/check-declare.el @ 107805:bcbdb43a80e2
Lucid menus can now use Xft for fonts.
* xsettings.c (current_font, SYSTEM_FONT, XSETTINGS_FONT_NAME): New.
(parse_xft_settings): Also check for XSETTINGS_FONT_NAME and save that
in current_font.
(init_gconf): Read value of SYSTEM_FONT and save it in current_font.
(Ffont_get_system_normal_font, xsettings_get_system_normal_font): New
functions.
(syms_of_xsettings): Initialize current_font. defsubr
Sfont_get_system_normal_font.
* xsettings.h (Ffont_get_system_normal_font,
xsettings_get_system_normal_font): Declare.
* xfns.c (extern xlwmenu_default_font): Remove.
(Fx_create_frame): Remove setting of xlwmenu_default_font, moved
to xlwmenu.c.
* menu.c (digest_single_submenu): If USE_LUCID and HAVE_XFT, encode
menu items in UTF-8.
* xmenu.c: include xsettings.h and xlwmenu.h if USE_LUCID.
(apply_systemfont_to_menu): New function.
(set_frame_menubar, create_and_show_popup_menu): Call
apply_systemfont_to_menu.
* xlwmenu.c (xlwmenu_default_font): Make static.
(xlwMenuResources): Add XtNfaceName and XtNdefaultFace.
(string_width): Use XftTextExtentsUtf8 if HAVE_XFT.
(MENU_FONT_HEIGHT, MENU_FONT_ASCENT): Add versions for
HAVE_XFT.
(size_menu): Set max_rest_width in window_state structure.
(display_menu_item): If HAVE_XFT and xft_draw is set, use
XftDrawRect and XftDrawStringUtf8 to draw text.
(make_windows_if_needed): Set max_rest_width and xft_draw
in windows[i].
(openXftFont): New.
(XlwMenuInitialize): Call openXftFont if HAVE_XFT. If mw->menu.font
is not set, load font fixed and save it in xlwmenu_default_font.
(XlwMenuInitialize): Set max_rest_width and xft_draw in windows[0].
(XlwMenuClassInitialize): Initialize xlwmenu_default_font.
(XlwMenuRealize): Set xft_fg, xft_bg, xft_disabled_fg and
windows[0].xft_draw if xft_font is set.
(XlwMenuDestroy): Destroy all xft_draw and close xft_font.
(facename_changed): New.
(XlwMenuSetValues): Call facename_changed. If face name did change,
close old fonts and destroy xft_draw:s. Then create new ones.
* xlwmenu.h (XtNfaceName, XtCFaceName, XtNdefaultFace,
XtCDefaultFace): New.
* xlwmenuP.h (_window_state): Add max_rest_width and xft_draw.
(_XlwMenu_part): Add faceName,xft_fg, xft_bg, xft_disabled_fg and
xft_font.
* xresources.texi (Lucid Resources): Mention faceName to set Xft fonts.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 08 Apr 2010 18:21:25 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; check-declare.el --- Check declare-function statements ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Glenn Morris <rgm@gnu.org> ;; Keywords: lisp, tools, maint ;; This file is part of GNU Emacs. ;; GNU Emacs 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 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; The byte-compiler often warns about undefined functions that you ;; know will actually be defined when it matters. The `declare-function' ;; statement allows you to suppress these warnings. This package ;; checks that all such statements in a file or directory are accurate. ;; The entry points are `check-declare-file' and `check-declare-directory'. ;; For more information, see Info node `elisp(Declaring Functions)'. ;;; TODO: ;; 1. Warn about functions marked as obsolete, eg ;; password-read-and-add in smime.el. ;; 2. defmethod, defclass argument checking. ;; 3. defclass also defines -p and -child-p. ;;; Code: (defconst check-declare-warning-buffer "*Check Declarations Warnings*" "Name of buffer used to display any `check-declare' warnings.") (defun check-declare-locate (file basefile) "Return the full path of FILE. Expands files with a \".c\" or \".m\" extension relative to the Emacs \"src/\" directory. Otherwise, `locate-library' searches for FILE. If that fails, expands FILE relative to BASEFILE's directory part. The returned file might not exist. If FILE has an \"ext:\" prefix, so does the result." (let ((ext (string-match "^ext:" file)) tfile) (if ext (setq file (substring file 4))) (setq file (if (member (file-name-extension file) '("c" "m")) (expand-file-name file (expand-file-name "src" source-directory)) (if (setq tfile (locate-library file)) (progn (setq tfile (replace-regexp-in-string "\\.elc\\'" ".el" tfile)) (if (and (not (file-exists-p tfile)) (file-exists-p (concat tfile ".gz"))) (concat tfile ".gz") tfile)) (setq tfile (expand-file-name file (file-name-directory basefile))) (if (or (file-exists-p tfile) (string-match "\\.el\\'" tfile)) tfile (concat tfile ".el"))))) (if ext (concat "ext:" file) file))) (defun check-declare-scan (file) "Scan FILE for `declare-function' calls. Return a list with elements of the form (FNFILE FN ARGLIST FILEONLY), where only the first two elements need be present. This claims that FNFILE defines FN, with ARGLIST. FILEONLY non-nil means only check that FNFILE exists, not that it defines FN. This is for function definitions that we don't know how to recognize (e.g. some macros)." (let ((m (format "Scanning %s..." file)) alist form len fn fnfile arglist fileonly) (message "%s" m) (with-temp-buffer (insert-file-contents file) ;; FIXME we could theoretically be inside a string. (while (re-search-forward "^[ \t]*\\((declare-function\\)[ \t\n]" nil t) (goto-char (match-beginning 1)) (if (and (setq form (ignore-errors (read (current-buffer))) len (length form)) (> len 2) (< len 6) (symbolp (setq fn (cadr form))) (setq fn (symbol-name fn)) ; later we use as a search string (stringp (setq fnfile (nth 2 form))) (setq fnfile (check-declare-locate fnfile (expand-file-name file))) ;; Use `t' to distinguish unspecified arglist from empty one. (or (eq t (setq arglist (if (> len 3) (nth 3 form) t))) (listp arglist)) (symbolp (setq fileonly (nth 4 form)))) (setq alist (cons (list fnfile fn arglist fileonly) alist)) ;; FIXME make this more noticeable. (message "Malformed declaration for `%s'" (cadr form))))) (message "%sdone" m) alist)) (defun check-declare-errmsg (errlist &optional full) "Return a string with the number of errors in ERRLIST, if any. Normally just counts the number of elements in ERRLIST. With optional argument FULL, sums the number of elements in each element." (if errlist (let ((l (length errlist))) (when full (setq l 0) (dolist (e errlist) (setq l (+ l (1- (length e)))))) (format "%d problem%s found" l (if (= l 1) "" "s"))) "OK")) (autoload 'byte-compile-arglist-signature "bytecomp") (defun check-declare-verify (fnfile fnlist) "Check that FNFILE contains function definitions matching FNLIST. Each element of FNLIST has the form (FILE FN ARGLIST FILEONLY), where only the first two elements need be present. This means FILE claimed FN was defined in FNFILE with the specified ARGLIST. FILEONLY non-nil means to only check that FNFILE exists, not that it actually defines FN. Returns nil if all claims are found to be true, otherwise a list of errors with elements of the form \(FILE FN TYPE), where TYPE is a string giving details of the error." (let ((m (format "Checking %s..." fnfile)) (cflag (member (file-name-extension fnfile) '("c" "m"))) (ext (string-match "^ext:" fnfile)) re fn sig siglist arglist type errlist minargs maxargs) (message "%s" m) (if ext (setq fnfile (substring fnfile 4))) (if (file-regular-p fnfile) (with-temp-buffer (insert-file-contents fnfile) ;; defsubst's don't _have_ to be known at compile time. (setq re (format (if cflag "^[ \t]*\\(DEFUN\\)[ \t]*([ \t]*\"%s\"" "^[ \t]*(\\(fset[ \t]+'\\|\ def\\(?:un\\|subst\\|foo\\|method\\|class\\|\ ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\\|\ \\(?:ine-obsolete-function-\\)?alias[ \t]+'\\|\ ine-overloadable-function\\)\\)\ \[ \t]*%s\\([ \t;]+\\|$\\)") (regexp-opt (mapcar 'cadr fnlist) t))) (while (re-search-forward re nil t) (skip-chars-forward " \t\n") (setq fn (match-string 2) type (match-string 1) ;; (min . max) for a fixed number of arguments, or ;; arglists with optional elements. ;; (min) for arglists with &rest. ;; sig = 'err means we could not find an arglist. sig (cond (cflag (or (when (search-forward "," nil t 3) (skip-chars-forward " \t\n") ;; Assuming minargs and maxargs on same line. (when (looking-at "\\([0-9]+\\)[ \t]*,[ \t]*\ \\([0-9]+\\|MANY\\|UNEVALLED\\)") (setq minargs (string-to-number (match-string 1)) maxargs (match-string 2)) (cons minargs (unless (string-match "[^0-9]" maxargs) (string-to-number maxargs))))) 'err)) ((string-match "\\`define-\\(derived\\|generic\\)-mode\\'" type) '(0 . 0)) ((string-match "\\`define\\(-global\\(ized\\)?\\)?-minor-mode\\'" type) '(0 . 1)) ;; Prompt to update. ((string-match "\\`define-obsolete-function-alias\\>" type) 'obsolete) ;; Can't easily check arguments in these cases. ((string-match "\\`\\(def\\(alias\\|\ method\\|class\\)\\|fset\\)\\>" type) t) ((looking-at "\\((\\|nil\\)") (byte-compile-arglist-signature (read (current-buffer)))) (t 'err)) ;; alist of functions and arglist signatures. siglist (cons (cons fn sig) siglist))))) (dolist (e fnlist) (setq arglist (nth 2 e) type (if (not re) "file not found" (if (not (setq sig (assoc (cadr e) siglist))) (unless (nth 3 e) ; fileonly "function not found") (setq sig (cdr sig)) (cond ((eq sig 'obsolete) ; check even when no arglist specified "obsolete alias") ;; arglist t means no arglist specified, as ;; opposed to an empty arglist. ((eq arglist t) nil) ((eq sig t) nil) ; eg defalias - can't check arguments ((eq sig 'err) "arglist not found") ; internal error ((not (equal (byte-compile-arglist-signature arglist) sig)) "arglist mismatch"))))) (when type (setq errlist (cons (list (car e) (cadr e) type) errlist)))) (message "%s%s" m (if (or re (not ext)) (check-declare-errmsg errlist) (progn (setq errlist nil) "skipping external file"))) errlist)) (defun check-declare-sort (alist) "Sort a list with elements FILE (FNFILE ...). Returned list has elements FNFILE (FILE ...)." (let (file fnfile rest sort a) (dolist (e alist) (setq file (car e)) (dolist (f (cdr e)) (setq fnfile (car f) rest (cdr f)) (if (setq a (assoc fnfile sort)) (setcdr a (append (cdr a) (list (cons file rest)))) (setq sort (cons (list fnfile (cons file rest)) sort))))) sort)) (defun check-declare-warn (file fn fnfile type) "Warn that FILE made a false claim about FN in FNFILE. TYPE is a string giving the nature of the error. Warning is displayed in `check-declare-warning-buffer'." (display-warning 'check-declare (format "%s said `%s' was defined in %s: %s" (file-name-nondirectory file) fn (file-name-nondirectory fnfile) type) nil check-declare-warning-buffer)) (defun check-declare-files (&rest files) "Check veracity of all `declare-function' statements in FILES. Return a list of any errors found." (let (alist err errlist) (dolist (file files) (setq alist (cons (cons file (check-declare-scan file)) alist))) ;; Sort so that things are ordered by the files supposed to ;; contain the defuns. (dolist (e (check-declare-sort alist)) (if (setq err (check-declare-verify (car e) (cdr e))) (setq errlist (cons (cons (car e) err) errlist)))) (if (get-buffer check-declare-warning-buffer) (kill-buffer check-declare-warning-buffer)) ;; Sort back again so that errors are ordered by the files ;; containing the declare-function statements. (dolist (e (check-declare-sort errlist)) (dolist (f (cdr e)) (check-declare-warn (car e) (cadr f) (car f) (nth 2 f)))) errlist)) ;;;###autoload (defun check-declare-file (file) "Check veracity of all `declare-function' statements in FILE. See `check-declare-directory' for more information." (interactive "fFile to check: ") (or (file-exists-p file) (error "File `%s' not found" file)) (let ((m (format "Checking %s..." file)) errlist) (message "%s" m) (setq errlist (check-declare-files file)) (message "%s%s" m (check-declare-errmsg errlist)) errlist)) ;;;###autoload (defun check-declare-directory (root) "Check veracity of all `declare-function' statements under directory ROOT. Returns non-nil if any false statements are found." (interactive "DDirectory to check: ") (or (file-directory-p (setq root (expand-file-name root))) (error "Directory `%s' not found" root)) (let ((m "Checking `declare-function' statements...") (m2 "Finding files with declarations...") errlist files) (message "%s" m) (message "%s" m2) (setq files (process-lines find-program root "-name" "*.el" "-exec" grep-program "-l" "^[ \t]*(declare-function" "{}" ";")) (message "%s%d found" m2 (length files)) (when files (setq errlist (apply 'check-declare-files files)) (message "%s%s" m (check-declare-errmsg errlist t)) errlist))) (provide 'check-declare) ;; arch-tag: a4d6cdc4-deb7-4502-b327-0e4ef3d82d96 ;;; check-declare.el ends here.