annotate src/menu.h @ 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 1d1d5d9bd884
children e16f43875a48 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
1 /* Functions to manipulate menus.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105923
diff changeset
2 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
3
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
4 This file is part of GNU Emacs.
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
5
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
6 GNU Emacs is free software: you can redistribute it and/or modify
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
8 the Free Software Foundation, either version 3 of the License, or
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
9 (at your option) any later version.
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
10
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
14 GNU General Public License for more details.
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
15
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
17 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
18
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
19 #ifndef MENU_H
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
20 #define MENU_H
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
21
105923
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
22 extern Lisp_Object Vmenu_updating_frame;
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
23
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
24 extern void init_menu_items P_ ((void));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
25 extern void finish_menu_items P_ ((void));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
26 extern void discard_menu_items P_ ((void));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
27 extern void save_menu_items P_ ((void));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
28 extern int parse_single_submenu P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
29 extern void list_of_panes P_ ((Lisp_Object));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
30 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
31 extern void free_menubar_widget_value_tree P_ ((widget_value *));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
32 extern void update_submenu_strings P_ ((widget_value *));
96759
1e2f7aab70ba * Makefile.in: Undef LIB_STANDARD before defining it to silence warning
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96621
diff changeset
33 extern void find_and_call_menu_selection P_ ((FRAME_PTR, int,
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
34 Lisp_Object, void *));
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
35 #endif
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
36
105923
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
37 #ifdef HAVE_X_WINDOWS
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
38 extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y);
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
39 #endif
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
40
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
41 extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int,
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
42 Lisp_Object, char **);
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
43 extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int,
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
44 Lisp_Object, char **);
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
45 extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
46 Lisp_Object, char **, EMACS_UINT);
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
47 #endif /* MENU_H */
96621
bf6f87d07e3b Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96608
diff changeset
48
bf6f87d07e3b Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96608
diff changeset
49 /* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
bf6f87d07e3b Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96608
diff changeset
50 (do not change this comment) */