comparison src/window.h @ 111566:b4dbe6c4111e

Cleanup of window coordinate positioning code. Now, text area click input events measure Y from the top of the text area, excluding the header line if any. * src/dispnew.c (buffer_posn_from_coords): Assume that X counts from the start of the text area. * src/keyboard.c (make_lispy_position): For text area clicks, record Y pixel position relative to the text area, excluding header line. Also change X and Y to Lisp_Objects, not pointers; don't return coordinate values via pointers. Pass ON_TEXT_AREA coordinate to buffer_posn_from_coords counting from the start of the text area. (Fposn_at_x_y, make_lispy_event): Callers changed. * src/w32term.c (w32_read_socket): * src/msdos.c (dos_rawgetc): * src/xterm.c (handle_one_xevent): Likewise. * src/window.c (coordinates_in_window): Change X and Y to ints rather than pointers; don't return coordinates via pointers. (struct check_window_data): Change X and Y from pointers to ints. (window_from_coordinates): Remove args WX and WY; don't return coordinates via pointers. (Fcoordinates_in_window_p, window_from_coordinates): (check_window_containing, Fwindow_at): Callers changed. (window_relative_x_coord): New function. * src/window.h (window_from_coordinates, window_relative_x_coord): Update prototypes. * src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates call. Use window_relative_x_coord. (note_mouse_highlight): Change window_from_coordinates call.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 16 Nov 2010 21:37:45 -0500
parents 8e4172d91b56
children ac49e05bfcf2
comparison
equal deleted inserted replaced
111565:88b67190d0b2 111566:b4dbe6c4111e
786 EXFUN (Fwindow_live_p, 1); 786 EXFUN (Fwindow_live_p, 1);
787 EXFUN (Fset_window_point, 2); 787 EXFUN (Fset_window_point, 2);
788 extern Lisp_Object make_window (void); 788 extern Lisp_Object make_window (void);
789 extern void delete_window (Lisp_Object); 789 extern void delete_window (Lisp_Object);
790 extern Lisp_Object window_from_coordinates (struct frame *, int, int, 790 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
791 enum window_part *, 791 enum window_part *, int);
792 int *, int*, int);
793 EXFUN (Fwindow_dedicated_p, 1); 792 EXFUN (Fwindow_dedicated_p, 1);
794 extern int window_height (Lisp_Object); 793 extern int window_height (Lisp_Object);
795 extern int window_width (Lisp_Object); 794 extern int window_width (Lisp_Object);
796 EXFUN (Fwindow_full_width_p, 1); 795 EXFUN (Fwindow_full_width_p, 1);
797 extern void set_window_height (Lisp_Object, int, int); 796 extern void set_window_height (Lisp_Object, int, int);
802 extern void foreach_window (struct frame *, 801 extern void foreach_window (struct frame *,
803 int (* fn) (struct window *, void *), 802 int (* fn) (struct window *, void *),
804 void *); 803 void *);
805 extern void grow_mini_window (struct window *, int); 804 extern void grow_mini_window (struct window *, int);
806 extern void shrink_mini_window (struct window *); 805 extern void shrink_mini_window (struct window *);
806 extern int window_relative_x_coord (struct window *, enum window_part, int);
807 807
808 void run_window_configuration_change_hook (struct frame *f); 808 void run_window_configuration_change_hook (struct frame *f);
809 809
810 /* Make WINDOW display BUFFER as its contents. RUN_HOOKS_P non-zero 810 /* Make WINDOW display BUFFER as its contents. RUN_HOOKS_P non-zero
811 means it's allowed to run hooks. See make_frame for a case where 811 means it's allowed to run hooks. See make_frame for a case where