[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Sun, 09 Mar 2003 15:43:06 -0500 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.775 emacs/src/xterm.c:1.776
*** emacs/src/xterm.c:1.775 Sat Mar 8 05:16:04 2003
--- emacs/src/xterm.c Sun Mar 9 15:43:03 2003
***************
*** 8436,8441 ****
--- 8436,8445 ----
{
Lisp_Object tail;
+ #ifdef USE_GTK
+ window_id = (Window) xg_get_scroll_id_for_window (window_id);
+ #endif /* USE_GTK */
+
for (tail = Vframe_list;
XGCTYPE (tail) == Lisp_Cons;
tail = XCDR (tail))
***************
*** 9860,9866 ****
This may be called from a signal handler, so we have to ignore GC
mark bits. */
- #ifndef USE_TOOLKIT_SCROLL_BARS
static void
x_scroll_bar_handle_click (bar, event, emacs_event)
--- 9864,9869 ----
***************
*** 9914,9919 ****
--- 9917,9923 ----
XSETINT (bar->dragging, y - XINT (bar->start));
#endif
+ #ifndef USE_TOOLKIT_SCROLL_BARS
/* If the user has released the handle, set it to its final position. */
if (event->type == ButtonRelease
&& ! NILP (bar->dragging))
***************
*** 9924,9929 ****
--- 9928,9934 ----
x_scroll_bar_set_handle (bar, new_start, new_end, 0);
bar->dragging = Qnil;
}
+ #endif
/* Same deal here as the other #if 0. */
#if 0
***************
*** 9941,9946 ****
--- 9946,9953 ----
}
}
+ #ifndef USE_TOOLKIT_SCROLL_BARS
+
/* Handle some mouse motion while someone is dragging the scroll bar.
This may be called from a signal handler, so we have to ignore GC
***************
*** 11421,11430 ****
}
else
{
- #ifndef USE_TOOLKIT_SCROLL_BARS
struct scroll_bar *bar
= x_window_to_scroll_bar (event.xbutton.window);
if (bar)
x_scroll_bar_handle_click (bar, &event, &emacs_event);
#endif /* not USE_TOOLKIT_SCROLL_BARS */
--- 11428,11445 ----
}
else
{
struct scroll_bar *bar
= x_window_to_scroll_bar (event.xbutton.window);
+ #ifdef USE_TOOLKIT_SCROLL_BARS
+ /* Make the "Ctrl-Mouse-2 splits window" work for toolkit
+ scroll bars. */
+ if (bar && event.xbutton.state & ControlMask)
+ {
+ x_scroll_bar_handle_click (bar, &event, &emacs_event);
+ *finish = X_EVENT_DROP;
+ }
+ #else /* not USE_TOOLKIT_SCROLL_BARS */
if (bar)
x_scroll_bar_handle_click (bar, &event, &emacs_event);
#endif /* not USE_TOOLKIT_SCROLL_BARS */
***************
*** 11534,11540 ****
OTHER:
#ifdef USE_X_TOOLKIT
BLOCK_INPUT;
! XtDispatchEvent (&event);
UNBLOCK_INPUT;
#endif /* USE_X_TOOLKIT */
break;
--- 11549,11556 ----
OTHER:
#ifdef USE_X_TOOLKIT
BLOCK_INPUT;
! if (*finish != X_EVENT_DROP)
! XtDispatchEvent (&event);
UNBLOCK_INPUT;
#endif /* USE_X_TOOLKIT */
break;
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2003/03/04
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2003/03/08
- [Emacs-diffs] Changes to emacs/src/xterm.c,
Jan Djärv <=
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F. Storm, 2003/03/12
- [Emacs-diffs] Changes to emacs/src/xterm.c, Andreas Schwab, 2003/03/12
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2003/03/14
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F. Storm, 2003/03/16
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2003/03/17
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F. Storm, 2003/03/21
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2003/03/22
- [Emacs-diffs] Changes to emacs/src/xterm.c, Stefan Monnier, 2003/03/28