diff options
| author | Andrew Choi <akochoi@shaw.ca> | 2002-08-03 22:21:09 +0000 |
|---|---|---|
| committer | Andrew Choi <akochoi@shaw.ca> | 2002-08-03 22:21:09 +0000 |
| commit | 742fbed75b4cd5c2c2e7a8d4c0f4add9957e7f9a (patch) | |
| tree | 2d119dccd908ef943fd9343fbaa646808dc3e0e4 /src/termhooks.h | |
| parent | 365417014078a0f260fd24d41845aeb274b876c8 (diff) | |
| download | emacs-742fbed75b4cd5c2c2e7a8d4c0f4add9957e7f9a.tar.gz | |
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.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 63fa1f0ee3b..a479b5bdc1a 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -242,9 +242,9 @@ enum event_kind the mouse click occurred in. .timestamp gives a timestamp (in milliseconds) for the click. */ -#ifdef WINDOWSNT +#if defined(WINDOWSNT) || defined(MAC_OSX) MOUSE_WHEEL_EVENT, /* A mouse-wheel event is generated - on WINDOWSNT by a + on WINDOWSNT or MAC_OSX by a wheel on a mouse (e.g., MS Intellimouse). The event contains a delta that corresponds to the amount and direction that the wheel @@ -259,6 +259,8 @@ enum event_kind the wheel event occurred in. .timestamp gives a timestamp (in milliseconds) for the wheel event. */ +#endif +#ifdef WINDOWSNT LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is generated on WINDOWSNT when the keyboard layout or input language is changed by the |