[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
|
From: |
Pavel Janík |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
|
Date: |
Thu, 13 Jun 2002 10:53:44 -0400 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.735 emacs/src/xterm.c:1.736
*** emacs/src/xterm.c:1.735 Tue May 28 16:27:59 2002
--- emacs/src/xterm.c Thu Jun 13 10:53:43 2002
***************
*** 6636,6644 ****
XButtonEvent *event;
struct frame *f;
{
! /* Make the event type no_event; we'll change that when we decide
otherwise. */
! result->kind = mouse_click;
result->code = event->button - Button1;
result->timestamp = event->time;
result->modifiers = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
--- 6636,6644 ----
XButtonEvent *event;
struct frame *f;
{
! /* Make the event type NO_EVENT; we'll change that when we decide
otherwise. */
! result->kind = MOUSE_CLICK_EVENT;
result->code = event->button - Button1;
result->timestamp = event->time;
result->modifiers = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
***************
*** 8325,8331 ****
/* Action hook installed via XtAppAddActionHook when toolkit scroll
bars are used.. The hook is responsible for detecting when
the user ends an interaction with the scroll bar, and generates
! a `end-scroll' scroll_bar_click' event if so. */
static void
xt_action_hook (widget, client_data, action_name, event, params,
--- 8325,8331 ----
/* Action hook installed via XtAppAddActionHook when toolkit scroll
bars are used.. The hook is responsible for detecting when
the user ends an interaction with the scroll bar, and generates
! a `end-scroll' SCROLL_BAR_CLICK_EVENT' event if so. */
static void
xt_action_hook (widget, client_data, action_name, event, params,
***************
*** 8455,8461 ****
XSETWINDOW (window, w);
f = XFRAME (w->frame);
! ievent->kind = scroll_bar_click;
ievent->frame_or_window = window;
ievent->arg = Qnil;
ievent->timestamp = XtLastTimestampProcessed (FRAME_X_DISPLAY (f));
--- 8455,8461 ----
XSETWINDOW (window, w);
f = XFRAME (w->frame);
! ievent->kind = SCROLL_BAR_CLICK_EVENT;
ievent->frame_or_window = window;
ievent->arg = Qnil;
ievent->timestamp = XtLastTimestampProcessed (FRAME_X_DISPLAY (f));
***************
*** 9513,9519 ****
}
/* Handle a mouse click on the scroll bar BAR. If *EMACS_EVENT's kind
! is set to something other than no_event, it is enqueued.
This may be called from a signal handler, so we have to ignore GC
mark bits. */
--- 9513,9519 ----
}
/* Handle a mouse click on the scroll bar BAR. If *EMACS_EVENT's kind
! is set to something other than NO_EVENT, it is enqueued.
This may be called from a signal handler, so we have to ignore GC
mark bits. */
***************
*** 9529,9535 ****
if (! GC_WINDOWP (bar->window))
abort ();
! emacs_event->kind = scroll_bar_click;
emacs_event->code = event->xbutton.button - Button1;
emacs_event->modifiers
= (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO
--- 9529,9535 ----
if (! GC_WINDOWP (bar->window))
abort ();
! emacs_event->kind = SCROLL_BAR_CLICK_EVENT;
emacs_event->code = event->xbutton.button - Button1;
emacs_event->modifiers
= (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO
***************
*** 9896,9902 ****
bcopy (&event, f->output_data.x->saved_menu_event, size); \
if (numchars >= 1) \
{ \
! bufp->kind = menu_bar_activate_event; \
XSETFRAME (bufp->frame_or_window, f); \
bufp->arg = Qnil;
\
bufp++; \
--- 9896,9902 ----
bcopy (&event, f->output_data.x->saved_menu_event, size); \
if (numchars >= 1) \
{ \
! bufp->kind = MENU_BAR_ACTIVATE_EVENT; \
XSETFRAME (bufp->frame_or_window, f); \
bufp->arg = Qnil;
\
bufp++; \
***************
*** 10113,10119 ****
if (numchars == 0)
abort ();
! bufp->kind = delete_window_event;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
bufp++;
--- 10113,10119 ----
if (numchars == 0)
abort ();
! bufp->kind = DELETE_WINDOW_EVENT;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
bufp++;
***************
*** 10203,10209 ****
if (numchars == 0)
abort ();
! bufp->kind = selection_clear_event;
SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
SELECTION_EVENT_TIME (bufp) = eventp->time;
--- 10203,10209 ----
if (numchars == 0)
abort ();
! bufp->kind = SELECTION_CLEAR_EVENT;
SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
SELECTION_EVENT_TIME (bufp) = eventp->time;
***************
*** 10232,10238 ****
if (numchars == 0)
abort ();
! bufp->kind = selection_request_event;
SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
SELECTION_EVENT_REQUESTOR (bufp) = eventp->requestor;
SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
--- 10232,10238 ----
if (numchars == 0)
abort ();
! bufp->kind = SELECTION_REQUEST_EVENT;
SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
SELECTION_EVENT_REQUESTOR (bufp) = eventp->requestor;
SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
***************
*** 10372,10378 ****
{
f->async_iconified = 1;
! bufp->kind = iconify_event;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
bufp++;
--- 10372,10378 ----
{
f->async_iconified = 1;
! bufp->kind = ICONIFY_EVENT;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
bufp++;
***************
*** 10404,10410 ****
if (f->iconified)
{
! bufp->kind = deiconify_event;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
bufp++;
--- 10404,10410 ----
if (f->iconified)
{
! bufp->kind = DEICONIFY_EVENT;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
bufp++;
***************
*** 10640,10646 ****
if (temp_index == sizeof temp_buffer / sizeof (short))
temp_index = 0;
temp_buffer[temp_index++] = keysym;
! bufp->kind = non_ascii_keystroke;
bufp->code = keysym;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
--- 10640,10646 ----
if (temp_index == sizeof temp_buffer / sizeof (short))
temp_index = 0;
temp_buffer[temp_index++] = keysym;
! bufp->kind = NON_ASCII_KEYSTROKE_EVENT;
bufp->code = keysym;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
***************
*** 10703,10710 ****
nbytes - i, len);
bufp->kind = (SINGLE_BYTE_CHAR_P (c)
! ? ascii_keystroke
! : multibyte_char_keystroke);
bufp->code = c;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
--- 10703,10710 ----
nbytes - i, len);
bufp->kind = (SINGLE_BYTE_CHAR_P (c)
! ? ASCII_KEYSTROKE_EVENT
! : MULTIBYTE_CHAR_KEYSTROKE_EVENT);
bufp->code = c;
XSETFRAME (bufp->frame_or_window, f);
bufp->arg = Qnil;
***************
*** 11032,11038 ****
struct input_event emacs_event;
int tool_bar_p = 0;
! emacs_event.kind = no_event;
bzero (&compose_status, sizeof (compose_status));
if (dpyinfo->grabbed
--- 11032,11038 ----
struct input_event emacs_event;
int tool_bar_p = 0;
! emacs_event.kind = NO_EVENT;
bzero (&compose_status, sizeof (compose_status));
if (dpyinfo->grabbed
***************
*** 11098,11104 ****
dpyinfo->grabbed &= ~(1 << event.xbutton.button);
}
! if (numchars >= 1 && emacs_event.kind != no_event)
{
bcopy (&emacs_event, bufp, sizeof (struct input_event));
bufp++;
--- 11098,11104 ----
dpyinfo->grabbed &= ~(1 << event.xbutton.button);
}
! if (numchars >= 1 && emacs_event.kind != NO_EVENT)
{
bcopy (&emacs_event, bufp, sizeof (struct input_event));
bufp++;