Mercurial > emacs
view lisp/emacs-lisp/crm.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
;;; crm.el --- read multiple strings with completion ;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: completion, minibuffer, multiple elements ;; 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: ;; This code defines a function, `completing-read-multiple', which ;; provides the ability to read multiple strings in the minibuffer, ;; with completion. ;; By using this functionality, a user may specify multiple strings at ;; a single prompt, optionally using completion. ;; Multiple strings are specified by separating each of the strings ;; with a prespecified separator character. For example, if the ;; separator character is a comma, the strings 'alice', 'bob', and ;; 'eve' would be specified as 'alice,bob,eve'. ;; The default value for the separator character is the value of ;; `crm-default-separator' (comma). The separator character may be ;; changed by modifying the value of `crm-separator'. ;; Contiguous strings of non-separator-characters are referred to as ;; 'elements'. In the aforementioned example, the elements are: ;; 'alice', 'bob', and 'eve'. ;; Completion is available on a per-element basis. For example, if ;; the contents of the minibuffer are 'alice,bob,eve' and point is ;; between 'l' and 'i', pressing TAB operates on the element 'alice'. ;; For the moment, I have decided to not bind any special behavior to ;; the separator key. In the future, the separator key might be used ;; to provide completion in certain circumstances. One of the reasons ;; why this functionality is not yet provided is that it is unclear to ;; the author what the precise circumstances are, under which ;; separator-invoked completion should be provided. ;; Design note: `completing-read-multiple' is modeled after ;; `completing-read'. They should be similar -- it was intentional. ;; Some of this code started out as translation from C code in ;; src/minibuf.c to Emacs Lisp code. After this code was rewritten in Elisp ;; and made to operate on any field, this file was completely rewritten to ;; just reuse that code. ;; Thanks to Sen Nagata <sen@eccosys.com> for the original version of the ;; code, and sorry for throwing it all out. --Stef ;; Thanks to Richard Stallman for all of his help (many of the good ;; ideas in here are from him), Gerd Moellmann for his attention, ;; Stefan Monnier for responding with a code sample and comments very ;; early on, and Kai Grossjohann & Soren Dayton for valuable feedback. ;;; Questions and Thoughts: ;; -should `completing-read-multiple' allow a trailing separator in ;; a return value when REQUIRE-MATCH is t? if not, should beep when a user ;; tries to exit the minibuffer via RET? ;; -tip: use M-f and M-b for ease of navigation among elements. ;; - the difference between minibuffer-completion-table and ;; crm-completion-table is just crm--collection-fn. In most cases it ;; shouldn't make any difference. But if a non-CRM completion function ;; happens to be used, it will use minibuffer-completion-table and ;; crm--collection-fn will try to make it do "more or less the right ;; thing" by making it complete on the last element, which is about as ;; good as we can hope for right now. ;; I'm not sure if it's important or not. Maybe we could just throw away ;; crm-completion-table and crm--collection-fn, but there doesn't seem to ;; be a pressing need for it, and since Sen did bother to write it, we may ;; as well keep it, in case it helps. ;;; History: ;; ;; 2000-04-10: ;; ;; first revamped version ;;; Code: (defconst crm-default-separator "," "Default separator for `completing-read-multiple'.") (defvar crm-separator crm-default-separator "Separator used for separating strings in `completing-read-multiple'. It should be a single character string that doesn't appear in the list of completion candidates. Modify this value to make `completing-read-multiple' use a separator other than `crm-default-separator'.") (defvar crm-local-completion-map (let ((map (make-sparse-keymap))) (set-keymap-parent map minibuffer-local-completion-map) (define-key map [remap minibuffer-complete] #'crm-complete) (define-key map [remap minibuffer-complete-word] #'crm-complete-word) (define-key map [remap minibuffer-completion-help] #'crm-completion-help) map) "Local keymap for minibuffer multiple input with completion. Analog of `minibuffer-local-completion-map'.") (defvar crm-local-must-match-map (let ((map (make-sparse-keymap))) ;; We'd want to have multiple inheritance here. (set-keymap-parent map minibuffer-local-must-match-map) (define-key map [remap minibuffer-complete] #'crm-complete) (define-key map [remap minibuffer-complete-word] #'crm-complete-word) (define-key map [remap minibuffer-completion-help] #'crm-completion-help) (define-key map [remap minibuffer-complete-and-exit] #'crm-complete-and-exit) map) "Local keymap for minibuffer multiple input with exact match completion. Analog of `minibuffer-local-must-match-map' for crm.") (defvar crm-completion-table nil "An alist whose elements' cars are strings, or an obarray. This is a table used for completion by `completing-read-multiple' and its supporting functions.") ;; this function evolved from a posting by Stefan Monnier (defun crm--collection-fn (string predicate flag) "Function used by `completing-read-multiple' to compute completion values. The value of STRING is the string to be completed. The value of PREDICATE is a function to filter possible matches, or nil if none. The value of FLAG is used to specify the type of completion operation. A value of nil specifies `try-completion'. A value of t specifies `all-completions'. A value of lambda specifes a test for an exact match. For more information on STRING, PREDICATE, and FLAG, see the Elisp Reference sections on 'Programmed Completion' and 'Basic Completion Functions'." (let ((beg 0)) (while (string-match crm-separator string beg) (setq beg (match-end 0))) (completion-table-with-context (substring string 0 beg) crm-completion-table (substring string beg) predicate flag))) (defun crm--select-current-element () "Parse the minibuffer to find the current element. Place an overlay on the element, with a `field' property, and return it." (let* ((bob (minibuffer-prompt-end)) (start (save-excursion (if (re-search-backward crm-separator bob t) (match-end 0) bob))) (end (save-excursion (if (re-search-forward crm-separator nil t) (match-beginning 0) (point-max)))) (ol (make-overlay start end nil nil t))) (overlay-put ol 'field (make-symbol "crm")) ol)) (defun crm-completion-help () "Display a list of possible completions of the current minibuffer element." (interactive) (let ((ol (crm--select-current-element))) (unwind-protect (minibuffer-completion-help) (delete-overlay ol))) nil) (defun crm-complete () "Complete the current element. If no characters can be completed, display a list of possible completions. Return t if the current element is now a valid match; otherwise return nil." (interactive) (let ((ol (crm--select-current-element))) (unwind-protect (minibuffer-complete) (delete-overlay ol)))) (defun crm-complete-word () "Complete the current element at most a single word. Like `minibuffer-complete-word' but for `completing-read-multiple'." (interactive) (let ((ol (crm--select-current-element))) (unwind-protect (minibuffer-complete-word) (delete-overlay ol)))) (defun crm-complete-and-exit () "If all of the minibuffer elements are valid completions then exit. All elements in the minibuffer must match. If there is a mismatch, move point to the location of mismatch and do not exit. This function is modeled after `minibuffer-complete-and-exit'." (interactive) (let ((doexit t)) (goto-char (minibuffer-prompt-end)) (while (and doexit (let ((ol (crm--select-current-element))) (goto-char (overlay-end ol)) (unwind-protect (catch 'exit (minibuffer-complete-and-exit) ;; This did not throw `exit', so there was a problem. (setq doexit nil)) (goto-char (overlay-end ol)) (delete-overlay ol)) (not (eobp)))) ;; Skip to the next element. (forward-char 1)) (if doexit (exit-minibuffer)))) (defun crm--choose-completion-string (choice buffer base-position &rest ignored) "Completion string chooser for `completing-read-multiple'. This is called from `choose-completion-string-functions'. It replaces the string that is currently being completed, without exiting the minibuffer." (let ((completion-no-auto-exit t) (choose-completion-string-functions nil)) (choose-completion-string choice buffer base-position) t)) ;; superemulates behavior of completing_read in src/minibuf.c ;;;###autoload (defun completing-read-multiple (prompt table &optional predicate require-match initial-input hist def inherit-input-method) "Read multiple strings in the minibuffer, with completion. By using this functionality, a user may specify multiple strings at a single prompt, optionally using completion. Multiple strings are specified by separating each of the strings with a prespecified separator character. For example, if the separator character is a comma, the strings 'alice', 'bob', and 'eve' would be specified as 'alice,bob,eve'. The default value for the separator character is the value of `crm-default-separator' (comma). The separator character may be changed by modifying the value of `crm-separator'. Contiguous strings of non-separator-characters are referred to as 'elements'. In the aforementioned example, the elements are: 'alice', 'bob', and 'eve'. Completion is available on a per-element basis. For example, if the contents of the minibuffer are 'alice,bob,eve' and point is between 'l' and 'i', pressing TAB operates on the element 'alice'. The return value of this function is a list of the read strings. See the documentation for `completing-read' for details on the arguments: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and INHERIT-INPUT-METHOD." (unwind-protect (progn (add-hook 'choose-completion-string-functions 'crm--choose-completion-string) (let* ((minibuffer-completion-table #'crm--collection-fn) (minibuffer-completion-predicate predicate) ;; see completing_read in src/minibuf.c (minibuffer-completion-confirm (unless (eq require-match t) require-match)) (crm-completion-table table) (map (if require-match crm-local-must-match-map crm-local-completion-map)) ;; If the user enters empty input, read-from-minibuffer returns ;; the empty string, not DEF. (input (read-from-minibuffer prompt initial-input map nil hist def inherit-input-method))) (and def (string-equal input "") (setq input def)) (split-string input crm-separator))) (remove-hook 'choose-completion-string-functions 'crm--choose-completion-string))) (define-obsolete-function-alias 'crm-minibuffer-complete 'crm-complete "23.1") (define-obsolete-function-alias 'crm-minibuffer-completion-help 'crm-completion-help "23.1") (define-obsolete-function-alias 'crm-minibuffer-complete-and-exit 'crm-complete-and-exit "23.1") ;; testing and debugging ;; (defun crm-init-test-environ () ;; "Set up some variables for testing." ;; (interactive) ;; (setq my-prompt "Prompt: ") ;; (setq my-table ;; '(("hi") ("there") ("man") ("may") ("mouth") ("ma") ;; ("a") ("ab") ("abc") ("abd") ("abf") ("zab") ("acb") ;; ("da") ("dab") ("dabc") ("dabd") ("dabf") ("dzab") ("dacb") ;; ("fda") ("fdab") ("fdabc") ("fdabd") ("fdabf") ("fdzab") ("fdacb") ;; ("gda") ("gdab") ("gdabc") ("gdabd") ("gdabf") ("gdzab") ("gdacb") ;; )) ;; (setq my-separator ",")) ;(completing-read-multiple my-prompt my-table) ;(completing-read-multiple my-prompt my-table nil t) ;(completing-read-multiple my-prompt my-table nil "match") ;(completing-read my-prompt my-table nil t) ;(completing-read my-prompt my-table nil "match") (provide 'crm) ;; arch-tag: db1911d9-86c6-4a42-b32a-4910701b15a6 ;;; crm.el ends here