Mercurial > emacs

comparison src/xterm.c @ 83473:428d132b4028

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-73 Merge from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-74 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-75 Make ERC comply with the new copyright year guidelines. * emacs@sv.gnu.org/emacs--devo--0--patch-76 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-77 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-78 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-79 (rcirc-format-response-string): Fix small bugs * emacs@sv.gnu.org/emacs--devo--0--patch-80 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-81 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-82 Fix compiler error in erc-dcc.el. * emacs@sv.gnu.org/emacs--devo--0--patch-83 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-84 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-85 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-86 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-87 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-88 Merge from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-89 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-90 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-513
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 16 Feb 2006 16:18:54 +0000
parents 5816618f2b6d fb2632c6f0cc
children d08a7ef0cb8a
comparison
equal deleted inserted replaced
83472:b8bd59a73456 83473:428d132b4028
323 static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *)); 323 static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *));
324 static void x_set_window_size_1 P_ ((struct frame *, int, int, int)); 324 static void x_set_window_size_1 P_ ((struct frame *, int, int, int));
325 static const XColor *x_color_cells P_ ((Display *, int *)); 325 static const XColor *x_color_cells P_ ((Display *, int *));
326 static void x_update_window_end P_ ((struct window *, int, int)); 326 static void x_update_window_end P_ ((struct window *, int, int));
327 void x_delete_display P_ ((struct x_display_info *)); 327 void x_delete_display P_ ((struct x_display_info *));
328 static unsigned int x_x_to_emacs_modifiers P_ ((struct x_display_info *, 328
329 unsigned));
330 static int x_io_error_quitter P_ ((Display *)); 329 static int x_io_error_quitter P_ ((Display *));
331 int x_catch_errors P_ ((Display *)); 330 int x_catch_errors P_ ((Display *));
332 void x_uncatch_errors P_ ((Display *, int)); 331 void x_uncatch_errors P_ ((Display *, int));
333 void x_lower_frame P_ ((struct frame *)); 332 void x_lower_frame P_ ((struct frame *));
334 void x_scroll_bar_clear P_ ((struct frame *)); 333 void x_scroll_bar_clear P_ ((struct frame *));
3468 } 3467 }
3469 3468
3470 /* Convert between the modifier bits X uses and the modifier bits 3469 /* Convert between the modifier bits X uses and the modifier bits
3471 Emacs uses. */ 3470 Emacs uses. */
3472 3471
3473 static unsigned int 3472 unsigned int
3474 x_x_to_emacs_modifiers (dpyinfo, state) 3473 x_x_to_emacs_modifiers (dpyinfo, state)
3475 struct x_display_info *dpyinfo; 3474 struct x_display_info *dpyinfo;
3476 unsigned int state; 3475 unsigned int state;
3477 { 3476 {
3478 EMACS_UINT mod_meta = meta_modifier; 3477 EMACS_UINT mod_meta = meta_modifier;
3595 XMotionEvent *event; 3594 XMotionEvent *event;
3596 { 3595 {
3597 last_mouse_movement_time = event->time; 3596 last_mouse_movement_time = event->time;
3598 last_mouse_motion_event = *event; 3597 last_mouse_motion_event = *event;
3599 XSETFRAME (last_mouse_motion_frame, frame); 3598 XSETFRAME (last_mouse_motion_frame, frame);
3599
3600 if (!FRAME_X_OUTPUT (frame))
3601 return 0;
3600 3602
3601 if (event->window != FRAME_X_WINDOW (frame)) 3603 if (event->window != FRAME_X_WINDOW (frame))
3602 { 3604 {
3603 frame->mouse_moved = 1; 3605 frame->mouse_moved = 1;
3604 last_mouse_scroll_bar = Qnil; 3606 last_mouse_scroll_bar = Qnil;