Mercurial > emacs
comparison src/xterm.c @ 90188:01137c1fdbe9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 324-352)
- Merge from gnus--rel--5.10
- Update from CVS
- etc/emacs-buffer.gdb: Remove RCS keywords
* gnus--rel--5.10 (patch 70-79)
- Update from CVS
- Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 06 Jun 2005 02:39:45 +0000 |
parents | 62afea0771d8 c79b5010b654 |
children | 173dee4e2611 |
comparison
equal
deleted
inserted
replaced
90187:587ea1490d70 | 90188:01137c1fdbe9 |
---|---|
904 if (font_info->font_encoder) | 904 if (font_info->font_encoder) |
905 { | 905 { |
906 /* It's a program. */ | 906 /* It's a program. */ |
907 struct ccl_program *ccl = font_info->font_encoder; | 907 struct ccl_program *ccl = font_info->font_encoder; |
908 | 908 |
909 check_ccl_update (ccl); | |
909 if (CHARSET_DIMENSION (charset) == 1) | 910 if (CHARSET_DIMENSION (charset) == 1) |
910 { | 911 { |
911 ccl->reg[0] = CHARSET_ID (charset); | 912 ccl->reg[0] = CHARSET_ID (charset); |
912 ccl->reg[1] = char2b->byte2; | 913 ccl->reg[1] = char2b->byte2; |
913 ccl->reg[2] = -1; | 914 ccl->reg[2] = -1; |
6780 | 6781 |
6781 if (event.type == ButtonPress) | 6782 if (event.type == ButtonPress) |
6782 { | 6783 { |
6783 dpyinfo->grabbed |= (1 << event.xbutton.button); | 6784 dpyinfo->grabbed |= (1 << event.xbutton.button); |
6784 last_mouse_frame = f; | 6785 last_mouse_frame = f; |
6785 /* Ignore any mouse motion that happened | |
6786 before this event; any subsequent mouse-movement | |
6787 Emacs events should reflect only motion after | |
6788 the ButtonPress. */ | |
6789 if (f != 0) | |
6790 f->mouse_moved = 0; | |
6791 | 6786 |
6792 if (!tool_bar_p) | 6787 if (!tool_bar_p) |
6793 last_tool_bar_item = -1; | 6788 last_tool_bar_item = -1; |
6794 } | 6789 } |
6795 else | 6790 else |
6796 dpyinfo->grabbed &= ~(1 << event.xbutton.button); | 6791 dpyinfo->grabbed &= ~(1 << event.xbutton.button); |
6792 | |
6793 /* Ignore any mouse motion that happened before this event; | |
6794 any subsequent mouse-movement Emacs events should reflect | |
6795 only motion after the ButtonPress/Release. */ | |
6796 if (f != 0) | |
6797 f->mouse_moved = 0; | |
6797 | 6798 |
6798 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | 6799 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
6799 f = x_menubar_window_to_frame (dpyinfo, event.xbutton.window); | 6800 f = x_menubar_window_to_frame (dpyinfo, event.xbutton.window); |
6800 /* For a down-event in the menu bar, | 6801 /* For a down-event in the menu bar, |
6801 don't pass it to Xt right now. | 6802 don't pass it to Xt right now. |