Hello community, here is the log from the commit of package vte for openSUSE:Factory checked in at 2012-01-09 15:42:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vte (Old) and /work/SRC/openSUSE:Factory/.vte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vte", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vte/vte.changes 2011-10-19 00:55:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vte.new/vte.changes 2012-01-09 15:42:45.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Dec 8 20:33:32 UTC 2011 - dimstar@opensuse.org + +- Split typelib file into typelib-1_0-Vte-2_90 subpackage. +- Add typelib-1_0-Vte-2_90 Requires to devel subpackage. + +------------------------------------------------------------------- +Mon Nov 21 16:31:09 UTC 2011 - dimstar@opensuse.org + +- Update to version 0.31.0: + + Don't override the widget background colour + + Add missing (closure) annotation on VteSelectionFunc + + use gtk_drag_check_threshold() (bgo#654691) + + Add urxvt extended mouse tracking mode support (bgo#662423) + + Add runtime check for X11 display (bgo#660151) + + Bugs fixed: bgo#655405, bgo#661121, bgo#616001 + + Updated translations. + +------------------------------------------------------------------- Old: ---- vte-0.30.1.tar.bz2 New: ---- vte-0.31.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vte.spec ++++++ --- /var/tmp/diff_new_pack.ssTmsP/_old 2012-01-09 15:42:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ssTmsP/_new 2012-01-09 15:42:46.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define _sover 2_90-9 %define _apiver 2.90 %define _binver 2_90 @@ -24,12 +23,12 @@ Name: vte %define _name vte Url: http://www.gnome.org -License: GPLv2+ -Group: Development/Libraries/GNOME -Version: 0.30.1 -Release: 1 +Version: 0.31.0 +Release: 0 Summary: Terminal Emulator Library -Source: http://download.gnome.org/sources/vte/0.30/%{name}-%{version}.tar.bz2 +License: GPL-2.0+ +Group: Development/Libraries/GNOME +Source: http://download.gnome.org/sources/vte/0.31/%{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk3-devel @@ -46,7 +45,6 @@ %package -n libvte%{_sover} -License: GPLv2+ Summary: Terminal Emulator Library Group: System/Libraries Requires: gnome-pty-helper @@ -61,8 +59,18 @@ use with GTK+ as well as handling of child process and terminal emulation settings. +%package -n typelib-1_0-Vte-%{?_binver} +Summary: Terminal Emulator Library -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Vte-%{?_binver} +VTE is a terminal emulator library that provides a terminal widget for +use with GTK+ as well as handling of child process and terminal +emulation settings. + +This package provides the GObject Introspection bindings for VTE. + %package -n gnome-pty-helper -License: GPLv2+ Summary: Terminal Emulator Library -- Helper for utmp/wtmp/lastlog logging Group: System/Libraries PreReq: permissions @@ -75,7 +83,6 @@ This package provides a helper for utmp/wtmp/lastlog logging. %package tools -License: GPLv2+ Summary: Terminal Emulator Library -- Tools Group: System/Libraries @@ -87,7 +94,6 @@ This package provides tools using VTE. %package -n glade-catalog-vte -License: GPLv2+ Summary: Terminal Emulator Library -- Catalog for Glade Group: Development/Tools/GUI Builders Requires: libvte%{_sover} = %{version} @@ -103,10 +109,10 @@ widgets in Glade. %package devel -License: GPLv2+ Summary: Terminal Emulator Library -- Development Files Group: Development/Libraries/GNOME Requires: libvte%{_sover} = %{version} +Requires: typelib-1_0-Vte-%{?_binver} = %{version} Provides: vte-doc = %{version} Obsoletes: vte-doc < %{version} @@ -154,11 +160,14 @@ %defattr(-,root,root) %doc AUTHORS COPYING README NEWS ChangeLog %{_libdir}/*.so.* -%{_libdir}/girepository-1.0/Vte-%{_apiver}.typelib %dir %{_datadir}/vte %dir %{_datadir}/vte/termcap-%{_apiver} %{_datadir}/vte/termcap-%{_apiver}/xterm +%files -n typelib-1_0-Vte-%{?_binver} +%defattr(-,root,root) +%{_libdir}/girepository-1.0/Vte-%{_apiver}.typelib + %files -n gnome-pty-helper %defattr(-,root,root) %verify (not mode) %attr (2755, root, utmp) %{_libexecdir}/gnome-pty-helper ++++++ vte-0.30.1.tar.bz2 -> vte-0.31.0.tar.bz2 ++++++ ++++ 20984 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/ChangeLog new/vte-0.31.0/ChangeLog --- old/vte-0.30.1/ChangeLog 2011-10-17 13:12:15.000000000 +0200 +++ new/vte-0.31.0/ChangeLog 2011-11-21 14:50:17.000000000 +0100 @@ -1,3 +1,159 @@ +commit 45fd45ff5c4ea0d58c8cf32cfd03d7b556bb9dc8 +Author: Christian Persch <chpe@gnome.org> +Date: Mon Nov 21 14:47:38 2011 +0100 + + Version 0.31.0 + + NEWS | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +commit 9fc22089b05cfe6c47ae8e8059a4092fa6933edc +Author: Christian Persch <chpe@gnome.org> +Date: Fri Nov 18 13:22:19 2011 +0100 + + build: Add more compiler warnings + (cherry picked from commit 5146e22b60cbbba25e432ee8b3e08533efae65e6) + + configure.in | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit 568e2488f58dd6df9d8f8c542f112e15955d1261 +Author: Christian Persch <chpe@gnome.org> +Date: Mon Oct 31 14:02:28 2011 +0100 + + build: Use better autoconf macros to detect compiler flags support + + This fixes these autoconf warnings: + + Running aclocal-1.11... + configure.in:195: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body + ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... + ../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from... + ../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from... + configure.in:140: VTE_CC_TRY_FLAG is expanded from... + ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... + ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... + ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... + configure.in:195: the top level + [etc] + + Should also fix detection of non-support for -fno-common in sun cc, + https://bugzilla.gnome.org/show_bug.cgi?id=616001 . + (cherry picked from commit e22660067676aff41db5dfc2948b603ee1f2b8c5) + + Makefile.am | 2 +- + acinclude.m4 | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.in | 152 +++++----------------------- + 3 files changed, 346 insertions(+), 127 deletions(-) + +commit 60e0ce9ff6b27787c47c266e779d80e3389babe9 +Author: Egmont Koblinger <egmont@gmail.com> +Date: Wed Nov 9 22:47:37 2011 +0100 + + Add urxvt extended mouse tracking mode support + + https://bugzilla.gnome.org/show_bug.cgi?id=662423 + + src/vte-private.h | 1 + + src/vte.c | 58 +++++++++++++++++++++++++++++++++------------------- + src/vteseq.c | 5 ++++ + 3 files changed, 43 insertions(+), 21 deletions(-) + +commit 70128abf00fba026d85e92b1e47c0b2d69270f16 +Author: Brian Cameron <brian.cameron@oracle.com> +Date: Sun Oct 30 19:10:16 2011 +0100 + + Fix build with sun's cc + + https://bugzilla.gnome.org/show_bug.cgi?id=661121 + + src/vte.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit f91e8adbbdee5dccf61fc594c58b954d12bb0356 +Author: Dan Winship <danw@gnome.org> +Date: Fri Jul 15 13:36:45 2011 -0400 + + vte: use gtk_drag_check_threshold() + + When processing motion events, don't start selecting until the pointer + has moved at least the gtk drag threshold distance. + + Fixes the problem where, when clicking to select a terminal, you often + end up selecting a bit of text where you clicked, which is especially + annoying when you were planning to middle-button-paste something from + another window. + + https://bugzilla.gnome.org/show_bug.cgi?id=654691 + + src/vte-private.h | 1 + + src/vte.c | 34 ++++++++++++++++++++++++++-------- + 2 files changed, 27 insertions(+), 8 deletions(-) + +commit 0870312c122b55f64b41390f4315b09d338c6556 +Author: Young-Ho Cha <ganadist@chollian.net> +Date: Fri Oct 28 14:10:03 2011 +0200 + + Add runtime check for X11 display + + https://bugzilla.gnome.org/show_bug.cgi?id=660151 + + src/vtebg.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 62f9f45839e9c79b255c02f9d893c4898de00187 +Author: Evan Nemerson <evan@coeus-group.com> +Date: Wed Jul 27 03:18:37 2011 -0700 + + Add missing (closure) annotation on VteSelectionFunc + + Fixes #655405. + + src/vte.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e68cfbac308e98d704fbca579bab53998904c7ad +Author: Christian Persch <chpe@gnome.org> +Date: Thu Oct 27 23:10:56 2011 +0200 + + Don't override the widget background colour + + The comment was inaccurate; we always do draw the background colour even + when the background mode is NONE. Removing the colour override makes + theme colours working again in gnome-terminal's gsettings branch. + + src/vte.c | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +commit e6a83f6175c2865385c80deec1f7ed79650f7d58 +Author: Christian Persch <chpe@gnome.org> +Date: Thu Oct 27 23:09:31 2011 +0200 + + Use to GtkStyleContext + + ... instead of the obsolete GtkStyle. + + src/vte.c | 29 +++++++++++++---------------- + 1 files changed, 13 insertions(+), 16 deletions(-) + +commit f1b028951c2b79b4f01d39a2bfda1f039ba0760d +Author: Christian Persch <chpe@gnome.org> +Date: Thu Oct 27 23:12:28 2011 +0200 + + Post branch version bump + + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 4b3faee73939770d035d88bb575393f31f62ec78 +Author: Christian Persch <chpe@gnome.org> +Date: Mon Oct 17 13:14:58 2011 +0200 + + Post release version bump + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 4927c3877e73cd7c11456d4b49081c9b99f7e72f Author: Christian Persch <chpe@gnome.org> Date: Sun Oct 16 19:51:01 2011 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/Makefile.am new/vte-0.31.0/Makefile.am --- old/vte-0.30.1/Makefile.am 2011-09-26 14:32:48.000000000 +0200 +++ new/vte-0.31.0/Makefile.am 2011-11-21 14:41:46.000000000 +0100 @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I . SUBDIRS = src termcaps po doc perf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/NEWS new/vte-0.31.0/NEWS --- old/vte-0.30.1/NEWS 2011-10-17 13:07:31.000000000 +0200 +++ new/vte-0.31.0/NEWS 2011-11-21 14:46:26.000000000 +0100 @@ -1,3 +1,13 @@ +0.31.0 +====== +- Don't override the widget background colour +- Add missing (closure) annotation on VteSelectionFunc (#655405, Evan Nemerson) +- use gtk_drag_check_threshold() (#654691, Dan Winship) +- Add urxvt extended mouse tracking mode support (#662423, Egmont Koblinger) +- Add runtime check for X11 display (#660151, Young-Ho Cha) +- Build fixes (#661121, #616001) +- Translation updates + 0.30.1 ====== - Translation updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/acinclude.m4 new/vte-0.31.0/acinclude.m4 --- old/vte-0.30.1/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/vte-0.31.0/acinclude.m4 2011-11-09 23:22:48.000000000 +0100 @@ -0,0 +1,319 @@ +dnl Macros to check the presence of generic (non-typed) symbols. +dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com> +dnl Copyright (c) 2006-2008 xine project +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 3, or (at your option) +dnl any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +dnl 02110-1301, USA. +dnl +dnl As a special exception, the copyright owners of the +dnl macro gives unlimited permission to copy, distribute and modify the +dnl configure scripts that are the output of Autoconf when processing the +dnl Macro. You need not follow the terms of the GNU General Public +dnl License when using or distributing such scripts, even though portions +dnl of the text of the Macro appear in them. The GNU General Public +dnl License (GPL) does govern all other use of the material that +dnl constitutes the Autoconf Macro. +dnl +dnl This special exception to the GPL applies to versions of the +dnl Autoconf Macro released by this project. When you make and +dnl distribute a modified version of the Autoconf Macro, you may extend +dnl this special exception to the GPL to apply to your modified version as +dnl well. + +dnl Check if the flag is supported by compiler +dnl CC_CHECK_CFLAGS_SILENT([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ + AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a;])], + [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl Check if the flag is supported by compiler (cacheable) +dnl CC_CHECK_CFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_CFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_cflags_$1]), + CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! + ) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl CC_CHECK_CFLAG_APPEND(FLAG, [action-if-found], [action-if-not-found]) +dnl Check for CFLAG and appends them to CFLAGS if supported +AC_DEFUN([CC_CHECK_CFLAG_APPEND], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_cflags_$1]), + CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! + ) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [CFLAGS="$CFLAGS $1"; DEBUG_CFLAGS="$DEBUG_CFLAGS $1"; $2], [$3]) +]) + +dnl CC_CHECK_CFLAGS_APPEND([FLAG1 FLAG2], [action-if-found], [action-if-not]) +AC_DEFUN([CC_CHECK_CFLAGS_APPEND], [ + for flag in $1; do + CC_CHECK_CFLAG_APPEND($flag, [$2], [$3]) + done +]) + +dnl Check if the flag is supported by linker (cacheable) +dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_LDFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_ldflags_$1]), + [ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $1" + AC_LANG_PUSH([C]) + AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 1; }])], + [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) + AC_LANG_POP([C]) + LDFLAGS="$ac_save_LDFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for +dnl the current linker to avoid undefined references in a shared object. +AC_DEFUN([CC_NOUNDEFINED], [ + dnl We check $host for which systems to enable this for. + AC_REQUIRE([AC_CANONICAL_HOST]) + + case $host in + dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads + dnl are requested, as different implementations are present; to avoid problems + dnl use -Wl,-z,defs only for those platform not behaving this way. + *-freebsd* | *-openbsd*) ;; + *) + dnl First of all check for the --no-undefined variant of GNU ld. This allows + dnl for a much more readable commandline, so that people can understand what + dnl it does without going to look for what the heck -z defs does. + for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do + CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) + break + done + ;; + esac + + AC_SUBST([LDFLAGS_NOUNDEFINED]) +]) + +dnl Check for a -Werror flag or equivalent. -Werror is the GCC +dnl and ICC flag that tells the compiler to treat all the warnings +dnl as fatal. We usually need this option to make sure that some +dnl constructs (like attributes) are not simply ignored. +dnl +dnl Other compilers don't support -Werror per se, but they support +dnl an equivalent flag: +dnl - Sun Studio compiler supports -errwarn=%all +AC_DEFUN([CC_CHECK_WERROR], [ + AC_CACHE_CHECK( + [for $CC way to treat warnings as errors], + [cc_cv_werror], + [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror], + [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])]) + ]) +]) + +AC_DEFUN([CC_CHECK_ATTRIBUTE], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], + AS_TR_SH([cc_cv_attribute_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_LANG_PUSH([C]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], + [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) + AC_LANG_POP([C]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], + [AC_DEFINE( + AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, + [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] + ) + $4], + [$5]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ + CC_CHECK_ATTRIBUTE( + [constructor],, + [void __attribute__((constructor)) ctor() { int a; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ + CC_CHECK_ATTRIBUTE( + [format], [format(printf, n, n)], + [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ + CC_CHECK_ATTRIBUTE( + [format_arg], [format_arg(printf)], + [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ + CC_CHECK_ATTRIBUTE( + [visibility_$1], [visibility("$1")], + [void __attribute__((visibility("$1"))) $1_function() { }], + [$2], [$3]) +]) + +AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ + CC_CHECK_ATTRIBUTE( + [nonnull], [nonnull()], + [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ + CC_CHECK_ATTRIBUTE( + [unused], , + [void some_function(void *foo, __attribute__((unused)) void *bar);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ + CC_CHECK_ATTRIBUTE( + [sentinel], , + [void some_function(void *foo, ...) __attribute__((sentinel));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ + CC_CHECK_ATTRIBUTE( + [deprecated], , + [void some_function(void *foo, ...) __attribute__((deprecated));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ + CC_CHECK_ATTRIBUTE( + [alias], [weak, alias], + [void other_function(void *foo) { } + void some_function(void *foo) __attribute__((weak, alias("other_function")));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ + CC_CHECK_ATTRIBUTE( + [malloc], , + [void * __attribute__((malloc)) my_alloc(int n);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_PACKED], [ + CC_CHECK_ATTRIBUTE( + [packed], , + [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONST], [ + CC_CHECK_ATTRIBUTE( + [const], , + [int __attribute__((const)) twopow(int n) { return 1 << n; } ], + [$1], [$2]) +]) + +AC_DEFUN([CC_FLAG_VISIBILITY], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports -fvisibility=hidden], + [cc_cv_flag_visibility], + [cc_flag_visibility_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], + cc_cv_flag_visibility='yes', + cc_cv_flag_visibility='no') + CFLAGS="$cc_flag_visibility_save_CFLAGS"]) + + AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], + [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, + [Define this if the compiler supports the -fvisibility flag]) + $1], + [$2]) +]) + +AC_DEFUN([CC_FUNC_EXPECT], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if compiler has __builtin_expect function], + [cc_cv_func_expect], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_LANG_PUSH([C]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [int some_function() { + int a = 3; + return (int)__builtin_expect(a, 3); + }])], + [cc_cv_func_expect=yes], + [cc_cv_func_expect=no]) + AC_LANG_POP([C]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([test "x$cc_cv_func_expect" = "xyes"], + [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1, + [Define this if the compiler supports __builtin_expect() function]) + $1], + [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported], + [cc_cv_attribute_aligned], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_LANG_PUSH([C]) + for cc_attribute_align_try in 64 32 16 8 4 2; do + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + int main() { + static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; + return c; + }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) + done + AC_LANG_POP([C]) + CFLAGS="$ac_save_CFLAGS" + ]) + + if test "x$cc_cv_attribute_aligned" != "x"; then + AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned], + [Define the highest alignment supported]) + fi +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/configure.in new/vte-0.31.0/configure.in --- old/vte-0.30.1/configure.in 2011-10-16 19:50:50.000000000 +0200 +++ new/vte-0.31.0/configure.in 2011-11-21 14:42:17.000000000 +0100 @@ -1,6 +1,6 @@ m4_define([version_major],0) -m4_define([version_minor],30) -m4_define([version_micro],1) +m4_define([version_minor],31) +m4_define([version_micro],0) m4_define([version_triplet],version_major.version_minor.version_micro) m4_define([so_major_adjust],9) dnl Don't change! @@ -69,6 +69,18 @@ LT_PREREQ([2.2]) LT_INIT +################################################################################ +# Enable debugging messages and additional run-time checks. +################################################################################ + +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], + [enable extra debugging checks and logging messages])], + [],[enable_debug=no]) +if test "x$enable_debug" = "xyes" ; then + AC_MSG_RESULT([enabling debug checks and messages]) + AC_DEFINE(VTE_DEBUG,1,[Enable debugging messages.]) +fi ################################################################################ # i18n @@ -83,7 +95,6 @@ AM_GLIB_GNU_GETTEXT AC_CHECK_DECLS(bind_textdomain_codeset,,,[#include "libintl.h"]) - ################################################################################ # Platform checks ################################################################################ @@ -120,105 +131,22 @@ LIBTOOL_FLAGS='-as-needed' AC_SUBST([LIBTOOL_FLAGS]) - ################################################################################ # Compilation ################################################################################ -dnl Use lots of warning flags with with gcc and compatible compilers -dnl Copied from cairo -AC_DEFUN([VTE_CC_TRY_FLAG], [ - AC_MSG_CHECKING([whether $CC supports $1]) - - vte_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - - AC_COMPILE_IFELSE([ ], [vte_cc_flag=yes], [vte_cc_flag=no]) - CFLAGS="$vte_save_CFLAGS" - - if test "x$vte_cc_flag" = "xyes"; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi - AC_MSG_RESULT([$vte_cc_flag]) -]) -AC_DEFUN([VTE_LD_TRY_FLAG], [ - AC_MSG_CHECKING([whether $CC supports $1 when linking]) - - vte_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $1" - - AC_LINK_IFELSE([int main(void) {return 0;}], - [vte_ld_flag=yes], [vte_ld_flag=no]) - LDFLAGS="$vte_save_LDFLAGS" - - if test "x$vte_ld_flag" = "xyes"; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi - AC_MSG_RESULT([$vte_ld_flag]) -]) - - -dnl Note: if you change the following variable, the cache is automatically -dnl skipped and all flags rechecked. So there's no need to do anything -dnl else. If for any reason you need to force a recheck, just change -dnl MAYBE_WARN in an ignorable way (like adding whitespace) - -MAYBE_WARN="-Wall -Wextra \ --Wsign-compare -Werror-implicit-function-declaration \ --Wpointer-arith -Wwrite-strings -Wstrict-prototypes \ --Waggregate-return -Wcast-align -Wimplicit -Wuninitialised \ --Wmissing-prototypes -Wmissing-declarations -Wnested-externs \ --Wpacked -Wmissing-format-attribute -Wshadow \ --Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \ --Wdeclaration-after-statement -Wold-style-definition \ --Wno-missing-field-initializers -Wno-unused-parameter \ --fno-common -Wno-switch-enum" - -# invalidate cached value if MAYBE_WARN has changed -if test "x$vte_cv_warn_maybe" != "x$MAYBE_WARN"; then - unset vte_cv_warn_cflags -fi -AC_CACHE_CHECK([for supported warning flags], vte_cv_warn_cflags, [ - echo - WARN_CFLAGS="" - - # Some warning options are not supported by all versions of - # gcc, so test all desired options against the current - # compiler. - # - # Note that there are some order dependencies - # here. Specifically, an option that disables a warning will - # have no net effect if a later option then enables that - # warnings, (perhaps implicitly). So we put some grouped - # options (-Wall and -Wextra) up front and the -Wno options - # last. - - for W in $MAYBE_WARN; do - VTE_CC_TRY_FLAG([$W], [WARN_CFLAGS="$WARN_CFLAGS $W"]) - done - - vte_cv_warn_cflags=$WARN_CFLAGS - vte_cv_warn_maybe=$MAYBE_WARN - - AC_MSG_CHECKING([which warning flags were supported])]) -WARN_CFLAGS=$vte_cv_warn_cflags -AC_SUBST(WARN_CFLAGS) -CFLAGS="$CFLAGS $WARN_CFLAGS" - -# Enable debugging messages and additional run-time checks. -AC_ARG_ENABLE(debug, - [AS_HELP_STRING([--enable-debug], - [enable extra debugging checks and logging messages] - )], - DEBUG=$enableval, DEBUG=no) -if test "x$DEBUG" != "xno" ; then - AC_MSG_RESULT([enabling debug checks and messages]) - AC_DEFINE(VTE_DEBUG,1,[Enable debugging messages.]) -fi +CC_CHECK_CFLAGS_APPEND([ \ + -Wall -Wextra \ + -Wformat-nonliteral -Werror=format-security \ + -Wsign-compare -Werror=implicit-function-declaration \ + -Wpointer-arith -Wwrite-strings -Wstrict-prototypes \ + -Waggregate-return -Wcast-align -Wimplicit -Wuninitialized \ + -Wmissing-prototypes -Wmissing-declarations -Wnested-externs \ + -Wpacked -Wmissing-format-attribute -Wshadow \ + -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \ + -Wdeclaration-after-statement -Wold-style-definition \ + -Wno-missing-field-initializers -Wno-unused-parameter \ + -fno-common -Wno-switch-enum]) ########################################################## # Check for -Bsymbolic-functions linker flag used to avoid @@ -232,9 +160,8 @@ VTE_LDFLAGS= if test "$enable_Bsymbolic" != "no"; then - FLAG="-Wl,-Bsymbolic-functions" - VTE_LD_TRY_FLAG([$FLAG], - [VTE_LDFLAGS="$VTE_LDFLAGS $FLAG"], + CC_CHECK_LDFLAGS(["-Wl,-Bsymbolic-functions"], + [VTE_LDFLAGS="$VTE_LDFLAGS -Wl,-Bsymbolic-functions"], [if test "$enable_Bsymbolic" = "auto"; then AC_MSG_WARN([-Bsymbolic not supported by ld; disabling]) enable_Bsymbolic=no @@ -246,32 +173,6 @@ AC_SUBST([VTE_LDFLAGS]) ################################################################################ - -# Disable deprecations and single includes -# We don't use GNOME_MAINTAINER_MODE_DEFINES here since it's too much and -# it also defines VTE's own defines. -dnl AC_ARG_ENABLE([deprecation], -dnl [AS_HELP_STRING([--disable-deprecation], -dnl [prohibit VTE from using deprecated GLib/Pango/ATK/GDK/GTK+ features])], -dnl [],[enable_deprecation=$enable_maintainer_mode]) -dnl if test "x$enable_deprecation" = xyes; then -dnl AC_MSG_NOTICE([disabling deprecated GLIB/PANGO/GDK/ATK/GTK+ features]) -dnl -dnl AC_DEFINE([ATK_DISABLE_DEPRECATED],[1],[Disable deprecated features]) -dnl AC_DEFINE([ATK_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes]) -dnl AC_DEFINE([G_DISABLE_DEPRECATED],[1],[Disable deprecated features]) -dnl AC_DEFINE([G_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes]) -dnl AC_DEFINE([GDK_DISABLE_DEPRECATED],[1],[Disable deprecated features]) -dnl AC_DEFINE([GDK_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes]) -dnl AC_DEFINE([GDK_PIXBUF_DISABLE_DEPRECATED],[1],[Disable deprecated features]) -dnl AC_DEFINE([GDK_PIXBUF_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes]) -dnl AC_DEFINE([GTK_DISABLE_DEPRECATED],[1],[Disable deprecated features]) -dnl AC_DEFINE([GTK_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes]) -dnl AC_DEFINE([PANGO_DISABLE_DEPRECATED],[1],[Disable deprecated features]) -dnl AC_DEFINE([PANGO_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes]) -dnl fi - -################################################################################ # Core ################################################################################ @@ -504,6 +405,6 @@ Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION Installing Glade catalogue: $enable_glade_catalogue - Debugging: $DEBUG + Debugging: $enable_debug Disallow deprecated features: $enable_deprecation EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/VteReaper.html new/vte-0.31.0/doc/reference/html/VteReaper.html --- old/vte-0.30.1/doc/reference/html/VteReaper.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/VteReaper.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>VteReaper</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="deprecated-objects.html" title="Deprecated"> <link rel="prev" href="deprecated-objects.html" title="Deprecated"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/VteTerminal.html new/vte-0.31.0/doc/reference/html/VteTerminal.html --- old/vte-0.30.1/doc/reference/html/VteTerminal.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/VteTerminal.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>VteTerminal</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="ch01.html" title=""> <link rel="prev" href="ch01.html" title=""> @@ -613,7 +613,7 @@ </tr> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>user data. +<td> user data. <span class="annotation">[closure]</span> </td> </tr> <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/VteTerminalAccessible.html new/vte-0.31.0/doc/reference/html/VteTerminalAccessible.html --- old/vte-0.30.1/doc/reference/html/VteTerminalAccessible.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/VteTerminalAccessible.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>VteTerminalAccessible</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="internal-objects.html" title="Interna"> <link rel="prev" href="internal-objects.html" title="Interna"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/annotation-glossary.html new/vte-0.31.0/doc/reference/html/annotation-glossary.html --- old/vte-0.30.1/doc/reference/html/annotation-glossary.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/annotation-glossary.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Annotation Glossary</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="api-index-0-28.html" title="Index of new symbols in 0.28"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/api-index-0-20.html new/vte-0.31.0/doc/reference/html/api-index-0-20.html --- old/vte-0.30.1/doc/reference/html/api-index-0-20.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/api-index-0-20.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Index of new symbols in 0.20</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="api-index-deprecated.html" title="Index of deprecated symbols"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/api-index-0-24.html new/vte-0.31.0/doc/reference/html/api-index-0-24.html --- old/vte-0.30.1/doc/reference/html/api-index-0-24.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/api-index-0-24.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Index of new symbols in 0.24</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="api-index-0-20.html" title="Index of new symbols in 0.20"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/api-index-0-26.html new/vte-0.31.0/doc/reference/html/api-index-0-26.html --- old/vte-0.30.1/doc/reference/html/api-index-0-26.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/api-index-0-26.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Index of new symbols in 0.26</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="api-index-0-24.html" title="Index of new symbols in 0.24"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/api-index-0-28.html new/vte-0.31.0/doc/reference/html/api-index-0-28.html --- old/vte-0.30.1/doc/reference/html/api-index-0-28.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/api-index-0-28.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Index of new symbols in 0.28</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="api-index-0-26.html" title="Index of new symbols in 0.26"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/api-index-deprecated.html new/vte-0.31.0/doc/reference/html/api-index-deprecated.html --- old/vte-0.30.1/doc/reference/html/api-index-deprecated.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/api-index-deprecated.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Index of deprecated symbols</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="api-index-full.html" title="Index"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/api-index-full.html new/vte-0.31.0/doc/reference/html/api-index-full.html --- old/vte-0.30.1/doc/reference/html/api-index-full.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/api-index-full.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Index</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="object-hierarchy.html" title="Object Hierarchy"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/ch01.html new/vte-0.31.0/doc/reference/html/ch01.html --- old/vte-0.30.1/doc/reference/html/ch01.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/ch01.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title></title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="pt01.html" title="Part I. API Reference"> <link rel="prev" href="pt01.html" title="Part I. API Reference"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/ch02.html new/vte-0.31.0/doc/reference/html/ch02.html --- old/vte-0.30.1/doc/reference/html/ch02.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/ch02.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title></title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="pt01.html" title="Part I. API Reference"> <link rel="prev" href="VteTerminal.html" title="VteTerminal"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/ch03.html new/vte-0.31.0/doc/reference/html/ch03.html --- old/vte-0.30.1/doc/reference/html/ch03.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/ch03.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title></title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="pt01.html" title="Part I. API Reference"> <link rel="prev" href="vte-Vte-PTY.html" title="Vte PTY"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/deprecated-objects.html new/vte-0.31.0/doc/reference/html/deprecated-objects.html --- old/vte-0.30.1/doc/reference/html/deprecated-objects.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/deprecated-objects.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Deprecated</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="pt01.html" title="Part I. API Reference"> <link rel="prev" href="VteTerminalAccessible.html" title="VteTerminalAccessible"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/index.html new/vte-0.31.0/doc/reference/html/index.html --- old/vte-0.30.1/doc/reference/html/index.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/index.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>VTE Reference Manual</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="next" href="pt01.html" title="Part I. API Reference"> <meta name="generator" content="GTK-Doc V1.15.1 (XML mode)"> @@ -15,14 +15,14 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">VTE Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - Documentation for VTE version 0.30.1 + Documentation for VTE version 0.31.0 . The latest version of this documentation can be found on-line at the <a class="ulink" href="http://library.gnome.org/devel/vte/" target="_top">GNOME Library</a>. </p></div> <div><p class="copyright">Copyright © 2009, 2010 Christian Persch</p></div> <div><div class="legalnotice"> -<a name="id2843127"></a><p> +<a name="id2766684"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Lesser General Public Licence</em>, Version 2.1 or (at your option) any later version published by the Free Software Foundation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/internal-objects.html new/vte-0.31.0/doc/reference/html/internal-objects.html --- old/vte-0.30.1/doc/reference/html/internal-objects.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/internal-objects.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Interna</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="pt01.html" title="Part I. API Reference"> <link rel="prev" href="vte-Version-Information.html" title="Version Information"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/licence.html new/vte-0.31.0/doc/reference/html/licence.html --- old/vte-0.30.1/doc/reference/html/licence.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/licence.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Appendix A. Licence</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="annotation-glossary.html" title="Annotation Glossary"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/object-hierarchy.html new/vte-0.31.0/doc/reference/html/object-hierarchy.html --- old/vte-0.30.1/doc/reference/html/object-hierarchy.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/object-hierarchy.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Object Hierarchy</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="VteReaper.html" title="VteReaper"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/pt01.html new/vte-0.31.0/doc/reference/html/pt01.html --- old/vte-0.30.1/doc/reference/html/pt01.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/pt01.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Part I. API Reference</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="index.html" title="VTE Reference Manual"> <link rel="prev" href="index.html" title="VTE Reference Manual"> @@ -21,7 +21,7 @@ </tr></table> <div class="part"> <div class="titlepage"><div><div><h1 class="title"> -<a name="id2843178"></a>Part I. API Reference</h1></div></div></div> +<a name="id2766735"></a>Part I. API Reference</h1></div></div></div> <div class="toc"> <p><b>Table of Contents</b></p> <dl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/vte-Version-Information.html new/vte-0.31.0/doc/reference/html/vte-Version-Information.html --- old/vte-0.30.1/doc/reference/html/vte-Version-Information.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/vte-Version-Information.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Version Information</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="ch03.html" title=""> <link rel="prev" href="ch03.html" title=""> @@ -67,7 +67,7 @@ <hr> <div class="refsect2"> <a name="VTE-MINOR-VERSION:CAPS"></a><h3>VTE_MINOR_VERSION</h3> -<pre class="programlisting">#define VTE_MINOR_VERSION (30) +<pre class="programlisting">#define VTE_MINOR_VERSION (31) </pre> <p> The minor version number of the VTE library @@ -78,7 +78,7 @@ <hr> <div class="refsect2"> <a name="VTE-MICRO-VERSION:CAPS"></a><h3>VTE_MICRO_VERSION</h3> -<pre class="programlisting">#define VTE_MICRO_VERSION (1) +<pre class="programlisting">#define VTE_MICRO_VERSION (0) </pre> <p> The micro version number of the VTE library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/html/vte-Vte-PTY.html new/vte-0.31.0/doc/reference/html/vte-Vte-PTY.html --- old/vte-0.30.1/doc/reference/html/vte-Vte-PTY.html 2011-10-17 13:12:17.000000000 +0200 +++ new/vte-0.31.0/doc/reference/html/vte-Vte-PTY.html 2011-11-21 14:50:19.000000000 +0100 @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Vte PTY</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="VTE Reference Manual"> <link rel="up" href="ch02.html" title=""> <link rel="prev" href="ch02.html" title=""> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/doc/reference/version.xml new/vte-0.31.0/doc/reference/version.xml --- old/vte-0.30.1/doc/reference/version.xml 2011-10-17 13:09:10.000000000 +0200 +++ new/vte-0.31.0/doc/reference/version.xml 2011-11-21 14:48:42.000000000 +0100 @@ -1 +1 @@ -0.30.1 +0.31.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/marshal.c new/vte-0.31.0/src/marshal.c --- old/vte-0.30.1/src/marshal.c 2011-08-28 23:33:49.000000000 +0200 +++ new/vte-0.31.0/src/marshal.c 2011-10-31 14:31:45.000000000 +0100 @@ -8,7 +8,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vte-private.h new/vte-0.31.0/src/vte-private.h --- old/vte-0.30.1/src/vte-private.h 2011-09-26 14:32:16.000000000 +0200 +++ new/vte-0.31.0/src/vte-private.h 2011-11-21 14:41:47.000000000 +0100 @@ -246,6 +246,7 @@ GArray *word_chars; gboolean has_selection; gboolean selecting; + gboolean selecting_after_threshold; gboolean selecting_restart; gboolean selecting_had_delta; gboolean selection_block_mode; @@ -305,6 +306,7 @@ long mouse_last_x, mouse_last_y; gboolean mouse_autohide; guint mouse_autoscroll_tag; + gboolean mouse_urxvt_extension; /* State variables for handling match checks. */ char *match_contents; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vte.c new/vte-0.31.0/src/vte.c --- old/vte-0.30.1/src/vte.c 2011-09-26 14:32:48.000000000 +0200 +++ new/vte-0.31.0/src/vte.c 2011-11-21 14:41:47.000000000 +0100 @@ -5014,16 +5014,15 @@ } static void -vte_terminal_style_set (GtkWidget *widget, - GtkStyle *prev_style) +vte_terminal_style_updated (GtkWidget *widget) { VteTerminal *terminal = VTE_TERMINAL(widget); float aspect; + void (* style_updated) (GtkWidget *) = + GTK_WIDGET_CLASS (vte_terminal_parent_class)->style_updated; - GTK_WIDGET_CLASS (vte_terminal_parent_class)->style_set (widget, prev_style); - - if (gtk_widget_get_style(widget) == prev_style) - return; + if (style_updated) + style_updated (widget); vte_terminal_set_font_full_internal(terminal, terminal->pvt->fontdesc, terminal->pvt->fontantialias); @@ -5821,10 +5820,11 @@ long col, long row, unsigned char *pb, - unsigned char *px, - unsigned char *py) + long *px, + long *py) { - unsigned char cb = 0, cx = 0, cy = 0; + unsigned char cb = 0; + long cx, cy; /* Encode the button information in cb. */ switch (button) { @@ -5860,11 +5860,11 @@ cb |= 16; } - /* Encode the cursor coordinates. */ - cx = 32 + CLAMP(1 + col, - 1, terminal->column_count); - cy = 32 + CLAMP(1 + row, - 1, terminal->row_count);; + /* Clamp the cursor coordinates. */ + cx = CLAMP(1 + col, + 1, terminal->column_count); + cy = CLAMP(1 + row, + 1, terminal->row_count); *pb = cb; *px = cx; @@ -5872,14 +5872,34 @@ } static void +vte_terminal_feed_mouse_event(VteTerminal *terminal, + int cb, + long cx, + long cy) +{ + char buf[LINE_MAX]; + gint len = 0; + + if (terminal->pvt->mouse_urxvt_extension) { + /* urxvt's extended mode (1015) */ + len = g_snprintf(buf, sizeof(buf), _VTE_CAP_CSI "%d;%ld;%ldM", cb, cx, cy); + } else if (cx <= 231 && cy <= 231) { + /* legacy mode */ + len = g_snprintf(buf, sizeof(buf), _VTE_CAP_CSI "M%c%c%c", cb, 32 + (guchar)cx, 32 + (guchar)cy); + } + + /* Send event direct to the child, this is binary not text data */ + vte_terminal_feed_child_binary(terminal, buf, len); +} + +static void vte_terminal_send_mouse_button_internal(VteTerminal *terminal, int button, long x, long y) { - unsigned char cb, cx, cy; - char buf[LINE_MAX]; - gint len; + unsigned char cb; + long cx, cy; int width = terminal->char_width; int height = terminal->char_height; long col = (x - terminal->pvt->inner_border.left) / width; @@ -5888,10 +5908,7 @@ vte_terminal_get_mouse_tracking_info (terminal, button, col, row, &cb, &cx, &cy); - - /* Send event direct to the child, this is binary not text data */ - len = g_snprintf(buf, sizeof(buf), _VTE_CAP_CSI "M%c%c%c", cb, cx, cy); - vte_terminal_feed_child_binary(terminal, buf, len); + vte_terminal_feed_mouse_event(terminal, cb, cx, cy); } /* Send a mouse button click/release notification. */ @@ -5927,9 +5944,8 @@ static void vte_terminal_maybe_send_mouse_drag(VteTerminal *terminal, GdkEventMotion *event) { - unsigned char cb, cx, cy; - char buf[LINE_MAX]; - gint len; + unsigned char cb; + long cx, cy; int width = terminal->char_width; int height = terminal->char_height; long col = ((long) event->x - terminal->pvt->inner_border.left) / width; @@ -5963,9 +5979,7 @@ &cb, &cx, &cy); cb += 32; /* for movement */ - /* Send event direct to the child, this is binary not text data */ - len = g_snprintf(buf, sizeof(buf), _VTE_CAP_CSI "M%c%c%c", cb, cx, cy); - vte_terminal_feed_child_binary(terminal, buf, len); + vte_terminal_feed_mouse_event(terminal, cb, cx, cy); } /* Clear all match hilites. */ @@ -6218,7 +6232,7 @@ * @terminal: terminal in which the cell is. * @column: column in which the cell is. * @row: row in which the cell is. - * @data: user data. + * @data: (closure): user data. * * Specifies the type of a selection function used to check whether * a cell has to be selected or not. @@ -6599,7 +6613,7 @@ /* Start selection at the location of the event. */ static void -vte_terminal_start_selection(VteTerminal *terminal, GdkEventButton *event, +vte_terminal_start_selection(VteTerminal *terminal, gdouble x, gdouble y, enum vte_selection_type selection_type) { long delta; @@ -6612,8 +6626,8 @@ /* Record that we have the selection, and where it started. */ delta = terminal->pvt->screen->scroll_delta; terminal->pvt->has_selection = TRUE; - terminal->pvt->selection_last.x = event->x - terminal->pvt->inner_border.left; - terminal->pvt->selection_last.y = event->y - terminal->pvt->inner_border.top + + terminal->pvt->selection_last.x = x - terminal->pvt->inner_border.left; + terminal->pvt->selection_last.y = y - terminal->pvt->inner_border.top + (terminal->char_height * delta); /* Decide whether or not to restart on the next drag. */ @@ -6638,6 +6652,7 @@ /* Record the selection type. */ terminal->pvt->selection_type = selection_type; terminal->pvt->selecting = TRUE; + terminal->pvt->selecting_after_threshold = FALSE; _vte_debug_print(VTE_DEBUG_SELECTION, "Selection started at (%ld,%ld).\n", @@ -7288,6 +7303,19 @@ switch (event->type) { case GDK_MOTION_NOTIFY: + if (terminal->pvt->selecting_after_threshold) { + if (!gtk_drag_check_threshold (widget, + terminal->pvt->mouse_last_x, + terminal->pvt->mouse_last_y, + x, y)) + return TRUE; + + vte_terminal_start_selection(terminal, + terminal->pvt->mouse_last_x, + terminal->pvt->mouse_last_y, + selection_type_char); + } + if (terminal->pvt->selecting && ((terminal->pvt->modifiers & GDK_SHIFT_MASK) || !terminal->pvt->mouse_tracking_mode)) @@ -7394,9 +7422,7 @@ } if (start_selecting) { vte_terminal_deselect_all(terminal); - vte_terminal_start_selection(terminal, - event, - selection_type_char); + terminal->pvt->selecting_after_threshold = TRUE; handled = TRUE; } if (extend_selecting) { @@ -7437,10 +7463,15 @@ x, y + (terminal->char_height * delta)); switch (event->button) { case 1: + if (terminal->pvt->selecting_after_threshold) { + vte_terminal_start_selection(terminal, + x, y, + selection_type_char); + } if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) || !terminal->pvt->mouse_tracking_mode) { vte_terminal_start_selection(terminal, - event, + x, y, selection_type_word); vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); @@ -7462,7 +7493,7 @@ if ((terminal->pvt->modifiers & GDK_SHIFT_MASK) || !terminal->pvt->mouse_tracking_mode) { vte_terminal_start_selection(terminal, - event, + x, y, selection_type_line); vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); @@ -7542,6 +7573,7 @@ terminal->pvt->mouse_last_button = 0; terminal->pvt->mouse_last_x = x; terminal->pvt->mouse_last_y = y; + terminal->pvt->selecting_after_threshold = FALSE; return TRUE; } @@ -9246,7 +9278,7 @@ gboolean highlight, guint *fore, guint *back) { - return vte_terminal_determine_colors_internal (terminal, cell, + vte_terminal_determine_colors_internal (terminal, cell, highlight, FALSE, fore, back); } @@ -9257,7 +9289,7 @@ gboolean highlight, guint *fore, guint *back) { - return vte_terminal_determine_colors_internal (terminal, cell, + vte_terminal_determine_colors_internal (terminal, cell, highlight, TRUE, fore, back); } @@ -11787,7 +11819,7 @@ widget_class->focus_out_event = vte_terminal_focus_out; widget_class->visibility_notify_event = vte_terminal_visibility_notify; widget_class->unrealize = vte_terminal_unrealize; - widget_class->style_set = vte_terminal_style_set; + widget_class->style_updated = vte_terminal_style_updated; #if GTK_CHECK_VERSION (2, 91, 0) widget_class->get_preferred_width = vte_terminal_get_preferred_width; widget_class->get_preferred_height = vte_terminal_get_preferred_height; @@ -13182,7 +13214,7 @@ { double saturation; const PangoColor *entry; - GdkColor color; + GdkRGBA color; /* If we're not realized yet, don't worry about it, because we get * called when we realize. */ @@ -13202,18 +13234,13 @@ entry->red, entry->green, entry->blue, terminal->pvt->bg_opacity); - /* Set the terminal widget background color since otherwise we - * won't draw it for VTE_BG_SOURCE_NONE. */ - color.red = entry->red; - color.green = entry->green; - color.blue = entry->blue; - gtk_widget_modify_bg (&terminal->widget, GTK_STATE_NORMAL, &color); + color.red = entry->red / 65535.; + color.green = entry->green / 65535.; + color.blue = entry->blue / 65535.; + color.alpha = terminal->pvt->bg_opacity / 65535.; _vte_draw_set_background_solid (terminal->pvt->draw, - entry->red / 65535., - entry->green / 65535., - entry->blue / 65535., - terminal->pvt->bg_opacity / 65535.); + color.red, color.green, color.blue, color.alpha); /* If we're transparent, and either have no root image or are being * told to update it, get a new copy of the root window. */ @@ -14111,6 +14138,7 @@ pvt->mouse_last_button = 0; pvt->mouse_last_x = 0; pvt->mouse_last_y = 0; + pvt->mouse_urxvt_extension = FALSE; /* Clear modifiers. */ pvt->modifiers = 0; /* Cause everything to be redrawn (or cleared). */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vtebg.c new/vte-0.31.0/src/vtebg.c --- old/vte-0.30.1/src/vtebg.c 2011-09-26 14:32:16.000000000 +0200 +++ new/vte-0.31.0/src/vtebg.c 2011-11-21 14:41:47.000000000 +0100 @@ -234,6 +234,7 @@ pvt = bg->pvt; pvt->screen = screen; #ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY(gdk_screen_get_display(screen))) { GdkEventMask events; GdkWindow *window; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vteseq-2.c new/vte-0.31.0/src/vteseq-2.c --- old/vte-0.30.1/src/vteseq-2.c 2011-08-29 13:57:16.000000000 +0200 +++ new/vte-0.31.0/src/vteseq-2.c 2011-11-21 14:48:54.000000000 +0100 @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.4 */ /* Command-line: gperf -m 100 --no-strlen vteseq-2.gperf */ /* Computed positions: -k'1-2' */ @@ -83,7 +83,7 @@ #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ __attribute__ ((__gnu_inline__)) #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vteseq-n.c new/vte-0.31.0/src/vteseq-n.c --- old/vte-0.30.1/src/vteseq-n.c 2011-10-17 13:10:31.000000000 +0200 +++ new/vte-0.31.0/src/vteseq-n.c 2011-11-21 14:48:54.000000000 +0100 @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.4 */ /* Command-line: gperf -m 100 vteseq-n.gperf */ /* Computed positions: -k'1,4,$' */ @@ -214,7 +214,7 @@ #define vteseq_n_pool ((const char *) &vteseq_n_pool_contents) #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ __attribute__ ((__gnu_inline__)) #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vteseq.c new/vte-0.31.0/src/vteseq.c --- old/vte-0.30.1/src/vteseq.c 2011-09-26 14:32:48.000000000 +0200 +++ new/vte-0.31.0/src/vteseq.c 2011-11-21 14:41:47.000000000 +0100 @@ -689,6 +689,11 @@ {1010, NULL, NULL, NULL, NULL, NULL, NULL, NULL,}, /* 1011/rxvt: disallowed, scroll-on-keypress is set by user. */ {1011, NULL, NULL, NULL, NULL, NULL, NULL, NULL,}, + /* 1015/urxvt: Extended mouse coordinates. */ + {1015, &terminal->pvt->mouse_urxvt_extension, NULL, NULL, + GINT_TO_POINTER(FALSE), + GINT_TO_POINTER(TRUE), + NULL, NULL,}, /* 1035: disallowed, don't know what to do with it. */ {1035, NULL, NULL, NULL, NULL, NULL, NULL, NULL,}, /* 1036: Meta-sends-escape. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vte-0.30.1/src/vteversion.h new/vte-0.31.0/src/vteversion.h --- old/vte-0.30.1/src/vteversion.h 2011-10-17 13:09:10.000000000 +0200 +++ new/vte-0.31.0/src/vteversion.h 2011-11-21 14:48:41.000000000 +0100 @@ -50,7 +50,7 @@ * * Since: 0.16.15 */ -#define VTE_MINOR_VERSION (30) +#define VTE_MINOR_VERSION (31) /** * VTE_MICRO_VERSION: @@ -60,7 +60,7 @@ * * Since: 0.16.15 */ -#define VTE_MICRO_VERSION (1) +#define VTE_MICRO_VERSION (0) /** * VTE_CHECK_VERSION: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org