Mercurial > hg > xemacs-beta
view lisp/x-select.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | 5e906dd5c3e9 |
children | 308d34e9f07d |
line wrap: on
line source
;;; x-select.el --- Lisp interface to X Selections. ;; Copyright (C) 1990, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, 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, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.30 (select.el). ;;; Commentary: ;; This file is dumped with XEmacs (when X support is compiled in). ;; The selection code requires us to use certain symbols whose names are ;; all upper-case; this may seem tasteless, but it makes there be a 1:1 ;; correspondence between these symbols and X Atoms (which are upcased). ;;; Code: (globally-declare-fboundp '(x-get-cutbuffer-internal x-rotate-cutbuffers-internal x-store-cutbuffer-internal)) (define-obsolete-function-alias 'x-selection-exists-p 'selection-exists-p) (define-obsolete-function-alias 'x-selection-owner-p 'selection-owner-p) (define-obsolete-variable-alias 'x-selection-converter-alist 'selection-converter-alist) (define-obsolete-variable-alias 'x-lost-selection-hooks 'lost-selection-hooks) (define-obsolete-variable-alias 'x-selected-text-type 'selection-preferred-types) (define-obsolete-function-alias 'x-valid-simple-selection-p 'valid-simple-selection-p) (define-obsolete-function-alias 'x-own-selection 'own-selection) (define-obsolete-function-alias 'x-disown-selection 'disown-selection) (define-obsolete-function-alias 'x-delete-primary-selection 'delete-primary-selection) (define-obsolete-function-alias 'x-copy-primary-selection 'copy-primary-selection) (define-obsolete-function-alias 'x-kill-primary-selection 'kill-primary-selection) (define-obsolete-function-alias 'x-select-make-extent-for-selection 'select-make-extent-for-selection) (define-obsolete-function-alias 'x-cut-copy-clear-internal 'cut-copy-clear-internal) (define-obsolete-function-alias 'x-get-selection 'get-selection) (define-obsolete-function-alias 'x-get-clipboard 'get-clipboard) (define-obsolete-function-alias 'x-yank-clipboard-selection 'yank-clipboard-selection) (define-obsolete-function-alias 'x-disown-selection-internal 'disown-selection-internal) (defun x-get-secondary-selection () "Return text selected from some X window." (get-selection 'SECONDARY)) (defun x-own-secondary-selection (selection &optional type) "Make a secondary X Selection of the given argument. The argument may be a string or a cons of two markers (in which case the selection is considered to be the text between those markers)." (interactive (if (not current-prefix-arg) (list (read-string "Store text for pasting: ")) (list (cons ;; these need not be ordered. (copy-marker (point-marker)) (copy-marker (mark-marker)))))) (own-selection selection 'SECONDARY)) (defun x-notice-selection-requests (selection type successful) "for possible use as the value of `x-sent-selection-hooks'." (if (not successful) (message "Selection request failed to convert %s to %s" selection type) (message "Sent selection %s as %s" selection type))) (defun x-notice-selection-failures (selection type successful) "for possible use as the value of `x-sent-selection-hooks'." (or successful (message "Selection request failed to convert %s to %s" selection type))) ;(setq x-sent-selection-hooks 'x-notice-selection-requests) ;(setq x-sent-selection-hooks 'x-notice-selection-failures) ;;; Cut Buffer support ;;; FSF name x-get-cut-buffer (defun x-get-cutbuffer (&optional which-one) "Return the value of one of the 8 X server cut buffers. Optional arg WHICH-ONE should be a number from 0 to 7, defaulting to 0. Cut buffers are considered obsolete; you should use selections instead. This function does nothing if cut buffer support was not compiled in." (when (fboundp 'x-get-cutbuffer-internal) (x-get-cutbuffer-internal (aref [CUT_BUFFER0 CUT_BUFFER1 CUT_BUFFER2 CUT_BUFFER3 CUT_BUFFER4 CUT_BUFFER5 CUT_BUFFER6 CUT_BUFFER7] (or which-one 0))))) ;;; FSF name x-set-cut-buffer (defun x-store-cutbuffer (string &optional push) "Store STRING into the X server's primary cut buffer. If optional arg PUSH is non-nil, also rotate the cut buffers: this means the previous value of the primary cut buffer moves to the second cut buffer, and the second to the third, and so on (there are 8 buffers.) Cut buffers are considered obsolete; you should use selections instead. This function does nothing if cut buffer support was not compiled in." (when (fboundp 'x-store-cutbuffer-internal) (when push (x-rotate-cutbuffers-internal 1)) (x-store-cutbuffer-internal 'CUT_BUFFER0 string))) ;FSFmacs (provide 'select) ;;; x-select.el ends here.