Mercurial > emacs
view test/redisplay-testsuite.el @ 108656:0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
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.
(display_line): Record minimum and maximum buffer positions for
glyphs in this row. Record the position of the newline that
terminates the line.
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.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 18 May 2010 18:22:15 +0300 |
parents | 1d1d5d9bd884 |
children | b262a4f49bf3 376148b31b5e |
line wrap: on
line source
;;; redisplay-testsuite.el --- Test suite for redisplay. ;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: internal ;; Human-Keywords: internal ;; 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: ;; Type M-x test-redisplay RET to generate the test buffer. ;;; Code: (defun test-insert-overlay (text &rest props) (let ((opoint (point)) overlay) (insert text) (setq overlay (make-overlay opoint (point))) (while props (overlay-put overlay (car props) (cadr props)) (setq props (cddr props))))) (defun test-redisplay-1 () (insert "Test 1: Displaying adjacent and overlapping overlays:\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "n" 'before-string "g" 'after-string "u ") (test-insert-overlay "ma" 'before-string "e" 'after-string "cs") (insert "\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "u" 'before-string "gn") (test-insert-overlay "ma" 'before-string " e" 'after-string "cs") (insert "\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "XXX" 'display "u " 'before-string "gn" 'after-string "em") (test-insert-overlay "a" 'after-string "cs") (insert "\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "u " 'before-string "gn" 'after-string "em") (test-insert-overlay "XXX" 'display "a" 'after-string "cs") (insert "\n\n")) (defun test-redisplay-2 () (insert "Test 2: Mouse highlighting. Move your mouse over the letters XXX:\n\n") (insert " Expected: " (propertize "xxxXXXxxx" 'face 'highlight) "...---...\n Test: ") (test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx" 'mouse-face 'highlight ) (test-insert-overlay "---" 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "xxxXXX" 'face 'highlight) "...---...\n Test: ") (test-insert-overlay "XXX" 'before-string "xxx" 'mouse-face 'highlight) (test-insert-overlay "---" 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "XXX" 'face 'highlight) "...---...\n Test: ") (test-insert-overlay "..." 'display "XXX" 'mouse-face 'highlight) (test-insert-overlay "---" 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "XXXxxx" 'face 'highlight) "...\n Test: ") (test-insert-overlay "..." 'display "XXX" 'after-string "xxx" 'mouse-face 'highlight) (test-insert-overlay "error" 'display "...") (insert "\n\n Expected: " "---..." (propertize "xxxXXX" 'face 'highlight) "\n Test: ") (test-insert-overlay "xxx" 'display "---" 'after-string "...") (test-insert-overlay "error" 'before-string "xxx" 'display "XXX" 'mouse-face 'highlight) (insert "\n\n Expected: " "...---..." (propertize "xxxXXXxxx" 'face 'highlight) "\n Test: ") (test-insert-overlay "---" 'before-string "..." 'after-string "...") (test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx" 'mouse-face 'highlight) (insert "\n\n Expected: " "..." (propertize "XXX" 'face 'highlight) "...\n Test: ") (test-insert-overlay "---" 'display (propertize "XXX" 'mouse-face 'highlight) 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "XXX\n" 'face 'highlight) "\n Test: ") (test-insert-overlay "XXX\n" 'mouse-face 'highlight) (insert "\n")) (defun test-redisplay () (interactive) (pop-to-buffer (generate-new-buffer "*Redisplay Test*")) (test-redisplay-1) (test-redisplay-2) (goto-char (point-min))) ;; arch-tag: fcee53c8-024f-403d-9154-61ae3ce0bfb8