Mercurial > hg > xemacs-beta
annotate lisp/symbol-syntax.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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; symbol-syntax.el --- find chars with symbol syntax |
| 2 | |
| 3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 | |
| 6 ;; Author: JBW, JBW@_CORTEZ | |
| 7 ;; Created: Wed Jun 20 15:15:34 1990 | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: matching | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not in FSF. | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; Last modified by: Ben Wing, ben@xemacs.org | |
| 33 ;; Last modified on: Mon Oct 2 02:32:05 GMT 1995 | |
| 34 | |
| 35 ;;; Code: | |
| 36 | |
| 37 (defvar symbol-syntax-table-alist nil) | |
| 38 ;; '((c-mode-syntax-table) | |
| 39 ;; (emacs-lisp-mode-syntax-table) | |
| 40 ;; (lisp-mode-syntax-table) | |
| 41 ;; (text-mode-syntax-table))) | |
| 42 | |
| 43 (defun update-symbol-syntax-table-alist () | |
| 44 (let ((alist symbol-syntax-table-alist) | |
| 45 item) | |
| 46 (while (consp alist) | |
| 47 (cond ((null (car alist)) | |
| 48 (error "Missing alist item")) | |
| 49 ((null (car (car alist))) | |
| 50 (error "Alist item with null car")) | |
| 51 ;; this functionality not used | |
| 52 ((symbolp (setq item (car (car alist)))) | |
| 53 (or (null (cdr (car alist))) | |
| 54 (error "Alist item expected to have null cdr")) | |
| 55 (while (symbolp item) | |
| 56 (setq item (symbol-value item))) | |
| 57 (setcar (car alist) item))) | |
| 58 (cond ((not (syntax-table-p (car (car alist)))) | |
| 59 (error "Alist item car expected to be symbol table")) | |
| 60 ((null (cdr (car alist))) | |
| 61 (setcdr (car alist) | |
| 62 (make-symbol-syntax-table (car (car alist)))))) | |
| 63 (setq alist (cdr alist))))) | |
| 64 | |
| 65 (defun get-symbol-syntax-table (norm-table) | |
| 66 (let (result) | |
| 67 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 68 nil | |
| 69 (update-symbol-syntax-table-alist) | |
| 70 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 71 nil | |
| 72 (setq symbol-syntax-table-alist | |
| 73 (cons (list norm-table) | |
| 74 symbol-syntax-table-alist)) | |
| 75 (update-symbol-syntax-table-alist) | |
| 76 (or (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 77 (error "Syntax table missing from symbol-syntax-table-alist")))) | |
| 78 (or (setq result (cdr result)) | |
| 79 (error "Alist item has null cdr")) | |
| 80 (or (syntax-table-p result) | |
| 81 (error "Non-syntax-table item in alist")) | |
| 82 result)) | |
| 83 | |
| 84 (defun make-symbol-syntax-table (in-table) | |
| 85 (let ((out-table (copy-syntax-table in-table))) | |
| 86 (map-syntax-table | |
| 87 #'(lambda (key value) | |
| 88 (if (eq ?_ (char-syntax-from-code value)) | |
| 89 (put-char-table key (set-char-syntax-in-code value ?w) | |
| 90 out-table)) | |
| 91 nil) | |
| 92 out-table) | |
| 93 out-table)) | |
| 94 | |
| 95 ;; stuff for examining contents of syntax tables | |
| 96 ;;(show-chars-with-syntax | |
| 97 ;; '(c-mode-syntax-table | |
| 98 ;; emacs-lisp-mode-syntax-table | |
| 99 ;; lisp-mode-syntax-table | |
| 100 ;; text-mode-syntax-table) | |
| 101 ;; ?_) | |
| 102 | |
| 103 (defun show-chars-with-syntax (tables syntax) | |
| 104 (let ((schars nil)) | |
| 105 (unwind-protect | |
| 106 (while (consp tables) | |
| 107 (let* ((chars nil) | |
| 108 (table-symbol (car tables)) | |
| 109 (table table-symbol)) | |
| 110 (or (symbolp table-symbol) | |
| 111 (error "bad argument non-symbol")) | |
| 112 (while (symbolp table) | |
| 113 (setq table (symbol-value table))) | |
| 114 (map-syntax-table | |
| 115 #'(lambda (key value) | |
| 116 (if (eq syntax (char-syntax-from-code value)) | |
| 117 (setq chars (cons key chars))) | |
| 118 nil) | |
| 119 table) | |
| 120 (setq schars (cons (list table-symbol (nreverse chars)) | |
| 121 schars))) | |
| 122 (setq tables (cdr tables)))) | |
| 123 (nreverse schars))) | |
| 124 | |
| 125 (provide 'symbol-syntax) | |
| 126 | |
| 127 ;;; symbol-syntax.el ends here |