Commit graph

19518 commits

Author SHA1 Message Date
Kim F. Storm
ffd808257c (setup_for_ellipsis): Reset saved_face_id to use default
face unless last visible char and first invisible char have the
same face.  Also use default face if saved_face_id is undefined.
2005-04-19 12:52:02 +00:00
Kim F. Storm
98dde72651 *** empty log message *** 2005-04-19 12:51:37 +00:00
YAMAMOTO Mitsuharu
327a33761a *** empty log message *** 2005-04-19 12:05:04 +00:00
YAMAMOTO Mitsuharu
94d0e8065e (Qbig5, Qcn_gb, Qsjis, Qeuc_kr): Remove variables.
(syms_of_mac): Don't initialize them.
(Vmac_charset_info_alist): New variable.
(syms_of_mac): Defvar it.
(create_text_encoding_info_alist): New function.
(decode_mac_font_name, mac_to_x_fontname)
(x_font_name_to_mac_font_name, init_font_name_table): Don't hard
code the correspondence among XLFD charsets, Mac script codes, and
Emacs coding systems.  Use Vmac_charset_info_alist and result of
create_text_encoding_info_alist instead.
(init_font_name_table) [TARGET_API_MAC_CARBON]: Use Font Manager
routines also on Mac OS Classic.
(init_font_name_table) [!TARGET_API_MAC_CARBON]: Use
add_font_name_table_entry.
(mac_do_list_fonts): Regard 0 in XLFD scaleble fields as
specified.  Derive unspecified scalable fields from specified one.
(x_list_fonts): Consider Valternate_fontname_alist.
(kDefaultFontSize): Change value from 9 to 12.
(XLoadQueryFont): Get decoded font family, font face, and charset
from x_font_name_to_mac_font_name.  Set full name of loaded font.
(mac_unload_font): Free `full_name' member.
(x_load_font): Don't try XLoadQueryFont if x_list_fonts returns
NULL.  Copy full_name member of struct MacFontStruct to that of
struct font_info.
2005-04-19 12:04:09 +00:00
YAMAMOTO Mitsuharu
a6d1cf0145 (MacFontStruct): Remove member fontname'. Add member full_name'.
[TARGET_API_MAC_CARBON] (MacFontStruct): Use type int for
mac_scriptcode member.
2005-04-19 12:03:38 +00:00
Kim F. Storm
62af9c2421 (handle_stop): Set saved_face_id to current face if
selective_display_ellipsis_p so ellipsis will be shown in same
face as preceding text.
(setup_for_ellipsis): Don't set saved_face_id here.
(next_element_from_display_vector): Default to saved_face_id.
2005-04-19 10:11:41 +00:00
Kim F. Storm
5827e9d460 *** empty log message *** 2005-04-19 10:11:26 +00:00
Kim F. Storm
d063683916 *** empty log message *** 2005-04-19 09:13:36 +00:00
Kim F. Storm
f374520488 (resolve_face_name): Use Fsafe_get to avoid redisplay
loops in case of bad face property lists.  Limit number of face
alias lookups to 10 (in case of face alias loops).
2005-04-19 08:34:50 +00:00
Kim F. Storm
7dfe2054bc (Fsafe_get): EXFUN it. 2005-04-19 08:34:33 +00:00
Kim F. Storm
7f2646c96c (Fsafe_get): New function.
(syms_of_fns): Defsubr it.
2005-04-19 08:34:19 +00:00
Kim F. Storm
25bcb3535c (overlay_arrow_string_or_property): Remove PBITMAP arg.
Calls changed.  Don't check for overlay-arrow-bitmap property here.
(overlay_arrow_at_row): Remove PBITMAP arg.  Instead, if left
fringe is present, return Lisp integer for bitmap (or -1 for default).
Fix value of overlay-arrow-bitmap property to be a symbol, use
lookup_fringe_bitmap to parse it.
(display_line): Change call to overlay_arrow_at_row.  Store integer
return value as overlay bitmap in row rather than window.
Only show overlay arrow if row displays text, or if no other overlay
arrow is seen in window (if overlay marker is at point-max).
2005-04-18 14:10:09 +00:00
Kim F. Storm
3f34b6bd01 (struct window): Remove member overlay_arrow_bitmap. 2005-04-18 14:09:56 +00:00
Kim F. Storm
c21f77c70d (make_window): Don't initialize overlay_arrow_bitmap. 2005-04-18 14:09:47 +00:00
Kim F. Storm
a8b34fae00 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
rather than from window.
(update_window_fringes): Compare overlay_arrow_bitmap rather than
overlay_arrow_p members.
(Ffringe_bitmaps_at_pos): Return fringe overlay_arrow_bitmap name
if not default.
2005-04-18 14:09:32 +00:00
Kim F. Storm
3d4a365f61 (row_equal_p, update_window_line, scrolling_window):
Compare overlay_arrow_bitmap than overlay_arrow_p members.
2005-04-18 14:09:10 +00:00
Kim F. Storm
e937c04680 (struct glyph_row): New member overlay_arrow_bitmap.
It replaces the corresponding member from struct window, as a
window may now show multiple overlay arrows.
Remove member overlay_arrow_p, superseeded by overlay_arrow_bitmap.
2005-04-18 14:09:00 +00:00
Kim F. Storm
e5c78c9d83 *** empty log message *** 2005-04-18 14:08:43 +00:00
Thien-Thi Nguyen
7d603e3f8e (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL. 2005-04-18 11:34:46 +00:00
Lute Kamstra
9942fa0cc1 (Vloads_in_progress): Static. 2005-04-18 10:22:20 +00:00
Lute Kamstra
7aed223df9 (Vloads_in_progress): Remove extern.
(load_in_progress): Add extern.
(Frequire): Use load_in_progress instead of Vloads_in_progress.
2005-04-18 10:20:46 +00:00
Thien-Thi Nguyen
999cdb8fc7 (Fx_popup_menu): Initialize error_name to NULL. 2005-04-18 09:41:15 +00:00
Thien-Thi Nguyen
59cfb104f6 Remove eol whitespace; nfc. 2005-04-18 09:36:06 +00:00
YAMAMOTO Mitsuharu
3f4413f85f *** empty log message *** 2005-04-18 07:45:19 +00:00
YAMAMOTO Mitsuharu
2f29e60d2a (XTread_socket): Don't beep on keyboard input even if no frame is
visible.
2005-04-18 07:44:54 +00:00
Dan Nicolaescu
60ec7b7ed9 (struct keys): Add support for shifted keys. 2005-04-17 01:37:38 +00:00
Richard M. Stallman
a8a1c0ee0d (with_echo_area_buffer): Delete WHICH < 0 case.
(set_message): Call with_echo_area_buffer with WHICH = 0.
(set_message_1): Erase the echo area buffer first thing.
(echo_area_display): Don't clear echo_message_buffer.
2005-04-16 18:19:40 +00:00
YAMAMOTO Mitsuharu
f3cf04d397 (mac.o): Depend on charset.h and coding.h. 2005-04-16 03:07:58 +00:00
YAMAMOTO Mitsuharu
a5e700caf2 [MAC_OSX] (image_load_quartz2d): Use cfstring_create_with_string. 2005-04-16 03:07:05 +00:00
YAMAMOTO Mitsuharu
35e8e78731 (cfstring_create_with_string) [TARGET_API_MAC_CARBON]: New extern. 2005-04-16 03:05:43 +00:00
YAMAMOTO Mitsuharu
7ca7ccd511 (x_autoselect_window_p): Remove variable.
(last_window): New variable.
(XTreassert_line_highlight, x_change_line_highlight): Remove
declarations.
(mac_focus_changed, x_detect_focus_change): New functions and
declarations.
(XTextExtents16, front_emacs_window): Remove function.
(mac_focus_frame): New function.
(XTmouse_position, do_menu_choice, do_zoom_window, XTread_socket)
(mac_check_for_quit_char): Use it instead of front_emacs_window.
(x_scroll_bar_report_motion): Obtain window from control owner.
(x_make_frame_invisible): Set window manager size hint.
(do_mouse_moved): Remove function.
(XTread_socket): Move its contents here.  Generate select-window
event on mouse movement if needed.  Use x_detect_focus_change on
activate/deactivate events.  Don't deiconify frame or invalidate
window rectangle when dnd items are dropped.  Don't
activate/deactivate root control.
(frame_highlight, frame_unhighlight): Activate/deactivate root
control here.
(syms_of_macterm): Delete DEFVAR_BOOL for x_autoselect_window_p.
2005-04-16 03:05:15 +00:00
YAMAMOTO Mitsuharu
28fbbe2306 (Fx_file_dialog): Likewise. 2005-04-16 03:04:13 +00:00
YAMAMOTO Mitsuharu
e8d8317c36 Include charset.h and coding.h.
[TARGET_API_MAC_CARBON] (Qutf_8): Remove extern.
[TARGET_API_MAC_CARBON] (cfstring_create_with_string): New function.
[TARGET_API_MAC_CARBON] (Fmac_get_preference): Use it.
2005-04-16 03:03:02 +00:00
Luc Teirlinck
9e5b2858ee *** empty log message *** 2005-04-16 00:38:31 +00:00
Luc Teirlinck
875baa3450 Define new macro TOOLTIP_SUPPORT.
(lisp): Use it.
(SOME_MACHINE_LISP): Add tooltip.
2005-04-16 00:30:45 +00:00
YAMAMOTO Mitsuharu
0ed0babf88 [!TARGET_API_MAC_CARBON]: Don't include TextEncodingConverter.h. 2005-04-14 09:26:22 +00:00
YAMAMOTO Mitsuharu
844631fa1f (x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]: Use ENCODE_SYSTEM
to encode title bar string.
(x_create_tip_frame): Apply 2005-03-18 change for xfns.c.
(Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]: Use
CFStringGetSystemEncoding to get system default string encoding.
2005-04-14 09:25:41 +00:00
YAMAMOTO Mitsuharu
42c6741e0a [!TARGET_API_MAC_CARBON]: Include MacLocales.h. Don't include
TextEncodingConverter.h.
(mac_system_script_code, Vmac_system_locale): New variables.
(syms_of_mac): Defvar them.
(mac_get_system_locale): New function.
2005-04-14 09:25:01 +00:00
Kim F. Storm
7e26f91b04 *** empty log message *** 2005-04-14 09:04:24 +00:00
Steven Tamm
0614c57585 macterm.c (syms_of_macterm): Removing redundant definition of
mac-pass-control-to-system
2005-04-14 04:22:48 +00:00
Stefan Monnier
203eb0aa1d (Fset_window_configuration): Be careful when you choose
among several possible points for the new_current_buffer.
2005-04-12 22:52:52 +00:00
YAMAMOTO Mitsuharu
b7461be999 *** empty log message *** 2005-04-12 10:28:24 +00:00
YAMAMOTO Mitsuharu
9c5501d9ee (enum event_kind) [MAC_OS]: Add LANGUAGE_CHANGE_EVENT. 2005-04-12 10:26:24 +00:00
YAMAMOTO Mitsuharu
778f445523 (mac_keyboard_text_encoding, current_mac_keyboard_text_encoding):
Remove variables.
(XTread_socket): Store language-change event if keyboard script change
is detected.  Don't convert input to `mac_keyboard_text_encoding'.
(syms_of_macterm): Delete DEFVAR_INT for mac-keyboard-text-encoding.
2005-04-12 10:26:08 +00:00
YAMAMOTO Mitsuharu
c16dab62b2 (Qlanguage_change) [MAC_OS]: New variable.
(syms_of_keyboard) [MAC_OS]: Intern and staticpro it.
(kbd_buffer_get_event) [MAC_OS]: Make event for	LANGUAGE_CHANGE_EVENT.
2005-04-12 10:25:05 +00:00
YAMAMOTO Mitsuharu
a56e6111a1 *** empty log message *** 2005-04-12 09:02:40 +00:00
YAMAMOTO Mitsuharu
a42bf89089 (poll_for_input) [SYNC_INPUT]: Don't call poll_for_input_1. Set
interrupt_input_pending to 1 instead.
2005-04-12 08:07:13 +00:00
Richard M. Stallman
6695c528d4 *** empty log message *** 2005-04-10 23:38:37 +00:00
Richard M. Stallman
a1716a5704 (standard_args): Rename --bare-bones to --quick.
Add -D aka --basic-display.
2005-04-10 23:23:24 +00:00
Richard M. Stallman
7fa57e4559 (Fmake_indirect_buffer): Clear out some local variables. 2005-04-10 23:22:38 +00:00