cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge some changes from upstream that fix a couple of annoying bugs.

Browse Source
This commit is contained in:
ajacoutot 2014-05-22 17:02:05 +00:00
parent 918df4840e
commit 309444d431
3 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/vte3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2014/05/13 08:49:27 jasper Exp $
# $OpenBSD: Makefile,v 1.45 2014/05/22 17:02:05 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= terminal emulation library
GNOME_PROJECT= vte
GNOME_VERSION= 0.36.2
REVISION= 0
PKGNAME= vte3-${GNOME_VERSION}

45
devel/vte3/patches/patch-src_keymap_c Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-src_keymap_c,v 1.1 2014/05/22 17:02:05 ajacoutot Exp $
From 1f764f94d1f9798e3a47365cb4a215c06b9aef8a Mon Sep 17 00:00:00 2001
From: Egmont Koblinger <egmont@gmail.com>
Date: Wed, 14 May 2014 17:09:10 +0200
Subject: emulation: Fix escape sequences of keypad Home and End (take 2)
--- src/keymap.c.orig Mon May 12 20:21:37 2014
+++ src/keymap.c Thu May 22 18:57:07 2014
@@ -502,13 +502,12 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_
static const struct _vte_keymap_entry _vte_keymap_GDK_KP_End[] = {
{cursor_all, keypad_default, fkey_all, 0, X_NULL, 0, "K4"},
- {cursor_all, keypad_default, fkey_notvt220,
- 0, _VTE_CAP_CSI "4~", -1, X_NULL},
+ {cursor_default, keypad_default, fkey_notvt220, 0, _VTE_CAP_CSI "F", -1, X_NULL},
+ {cursor_app, keypad_default, fkey_notvt220, 0, _VTE_CAP_SS3 "F", -1, X_NULL},
{cursor_all, keypad_default, fkey_vt220, 0, "1", 1, X_NULL},
- {cursor_all, keypad_app, fkey_notvt220, 0, _VTE_CAP_CSI "4~", -1, X_NULL},
+ {cursor_default, keypad_app, fkey_notvt220, 0, _VTE_CAP_CSI "F", -1, X_NULL},
+ {cursor_app, keypad_app, fkey_notvt220, 0, _VTE_CAP_SS3 "F", -1, X_NULL},
{cursor_all, keypad_app, fkey_vt220, 0, _VTE_CAP_SS3 "q", -1, X_NULL},
- {cursor_default, keypad_all, fkey_default, 0, _VTE_CAP_CSI "F", -1, X_NULL},
- {cursor_app, keypad_all, fkey_default, 0, _VTE_CAP_SS3 "F", -1, X_NULL},
{cursor_all, keypad_all, fkey_all, 0, X_NULL, 0, X_NULL},
};
@@ -564,13 +563,12 @@ static const struct _vte_keymap_entry _vte_keymap_GDK_
static const struct _vte_keymap_entry _vte_keymap_GDK_KP_Home[] = {
{cursor_all, keypad_default, fkey_all, 0, X_NULL, 0, "K1"},
- {cursor_all, keypad_default, fkey_notvt220,
- 0, _VTE_CAP_CSI "1~", -1, X_NULL},
+ {cursor_default, keypad_default, fkey_notvt220, 0, _VTE_CAP_CSI "H", -1, X_NULL},
+ {cursor_app, keypad_default, fkey_notvt220, 0, _VTE_CAP_SS3 "H", -1, X_NULL},
{cursor_all, keypad_default, fkey_vt220, 0, "7", 1, X_NULL},
- {cursor_all, keypad_app, fkey_notvt220, 0, _VTE_CAP_CSI "1~", -1, X_NULL},
+ {cursor_default, keypad_app, fkey_notvt220, 0, _VTE_CAP_CSI "H", -1, X_NULL},
+ {cursor_app, keypad_app, fkey_notvt220, 0, _VTE_CAP_SS3 "H", -1, X_NULL},
{cursor_all, keypad_app, fkey_vt220, 0, _VTE_CAP_SS3 "w", -1, X_NULL},
- {cursor_default, keypad_all, fkey_default, 0, _VTE_CAP_CSI "H", -1, X_NULL},
- {cursor_app, keypad_all, fkey_default, 0, _VTE_CAP_SS3 "H", -1, X_NULL},
{cursor_all, keypad_all, fkey_all, 0, X_NULL, 0, X_NULL},
};

17
devel/vte3/patches/patch-src_vte_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_vte_c,v 1.1 2014/05/22 17:02:05 ajacoutot Exp $
From 208b8bfa1884aea09a6aa8f4a046067d4f78f46f Mon Sep 17 00:00:00 2001
From: Colin Gibbs <colin@gibbsonline.net>
Date: Mon, 19 May 2014 15:27:40 +0200
Subject: widget: Fix disappearing mouse pointer
--- src/vte.c.orig Mon May 12 20:21:44 2014
+++ src/vte.c Thu May 22 18:57:08 2014
@@ -7744,6 +7744,7 @@ vte_terminal_focus_out(GtkWidget *widget, GdkEventFocu
vte_terminal_match_hilite_hide (terminal);
/* Mark the cursor as invisible to disable hilite updating */
terminal->pvt->mouse_cursor_visible = FALSE;
+ terminal->pvt->mouse_last_button = 0;
}
terminal->pvt->has_focus = FALSE;