GitLab

Undo 2006-09-08 change.

	(Vmouse_autoselect_window): New variable.  DEFVAR_LISP it.

	* dispextern.h (mouse_autoselect_window): Remove extern.
	(Vmouse_autoselect_window): Add extern.

	* macterm.c (XTread_socket): Test Vmouse_autoselect_window
	instead of mouse_autoselect_window.

	* msdos.c (dos_rawgetc): Likewise.

	* w32term.c (w32_read_socket): Likewise.

	* xterm.c (handle_one_xevent): Likewise.

(mac_get_ideal_size): New functions.
(x_set_offset, x_set_window_size, x_make_frame_visible)
(do_zoom_window, mac_handle_window_event, XTread_socket): Use them.
(install_window_handler, mac_handle_window_event)
[USE_CARBON_EVENTS]: Handle kEventWindowGetIdealSize and
kEventWindowBoundsChanged.
(XTread_socket) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: Don't call
DragWindow.

[USE_CARBON_EVENTS]: Handle kEventWindowClose.
[USE_MAC_TSM] (mac_handle_text_input_event): Set modifiers for
ASCII keystroke event.

(x_iconify_frame, XLoadQueryFont, install_window_handler)
(mac_handle_command_event, init_command_handler, init_menu_bar):
Use OSStatus instead of OSErr.
(x_free_frame_resources) [TARGET_API_MAC_CARBON]: Don't use
FRAME_FILE_NAME.
(x_query_font): Apply 2006-08-04 change for xterm.c.
(Qhi_command): Rename from Qhicommand.  All uses changed.

(syms_of_xterm): DEFVAR_BOOL it.
(x_draw_glyph_string): Use it.
Draw underline and overline up to the end of line if the face
extends to the end of line.

stretch	glyph in left marginal areas on	header and mode lines.

directly lookup keycode_to_xkeysym_table.
[USE_MAC_TSM] (mac_handle_text_input_event): Don't construct
ASCII_KEYSTROKE_EVENT for non-zero keycode_to_xkeysym_table entries.
(XTread_socket): Use character codes to construct keypad key events.
(mac_initialize_display_info) [MAC_OSX]: Use CGDisplaySamplesPerPixel.
(x_delete_display): Apply 2006-07-04 change for xterm.c.

(x_set_mouse_pixel_position) [MAC_OSX]: Use CGWarpMouseCursorPosition.
(fm_style_face_attributes_alist) [USE_ATSUI]: New variable.
(syms_of_macterm) [USE_ATSUI]: Initialize and staticpro it.
Change keys of Vmac_atsu_font_table from strings to numbers.
(fm_style_to_face_attributes) [USE_ATSUI]: New function.
(init_font_name_table) [USE_ATSUI]: Use it.
(saved_ts_script_language_on_focus) [USE_MAC_TSM]: New variable.
(syms_of_macterm) [USE_MAC_TSM]: Initialize and staticpro it.
[USE_MAC_TSM] (mac_tsm_resume): Restore script and language codes
only when saved_ts_script_language_on_focus coincides with
Vmac_ts_script_language_on_focus.
[USE_MAC_TSM] (mac_tsm_suspend): Save value of
Vmac_ts_script_language_on_focus to saved_ts_script_language_on_focus.
(XTread_socket) [USE_MAC_TSM]: Add Mac OS Classic support.
[USE_MAC_TSM] (mac_handle_text_input_event, init_tsm): Likewise.

(mac_tsm_resume, mac_tsm_suspend) [USE_MAC_TSM]: New functions.
(mac_handle_window_event, XTread_socket) [USE_MAC_TSM]: Use them.
(Vmac_ts_script_language_on_focus) [USE_MAC_TSM]: New variable.
(syms_of_macterm) [USE_MAC_TSM]: Defvar it.
(saved_ts_language, saved_ts_component) [USE_MAC_TSM]: New variables.
(mac_initialize_display_info) [MAC_OSX]: Use Quartz Display
Services functions to get size of main display in pixels.

(Qtext_input, Qupdate_active_input_area, Qunicode_for_key_event)
[USE_MAC_TSM]: Likewise.
(syms_of_macterm) [USE_MAC_TSM]: Intern and staticpro them.
(Qbefore_string) [USE_MAC_TSM]: Add extern.
(do_app_resume, do_app_suspend) [USE_MAC_TSM]: Call
ActivateTSMDocument/DeactivateTSMDocument.
(mac_store_event_ref_as_apple_event): Call mac_post_mouse_moved_event.
(mac_handle_window_event) [USE_MAC_TSM]: Handle
kEventWindowFocusAcquired/kEventWindowFocusRelinquish.
(mac_handle_text_input_event) [USE_MAC_TSM]: New function.
(install_window_handler) [USE_MAC_TSM]: Install it.  Register
kEventWindowFocusAcquired/kEventWindowFocusRelinquish.
(keycode_to_xkeysym_table): Add entry for f16.
(XTread_socket) [USE_MAC_TSM]: Set/reset read_socket_inev
before/after passing keystroke event to toolbox dispatcher.
(init_tsm) [USE_MAC_TSM]: New function.
(mac_initialize) [USE_MAC_TSM]: Call it.
(Vmac_ts_active_input_overlay) [USE_MAC_TSM]: New defvar.

(XTread_socket): Remove obsolete comment.

(mac_font_panel_visible_p, mac_show_hide_font_panel)
[USE_MAC_FONT_PANEL]: New functions.
[USE_MAC_FONT_PANEL] (mac_set_font_info_for_selection): Return
immediately if font panel is not visible.

cursor and erasing cursor on partially visible stretch glyph on left.
(x_draw_hollow_cursor): Compute x via get_phys_cursor_geometry.

Fix last change.  Don't map `fn' modifier if pressed with F1 ... F12.

(fn_keycode_to_keycode_table) [MAC_OSX]: New variable.
(mac_set_unicode_keystroke_event) [TARGET_API_MAC_CARBON]: New function.
(XTread_socket) [TARGET_API_MAC_CARBON]: Use it.
(XTread_socket) [MAC_OSX]: Try 'uchr' Unicode keyboard-layout
resource to backtranslate key with modifiers.
(XTread_socket): Don't set read_socket_inev around AEProcessAppleEvent.

Forward keyUp events to toolbox_dispatcher.

[MAC_OSX] (mac_store_service_event): Rename from
mac_store_services_event.  All callers changed.
[USE_MAC_FONT_PANEL] (mac_set_font_info_for_selection): Add args
FACE_ID and C.  All callers changed.
(x_free_frame_resources) [USE_MAC_FONT_PANEL]: Call
mac_set_font_info_for_selection when focus frame is destroyed.
(XTread_socket): Revert to FrontNonFloatingWindow/FrontWindow.

to font->mac_fontnum.
[USE_MAC_FONT_PANEL] (mac_set_font_info_for_selection): New function.
(x_new_focus_frame) [USE_MAC_FONT_PANEL]: Use it.
(QCfamily, QCweight, QCslant, Qnormal, Qbold, Qitalic): Add extern.
(QWindow) [MAC_OSX]: Likewise.
(Qfont) [USE_MAC_FONT_PANEL]: Likewise.
(Vmac_atsu_font_table) [USE_ATSUI]: New variable.
(syms_of_macterm) [USE_ATSUI]: Defvar it.
(Qtoolbar_switch_mode) [MAC_OSX]: New variable.
(Qpanel_closed, Qselection) [USE_MAC_FONT_PANEL]: Likewise.
(syms_of_macterm): Intern and staticpro them.
(init_font_name_table) [USE_ATSUI]: Set data to Vmac_atsu_font_table.
[TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event): New
function.
[USE_CARBON_EVENTS] (mac_handle_command_event): Use it.
[MAC_OSX] (mac_store_services_event): Likewise.
[USE_CARBON_EVENTS] (mac_handle_window_event) [MAC_OSX]: Handle
kEventWindowToolbarSwitchMode event.
(install_window_handler) [USE_CARBON_EVENTS && MAC_OSX]: Register it.
[MAC_OSX] (mac_store_services_event): Change return type to OSStatus.
[USE_MAC_FONT_PANEL] (mac_handle_font_event): New function.
(install_window_handler) [USE_MAC_FONT_PANEL]: Install it.
(XTread_socket): Select window on mouse click if x_focus_frame is NULL.

path select also for proxy icon click.
[TARGET_API_MAC_CARBON] (mac_post_mouse_moved_event): New function.
[USE_TOOLKIT_SCROLL_BARS] (scroll_bar_timer_callback): Use it.
(xlfdpat_create): Remove unused label `error' and trailing sentences.
(mac_do_track_drag, mac_do_receive_drag): Move functions to macselect.c.
(mac_do_track_dragUPP, mac_do_receive_dragUPP): Move variables to
macselect.c.
(install_drag_handler, remove_drag_handler): Add extern.
(mac_store_apple_event): Change return type to void.  All uses changed.
Create Lisp object from Apple event and store it into input event.
(mac_make_lispy_event_code): Remove function.
[TARGET_API_MAC_CARBON] (mac_store_drag_event): New function.
(install_window_handler): Call install_drag_handler.
(remove_window_handler): Call remove_drag_handler.

endpoints of strictly horizontal/vertical lines.
(mac_set_clip_rectangles) [USE_CG_DRAWING]: Set clip_rects.
(pcm_init, pcm_get_status): New functions.
(x_per_char_metric, XLoadQueryFont): Use them instead of
XCharStructRow and related macros.
(x_draw_relief_rect): Don't adjust arguments of mac_draw_line.
(x_free_frame_resources) [TARGET_API_MAC_CARBON]: Free FRAME_FILE_NAME.
(XTread_socket) [TARGET_API_MAC_CARBON]: Handle proxy icon drag
and window path pop-up menu on title bar.
(mac_use_core_graphics) [USE_CG_DRAWING]: Set default to 1.

(add_mac_font_name): New function.
(init_font_name_table): Use it.  Adopt the first found font from
those having the same family name.

(init_font_name_table, init_font_name_table, mac_do_list_fonts)
(XLoadQueryFont, mac_store_apple_event): Don't check
return value of xmalloc.

(x_io_error_quitter, x_draw_image_foreground_1): Remove prototypes.
(x_sync): Move to macfns.c.
[USE_CG_DRAWING] (mac_define_fringe_bitmap): Remove unused
variable `mask_bits'.
(mac_compute_glyph_string_overhangs): Avoid ambiguous `else'.
(x_draw_image_glyph_string): Remove unused variable `pixmap'.
(x_mac_to_emacs_modifiers): Remove function.
(XTset_vertical_scroll_bar, mac_handle_visibility_change)
(x_make_frame_visible, xlfdpat_create, mac_handle_command_event):
Add explicit braces to avoid ambiguous `else'.
(x_make_frame_visible): Remove unused variables `type',
`original_top', and `original_left'.
(mac_do_list_fonts, XTread_socket): Add parentheses around && within ||.
(x_load_font): Remove unused variables `full_name', and `value'.
(do_get_menus, do_init_managers, do_check_ram_size) [!MAC_OS8]:
Remove functions.
(do_zoom_window): Reorganize variables with respect to conditionals.
(init_command_handler): Remove unused variable `err'.
[MAC_OSX] (mac_check_bundle): Remove unused variable `child'.

on in toolbar window if mouse-highlight is an integer.

Create GWorld in ARGB pixel format.
(mac_copy_area, mac_copy_area_with_mask) [USE_CG_DRAWING]: Remove
functions.
(x_draw_image_foreground) [USE_CG_DRAWING]: Use mac_draw_cg_image
instead of mac_copy_area/mac_copy_area_with_mask.

(max_fringe_bmp, fringe_bmp) [USE_CG_DRAWING]: New variables.
(mac_define_fringe_bitmap, mac_destroy_fringe_bitmap)
(mac_draw_cg_image) [USE_CG_DRAWING]: New functions.
(mac_draw_bitmap) [USE_CG_DRAWING]: Remove function.
(x_draw_fringe_bitmap) [USE_CG_DRAWING]: Use mac_draw_cg_image
instead of mac_draw_bitmap.
(x_redisplay_interface) [USE_CG_DRAWING]: Set handlers for
define_fringe_bitmap and destroy_fringe_bitmap.

(x_draw_composite_glyph_string_foreground)
(x_draw_image_foreground): Undo previous changes.
(x_draw_hollow_cursor): Likewise.  Subtract 1 from the last
argument of mac_draw_rectangle.
(CG_SET_FILL_COLOR, CG_SET_STROKE_COLOR): New macros.
(mac_draw_string_common, mac_draw_image_string_cg): Use them.
(FRAME_CG_CONTEXT) [USE_CG_DRAWING]: New macro.
(mac_begin_cg_clip, mac_end_cg_clip, mac_prepare_for_quickdraw)
[USE_CG_DRAWING]: New functions.
(mac_draw_line, mac_erase_rectangle, mac_clear_window)
(mac_fill_rectangle, mac_draw_rectangle, mac_draw_string_common)
(mac_draw_image_string_cg) [USE_CG_DRAWING]: Add Quartz 2D drawing part.
(mac_draw_bitmap, mac_invert_rectangle, mac_draw_string_common)
(mac_copy_area, mac_scroll_area, x_scroll_bar_create)
(x_scroll_bar_remove, XTset_vertical_scroll_bar, x_set_window_size)
(XTread_socket) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.

(x_draw_glyph_string_foreground)
(x_draw_composite_glyph_string_foreground)
(x_draw_image_foreground): Don't subtract 1 from width and height
arguments to mac_draw_rectangle.
(x_draw_hollow_cursor): Add 1 to w->phys_cursor_width.

(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
(XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: Don't show
scroll bar if it is not tall enough to display scroll bar thumb.
[USE_CARBON_EVENTS] (mac_convert_event_ref)
(mac_handle_command_event, mac_handle_window_event)
(mac_handle_mouse_event): Check error code of GetEventParameter.
(convert_fn_keycode) [MAC_OSX]: Likewise.

values if control is not visible or values are not changed.

(mac_begin_clip, mac_end_clip): Take arg GC instead of REGION.
All uses changed.  Don't do clipping if n_clip_rects is zero.
(mac_set_clip_rectangles): Use xassert instead of abort.  Set
n_clip_rects.  Don't make clip_region empty when number of
clipping rectangles is zero.
(mac_reset_clip_rectangles): Set n_clip_rects directly instead of
calling mac_set_clip_rectangles.
(x_set_toolkit_scroll_bar_thumb): Temporarily hide scroll bar to
avoid multiple redraws.

BG_WIDTH.  All uses changed.  Draw background if BG_WIDTH is not zero.
(mac_draw_image_string, mac_draw_image_string_16): New arg BG_WIDTH.
[USE_CG_TEXT_DRAWING] (mac_draw_image_string_cg): Rename from
mac_draw_string_cg.  New arg BG_WIDTH.  All uses changed.  Draw
background if BG_WIDTH is not zero.  Use float constants as
divisors instead of double.  Use alloca instead of xmalloc/xfree.
(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
[!MAC_OS8 || USE_ATSUI]: Background may be drawn using
mac_draw_image_string* functions.
(XLoadQueryFont) [MAC_OS8 && USE_ATSUI]: Don't adjust heights of
some fonts when srcCopy text transfer mode might be used.
(mac_begin_clip, mac_end_clip): Check if region is empty.
(mac_set_clip_rectangles): When resetting clip region, make it
empty instead of disposing of it.

for unfocused frame.
(x_raise_frame): Call BringToFront instead of SelectWindow.
(x_lower_frame): Use NULL instead of nil.
(x_make_frame_visible): Don't call SelectWindow.
(XTread_socket): Increment handling_signal at the start, decrement
it at the end.
[USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): Use
CFPreferencesGetAppIntegerValue instead of Fmac_get_preference.

[MAC_OS_X_VERSION_MAX_ALLOWED >= 1020]: Specify	kATSLineUseQDRendering.
(XLoadQueryFont) [USE_ATSUI]: Display diacritical marks in
decomposed form.