Mercurial > hg > xemacs-beta
annotate tests/gtk/statusbar-test.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Feb 2010 20:51:18 -0600 |
| parents | db7068430402 |
| children | ba07c880114a |
| rev | line source |
|---|---|
|
4709
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
1 ;; This file is part of XEmacs. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
2 ;; |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
3 ;; XEmacs is free software; you can redistribute it and/or modify it |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
4 ;; under the terms of the GNU General Public License as published by the |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
5 ;; Free Software Foundation; either version 2, or (at your option) any |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
6 ;; later version. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
7 ;; |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
8 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
9 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
10 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
11 ;; for more details. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
12 ;; |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
13 ;; You should have received a copy of the GNU General Public License |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
14 ;; along with XEmacs; see the file COPYING. If not, write to |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
15 ;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
16 ;; Boston, MA 02111-1301, USA. */ |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
17 |
| 462 | 18 (defvar statusbar-hashtable (make-hashtable 29)) |
| 19 (defvar statusbar-gnome-p nil) | |
| 20 | |
| 21 (defmacro get-frame-statusbar (frame) | |
| 22 `(gethash (or ,frame (selected-frame)) statusbar-hashtable)) | |
| 23 | |
| 24 (defun add-frame-statusbar (frame) | |
| 25 "Stick a GTK (or GNOME) statusbar at the bottom of the frame." | |
| 26 (if (windowp (frame-property frame 'minibuffer)) | |
| 27 (puthash frame (get-frame-statusbar (window-frame (frame-property frame 'minibuffer))) | |
| 28 statusbar-hashtable) | |
| 29 (let ((sbar nil) | |
| 30 (shell (frame-property frame 'shell-widget))) | |
| 31 (if (string-match "Gnome" (gtk-type-name (gtk-object-type shell))) | |
| 32 (progn | |
| 33 (require 'gnome-widgets) | |
| 34 (setq sbar (gnome-appbar-new t t 0) | |
| 35 statusbar-gnome-p t) | |
| 36 (gtk-progress-set-format-string sbar "%p%%") | |
| 37 (gnome-app-set-statusbar shell sbar)) | |
| 38 (setq sbar (gtk-statusbar-new)) | |
| 39 (gtk-box-pack-end (frame-property frame 'container-widget) | |
| 40 sbar nil nil 0)) | |
| 41 (puthash frame sbar statusbar-hashtable)))) | |
| 42 | |
| 43 (add-hook 'create-frame-hook 'add-frame-statusbar) | |
| 44 (add-hook 'delete-frame-hook (lambda (f) | |
| 45 (remhash f statusbar-hashtable))) | |
| 46 | |
| 47 | |
| 48 (defun clear-message (&optional label frame stdout-p no-restore) | |
| 49 (let ((sbar (get-frame-statusbar frame))) | |
| 50 (if sbar | |
| 51 (if statusbar-gnome-p | |
| 52 (gnome-appbar-pop sbar) | |
| 53 (gtk-statusbar-pop sbar 1))))) | |
| 54 | |
| 55 (defun append-message (label message &optional frame stdout-p) | |
| 56 (let ((sbar (get-frame-statusbar frame))) | |
| 57 (if sbar | |
| 58 (if statusbar-gnome-p | |
| 59 (gnome-appbar-push sbar message) | |
| 60 (gtk-statusbar-push sbar 1 message))))) | |
| 61 | |
| 62 (defun progress-display (fmt &optional value &rest args) | |
| 63 "Print a progress gauge and message in the bottom gutter area of the frame. | |
| 64 The arguments are the same as to `format'. | |
| 65 | |
| 66 If the only argument is nil, clear any existing progress gauge." | |
| 67 (let ((sbar (get-frame-statusbar nil))) | |
| 68 (apply 'message fmt args) | |
| 69 (if statusbar-gnome-p | |
| 70 (progn | |
| 71 (gtk-progress-set-show-text (gnome-appbar-get-progress sbar) t) | |
| 72 (gnome-appbar-set-progress sbar (/ value 100.0)) | |
| 73 (gdk-flush))))) | |
| 74 | |
| 75 (defun lprogress-display (label fmt &optional value &rest args) | |
| 76 "Print a progress gauge and message in the bottom gutter area of the frame. | |
| 77 First argument LABEL is an identifier for this progress gauge. The rest of the | |
| 78 arguments are the same as to `format'." | |
| 79 (if (and (null fmt) (null args)) | |
| 80 (prog1 nil | |
| 81 (clear-progress-display label nil)) | |
| 82 (let ((str (apply 'format fmt args))) | |
| 83 (progress-display str value) | |
| 84 str))) | |
| 85 | |
| 86 (defun clear-progress-display (&rest ignored) | |
| 87 (if statusbar-gnome-p | |
| 88 (let* ((sbar (get-frame-statusbar nil)) | |
| 89 (progress (gnome-appbar-get-progress sbar))) | |
| 90 (gnome-appbar-set-progress sbar 0) | |
| 91 (gtk-progress-set-show-text progress nil)))) |