mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

*** empty log message ***

Browse Source
This commit is contained in:
Pavel Janík 2002-06-13 15:00:02 +00:00
parent 3b8f965153
commit e43bd4f5b2
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ChangeLog
View File

@ -1,3 +1,21 @@
2002-06-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* macterm.c, macmenu.c, msdos.c, sysdep.c, termhooks.h, xterm.h
* xsmfns.c, w32term.c, w32menu.c, w32inevt.c: Rename enum event_kind
as follows: ascii_keystroke to ASCII_KEYSTROKE_EVENT,
multibyte_char_keystroke to MULTIBYTE_CHAR_KEYSTROKE_EVENT,
non_ascii_keystroke to NON_ASCII_KEYSTROKE_EVENT, timer_event to
TIMER_EVENT, mouse_click to MOUSE_CLICK_EVENT, mouse_wheel to
MOUSE_WHEEL_EVENT, language_change_event to LANGUAGE_CHANGE_EVENT,
scroll_bar_click to SCROLL_BAR_CLICK_EVENT, w32_scroll_bar_click
to W32_SCROLL_BAR_CLICK_EVENT, selection_request_event to
SELECTION_REQUEST_EVENT, selection_clear_event to
SELECTION_CLEAR_EVENT, buffer_switch_event to BUFFER_SWITCH_EVENT,
delete_window_event to DELETE_WINDOW_EVENT, iconify_event to
ICONIFY_EVENT, deiconify_event to DEICONIFY_EVENT,
menu_bar_activate_event to MENU_BAR_ACTIVATE_EVENT, drag_n_drop to
DRAG_N_DROP_EVENT, save_session_event to SAVE_SESSION_EVENT.
2002-06-12 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* macmenu.c: Remove declaration of Qmouse_click and Qevent_kind.

6
src/sysdep.c
View File

@ -2011,7 +2011,7 @@ kbd_input_ast ()
if (c >= 0)
{
struct input_event e;
e.kind = ascii_keystroke;
e.kind = ASCII_KEYSTROKE_EVENT;
XSETINT (e.code, c);
e.frame_or_window = selected_frame;
kbd_buffer_store_event (&e);
@ -2680,7 +2680,7 @@ read_input_waiting ()
kbd_buffer_store_event (&buf[i]);
/* Don't look at input that follows a C-g too closely.
This reduces lossage due to autorepeat on C-g. */
if (buf[i].kind == ascii_keystroke
if (buf[i].kind == ASCII_KEYSTROKE_EVENT
&& buf[i].code == quit_char)
break;
}
@ -2691,7 +2691,7 @@ read_input_waiting ()
nread = read (fileno (stdin), buf, 1);
/* Scan the chars for C-g and store them in kbd_buffer. */
e.kind = ascii_keystroke;
e.kind = ASCII_KEYSTROKE_EVENT;
e.frame_or_window = selected_frame;
e.modifiers = 0;
for (i = 0; i < nread; i++)

6
src/w32inevt.c
View File

@ -426,7 +426,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
if (lispy_function_keys[event->wVirtualKeyCode] == 0)
{
emacs_ev->kind = ascii_keystroke;
emacs_ev->kind = ASCII_KEYSTROKE_EVENT;
if (!NILP (Vw32_recognize_altgr)
&& (event->dwControlKeyState & LEFT_CTRL_PRESSED)
@ -468,7 +468,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
}
else
{
emacs_ev->kind = non_ascii_keystroke;
emacs_ev->kind = NON_ASCII_KEYSTROKE_EVENT;
XSETINT (emacs_ev->code, event->wVirtualKeyCode);
}
@ -584,7 +584,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
if (event->dwButtonState == button_state)
return 0;
emacs_ev->kind = mouse_click;
emacs_ev->kind = MOUSE_CLICK_EVENT;
/* Find out what button has changed state since the last button event. */
but_change = button_state ^ event->dwButtonState;

6
src/xterm.h
View File

@ -905,11 +905,11 @@ struct scroll_bar
- (f)->output_data.x->internal_border_width)))
/* If a struct input_event has a kind which is selection_request_event
or selection_clear_event, then its contents are really described
/* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT
or SELECTION_CLEAR_EVENT, then its contents are really described
by this structure. */
/* For an event of kind selection_request_event,
/* For an event of kind SELECTION_REQUEST_EVENT,
this structure really describes the contents.
**Don't make this struct longer!**
If it overlaps the frame_or_window field of struct input_event,