annotate oldXMenu/AddPane.c @ 107648:babfb0a156a1

Initial support for bidirectional editing. Makefile.in (obj): Include bidi.o. (bidi.o): New target. makefile.w32-in (OBJ1): Add $(BLD)/bidi.$(O). ($(BLD)/bidi.$(O)): New target. bidi.c: New file. buffer.h (struct buffer): New members bidi_display_reordering and bidi_paragraph_direction. buffer.c (init_buffer_once): Initialize bidi_display_reordering and bidi_paragraph_direction. (syms_of_buffer): Declare Lisp variables bidi-display-reordering and bidi-paragraph-direction. (Fbuffer_swap_text): Swap the values of bidi_display_reordering and bidi_paragraph_direction. dispextern.h (BIDI_MAXLEVEL, BIDI_AT_BASE_LEVEL): New macros. (bidi_type_t, bidi_dir_t): New types. (bidi_saved_info, bidi_stack, bidi_it): New structures. (struct it): New members bidi_p, bidi_it, paragraph_embedding, prev_stop, base_level_stop, and eol_pos. (bidi_init_it, bidi_get_next_char_visually): New prototypes. (IT_STACK_SIZE): Enlarge to 5. (struct glyph_row): New member reversed_p. <string_buffer_position>: Update prototype. (PRODUCE_GLYPHS): Set the reversed_p flag in the iterator's glyph_row if bidi_it.paragraph_dir == R2L. (struct glyph): New members resolved_level and bidi_type. dispnew.c (direct_output_forward_char): Give up if we need bidi processing or buffer's direction is right-to-left. (prepare_desired_row): Preserve the reversed_p flag. (row_equal_p): Compare the reversed_p attributes as well. xdisp.c (init_iterator): Initialize it->bidi_p. Call bidi_init_it and set it->paragraph_embedding from the current buffer's value of bidi_paragraph_direction. (reseat_1): Initialize bidi_it.first_elt. (set_iterator_to_next, next_element_from_buffer): Use the value of paragraph_embedding to determine the paragraph direction. (set_iterator_to_next): Under bidi reordering, call bidi_get_next_char_visually. Call bidi_paragraph_init if the new_paragraph flag is set in the bidi iterator. (next_element_from_buffer): If bidi_it.first_elt is set, initialize paragraph direction and find the first character to display in the visual order. If reseated to a middle of a line, prime the bidi iterator starting at the line's beginning. Handle the situation where we overstepped stop_charpos due to non-linearity of the bidi iteration. Likewise for when we back up beyond the previous stop_charpos. When moving across stop_charpos, record it in prev_stop. (display_line): Set row->end and it->start for the next row to the next character in logical order. Always extend reversed_p rows to the end of line, even if they end at ZV. Copy the reversed_p flag to the next glyph row. Keep calling set_cursor_from_row for bidi-reordered rows even if we already have a possible candidate for cursor position. Set row_end after all the row's glyphs have been produced, by looping over the glyphs. Record the position after EOL in it->eol_pos, and use it to set end_pos of the last row produced for a continued line. <Qright_to_left, Qleft_to_right>: New variables. (syms_of_xdisp): Initialize and staticpro them. (string_buffer_position_lim): New function. (string_buffer_position): Most of code moved to string_buffer_position_lim. Last argument and return value are now EMACS_INT; all callers changed. (set_cursor_from_row): Rewritten to support bidirectional text and reversed glyph rows. (text_outside_line_unchanged_p, try_window_id): Disable optimizations if we are reordering bidirectional text and the paragraph direction can be affected by the change. (append_glyph, append_composite_glyph) (produce_image_glyph, append_stretch_glyph): Set the resolved_level and bidi_type members of each glyph. (append_glyph): If the glyph row is reversed, prepend the glyph rather than appending it. (handle_stop_backwards): New function. (reseat_1, pop_it, push_it): Set prev_stop and base_level_stop. (reseat): call handle_stop_backwards to recompute prev_stop and base_level_stop for the new position. (handle_invisible_prop): Under bidi iteration, skip invisible text using bidi_get_next_char_visually. If we are `reseat'ed, init the paragraph direction. Update IT->prev_stop after skipping invisible text. (move_it_in_display_line_to): New variables prev_method and prev_pos. Compare for strict equality in BUFFER_POS_REACHED_P. (try_cursor_movement): Examine all the candidate rows that occlude point, to return the best match. If rows are bidi-reordered and point moved backwards, back up to the row that is not a continuation line, and start looking for a suitable row from there. term.c (append_glyph): Reverse glyphs by pre-pending them, rather than appending, if the glyph_row's reversed_p flag is set. Set the resolved_level and bidi_type members of each glyph. .gdbinit (pbiditype): New command. (pgx): Use it to display bidi level and type of the glyph. (pitx): Display some bidi information about the iterator. (prowlims, pmtxrows): New commands. files.el: Make bidi-display-reordering safe variable for boolean values. mule.texi (International): Mention support of bidirectional editing. (Bidirectional Editing): New section. HELLO: Reorder Arabic and Hebrew into logical order, and insert RLM before the opening paren, to make the display more reasonable. Add setting for bidi-display-reordering in the local variables section. NEWS: Mention initial support for bidirectional editing.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 30 Mar 2010 05:13:07 -0400
parents fec5e03aaf59
children edf631bdbb7a ec58e5c426ef 5cc91198ffb2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
76174
fec5e03aaf59 Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
1 /* Copyright Massachusetts Institute of Technology 1985 */
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
2
76174
fec5e03aaf59 Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
3 #include "copyright.h"
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
4
Dave Love <fx@gnu.org>
parents:
diff changeset
5 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
6 * XMenu: MIT Project Athena, X Window system menu package
Dave Love <fx@gnu.org>
parents:
diff changeset
7 *
Dave Love <fx@gnu.org>
parents:
diff changeset
8 * XMenuAddPane - Adds a pane to an XMenu object.
Dave Love <fx@gnu.org>
parents:
diff changeset
9 *
Dave Love <fx@gnu.org>
parents:
diff changeset
10 * Author: Tony Della Fera, DEC
Dave Love <fx@gnu.org>
parents:
diff changeset
11 * August, 1985
Dave Love <fx@gnu.org>
parents:
diff changeset
12 *
Dave Love <fx@gnu.org>
parents:
diff changeset
13 */
Dave Love <fx@gnu.org>
parents:
diff changeset
14
Dave Love <fx@gnu.org>
parents:
diff changeset
15 #include <config.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
16 #include "XMenuInt.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
17
Dave Love <fx@gnu.org>
parents:
diff changeset
18 int
Dave Love <fx@gnu.org>
parents:
diff changeset
19 XMenuAddPane(display, menu, label, active)
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
20 Display *display;
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
21 register XMenu *menu; /* Menu object to be modified. */
Dave Love <fx@gnu.org>
parents:
diff changeset
22 register char *label; /* Selection label. */
Dave Love <fx@gnu.org>
parents:
diff changeset
23 int active; /* Make selection active? */
Dave Love <fx@gnu.org>
parents:
diff changeset
24 {
Dave Love <fx@gnu.org>
parents:
diff changeset
25 register XMPane *pane; /* Newly created pane. */
Dave Love <fx@gnu.org>
parents:
diff changeset
26 register XMSelect *select; /* Initial selection for the new pane. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
27
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
28 int label_length; /* Label length in characters. */
Dave Love <fx@gnu.org>
parents:
diff changeset
29 int label_width; /* Label width in pixels. */
Dave Love <fx@gnu.org>
parents:
diff changeset
30
Dave Love <fx@gnu.org>
parents:
diff changeset
31 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
32 * Check for NULL pointers!
Dave Love <fx@gnu.org>
parents:
diff changeset
33 */
Dave Love <fx@gnu.org>
parents:
diff changeset
34 if (label == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
35 _XMErrorCode = XME_ARG_BOUNDS;
Dave Love <fx@gnu.org>
parents:
diff changeset
36 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
37 }
Dave Love <fx@gnu.org>
parents:
diff changeset
38
Dave Love <fx@gnu.org>
parents:
diff changeset
39 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
40 * Calloc the XMPane structure and the initial XMSelect.
Dave Love <fx@gnu.org>
parents:
diff changeset
41 */
Dave Love <fx@gnu.org>
parents:
diff changeset
42 pane = (XMPane *)calloc(1, sizeof(XMPane));
Dave Love <fx@gnu.org>
parents:
diff changeset
43 if (pane == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
44 _XMErrorCode = XME_CALLOC;
Dave Love <fx@gnu.org>
parents:
diff changeset
45 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
46 }
Dave Love <fx@gnu.org>
parents:
diff changeset
47 select = (XMSelect *)calloc(1, sizeof(XMSelect));
Dave Love <fx@gnu.org>
parents:
diff changeset
48 if (select == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
49 _XMErrorCode = XME_CALLOC;
Dave Love <fx@gnu.org>
parents:
diff changeset
50 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
51 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
52
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
53 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
54 * Determine label size.
Dave Love <fx@gnu.org>
parents:
diff changeset
55 */
Dave Love <fx@gnu.org>
parents:
diff changeset
56 label_length = strlen(label);
Dave Love <fx@gnu.org>
parents:
diff changeset
57 label_width = XTextWidth(menu->p_fnt_info,
Dave Love <fx@gnu.org>
parents:
diff changeset
58 label,
Dave Love <fx@gnu.org>
parents:
diff changeset
59 label_length);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
60
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
61 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
62 * Set up the initial selection.
Dave Love <fx@gnu.org>
parents:
diff changeset
63 * Values not explicitly set are zeroed by calloc.
Dave Love <fx@gnu.org>
parents:
diff changeset
64 */
Dave Love <fx@gnu.org>
parents:
diff changeset
65 select->next = select;
Dave Love <fx@gnu.org>
parents:
diff changeset
66 select->prev = select;
Dave Love <fx@gnu.org>
parents:
diff changeset
67 select->type = SL_HEADER;
Dave Love <fx@gnu.org>
parents:
diff changeset
68 select->serial = -1;
Dave Love <fx@gnu.org>
parents:
diff changeset
69 select->parent_p = pane;
Dave Love <fx@gnu.org>
parents:
diff changeset
70
Dave Love <fx@gnu.org>
parents:
diff changeset
71 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
72 * Fill the XMPane structure.
Dave Love <fx@gnu.org>
parents:
diff changeset
73 * X and Y position are set to 0 since a recompute will follow.
Dave Love <fx@gnu.org>
parents:
diff changeset
74 */
Dave Love <fx@gnu.org>
parents:
diff changeset
75 pane->type = PANE;
Dave Love <fx@gnu.org>
parents:
diff changeset
76 pane->active = active;
Dave Love <fx@gnu.org>
parents:
diff changeset
77 pane->serial = -1;
Dave Love <fx@gnu.org>
parents:
diff changeset
78 pane->label = label;
Dave Love <fx@gnu.org>
parents:
diff changeset
79 pane->label_width = label_width;
Dave Love <fx@gnu.org>
parents:
diff changeset
80 pane->label_length = label_length;
Dave Love <fx@gnu.org>
parents:
diff changeset
81 pane->s_list = select;
Dave Love <fx@gnu.org>
parents:
diff changeset
82
Dave Love <fx@gnu.org>
parents:
diff changeset
83 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
84 * Insert the pane at the end of the pane list.
Dave Love <fx@gnu.org>
parents:
diff changeset
85 */
Dave Love <fx@gnu.org>
parents:
diff changeset
86 emacs_insque(pane, menu->p_list->prev);
Dave Love <fx@gnu.org>
parents:
diff changeset
87
Dave Love <fx@gnu.org>
parents:
diff changeset
88 /*
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
89 * Update the pane count.
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
90 */
Dave Love <fx@gnu.org>
parents:
diff changeset
91 menu->p_count++;
Dave Love <fx@gnu.org>
parents:
diff changeset
92
Dave Love <fx@gnu.org>
parents:
diff changeset
93 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
94 * Schedule a recompute.
Dave Love <fx@gnu.org>
parents:
diff changeset
95 */
Dave Love <fx@gnu.org>
parents:
diff changeset
96 menu->recompute = 1;
Dave Love <fx@gnu.org>
parents:
diff changeset
97
Dave Love <fx@gnu.org>
parents:
diff changeset
98 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
99 * Return the pane number just added.
Dave Love <fx@gnu.org>
parents:
diff changeset
100 */
Dave Love <fx@gnu.org>
parents:
diff changeset
101 _XMErrorCode = XME_NO_ERROR;
Dave Love <fx@gnu.org>
parents:
diff changeset
102 return((menu->p_count - 1));
Dave Love <fx@gnu.org>
parents:
diff changeset
103 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
104
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
105 /* arch-tag: 62a26021-f29d-48ba-96ef-3b6c4ebd6547
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
106 (do not change this comment) */