Mercurial > emacs
view admin/unidata/makefile.w32-in @ 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 | ce960720ed3f |
children | 417b1e4d63cd |
line wrap: on
line source
# makefile.w32-in -- W32 -*- Makefile -*- to generate character property tables. # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 # # This file is part of GNU Emacs. # GNU Emacs is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. EMACS = ../../src/$(BLD)/emacs.exe DSTDIR = ../../lisp/international lisp = $(CURDIR)/../../lisp # EMACSLOADPATH should include international, so Emacs finds encoded-kb. # It should include emacs-lisp, so Emacs finds bytecomp. This is because # lisp/subdirs.el is not generated yet when the commands below run. EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp # Quote EMACS so it could be a file name with embedded whitespace RUNEMACS = "$(EMACS)" -Q -batch all: $(DSTDIR)/charprop.el ../../src/biditype.h ../../src/bidimirror.h .el.elc: $(RUNEMACS) -f batch-byte-compile $< unidata.txt: UnicodeData.txt sed -e \ $(ARGQUOTE)s/\([^;]*\);\(.*\)/(#x\1 $(DQUOTE)\2$(DQUOTE))/$(ARGQUOTE)\ -e $(ARGQUOTE)s/;/$(DQUOTE) $(DQUOTE)/g$(ARGQUOTE) < UnicodeData.txt > $@ charprop-SH: unidata-gen.elc unidata.txt ELC=$(CURDIR)/unidata-gen.elc; \ DATA=$(CURDIR)/unidata.txt; \ cd $(DSTDIR); \ $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATA} charprop-CMD: unidata-gen.elc unidata.txt $(RUNEMACS) --eval $(ARGQUOTE)(cd $(DQUOTE)$(DSTDIR)$(DQUOTE))$(ARGQUOTE) --load $(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR)/unidata.txt ${DSTDIR}/charprop.el: charprop-$(SHELLTYPE) ../../src/biditype.h: UnicodeData.txt gawk -F";" -f biditype.awk -v BINMODE=2 $< > biditype.h $(CP) biditype.h $@ $(DEL) biditype.h ../../src/bidimirror.h: BidiMirroring.txt gawk -F"[; ]+" -f bidimirror.awk -v BINMODE=2 $< > bidimirror.h $(CP) bidimirror.h $@ $(DEL) bidimirror.h clean: - $(DEL) unidata-gen.elc unidata.txt biditype.h bidimirror.h