From 1289aeb85cb7c330283fa3049f7f11f092055004 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Wed, 23 Apr 2008 08:56:42 +0000 Subject: [PATCH] (x_y_to_hpos_vpos, fast_find_position) [HAVE_CARBON]: Make functions non-static. --- src/ChangeLog | 29 +++++++++++++++++++++++++++++ src/xdisp.c | 10 ++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index aaa49be146d..456d03c07b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,32 @@ +2008-04-23 YAMAMOTO Mitsuharu + + * macterm.c (Vmac_ts_active_input_buf) [USE_MAC_TSM]: New variable. + (syms_of_macterm) [USE_MAC_TSM]: Defvar it. + (Qmouse_drag_overlay) [MAC_OSX]: New variable. + (syms_of_macterm) [MAC_OSX]: Intern and staticpro it. + (mac_get_selected_range, mac_store_buffer_text_to_unicode_chars) + (mac_ax_selected_text_range) [MAC_OSX]: New functions. + (mac_ax_number_of_characters) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: + Likewise. + + * mactoolbox.c (Vmac_ts_active_input_buf) [USE_MAC_TSM]: Add extern. + (fast_find_position, x_y_to_hpos_vpos, mac_ax_selected_text_range): + (mac_ax_number_of_characters): Add externs. + (mac_get_selected_range, mac_store_buffer_text_to_unicode_chars) + [USE_MAC_TSM]: Likewise. + (mac_handle_text_input_event) [MAC_OSX]: + Handle kEventTextInputOffsetToPos for no active input area case. + Handle kEventTextInputPosToOffset and kEventTextInputGetSelectedText. + (mac_handle_document_access_event) + [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: New function. + (install_application_handler) [MAC_OSX]: Register handlers for + kEventTextInputPosToOffset and kEventTextInputGetSelectedText. + (install_application_handler) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: + Register mac_handle_document_access_event. + + * xdisp.c (x_y_to_hpos_vpos, fast_find_position) [HAVE_CARBON]: + Make functions non-static. + 2008-04-19 YAMAMOTO Mitsuharu * mac.c (create_apple_event) [TARGET_API_MAC_CARBON]: diff --git a/src/xdisp.c b/src/xdisp.c index f20aaedd2f7..897dd440f15 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1700,7 +1700,10 @@ glyph_to_pixel_coords (w, hpos, vpos, frame_x, frame_y) text, or we can't tell because W's current matrix is not up to date. */ -static struct glyph * +#ifndef HAVE_CARBON +static +#endif +struct glyph * x_y_to_hpos_vpos (w, x, y, hpos, vpos, dx, dy, area) struct window *w; int x, y; @@ -22079,7 +22082,10 @@ cursor_in_mouse_face_p (w) in 20.x as well, and I think it's too risky to install so near the release of 21.1. 2001-09-25 gerd. */ -static int +#ifndef HAVE_CARBON +static +#endif +int fast_find_position (w, charpos, hpos, vpos, x, y, stop) struct window *w; int charpos; -- 2.39.5