Mercurial > emacs
comparison src/keyboard.c @ 90072:cb67264d6096
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
Remove "-face" suffix from lazy-highlight face name
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22
<no summary provided>
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40
Fix regressions from latest reftex update
* miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0
tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
Merge from miles@gnu.org--gnu-2004
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3
Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 16 Jan 2005 03:40:12 +0000 |
parents | eac554634bfa 66df67e643ac |
children | 6d92d69fae33 |
comparison
equal
deleted
inserted
replaced
90071:f6b4d0ebf147 | 90072:cb67264d6096 |
---|---|
6843 #ifdef SYNC_INPUT | 6843 #ifdef SYNC_INPUT |
6844 interrupt_input_pending = 1; | 6844 interrupt_input_pending = 1; |
6845 #else | 6845 #else |
6846 SIGNAL_THREAD_CHECK (signo); | 6846 SIGNAL_THREAD_CHECK (signo); |
6847 #endif | 6847 #endif |
6848 | 6848 |
6849 if (input_available_clear_time) | 6849 if (input_available_clear_time) |
6850 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); | 6850 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); |
6851 | 6851 |
6852 #ifndef SYNC_INPUT | 6852 #ifndef SYNC_INPUT |
6853 handle_async_input (); | 6853 handle_async_input (); |
10514 XSETFASTINT (val[3], quit_char); | 10514 XSETFASTINT (val[3], quit_char); |
10515 | 10515 |
10516 return Flist (sizeof (val) / sizeof (val[0]), val); | 10516 return Flist (sizeof (val) / sizeof (val[0]), val); |
10517 } | 10517 } |
10518 | 10518 |
10519 DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 3, 0, | 10519 DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0, |
10520 doc: /* Return position information for pixel coordinates X and Y. | 10520 doc: /* Return position information for pixel coordinates X and Y. |
10521 By default, X and Y are relative to text area of the selected window. | 10521 By default, X and Y are relative to text area of the selected window. |
10522 Optional third arg FRAME_OR_WINDOW non-nil specifies frame or window. | 10522 Optional third arg FRAME_OR_WINDOW non-nil specifies frame or window. |
10523 If optional fourth arg WHOLE is non-nil, X is relative to the left | |
10524 edge of the window. | |
10523 | 10525 |
10524 The return value is similar to a mouse click position: | 10526 The return value is similar to a mouse click position: |
10525 (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW) | 10527 (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW) |
10526 IMAGE (DX . DY) (WIDTH . HEIGHT)) | 10528 IMAGE (DX . DY) (WIDTH . HEIGHT)) |
10527 The `posn-' functions access elements of such lists. */) | 10529 The `posn-' functions access elements of such lists. */) |
10528 (x, y, frame_or_window) | 10530 (x, y, frame_or_window, whole) |
10529 Lisp_Object x, y, frame_or_window; | 10531 Lisp_Object x, y, frame_or_window, whole; |
10530 { | 10532 { |
10531 if (NILP (frame_or_window)) | 10533 if (NILP (frame_or_window)) |
10532 frame_or_window = selected_window; | 10534 frame_or_window = selected_window; |
10533 | 10535 |
10534 if (WINDOWP (frame_or_window)) | 10536 if (WINDOWP (frame_or_window)) |
10537 | 10539 |
10538 CHECK_LIVE_WINDOW (frame_or_window); | 10540 CHECK_LIVE_WINDOW (frame_or_window); |
10539 | 10541 |
10540 w = XWINDOW (frame_or_window); | 10542 w = XWINDOW (frame_or_window); |
10541 XSETINT (x, (WINDOW_TO_FRAME_PIXEL_X (w, XINT (x)) | 10543 XSETINT (x, (WINDOW_TO_FRAME_PIXEL_X (w, XINT (x)) |
10542 + window_box_left_offset (w, TEXT_AREA))); | 10544 + (NILP (whole) |
10545 ? window_box_left_offset (w, TEXT_AREA) | |
10546 : - (WINDOW_LEFT_SCROLL_BAR_COLS (w) | |
10547 * WINDOW_FRAME_COLUMN_WIDTH (w))))); | |
10543 XSETINT (y, WINDOW_TO_FRAME_PIXEL_Y (w, XINT (y))); | 10548 XSETINT (y, WINDOW_TO_FRAME_PIXEL_Y (w, XINT (y))); |
10544 frame_or_window = w->frame; | 10549 frame_or_window = w->frame; |
10545 } | 10550 } |
10546 | 10551 |
10547 CHECK_LIVE_FRAME (frame_or_window); | 10552 CHECK_LIVE_FRAME (frame_or_window); |
10565 { | 10570 { |
10566 Lisp_Object tem; | 10571 Lisp_Object tem; |
10567 | 10572 |
10568 tem = Fpos_visible_in_window_p (pos, window, Qt); | 10573 tem = Fpos_visible_in_window_p (pos, window, Qt); |
10569 if (!NILP (tem)) | 10574 if (!NILP (tem)) |
10570 tem = Fposn_at_x_y (XCAR (tem), XCAR (XCDR (tem)), window); | 10575 tem = Fposn_at_x_y (XCAR (tem), XCAR (XCDR (tem)), window, Qnil); |
10571 return tem; | 10576 return tem; |
10572 } | 10577 } |
10573 | 10578 |
10574 | 10579 |
10575 /* | 10580 /* |
11265 DEFVAR_KBOARD ("overriding-terminal-local-map", | 11270 DEFVAR_KBOARD ("overriding-terminal-local-map", |
11266 Voverriding_terminal_local_map, | 11271 Voverriding_terminal_local_map, |
11267 doc: /* Per-terminal keymap that overrides all other local keymaps. | 11272 doc: /* Per-terminal keymap that overrides all other local keymaps. |
11268 If this variable is non-nil, it is used as a keymap instead of the | 11273 If this variable is non-nil, it is used as a keymap instead of the |
11269 buffer's local map, and the minor mode keymaps and text property keymaps. | 11274 buffer's local map, and the minor mode keymaps and text property keymaps. |
11270 It also overrides `overriding-local-map'. | 11275 It also replaces `overriding-local-map'. |
11276 | |
11271 This variable is intended to let commands such as `universal-argument' | 11277 This variable is intended to let commands such as `universal-argument' |
11272 set up a different keymap for reading the next command. */); | 11278 set up a different keymap for reading the next command. */); |
11273 | 11279 |
11274 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, | 11280 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, |
11275 doc: /* Keymap that overrides all other local keymaps. | 11281 doc: /* Keymap that overrides all other local keymaps. |
11276 If this variable is non-nil, it is used as a keymap instead of the | 11282 If this variable is non-nil, it is used as a keymap--replacing the |
11277 buffer's local map, and the minor mode keymaps and text property keymaps. */); | 11283 buffer's local map, the minor mode keymaps, and char property keymaps. */); |
11278 Voverriding_local_map = Qnil; | 11284 Voverriding_local_map = Qnil; |
11279 | 11285 |
11280 DEFVAR_LISP ("overriding-local-map-menu-flag", &Voverriding_local_map_menu_flag, | 11286 DEFVAR_LISP ("overriding-local-map-menu-flag", &Voverriding_local_map_menu_flag, |
11281 doc: /* Non-nil means `overriding-local-map' applies to the menu bar. | 11287 doc: /* Non-nil means `overriding-local-map' applies to the menu bar. |
11282 Otherwise, the menu bar continues to reflect the buffer's local map | 11288 Otherwise, the menu bar continues to reflect the buffer's local map |