Mercurial > emacs
annotate src/disptab.h @ 59146:9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
(struct glyph_string): Likewise.
* emacs.c (main) [MAC_OS8]: Call mac_term_init instead of
mac_initialize.
* fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name):
Change TARGET_API_MAC_CARBON to HAVE_CARBON.
* fns.c (vector): Change MAC_OSX to MAC_OS.
* frame.c (x_set_frame_parameters, x_report_frame_params)
(x_set_fullscreen): Remove #ifndef HAVE_CARBON.
(x_set_border_width, Vdefault_frame_scroll_bars): Change
HAVE_CARBON to MAC_OS.
* image.c [MAC_OS]: Include sys/stat.h.
[MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
QuickTimeComponents.h.
* mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
[!MAC_OSX] (select): Use mac_wait_next_event.
[!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to
Vexec_suffixes.
[!MAC_OSX] (select, run_mac_command): Change `#ifdef
TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
(mac_clear_font_name_table): Add extern.
(Fmac_clear_font_name_table): New defun.
(syms_of_mac): Defsubr it.
[MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define.
[MAC_OSX] (select_and_poll_event): New function.
[MAC_OSX] (sys_select): Use it.
[MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function.
[MAC_OSX && SELECT_USE_CFSOCKET]
(SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines.
[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and
RunLoop for simultaneously monitoring two kinds of inputs, window
events and process outputs, without periodically polling.
* macfns.c (mac_initialized): Remove extern.
(stricmp): Put in #if 0. All callers changed to use xstricmp in
xfaces.c.
(strnicmp): Decrement `n' at the end of each loop, not the
beginning.
(check_mac): Use the term "Mac native windows" instead of "Mac
OS".
(check_x_display_info, x_display_info_for_name): Sync with xfns.c.
(mac_get_rdb_resource): New function (from w32reg.c).
(x_get_string_resource): Use it.
(install_window_handler): Add extern.
(mac_window): New function.
(Fx_create_frame): Use it instead of make_mac_frame. Set
parameter for Qfullscreen. Call x_wm_set_size_hint.
(Fx_open_connection, Fx_close_connection): New defuns.
(syms_of_macfns): Defsubr them.
(x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add
kWindowNoUpdatesAttribute to the window attribute.
(x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
(x_create_tip_frame): Don't call ShowWindow.
(Fx_show_tip): Call ShowWindow.
(Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if
TARGET_API_MAC_CARBON'.
(mac_frame_parm_handlers): Set handlers for Qfullscreen.
(syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
* macgui.h [!MAC_OSX]: Don't include Controls.h. Include
Windows.h.
(Window): Typedef to WindowPtr and move outside `#if
TARGET_API_MAC_CARBON'.
(XSizeHints): New struct.
* macterm.c (x_update_begin, x_update_end)
[TARGET_API_MAC_CARBON]: Disable screen updates during update of a
frame.
(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
[MAC_OS8]: Use XDrawImageString/XDrawImageString16.
(construct_mouse_click): Put in #if 0.
(x_check_fullscreen, x_check_fullscreen_move): Remove decls.
(x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef
TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
(activate_scroll_bars, deactivate_scroll_bars)
[!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl.
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
if the position is neither user-specified nor program-specified.
(x_free_frame_resources): Free size_hints.
(x_wm_set_size_hint): Allocate size_hints if needed. Set
size_hints.
(mac_clear_font_name_table): New function.
(mac_do_list_fonts): Initialize font_name_table if needed.
(x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT
around mac_do_list_fonts.
(mac_unload_font): New function.
(x_load_font): Add BLOCK_INPUT around XLoadQueryFont.
(init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations
and definitions with #if TARGET_API_MAC_CARBON.
[USE_CARBON_EVENTS] (mac_handle_window_event): Add decl.
(install_window_handler): Add decl.
(do_window_update): Add BeginUpdate/EndUpdate for the tooltip
window. Use UpdateControls. Get the rectangle that should be
updated and restrict the target of expose_frame to it.
(do_grow_window): Set minimum height/width according to
size_hints.
(do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
(do_zoom_window): Don't use x_set_window_size.
[USE_CARBON_EVENTS] (mac_handle_window_event): New function.
(install_window_handler): New function.
[!USE_CARBON_EVENTS] (mouse_region): New variable.
[!USE_CARBON_EVENTS] (mac_wait_next_event): New function.
(XTread_socket) [USE_CARBON_EVENTS]: Move call to
GetEventDispatcherTarget inside BLOCK_INPUT.
(XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
Update mouse_region when mouse is moved.
(make_mac_frame): Remove.
(make_mac_terminal_frame): Put in #ifdef MAC_OS8. Initialize
mouse pointer shapes. Change values of f->left_pos and
f->top_pos. Don't use make_mac_frame. Use NewCWindow. Don't
call ShowWindow.
(mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
Vinvocation_name and Vsystem_name.
(mac_make_rdb): New function (from w32term.c).
(mac_term_init): Use it. Add BLOCK_INPUT. Error if display has
already been opened. Don't pass argument to
mac_initialize_display_info. Don't set dpyinfo->height/width.
Add entries to x_display_list and x_display_name_list.
(x_delete_display): New function.
(mac_initialize): Don't call mac_initialize_display_info.
(syms_of_macterm) [!MAC_OSX]: Don't call Fprovide.
* macterm.h (check_mac): Add extern.
(struct mac_output): New member size_hints.
(FRAME_SIZE_HINTS): New macro.
(mac_unload_font): Add extern.
* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
* xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
author | Steven Tamm <steventamm@mac.com> |
---|---|
date | Mon, 27 Dec 2004 17:27:30 +0000 |
parents | 695cf19ef79e |
children | a8fa7c632ee4 375f2633d815 |
rev | line source |
---|---|
484 | 1 /* Things for GLYPHS and glyph tables. |
2961 | 2 Copyright (C) 1993 Free Software Foundation, Inc. |
484 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
484 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
13183
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
13183
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
484 | 20 |
21 /* Access the slots of a display-table, according to their purpose. */ | |
22 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
23 #define DISP_TABLE_P(obj) \ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
24 (CHAR_TABLE_P (obj) \ |
17363
0fe9203c7a06
(DISP_TABLE_P): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17332
diff
changeset
|
25 && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table) \ |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
26 && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
27 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
28 #define DISP_TABLE_EXTRA_SLOTS 6 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
29 #define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
30 #define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
31 #define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
32 #define DISP_CTRL_GLYPH(dp) ((dp)->extras[3]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
33 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
34 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
35 |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
36 extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int)); |
17332
35269345d9ef
(disp_char_vector): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
17183
diff
changeset
|
37 |
17116
321ebfc346eb
(DISP_CHAR_VECTOR): Allow bare 8-bit in display-table.
Kenichi Handa <handa@m17n.org>
parents:
17029
diff
changeset
|
38 #define DISP_CHAR_VECTOR(dp, c) \ |
17332
35269345d9ef
(disp_char_vector): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
17183
diff
changeset
|
39 (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : disp_char_vector ((dp), (c))) |
484 | 40 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
41 /* Defined in window.c. */ |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
42 extern struct Lisp_Char_Table *window_display_table P_ ((struct window *)); |
484 | 43 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
44 /* Defined in indent.c. */ |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
45 extern struct Lisp_Char_Table *buffer_display_table P_ ((void)); |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
46 |
484 | 47 /* Display table to use for vectors that don't specify their own. */ |
48 extern Lisp_Object Vstandard_display_table; | |
49 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
50 /* This is the `purpose' slot of a display table. */ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
51 extern Lisp_Object Qdisplay_table; |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
52 |
484 | 53 /* Vector of GLYPH definitions. Indexed by GLYPH number, |
54 the contents are a string which is how to output the GLYPH. */ | |
55 extern Lisp_Object Vglyph_table; | |
56 | |
57 /* Return the current length of the GLYPH table, | |
58 or 0 if the table isn't currently valid. */ | |
59 #define GLYPH_TABLE_LENGTH \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
60 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0) |
484 | 61 |
62 /* Return the current base (for indexing) of the GLYPH table, | |
63 or 0 if the table isn't currently valid. */ | |
64 #define GLYPH_TABLE_BASE \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
65 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0) |
484 | 66 |
67 /* Given BASE and LEN returned by the two previous macros, | |
68 return nonzero if the GLYPH code G should be output as a single | |
69 character with code G. Return zero if G has a string in the table. */ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
70 #define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g])) |
484 | 71 |
72 /* Given BASE and LEN returned by the two previous macros, | |
73 return nonzero if GLYPH code G is aliased to a different code. */ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
74 #define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g])) |
484 | 75 |
76 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1, | |
77 return the alias for G. */ | |
78 #define GLYPH_ALIAS(base, g) XINT (base[g]) | |
79 | |
2725
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
80 /* Follow all aliases for G in the glyph table given by (BASE, |
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
81 LENGTH), and set G to the final glyph. */ |
17183
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
82 #define GLYPH_FOLLOW_ALIASES(base, length, g) \ |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
83 do { \ |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
84 while (GLYPH_ALIAS_P ((base), (length), (g))) \ |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
85 (g) = GLYPH_ALIAS ((base), (g)); \ |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
86 if (!GLYPH_CHAR_VALID_P (FAST_GLYPH_CHAR (g))) \ |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
87 g = FAST_MAKE_GLYPH (' ', FAST_GLYPH_FACE (g)); \ |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
88 } while (0) |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
89 |
484 | 90 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0, |
91 return the length and the address of the character-sequence | |
92 used for outputting GLYPH G. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
20309
diff
changeset
|
93 #define GLYPH_LENGTH(base,g) SCHARS (base[g]) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
20309
diff
changeset
|
94 #define GLYPH_STRING(base,g) SDATA (base[g]) |
484 | 95 |
96 /* GLYPH for a space character. */ | |
97 | |
98 #define SPACEGLYPH 040 | |
99 #define NULL_GLYPH 00 | |
100 | |
101 #define GLYPH_FROM_CHAR(c) (c) | |
52401 | 102 |
103 /* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349 | |
104 (do not change this comment) */ |