fix most of the gtk3 deprecations

This commit is contained in:
Steven Honeyman 2014-07-03 01:43:29 +01:00
parent 9805471344
commit 4266ef6d33
27 changed files with 208 additions and 13680 deletions

View File

@ -1,753 +0,0 @@
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
compile depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
install-html-recursive install-info-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
sed_rest='s,^[^/]*/*,,'; \
sed_last='s,^.*/\([^/]*\)$$,\1,'; \
sed_butlast='s,/*[^/]*$$,,'; \
while test -n "$$dir1"; do \
first=`echo "$$dir1" | sed -e "$$sed_first"`; \
if test "$$first" != "."; then \
if test "$$first" = ".."; then \
dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
else \
first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
if test "$$first2" = "$$first"; then \
dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
else \
dir2="../$$dir2"; \
fi; \
dir0="$$dir0"/"$$first"; \
fi; \
fi; \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
intltool__v_merge_options_ = @intltool__v_merge_options_@
intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = data po src
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
$(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then rm -f stamp-h1; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
distclean-hdr:
-rm -f config.h stamp-h1
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
*) list='$(SUBDIRS)' ;; \
esac; \
rev=''; for subdir in $$list; do \
if test "$$subdir" = "."; then :; else \
rev="$$subdir $$rev"; \
fi; \
done; \
rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
empty_fix=.; \
else \
include_option=--include; \
empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
$(am__make_dryrun) \
|| test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
dir1=$$subdir; dir2="$(top_distdir)"; \
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
$(am__remove_distdir)
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
(cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@test -n '$(distuninstallcheck_dir)' || { \
echo 'ERROR: trying to run $@ with an empty' \
'$$(distuninstallcheck_dir)' >&2; \
exit 1; \
}; \
$(am__cd) '$(distuninstallcheck_dir)' || { \
echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
exit 1; \
}; \
test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
@if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
check: check-recursive
all-am: Makefile config.h
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-recursive
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
dvi: dvi-recursive
dvi-am:
html: html-recursive
html-am:
info: info-recursive
info-am:
install-data-am:
install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am:
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
ctags-recursive install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

1
NEWS Normal file
View File

@ -0,0 +1 @@
see ChangeLog

2
README
View File

@ -10,7 +10,7 @@ are implemented in the editor. L3afpad is simple to use, is easily compiled,
requires few libraries, and starts up quickly. requires few libraries, and starts up quickly.
This program is released under the GNU General Public License (GPL) version 2, This program is released under the GNU General Public License (GPL) version 2,
see the file 'gpl-2.0.txt' for more information. see the file 'COPYING' for more information.
Features Features

178
SHA1SUMS
View File

@ -1,178 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1,SHA512
634071380936e4893b0e8cacdfcd344638406575 171 AUTHORS
a1c228019855c9975e6c51840a62d078d6320820 11134 ChangeLog
0beb31ee37259edeb621d345db933f2c827b2a21 22 Makefile.am
1def73fb90249cc73186c00181b9069dc698b4fc 24115 Makefile.in
04dc937708d52f3b9b6f9a096898c5e23fb80ace 2071 README
91514648287dc0e15892bc8dfec67770a90755ff 70019 aclocal.m4
6b92cec7739f61775c5740bf400df805b89812a9 7274 compile
9c8c48ef1459f0ff46c1e4def5428f0b301462c1 2837 config.h.in
e4a04f6cf0735b2d1147bf7a49ed60a62b9636e7 242544 configure
265ed9da79a173a9ff9e164c7784a995780e2ece 2188 configure.ac
cbd191104fbb3eda18bc12e1caa9e60db401a008 264 data/Makefile.am
76269a961d0bd5d19bfcce2eee864f433fa985b8 21164 data/Makefile.in
d5f3d29e0f768e7a48a9ab7bb7903aa123a72280 99 data/icons/128x128/Makefile.am
2c34c88cfc451bee695150bd0a1ef52978caa97f 12893 data/icons/128x128/Makefile.in
8cf1a82f7ff3a26c46919185a78984f70a067cdb 9794 data/icons/128x128/l3afpad.png
26763e3c019a93fb07f055bb4ebdab1e47774ffb 97 data/icons/16x16/Makefile.am
88b4535e60567beda905ab4d406f23a99f620fe4 12885 data/icons/16x16/Makefile.in
7f2b6a5b5dc41d504ba6b60c7ab1d36322e71306 947 data/icons/16x16/l3afpad.png
4d60f663c6929798d2d90818a23952229b6fea20 99 data/icons/192x192/Makefile.am
3530a1372dcf0adcf1bbf991121147fe52bc172e 12893 data/icons/192x192/Makefile.in
64750d14155472c2786f792946ca15769e62b156 17029 data/icons/192x192/l3afpad.png
f09b9895a7c1594b10a7725e8fa906cde786dc71 97 data/icons/20x20/Makefile.am
0dd387152fa0bc14423bbbd9c2a1e39f95e18b1d 12885 data/icons/20x20/Makefile.in
3b235a6b2d0ab4d07b3f5f2e80809cf78bcbb452 1111 data/icons/20x20/l3afpad.png
0d23a3a980e585436e18c6dfecd21a8e2f8bb367 97 data/icons/22x22/Makefile.am
a17f5e4fa86dbf2e32c9e65219c758d2797c600b 12885 data/icons/22x22/Makefile.in
27b187a98e7b3cdf2b8fd99aee2fb7c982c26401 1055 data/icons/22x22/l3afpad.png
f72d9a4a77058c84d1e43c70fe1dac18bf5c47a1 97 data/icons/24x24/Makefile.am
4be79ded6005e96e2c2e2d98ed5662dce2be6394 12885 data/icons/24x24/Makefile.in
17ac87ac5727643ed9fcc2967960c8927a53bd91 1174 data/icons/24x24/l3afpad.png
bad47c5a5bb5dd71d71ef21b6cc00da048e32b17 99 data/icons/256x256/Makefile.am
eba732f7b6e5d0f609aacc703401f144e5f32ea4 12893 data/icons/256x256/Makefile.in
0c86eff769c88d3c0cf6253f361e74420317e7ea 21030 data/icons/256x256/l3afpad.png
78634346b204497840efb96e73862ce005d6146c 97 data/icons/32x32/Makefile.am
4a75c4c549c3cd924f7ff7af85c576c38c998f62 12885 data/icons/32x32/Makefile.in
ef1d36c748d72a652b5c8ff28a085b6a8528a78d 1774 data/icons/32x32/l3afpad.png
905be94251b1c9755aa7ff3f97800a79dd11d705 97 data/icons/36x36/Makefile.am
e50addff0191530f150e0ca1fda5c0f51d5083ff 12885 data/icons/36x36/Makefile.in
216d0b4ce6019af75879379b92673d062049e667 2068 data/icons/36x36/l3afpad.png
6ad0f16850025dddb4b56ea7560789179f576c60 97 data/icons/40x40/Makefile.am
dde368b27f40f466c81ac568c4d8027dc8a1a5e1 12885 data/icons/40x40/Makefile.in
9a42580dbb087cb919af31cce2658c43bf8107f7 2349 data/icons/40x40/l3afpad.png
097d718eedaca858f5bb17964c2ed0706a8ecd53 97 data/icons/48x48/Makefile.am
37eeffe4bc72c1d617fc6f06676ec80f99fb52f4 12885 data/icons/48x48/Makefile.in
99322946fd6eb0bec8d797f5c2cf899f213e973f 2915 data/icons/48x48/l3afpad.png
86b6a9d74db3af1930b51c7d05af8c6be80d711d 97 data/icons/64x64/Makefile.am
4a810e5641051930ca3c245fbae4dcccb7f7f60a 12885 data/icons/64x64/Makefile.in
b0d1df41ed150bbc1dbc47cb9393942a6b199d9b 4006 data/icons/64x64/l3afpad.png
b46fd65a2be0fec8785d07d467c4407d83cddecf 97 data/icons/72x72/Makefile.am
e988df07adb2f64ab1c3ff0ae9f827330a48ca82 12885 data/icons/72x72/Makefile.in
2723548ad1cca0103845123c2e644dfa175e3fec 4605 data/icons/72x72/l3afpad.png
c6c66fd2722e65917d41c70969689e5bcb20c6d6 97 data/icons/96x96/Makefile.am
17e4e88d63a4c039299d859f2081981934ab8463 12885 data/icons/96x96/Makefile.in
df7241f90d99f10577aceaf7cc3f3344ac1f5450 6678 data/icons/96x96/l3afpad.png
33c3415cb3575f4347456695b56271bd014c658b 426 data/icons/Makefile.am
6daafd9fa79e6945b0a05ee5cdfdf54e74077d71 18277 data/icons/Makefile.in
fd55d34765bc0c212ea128ae2b76a7bc377c1e77 1065 data/icons_another/16.png
7910b4e10d69d67b82d516511190472f056b3f10 1066 data/icons_another/20.png
a5c2ec354db9f29c4614945477a5d26fec335fb9 1218 data/icons_another/22.png
6f8cb4dffc203ad00c8beaee0b618ac1ed6b8be9 1347 data/icons_another/24.png
97efac292c24d26d1fa44bbd63dad84ff1d298ce 2034 data/icons_another/32.png
f4d01f2e7e3b0b18c81912e08f878bde8e5756aa 2371 data/icons_another/36.png
f9dc3d93b1d0256dc920a704c1cc7c3e42c852d0 2681 data/icons_another/40.png
20e5488290612d78d79905cd8316c15536faa194 2668 data/icons_another/48.png
c66189f5d3b2cf45c8a974ef6152be69407d8947 175 data/l3afpad.desktop.in
99322946fd6eb0bec8d797f5c2cf899f213e973f 2915 data/l3afpad.png
9b536224b0f38c95a52b9b268e12995f26ac33b2 2308 data/l3afpad.xpm
2fe74a056b17fac68d7e27149dd44f4e94f27d12 35387 data/l3afpad_original.svg
0b26f101e3bc9fd1ff0be1da9fb4a82371142f92 20899 depcomp
4cc77b90af91e615a64ae04893fdffa7939db84c 18092 gpl-2.0.txt
06ee6336e63bb845c8439d777c32eb2eccc4fbf1 13998 install-sh
01a6b4bf79aca9b556822601186afab86e8c4fbf 26530 lgpl-2.1.txt
d7c9981a81af13370d4ed152b24c0a82b7028585 10346 missing
c7e1d0f4fcbbfa34f87091dfea04f38c6675f3de 7245 po/ChangeLog
9762868836b7908c6ce7244d6743c19ea1cc6e9d 172 po/LINGUAS
a225ba8bb2118afc96523149d854868e29277cc2 7206 po/Makefile.in.in
610fcd63bc842d466f948e96e625fb3927202b32 135 po/POTFILES.in
524fe365953c15ba867a6bfc3bc2c686636f6159 6240 po/bg.po
c69274c61d6ef18c099c0561114fe9a264c277ab 5557 po/br.po
462e031f0f71d67d2612f64fffd02278497699d7 5191 po/ca.po
b80b19319729d2ced424abe1ef8a0591bb949dd2 5516 po/cs.po
e3a8d0bfa39c8f7040a8a8a93547542279a58973 5779 po/da.po
61513177d0340e91d8674ca8b132a7993449e4c9 5477 po/de.po
bc81fd05e9bc4e3826463d33bda5eb25aa14fb0c 6157 po/el.po
acb52d930caa4715a43ec8dd80cf90bbd6517e8c 5079 po/eo.po
454cfc5293a6ae09535b733cf7e95f89c2ca2209 5219 po/es.po
cfd70b2145c0af8762ccb28ee742bc9b915e2c64 5317 po/et.po
46040c8f4255d1b12e0df7201f0c6bc785b5a819 5298 po/eu.po
a50d6f9d3bb985c9d8ff3542284013d2e3f9d89e 5236 po/fi.po
904563d7c195d7de0277ab6cfd66dcb6da269f7a 5555 po/fr.po
fb0f851180f048a0bb279bb0c728e350369bdc0e 5204 po/ga.po
a714b149ef8ee630005ba50f9fef68d9ea82fffc 5736 po/gl.po
b758006b4d0c457aa3215bb703cf418dc5e7cb47 5344 po/he.po
5119714a537b3c97a4507215c03028f53535c351 5473 po/hu.po
063c79c668a97034e1bbfcca5e5032f0d505b0c6 5120 po/id.po
024688b27c783fa5b3dd3827213a5c2f01325e51 5315 po/it.po
4246581fe6fed69794ab2a611c6f15f36db36def 5738 po/ja.po
364e09e3d04400f125b6119fe7cdbdfe4b41addb 5110 po/ko.po
68627618e7c87485e05523260b59fde20446928e 5211 po/lt.po
018bb7a79c38f335cfc7dbfbf7a1006ba8f61ead 5331 po/lv.po
f013126741766ac683e9c83dd833d4d4c25f0af7 5401 po/nl.po
393a468bf9edfaf08cb083a5795dbd6c709af97c 5510 po/nn.po
044ca35bfaf08b7cb94ca2d570e7be1453cfcefb 6729 po/pl.po
771cbf3f3e537ae1808f7d7861f36d41b815db97 5204 po/pt.po
4683b64b633776013035676dff397e2b14bbc392 5319 po/pt_BR.po
00bdc4300c0417da4c6f0e6f6cd09c39703ee0fc 6026 po/ru.po
209024b9f6253d63b20e28981fa23aae72deb640 5268 po/sk.po
bdcc3130b3ac23e16020d4006a61dd4e673bdd9d 5442 po/sl.po
12bf06e3b075ed9ccac8e6196c8f2689511dc3a1 5951 po/sr.po
c4689835eb366209ad05126a1af6a35b73dd74cf 5181 po/sv.po
7e105abfe86180659a93556453bd016b1a1d1db4 6446 po/ta.po
173286e50fbad253249b05fc35ae43f5058c3739 5244 po/tr.po
6a3f8fa2778fd0931fad7012f49a5f26a3f3f429 6075 po/uk.po
b613839b6a6c14137e94e1b4778e4d8c80fd3579 5451 po/vi.po
9254b740e87dde806416bec24a4be3835983ff57 5275 po/zh_CN.po
5112a4f16e7250f5d3799a4792800015fe049b2c 5253 po/zh_TW.po
5436cb3b94928a04328d697be5716f4e71aa4e0f 583 src/Makefile.am
1e606b54862e9bdf26491b219f82b92422f358f6 51460 src/Makefile.in
8b0b894af945a97846911030b957000183c465f6 8726 src/callback.c
1985e67d5ad11330ccaca93409b99c147c821bc9 1657 src/callback.h
4f2d3c776664cff12d4b3d78731b1dbbc0191e68 2594 src/dialog.c
0651e705696688f15d124e86d76e8cd7298393bd 1127 src/dialog.h
06c9435955b4b862bdfd96d6850c257ad8ae315e 6737 src/dnd.c
5f28dec9ccd8eebb58e25877057576bc6e276e34 909 src/dnd.h
ae0a6de60aa502b38ddcff3241998918ff81f438 6715 src/emacs.c
24279f8befe55dce2157382398c97c0040dcb3ac 956 src/emacs.h
c3d84301cd67dcfd7396f60355f54f7c00945dbd 11332 src/encoding.c
00ecfbef1b59fb80b5204359cdd11be31c32ac5b 1370 src/encoding.h
ecea3b48efd0936acf24442c9818d13df0c65a57 7742 src/file.c
1bdf2813b89470cd1ce3b44caee7ea1bcdd077e9 1304 src/file.h
3fad59e8f43d96d6c45241c4697846bab6cc2e1a 2119 src/font.c
245c0fbc1d931b75e256e1410eeab2a12b56f75e 996 src/font.h
92248cbfd207d6df307fecba6d938a744b18d0cd 6913 src/gtkprint.c
be9c382045d0fc1fb5eeabc8ed3493f1736e8f57 1046 src/gtkprint.h
871f6802167e129adbbdde3a59114270bfb24d75 17408 src/gtksourceiter.c
bd728f9ed958830af877392ea852b1ce6aeca069 1859 src/gtksourceiter.h
f6b21adcfc00151deba02a4339ea5883a7b8f411 2486 src/hlight.c
828e51d43aaa64cbaa492baf761d053bba6b02dd 1019 src/hlight.h
e16c424b87f978f263599d8cf17167dd08a7c740 6794 src/indent.c
bb2a52d5a1969da5a312b91bbba32d0489a48871 1334 src/indent.h
3cc4e43d9166f699681ea653bedc5e81c14c0103 3781 src/l3afpad.h
33c812c64fd92b7dd7519a23caee406cc3215276 8388 src/linenum.c
6f63e2c07f844c7ba97c77d3e7234d30560a09f0 983 src/linenum.h
2f8a8f514af9643cf21e9ba0b794d4de5dbdf4a9 8401 src/main.c
3c0259eda7028cfa574c29674235f5109f90526a 8751 src/menu.c
cafed6cfdf79765fae8127d020d311c4842fdeba 1179 src/menu.h
13f187180f999117bc24911c47e55e070e34cc88 17350 src/search.c
cee72ed3fd94d1637021e9c73602f109f7af06d1 1054 src/search.h
65fce9c9880a5cf6e73592bb67ad057e7832e73c 12595 src/selector.c
5af4e5fa14e8ab0106b07f15a74777124df098a8 1019 src/selector.h
609fd713cef54955274804dadd59d51fbc3e7aa4 10743 src/undo.c
1fc44ee0be9fd77cc917888a9a38ab0f5a4f2b66 1307 src/undo.h
26918883912f5f087e467d6ea8620db316cd9512 4155 src/utils.c
cc1d02de6eb5f85c69ef6f33cbe072ee8467706a 1116 src/utils.h
3e9703e4eee527e8db4b082aa4aa2eeb158e111b 11206 src/view.c
f9797a035a29fe5e6f1137d20fb916c573bd1bea 1276 src/view.h
bf524e4de2a68901495a91d181cf3573edd3027b 2532 src/window.c
75d1c79bfdd24b7ae5450ead4aef3ab43267e85f 1068 src/window.h
-----BEGIN PGP SIGNATURE-----
iEYEARECAAYFAlCR0yIACgkQdEpXpumNYVlaNgCfd19FpgsPT0QGBjiytaTDlhvL
Ee4AoIMCK7ZUDFRdo4M48FmotKNcUuNmiQIcBAEBCgAGBQJQkdMiAAoJELc3H0m+
i6gZ7gAP/ipncbfYbgRsTEIDTxC2AqCyu+slZLbSb2kVvX1f7ddKtCGzuKeG32x9
K3ijFhPnwYeCyUVJyJfLL3EEhm/E3XHcNhqo1MkF8cBCHkG2u2OkNGUXoLrh4OY7
pzGo56PYETtvapblwOZKg0YK+eFzyBeqobnJAWkoQigdAw4A7sOn4SfYk7dEoUSh
M2/usuaQII5CG/NfcUzVZs5cBOGVThfQ9CfBRKehdUIP58pt1WzU3zkxwOOG2bTo
Wfc7OQCth4KgUgYIuCWgietQSA0Q5GwYMFJrLOPbbmEq5uZeTQVFCuSaM2OAmvub
EOZ8Ocl4w6unoB8uQ2c2fS9OHv6Dqz0SQhSKuyIZi7glM3bZBGs1v4flil758UBg
KXOBQ0oJ2sl73MhiZZi4FnHRzLIBSywJrwuwEM7SJBERT8z+JqvCa2slkugvIgBu
ZnB0vpjwVrSckOTco4b1nWlbjWWr8CQxYL9JjjlghqRn3lv/KlET7mn5LtTrFxJ4
7Lao+aqunhzmRjJRbY57XY2BB0lZIekVP/UARZuQA+zl3MoRiIAk4j4iotlI3/mL
qFvKj4nrcT3dOHs83J7IC7o4RgXnkFSNwhZLc7K+uJa9zFSouLR5VWNYj8FkVUJL
7dl4uG/lSAoJkHra5YHyBWL0Se3uMVU+AF5FFmDhgRH9coZlp5Iu
=jjvo
-----END PGP SIGNATURE-----

1903
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

343
compile
View File

@ -1,343 +0,0 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-03-05.13; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
# Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program 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.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I)
eat=1
func_file_conv "$2" mingw
set x "$@" -I"$file"
shift
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l)
eat=1
func_cl_dashl "$2"
set x "$@" "$lib"
shift
;;
-l*)
func_cl_dashl "${1#-l}"
set x "$@" "$lib"
shift
;;
-L)
eat=1
func_cl_dashL "$2"
;;
-L*)
func_cl_dashL "${1#-L}"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in
'')
echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand '-c -o'.
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
ofile=
cfile=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
# So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

View File

@ -1,108 +0,0 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you enable Emacs key theme. */
#undef ENABLE_EMACS
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
/* Define to 0 if you disable print. */
#undef ENABLE_PRINT
/* Define to 0 if you disable statistics. */
#undef ENABLE_STATISTICS
/* Define to 0 if you disable Xinput2. */
#undef ENABLE_XINPUT2
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define the location where the catalogs will be installed */
#undef LOCALEDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you enable search history. */
#undef SEARCH_HISTORY
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if you enable GtkGrid. */
#undef USE_GTK_GRID
/* Version number of package */
#undef VERSION
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES

8221
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
AC_INIT(L3afpad, 0.8.18.1.10, caleb@calno.com) AC_INIT(L3afpad, 0.8.18.1.10-git, stevenhoneyman@gmail.com)
AM_INIT_AUTOMAKE($PACKAGE_TARNAME, $PACKAGE_VERSION) AM_INIT_AUTOMAKE($PACKAGE_TARNAME, $PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
@ -36,12 +36,6 @@ AC_ARG_ENABLE(emacs,
AC_DEFINE(ENABLE_EMACS, 1, [Define to 1 if you enable Emacs key theme.]) AC_DEFINE(ENABLE_EMACS, 1, [Define to 1 if you enable Emacs key theme.])
fi fi
AC_ARG_ENABLE(gtkgrid,
AC_HELP_STRING([--enable-gtkgrid], [Enable GtkGrid]))
if test "$enable_gtkgrid" = "yes"; then
AC_DEFINE(USE_GTK_GRID, 1, [Define to 1 if you enable GtkGrid.])
fi
AC_ARG_ENABLE(search-history, AC_ARG_ENABLE(search-history,
AC_HELP_STRING([--enable-search-history], [force to enable search history])) AC_HELP_STRING([--enable-search-history], [force to enable search history]))
if test "$enable_search_history" = "yes"; then if test "$enable_search_history" = "yes"; then

708
depcomp
View File

@ -1,708 +0,0 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2012-03-27.16; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
# This program 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.
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
case $1 in
'')
echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
Run PROGRAMS ARGS to compile a file, generating dependencies
as side-effects.
Environment variables:
depmode Dependency tracking mode.
source Source file read by 'PROGRAMS ARGS'.
object Object file output by 'PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputting dependencies.
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "depcomp $scriptversion"
exit $?
;;
esac
# A tabulation character.
tab=' '
# A newline character.
nl='
'
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
depfile=${depfile-`echo "$object" |
sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
# here, because this file can only contain one case statement.
if test "$depmode" = hp; then
# HP compiler uses -M and no extra arg.
gccflag=-M
depmode=gcc
fi
if test "$depmode" = dashXmstdout; then
# This is just like dashmstdout with a different argument.
dashmflag=-xM
depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
# This is just like msvisualcpp but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
cygpath_u='sed s,\\\\,/,g'
depmode=msvisualcpp
fi
if test "$depmode" = msvc7msys; then
# This is just like msvc7 but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
cygpath_u='sed s,\\\\,/,g'
depmode=msvc7
fi
if test "$depmode" = xlc; then
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
gccflag=-qmakedep=gcc,-MF
depmode=gcc
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
## Unfortunately, FreeBSD c89 acceptance of flags depends upon
## the command line argument order; so add the flags where they
## appear in depend2.am. Note that the slowdown incurred here
## affects only configure: in makefiles, %FASTDEP% shortcuts this.
for arg
do
case $arg in
-c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
*) set fnord "$@" "$arg" ;;
esac
shift # fnord
shift # $arg
done
"$@"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
mv "$tmpdepfile" "$depfile"
;;
gcc)
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
## -MM, not -M (despite what the docs say).
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
gccflag=-MD,
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
## This next piece of magic avoids the "deleted header file" problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
tr ' ' "$nl" < "$tmpdepfile" |
## Some versions of gcc put a space before the ':'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
| sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
hp)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
sgi)
if test "$libtool" = yes; then
"$@" "-Wp,-MDupdate,$tmpdepfile"
else
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
# the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
tr ' ' "$nl" < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr "$nl" ' ' >> "$depfile"
echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
tr ' ' "$nl" < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
xlc)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
# current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
tmpdepfile1=$dir$base.u
tmpdepfile2=$dir$base.u
tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
# Each line is of the form 'foo.o: dependent.h'.
# Do two passes, one to just change these to
# '$object: dependent.h' and one to simply 'dependent.h:'.
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
icc)
# Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
# However on
# $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
# ICC 7.0 will fill foo.d with something like
# foo.o: sub/foo.c
# foo.o: sub/foo.h
# which is wrong. We want
# sub/foo.o: sub/foo.c
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
# ICC 7.1 will output
# foo.o: sub/foo.c sub/foo.h
# and will wrap long lines using '\':
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
# tcc 0.9.26 (FIXME still under development at the moment of writing)
# will emit a similar output, but also prepend the continuation lines
# with horizontal tabulation characters.
"$@" -MD -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
# Each line is of the form 'foo.o: dependent.h',
# or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
# Do two passes, one to just change these to
# '$object: dependent.h' and one to simply 'dependent.h:'.
sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
< "$tmpdepfile" > "$depfile"
sed '
s/[ '"$tab"'][ '"$tab"']*/ /g
s/^ *//
s/ *\\*$//
s/^[^:]*: *//
/^$/d
/:$/d
s/$/ :/
' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
hp2)
# The "hp" stanza above does not work with aCC (C++) and HP's ia64
# compilers, which have integrated preprocessors. The correct option
# to use with these is +Maked; it writes dependencies to a file named
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
"$@" -Wc,+Maked
else
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir$base.d
"$@" +Maked
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add 'dependent.h:' lines.
sed -ne '2,${
s/^ *//
s/ \\*$//
s/$/:/
p
}' "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in 'foo.d' instead, so we check for that too.
# Subdirectories are respected.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
# static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
# compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
# automatically cleaned when .libs/ is deleted, while ignoring
# the former would cause a distcleancheck panic.
tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
tmpdepfile2=$dir$base.o.d # libtool 1.5
tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
tmpdepfile1=$dir$base.o.d
tmpdepfile2=$dir$base.d
tmpdepfile3=$dir$base.d
tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
msvc7)
if test "$libtool" = yes; then
showIncludes=-Wc,-showIncludes
else
showIncludes=-showIncludes
fi
"$@" $showIncludes > "$tmpdepfile"
stat=$?
grep -v '^Note: including file: ' "$tmpdepfile"
if test "$stat" = 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
# The first sed program below extracts the file names and escapes
# backslashes for cygpath. The second sed program outputs the file
# name when reading, but also accumulates all include files in the
# hold buffer in order to output them again at the end. This only
# works with sed implementations that can handle large buffers.
sed < "$tmpdepfile" -n '
/^Note: including file: *\(.*\)/ {
s//\1/
s/\\/\\\\/g
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
s/\(.*\)/'"$tab"'\1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
s/.*/'"$tab"'/
G
p
}' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvc7msys)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
# always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
# Remove '-o $object'.
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
done
test -z "$dashmflag" && dashmflag=-M
# Require at least two characters before searching for ':'
# in the target name. This is to cope with DOS-style filenames:
# a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' "$nl" < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
dashXmstdout)
# This case only exists to satisfy depend.m4. It is never actually
# run, as this mode is specially recognized in the preamble.
exit 1
;;
makedepend)
"$@" || exit $?
# Remove any Libtool call
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
# X makedepend
shift
cleared=no eat=no
for arg
do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
if test $eat = yes; then
eat=no
continue
fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file.
-arch)
eat=yes ;;
-*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
obj_suffix=`echo "$object" | sed 's/^.*\././'`
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
cpp)
# Important note: in order to support this mode, a compiler *must*
# always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
# Remove '-o $object'.
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
done
"$@" -E |
sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
IFS=" "
for arg
do
case "$arg" in
-o)
shift
;;
$object)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
shift
;;
*)
set fnord "$@" "$arg"
shift
shift
;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
echo "$tab" >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvcmsys)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
none)
exec "$@"
;;
*)
echo "Unknown depmode $depmode" 1>&2
exit 1
;;
esac
exit 0
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

View File

@ -1,339 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program 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 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

View File

@ -1,527 +0,0 @@
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright (C) 1994 X Consortium
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
nl='
'
IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
doit_exec=$doit
fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
chgrpprog=${CHGRPPROG-chgrp}
chmodprog=${CHMODPROG-chmod}
chownprog=${CHOWNPROG-chown}
cmpprog=${CMPPROG-cmp}
cpprog=${CPPROG-cp}
mkdirprog=${MKDIRPROG-mkdir}
mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
posix_glob='?'
initialize_posix_glob='
test "$posix_glob" != "?" || {
if (set -f) 2>/dev/null; then
posix_glob=
else
posix_glob=:
fi
}
'
posix_mkdir=
# Desired mode of installed file.
mode=0755
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
mvcmd=$mvprog
rmcmd="$rmprog -f"
stripcmd=
src=
dst=
dir_arg=
dst_arg=
copy_on_change=false
no_target_directory=
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
In the 1st form, copy SRCFILE to DSTFILE.
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
--help display this help and exit.
--version display version info and exit.
-c (ignored)
-C install only if different (preserve the last data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-s $stripprog installed files.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
-c) ;;
-C) copy_on_change=true;;
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
shift;;
-o) chowncmd="$chownprog $2"
shift;;
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac
shift
done
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
dst_arg=$arg
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
done
fi
if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
case $mode in
# Optimize common cases.
*644) cp_umask=133;;
*755) cp_umask=22;;
*[0-7])
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
fi
for src
do
# Protect names problematic for `test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
dst=$src
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
echo "$0: $src does not exist." >&2
exit 1
fi
if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dst_arg
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstdir_status=0
else
# Prefer dirname, but fall back on a substitute if dirname fails.
dstdir=`
(dirname "$dst") 2>/dev/null ||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$dst" : 'X\(//\)[^/]' \| \
X"$dst" : 'X\(//\)$' \| \
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$dst" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
}
/^X\(\/\/\)[^/].*/{
s//\1/
q
}
/^X\(\/\/\)$/{
s//\1/
q
}
/^X\(\/\).*/{
s//\1/
q
}
s/.*/./; q'
`
test -d "$dstdir"
dstdir_status=$?
fi
fi
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
# Create intermediate dirs using mode 755 as modified by the umask.
# This is like FreeBSD 'install' as of 1997-10-28.
umask=`umask`
case $stripcmd.$umask in
# Optimize common cases.
*[2367][2367]) mkdir_umask=$umask;;
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
*[0-7])
mkdir_umask=`expr $umask + 22 \
- $umask % 100 % 40 + $umask % 20 \
- $umask % 10 % 4 + $umask % 2
`;;
*) mkdir_umask=$umask,go-w;;
esac
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
mkdir_mode=
fi
posix_mkdir=false
case $umask in
*[123567][0-7][0-7])
# POSIX mkdir -p sets u+wx bits regardless of umask, which
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writeable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
esac
if
$posix_mkdir && (
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
# The umask is ridiculous, or mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
$posix_glob set -f
set fnord $dstdir
shift
$posix_glob set +f
IFS=$oIFS
prefixes=
for d
do
test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
if $posix_mkdir; then
(umask=$mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
done
if test -n "$prefixes"; then
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
fi
fi
fi
if test -n "$dir_arg"; then
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
eval "$initialize_posix_glob" &&
$posix_glob set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
$posix_glob set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd -f "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
trap '' 0
fi
done
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

331
missing
View File

@ -1,331 +0,0 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program 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.
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
run=:
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi
msg="missing on your system"
case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
# Exit code 63 means version mismatch. This often happens
# when the user try to use an ancient version of a tool on
# a file that requires a minimum version. In this case we
# we should proceed has if the program had been absent, or
# if --run hadn't been passed.
if test $? = 63; then
run=:
msg="probably too old"
fi
;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
\`g' are ignored when checking the name.
Send bug reports to <bug-automake@gnu.org>."
exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
exit $?
;;
-*)
echo 1>&2 "$0: Unknown \`$1' option"
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
esac
# normalize program name to check for.
program=`echo "$1" | sed '
s/^gnu-//; t
s/^gnu//; t
s/^g//; t'`
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program). This is about non-GNU programs, so use $1 not
# $program.
case $1 in
lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
# running `$TOOL --version' or `$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
;;
esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
esac
done
touch $touch_files
;;
automake*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
while read f; do touch "$f"; done
;;
autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo "#! /bin/sh"
echo "# Created by GNU Automake missing as a replacement of"
echo "# $ $@"
echo "exit 0"
chmod +x $file
exit 1
fi
;;
bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
if test ! -f y.tab.h; then
echo >y.tab.h
fi
if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
exit $?
fi
;;
makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '
/^@setfilename/{
s/.* \([^ ]*\) *$/\1/
p
q
}' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
# If the file does not exist, the user really needs makeinfo;
# let's fail without touching anything.
test -f $file || exit 1
touch $file
;;
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
;;
esac
exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

View File

@ -1,6 +1,6 @@
bin_PROGRAMS = l3afpad bin_PROGRAMS = l3afpad
INCLUDES = -DICONDIR=\"$(datadir)/pixmaps\" AM_CPPFLAGS = -DICONDIR=\"$(datadir)/pixmaps\"
l3afpad_SOURCES = \ l3afpad_SOURCES = \
l3afpad.h main.c \ l3afpad.h main.c \

View File

@ -247,10 +247,10 @@ static void activate_quick_find(void)
if (!flag) { if (!flag) {
gtk_widget_set_sensitive( gtk_widget_set_sensitive(
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Search/FindNext"), gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Search/FindNext"),
TRUE); TRUE);
gtk_widget_set_sensitive( gtk_widget_set_sensitive(
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Search/FindPrevious"), gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Search/FindPrevious"),
TRUE); TRUE);
flag = TRUE; flag = TRUE;
} }
@ -292,8 +292,8 @@ void on_option_word_wrap(void)
{ {
gboolean state; gboolean state;
state = gtk_check_menu_item_get_active( state = gtk_toggle_action_get_active(
GTK_TOGGLE_ACTION(gtk_item_factory_get_item(pub->mw->menubar, "/M/Options/WordWrap"))); GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(pub->mw->menubar, "/M/Options/WordWrap")));
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(pub->mw->view), gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(pub->mw->view),
state ? GTK_WRAP_WORD : GTK_WRAP_NONE); state ? GTK_WRAP_WORD : GTK_WRAP_NONE);
} }
@ -302,8 +302,8 @@ void on_option_line_numbers(void)
{ {
gboolean state; gboolean state;
state = gtk_check_menu_item_get_active( state = gtk_toggle_action_get_active(
GTK_TOGGLE_ACTION(gtk_item_factory_get_item(pub->mw->menubar, "/M/Options/LineNumbers"))); GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(pub->mw->menubar, "/M/Options/LineNumbers")));
show_line_numbers(pub->mw->view, state); show_line_numbers(pub->mw->view, state);
} }
@ -319,19 +319,20 @@ void on_option_auto_indent(void)
{ {
gboolean state; gboolean state;
state = gtk_check_menu_item_get_active( state = gtk_toggle_action_get_active(
GTK_TOGGLE_ACTION(gtk_item_factory_get_item(pub->mw->menubar, "/M/Options/AutoIndent"))); GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(pub->mw->menubar, "/M/Options/AutoIndent")));
indent_set_state(state); indent_set_state(state);
} }
void on_help_about(void) void on_help_about(void)
{ {
const gchar *copyright = "Copyright \xc2\xa9 2004-2010 Tarot Osuji\nCopyright \xc2\xa9 2011 Wen-Yen Chuang\nCopyright \xc2\xa9 2012 Yoo, Taik-Yon\nCopyright \xc2\xa9 2011 Jack Gandy"; const gchar *copyright = "Copyright \xc2\xa9 2004-2010 Tarot Osuji\nCopyright \xc2\xa9 2011 Wen-Yen Chuang\nCopyright \xc2\xa9 2011 Jack Gandy\nCopyright \xc2\xa9 2012 Yoo, Taik-Yon\nCopyright \xc2\xa9 2014 Steven Honeyman";
const gchar *comments = _("GTK+ based simple text editor"); const gchar *comments = _("GTK+ based simple text editor");
const gchar *authors[] = { const gchar *authors[] = {
"Tarot Osuji <tarot@sdf.lonestar.org>", "Tarot Osuji <tarot@sdf.lonestar.org>",
"Wen-Yen Chuang <caleb@calno.com>", "Wen-Yen Chuang <caleb@calno.com>",
"Yoo, Taik-Yon <jaagar@gmail.com>", "Yoo, Taik-Yon <jaagar@gmail.com>",
"Steven Honeyman <stevenhoneyman@gmail.com>",
NULL NULL
}; };
const gchar *translator_credits = _("translator-credits"); const gchar *translator_credits = _("translator-credits");

View File

@ -39,7 +39,7 @@ void run_dialog_message(GtkWidget *window,
"%s", str); "%s", str);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL); _("_OK"), GTK_RESPONSE_CANCEL, NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL);
g_free(str); g_free(str);
@ -64,9 +64,9 @@ GtkWidget *create_dialog_message_question(GtkWidget *window, gchar *message, ...
"%s", str); "%s", str);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_NO, GTK_RESPONSE_NO, _("_No"), GTK_RESPONSE_NO,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_YES, GTK_RESPONSE_YES, _("_Yes"), GTK_RESPONSE_YES,
NULL); NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
g_free(str); g_free(str);

View File

@ -55,7 +55,7 @@ static void cb_key_press_event(GtkWidget *view, GdkEventKey *event)
break; break;
case GDK_s: case GDK_s:
case GDK_S: case GDK_S:
if (GTK_WIDGET_IS_SENSITIVE(gtk_item_factory_get_widget( if (gtk_widget_is_sensitive(gtk_ui_manager_get_widget(
pub->mw->menubar, "/M/File/Save") pub->mw->menubar, "/M/File/Save")
)) ))
on_file_save(); on_file_save();
@ -159,54 +159,54 @@ gboolean check_emacs_key_theme(GtkWindow *window, GtkUIManager *ifactory)
); );
/* gtk_widget_remove_accelerator( /* gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/File/New"), gtk_ui_manager_get_widget(ifactory, "/M/File/New"),
accel_group, GDK_N, GDK_CONTROL_MASK); accel_group, GDK_N, GDK_CONTROL_MASK);
gtk_widget_remove_accelerator( gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/File/Open"), gtk_ui_manager_get_widget(ifactory, "/M/File/Open"),
accel_group, GDK_O, GDK_CONTROL_MASK); accel_group, GDK_O, GDK_CONTROL_MASK);
gtk_widget_remove_accelerator( gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/File/Save"), gtk_ui_manager_get_widget(ifactory, "/M/File/Save"),
accel_group, GDK_S, GDK_CONTROL_MASK); accel_group, GDK_S, GDK_CONTROL_MASK);
gtk_widget_remove_accelerator( gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/File/SaveAs"), gtk_ui_manager_get_widget(ifactory, "/M/File/SaveAs"),
accel_group, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK); accel_group, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK);
#if ENABLE_PRINT #if ENABLE_PRINT
gtk_widget_remove_accelerator( gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/File/Print"), gtk_ui_manager_get_widget(ifactory, "/M/File/Print"),
accel_group, GDK_P, GDK_CONTROL_MASK); accel_group, GDK_P, GDK_CONTROL_MASK);
#endif #endif
gtk_widget_remove_accelerator( gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Edit/Undo"), gtk_ui_manager_get_widget(ifactory, "/M/Edit/Undo"),
accel_group, GDK_Z, GDK_CONTROL_MASK); accel_group, GDK_Z, GDK_CONTROL_MASK);
*/ gtk_widget_add_accelerator( */ gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Edit/Undo"), gtk_ui_manager_get_widget(ifactory, "/M/Edit/Undo"),
"activate", accel_group, GDK_underscore, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); "activate", accel_group, GDK_underscore, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* gtk_widget_remove_accelerator( /* gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Edit/SelectAll"), gtk_ui_manager_get_widget(ifactory, "/M/Edit/SelectAll"),
accel_group, GDK_A, GDK_CONTROL_MASK); accel_group, GDK_A, GDK_CONTROL_MASK);
gtk_widget_remove_accelerator( gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/Find"), gtk_ui_manager_get_widget(ifactory, "/M/Search/Find"),
accel_group, GDK_F, GDK_CONTROL_MASK); accel_group, GDK_F, GDK_CONTROL_MASK);
*/ gtk_widget_add_accelerator( */ gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/Find"), gtk_ui_manager_get_widget(ifactory, "/M/Search/Find"),
"activate", accel_group, GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); "activate", accel_group, GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* gtk_widget_add_accelerator( /* gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/FindNext"), gtk_ui_manager_get_widget(ifactory, "/M/Search/FindNext"),
"activate", accel_group, GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); "activate", accel_group, GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
*/ gtk_widget_add_accelerator( */ gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/FindPrevious"), gtk_ui_manager_get_widget(ifactory, "/M/Search/FindPrevious"),
"activate", accel_group, GDK_R, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); "activate", accel_group, GDK_R, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* gtk_widget_remove_accelerator( /* gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/Replace"), gtk_ui_manager_get_widget(ifactory, "/M/Search/Replace"),
accel_group, GDK_H, GDK_CONTROL_MASK); accel_group, GDK_H, GDK_CONTROL_MASK);
*/ gtk_widget_add_accelerator( */ gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/Replace"), gtk_ui_manager_get_widget(ifactory, "/M/Search/Replace"),
"activate", accel_group, GDK_percent, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE); "activate", accel_group, GDK_percent, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
/* gtk_widget_remove_accelerator( /* gtk_widget_remove_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/JumpTo"), gtk_ui_manager_get_widget(ifactory, "/M/Search/JumpTo"),
accel_group, GDK_J, GDK_CONTROL_MASK); accel_group, GDK_J, GDK_CONTROL_MASK);
*/ gtk_widget_add_accelerator( */ gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/JumpTo"), gtk_ui_manager_get_widget(ifactory, "/M/Search/JumpTo"),
"activate", accel_group, GDK_G, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE); "activate", accel_group, GDK_G, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
gtk_accel_group_connect( gtk_accel_group_connect(

View File

@ -33,11 +33,11 @@ static gchar *get_font_name_by_selector(GtkWidget *window, gchar *current_fontna
GtkWidget *dialog; GtkWidget *dialog;
gchar *fontname; gchar *fontname;
dialog = gtk_font_selection_dialog_new(_("Font")); dialog = gtk_font_chooser_dialog_new(_("Font"),NULL);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window)); gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(dialog), current_fontname); gtk_font_chooser_set_font(GTK_FONT_CHOOSER(dialog), current_fontname);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(dialog)); fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog));
else else
fontname = NULL; fontname = NULL;
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);

View File

@ -36,17 +36,19 @@
static const gchar * static const gchar *
pointer_from_offset_skipping_decomp (const gchar *str, gint offset) pointer_from_offset_skipping_decomp (const gchar *str, gint offset)
{ {
gsize decomp_len; gchar *casefold, *normal;
gunichar *decomp; const gchar *p, *q;
const gchar *p;
p = str; p = str;
while (offset > 0) while (offset > 0)
{ {
decomp = g_unicode_canonical_decomposition (g_utf8_get_char (p), &decomp_len); q = g_utf8_next_char (p);
g_free (decomp); casefold = g_utf8_casefold (p, q - p);
p = g_utf8_next_char (p); normal = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
offset -= decomp_len; offset -= g_utf8_strlen (normal, -1);
g_free (casefold);
g_free (normal);
p = q;
} }
return p; return p;
} }
@ -201,15 +203,14 @@ finally_2:
} }
static void static void
forward_chars_with_skipping (GtkTextIter *iter, forward_chars_with_skipping(GtkTextIter * iter,
gint count, gint count,
gboolean skip_invisible, gboolean skip_invisible,
gboolean skip_nontext, gboolean skip_nontext, gboolean skip_decomp)
gboolean skip_decomp)
{ {
gint i; gint i;
g_return_if_fail (count >= 0); g_return_if_fail(count >= 0);
i = count; i = count;
@ -217,28 +218,36 @@ forward_chars_with_skipping (GtkTextIter *iter,
{ {
gboolean ignored = FALSE; gboolean ignored = FALSE;
if (skip_nontext && gtk_text_iter_get_char (iter) == GTK_TEXT_UNKNOWN_CHAR) /* minimal workaround to avoid the infinite loop of bug #168247. It
* doesn't fix the problemjust the symptom... */
if (gtk_text_iter_is_end(iter))
return;
if (skip_nontext
&& gtk_text_iter_get_char(iter) == GTK_TEXT_UNKNOWN_CHAR)
ignored = TRUE; ignored = TRUE;
if (!ignored && skip_invisible && if (!ignored && skip_invisible &&
/* _gtk_text_btree_char_is_invisible (iter)*/ FALSE) /* _gtk_text_btree_char_is_invisible (iter) */ FALSE)
ignored = TRUE; ignored = TRUE;
if (!ignored && skip_decomp) if (!ignored && skip_decomp)
{ {
/* being UTF8 correct sucks; this accounts for extra /* being UTF8 correct sucks; this accounts for extra offsets
offsets coming from canonical decompositions of * coming from canonical decompositions of UTF8 characters (e.g.
UTF8 characters (e.g. accented characters) which * accented characters) which g_utf8_normalize() performs */
g_utf8_normalize() performs */ gchar *normal;
gunichar *decomp; gchar buffer[6];
gsize decomp_len; gint buffer_len;
decomp = g_unicode_canonical_decomposition (
gtk_text_iter_get_char (iter), &decomp_len); buffer_len =
i -= (decomp_len - 1); g_unichar_to_utf8(gtk_text_iter_get_char(iter), buffer);
g_free (decomp); normal = g_utf8_normalize(buffer, buffer_len, G_NORMALIZE_NFD);
i -= (g_utf8_strlen(normal, -1) - 1);
g_free(normal);
} }
gtk_text_iter_forward_char (iter); gtk_text_iter_forward_char(iter);
if (!ignored) if (!ignored)
--i; --i;
@ -246,12 +255,11 @@ forward_chars_with_skipping (GtkTextIter *iter,
} }
static gboolean static gboolean
lines_match (const GtkTextIter *start, lines_match(const GtkTextIter * start,
const gchar **lines, const gchar ** lines,
gboolean visible_only, gboolean visible_only,
gboolean slice, gboolean slice,
GtkTextIter *match_start, GtkTextIter * match_start, GtkTextIter * match_end)
GtkTextIter *match_end)
{ {
GtkTextIter next; GtkTextIter next;
gchar *line_text; gchar *line_text;
@ -268,38 +276,37 @@ lines_match (const GtkTextIter *start,
} }
next = *start; next = *start;
gtk_text_iter_forward_line (&next); gtk_text_iter_forward_line(&next);
/* No more text in buffer, but *lines is nonempty */ /* No more text in buffer, but *lines is nonempty */
if (gtk_text_iter_equal (start, &next)) if (gtk_text_iter_equal(start, &next))
return FALSE; return FALSE;
if (slice) if (slice)
{ {
if (visible_only) if (visible_only)
line_text = gtk_text_iter_get_visible_slice (start, &next); line_text = gtk_text_iter_get_visible_slice(start, &next);
else else
line_text = gtk_text_iter_get_slice (start, &next); line_text = gtk_text_iter_get_slice(start, &next);
} }
else else
{ {
if (visible_only) if (visible_only)
line_text = gtk_text_iter_get_visible_text (start, &next); line_text = gtk_text_iter_get_visible_text(start, &next);
else else
line_text = gtk_text_iter_get_text (start, &next); line_text = gtk_text_iter_get_text(start, &next);
} }
if (match_start) /* if this is the first line we're matching */ if (match_start) /* if this is the first line we're matching */
{ {
found = g_utf8_strcasestr (line_text, *lines); found = g_utf8_strcasestr(line_text, *lines);
} }
else else
{ {
/* If it's not the first line, we have to match from the /* If it's not the first line, we have to match from the start of the
* start of the line. * line. */
*/ if (g_utf8_caselessnmatch(line_text, *lines, strlen(line_text),
if (g_utf8_caselessnmatch (line_text, *lines, strlen (line_text), strlen(*lines)))
strlen (*lines)))
found = line_text; found = line_text;
else else
found = NULL; found = NULL;
@ -307,47 +314,45 @@ lines_match (const GtkTextIter *start,
if (found == NULL) if (found == NULL)
{ {
g_free (line_text); g_free(line_text);
return FALSE; return FALSE;
} }
/* Get offset to start of search string */ /* Get offset to start of search string */
offset = g_utf8_strlen (line_text, found - line_text); offset = g_utf8_strlen(line_text, found - line_text);
next = *start; next = *start;
/* If match start needs to be returned, set it to the /* If match start needs to be returned, set it to the start of the search
* start of the search string. * string. */
*/ forward_chars_with_skipping(&next, offset, visible_only, !slice, FALSE);
forward_chars_with_skipping (&next, offset, visible_only, !slice, FALSE);
if (match_start) if (match_start)
{ {
*match_start = next; *match_start = next;
} }
/* Go to end of search string */ /* Go to end of search string */
forward_chars_with_skipping (&next, g_utf8_strlen (*lines, -1), visible_only, !slice, TRUE); forward_chars_with_skipping(&next, g_utf8_strlen(*lines, -1),
visible_only, !slice, TRUE);
g_free (line_text); g_free(line_text);
++lines; ++lines;
if (match_end) if (match_end)
*match_end = next; *match_end = next;
/* pass NULL for match_start, since we don't need to find the /* pass NULL for match_start, since we don't need to find the start
* start again. * again. */
*/ return lines_match(&next, lines, visible_only, slice, NULL, match_end);
return lines_match (&next, lines, visible_only, slice, NULL, match_end);
} }
static gboolean static gboolean
backward_lines_match (const GtkTextIter *start, backward_lines_match(const GtkTextIter * start,
const gchar **lines, const gchar ** lines,
gboolean visible_only, gboolean visible_only,
gboolean slice, gboolean slice,
GtkTextIter *match_start, GtkTextIter * match_start, GtkTextIter * match_end)
GtkTextIter *match_end)
{ {
GtkTextIter line, next; GtkTextIter line, next;
gchar *line_text; gchar *line_text;
@ -364,40 +369,39 @@ backward_lines_match (const GtkTextIter *start,
} }
line = next = *start; line = next = *start;
if (gtk_text_iter_get_line_offset (&next) == 0) if (gtk_text_iter_get_line_offset(&next) == 0)
{ {
if (!gtk_text_iter_backward_line (&next)) if (!gtk_text_iter_backward_line(&next))
return FALSE; return FALSE;
} }
else else
gtk_text_iter_set_line_offset (&next, 0); gtk_text_iter_set_line_offset(&next, 0);
if (slice) if (slice)
{ {
if (visible_only) if (visible_only)
line_text = gtk_text_iter_get_visible_slice (&next, &line); line_text = gtk_text_iter_get_visible_slice(&next, &line);
else else
line_text = gtk_text_iter_get_slice (&next, &line); line_text = gtk_text_iter_get_slice(&next, &line);
} }
else else
{ {
if (visible_only) if (visible_only)
line_text = gtk_text_iter_get_visible_text (&next, &line); line_text = gtk_text_iter_get_visible_text(&next, &line);
else else
line_text = gtk_text_iter_get_text (&next, &line); line_text = gtk_text_iter_get_text(&next, &line);
} }
if (match_start) /* if this is the first line we're matching */ if (match_start) /* if this is the first line we're matching */
{ {
found = g_utf8_strrcasestr (line_text, *lines); found = g_utf8_strrcasestr(line_text, *lines);
} }
else else
{ {
/* If it's not the first line, we have to match from the /* If it's not the first line, we have to match from the start of the
* start of the line. * line. */
*/ if (g_utf8_caselessnmatch(line_text, *lines, strlen(line_text),
if (g_utf8_caselessnmatch (line_text, *lines, strlen (line_text), strlen(*lines)))
strlen (*lines)))
found = line_text; found = line_text;
else else
found = NULL; found = NULL;
@ -405,38 +409,36 @@ backward_lines_match (const GtkTextIter *start,
if (found == NULL) if (found == NULL)
{ {
g_free (line_text); g_free(line_text);
return FALSE; return FALSE;
} }
/* Get offset to start of search string */ /* Get offset to start of search string */
offset = g_utf8_strlen (line_text, found - line_text); offset = g_utf8_strlen(line_text, found - line_text);
forward_chars_with_skipping (&next, offset, visible_only, !slice, FALSE); forward_chars_with_skipping(&next, offset, visible_only, !slice, FALSE);
/* If match start needs to be returned, set it to the /* If match start needs to be returned, set it to the start of the search
* start of the search string. * string. */
*/
if (match_start) if (match_start)
{ {
*match_start = next; *match_start = next;
} }
/* Go to end of search string */ /* Go to end of search string */
forward_chars_with_skipping (&next, g_utf8_strlen (*lines, -1), visible_only, !slice, TRUE); forward_chars_with_skipping(&next, g_utf8_strlen(*lines, -1),
visible_only, !slice, TRUE);
g_free (line_text); g_free(line_text);
++lines; ++lines;
if (match_end) if (match_end)
*match_end = next; *match_end = next;
/* try to match the rest of the lines forward, passing NULL /* try to match the rest of the lines forward, passing NULL for
* for match_start so lines_match will try to match the entire * match_start so lines_match will try to match the entire line */
* line */ return lines_match(&next, lines, visible_only, slice, NULL, match_end);
return lines_match (&next, lines, visible_only,
slice, NULL, match_end);
} }
/* strsplit () that retains the delimiter as part of the string. */ /* strsplit () that retains the delimiter as part of the string. */
@ -533,12 +535,12 @@ strbreakup (const char *string,
* Return value: whether a match was found * Return value: whether a match was found
**/ **/
gboolean gboolean
gtk_source_iter_forward_search (const GtkTextIter *iter, gtk_source_iter_forward_search(const GtkTextIter * iter,
const gchar *str, const gchar * str,
GtkSourceSearchFlags flags, GtkSourceSearchFlags flags,
GtkTextIter *match_start, GtkTextIter * match_start,
GtkTextIter *match_end, GtkTextIter * match_end,
const GtkTextIter *limit) const GtkTextIter * limit)
{ {
gchar **lines = NULL; gchar **lines = NULL;
GtkTextIter match; GtkTextIter match;
@ -547,15 +549,14 @@ gtk_source_iter_forward_search (const GtkTextIter *iter,
gboolean visible_only; gboolean visible_only;
gboolean slice; gboolean slice;
g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail(iter != NULL, FALSE);
g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail(str != NULL, FALSE);
if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0) if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0)
return gtk_text_iter_forward_search (iter, str, flags, return gtk_text_iter_forward_search(iter, str, flags,
match_start, match_end, match_start, match_end, limit);
limit);
if (limit && gtk_text_iter_compare (iter, limit) >= 0) if (limit && gtk_text_iter_compare(iter, limit) >= 0)
return FALSE; return FALSE;
if (*str == '\0') if (*str == '\0')
@ -563,9 +564,9 @@ gtk_source_iter_forward_search (const GtkTextIter *iter,
/* If we can move one char, return the empty string there */ /* If we can move one char, return the empty string there */
match = *iter; match = *iter;
if (gtk_text_iter_forward_char (&match)) if (gtk_text_iter_forward_char(&match))
{ {
if (limit && gtk_text_iter_equal (&match, limit)) if (limit && gtk_text_iter_equal(&match, limit))
return FALSE; return FALSE;
if (match_start) if (match_start)
@ -584,26 +585,24 @@ gtk_source_iter_forward_search (const GtkTextIter *iter,
slice = (flags & GTK_SOURCE_SEARCH_TEXT_ONLY) == 0; slice = (flags & GTK_SOURCE_SEARCH_TEXT_ONLY) == 0;
/* locate all lines */ /* locate all lines */
lines = strbreakup (str, "\n", -1); lines = strbreakup(str, "\n", -1);
search = *iter; search = *iter;
do do
{ {
/* This loop has an inefficient worst-case, where /* This loop has an inefficient worst-case, where
* gtk_text_iter_get_text () is called repeatedly on * gtk_text_iter_get_text () is called repeatedly on a single line. */
* a single line.
*/
GtkTextIter end; GtkTextIter end;
if (limit && gtk_text_iter_compare (&search, limit) >= 0) if (limit && gtk_text_iter_compare(&search, limit) >= 0)
break; break;
if (lines_match (&search, (const gchar**)lines, if (lines_match(&search, (const gchar **) lines,
visible_only, slice, &match, &end)) visible_only, slice, &match, &end))
{ {
if (limit == NULL || (limit && if (limit == NULL || (limit &&
gtk_text_iter_compare (&end, limit) < 0)) gtk_text_iter_compare(&end, limit) < 0))
{ {
retval = TRUE; retval = TRUE;
@ -614,9 +613,9 @@ gtk_source_iter_forward_search (const GtkTextIter *iter,
} }
break; break;
} }
} while (gtk_text_iter_forward_line (&search)); } while (gtk_text_iter_forward_line(&search));
g_strfreev ((gchar**)lines); g_strfreev((gchar **) lines);
return retval; return retval;
} }
@ -636,12 +635,12 @@ gtk_source_iter_forward_search (const GtkTextIter *iter,
* Return value: whether a match was found * Return value: whether a match was found
**/ **/
gboolean gboolean
gtk_source_iter_backward_search (const GtkTextIter *iter, gtk_source_iter_backward_search(const GtkTextIter * iter,
const gchar *str, const gchar * str,
GtkSourceSearchFlags flags, GtkSourceSearchFlags flags,
GtkTextIter *match_start, GtkTextIter * match_start,
GtkTextIter *match_end, GtkTextIter * match_end,
const GtkTextIter *limit) const GtkTextIter * limit)
{ {
gchar **lines = NULL; gchar **lines = NULL;
GtkTextIter match; GtkTextIter match;
@ -650,15 +649,14 @@ gtk_source_iter_backward_search (const GtkTextIter *iter,
gboolean visible_only; gboolean visible_only;
gboolean slice; gboolean slice;
g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail(iter != NULL, FALSE);
g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail(str != NULL, FALSE);
if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0) if ((flags & GTK_SOURCE_SEARCH_CASE_INSENSITIVE) == 0)
return gtk_text_iter_backward_search (iter, str, flags, return gtk_text_iter_backward_search(iter, str, flags,
match_start, match_end, match_start, match_end, limit);
limit);
if (limit && gtk_text_iter_compare (iter, limit) <= 0) if (limit && gtk_text_iter_compare(iter, limit) <= 0)
return FALSE; return FALSE;
if (*str == '\0') if (*str == '\0')
@ -666,9 +664,9 @@ gtk_source_iter_backward_search (const GtkTextIter *iter,
/* If we can move one char, return the empty string there */ /* If we can move one char, return the empty string there */
match = *iter; match = *iter;
if (gtk_text_iter_backward_char (&match)) if (gtk_text_iter_backward_char(&match))
{ {
if (limit && gtk_text_iter_equal (&match, limit)) if (limit && gtk_text_iter_equal(&match, limit))
return FALSE; return FALSE;
if (match_start) if (match_start)
@ -687,26 +685,24 @@ gtk_source_iter_backward_search (const GtkTextIter *iter,
slice = (flags & GTK_SOURCE_SEARCH_TEXT_ONLY) == 0; slice = (flags & GTK_SOURCE_SEARCH_TEXT_ONLY) == 0;
/* locate all lines */ /* locate all lines */
lines = strbreakup (str, "\n", -1); lines = strbreakup(str, "\n", -1);
search = *iter; search = *iter;
while (TRUE) while (TRUE)
{ {
/* This loop has an inefficient worst-case, where /* This loop has an inefficient worst-case, where
* gtk_text_iter_get_text () is called repeatedly on * gtk_text_iter_get_text () is called repeatedly on a single line. */
* a single line.
*/
GtkTextIter end; GtkTextIter end;
if (limit && gtk_text_iter_compare (&search, limit) <= 0) if (limit && gtk_text_iter_compare(&search, limit) <= 0)
break; break;
if (backward_lines_match (&search, (const gchar**)lines, if (backward_lines_match(&search, (const gchar **) lines,
visible_only, slice, &match, &end)) visible_only, slice, &match, &end))
{ {
if (limit == NULL || (limit && if (limit == NULL || (limit &&
gtk_text_iter_compare (&end, limit) > 0)) gtk_text_iter_compare(&end, limit) > 0))
{ {
retval = TRUE; retval = TRUE;
@ -718,18 +714,18 @@ gtk_source_iter_backward_search (const GtkTextIter *iter,
break; break;
} }
if (gtk_text_iter_get_line_offset (&search) == 0) if (gtk_text_iter_get_line_offset(&search) == 0)
{ {
if (!gtk_text_iter_backward_line (&search)) if (!gtk_text_iter_backward_line(&search))
break; break;
} }
else else
{ {
gtk_text_iter_set_line_offset (&search, 0); gtk_text_iter_set_line_offset(&search, 0);
} }
} }
g_strfreev ((gchar**)lines); g_strfreev((gchar **) lines);
return retval; return retval;
} }

View File

@ -68,51 +68,6 @@
#include "gtkprint.h" #include "gtkprint.h"
#include <gdk/gdkkeysyms-compat.h> #include <gdk/gdkkeysyms-compat.h>
#define gtk_check_menu_item_get_active gtk_toggle_action_get_active
#define gtk_item_factory_get_item(x,y) GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(x,y))
#define gtk_item_factory_get_widget gtk_ui_manager_get_widget
#define GTK_OPTION_MENU GTK_COMBO_BOX
#define GTK_WIDGET_IS_SENSITIVE gtk_widget_is_sensitive
#define GTK_WIDGET_VISIBLE gtk_widget_get_visible
#define GtkOptionMenu GtkComboBox
#define gtk_option_menu_get_history gtk_combo_box_get_active
#define gtk_option_menu_set_history gtk_combo_box_set_active
#if !USE_GTK_GRID
#define gtk_orientable_set_orientation(x,y)
#define gtk_widget_set_hexpand(x,y)
#define gtk_widget_set_vexpand(x,y)
#endif
#if USE_GTK_GRID
#undef GTK_BOX
#define GTK_BOX GTK_GRID
#define gtk_hbox_new(x,y) gtk_grid_new()
#define gtk_vbox_new(x,y) gtk_grid_new()
#define gtk_box_pack_start(v,w,x,y,z) gtk_container_add(GTK_CONTAINER(v),w)
#endif
#if GLIB_CHECK_VERSION(2,29,14) && defined(G_DISABLE_DEPRECATED)
#define g_unicode_canonical_decomposition (gunichar*)g_unicode_canonical_decomposition
#endif
#if GTK_CHECK_VERSION(3,1,6) && !USE_GTK_GRID && defined(GTK_DISABLE_DEPRECATED)
#define gtk_hbox_new (GtkWidget*)gtk_hbox_new
#define gtk_vbox_new (GtkWidget*)gtk_vbox_new
#endif
#if GTK_CHECK_VERSION(3,1,90)
#undef GTK_FONT_SELECTION_DIALOG
#define GTK_FONT_SELECTION_DIALOG GTK_FONT_CHOOSER
#define gtk_font_selection_dialog_new(x) gtk_font_chooser_dialog_new(x, NULL)
#define gtk_font_selection_dialog_get_font_name gtk_font_chooser_get_font
#define gtk_font_selection_dialog_set_font_name gtk_font_chooser_set_font
#endif
#if GTK_CHECK_VERSION(3,3,2)
#undef GTK_TABLE
#define GTK_TABLE GTK_GRID
#define gtk_table_attach_defaults(u,v,w,x,y,z) gtk_grid_attach(u,v,w,y,1,1)
#define gtk_table_new(x, y, z) gtk_grid_new()
#define gtk_table_set_col_spacing(x,y,z) gtk_grid_set_column_spacing(x,z)
#define gtk_table_set_col_spacings gtk_grid_set_column_spacing
#define gtk_table_set_row_spacings gtk_grid_set_row_spacing
#endif
typedef struct { typedef struct {
FileInfo *fi; FileInfo *fi;
MainWin *mw; MainWin *mw;

View File

@ -84,14 +84,14 @@ void save_config_file(void)
gtk_window_get_size(GTK_WINDOW(pub->mw->window), &width, &height); gtk_window_get_size(GTK_WINDOW(pub->mw->window), &width, &height);
fontname = pango_font_description_to_string(gtk_style_context_get_font(gtk_widget_get_style_context(pub->mw->view), 0)); fontname = pango_font_description_to_string(gtk_style_context_get_font(gtk_widget_get_style_context(pub->mw->view), 0));
wordwrap = gtk_check_menu_item_get_active( wordwrap = gtk_toggle_action_get_active(
GTK_TOGGLE_ACTION(gtk_item_factory_get_item(pub->mw->menubar, GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(pub->mw->menubar,
"/M/Options/WordWrap"))); "/M/Options/WordWrap")));
linenumbers = gtk_check_menu_item_get_active( linenumbers = gtk_toggle_action_get_active(
GTK_TOGGLE_ACTION(gtk_item_factory_get_item(pub->mw->menubar, GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(pub->mw->menubar,
"/M/Options/LineNumbers"))); "/M/Options/LineNumbers")));
autoindent = gtk_check_menu_item_get_active( autoindent = gtk_toggle_action_get_active(
GTK_TOGGLE_ACTION(gtk_item_factory_get_item(pub->mw->menubar, GTK_TOGGLE_ACTION(gtk_ui_manager_get_action(pub->mw->menubar,
"/M/Options/AutoIndent"))); "/M/Options/AutoIndent")));
tabwidth = get_current_tab_width(); tabwidth = get_current_tab_width();
@ -236,15 +236,15 @@ gint main(gint argc, gchar **argv)
set_text_font_by_name(pub->mw->view, conf->fontname); set_text_font_by_name(pub->mw->view, conf->fontname);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Options/WordWrap")), gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Options/WordWrap")),
conf->wordwrap); conf->wordwrap);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Options/LineNumbers")), gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Options/LineNumbers")),
conf->linenumbers); conf->linenumbers);
indent_set_default_tab_width(conf->tabwidth); indent_set_default_tab_width(conf->tabwidth);
indent_refresh_tab_width(pub->mw->view); indent_refresh_tab_width(pub->mw->view);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Options/AutoIndent")), gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Options/AutoIndent")),
conf->autoindent); conf->autoindent);
gtk_widget_show_all(pub->mw->window); gtk_widget_show_all(pub->mw->window);
@ -257,8 +257,8 @@ gint main(gint argc, gchar **argv)
hlight_init(pub->mw->buffer); hlight_init(pub->mw->buffer);
undo_init(pub->mw->view, undo_init(pub->mw->view,
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Edit/Undo"), gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Edit/Undo"),
gtk_item_factory_get_widget(pub->mw->menubar, "/M/Edit/Redo")); gtk_ui_manager_get_widget(pub->mw->menubar, "/M/Edit/Redo"));
// hlight_init(pub->mw->buffer); // hlight_init(pub->mw->buffer);
dnd_init(pub->mw->view); dnd_init(pub->mw->view);

View File

@ -187,31 +187,31 @@ GtkUIManager *create_menu_bar(GtkWidget *window)
accel_group, GDK_T, GDK_CONTROL_MASK, 0, accel_group, GDK_T, GDK_CONTROL_MASK, 0,
g_cclosure_new_swap(G_CALLBACK(on_option_always_on_top), NULL, NULL)); g_cclosure_new_swap(G_CALLBACK(on_option_always_on_top), NULL, NULL));
gtk_widget_add_accelerator( gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Edit/Redo"), gtk_ui_manager_get_widget(ifactory, "/M/Edit/Redo"),
"activate", accel_group, GDK_Y, GDK_CONTROL_MASK, 0); "activate", accel_group, GDK_Y, GDK_CONTROL_MASK, 0);
gtk_widget_add_accelerator( gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/FindNext"), gtk_ui_manager_get_widget(ifactory, "/M/Search/FindNext"),
"activate", accel_group, GDK_F3, 0, 0); "activate", accel_group, GDK_F3, 0, 0);
gtk_widget_add_accelerator( gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/FindPrevious"), gtk_ui_manager_get_widget(ifactory, "/M/Search/FindPrevious"),
"activate", accel_group, GDK_F3, GDK_SHIFT_MASK, 0); "activate", accel_group, GDK_F3, GDK_SHIFT_MASK, 0);
gtk_widget_add_accelerator( gtk_widget_add_accelerator(
gtk_item_factory_get_widget(ifactory, "/M/Search/Replace"), gtk_ui_manager_get_widget(ifactory, "/M/Search/Replace"),
"activate", accel_group, GDK_R, GDK_CONTROL_MASK, 0); "activate", accel_group, GDK_R, GDK_CONTROL_MASK, 0);
/* initialize sensitivities */ /* initialize sensitivities */
gtk_widget_set_sensitive( gtk_widget_set_sensitive(
gtk_item_factory_get_widget(ifactory, "/M/Search/FindNext"), gtk_ui_manager_get_widget(ifactory, "/M/Search/FindNext"),
FALSE); FALSE);
gtk_widget_set_sensitive( gtk_widget_set_sensitive(
gtk_item_factory_get_widget(ifactory, "/M/Search/FindPrevious"), gtk_ui_manager_get_widget(ifactory, "/M/Search/FindPrevious"),
FALSE); FALSE);
menu_item_save = gtk_item_factory_get_widget(ifactory, "/M/File/Save"); menu_item_save = gtk_ui_manager_get_widget(ifactory, "/M/File/Save");
menu_item_cut = gtk_item_factory_get_widget(ifactory, "/M/Edit/Cut"); menu_item_cut = gtk_ui_manager_get_widget(ifactory, "/M/Edit/Cut");
menu_item_copy = gtk_item_factory_get_widget(ifactory, "/M/Edit/Copy"); menu_item_copy = gtk_ui_manager_get_widget(ifactory, "/M/Edit/Copy");
menu_item_paste = gtk_item_factory_get_widget(ifactory, "/M/Edit/Paste"); menu_item_paste = gtk_ui_manager_get_widget(ifactory, "/M/Edit/Paste");
menu_item_delete = gtk_item_factory_get_widget(ifactory, "/M/Edit/Delete"); menu_item_delete = gtk_ui_manager_get_widget(ifactory, "/M/Edit/Delete");
menu_sensitivity_from_selection_bound(FALSE); menu_sensitivity_from_selection_bound(FALSE);
return ifactory; return ifactory;

View File

@ -471,7 +471,7 @@ void run_dialog_jump_to(GtkWidget *textview)
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL); NULL);
button = create_button_with_stock_image(_("_Jump"), GTK_STOCK_JUMP_TO); button = create_button_with_stock_image(_("_Jump"), "go-jump");
gtk_widget_set_can_default(button, TRUE); gtk_widget_set_can_default(button, TRUE);
gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button, GTK_RESPONSE_OK); gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button, GTK_RESPONSE_OK);
table = gtk_table_new(1, 2, FALSE); table = gtk_table_new(1, 2, FALSE);

View File

@ -31,9 +31,9 @@ static gchar *lineend_str[] = {
"CR" "CR"
}; };
static void cb_select_lineend(GtkOptionMenu *option_menu, FileInfo *selected_fi) static void cb_select_lineend(GtkComboBox *option_menu, FileInfo *selected_fi)
{ {
switch (gtk_option_menu_get_history(option_menu)) { switch (gtk_combo_box_get_active(option_menu)) {
case 1: case 1:
selected_fi->lineend = CR+LF; selected_fi->lineend = CR+LF;
break; break;
@ -71,7 +71,7 @@ static GtkWidget *create_lineend_menu(FileInfo *selected_fi)
case CR: case CR:
i = 2; i = 2;
} }
gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), i); gtk_combo_box_set_active(GTK_COMBO_BOX(option_menu), i);
return option_menu; return option_menu;
} }
@ -140,7 +140,7 @@ static GtkWidget *init_menu_item_manual_charset(gchar *manual_charset)
return menu_item_manual_charset; return menu_item_manual_charset;
} }
static gboolean get_manual_charset(GtkOptionMenu *option_menu, FileInfo *selected_fi) static gboolean get_manual_charset(GtkComboBox *option_menu, FileInfo *selected_fi)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *vbox; GtkWidget *vbox;
@ -152,14 +152,13 @@ static gboolean get_manual_charset(GtkOptionMenu *option_menu, FileInfo *selecte
dialog = gtk_dialog_new_with_buttons(other_codeset_title, dialog = gtk_dialog_new_with_buttons(other_codeset_title,
GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(option_menu))), GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(option_menu))),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK, _("_OK"), GTK_RESPONSE_OK,
NULL); NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_orientable_set_orientation(GTK_ORIENTABLE(vbox), GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, FALSE, FALSE, 0);
@ -210,13 +209,13 @@ static gboolean get_manual_charset(GtkOptionMenu *option_menu, FileInfo *selecte
gboolean charset_menu_init_flag; gboolean charset_menu_init_flag;
static void cb_select_charset(GtkOptionMenu *option_menu, FileInfo *selected_fi) static void cb_select_charset(GtkComboBox *option_menu, FileInfo *selected_fi)
{ {
CharsetTable *ctable; CharsetTable *ctable;
static guint index_history = 0, prev_history; static guint index_history = 0, prev_history;
prev_history = index_history; prev_history = index_history;
index_history = gtk_option_menu_get_history(option_menu); index_history = gtk_combo_box_get_active(option_menu);
if (!charset_menu_init_flag) { if (!charset_menu_init_flag) {
ctable = get_charset_table(); ctable = get_charset_table();
if (index_history < ctable->num + mode) { if (index_history < ctable->num + mode) {
@ -231,7 +230,7 @@ static void cb_select_charset(GtkOptionMenu *option_menu, FileInfo *selected_fi)
} else } else
if (!get_manual_charset(option_menu, selected_fi)) { if (!get_manual_charset(option_menu, selected_fi)) {
index_history = prev_history; index_history = prev_history;
gtk_option_menu_set_history(option_menu, index_history); gtk_combo_box_set_active(option_menu, index_history);
} }
} }
} }
@ -280,7 +279,7 @@ static GtkWidget *create_charset_menu(FileInfo *selected_fi)
i += mode; i += mode;
} }
if (mode == SAVE || selected_fi->charset_flag) if (mode == SAVE || selected_fi->charset_flag)
gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), i); gtk_combo_box_set_active(GTK_COMBO_BOX(option_menu), i);
charset_menu_init_flag = FALSE; charset_menu_init_flag = FALSE;
return option_menu; return option_menu;
@ -300,26 +299,24 @@ static GtkWidget *create_file_selector(FileInfo *selected_fi)
selector = gtk_file_chooser_dialog_new(title, NULL, selector = gtk_file_chooser_dialog_new(title, NULL,
mode ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE, mode ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Cancel"), GTK_RESPONSE_CANCEL,
mode ? GTK_STOCK_OPEN : GTK_STOCK_SAVE, GTK_RESPONSE_OK, mode ? _("_Open") : _("_Save As"), GTK_RESPONSE_OK,
NULL); NULL);
gtk_dialog_set_default_response(GTK_DIALOG(selector), GTK_RESPONSE_OK); gtk_dialog_set_default_response(GTK_DIALOG(selector), GTK_RESPONSE_OK);
// align = gtk_alignment_new(0.5, 0, 0, 0);
align = gtk_alignment_new(1, 0, 0, 0); align = gtk_alignment_new(1, 0, 0, 0);
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(selector), align); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(selector), align);
table = gtk_table_new(2, 2, FALSE); table = gtk_grid_new();
gtk_container_add(GTK_CONTAINER(align), table); gtk_container_add(GTK_CONTAINER(align), table);
option_menu_charset = create_charset_menu(selected_fi); option_menu_charset = create_charset_menu(selected_fi);
label = gtk_label_new_with_mnemonic(_("C_haracter Coding:")); label = gtk_label_new_with_mnemonic(_("C_haracter Coding:"));
gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu_charset); gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu_charset);
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
// gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_grid_set_column_spacing(GTK_GRID(table), 8);
gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8); gtk_grid_attach(GTK_GRID(table), option_menu_charset, 1, 0, 1, 1);
gtk_table_attach_defaults(GTK_TABLE(table), option_menu_charset, 1, 2, 0, 1);
if (mode == SAVE) { if (mode == SAVE) {
option_menu_lineend = create_lineend_menu(selected_fi); option_menu_lineend = create_lineend_menu(selected_fi);
gtk_table_attach_defaults(GTK_TABLE(table), option_menu_lineend, 2, 3, 0, 1); gtk_grid_attach(GTK_GRID(table), option_menu_lineend, 2, 0, 1, 1);
} }
gtk_widget_show_all(align); gtk_widget_show_all(align);
@ -382,7 +379,7 @@ FileInfo *get_fileinfo_from_selector(FileInfo *fi, gint requested_mode)
} }
} }
gtk_widget_hide(selector); gtk_widget_hide(selector);
} while (GTK_WIDGET_VISIBLE(selector)); } while (gtk_widget_get_visible(selector));
if (res != GTK_RESPONSE_OK) { if (res != GTK_RESPONSE_OK) {
if (selected_fi->charset) if (selected_fi->charset)

View File

@ -83,17 +83,13 @@ GtkWidget *create_button_with_stock_image(const gchar *text, const gchar *stock_
GtkWidget *label; GtkWidget *label;
GtkWidget *align; GtkWidget *align;
hbox = gtk_hbox_new(FALSE, 2); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON); image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_BUTTON);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
label = gtk_label_new_with_mnemonic(text); label = gtk_label_new_with_mnemonic(text);
#if USE_GTK_GRID
gtk_grid_attach_next_to (GTK_BOX (hbox), label, image, GTK_POS_RIGHT, 1, 1);
#else
gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#endif
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add(GTK_CONTAINER(align), hbox); gtk_container_add(GTK_CONTAINER(align), hbox);

View File

@ -42,12 +42,11 @@ MainWin *create_main_window(void)
g_signal_connect_after(G_OBJECT(mw->window), "delete-event", g_signal_connect_after(G_OBJECT(mw->window), "delete-event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL); G_CALLBACK(gtk_widget_hide_on_delete), NULL);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_orientable_set_orientation(GTK_ORIENTABLE(vbox), GTK_ORIENTATION_VERTICAL);
gtk_container_add(GTK_CONTAINER(mw->window), vbox); gtk_container_add(GTK_CONTAINER(mw->window), vbox);
mw->menubar = create_menu_bar(mw->window); mw->menubar = create_menu_bar(mw->window);
gtk_box_pack_start(GTK_BOX(vbox), gtk_item_factory_get_widget(mw->menubar, "/M"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), gtk_ui_manager_get_widget(mw->menubar, "/M"), FALSE, FALSE, 0);
sw = gtk_scrolled_window_new(NULL, NULL); sw = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_hexpand (sw, TRUE); gtk_widget_set_hexpand (sw, TRUE);