vte: dropped in favor of vte3
This commit is contained in:
Danny Rawlins
parent
a380e22a13
commit
0857faa29a
@ -1,6 +1,6 @@
|
|||||||
untrusted comment: verify with /etc/ports/opt.pub
|
untrusted comment: verify with /etc/ports/opt.pub
|
||||||
RWSE3ohX2g5d/ZFTUebCya4f0EzmlWW8nuUHCCvNnwJMMpjDL/zkYK4INI5Bb3NhJDdG1xEJl7tQbNM2xpbjjGX7FQ0yinyDeA8=
|
RWSE3ohX2g5d/Ya8QMQ42Ne+/7JTpAl4J2XahRrYKOi7Kr8nIG5jVZGU/dOMXOkIVzwc3n7WSt4YDajmIO9OGKy6IzBLPnpy6w8=
|
||||||
SHA256 (Pkgfile) = 5bd4dcd44bd192e27e7fd98d21ea2e1014424a5aca62d3f84743f43e56d22630
|
SHA256 (Pkgfile) = 24c2133d5b11569a35cf57e6930b536a58b603051a215f222f86d35ffd2f7130
|
||||||
SHA256 (.footprint) = f94e3f858fb5bc1dafe5eb81653d7495253e7ad844f371068f532ea9f31c8c47
|
SHA256 (.footprint) = f94e3f858fb5bc1dafe5eb81653d7495253e7ad844f371068f532ea9f31c8c47
|
||||||
SHA256 (SPIRV-Tools-v2021.3.tar.gz) = b6b4194121ee8084c62b20f8d574c32f766e4e9237dfe60b0658b316d19c6b13
|
SHA256 (SPIRV-Tools-v2021.4.tar.gz) = d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c
|
||||||
SHA256 (SPIRV-Headers-e71feddb3f17c5586ff7f4cfb5ed1258b800574b.tar.gz) = 9eb56548460fd8850250ebf78071528fb66c2a5db2ef535edc1d493b2581ec66
|
SHA256 (SPIRV-Headers-814e728b30ddd0f4509233099a3ad96fd4318c07.tar.gz) = c262d3c0c36ad5c87fbe3572aa292d2aed4dcd9b1ca4868eff9ec180e3f994f2
|
||||||
|
|||||||
@ -4,15 +4,16 @@
|
|||||||
# Depends on: cmake
|
# Depends on: cmake
|
||||||
|
|
||||||
name=spirv-tools
|
name=spirv-tools
|
||||||
version=2021.3
|
version=2021.4
|
||||||
## DEPS
|
## DEPS
|
||||||
_spirv_headers=e71feddb3f17c5586ff7f4cfb5ed1258b800574b
|
_spirv_headers=814e728b30ddd0f4509233099a3ad96fd4318c07
|
||||||
release=1
|
release=1
|
||||||
source=(https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz
|
source=(https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz
|
||||||
https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-Headers-$_spirv_headers.tar.gz)
|
https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-Headers-$_spirv_headers.tar.gz)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
mv SPIRV-Headers-$_spirv_headers SPIRV-Headers
|
mv SPIRV-Headers-$_spirv_headers SPIRV-Headers
|
||||||
|
|
||||||
prt-get isinst ninja && PKGMK_SPIRV_TOOLS+=' -G Ninja'
|
prt-get isinst ninja && PKGMK_SPIRV_TOOLS+=' -G Ninja'
|
||||||
|
|
||||||
PKGMK_SPIRV_TOOLS+=" \
|
PKGMK_SPIRV_TOOLS+=" \
|
||||||
|
|||||||
@ -1,27 +0,0 @@
|
|||||||
drwxr-xr-x root/root usr/
|
|
||||||
drwxr-xr-x root/root usr/bin/
|
|
||||||
-rwxr-xr-x root/root usr/bin/vte
|
|
||||||
drwxr-xr-x root/root usr/include/
|
|
||||||
drwxr-xr-x root/root usr/include/vte-0.0/
|
|
||||||
drwxr-xr-x root/root usr/include/vte-0.0/vte/
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/pty.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/reaper.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vte.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vteaccess.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vtedeprecated.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vtepty.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vtetypebuiltins.h
|
|
||||||
-rw-r--r-- root/root usr/include/vte-0.0/vte/vteversion.h
|
|
||||||
drwxr-xr-x root/root usr/lib/
|
|
||||||
-rw-r--r-- root/root usr/lib/libvte.a
|
|
||||||
-rwxr-xr-x root/root usr/lib/libvte.la
|
|
||||||
lrwxrwxrwx root/root usr/lib/libvte.so -> libvte.so.9.2800.2
|
|
||||||
lrwxrwxrwx root/root usr/lib/libvte.so.9 -> libvte.so.9.2800.2
|
|
||||||
-rwxr-xr-x root/root usr/lib/libvte.so.9.2800.2
|
|
||||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
|
||||||
-rw-r--r-- root/root usr/lib/pkgconfig/vte.pc
|
|
||||||
drwxr-xr-x root/root usr/lib/vte/
|
|
||||||
drwxr-xr-x root/root usr/share/
|
|
||||||
drwxr-xr-x root/root usr/share/vte/
|
|
||||||
drwxr-xr-x root/root usr/share/vte/termcap-0.0/
|
|
||||||
-rw-r--r-- root/root usr/share/vte/termcap-0.0/xterm
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
untrusted comment: verify with /etc/ports/opt.pub
|
|
||||||
RWSE3ohX2g5d/cuTN4b1wTbHWAqfj8tYcye82NTEEGG2VxK3t+jQmHWj79Cm7tyssqzq4OSdXd8uCRd0xELESUOe8xL6MPUB0w0=
|
|
||||||
SHA256 (Pkgfile) = 8d5aae79c0fc351b8618fa95722d2cbcaf59b7529c8854ade9d225092f2a3aa8
|
|
||||||
SHA256 (.footprint) = 16dd1fa9f2926caa8c3b8639d82c00bf2e21625aea3f1d0930a000cf9e6012aa
|
|
||||||
SHA256 (vte-0.28.2.tar.xz) = 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae
|
|
||||||
SHA256 (vte-0.30.1-alt-meta.patch) = 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6
|
|
||||||
SHA256 (vte-0.28.2-interix.patch) = 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518
|
|
||||||
SHA256 (vte-0.28.2-limit-arguments.patch) = 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9
|
|
||||||
SHA256 (vte-0.28.2-repaint-after-change-scroll-region.patch) = 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6
|
|
||||||
51
vte/Pkgfile
51
vte/Pkgfile
@ -1,51 +0,0 @@
|
|||||||
# Description: Virtual Terminal Emulator widget for use with GTK2
|
|
||||||
# URL: https://wiki.gnome.org/Apps/Terminal/VTE
|
|
||||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
|
||||||
# Depends on: gtk util-linux intltool
|
|
||||||
|
|
||||||
name=vte
|
|
||||||
version=0.28.2
|
|
||||||
release=4
|
|
||||||
source=(https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz
|
|
||||||
$name-0.30.1-alt-meta.patch
|
|
||||||
$name-0.28.2-interix.patch
|
|
||||||
$name-0.28.2-limit-arguments.patch
|
|
||||||
$name-0.28.2-repaint-after-change-scroll-region.patch)
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd $name-$version
|
|
||||||
|
|
||||||
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
|
||||||
patch -p1 -i $SRC/$name-0.30.1-alt-meta.patch
|
|
||||||
|
|
||||||
# https://bugzilla.gnome.org/show_bug.cgi?id=652290
|
|
||||||
patch -p1 -i $SRC/$name-0.28.2-interix.patch
|
|
||||||
|
|
||||||
# Fix CVE-2012-2738, upstream bug #676090
|
|
||||||
patch -p1 -i $SRC/$name-0.28.2-limit-arguments.patch
|
|
||||||
|
|
||||||
# Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
|
|
||||||
# Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
|
|
||||||
patch -p1 -i $SRC/$name-0.28.2-repaint-after-change-scroll-region.patch
|
|
||||||
|
|
||||||
export CFLAGS="$CFLAGS -Wno-deprecated-declarations"
|
|
||||||
|
|
||||||
./configure \
|
|
||||||
--prefix=/usr \
|
|
||||||
--libexecdir=/usr/lib/$name \
|
|
||||||
--disable-deprecation \
|
|
||||||
--disable-debugging \
|
|
||||||
--disable-python \
|
|
||||||
--disable-gtk-doc \
|
|
||||||
--with-xft2 \
|
|
||||||
--with-pangox \
|
|
||||||
--with-gtk=2.0
|
|
||||||
|
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
|
||||||
|
|
||||||
make
|
|
||||||
make DESTDIR=$PKG install
|
|
||||||
|
|
||||||
rm -r $PKG/usr/share/{gtk-doc,locale}
|
|
||||||
rm $PKG/usr/lib/vte/gnome-pty-helper
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
|
|
||||||
|
|
||||||
diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
|
|
||||||
--- vte-0.26.2.orig/configure.in 2011-08-17 08:30:55 +0200
|
|
||||||
+++ vte-0.26.2/configure.in 2011-08-17 08:35:42 +0200
|
|
||||||
@@ -362,7 +362,11 @@
|
|
||||||
AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
|
|
||||||
fi
|
|
||||||
AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
|
|
||||||
-AC_CHECK_FUNCS([ceil floor])
|
|
||||||
+dnl if the first check didn't find floor, it caches the "no" value,
|
|
||||||
+dnl and doesn't recheck. this makes the below check fail always on
|
|
||||||
+dnl systems with floor in -lm. thus we unset the chached result.
|
|
||||||
+unset ac_cv_func_floor
|
|
||||||
+AC_CHECK_FUNCS([ceil floor round])
|
|
||||||
|
|
||||||
# Look for tgetent
|
|
||||||
|
|
||||||
--- vte-0.26.2.orig/configure 2012-04-30 20:02:55.000000000 +0200
|
|
||||||
+++ vte-0.26.2/configure 2012-04-30 20:03:16.000000000 +0200
|
|
||||||
@@ -13277,7 +13277,7 @@
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
-for ac_func in ceil floor
|
|
||||||
+for ac_func in ceil floor round
|
|
||||||
do :
|
|
||||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
||||||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
||||||
diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
|
|
||||||
--- vte-0.26.2.orig/src/vte.c 2011-08-17 08:30:58 +0200
|
|
||||||
+++ vte-0.26.2/src/vte.c 2011-08-17 08:38:09 +0200
|
|
||||||
@@ -63,6 +63,18 @@
|
|
||||||
#include <locale.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef HAVE_ROUND
|
|
||||||
+# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
|
|
||||||
+static inline double round(double x) {
|
|
||||||
+ if(x - floor(x) < 0.5) {
|
|
||||||
+ return floor(x);
|
|
||||||
+ } else {
|
|
||||||
+ return ceil(x);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if GTK_CHECK_VERSION (2, 90, 7)
|
|
||||||
#define GDK_KEY(symbol) GDK_KEY_##symbol
|
|
||||||
#else
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christian Persch <chpe@gnome.org>
|
|
||||||
Date: Sat, 19 May 2012 17:36:09 +0000
|
|
||||||
Subject: emulation: Limit integer arguments to 65535
|
|
||||||
|
|
||||||
To guard against malicious sequences containing excessively big numbers,
|
|
||||||
limit all parsed numbers to 16 bit range. Doing this here in the parsing
|
|
||||||
routine is a catch-all guard; this doesn't preclude enforcing
|
|
||||||
more stringent limits in the handlers themselves.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=676090
|
|
||||||
---
|
|
||||||
diff --git a/src/table.c b/src/table.c
|
|
||||||
index 140e8c8..85cf631 100644
|
|
||||||
--- a/src/table.c
|
|
||||||
+++ b/src/table.c
|
|
||||||
@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
|
|
||||||
if (G_UNLIKELY (*array == NULL)) {
|
|
||||||
*array = g_value_array_new(1);
|
|
||||||
}
|
|
||||||
- g_value_set_long(&value, total);
|
|
||||||
+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
|
|
||||||
g_value_array_append(*array, &value);
|
|
||||||
} while (i++ < arginfo->length);
|
|
||||||
g_value_unset(&value);
|
|
||||||
diff --git a/src/vteseq.c b/src/vteseq.c
|
|
||||||
index 457c06a..46def5b 100644
|
|
||||||
--- a/src/vteseq.c
|
|
||||||
+++ b/src/vteseq.c
|
|
||||||
@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
|
|
||||||
GValueArray *params,
|
|
||||||
VteTerminalSequenceHandler handler)
|
|
||||||
{
|
|
||||||
- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
|
|
||||||
+ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd
|
|
||||||
|
|
||||||
From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Micah Cowan <micah@cowan.name>
|
|
||||||
Date: Tue, 22 Oct 2013 23:30:43 +0200
|
|
||||||
Subject: widget: Fix invalidation region
|
|
||||||
|
|
||||||
When the sequence handler moves the cursor into the restricted scrolling region,
|
|
||||||
the bbox needs to be reset, too.
|
|
||||||
Fixes glitches with interspersing writes to the bottom line with scrolls of the
|
|
||||||
upper region, and also fixes missing screen redraws when using mosh.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=542087
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=686097
|
|
||||||
|
|
||||||
diff --git a/src/vte.c b/src/vte.c
|
|
||||||
index 9f6d7d8..a4d9d25 100644
|
|
||||||
--- a/src/vte.c
|
|
||||||
+++ b/src/vte.c
|
|
||||||
@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal)
|
|
||||||
long wcount, start, delta;
|
|
||||||
gboolean leftovers, modified, bottom, again;
|
|
||||||
gboolean invalidated_text;
|
|
||||||
+ gboolean in_scroll_region;
|
|
||||||
GArray *unichars;
|
|
||||||
struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
|
|
||||||
|
|
||||||
@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal)
|
|
||||||
cursor = screen->cursor_current;
|
|
||||||
cursor_visible = terminal->pvt->cursor_visible;
|
|
||||||
|
|
||||||
+ in_scroll_region = screen->scrolling_restricted
|
|
||||||
+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
|
|
||||||
+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
|
|
||||||
+
|
|
||||||
/* We should only be called when there's data to process. */
|
|
||||||
g_assert(terminal->pvt->incoming ||
|
|
||||||
(terminal->pvt->pending->len > 0));
|
|
||||||
@@ -4194,6 +4199,8 @@ skip_chunk:
|
|
||||||
* points to the first character which isn't part of this
|
|
||||||
* sequence. */
|
|
||||||
if ((match != NULL) && (match[0] != '\0')) {
|
|
||||||
+ gboolean new_in_scroll_region;
|
|
||||||
+
|
|
||||||
/* Call the right sequence handler for the requested
|
|
||||||
* behavior. */
|
|
||||||
_vte_terminal_handle_sequence(terminal,
|
|
||||||
@@ -4204,12 +4211,21 @@ skip_chunk:
|
|
||||||
start = (next - wbuf);
|
|
||||||
modified = TRUE;
|
|
||||||
|
|
||||||
- /* if we have moved during the sequence handler, restart the bbox */
|
|
||||||
+ new_in_scroll_region = screen->scrolling_restricted
|
|
||||||
+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
|
|
||||||
+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
|
|
||||||
+
|
|
||||||
+ delta = screen->scroll_delta; /* delta may have changed from sequence. */
|
|
||||||
+
|
|
||||||
+ /* if we have moved greatly during the sequence handler, or moved
|
|
||||||
+ * into a scroll_region from outside it, restart the bbox.
|
|
||||||
+ */
|
|
||||||
if (invalidated_text &&
|
|
||||||
- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
|
|
||||||
- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
|
|
||||||
- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
|
|
||||||
- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
|
|
||||||
+ ((new_in_scroll_region && !in_scroll_region) ||
|
|
||||||
+ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
|
|
||||||
+ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
|
|
||||||
+ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
|
|
||||||
+ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
|
|
||||||
/* Clip off any part of the box which isn't already on-screen. */
|
|
||||||
bbox_topleft.x = MAX(bbox_topleft.x, 0);
|
|
||||||
bbox_topleft.y = MAX(bbox_topleft.y, delta);
|
|
||||||
@@ -4229,6 +4245,8 @@ skip_chunk:
|
|
||||||
bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
|
|
||||||
bbox_topleft.x = bbox_topleft.y = G_MAXINT;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ in_scroll_region = new_in_scroll_region;
|
|
||||||
} else
|
|
||||||
/* Second, we have a NULL match, and next points to the very
|
|
||||||
* next character in the buffer. Insert the character which
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
|
||||||
Date: Tue, 15 Nov 2011 03:06:40 -0500
|
|
||||||
Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
|
|
||||||
compatibility
|
|
||||||
|
|
||||||
Also, since VTE_META_MASK is now a mask with multiple bits set, code that
|
|
||||||
compares gdk key modifiers to VTE_META_MASK by numerical equality is no
|
|
||||||
longer guaranteed to work. Therefore, for such comparisons a new function,
|
|
||||||
vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
|
|
||||||
matching matching VTE_META_MASK are set, then all are set.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=663779
|
|
||||||
---
|
|
||||||
src/keymap.c | 15 +++++++++++++--
|
|
||||||
src/keymap.h | 2 +-
|
|
||||||
2 files changed, 14 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/keymap.c b/src/keymap.c
|
|
||||||
index 9a21669..95b4c5b 100644
|
|
||||||
--- a/src/keymap.c
|
|
||||||
+++ b/src/keymap.c
|
|
||||||
@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
|
|
||||||
{GDK_KEY (F35), _vte_keymap_GDK_F35},
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
|
|
||||||
+ * despite being a compound mask, is treated as indivisible. */
|
|
||||||
+GdkModifierType
|
|
||||||
+_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
|
|
||||||
+ GdkModifierType mask)
|
|
||||||
+{
|
|
||||||
+ if (modifiers & VTE_META_MASK)
|
|
||||||
+ modifiers |= VTE_META_MASK;
|
|
||||||
+ return modifiers & mask;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Map the specified keyval/modifier setup, dependent on the mode, to either
|
|
||||||
* a literal string or a capability name. */
|
|
||||||
void
|
|
||||||
@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
|
|
||||||
} else {
|
|
||||||
fkey_mode = fkey_default;
|
|
||||||
}
|
|
||||||
- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
|
|
||||||
+ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
|
|
||||||
|
|
||||||
/* Search for the conditions. */
|
|
||||||
for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
|
|
||||||
@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- switch (modifiers & significant_modifiers) {
|
|
||||||
+ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
|
|
||||||
case 0:
|
|
||||||
modifier = 0;
|
|
||||||
break;
|
|
||||||
diff --git a/src/keymap.h b/src/keymap.h
|
|
||||||
index 243e22e..21d9b8e 100644
|
|
||||||
--- a/src/keymap.h
|
|
||||||
+++ b/src/keymap.h
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
-#define VTE_META_MASK GDK_META_MASK
|
|
||||||
+#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK)
|
|
||||||
#define VTE_NUMLOCK_MASK GDK_MOD2_MASK
|
|
||||||
|
|
||||||
/* Map the specified keyval/modifier setup, dependent on the mode, to either
|
|
||||||
--
|
|
||||||
1.7.8.rc3
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user