1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Commit Graph

34 Commits

Author SHA1 Message Date
YAMAMOTO Mitsuharu
9b3c108b78 (function-key-map): Sync with x-win.el. 2005-03-15 07:45:58 +00:00
Stefan Monnier
2c75eddf9d (function-key-map): Use char-names more consistently.
(file-name-coding-system): Only set it for MacOS-9.  The other case is
already handled in mule-cmds.el (where it also works when mac-win.el
is not used).
2005-02-21 13:11:04 +00:00
Steven Tamm
a15252fdfb * editfns.c (Voperating_system_release): Added.
(init_editfns): Assign new variable operating-system-release
	based on call to uname if available.
	(get_operating_system_release): Added function to
	allow c-level access to operating system release.
* config.h: Regenerated.
* s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or
	less.
	(MIN_PTY_KERNEL_VERSION): Defined minimum kernel version for
	using ptys as '7'.
* term/mac-win.el (process-connection-type): Removed.
	Controlled now by s/darwin.h:PTY_ITERATION.
2005-01-20 18:13:48 +00:00
Steven Tamm
8db8a5cf5f * term/mac-win.el (process-connection-type): Use new
operating-system-release variable to use ptys on Darwin 7 (OSX
	10.3) when using carbon build.
2005-01-19 19:14:01 +00:00
Steven Tamm
456e761bec * macterm.c (SelectionRange): Add Xcode position apple event struct.
(do_ae_open_documents): Handle Xcode-style file position open
	events.
* term/mac-win.el (mac-drag-n-drop): Handle drag-n-drop events
	that include line numbers.
2004-12-30 02:04:31 +00:00
Steven Tamm
30c92fab79 * term/mac-win.el: Require x-dnd.
(mac-drag-n-drop): Sync with W32 version.  Use x-dnd.el functions.
* macfns.c (install_window_handler): Modify extern to return OSErr
	value.
	(mac_window): Handle return value of install_window_handler.
* macterm.c (reflect_byte): Remove function.
	(mac_create_bitmap_from_bitmap_data): Don't call it.  Lookup table
	instead.
	(mac_do_font_lists): Simplify calculation of the longest
	nonspecial string.
	[TARGET_API_MAC_CARBON] (init_mac_drag_n_drop): Remove function
	and declaration.
	(mac_initialize) [TARGET_API_MAC_CARBON]: Don't call it.
	[TARGET_API_MAC_CARBON] (mac_do_track_drag): New function and
	declaration.
	(install_window_handler): Return OSErr value.
	(install_window_handler) [TARGET_API_MAC_CARBON]: Register
	handlers for tracking/receiving drag-and-drop items.
	(do_ae_open_documents): Generate unibyte strings for filenames.
	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.  Reject
	only non-filename items.  Set event modifiers.  Set return value.
2004-12-29 17:25:02 +00:00
Steven Tamm
74e2abe26a * term/mac-win.el: Sync with x-win.el. Rearrange the contents.
Call mac-clear-font-name-table if invoked on Mac OS 8/9.  Call
x-open-connection on Mac OS X.
2004-12-27 17:23:02 +00:00
Steven Tamm
fbe6152fad * term/mac-win.el (encoding-vector, mac-font-encoder-list)
(ccl-encode-mac-centraleurroman-font): Use centraleurroman
instead of centraleuropean as the name
* macterm.c (endif, x_font_name_to_mac_font_name): Use
maccentraleurroman instead of maccentraleuropean
(mac_c_string_match, mac_do_list_fonts): Speed up font search by
quickly finding a specific font without needing regexps.
2004-12-18 16:36:31 +00:00
Steven Tamm
f084eeb926 * term/mac-win.el (ccl-encode-mac-roman-font)
(ccl-encode-mac-cyrillic-font)
(ccl-encode-mac-centraleuropean-font, encoder-list)
(fontset-add-mac-fonts, create-fontset-from-mac-roman-font):
Support Cyrillic, CentralEuropean, and Dingbat font display
2004-11-30 15:49:26 +00:00
Steven Tamm
2ca75b4224 Add ASCII equivalents for some function keys.
(mode-line-frame-identification): Sync with x-win.el.
2004-09-02 16:59:18 +00:00
Steven Tamm
0ecc99998a term/mac-win.el (mac-scroll-ignore-events, mac-scroll-down)
(mac-scroll-down-line, mac-scroll-up, mac-scroll-up-line):
Do not treat double clicks and triple clicks specially in the
scroll bar (preventing strange repositioning problems)
2004-07-08 15:24:54 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Jason Rumney
e9ec1a292f No need to bind wheel events specially. 2003-06-04 21:54:08 +00:00
Stefan Monnier
a52eeda823 (iconify-or-deiconify-frame): Move to frame.el. 2003-05-31 16:03:11 +00:00
Andrew Choi
5416884dd3 * term/mac-win.el: Unconditionally set process-connection-type to nil. 2003-04-15 01:29:42 +00:00
Juanma Barranquero
c337cd0a62 (iconify-or-deiconify-frame): Define for compatibility with packages
that use it.
2003-03-28 17:49:49 +00:00
Juanma Barranquero
db95369be0 Trailing whitespace deleted. 2003-02-04 13:30:45 +00:00
Andrew Choi
058c18c71f 2003-01-28 Benjamin Riefenstahl <Benjamin.Riefenstahl@epost.de>
* macterm.c (keycode_to_xkeysym_table): Add <tab>, <backspace>,
        <escape>.
        (keycode_to_xkeysym_table): Reformat and add more comments.
        (XTread_socket): Drop special case for backspace.

        * term/mac-win.el: Add entries in function-key-map for
        [tab], [backspace], [escape].
2003-01-28 18:46:07 +00:00
John Paul Wallington
a6127c0f7a (interprogram-paste-function): Handle empty clipboard. 2003-01-23 00:04:20 +00:00
Kenichi Handa
153e1ba447 Require fontset and call setup-default-fontset. 2003-01-17 08:16:17 +00:00
Kenichi Handa
be25dab0a1 Setup the fontset "fontset-mac" correctly. 2003-01-15 05:33:18 +00:00
Steven Tamm
e989b9bcaf Switching return to be treated like an X keysym 2002-10-04 15:03:02 +00:00
Andrew Choi
742fbed75b In src:
2002-08-03  Andrew Choi  <akochoi@shaw.ca>

        * macterm.c (USE_CARBON_EVENTS): New macro.
        (macCtrlKey, macShiftKey, macMetaKey, macAltKey): New macros.
        (x_iconify_frame): Call CollapseWindow.
        (Vmac_reverse_ctrl_meta): New variable.
        (Vmac_wheel_button_is_mouse_2): New variable.
        (init_mac_drag_n_drop): New function.
        (mac_do_receive_drag): New function.
        (mac_handle_service_event): New function.
        (init_service_handler): New function.
        (mac_to_emacs_modifiers): New function.
        (mac_event_to_emacs_modifiers): New function.
        (mac_get_mouse_btn): New function.
        (mac_convert_event_ref): New function.
        (XTread_socket) [USE_CARBON_EVENTS]: Call ReceiveNextEvent,
        SendEventToEventTarget, mac_event_to_emacs_modifiers, and
        mac_get_mouse_btn.
        (mac_initialize): Call init_mac_drag_n_drop and
        init_service_handler.

        * keyboard.c: Define Qmouse_wheel, mouse_wheel_syms, and
        lispy_mouse_wheel_names for MAC_OSX as well as for WINDOWS_NT.
        (kbd_buffer_get_event): Set used_mouse_menu for MENU_BAR_EVENT and
        TOOL_BAR_EVENT for MAC_OS as well.
        (make_lispy_event): Handle MOUSE_WHEEL_EVENT for MAC_OSX as well
        as for WINDOWS_NT.
        (syms_of_keyboard): Initialize Qmouse_wheel for MAC_OSX.

        * termhooks.h (event_kind): Define MOUSE_WHEEL_EVENT also for
        MAC_OSX.

In lisp:

2002-08-03  Andrew Choi  <akochoi@shaw.ca>

        * term/mac-win.el: Set keys to enable mouse wheel support.
2002-08-03 22:21:09 +00:00
Andreas Schwab
525fdbc9c8 * files.el (directory-free-space-args): Don't use -P on Darwin.
* term/mac-win.el: Don't set it here.
2002-06-30 14:42:19 +00:00
Andreas Schwab
eb14066a0b Use directory-free-space-program instead of
obsolete variable dired-free-space-program.  On Darwin, don't set
directory-free-space-program, shell-file-name and
process-connection-type; set directory-free-space-args to not
include `-P' and use utf-8 for file name coding system.
2002-06-29 19:01:46 +00:00
Andrew Choi
f00691a3e4 In src/:
2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * fontset.c (syms_of_fontset) [MAC_OS]: Set ASCII font of
        Vdefault_fontset to Monaco with mac-roman coding.

        * mac.c, macfns.c, macmenu.c, macterm.c: Undefine and redefine
        init_process before and after inclusion of Carbon/Carbon.h, resp.

        * macterm.c (x_new_font): Set font for normal_gc, reverse_gc, and
        cursor_gc.
        (add_font_name_table_entry): New function.
        (init_font_name_table): Use add_font_name_table_entry; add italic,
        bold, and bold-italic entries for truetype fonts.

        * xfaces.c (init_frame_faces) [MAC_OS]: Call realize_basic_faces
        for Mac too.
        (try_font_list) [MAC_OS]: If no font matches given registry, try
        fonts with any registry matching face_family.
        (realize_x_face) [MAC_OS]: Remove old ad-hoc fix to load font
        here.

        * s/darwin.h: If autoconf detects the Ncurses library, define
        LIBS_TERMCAP to -lncurses to use it.

In lisp/:

2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * term/mac-win.el (scalable-fonts-allowed): Set to t.
2002-06-16 23:08:57 +00:00
Andrew Choi
e0f712ba55 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
lisp/ChangeLog, and src/ChangeLog for list of changes.
2002-04-26 23:39:06 +00:00
Andrew Choi
ae355fa64a 2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk>
* term/mac-win.el (mac-drag-n-drop): Decode file name by
	consulting the value of file-name-coding-system.
2001-09-04 03:43:23 +00:00
Andrew Choi
fa05f6ac1b 2001-08-24 Andrew Choi <akochoi@cse.cuhk.edu.hk>
* term/mac-win.el: Require scroll-bar.
2001-08-24 07:16:37 +00:00
Pavel Janík
e8af40eed4 Some fixes to follow coding conventions. 2001-07-16 12:23:00 +00:00
Andrew Choi
591b63b424 * term/mac-win.el: Remove load for ls-lisp.
* loadup.el: Load ls-lisp for system-type macos.
2000-12-12 05:04:07 +00:00
Kenichi Handa
dfc064f2b5 (decode-mac-roman, encode-mac-roman, mac-roman): Moved to european.el.
(ccl-encode-mac-roman-font, fontset-mac): Modified for
mule-unicode-2500-33ff and mule-unicode-e000-ffff.
(mac-roman-kbd-insert, mac-roman-kbd-mode): These functions deleted.
(mac-roman-kbd-mode, mac-roman-kbd-mode-map): These variables deleted.
2000-10-31 04:17:17 +00:00
Andrew Choi
8f47302e25 Andrew Choi <akochoi@i-cable.com>
* international/mule-conf.el (mac-roman-lower, mac-roman-upper):
        New charsets.

        * term/mac-win.el: Remove definitions of mac-roman-lower and
        mac-roman-upper, require dired, and define instead of set
        mac-ready-for-drag-n-drop to avoid compilation error.

        * src/macterm.c (XTread_socket): check whether Lisp variable
        mac-ready-for-drag-n-drop is bound rather than non-nil value.
2000-10-23 17:49:59 +00:00
Andrew Choi
1a578e9be2 Initial check-in: changes for building Emacs under Mac OS.
2000-10-23  Andrew Choi  <akochoi@i-cable.com>

	* dispextern.h [macintosh]: Include macgui.h instead of macterm.h.

	* dispnew.c [macintosh]: Include macterm.h.
	(init_display) [macintosh]: initialization for window system.

	* emacs.c (main) [macintosh]: Call syms_of_textprop,
	syms_of_macfns, syms_of_ccl, syms_of_fontset, syms_of_xterm,
	syms_of_search, x_term_init, and init_keyboard before calling
	init_window_once.  Also, call syms_of_xmenu.

	* fontset.c (syms_of_fontset) [macintosh]: Set ASCII font of
	default fontset to Monaco.

	* frame.c [macintosh]: Include macterm.h.  Remove declarations of
	NewMacWindow and DisposeMacWindow.
	(make_terminal_frame) [macintosh]: Call make_mac_terminal_frame
	instead of calling NewMacWindow and setting fields of
	f->output_data.mac directly.  Call init_frame_faces.
	(Fdelete_frame) [macintosh]: Remove unused code.
	(Fmodify_frame_parameters) [macintosh]: Call
	x_set_frame_parameters instead of mac_set_frame_parameters.

	* frame.h [macintosh]: Define menu_bar_lines field in struct
	frame.  Define FRAME_EXTERNAL_MENU_BAR macro.

	* keyboard.c [macintosh]: Include macterm.h.
	(kbd_buffer_get_event) [macintosh]: Generate delete_window_event
	and menu_bar_activate_event type events as for X and NT.
	(make_lispy_event) [macintosh]: Construct lisp events of type
	MENU_BAR_EVENT as for X and NT.

	* sysdep.c [macintosh]: Remove declaration for sys_signal.
	Include stdlib.h.  Remove definition of Vx_bitmap_file_path.
	(sys_subshell) [macintosh]: Remove definition entirely.
	(init_sys_modes) [macintosh]: Do not initialize Vwindow_system and
	Vwindow_system_version here.  Remove initialization of
	Vx_bitmap_file_path.
	(read_input_waiting): Correct the number of parameters passed to
	read_socket_hook.
	Move all Macintosh functions to mac/mac.c.

	* term.c [macintosh]: Include macterm.h.

	* window.c [macintosh]: Include macterm.h.

	* xdisp.c [macintosh]: Include macterm.h.  Declare
	set_frame_menubar and pending_menu_activation.
	(echo_area_display) [macintosh]: Do not return if terminal frame
	is the selected frame.
	(update_menu_bar) [macintosh]: Check FRAME_EXTERNAL_MENU_BAR (f).
	Allow only the selected frame to set menu bar.
	(redisplay_window) [macintosh]: Obtain menu bar to redisplay by
	calling FRAME_EXTERNAL_MENU_BAR (f).
	(display_menu_bar) [macintosh]: Check FRAME_MAC_P (f).

	* xfaces.c [macintosh]: Include macterm.h.  Define x_display_info
	and check_x.  Declare XCreateGC.  Define x_create_gc and
	x_free_gc.  Initialize font_sort_order.
	(x_face_list_fonts) [macintosh]: Use the same code as WINDOWSNT,
	but call x_list_fonts instead of w32_list_fonts.
	(Finternal_face_x_get_resource) [macintosh]: Do not call
	display_x_get_resource.
	(prepare_face_for_display) [macintosh]: Set xgcv.font.
	(realize_x_face) [macintosh]: Load the font if it is specified in
	ATTRS.
	(syms_of_xfaces) [macintosh]: Initialize Vscalable_fonts_allowed
	to Qt.

	* cus-edit.el (custom-button-face): Use 3D look for mac.
	(custom-button-pressed-face): Likewise.

	* faces.el (set-face-attributes-from-resources): Handle mac frames
	in the same way as x and w32 frames.
	(face-valid-attribute-values): Likewise.
	(read-face-attribute): Likewise.
	(defined-colors): Likewise.
	(color-defined-p): Likewise.
	(color-values): Likewise.
	(display-grayscale-p): Likewise.
	(face-set-after-frame-default): Likewise.
	(mode-line): Same default face as for x and w32.
	(tool-bar): Likewise.

	* frame.el: Remove call to frame-notice-user-settings at end of
	the file.

	* info.el (Info-fontify-node): make underlines invisible for mac
	as for x, pc, and w32 frame types.

	* term/mac-win.el: New file.
2000-10-22 16:50:16 +00:00