annotate lwlib/xlwgaugeP.h @ 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 abe6d1db359e
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
1 /* Gauge Widget for XEmacs.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
2 Copyright (C) 1999 Edward A. Falk
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
3
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
4 This file is part of XEmacs.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
5
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
6 XEmacs is free software; you can redistribute it and/or modify it
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
7 under the terms of the GNU General Public License as published by the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
8 Free Software Foundation; either version 2, or (at your option) any
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
9 later version.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
10
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
14 for more details.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
15
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
17 along with XEmacs; see the file COPYING. If not, write to
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
19 Boston, MA 02111-1307, USA. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
20
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
21 /*
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
22 * GaugeP.h - Gauge widget
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
23 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
24 * Author: Edward A. Falk
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
25 * falk@falconer.vip.best.com
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
26 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
27 * Date: July 9, 1997
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
28 */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
29
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
30 #ifndef _XawGaugeP_h
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
31 #define _XawGaugeP_h
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
32
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
33 /***********************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
34 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
35 * Gauge Widget Private Data
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
36 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
37 * Gauge has little in common with the label widget, but can make use
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
38 * of some label resources, so is subclassed from label.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
39 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
40 ***********************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
41
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
42 #include "xlwgauge.h"
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 434
diff changeset
43 #include ATHENA_LabelP_h_
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
44
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
45 /* New fields for the Gauge widget class record */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
46
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
47 typedef struct {XtPointer extension;} GaugeClassPart;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
48
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
49 /* Full class record declaration */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
50 typedef struct _GaugeClassRec {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
51 CoreClassPart core_class;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
52 SimpleClassPart simple_class;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
53 #ifdef _ThreeDP_h
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
54 ThreeDClassPart threeD_class;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
55 #endif
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
56 LabelClassPart label_class;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
57 GaugeClassPart gauge_class;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
58 } GaugeClassRec;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
59
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
60 extern GaugeClassRec gaugeClassRec;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
61
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
62 /* New fields for the Gauge widget record */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
63 typedef struct {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
64 /* resources */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
65 int value, v0,v1 ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
66 int ntics, nlabels ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
67 String *labels ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
68 XtOrientation orientation ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
69 Boolean autoScaleUp ; /* scales automatically */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
70 Boolean autoScaleDown ; /* scales automatically */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
71 int update ; /* update interval */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
72 XtCallbackList getValue ; /* proc to call to fetch a point */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
73
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
74 /* private state */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
75 Dimension gmargin ; /* edges <-> gauge */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
76 Dimension tmargin ; /* top (left) edge <-> tic marks */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
77 Dimension lmargin ; /* tic marks <-> labels */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
78 Dimension margin0 ; /* left/bottom margin */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
79 Dimension margin1 ; /* right/top margin */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
80 XtIntervalId intervalId ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
81 Atom selected ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
82 String selstr ; /* selection string, if any */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
83 GC inverse_GC ;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
84 } GaugePart;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
85
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
86
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
87 /****************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
88 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
89 * Full instance record declaration
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
90 *
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
91 ****************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
92
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
93 typedef struct _GaugeRec {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
94 CorePart core;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
95 SimplePart simple;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
96 #ifdef _ThreeDP_h
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
97 ThreeDPart threeD;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
98 #endif
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
99 LabelPart label;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
100 GaugePart gauge;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
101 } GaugeRec;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
102
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents:
diff changeset
103 #endif /* _XawGaugeP_h */