commit libtermkey for openSUSE:Factory
Hello community,
here is the log from the commit of package libtermkey for openSUSE:Factory
checked in at 2020-10-29 09:22:51
Comparing /work/SRC/openSUSE:Factory/libtermkey (Old)
and /work/SRC/openSUSE:Factory/.libtermkey.new.3463 (New)
Package is "libtermkey"
Thu Oct 29 09:22:51 2020 rev:4 rq:844623 version:0.22
Changes:
--- /work/SRC/openSUSE:Factory/libtermkey/libtermkey.changes2018-11-09
07:54:50.183682492 +0100
+++ /work/SRC/openSUSE:Factory/.libtermkey.new.3463/libtermkey.changes
2020-10-29 09:22:56.746724543 +0100
@@ -1,0 +2,7 @@
+Thu Oct 22 14:47:38 UTC 2020 - Dirk Stoecker 0.22
+
+- update to 0.22
+ 0.22 - changes: bugfixes for unit tests on BSD platforms
+ 0.21.1 - changes: internal bugfixes, valgrind neatness
+
+---
Old:
libtermkey-0.20.tar.gz
New:
libtermkey-0.22.tar.gz
Other differences:
--
++ libtermkey.spec ++
--- /var/tmp/diff_new_pack.JneClt/_old 2020-10-29 09:22:57.298725072 +0100
+++ /var/tmp/diff_new_pack.JneClt/_new 2020-10-29 09:22:57.302725076 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libtermkey
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
%define sover 1
Name: libtermkey
-Version:0.20
+Version:0.22
Release:0
Summary:Library for processing of keyboard entry from terminal-based
programs
License:MIT
Group: Development/Libraries/C and C++
-Url:http://www.leonerd.org.uk/code/libtermkey/
+URL:http://www.leonerd.org.uk/code/libtermkey/
Source:
http://www.leonerd.org.uk/code/libtermkey/libtermkey-%{version}.tar.gz
Patch0: fix-syntax.patch
BuildRequires: gcc
@@ -91,7 +91,7 @@
%files -n %{name}%{sover}
%defattr(-,root,root)
-%doc LICENSE
+%license LICENSE
%{_libdir}/libtermkey.so.%{sover}
%{_libdir}/libtermkey.so.%{sover}.*
++ libtermkey-0.20.tar.gz -> libtermkey-0.22.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libtermkey-0.20/Makefile new/libtermkey-0.22/Makefile
--- old/libtermkey-0.20/Makefile2017-03-30 15:17:09.0 +0200
+++ new/libtermkey-0.22/Makefile2019-03-14 14:47:10.0 +0100
@@ -49,10 +49,12 @@
TESTFILES=$(TESTSOURCES:.c=.t)
VERSION_MAJOR=0
-VERSION_MINOR=20
+VERSION_MINOR=22
+
+VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
VERSION_CURRENT=15
-VERSION_REVISION=0
+VERSION_REVISION=2
VERSION_AGE=14
PREFIX=/usr/local
@@ -110,7 +112,7 @@
install -d $(DESTDIR)$(INCDIR)
install -m644 termkey.h $(DESTDIR)$(INCDIR)
install -d $(DESTDIR)$(LIBDIR)/pkgconfig
- sed "s,@LIBDIR@,$(LIBDIR),;s,@INCDIR@,$(INCDIR)," $(DESTDIR)$(LIBDIR)/pkgconfig/termkey.pc
+ LIBDIR=$(LIBDIR) INCDIR=$(INCDIR) VERSION=$(VERSION) sh termkey.pc.sh
>$(DESTDIR)$(LIBDIR)/pkgconfig/termkey.pc
install-lib: $(LIBRARY)
install -d $(DESTDIR)$(LIBDIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libtermkey-0.20/driver-csi.c
new/libtermkey-0.22/driver-csi.c
--- old/libtermkey-0.20/driver-csi.c2017-03-30 15:17:09.0 +0200
+++ new/libtermkey-0.22/driver-csi.c2019-03-14 14:47:10.0 +0100
@@ -158,7 +158,7 @@
}
/*
- * Handler for CSI M / CSI m mouse events in SRG and rxvt encodings
+ * Handler for CSI M / CSI m mouse events in SGR and rxvt encodings
* Note: This does not handle X10 encoding
*/
@@ -569,6 +569,9 @@
if(result == TERMKEY_RES_NONE) {
#ifdef DEBUG
switch(args) {
+ case 0:
+fprintf(stderr, "CSI: Unknown cmd=%c\n", (char)cmd);
+break;
case 1:
fprintf(stderr, "CSI: Unknown arg1=%ld cmd=%c\n", arg[0], (char)cmd);
break;
@@ -585,6 +588,7 @@
#endif
key->type = TERMKEY_TYPE_UNKNOWN_CSI;
key->code.number = cmd;
+key->modifiers = 0;
tk->hightide = csi_len - introlen;
*nbytep = introlen; // Do not yet eat the data bytes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libtermkey-0.20/driver-ti.c
new/libtermkey-0.22/driver-ti.c
--- old/libtermkey-0.20/driver-ti.c 2017-03-30 15:17:09.0 +0200
+++ new/libtermkey-0.22/driver-ti.c 2019-03-14 14:47:10.0 +0100
@@ -10,17 +10,97 @@
# include
# include
-/* curses.h has just poluted our namespace. We want this back */
+/* curses.h has just polluted our namespace. We want this back */
# undef buttons
#endif
commit libtermkey for openSUSE:Factory
Hello community,
here is the log from the commit of package libtermkey for openSUSE:Factory
checked in at 2018-11-09 07:54:49
Comparing /work/SRC/openSUSE:Factory/libtermkey (Old)
and /work/SRC/openSUSE:Factory/.libtermkey.new (New)
Package is "libtermkey"
Fri Nov 9 07:54:49 2018 rev:3 rq:647238 version:0.20
Changes:
--- /work/SRC/openSUSE:Factory/libtermkey/libtermkey.changes2018-05-29
16:50:45.435168753 +0200
+++ /work/SRC/openSUSE:Factory/.libtermkey.new/libtermkey.changes
2018-11-09 07:54:50.183682492 +0100
@@ -1,0 +2,6 @@
+Wed Nov 7 09:53:22 UTC 2018 - Jan Engelhardt
+
+- Rename %soname to %sover to better reflect its use.
+- Fix RPM groups; trim bias from descriptions.
+
+---
Other differences:
--
++ libtermkey.spec ++
--- /var/tmp/diff_new_pack.9wSEG6/_old 2018-11-09 07:54:50.699681900 +0100
+++ /var/tmp/diff_new_pack.9wSEG6/_new 2018-11-09 07:54:50.699681900 +0100
@@ -12,17 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define soname 1
+%define sover 1
Name: libtermkey
Version:0.20
Release:0
-Summary:Library for easy processing of keyboard entry from
terminal-based programs
+Summary:Library for processing of keyboard entry from terminal-based
programs
License:MIT
-Group: System/Libraries
+Group: Development/Libraries/C and C++
Url:http://www.leonerd.org.uk/code/libtermkey/
Source:
http://www.leonerd.org.uk/code/libtermkey/libtermkey-%{version}.tar.gz
Patch0: fix-syntax.patch
@@ -38,19 +38,19 @@
programs. It handles all the necessary logic to recognise special keys, UTF-8
combining, and so on, with a simple interface.
-%package -n %{name}%{soname}
-Summary:Library for easy processing of keyboard entry from
terminal-based programs
+%package -n %{name}%{sover}
+Summary:Library for processing of keyboard entry from terminal-based
programs
Group: System/Libraries
-%description -n %{name}%{soname}
+%description -n %{name}%{sover}
This library allows easy processing of keyboard entry from terminal-based
programs. It handles all the necessary logic to recognise special keys, UTF-8
combining, and so on, with a simple interface.
%package devel
-Summary:Library for easy processing of keyboard entry from
terminal-based programs
+Summary:Development files for libtermkey, a keyboard entry processing
library
Group: Development/Libraries/C and C++
-Requires: %{name}%{soname} = %{version}
+Requires: %{name}%{sover} = %{version}
Requires: ncurses-devel
Requires: pkgconfig
@@ -85,15 +85,15 @@
find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -type f -name "*.a" -delete -print
-%post -n %{name}%{soname} -p /sbin/ldconfig
+%post -n %{name}%{sover} -p /sbin/ldconfig
-%postun -n %{name}%{soname} -p /sbin/ldconfig
+%postun -n %{name}%{sover} -p /sbin/ldconfig
-%files -n %{name}%{soname}
+%files -n %{name}%{sover}
%defattr(-,root,root)
%doc LICENSE
-%{_libdir}/libtermkey.so.%{soname}
-%{_libdir}/libtermkey.so.%{soname}.*
+%{_libdir}/libtermkey.so.%{sover}
+%{_libdir}/libtermkey.so.%{sover}.*
%files devel
%defattr(-,root,root)
commit libtermkey for openSUSE:Factory
Hello community,
here is the log from the commit of package libtermkey for openSUSE:Factory
checked in at 2018-05-29 16:50:22
Comparing /work/SRC/openSUSE:Factory/libtermkey (Old)
and /work/SRC/openSUSE:Factory/.libtermkey.new (New)
Package is "libtermkey"
Tue May 29 16:50:22 2018 rev:2 rq:611658 version:0.20
Changes:
--- /work/SRC/openSUSE:Factory/libtermkey/libtermkey.changes2016-01-28
17:22:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.libtermkey.new/libtermkey.changes
2018-05-29 16:50:45.435168753 +0200
@@ -1,0 +2,8 @@
+Wed May 23 08:16:07 UTC 2018 - mli...@suse.cz
+
+- Bump to version 0.20:
+ * added parsing of DCS and OSC control strings
+ * fixed handling of Ctrl-Space, bugfix for keypad mode switching,
+endian fix for unicode keys (thanks jamessan)
+
+---
Old:
libtermkey-0.18.tar.gz
New:
libtermkey-0.20.tar.gz
Other differences:
--
++ libtermkey.spec ++
--- /var/tmp/diff_new_pack.qbYxbE/_old 2018-05-29 16:50:46.775119449 +0200
+++ /var/tmp/diff_new_pack.qbYxbE/_new 2018-05-29 16:50:46.775119449 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libtermkey
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define soname 1
Name: libtermkey
-Version:0.18
+Version:0.20
Release:0
Summary:Library for easy processing of keyboard entry from
terminal-based programs
License:MIT
@@ -103,3 +103,4 @@
%{_mandir}/man3/termkey*.3%{ext_man}
%{_mandir}/man7/termkey.*
+%changelog
++ libtermkey-0.18.tar.gz -> libtermkey-0.20.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libtermkey-0.18/Makefile new/libtermkey-0.20/Makefile
--- old/libtermkey-0.18/Makefile2015-10-06 23:52:28.0 +0200
+++ new/libtermkey-0.20/Makefile2017-03-30 15:17:09.0 +0200
@@ -49,11 +49,11 @@
TESTFILES=$(TESTSOURCES:.c=.t)
VERSION_MAJOR=0
-VERSION_MINOR=18
+VERSION_MINOR=20
-VERSION_CURRENT=13
+VERSION_CURRENT=15
VERSION_REVISION=0
-VERSION_AGE=12
+VERSION_AGE=14
PREFIX=/usr/local
LIBDIR=$(PREFIX)/lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libtermkey-0.18/driver-csi.c
new/libtermkey-0.20/driver-csi.c
--- old/libtermkey-0.18/driver-csi.c2015-10-06 23:52:28.0 +0200
+++ new/libtermkey-0.20/driver-csi.c2017-03-30 15:17:09.0 +0200
@@ -11,6 +11,8 @@
typedef struct {
TermKey *tk;
+ int saved_string_id;
+ char *saved_string;
} TermKeyCsi;
typedef TermKeyResult CsiHandler(TermKey *tk, TermKeyKey *key, int cmd, long
*arg, int args);
@@ -508,6 +510,8 @@
return NULL;
csi->tk = tk;
+ csi->saved_string_id = 0;
+ csi->saved_string = NULL;
return csi;
}
@@ -516,6 +520,9 @@
{
TermKeyCsi *csi = info;
+ if(csi->saved_string)
+free(csi->saved_string);
+
free(csi);
}
@@ -637,6 +644,52 @@
return TERMKEY_RES_KEY;
}
+static TermKeyResult peekkey_ctrlstring(TermKey *tk, TermKeyCsi *csi, size_t
introlen, TermKeyKey *key, int force, size_t *nbytep)
+{
+ size_t str_end = introlen;
+
+ while(str_end < tk->buffcount) {
+if(CHARAT(str_end) == 0x9c) // ST
+ break;
+if(CHARAT(str_end) == 0x1b &&
+ (str_end + 1) < tk->buffcount &&
+ CHARAT(str_end+1) == 0x5c) // ESC-prefixed ST
+ break;
+
+str_end++;
+ }
+
+ if(str_end >= tk->buffcount)
+return TERMKEY_RES_AGAIN;
+
+#ifdef DEBUG
+ fprintf(stderr, "Found a control string: %*s",
+ str_end - introlen, tk->buffer + tk->buffstart + introlen);
+#endif
+
+ *nbytep = str_end + 1;
+ if(CHARAT(str_end) == 0x1b)
+(*nbytep)++;
+
+ if(csi->saved_string)
+free(csi->saved_string);
+
+ size_t len = str_end - introlen;
+
+ csi->saved_string_id++;
+ csi->saved_string = malloc(len + 1);
+
+ strncpy(csi->saved_string, (char *)tk->buffer + tk->buffstart + introlen,
len);
+ csi->saved_string[len] = 0;
+
+ key->type = (CHARAT(introlen-1) & 0x1f) == 0x10 ?
+TERMKEY_TYPE_DCS : TERMKEY_TYPE_OSC;
+ key->code.number = csi->saved_string_id;
+ key->modifiers = 0;
+
+ return TERMKEY_RES_KEY;
+}
+
static TermKeyResult peekkey(TermKey *tk, void *info, TermKeyKey *key, int
force, size_t *nbytep)
{
if(tk->buffcount == 0)
@@ -644,23 +697,37 @@
TermKeyCsi *csi = info;
- // Now we're sure at least 1 byte is valid
- unsigned char b0 = CHARAT(0);
+ switch(CHARAT(0)) {
+case 0x1b:
