Mercurial > emacs
view leim/Makefile.in @ 51207:7e176ef34c10
Make (many) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(make_window): Initialize new members
left_margin_cols, right_margin_cols, left_fringe_width,
right_fringe_width, fringes_outside_margins, scroll_bar_width,
and vertical_scroll_bar_type.
(coordinates_in_window): Adapted to new fringe/margin positions
and per-window fringes and scroll-bars.
Fix bug related to incorrectly adjusting coordinates by
frame's internal_border_width (the effect normally negible since
the internal_border_width is typically 0 or 1 pixel, but very
noticeable for an internal_border_width of e.g. 25 pixels).
Upon successful return (other than ON_NOTHING), the coordinates
are now always properly converted to window relative for the
given display element.
(window_from_coordinates): Add new parameters wx and wy to
return the window relative x and y position in the returned
window and part. A null arg means, don't return the position.
All callers changed.
(adjust_window_margins): New function which may reduce the width
of the display margins if a window's text area is too small after
resizing or splitting windows.
(size_window): Fix bug that did not account for display margin
widths when checking the minimum width of a window; use
adjust_window_margins.
(set_window_buffer): Call Fset_window_fringes and
Fset_window_scroll_bars to setup per-window elements.
Add new arg KEEP_MARGINS_P. Non-nil means to keep window's
existing display margin, fringe widths, and scroll bar settings
(e.g. after splitting a window or resizing the frame). All
callers changed.
(Fset_window_buffer): New arg KEEP_MARGINS. All callers changed.
(Fsplit_window): Duplicate original window's display margin,
fringe, and scroll-bar settings; then call Fset_window_buffer with
KEEP_MARGINS non-nil. This fixes a bug which caused a split
window to only preserve the display margins in one of the windows.
When splitting horisontally, call adjust_window_margins on both
windows to ensure that the text area of the new windows is non too
narrow. This fixes a bug which could cause emacs to trap if the
width of the split window was less than the width of the display
margins.
(window_box_text_cols): Renamed from window_internal_width. All
uses changed. Adapt to per-window fringes and scroll bars.
Fix bug that caused vertical separator to be subtracted also on
window frames. Fix another bug that did not reduce the returned
value by the columns used for display margins.
(window_scroll_line_based): Fix bug related to scrolling too much
when display margins are present (implicitly fixed by the fix to
window_box_text_cols).
(scroll_left, scroll_right): Fix bug related to scrolling too far
by default when display margins are present (implicitly fixed by
the fix to window_box_text_cols).
(struct saved_window): Rename members left to left_col, top to
top_line, width to total_cols, height to total_lines, orig_top to
orig_top_line, orig_height to orig_total_lines. All uses changed.
New members left_margin_cols, right_margin_cols,
left_fringe_width, right_fringe_width, fringes_outside_margins,
scroll_bar_width, and vertical_scroll_bar_type for saving
per-window display elements.
(Fset_window_configuration): Restore display margins, fringes,
and scroll bar settings. This fixes a bug which caused display
margins to be discarded when saving and restoring a window
configuration.
(save_window_save): Save display margins, fringes, and scroll bar
settings. This fixes a bug which caused display margins to be
discarded when saving and restoring a window configuration.
(Fset_window_margins): Do nothing if display margins are not
really changed. Otherwise, call adjust_window_margins to ensure
the text area doesn't get too narrow. This fixes a bug which
could cause emacs to trap if setting display margins wider than
the width of the window.
(Fset_window_fringes): New defun to allow user to specifically set
this window's fringe widths and position vs. display margins.
(Fwindow_fringes): New defun to return window's actual fringe
settings.
(Fset_window_scroll_bars): New defun to allow user to specifically
set this window's scroll bar width and position.
(Fwindow_scroll_bars): New defun to return window's actual scroll
bar settings.
(compare_window_configurations): Also compare display margins,
fringes, and scroll bar settings.
(syms_of_window): Defsubr new defuns for fringe and scroll bars.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 22:07:51 +0000 |
parents | 0f86c147686f |
children | 695cf19ef79e |
line wrap: on
line source
# Makefile for leim subdirectory in GNU Emacs. # Copyright (C) 1997 Electrotechnical Laboratory, JAPAN. # Licensed to the Free Software Foundation. # 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 2, 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; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # Avoid trouble on systems where the `SHELL' variable might be # inherited from the environment. SHELL = /bin/sh # Here are the things that we expect ../configure to edit. version=@version@ prefix=@prefix@ datadir=@datadir@ srcdir=@srcdir@ # Where to install LEIM files. INSTALLDIR=${datadir}/emacs/${version}/leim # On Xenix and the IBM RS6000, double-dot gets screwed up. dot = . # Which Emacs to use to convert TIT files to Emacs Lisp files, # byte-compile Emacs Lisp files, and generate the file leim-list.el. BUILT-EMACS = ${dot}${dot}/src/emacs buildlisppath=${srcdir}/${dot}${dot}/lisp # How to run Emacs. RUN-EMACS = EMACSLOADPATH=$(buildlisppath) \ ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte # Subdirectories to be made if ${srcdir} is different from the current # directory. SUBDIRS=quail # Files generated from TIT dictionaries for Chinese GB character set. TIT-GB=\ quail/CCDOSPY.elc \ quail/Punct.elc \ quail/QJ.elc \ quail/SW.elc \ quail/TONEPY.elc # Files generated from TIT dictionaries for Chinese BIG5 character set. TIT-BIG5=\ quail/4Corner.elc \ quail/ARRAY30.elc \ quail/ECDICT.elc \ quail/ETZY.elc \ quail/Punct-b5.elc \ quail/PY-b5.elc \ quail/QJ-b5.elc \ quail/ZOZY.elc CHINESE-TIT=${TIT-GB} ${TIT-BIG5} NON-TIT-GB=${srcdir}/quail/py-punct.elc NON-TIT-BIG5=${srcdir}/quail/pypunct-b5.elc CHINESE-NON-TIT=${NON-TIT-GB} ${NON-TIT-BIG5} CHINESE-GB=${TIT-GB} ${NON-TIT-GB} CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5} JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc KOREAN= ${srcdir}/quail/hangul.elc \ ${srcdir}/quail/hangul3.elc \ ${srcdir}/quail/hanja.elc \ ${srcdir}/quail/hanja3.elc \ ${srcdir}/quail/hanja-jis.elc \ ${srcdir}/quail/symbol-ksc.elc THAI=${srcdir}/quail/thai.elc VIETNAMESE=${srcdir}/quail/viqr.elc ${srcdir}/quail/vntelex.elc LAO=${srcdir}/quail/lao.elc ${srcdir}/quail/lrt.elc INDIAN=${srcdir}/quail/indian.elc TIBETAN=${srcdir}/quail/tibetan.elc LATIN= ${srcdir}/quail/latin-pre.elc \ ${srcdir}/quail/latin-post.elc \ ${srcdir}/quail/latin-alt.elc \ ${srcdir}/quail/latin-ltx.elc \ ${srcdir}/quail/welsh.elc UNICODE=${srcdir}/quail/sgml-input.elc ${srcdir}/quail/rfc1345.elc \ ${srcdir}/quail/uni-input.elc SLAVIC= \ ${srcdir}/quail/czech.elc \ ${srcdir}/quail/croatian.elc \ ${srcdir}/quail/slovak.elc GREEK=${srcdir}/quail/greek.elc RUSSIAN=${srcdir}/quail/cyrillic.elc ${srcdir}/quail/cyril-jis.elc MISC= \ ${srcdir}/quail/ethiopic.elc \ ${srcdir}/quail/ipa.elc \ ${srcdir}/quail/hebrew.elc \ ${srcdir}/quail/georgian.elc MISC-DIC=\ quail/tsang-b5.elc \ quail/quick-b5.elc \ quail/tsang-cns.elc \ quail/quick-cns.elc \ quail/PY.elc \ quail/ZIRANMA.elc \ quail/CTLau.elc \ quail/CTLau-b5.elc CHINESE=${CHINESE-GB} ${CHINESE-BIG5} EASTASIA=${CHINESE} ${JAPANESE} ${KOREAN} ASIA=${EASTASIA} ${THAI} ${VIETNAMESE} ${LAO} ${INDIAN} ${TIBETAN} EUROPEAN=${LATIN} ${SLAVIC} ${GREEK} ${RUSSIAN} WORLD=${ASIA} ${EUROPEAN} ${MISC} ${MISC-DIC} ${UNICODE} TIT=${CHINESE-TIT} NON-TIT=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${MISC} .SUFFIXES: .elc .el .el.elc: ${RUN-EMACS} -f batch-byte-compile $< all: ${BUILT-EMACS} ${SUBDIRS} ${TIT} ${MISC-DIC} leim-list.el # To ensure that we can run Emacs. This target is ignored (never # being hit) if a user changes default value of EMACS. ${dot}${dot}/src/emacs: cd ../src; ${MAKE} ${MFLAGS} emacs ${SUBDIRS}: mkdir $@ touch stamp-subdir # The rules which generate ${TIT} and ${MISC-DIC} files create them all # in one go. So we need to prevent parallel execution for that target, # otherwise Emacs complains about files being locked. .NOTPARALLEL is # for GNU Make, .NO_PARALLEL is for other Make's. .NOTPARALLEL: ${TIT} ${MISC-DIC} .NO_PARALLEL: ${TIT} ${MISC-DIC} # Rule to generate quail/*.el from CXTERM-DIC/*.tit. # The "if [ -f $@ ]; then true; " part prevents parallel Make's # which don't honor .NOTPARALLEL, such as SGI's Make, from running # this rule many times, one each for every file it creates. ${TIT}: if [ -d quail ]; then true; else make quail; fi if [ -f $@ ]; then true; else \ ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \ --eval '(batch-titdic-convert t)' -dir quail ${srcdir}/CXTERM-DIC; fi if [ -f $@ ]; then true; else \ ${RUN-EMACS} -l ${buildlisppath}/international/quail \ -f batch-byte-compile ${TIT:.elc=.el}; fi # Rule to generate quail/*.el from MISC-DIC/*. ${MISC-DIC}: if [ -d quail ]; then true; else make quail; fi if [ -f $@ ]; then true; else \ ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; fi if [ -f $@ ]; then true; else \ ${RUN-EMACS} -l ${buildlisppath}/international/quail \ -f batch-byte-compile ${MISC-DIC:.elc=.el}; fi leim-list.el: ${SUBDIRS} ${WORLD} if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ ${RUN-EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\")" ; \ else \ ${RUN-EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \ fi install: all if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \ rm -rf ${INSTALLDIR}/leim-list.el; \ rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \ echo "Copying leim files to ${INSTALLDIR} ..." ; \ if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ tar -chf - leim-list.el quail ja-dic \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ else \ tar -chf - leim-list.el quail \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ cd ${srcdir}; \ tar -chf - quail/* ja-dic \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ fi; \ rm -rf ${INSTALLDIR}/CVS ${INSTALLDIR}/*/CVS; \ rm -f ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore; \ rm -f ${INSTALLDIR}/\#* ${INSTALLDIR}/*/\#* ; \ rm -f ${INSTALLDIR}/.\#* ${INSTALLDIR}/*/.\#* ; \ rm -f ${INSTALLDIR}/*~ ${INSTALLDIR}/*/*~ ; \ rm -f ${INSTALLDIR}/*.orig ${INSTALLDIR}/*/*.orig ; \ else true; fi -chmod -R a+r ${INSTALLDIR} clean mostlyclean: rm -f ${TIT} ${NON-TIT} ${WORLD} ${TIT:.elc=.el} \ ${MISC-DIC} ${MISC-DIC:.elc=.el} leim-list.el distclean maintainer-clean: if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi rm -f Makefile extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~