Mercurial > emacs
view lisp/dynamic-setting.el @ 108750:3339da3cfeb3
Redesign bidi-aware edge positions of glyph rows, fix bug #6036.
dispextern.h (struct glyph_row): New members minpos and maxpos.
(MATRIX_ROW_START_CHARPOS, MATRIX_ROW_START_BYTEPOS)
(MATRIX_ROW_END_CHARPOS, MATRIX_ROW_END_BYTEPOS): Reference minpos
and maxpos members instead of start.pos and end.pos, respectively.
xdisp.c (display_line): Compare IT_CHARPOS with the position in
row->start.pos, rather than with MATRIX_ROW_START_CHARPOS.
(cursor_row_p): Use row->end.pos rather than MATRIX_ROW_END_CHARPOS.
(try_window_reusing_current_matrix, try_window_id): Use
ROW->minpos rather than ROW->start.pos.
(init_from_display_pos, init_iterator): Use EMACS_INT for
character and byte positions.
(find_row_edges): Renamed from find_row_end. Accept additional
arguments for minimum and maximum buffer positions seen by
display_line for this row. Don't use iterator to find the
position following the maximum one; instead, increment the
position found by display_line directly. Fix logic; eol_pos
should be tested before the rest. Handle the case of characters
delivered from display vector (bug#6036). Fix tests related to
it->method. Handle the truncated_on_right_p rows.
(RECORD_MAX_MIN_POS): New macro.
(display_line): Use it to record the minimum and maximum buffer
positions for glyphs in the row being assembled. Record the
position of the newline that terminates the line. If word wrap is
in effect, restore minimum and maximum positions seen up to the
wrap point, when iterator returns to it.
(try_window_reusing_current_matrix): Give up if in bidi-reordered
row and cursor not already at point. Restore original pre-bidi
code for unidirectional buffers.
dispnew.c (increment_row_positions, check_matrix_invariants):
Increment and check row->start.pos and row->end.pos, in addition
to MATRIX_ROW_START_CHARPOS and MATRIX_ROW_END_CHARPOS.
.gdbinit (prowlims): Display row->minpos and row->maxpos.
Display truncated_on_left_p and truncated_on_right_p flags.
Formatting fixes.
(pmtxrows): Display the ordinal number of each row. Don't display
rows beyond the last one.
bidi.c (bidi_cache_iterator_state): Don't zero out new_paragraph:
it is not copied by bidi_copy_it.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 22 May 2010 22:32:21 +0300 |
parents | 2ba5d029fd5e |
children | 5e867bd030c8 012ef7d8f2be |
line wrap: on
line source
;;; dynamic-setting.el --- Support dynamic changes ;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;; Author: Jan Djärv <jan.h.d@swipnet.se> ;; Maintainer: FSF ;; Keywords: font, system-font, tool-bar-style ;; 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 file provides the lisp part of the GConf and XSetting code in ;; xsetting.c. But it is nothing that prevents it from being used by ;; other configuration schemes. ;;; Code: ;;; Customizable variables (declare-function font-get-system-font "xsettings.c" ()) (defvar font-use-system-font) (defun font-setting-change-default-font (display-or-frame set-font) "Change font and/or font settings for frames on display DISPLAY-OR-FRAME. If DISPLAY-OR-FRAME is a frame, the display is the one for that frame. If SET-FONT is non-nil, change the font for frames. Otherwise re-apply the current form for the frame (i.e. hinting or somesuch changed)." (let ((new-font (and (fboundp 'font-get-system-font) (font-get-system-font)))) (when new-font ;; Be careful here: when set-face-attribute is called for the ;; :font attribute, Emacs tries to guess the best matching font ;; by examining the other face attributes (Bug#2476). (clear-font-cache) ;; Set for current frames. Only change font for those that have ;; the old font now. If they don't have the old font, the user ;; probably changed it. (dolist (f (frames-on-display-list display-or-frame)) (if (display-graphic-p f) (let* ((frame-font (or (font-get (face-attribute 'default :font f 'default) :user-spec) (frame-parameter f 'font-parameter))) (font-to-set (if set-font new-font ;; else set font again, hinting etc. may have changed. frame-font))) (if font-to-set (progn (message "setting %s" font-to-set) (set-frame-parameter f 'font-parameter font-to-set) (set-face-attribute 'default f :width 'normal :weight 'normal :slant 'normal :font font-to-set)))))) ;; Set for future frames. (set-face-attribute 'default t :font new-font) (let ((spec (list (list t (face-attr-construct 'default))))) (progn (put 'default 'customized-face spec) (custom-push-theme 'theme-face 'default 'user 'set spec) (put 'default 'face-modified nil)))))) (defun dynamic-setting-handle-config-changed-event (event) "Handle config-changed-event on the display in EVENT. Changes can be The monospace font. If `font-use-system-font' is nil, the font is not changed. Xft parameters, like DPI and hinting. The tool bar style." (interactive "e") (let ((type (nth 1 event)) (display-name (nth 2 event))) (cond ((and (eq type 'monospace-font-name) font-use-system-font) (font-setting-change-default-font display-name t)) ((eq type 'font-render) (font-setting-change-default-font display-name nil)) ((eq type 'tool-bar-style) (force-mode-line-update t))))) (define-key special-event-map [config-changed-event] 'dynamic-setting-handle-config-changed-event) ;; arch-tag: 3a57e78f-1cd6-48b6-ab75-98f160dcc017