Mercurial > emacs
annotate src/msdos.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 |
rev | line source |
---|---|
5503 | 1 /* MS-DOS specific C utilities, interface. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1993, 2001, 2002, 2003, 2004, |
106815 | 3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5503 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
5503 | 8 it under the terms of the GNU General Public License as published by |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
10 (at your option) any later version. |
5503 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
5503 | 19 |
29611
f39e60352427
(EMACS_MSDOS_H): Renamed from MSDOS_H_.
Eli Zaretskii <eliz@gnu.org>
parents:
29557
diff
changeset
|
20 #ifndef EMACS_MSDOS_H |
f39e60352427
(EMACS_MSDOS_H): Renamed from MSDOS_H_.
Eli Zaretskii <eliz@gnu.org>
parents:
29557
diff
changeset
|
21 #define EMACS_MSDOS_H |
9572 | 22 |
5503 | 23 #include <dpmi.h> |
24 | |
97661
e4a283c4bc1c
Remove definition of struct x_display_info and struct x_output.
Eli Zaretskii <eliz@gnu.org>
parents:
94994
diff
changeset
|
25 int dos_ttraw (struct tty_display_info *); |
5503 | 26 int dos_ttcooked (); |
13178 | 27 int dos_get_saved_screen (char **, int *, int *); |
28 int dos_set_keyboard (int, int); | |
14285
6081221167de
(dos_set_window_size): Prototype for a new function.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
29 void dos_set_window_size (int *, int *); |
13178 | 30 |
5503 | 31 int getdefdir (int, char*); |
32 void unixtodos_filename (char *); | |
33 void dostounix_filename (char *); | |
7822
17b96e349369
Add template for rootrelativepath.
Richard M. Stallman <rms@gnu.org>
parents:
7604
diff
changeset
|
34 char *rootrelativepath (char *); |
5503 | 35 void init_environment (); |
36 void internal_terminal_init (); | |
37 void ctrl_break_func (_go32_dpmi_registers *); | |
38 void install_ctrl_break_check (); | |
39 | |
40 extern int have_mouse; | |
41 void mouse_init (); | |
42 void mouse_on (); | |
43 void mouse_off (); | |
44 void mouse_moveto (int, int); | |
9572 | 45 |
46 #ifndef HAVE_X_WINDOWS | |
47 /* Dummy types. */ | |
48 typedef int XFontStruct; | |
49 typedef int GC; | |
50 typedef int Pixmap; | |
51 typedef int Display; | |
52 typedef int Window; | |
21784
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
53 typedef int XRectangle; |
74497
07c34c917584
(PIX_TYPE): Redefine as `unsigned long'.
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
54 #define PIX_TYPE unsigned long |
9572 | 55 #define XDISPLAY |
56 | |
97661
e4a283c4bc1c
Remove definition of struct x_display_info and struct x_output.
Eli Zaretskii <eliz@gnu.org>
parents:
94994
diff
changeset
|
57 typedef struct tty_display_info Display_Info; |
27018 | 58 |
97661
e4a283c4bc1c
Remove definition of struct x_display_info and struct x_output.
Eli Zaretskii <eliz@gnu.org>
parents:
94994
diff
changeset
|
59 extern struct tty_display_info the_only_display_info; |
9572 | 60 |
61 #define FRAME_X_DISPLAY(f) ((Display *) 0) | |
97661
e4a283c4bc1c
Remove definition of struct x_display_info and struct x_output.
Eli Zaretskii <eliz@gnu.org>
parents:
94994
diff
changeset
|
62 #define FRAME_FONT(f) ((f)->output_data.tty->font) |
e4a283c4bc1c
Remove definition of struct x_display_info and struct x_output.
Eli Zaretskii <eliz@gnu.org>
parents:
94994
diff
changeset
|
63 #define FRAME_X_DISPLAY_INFO(f) (&the_only_display_info) |
27957
5210a97b3ac7
(FRAME_INTERNAL_BORDER_WIDTH): Define to zero.
Eli Zaretskii <eliz@gnu.org>
parents:
27463
diff
changeset
|
64 |
21784
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
65 /* Prototypes. */ |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
66 |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
67 /* Forward declarations for prototypes. */ |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
68 struct frame; |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
69 struct window; |
25111
36169f5d88da
Remove redundant declarations (most of them are now in
Eli Zaretskii <eliz@gnu.org>
parents:
21784
diff
changeset
|
70 |
36169f5d88da
Remove redundant declarations (most of them are now in
Eli Zaretskii <eliz@gnu.org>
parents:
21784
diff
changeset
|
71 /* Defined in xfns.c; emulated on msdos.c */ |
21784
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
72 |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
73 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
74 extern int x_pixel_width P_ ((struct frame *)); |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
75 extern int x_pixel_height P_ ((struct frame *)); |
8de4e2a8cc62
[!HAVE_X_WINDOWS]: Add a dummy typedef for XRectangle
Eli Zaretskii <eliz@gnu.org>
parents:
15386
diff
changeset
|
76 |
9572 | 77 #define XFreeGC (void) |
78 #define x_destroy_bitmap(p1,p2) | |
79 #define load_pixmap(p1,p2,p3,p4) (0) | |
80 #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9) | |
51202
62a7506ec831
(struct x_output): Remove members left_pos, top_pos,
Kim F. Storm <storm@cua.dk>
parents:
50247
diff
changeset
|
81 #define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols) |
62a7506ec831
(struct x_output): Remove members left_pos, top_pos,
Kim F. Storm <storm@cua.dk>
parents:
50247
diff
changeset
|
82 #define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines) |
9572 | 83 #define XMenuSetAEQ (void) |
84 #define XMenuSetFreeze (void) | |
85 #define XMenuRecompute (void) | |
86 #define FONT_WIDTH(foo) 1 | |
87 #define XM_FAILURE -1 | |
88 #define XM_SUCCESS 1 | |
89 #define XM_NO_SELECT 2 | |
90 #define XM_IA_SELECT 3 | |
91 #define ButtonReleaseMask 0 | |
92 | |
93 typedef struct x_menu_struct | |
94 { | |
95 int count; | |
96 char **text; | |
97 struct x_menu_struct **submenu; | |
98 int *panenumber; /* Also used as enable. */ | |
99 int allocated; | |
100 int panecount; | |
101 int width; | |
27463
6e3d60350319
Change prototypes of XMenuAddSelection and XMenuActivate.
Eli Zaretskii <eliz@gnu.org>
parents:
27018
diff
changeset
|
102 char **help_text; |
9572 | 103 } XMenu; |
104 | |
10503
4d94f31dc555
(x_mouse_leave): Add neutralizing define.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
105 XMenu *XMenuCreate (Display *, Window, char *); |
4d94f31dc555
(x_mouse_leave): Add neutralizing define.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
106 int XMenuAddPane (Display *, XMenu *, char *, int); |
27463
6e3d60350319
Change prototypes of XMenuAddSelection and XMenuActivate.
Eli Zaretskii <eliz@gnu.org>
parents:
27018
diff
changeset
|
107 int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *); |
10503
4d94f31dc555
(x_mouse_leave): Add neutralizing define.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
108 void XMenuLocate (Display *, XMenu *, int, int, int, int, |
4d94f31dc555
(x_mouse_leave): Add neutralizing define.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
109 int *, int *, int *, int *); |
27463
6e3d60350319
Change prototypes of XMenuAddSelection and XMenuActivate.
Eli Zaretskii <eliz@gnu.org>
parents:
27018
diff
changeset
|
110 int XMenuActivate (Display *, XMenu *, int *, int *, int, int, unsigned, |
30340
be29e15ece0e
(XMenuActivate): Update prototype.
Eli Zaretskii <eliz@gnu.org>
parents:
29611
diff
changeset
|
111 char **, void (*callback)(char *, int, int)); |
10503
4d94f31dc555
(x_mouse_leave): Add neutralizing define.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
112 void XMenuDestroy (Display *, XMenu *); |
4d94f31dc555
(x_mouse_leave): Add neutralizing define.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
113 |
9572 | 114 #endif /* not HAVE_X_WINDOWS */ |
115 | |
29611
f39e60352427
(EMACS_MSDOS_H): Renamed from MSDOS_H_.
Eli Zaretskii <eliz@gnu.org>
parents:
29557
diff
changeset
|
116 #endif /* not EMACS_MSDOS_H */ |
52401 | 117 |
118 /* arch-tag: ad21eeed-8fdb-4357-8007-36368a6bdbf3 | |
119 (do not change this comment) */ |