Mercurial > emacs
view test/redisplay-testsuite.el @ 109748:e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
* callproc.c (synch_process_death): Make const.
(Fcall_process): Make signame const.
* emacs.c (main): Pass char[] to putenv instead of literal.
* floatfns.c (matherr): Use a const char* variable for x->name.
* font.c (font_open_by_name): Make name const.
* font.h (font_open_by_name): Make name const.
* gtkutil.c (get_utf8_string): Always return an allocated string.
Parameter is const.
(create_dialog, xg_create_one_menuitem, create_menus)
(xg_item_label_same_p, xg_update_menu_item): Free result from
get_utf8_string.
(xg_separator_p, xg_item_label_same_p): label is const.
* gtkutil.h: Replace widget_value with struct _widget_value.
(enum button_type, struct _widget_value): Remove and use the one from
keyboard.h.
* keyboard.h (_widget_value): Add defined USE_GTK. Replace Boolean
with unsigned char and XtPointer with void *.
* menu.c (Fx_popup_menu): error_name is const.
* menu.h (w32_menu_show, ns_menu_show, xmenu_show): error parameter
is const char **.
* w32menu.c (w32_menu_show):
* nsmenu.m (ns_menu_show): error parameter is const char **.
* process.h (synch_process_death): Is const char*.
* xmenu.c (Fx_popup_dialog): error_name is const char*.
(xmenu_show): error parameter is const char **. pane_string is const
char *.
(button_names): Is const char *.
(xdialog_show): error_name and pane_string is const.
* xrdb.c (get_system_app): Make path const and use char *p for non-const
char.
* xselect.c (Fx_get_atom_name): Use char empty[] instead of literal "".
* xsmfns.c (NOSPLASH_OPT): Change to char[].
(smc_save_yourself_CB): Do xstrdup on all ->type and ->name for
props. Free them at the end.
* xterm.c (emacs_class): New char[] for EMACS_CLASS.
(xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class.
(x_term_init): Use char[] display_opt and name_opt instead of
string literal. file is const char*.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Wed, 11 Aug 2010 14:34:46 +0200 |
parents | b262a4f49bf3 |
children | 417b1e4d63cd |
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\n")) (defun test-redisplay-3 () (insert "Test 3: Overlay with before/after strings and images:\n\n") (let ((img-data "#define x_width 8 #define x_height 8 static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff };")) ;; Control (insert " Expected: AB" (propertize "X" 'display `(image :data ,img-data :type xbm)) "CD\n") ;; Overlay with before, after, and image display string. (insert " Result 1: ") (let ((opoint (point))) (insert "AXD\n") (let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))) (overlay-put ov 'before-string "B") (overlay-put ov 'after-string "C") (overlay-put ov 'display `(image :data ,img-data :type xbm)))) ;; Overlay with before and after string, and image text prop. (insert " Result 2: ") (let ((opoint (point))) (insert "AXD\n") (let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))) (overlay-put ov 'before-string "B") (overlay-put ov 'after-string "C") (put-text-property (1+ opoint) (+ 2 opoint) 'display `(image :data ,img-data :type xbm)))) ;; Overlays with adjacent before and after strings, and image text ;; prop. (insert " Result 3: ") (let ((opoint (point))) (insert "AXD\n") (let ((ov1 (make-overlay opoint (1+ opoint))) (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint)))) (overlay-put ov1 'after-string "B") (overlay-put ov2 'before-string "C") (put-text-property (1+ opoint) (+ 2 opoint) 'display `(image :data ,img-data :type xbm)))) ;; Three overlays. (insert " Result 4: ") (let ((opoint (point))) (insert "AXD\n\n") (let ((ov1 (make-overlay opoint (1+ opoint))) (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint))) (ov3 (make-overlay (1+ opoint) (+ 2 opoint)))) (overlay-put ov1 'after-string "B") (overlay-put ov2 'before-string "C") (overlay-put ov3 'display `(image :data ,img-data :type xbm)))))) (defun test-redisplay () (interactive) (let ((buf (get-buffer "*Redisplay Test*"))) (if buf (kill-buffer buf)) (pop-to-buffer (get-buffer-create "*Redisplay Test*")) (erase-buffer) (test-redisplay-1) (test-redisplay-2) (test-redisplay-3) (goto-char (point-min)))) ;; arch-tag: fcee53c8-024f-403d-9154-61ae3ce0bfb8