Re: [E-devel] Release Tarball Uploading
On 19-03-26 11:43, Mike Blumenkrantz wrote: > Hi, > > I've been preparing to manage to procedure for the upcoming release, and > I've noticed at least one blocker for me. It seems there's been a lot of > shuffling of infrastructure recently, and I'm no longer certain where to > upload tarballs; a recent mailing list thread suggests that this should be > download.enlightenment.org directly--with no ProxyCommand--but this doesn't > seem to be working for me. > > Can someone clarify/fix this so that I can continue with my release > checklist? Yesterday, I put terminology's pre-release on my own server for that exact reason. -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Release Tarball Uploading
On 19-03-28 10:42, Carsten Haitzler wrote: > On Tue, 26 Mar 2019 16:50:40 +0100 Boris Faure said: > > > On 19-03-26 11:43, Mike Blumenkrantz wrote: > > > Hi, > > > > > > I've been preparing to manage to procedure for the upcoming release, and > > > I've noticed at least one blocker for me. It seems there's been a lot of > > > shuffling of infrastructure recently, and I'm no longer certain where to > > > upload tarballs; a recent mailing list thread suggests that this should be > > > download.enlightenment.org directly--with no ProxyCommand--but this > > > doesn't > > > seem to be working for me. > > > > > > Can someone clarify/fix this so that I can continue with my release > > > checklist? > > > > Yesterday, I put terminology's pre-release on my own server for that > > exact reason. > > i added you and zmike as users. same keys as in devs repo. i'm sick right now > so i've been spending the last week mostly in bed recovering, so haven't been > paying attention. you could have asked stefan, okra or beber too for access > FYI. Thanks! I hope you'll get better soon. It's working fine and I've upload Terminology's pre-release to https://download.enlightenment.org/pre-releases/terminology-1.4.0.tar.xz. -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Terminology 1.4.0
Hello fellow Terminology enthusiasts! In the northern hemisphere, it is already spring. The flowers are starting to bloom again, trees are budding… It is also a time to start fresh and release those 250+ commits written during long winter nights. I am thus proud to release Terminology 1.4.0 today! Additions: * Add Continuous Integration on every push to the git repository * Add a test framework on escape code parsing and interpreting * Add more than 120 test files * Add support, along with tests, for the following escape codes: DSR-DIR, DSR-KBD, DSR-MSR, DSR-DECCKSR, DSR-OS, DSR-PP, DSR-UDK, DECSCLM, DECBI, DECFI, DECSACE, DECRARA, DECCRARA, DECIC, DECDC, DECCRA, DECST8C, DA3, DECSWBV * Add finer configuration on whether to activate links * Set environment variable WINDOWID Improvements: * Selections only disappear if the underlying content changes * When pasting a buffer, skip control characters as a security measure Fixes: * Fixes, along with tests, on handling the following escape codes: VPR, DECERA, DECFRA, DSR-CPR, DCH, DECALN, DECAWM, IL, DL * Fixes, along with tests, on mouse reporting * Fixes on issues spotted by Coverity The tarball can be found at : - https://download.enlightenment.org/rel/apps/terminology/terminology-1.4.0.tar.xz - https://downloads.terminolo.gy/terminology-1.4.0.tar.xz sha256sum: ed5904ba5eb11c67790964306ec260b4134e2a443ef5abd5105610d9943b3e60 Happy compiling! ( https://xkcd.com/303/ ) -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Terminology 1.4.0
On 19-04-07 10:33, Ross Vandegrift wrote: > On Sun, Mar 31, 2019 at 12:30:36PM +0200, Boris Faure wrote: > > I am thus proud to release Terminology 1.4.0 today! > > > > Additions: > > * Add Continuous Integration on every push to the git repository > > * Add a test framework on escape code parsing and interpreting > > * Add more than 120 test files > > Thanks Boris this is awesome! When I run the tests, I get two failures: > c2.sh... (got c1d8061531d89476be61e948007ca239, expected > 9f264ee84b6d89f1f9fa7b76abd442c0) ✘ > shift_in_out.sh... (got c3bb903237d9ef40d39ec07f328d922a, expected > 3896bcc6887998bbc41b43840a6b2e33) ✘ > > I think the expected test results have captured something about the > environment > in the docker image borisfaure/terminology-ci. I'd guess this is due to using > musl libc in alpine instead of glibc, but I don't have proof. Is this > difference expected? It'd be nice to use the tests on a normal distro. > > The hashes above are stable w/gcc 8.3 & glibc 2.28 on Debian sid, even across > different versions of EFL. > > Thanks, > Ross Those tests do work fine on both gentoo and archlinux (using glibc) and alpine with musl. I think the change in behaviour is a debianism. -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Terminology 1.4.0 lacks support for Russian [Cyrillic], etc.
On 19-05-02 01:00, Jose R R wrote: > Niltze, all- > > FYI feedback. Unlike Terminology 1.3.x, Terminology 1.4.0 lacks > support for Russian [Cyricllic] characters, i.e., ё, as well as other > characters, i.e., German, with apostrophes, etc. Which version of EFL are you using? Is the issue about typing those characters or rendering them? Best Regards -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Terminology 1.4.0 lacks support for Russian [Cyrillic], etc.
On 19-05-02 09:27, Gustavo Lima Chaves wrote: > * Carsten Haitzler [2019-05-02 13:07:42 +0100]: > > > On Thu, 2 May 2019 01:00:39 -0700 Jose R R said: > > > > > Niltze, all- > > > > > > FYI feedback. Unlike Terminology 1.3.x, Terminology 1.4.0 lacks > > > support for Russian [Cyricllic] characters, i.e., ё, as well as other > > > characters, i.e., German, with apostrophes, etc. > > > > I can both type and display those chars. Hell... I can display color emoji! > > :) > > My only issue with the latest commits is tmux: are you guys able to > use without mis-rendering taking place all the time? Using my fixes from yesterday? -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Terminology 1.4.0 lacks [copy/paste] support for Russian [Cyrillic], etc.
I think I understood the issue (not decoding the paste as utf8). I'll try to fix it over the weekend. Then I'll release a hotfix version. -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Terminology 1.4.0 lacks [copy/paste] support for Russian [Cyrillic], etc.
On 19-05-03 18:38, Boris Faure wrote: > I think I understood the issue (not decoding the paste as utf8). I'll > try to fix it over the weekend. Then I'll release a hotfix version. I've done the patch. Could you please test it and tell me if it fixes your issues? Have a nice weekend -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] terminology-1.4 01/01: ci: build with different versions of EFL (1.20.7, 1.21.1, 1.22.2)
billiob pushed a commit to branch terminology-1.4.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c7d92ecc6cac53f237f844e465c174ba85c40b78
commit c7d92ecc6cac53f237f844e465c174ba85c40b78
Author: Boris Faure
Date: Tue May 21 11:05:06 2019 +0200
ci: build with different versions of EFL (1.20.7, 1.21.1, 1.22.2)
---
.circleci/config.yml | 117 +--
1 file changed, 86 insertions(+), 31 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c312da..9b026c9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,12 +21,34 @@ jobs:
paths:
- /terminology
- build_gcc:
+ build_full_clang_elf-1.22:
+docker:
+ - image: borisfaure/terminology-ci:latest
+environment:
+ - CC: clang
+steps:
+ - restore_cache:
+ key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+ - run:
+ name: Install EFL
+ command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
+ - run:
+ name: Compile with Clang
+ command: |
+cd /terminology
+meson -Dtests=true -Dfuzzing=true . build
+meson configure build
+cd build
+ninja -j4
+ build_full_gcc_efl-1.22:
docker:
- image: borisfaure/terminology-ci:latest
steps:
- restore_cache:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+ - run:
+ name: Install EFL
+ command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
- run:
name: Compile with GCC
environment:
@@ -36,57 +58,90 @@ jobs:
meson -Dtests=true -Dfuzzing=true -Db_coverage=true . build
meson configure build
cd build
-ninja
+ninja -j4
- save_cache:
- key: build_gcc-{{ .Environment.CIRCLE_SHA1 }}
+ key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
paths:
- /terminology
- tests_gcc:
+ build_minimal_gcc_efl-1.21:
docker:
- image: borisfaure/terminology-ci:latest
steps:
- restore_cache:
- key: build_gcc-{{ .Environment.CIRCLE_SHA1 }}
- - run: |
- cd /terminology
- tests/run_tests.sh -v -t build/src/bin/tytest -r tests/tests.results
-d tests/
- - run: |
- cd /terminology/build/
- cd src/bin
- rm -fr *@@terminology@exe *@@tyalpha@exe *@@tybg@exe *@@tycat@exe
- rm -fr *@@tyfuzz@exe *@@tyls@exe *@@typop@exe *@@tyq@exe
- rm -fr *@@tysend@exe
- cd /terminology/build/
- curl -s https://codecov.io/bash > .codecov
- chmod +x .codecov
- sed -i.bak 's/execdir/exec/' .codecov
- ./.codecov -Z
- build_clang:
+ key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+ - run:
+ name: Install EFL
+ command: apk add /pkg/efl-21/efl-1.21.1-r0.apk
/pkg/efl-21/efl-dev-1.21.1-r0.apk
+ - run:
+ name: Compile with GCC
+ command: |
+cd /terminology
+meson . build
+meson configure build
+cd build
+ninja -j4
+ build_minimal_gcc_efl-1.20:
docker:
- image: borisfaure/terminology-ci:latest
-environment:
- - CC: clang
steps:
- restore_cache:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- - run: |
- cd /terminology
- meson -Dtests=true -Dfuzzing=true . build
- meson configure build
- cd build
- ninja
+ - run:
+ name: Install EFL
+ command: apk add /pkg/efl-20/efl-1.20.7-r0.apk
/pkg/efl-20/efl-dev-1.20.7-r0.apk
+ - run:
+ name: Compile with GCC
+ command: |
+cd /terminology
+meson . build
+meson configure build
+cd build
+ninja -j4
+ tests_gcc:
+docker:
+ - image: borisfaure/terminology-ci:latest
+steps:
+ - restore_cache:
+ key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
+ - run:
+ name: Install EFL
+ command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
+ - run:
+ name: Launch tests
+ command: |
+cd /terminology
+tests/run_tests.sh -v -t build/src/bin/tytest -r
tests/tests.results -d tests/
+ - run:
+ name: codecov
+ command: |
+cd /terminology/build/
+cd src/bin
+rm -fr *@@terminology@exe *@@tyalpha@exe *@@tybg@exe *@@tycat@exe
+rm -fr *@@tyfuzz@exe *@@tyls@exe *@@typop@exe *@@tyq@exe
+rm -fr *@@tysend@exe
+cd /terminology/build/
+curl -s https://codecov.io/bash > .codecov
+chmod +x .codecov
+sed -i.bak 's/ex
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.4'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=85372bfd273e19a6832e8f6625f3f08fbc2fbc95 commit 85372bfd273e19a6832e8f6625f3f08fbc2fbc95 Merge: 40ea16d c7d92ec Author: Boris Faure Date: Tue May 21 11:23:49 2019 +0200 Merge branch 'terminology-1.4' .circleci/config.yml | 117 +-- 1 file changed, 86 insertions(+), 31 deletions(-) --
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.4'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=b6545c0bbfcf4c7533794316a4ea54cde420145d commit b6545c0bbfcf4c7533794316a4ea54cde420145d Merge: 2168e6a 7056116 Author: Boris Faure Date: Tue May 21 21:29:39 2019 +0200 Merge branch 'terminology-1.4' --
[EGIT] [apps/terminology] master 01/01: themes: make blue more readable
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=5c0167c5e150df06b15008370c539c9aad19d3eb
commit 5c0167c5e150df06b15008370c539c9aad19d3eb
Author: Boris Faure
Date: Wed May 22 10:26:11 2019 +0200
themes: make blue more readable
---
data/themes/default_colors.in.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/themes/default_colors.in.edc
b/data/themes/default_colors.in.edc
index 98fa1e9..aa68f4b 100644
--- a/data/themes/default_colors.in.edc
+++ b/data/themes/default_colors.in.edc
@@ -3,7 +3,7 @@ color_class { name: "c1"; color: 0 0 0 255; } //
COL_BLACK
color_class { name: "c2"; color: 204 51 51 255; } // COL_RED
color_class { name: "c3"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "c4"; color: 204 136 51 255; } // COL_YELLOW
-color_class { name: "c5"; color: 51 51 204 255; } // COL_BLUE
+color_class { name: "c5"; color: 38 139 210 255; } // COL_BLUE
color_class { name: "c6"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "c7"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "c8"; color: 204 204 204 255; } // COL_WHITE
@@ -54,7 +54,7 @@ color_class { name: "C0"; color: 0 0 0 255; } //
COL_BLACK
color_class { name: "C1"; color: 204 51 51 255; } // COL_RED
color_class { name: "C2"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "C3"; color: 204 136 51 255; } // COL_YELLOW
-color_class { name: "C4"; color: 51 51 204 255; } // COL_BLUE
+color_class { name: "C4"; color: 38 139 210 255; } // COL_BLUE
color_class { name: "C5"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "C6"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "C7"; color: 204 204 204 255; } // COL_WHITE
--
[EGIT] [website/www-content] master 01/01: Terminology release v1.4.1
billiob pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=65b6fc72ab04730c2a7b45309b155c9e11dff38c commit 65b6fc72ab04730c2a7b45309b155c9e11dff38c Author: Boris Faure Date: Fri May 24 22:48:16 2019 +0200 Terminology release v1.4.1 --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 353bc45ec..cbb0c5072 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -3,7 +3,7 @@ efl_v = 1.22.2 python_efl_v = 1.22.0 enlightenment_v = 0.22.4 -terminology_v = 1.4.0 +terminology_v = 1.4.1 rage_v= 0.3.0 econnman_v= 1.1 ephoto_v = 1.5 --
[EGIT] [website/www-content] master 01/01: Wiki page 2019-05-24-terminology-1.4.1 changed with summary [created] by Boris Faure
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=83a15eee28adcf0dfe17d8fcf24b8487df04ba57
commit 83a15eee28adcf0dfe17d8fcf24b8487df04ba57
Author: Boris Faure
Date: Fri May 24 14:01:12 2019 -0700
Wiki page 2019-05-24-terminology-1.4.1 changed with summary [created] by
Boris Faure
---
pages/news/2019-05-24-terminology-1.4.1.txt | 17 +
1 file changed, 17 insertions(+)
diff --git a/pages/news/2019-05-24-terminology-1.4.1.txt
b/pages/news/2019-05-24-terminology-1.4.1.txt
new file mode 100644
index 0..31521a04c
--- /dev/null
+++ b/pages/news/2019-05-24-terminology-1.4.1.txt
@@ -0,0 +1,17 @@
+=== Terminology v1.4.1 ===
+ * //2019-05-24 - by Boris Faure//
+
+A few weeks after having released Terminology v1.4.0, few issues were found
and fixed in this new 1.4.1 version.
+
+== Fixes ==
+ * Decode pasted string as UTF-8, fixing some characters being skipped
+ * Fix theme to ensure default size is 80x24
+ * Fix focus disappearing after going to Settings and back
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
https://download.enlightenment.org/rel/apps/terminology/terminology-1.4.1.tar.xz
| Terminology 1.4.1 XZ]] |
''d7b8b35fa38cb6a8746435c44f3517c47324d4c8362b35878ec90c9254d9a956'' |
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
+
--
[EGIT] [apps/terminology] terminology-1.4 01/01: Terminology release 1.4.1
billiob pushed a commit to branch terminology-1.4.
http://git.enlightenment.org/apps/terminology.git/commit/?id=49d9eb52a539613dc048d149b6a6b33f152d7752
commit 49d9eb52a539613dc048d149b6a6b33f152d7752
Author: Boris Faure
Date: Fri May 24 22:17:05 2019 +0200
Terminology release 1.4.1
---
ChangeLog | 6 ++
NEWS | 9 +
README.md | 2 +-
man/terminology-helpers.1 | 2 +-
man/terminology.1 | 2 +-
meson.build | 2 +-
6 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71ac671..eb124a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-24
+* Release v1.4.1
+* Decode pasted string as UTF-8, fixing some characters being skipped
+* Fix theme to ensure default size is 80x24
+* Fix focus disappearing after going to Settings and back
+
2019-03-31
* Release v1.4.0
* Add Continuous Integration on every push to the git repository
diff --git a/NEWS b/NEWS
index 51a647e..307d84d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@
Terminology 1.4.0
=
+Changes since 1.4.0:
+
+
+Fixes:
+* Decode pasted string as UTF-8, fixing some characters being skipped
+* Fix theme to ensure default size is 80x24
+* Fix focus disappearing after going to Settings and back
+
+
Changes since 1.3.2:
diff --git a/README.md b/README.md
index f60dfd6..79f42f4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Terminology 1.4.0
+Terminology 1.4.1
=
This is an EFL terminal emulator with some extra bells and whistles.
diff --git a/man/terminology-helpers.1 b/man/terminology-helpers.1
index a26ceaf..b4d91e6 100644
--- a/man/terminology-helpers.1
+++ b/man/terminology-helpers.1
@@ -1,5 +1,5 @@
.\" Manpage for terminology helpers
-.TH TERMINOLOGY-HELPERS 1 "Mar 31 2019"
+.TH TERMINOLOGY-HELPERS 1 "May 24, 2019"
.SH NAME
terminiology-helpers \- programs that enhance
.B terminology(1)
diff --git a/man/terminology.1 b/man/terminology.1
index 6bf3777..a08981c 100644
--- a/man/terminology.1
+++ b/man/terminology.1
@@ -1,5 +1,5 @@
.\" Manpage for Terminology
-.TH TERMINOLOGY 1 "31 Mar 2019" "1.4.0" "Terminology man page"
+.TH TERMINOLOGY 1 "May 24, 2019" "1.4.1" "Terminology man page"
.SH NAME
Terminology \- Terminal Emulator written with EFL (Enlightenment Foundation
Libraries).
.SH SYNOPSIS
diff --git a/meson.build b/meson.build
index 41fb7b8..05b2c47 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('terminology', 'c',
-version: '1.4.99',
+version: '1.4.1',
default_options: ['c_std=gnu99'],
license: 'BSD')
--
[E-devel] Terminology 1.4.1
Hello fellow Terminology enthusiasts! A few weeks after having released Terminology v1.4.0, few issues were found and fixed in this new 1.4.1 version. == Fixes == * Decode pasted string as UTF-8, fixing some characters being skipped * Fix theme to ensure default size is 80x24 * Fix focus disappearing after going to Settings and back The tarball can be found at : - https://download.enlightenment.org/rel/apps/terminology/terminology-1.4.1.tar.xz - https://downloads.terminolo.gy/terminology-1.4.1.tar.xz sha256sum: d7b8b35fa38cb6a8746435c44f3517c47324d4c8362b35878ec90c9254d9a956 Happy compiling! ( https://xkcd.com/303/ ) -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/02: win: use elm_layout for the base objects
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=3c12162dcfa7d2d3b5553f133d093f03999144d1
commit 3c12162dcfa7d2d3b5553f133d093f03999144d1
Author: Boris Faure
Date: Wed May 22 23:03:03 2019 +0200
win: use elm_layout for the base objects
---
src/bin/utils.c | 26 ++
src/bin/utils.h | 1 +
src/bin/win.c | 109 ++--
src/bin/win.h | 1 -
4 files changed, 77 insertions(+), 60 deletions(-)
diff --git a/src/bin/utils.c b/src/bin/utils.c
index 57cdb1e..ecd2da3 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -49,6 +49,32 @@ theme_apply(Evas_Object *edje, const Config *config, const
char *group)
return EINA_FALSE;
}
+Eina_Bool
+theme_apply_elm(Evas_Object *layout, const Config *config, const char *group)
+{
+ const char *errmsg;
+ Evas_Object *edje;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(layout, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(config, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(group, EINA_FALSE);
+
+ if (elm_layout_file_set(layout, config_theme_path_get(config), group))
+ return EINA_TRUE;
+
+ edje = elm_layout_edje_get(layout);
+ errmsg = edje_load_error_str(edje_object_load_error_get(edje));
+ INF("Cannot find theme: file=%s group=%s error='%s', trying default...",
+ config_theme_path_get(config), group, errmsg);
+
+ if (elm_layout_file_set(layout, config_theme_path_default_get(config),
group))
+ return EINA_TRUE;
+
+ errmsg = edje_load_error_str(edje_object_load_error_get(edje));
+ ERR(_("Could not load any theme for group=%s: %s"), group, errmsg);
+ return EINA_FALSE;
+}
+
Eina_Bool
theme_apply_default(Evas_Object *edje, const Config *config, const char *group)
{
diff --git a/src/bin/utils.h b/src/bin/utils.h
index cf25322..73476de 100644
--- a/src/bin/utils.h
+++ b/src/bin/utils.h
@@ -5,6 +5,7 @@
#include "config.h"
Eina_Bool theme_apply(Evas_Object *edje, const Config *config, const char
*group);
+Eina_Bool theme_apply_elm(Evas_Object *edje, const Config *config, const char
*group);
Eina_Bool theme_apply_default(Evas_Object *edje, const Config *config, const
char *group);
void theme_reload(Evas_Object *edje);
void theme_auto_reload_enable(Evas_Object *edje);
diff --git a/src/bin/win.c b/src/bin/win.c
index 06ba7db..fd87a8c 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -385,11 +385,11 @@ _solo_bell(Term_Container *tc,
if (!tc->wn->config->disable_visual_bell)
{
edje_object_signal_emit(term->bg, "bell", "terminology");
-edje_object_signal_emit(term->base, "bell", "terminology");
+elm_layout_signal_emit(term->base, "bell", "terminology");
if (tc->wn->config->bell_rings)
{
edje_object_signal_emit(term->bg, "bell,ring", "terminology");
- edje_object_signal_emit(term->base, "bell,ring", "terminology");
+ elm_layout_signal_emit(term->base, "bell,ring", "terminology");
}
}
tc->parent->bell(tc->parent, tc);
@@ -419,7 +419,7 @@ _solo_unfocus(Term_Container *tc, Term_Container *relative)
if (!term->config->disable_focus_visuals)
{
edje_object_signal_emit(term->bg, "focus,out", "terminology");
-edje_object_signal_emit(term->base, "focus,out", "terminology");
+elm_layout_signal_emit(term->base, "focus,out", "terminology");
}
}
@@ -454,12 +454,12 @@ _solo_focus(Term_Container *tc, Term_Container *relative)
if (term->config->disable_focus_visuals)
{
edje_object_signal_emit(term->bg, "focused,set", "terminology");
-edje_object_signal_emit(term->base, "focused,set", "terminology");
+elm_layout_signal_emit(term->base, "focused,set", "terminology");
}
else
{
edje_object_signal_emit(term->bg, "focus,in", "terminology");
-edje_object_signal_emit(term->base, "focus,in", "terminology");
+elm_layout_signal_emit(term->base, "focus,in", "terminology");
}
if (term->wn->cmdbox)
elm_object_focus_set(term->wn->cmdbox, EINA_FALSE);
@@ -574,7 +574,7 @@ _cb_win_focus_in(void *data,
if (!term->config->disable_focus_visuals)
{
edje_object_signal_emit(term->bg, "focus,out",
"terminology");
- edje_object_signal_emit(term->base, "focus,out",
"terminology");
+ elm_layout_signal_emit(term->base,
[EGIT] [apps/terminology] master 02/02: Merge remote-tracking branch 'origin/terminology-1.4'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=b963622c5d7ca4d0170529c615447879e8184d40 commit b963622c5d7ca4d0170529c615447879e8184d40 Merge: 3c12162 49d9eb5 Author: Boris Faure Date: Sat May 25 11:35:46 2019 +0200 Merge remote-tracking branch 'origin/terminology-1.4' ChangeLog | 6 ++ NEWS | 9 + README.md | 2 +- man/terminology-helpers.1 | 2 +- man/terminology.1 | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) --
[EGIT] [apps/terminology] master 01/01: use layout api in controls/options
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=fff087bead746d77c1b442e9b558af9baa52bf51
commit fff087bead746d77c1b442e9b558af9baa52bf51
Author: Boris Faure
Date: Sun May 26 19:25:44 2019 +0200
use layout api in controls/options
---
src/bin/controls.c | 14 +++---
src/bin/options.c | 46 +-
src/bin/options_behavior.c | 42 ++
src/bin/options_keys.c | 2 +-
4 files changed, 47 insertions(+), 57 deletions(-)
diff --git a/src/bin/controls.c b/src/bin/controls.c
index c9cf83f..5aa2e62 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -61,10 +61,10 @@ _cb_hidden(void *data,
evas_object_del(frame);
- o = edje_object_part_swallow_get(ctx->base, "terminology.controls");
+ o = elm_layout_content_get(ctx->base, "terminology.controls");
if (o)
{
-edje_object_part_unswallow(ctx->base, o);
+elm_layout_content_unset(ctx->base, "terminology.controls");
}
elm_cache_all_flush();
@@ -286,7 +286,7 @@ controls_hide(Controls_Ctx *ctx, Eina_Bool call_cb)
if (ctx->term)
{
evas_object_event_callback_del(ctx->term, EVAS_CALLBACK_DEL,
_cb_saved_del);
-edje_object_signal_emit(ctx->base, "controls,hide", "terminology");
+elm_layout_signal_emit(ctx->base, "controls,hide", "terminology");
}
if (ctx->over)
@@ -311,7 +311,7 @@ controls_show(Evas_Object *win, Evas_Object *base,
Evas_Object *bg,
Controls_Ctx *ctx;
if (eina_hash_find(controls, &win) ||
- edje_object_part_swallow_get(base, "terminology.controls"))
+ elm_layout_content_get(base, "terminology.controls"))
{
donecb(donedata);
return;
@@ -418,16 +418,16 @@ controls_show(Evas_Object *win, Evas_Object *base,
Evas_Object *bg,
evas_object_smart_callback_add(win, "selection,off", _cb_sel_off,
ctx);
- edje_object_part_swallow(base, "terminology.controls", ctx->frame);
+ elm_layout_content_set(base, "terminology.controls", ctx->frame);
evas_object_show(ctx->frame);
ctx->over = o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 0, 0, 0, 0);
- edje_object_part_swallow(base, "terminology.dismiss", o);
+ elm_layout_content_set(base, "terminology.dismiss", o);
evas_object_show(o);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down, ctx);
- edje_object_signal_emit(base, "controls,show", "terminology");
+ elm_layout_signal_emit(base, "controls,show", "terminology");
elm_object_focus_set(ctx->frame, EINA_TRUE);
evas_object_event_callback_add(ctx->win, EVAS_CALLBACK_DEL, _cb_saved_del,
ctx);
evas_object_event_callback_add(ctx->term, EVAS_CALLBACK_DEL, _cb_saved_del,
ctx);
diff --git a/src/bin/options.c b/src/bin/options.c
index 4925956..4ca0cb1 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -61,7 +61,7 @@ _cb_op(void *data,
ctx->mode = mode;
- edje_object_signal_emit(ctx->base, "optdetails,hide", "terminology");
+ elm_layout_signal_emit(ctx->base, "optdetails,hide", "terminology");
}
static void
@@ -96,7 +96,7 @@ _cb_opdt_hide_done(void *data,
case OPTION_ELM: options_elm(ctx->opbox, ctx->term); break;
case OPTIONS_MODE_NB: assert(0 && "should not occur");
}
- edje_object_signal_emit(ctx->base, "optdetails,show", "terminology");
+ elm_layout_signal_emit(ctx->base, "optdetails,show", "terminology");
}
static void
@@ -107,9 +107,8 @@ _cb_opdt_hide_done2(void *data,
{
Options_Ctx *ctx = data;
- edje_object_signal_callback_del(ctx->base, "optdetails,hide,done",
- "terminology",
- _cb_opdt_hide_done2);
+ elm_layout_signal_callback_del(ctx->base, "optdetails,hide,done",
+ "terminology", _cb_opdt_hide_done2);
evas_object_del(ctx->opbox);
evas_object_del(ctx->frame);
@@ -122,17 +121,15 @@ _cb_opdt_hide_done2(void *data,
static void
options_hide(Options_Ctx *ctx)
{
- edje_object_part_swallow(ctx->base, "terminology.optdetails", ctx->opbox);
- edje_object_part_swallow(ctx->base, "terminology.options", ctx->frame);
- edje_object_signal_emit(ctx->base, "optdetails,show", "terminology");
- edje_object_signal_emit(ctx->base, "optio
[EGIT] [apps/terminology] master 03/06: themes: use a color_class BG to set background color
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=82dec43611be11f2762120fb47d9a1671c910b3b
commit 82dec43611be11f2762120fb47d9a1671c910b3b
Author: Boris Faure
Date: Sun May 26 22:54:12 2019 +0200
themes: use a color_class BG to set background color
---
ChangeLog.theme | 6 +-
data/themes/base16_ocean_dark.edc | 1 +
data/themes/default.edc | 10 +-
data/themes/default_colors.in.edc | 3 ++-
data/themes/mild.edc | 4 ++--
data/themes/mustang.edc | 2 ++
data/themes/nord.edc | 4 +++-
data/themes/smyck.edc | 2 ++
data/themes/solarized.edc | 21 -
data/themes/solarized_light.edc | 4 +++-
10 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/ChangeLog.theme b/ChangeLog.theme
index d886cb3..7a18ef4 100644
--- a/ChangeLog.theme
+++ b/ChangeLog.theme
@@ -1,7 +1,11 @@
=
-Terminology 1.2.0
+Terminology 1.5.0
=
+Changes since 1.2.0:
+
+ * Color class "BG" has to be set with the color of the background.
+
Changes since 1.1.1:
diff --git a/data/themes/base16_ocean_dark.edc
b/data/themes/base16_ocean_dark.edc
index 124a0ac..843fc5a 100644
--- a/data/themes/base16_ocean_dark.edc
+++ b/data/themes/base16_ocean_dark.edc
@@ -25,6 +25,7 @@ collections {
color_class { name: "C7"; color: 192 197 206 255; }
color_class { name: "C8"; color: 101 115 126 255; }
color_class { name: "C9"; color: 208 135 112 255; }
+color_class { name: "BG"; color: BG_COLOR; }
}
}
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 9323255..45d6082 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1,7 +1,7 @@
#ifndef NO_COLORS
color_classes {
-# include "default_colors.in.edc"
-# define BG_COL 32 32 32 255
+#define BG_COLOR 32 32 32 255
+#include "default_colors.in.edc"
}
#endif
@@ -54,7 +54,7 @@ collections {
part { name: "miniview.bg"; type: RECT;
//mouse_events: 1;
description { state: "default" 0.0;
- color: BG_COL;
+ color_class: "BG";
}
}
part { name: "shadow";
@@ -326,7 +326,7 @@ collections {
part { name: "base"; type: RECT;
mouse_events: 1;
description { state: "default" 0.0;
- color: BG_COL;
+ color_class: "BG";
}
}
@@ -5153,7 +5153,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
part { name: "base"; type: RECT;
mouse_events: 1;
description { state: "default" 0.0;
- color: BG_COL;
+ color_class: "BG";
rel1.offset: 2 2;
rel2.offset: -3 -3;
}
diff --git a/data/themes/default_colors.in.edc
b/data/themes/default_colors.in.edc
index aa68f4b..415460f 100644
--- a/data/themes/default_colors.in.edc
+++ b/data/themes/default_colors.in.edc
@@ -1,3 +1,5 @@
+color_class { name: "BG"; color: BG_COLOR ; }
+
color_class { name: "c0"; color: 170 170 170 255; } // COL_DEF
color_class { name: "c1"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "c2"; color: 204 51 51 255; } // COL_RED
@@ -347,5 +349,4 @@ color_class { name: "C252"; color: 210 210 210 255; }
color_class { name: "C253"; color: 218 218 218 255; }
color_class { name: "C254"; color: 228 228 228 255; }
color_class { name: "C255"; color: 238 238 238 255; }
-
#endif
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index a75cba0..f8a79d0 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -129,7 +129,7 @@ collections {
mouse_events: 1;
clip_to: "baseclip";
description { state: "default" 0.0;
- color: BG_COLOR;
+ color_class: "BG";
}
}
part { name: "fade"; type: RECT;
@@ -1820,7 +1820,7 @@ collections {
part { name: "base"; type: RECT;
clip_to: "clip";
description { state: "default" 0.0;
- color: BG_COLOR;
+ color_class: "BG";
rel1.to: "terminology.content";
rel2.to: "terminology.content";
}
diff --git a/data/themes/mustang.edc b/data/themes/mustang.edc
index b81656e..2176c6b 100644
--- a/data/themes/mustang.edc
+++ b/
[EGIT] [apps/terminology] master 04/06: termpty: fix unsigned comparison
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=f6d6ce481e4b3d48076df7f4ed681e5c9c1a910a
commit f6d6ce481e4b3d48076df7f4ed681e5c9c1a910a
Author: Boris Faure
Date: Sun May 26 22:54:38 2019 +0200
termpty: fix unsigned comparison
---
src/bin/termpty.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 1923f2a..72f7080 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -312,8 +312,8 @@ _fd_read_do(Termpty *ty, Ecore_Fd_Handler *fd_handler,
Eina_Bool false_on_empty)
(len - prev_i) <= (int)sizeof(ty->oldbuf))
{
for (k = 0;
-(k < (unsigned int)sizeof(ty->oldbuf)) &&
-(k < (len - prev_i));
+(k < (unsigned int)sizeof(ty->oldbuf)) &&
+(k < (unsigned int)(len - prev_i));
k++)
{
ty->oldbuf[k] = buf[prev_i+k];
--
[EGIT] [apps/terminology] master 05/06: termpty: add termpty_color_class_get()
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=7e677abfb99d4c362215ca449de3bad8edab9c3c
commit 7e677abfb99d4c362215ca449de3bad8edab9c3c
Author: Boris Faure
Date: Sun May 26 22:55:22 2019 +0200
termpty: add termpty_color_class_get()
---
src/bin/termpty.c | 36 +++-
src/bin/termpty.h | 4
src/bin/tyfuzz.c | 15 +++
3 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 72f7080..7932d52 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -7,8 +7,11 @@
#include "termptyesc.h"
#include "termptyops.h"
#include "termptysave.h"
-#include "termio.h"
#include "keyin.h"
+#if !defined(ENABLE_FUZZING) && !defined(ENABLE_TESTS)
+# include "win.h"
+#endif
+#include "termio.h"
#include
#include
#include
@@ -1839,3 +1842,34 @@ term_link_free(Termpty *ty, Term_Link *link)
/* Remove from bitmap */
hl_bitmap_clear_bit(ty, id);
}
+#if !defined(ENABLE_FUZZING) && !defined(ENABLE_TESTS)
+int
+termpty_color_class_get(Termpty *ty, const char *key,
+int *r, int *g, int *b, int *a)
+{
+ Term *term;
+
+ term = termio_term_get(ty->obj);
+ if (term)
+ {
+Evas_Object *bg = term_bg_get(term);
+if (!edje_object_color_class_get(bg, key,
+ r,
+ g,
+ b,
+ a,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL))
+ {
+ ERR("color class BG not found in theme");
+ return -1;
+ }
+ }
+ else
+ {
+ERR("term not found");
+return -1;
+ }
+ return 0;
+}
+#endif
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index e369012..bd6bf62 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -314,6 +314,10 @@ void
termpty_handle_block_codepoint_overwrite_heavy(Termpty *ty, int oldc, int n
Term_Link * term_link_new(Termpty *ty);
void term_link_free(Termpty *ty, Term_Link *link);
+int
+termpty_color_class_get(Termpty *ty, const char *key,
+int *r, int *g, int *b, int *a);
+
extern int _termpty_log_dom;
#define TERMPTY_SCREEN(Tpty, X, Y) \
diff --git a/src/bin/tyfuzz.c b/src/bin/tyfuzz.c
index 5525886..69281f1 100644
--- a/src/bin/tyfuzz.c
+++ b/src/bin/tyfuzz.c
@@ -226,6 +226,21 @@ termio_set_cursor_shape(Evas_Object *obj EINA_UNUSED,
{
}
#endif
+
+int
+termpty_color_class_get(Termpty *ty EINA_UNUSED, const char *key,
+int *r, int *g, int *b, int *a)
+{
+ if (strncmp(key, "BG", strlen("BG")) == 0)
+ {
+*r = 131;
+*g = 132;
+*b = 133;
+*a = 134;
+return 0;
+ }
+ return -1;
+}
/* }}} */
--
[EGIT] [apps/terminology] master 06/06: termptyesc: handle OSC 11 that reports background color
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=33b2d68aa9c98b1c28f34bc6dc908b94b57083c6
commit 33b2d68aa9c98b1c28f34bc6dc908b94b57083c6
Author: Boris Faure
Date: Sun May 26 23:02:53 2019 +0200
termptyesc: handle OSC 11 that reports background color
It can also be used to set background color but that's not implemented
---
src/bin/termptyesc.c | 40 +++-
src/bin/tyfuzz.c | 12
tests/osc-11-query.sh | 6 ++
tests/tests.results | 1 +
4 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index f8f385f..be37adf 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -32,6 +32,10 @@
#define OSC 0x9d
#define DEL 0x7f
+#define TERMPTY_WRITE_STR(_S) \
+ termpty_write(ty, _S, strlen(_S))
+
+
/* XXX: all handle_ functions return the number of bytes successfully read, 0
* if not enough bytes could be read
*/
@@ -3633,6 +3637,34 @@ _handle_xterm_777_command(Termpty *ty,
*title_end = ';';
}
+static void
+_handle_xterm_11_command(Termpty *ty, Eina_Unicode *p)
+{
+ int r = 0, g = 0, b = 0;
+ char buf[32];
+ size_t l;
+
+ if (!*p)
+ goto err;
+
+ /* only support query mode for the moment */
+ if (*p != '?')
+ goto err;
+
+ if (termpty_color_class_get(ty, "BG", &r, &g, &b, NULL) != 0)
+ {
+ERR("error getting color class 'BG'");
+ }
+ TERMPTY_WRITE_STR("\033]11;rgb:");
+ l = snprintf(buf, sizeof(buf), "%.2X/%.2X/%.2X", r, g, b);
+ termpty_write(ty, buf, l);
+ TERMPTY_WRITE_STR("\007");
+
+ return;
+err:
+ ty->decoding_error = EINA_TRUE;
+}
+
static int
_handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode *ce)
{
@@ -3670,9 +3702,6 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const
Eina_Unicode *ce)
else
return 0;
-#define TERMPTY_WRITE_STR(_S) \
- termpty_write(ty, _S, strlen(_S))
-
arg = _osc_arg_get(&p);
switch (arg)
{
@@ -3777,6 +3806,9 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const
Eina_Unicode *ce)
#endif
}
break;
+ case 11:
+_handle_xterm_11_command(ty, p);
+break;
case 50:
DBG("xterm font support");
if (!*p)
@@ -3804,8 +3836,6 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c, const
Eina_Unicode *ce)
break;
}
-#undef TERMPTY_WRITE_STR
-
return cc - c;
err:
WRN("invalid xterm sequence");
diff --git a/src/bin/tyfuzz.c b/src/bin/tyfuzz.c
index 69281f1..e1c1d12 100644
--- a/src/bin/tyfuzz.c
+++ b/src/bin/tyfuzz.c
@@ -233,10 +233,14 @@ termpty_color_class_get(Termpty *ty EINA_UNUSED, const
char *key,
{
if (strncmp(key, "BG", strlen("BG")) == 0)
{
-*r = 131;
-*g = 132;
-*b = 133;
-*a = 134;
+if (r)
+ *r = 131;
+if (g)
+ *g = 132;
+if (b)
+ *b = 133;
+if (a)
+ *a = 134;
return 0;
}
return -1;
diff --git a/tests/osc-11-query.sh b/tests/osc-11-query.sh
new file mode 100755
index 000..f26cdf8
--- /dev/null
+++ b/tests/osc-11-query.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# query background color
+printf '\033]11;?\007'
+sleep 0.1
+#should print ^]]11;rgb:83/84/85^G
diff --git a/tests/tests.results b/tests/tests.results
index d43b42f..c4ae850 100644
--- a/tests/tests.results
+++ b/tests/tests.results
@@ -121,3 +121,4 @@ mouse_reporting_mode_normal_ext_urxvt.sh
bf68099047410f102e71d2e451875c69
mouse_reporting_mode_mouse_move_pressed_ext_urxvt.sh
59f3e59b60b3a43260de6a80135489eb
mouse_reporting_mode_all_ext_urxvt.sh a11bbc8ebea42d06cc3ad823b52c09b3
shift_in_out.sh 3896bcc6887998bbc41b43840a6b2e33
+osc-11-query.sh fa4a07e289cc7b223404bb580dc413bf
--
[EGIT] [apps/terminology] master 01/06: options_behavior: remove unused variable
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=372893297b459ac6f7bac50795d3b8cae855d0b4
commit 372893297b459ac6f7bac50795d3b8cae855d0b4
Author: Boris Faure
Date: Sun May 26 22:41:26 2019 +0200
options_behavior: remove unused variable
---
src/bin/options_behavior.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 9b22cae..cb5ec9f 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -207,7 +207,7 @@ static void
_add_cursors_option(Evas_Object *bx,
Behavior_Ctx *ctx)
{
- Evas_Object *lbl, *rd, *rdg, *layout, *oe;
+ Evas_Object *lbl, *rd, *rdg, *layout;
lbl = elm_label_add(bx);
evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, 0.0);
--
[EGIT] [apps/terminology] master 02/06: win: add term_bg_get()
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=d29533e34149cdb7acae9593b95269b06bd3227e
commit d29533e34149cdb7acae9593b95269b06bd3227e
Author: Boris Faure
Date: Sun May 26 22:52:57 2019 +0200
win: add term_bg_get()
---
src/bin/win.c | 8
src/bin/win.h | 1 +
2 files changed, 9 insertions(+)
diff --git a/src/bin/win.c b/src/bin/win.c
index fd87a8c..d9e47c6 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -5517,6 +5517,14 @@ term_miniview_get(const Term *term)
return NULL;
}
+Evas_Object *
+term_bg_get(const Term *term)
+{
+ if (term)
+ return term->bg;
+ return NULL;
+}
+
static void
_cb_bell(void *data,
diff --git a/src/bin/win.h b/src/bin/win.h
index c1b799f..7ec3575 100644
--- a/src/bin/win.h
+++ b/src/bin/win.h
@@ -59,6 +59,7 @@ Term *term_prev_get(const Term *term);
void term_next(Term *term);
void term_prev(Term *term);
Win * term_win_get(const Term *term);
+Evas_Object *term_bg_get(const Term *term);
void term_up(Term *term);
void term_down(Term *term);
--
[EGIT] [apps/terminology] master 01/01: termptyesc: osc 11's format is weird
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=50e13710061a952473edfa82792cf887e2c369ba
commit 50e13710061a952473edfa82792cf887e2c369ba
Author: Boris Faure
Date: Mon May 27 00:13:22 2019 +0200
termptyesc: osc 11's format is weird
---
src/bin/termptyesc.c | 3 ++-
tests/tests.results | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index be37adf..520cb36 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -3656,7 +3656,8 @@ _handle_xterm_11_command(Termpty *ty, Eina_Unicode *p)
ERR("error getting color class 'BG'");
}
TERMPTY_WRITE_STR("\033]11;rgb:");
- l = snprintf(buf, sizeof(buf), "%.2X/%.2X/%.2X", r, g, b);
+ l = snprintf(buf, sizeof(buf), "%.2x%.2x/%.2x%.2x/%.2x%.2x",
+r, r, g, g, b, b);
termpty_write(ty, buf, l);
TERMPTY_WRITE_STR("\007");
diff --git a/tests/tests.results b/tests/tests.results
index c4ae850..d8f480b 100644
--- a/tests/tests.results
+++ b/tests/tests.results
@@ -121,4 +121,4 @@ mouse_reporting_mode_normal_ext_urxvt.sh
bf68099047410f102e71d2e451875c69
mouse_reporting_mode_mouse_move_pressed_ext_urxvt.sh
59f3e59b60b3a43260de6a80135489eb
mouse_reporting_mode_all_ext_urxvt.sh a11bbc8ebea42d06cc3ad823b52c09b3
shift_in_out.sh 3896bcc6887998bbc41b43840a6b2e33
-osc-11-query.sh fa4a07e289cc7b223404bb580dc413bf
+osc-11-query.sh 369e4e03be35dcb360e45d13fcd7da61
--
[EGIT] [apps/terminology] master 02/02: termptyesc: handle some OSC where there's nothing to do
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=417cf716c6875cec5a978f878507538047dcb007
commit 417cf716c6875cec5a978f878507538047dcb007
Author: Boris Faure
Date: Mon May 27 19:20:28 2019 +0200
termptyesc: handle some OSC where there's nothing to do
---
src/bin/termptyesc.c | 30 ++
1 file changed, 30 insertions(+)
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 498b8d9..b039a7c 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -3820,6 +3820,36 @@ _handle_esc_osc(Termpty *ty, const Eina_Unicode *c,
const Eina_Unicode *ce)
free(s);
}
break;
+ case 110:
+DBG("Reset VT100 text foreground color");
+break;
+ case 111:
+DBG("Reset VT100 text background color");
+break;
+ case 112:
+DBG("Reset text cursor color");
+break;
+ case 113:
+DBG("Reset mouse foreground color");
+break;
+ case 114:
+DBG("Reset mouse background color");
+break;
+ case 115:
+DBG("Reset Tektronix foreground color");
+break;
+ case 116:
+DBG("Reset Tektronix background color");
+break;
+ case 117:
+DBG("Reset highlight color");
+break;
+ case 118:
+DBG("Reset Tektronix cursor color");
+break;
+ case 119:
+DBG("Reset highlight foreground color");
+break;
case 777:
DBG("xterm notification support");
s = eina_unicode_unicode_to_utf8(p, &len);
--
[EGIT] [apps/terminology] master 01/02: termptyesc: just ignore screen mode
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=16db713a44e34f05793206f764c49ccd291dfa09
commit 16db713a44e34f05793206f764c49ccd291dfa09
Author: Boris Faure
Date: Mon May 27 19:20:09 2019 +0200
termptyesc: just ignore screen mode
---
src/bin/termptyesc.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 520cb36..498b8d9 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -492,7 +492,6 @@ _handle_esc_csi_reset_mode(Termpty *ty, Eina_Unicode cc,
Eina_Unicode *b,
See
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577012
*/
WRN("Ignored screen mode %i", arg);
- ty->decoding_error = EINA_TRUE;
break;
case 1047:
if (!mode && ty->altbuf)
--
[EGIT] [apps/terminology] master 02/03: config: turn "notabs" into "show_tabs"
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=dc1ddf7e405b8c1a99f8a1cb270c84840531e983
commit dc1ddf7e405b8c1a99f8a1cb270c84840531e983
Author: Boris Faure
Date: Sun Sep 29 23:03:12 2019 +0200
config: turn "notabs" into "show_tabs"
---
src/bin/config.c | 18 --
src/bin/config.h | 3 ++-
src/bin/options_behavior.c | 5 +++--
src/bin/win.c | 20 ++--
4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 9cb4fa2..52ff2d2 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -7,7 +7,7 @@
#include "col.h"
#include "utils.h"
-#define CONF_VER 22
+#define CONF_VER 23
#define CONFIG_KEY "config"
#define LIM(v, min, max) {if (v >= max) v = max; else if (v <= min) v = min;}
@@ -175,8 +175,10 @@ config_init(void)
(edd_base, Config, "keys", keys, edd_keys);
EET_DATA_DESCRIPTOR_ADD_BASIC
(edd_base, Config, "gravatar", gravatar, EET_T_UCHAR);
- EET_DATA_DESCRIPTOR_ADD_BASIC
+ EET_DATA_DESCRIPTOR_ADD_BASIC /* DEPRECATED, NO LONGER USED */
(edd_base, Config, "notabs", notabs, EET_T_UCHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC
+ (edd_base, Config, "show_tabs", show_tabs, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC
(edd_base, Config, "mv_always_show", mv_always_show, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC
@@ -292,7 +294,7 @@ config_sync(const Config *config_src, Config *config)
config->disable_focus_visuals = config_src->disable_focus_visuals;
/* TODO: config->keys */
config->gravatar = config_src->gravatar;
- config->notabs = config_src->notabs;
+ config->show_tabs = config_src->show_tabs;
config->mv_always_show = config_src->mv_always_show;
config->ty_escapes = config_src->ty_escapes;
config->changedir_to_current = config_src->changedir_to_current;
@@ -554,7 +556,7 @@ config_new(void)
config->disable_focus_visuals = EINA_FALSE;
config->colors_use = EINA_FALSE;
config->gravatar = EINA_TRUE;
-config->notabs = EINA_FALSE;
+config->show_tabs = EINA_TRUE;
config->mv_always_show = EINA_FALSE;
config->ty_escapes = EINA_TRUE;
config->changedir_to_current = EINA_TRUE;
@@ -705,7 +707,11 @@ config_load(void)
config->hide_cursor = 5.0;
EINA_FALLTHROUGH;
/*pass through*/
-case CONF_VER: /* 22 */
+case 22:
+ config->show_tabs = !config->notabs;
+ EINA_FALLTHROUGH;
+ /*pass through*/
+case CONF_VER: /* 23 */
config->version = CONF_VER;
break;
default:
@@ -801,7 +807,7 @@ config_fork(const Config *config)
CPY(temporary);
CPY(font_set);
CPY(gravatar);
- CPY(notabs);
+ CPY(show_tabs);
CPY(mv_always_show);
CPY(ty_escapes);
CPY(changedir_to_current);
diff --git a/src/bin/config.h b/src/bin/config.h
index b74a4a9..aa3027b 100644
--- a/src/bin/config.h
+++ b/src/bin/config.h
@@ -89,7 +89,8 @@ struct _Config
Eina_Bool disable_focus_visuals;
Eina_Bool colors_use;
Eina_Bool gravatar;
- Eina_Bool notabs;
+ Eina_Bool notabs; /* DEPRECATED */
+ Eina_Bool show_tabs;
Eina_Bool mv_always_show;
Eina_Bool ty_escapes;
Eina_Bool changedir_to_current;
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 4fb0c9b..4f1bf33 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -1,5 +1,6 @@
#include "private.h"
+
#include
#include
#include
@@ -55,7 +56,7 @@ CB(login_shell, 0);
CB(mouse_over_focus, 0);
CB(disable_focus_visuals, 1);
CB(gravatar, 0);
-CB(notabs, 1);
+CB(show_tabs, 0);
CB(mv_always_show, 0);
CB(ty_escapes, 0);
CB(changedir_to_current, 0);
@@ -482,7 +483,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
CX(_("Focus split under the Mouse"), mouse_over_focus, 0);
CX(_("Focus-related visuals"), disable_focus_visuals, 1);
CX(_("Gravatar integration"), gravatar, 0);
- CX(_("Show tabs"), notabs, 1);
+ CX(_("Show tabs"), show_tabs, 0);
CX(_("Always show miniview"), mv_always_show, 0);
CX(_("Enable special Terminology escape codes"), ty_escapes, 0);
CX(_("Open new terminals in current working directory"),
changedir_to_current, 0);
diff --git a/src/bin/win.c b/src/bin/win.c
index 8a0124f..0d5ca46 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -517,7 +517,7 @@ _solo_set_title(Term_Container *tc,
eina
[EGIT] [apps/terminology] master 01/03: win: show title tab on splits when config is set accordingly
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=5996e5eb2cb5e3481b1258cba965afd00722c8bf
commit 5996e5eb2cb5e3481b1258cba965afd00722c8bf
Author: Boris Faure
Date: Thu Sep 26 22:49:11 2019 +0200
win: show title tab on splits when config is set accordingly
---
src/bin/win.c | 93 ++-
1 file changed, 92 insertions(+), 1 deletion(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index ae330ea..8a0124f 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -508,8 +508,20 @@ _solo_set_title(Term_Container *tc,
Term_Container *_child EINA_UNUSED,
const char *title)
{
+ Solo *solo;
+ Term *term;
+
+ assert (tc->type == TERM_CONTAINER_TYPE_SOLO);
+ solo = (Solo*) tc;
+ term = solo->term;
+
eina_stringshare_del(tc->title);
tc->title = eina_stringshare_add(title);
+ if (!term->config->notabs)
+ {
+edje_object_part_text_set(term->bg, "terminology.tab.title",
+ title);
+ }
tc->parent->set_title(tc->parent, tc, title);
}
@@ -676,6 +688,61 @@ _solo_new(Term *term, Win *wn)
return tc;
}
+static void
+_solo_title_show(Term_Container *tc)
+{
+ Solo *solo;
+ Term *term;
+
+ assert (tc->type == TERM_CONTAINER_TYPE_SOLO);
+ solo = (Solo*) tc;
+ term = solo->term;
+
+ if (!term->tab_spacer)
+ {
+Evas_Coord w = 0, h = 0;
+
+term->tab_spacer = evas_object_rectangle_add(
+ evas_object_evas_get(term->bg));
+evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
+elm_coords_finger_size_adjust(1, &w, 1, &h);
+evas_object_size_hint_min_set(term->tab_spacer, w, h);
+edje_object_part_swallow(term->bg, "terminology.tab",
term->tab_spacer);
+edje_object_part_drag_value_set(term->bg, "terminology.tabl", 0.0,
0.0);
+edje_object_part_drag_value_set(term->bg, "terminology.tabr", 1.0,
0.0);
+edje_object_part_text_set(term->bg, "terminology.tab.title",
+ solo->tc.title);
+edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
+edje_object_message_signal_process(term->bg);
+ }
+ else
+ {
+edje_object_part_drag_value_set(term->bg, "terminology.tabl", 0.0,
0.0);
+edje_object_part_drag_value_set(term->bg, "terminology.tabr", 1.0,
0.0);
+edje_object_message_signal_process(term->bg);
+ }
+}
+
+static void
+_solo_title_hide(Term_Container *tc)
+{
+ Solo *solo;
+ Term *term;
+
+ assert (tc->type == TERM_CONTAINER_TYPE_SOLO);
+ solo = (Solo*) tc;
+ term = solo->term;
+
+ if (term->tab_spacer)
+ {
+edje_object_signal_emit(term->bg, "tabbar,off", "terminology");
+edje_object_message_signal_process(term->bg);
+edje_object_part_unswallow(term->bg, term->tab_spacer);
+evas_object_del(term->tab_spacer);
+term->tab_spacer = NULL;
+ }
+}
+
/* }}} */
/* {{{ Win */
@@ -1096,6 +1163,12 @@ _win_swallow(Term_Container *tc, Term_Container *orig,
o = new_child->get_evas_object(new_child);
elm_layout_content_set(wn->base, "terminology.content", o);
+ if ((new_child->type == TERM_CONTAINER_TYPE_SOLO
+&& (!wn->config->notabs)))
+ {
+_solo_title_hide(new_child);
+ }
+
evas_object_show(o);
new_child->parent = tc;
wn->child = new_child;
@@ -1270,6 +1343,14 @@ _win_split(Term_Container *tc, Term_Container *child,
elm_layout_content_unset(wn->base, "terminology.content");
tc_split = _split_new(child, tc_solo_new, is_horizontal);
+if (!wn->config->notabs)
+ {
+ if (child->type == TERM_CONTAINER_TYPE_SOLO)
+ {
+ _solo_title_show(child);
+ }
+ _solo_title_show(tc_solo_new);
+ }
tc_split->is_focused = tc->is_focused;
tc->swallow(tc, NULL, tc_split);
@@ -2509,6 +2590,11 @@ _split_split(Term_Container *tc, Term_Container *child,
tc_split->is_focused = tc->is_focused;
tc->swallow(tc, child, tc_split);
+ if (!wn->config->notabs)
+ {
+_solo_title_show(tc_solo_new);
+ }
+
evas_object_show(obj_split);
}
@@ -2521,6 +2607,7 @@ _split_is_visible(Term_Container *tc, Term_Container
*_child EINA_UNUSED)
return tc->parent->is_visible(tc->parent, tc);
}
+/* tc1 is a new solo */
static Term_Container *
_split_new(Term_Container *tc1, Term_Container *tc2,
Eina_Bool is_horizontal)
@@ -3227,17 +3314,21 @@ _tabs_close(Term_Container *tc, Term_Container *child)
[EGIT] [apps/terminology] master 03/03: win: update terms on change of config about show_tabs
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=9a2ddd8468cd104a82c1f35ec61108ed4ed18493
commit 9a2ddd8468cd104a82c1f35ec61108ed4ed18493
Author: Boris Faure
Date: Mon Sep 30 21:54:53 2019 +0200
win: update terms on change of config about show_tabs
---
src/bin/win.c | 120 --
1 file changed, 67 insertions(+), 53 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index 0d5ca46..e90b542 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -628,12 +628,6 @@ _solo_focus(Term_Container *tc, Term_Container *relative)
term->missed_bell = EINA_FALSE;
}
-static void
-_solo_update(Term_Container *tc)
-{
- assert (tc->type == TERM_CONTAINER_TYPE_SOLO);
-}
-
static Eina_Bool
_solo_is_visible(Term_Container *tc, Term_Container *_child EINA_UNUSED)
{
@@ -641,53 +635,6 @@ _solo_is_visible(Term_Container *tc, Term_Container
*_child EINA_UNUSED)
return tc->parent->is_visible(tc->parent, tc);
}
-static Term_Container *
-_solo_new(Term *term, Win *wn)
-{
- Term_Container *tc = NULL;
- Solo *solo = NULL;
- solo = calloc(1, sizeof(Solo));
- if (!solo)
- {
-free(solo);
-return NULL;
- }
-
- tc = (Term_Container*)solo;
- tc->term_next = _solo_term_next;
- tc->term_prev = _solo_term_prev;
- tc->term_up = _solo_term_up;
- tc->term_down = _solo_term_down;
- tc->term_left = _solo_term_left;
- tc->term_right = _solo_term_right;
- tc->term_first = _solo_term_first;
- tc->term_last = _solo_term_last;
- tc->focused_term_get = _solo_focused_term_get;
- tc->get_evas_object = _solo_get_evas_object;
- tc->split = _solo_split;
- tc->find_term_at_coords = _solo_find_term_at_coords;
- tc->size_eval = _solo_size_eval;
- tc->swallow = NULL;
- tc->focus = _solo_focus;
- tc->unfocus = _solo_unfocus;
- tc->set_title = _solo_set_title;
- tc->bell = _solo_bell;
- tc->close = _solo_close;
- tc->update = _solo_update;
- tc->title = eina_stringshare_add("Terminology");
- tc->is_visible = _solo_is_visible;
- tc->type = TERM_CONTAINER_TYPE_SOLO;
-
- tc->parent = NULL;
- tc->wn = wn;
-
- solo->term = term;
-
- term->container = tc;
-
- return tc;
-}
-
static void
_solo_title_show(Term_Container *tc)
{
@@ -743,6 +690,73 @@ _solo_title_hide(Term_Container *tc)
}
}
+static void
+_solo_update(Term_Container *tc)
+{
+ Solo *solo;
+ Term *term;
+ Term_Container *tc_parent = tc->parent;
+
+ assert (tc->type == TERM_CONTAINER_TYPE_SOLO);
+ solo = (Solo*) tc;
+ term = solo->term;
+
+ if (tc_parent->type == TERM_CONTAINER_TYPE_SPLIT)
+ {
+if (term->config->show_tabs)
+ _solo_title_show(tc);
+else
+ _solo_title_hide(tc);
+ }
+}
+
+static Term_Container *
+_solo_new(Term *term, Win *wn)
+{
+ Term_Container *tc = NULL;
+ Solo *solo = NULL;
+ solo = calloc(1, sizeof(Solo));
+ if (!solo)
+ {
+free(solo);
+return NULL;
+ }
+
+ tc = (Term_Container*)solo;
+ tc->term_next = _solo_term_next;
+ tc->term_prev = _solo_term_prev;
+ tc->term_up = _solo_term_up;
+ tc->term_down = _solo_term_down;
+ tc->term_left = _solo_term_left;
+ tc->term_right = _solo_term_right;
+ tc->term_first = _solo_term_first;
+ tc->term_last = _solo_term_last;
+ tc->focused_term_get = _solo_focused_term_get;
+ tc->get_evas_object = _solo_get_evas_object;
+ tc->split = _solo_split;
+ tc->find_term_at_coords = _solo_find_term_at_coords;
+ tc->size_eval = _solo_size_eval;
+ tc->swallow = NULL;
+ tc->focus = _solo_focus;
+ tc->unfocus = _solo_unfocus;
+ tc->set_title = _solo_set_title;
+ tc->bell = _solo_bell;
+ tc->close = _solo_close;
+ tc->update = _solo_update;
+ tc->title = eina_stringshare_add("Terminology");
+ tc->is_visible = _solo_is_visible;
+ tc->type = TERM_CONTAINER_TYPE_SOLO;
+
+ tc->parent = NULL;
+ tc->wn = wn;
+
+ solo->term = term;
+
+ term->container = tc;
+
+ return tc;
+}
+
/* }}} */
/* {{{ Win */
--
[EGIT] [apps/terminology] master 01/01: solarized_light: avoid redefining BG_COLOR
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=43964c18c74cbf41ddfee49cd314f6e213c40a8b commit 43964c18c74cbf41ddfee49cd314f6e213c40a8b Author: Boris Faure Date: Mon Sep 30 22:46:58 2019 +0200 solarized_light: avoid redefining BG_COLOR --- data/themes/solarized_light.edc | 1 - 1 file changed, 1 deletion(-) diff --git a/data/themes/solarized_light.edc b/data/themes/solarized_light.edc index c3db501..1ac95e4 100644 --- a/data/themes/solarized_light.edc +++ b/data/themes/solarized_light.edc @@ -15,7 +15,6 @@ #define S_base2 7 54 66 255 #define S_base3 0 43 54 255 -#define BG_COLOR S_base03 #define BG_COLOR_NO_ALPHA 253 246 227 #define BG_COLOR BG_COLOR_NO_ALPHA 255 #define FG_COLOR_NO_ALPHA 0 43 54 --
[EGIT] [apps/terminology] terminology-1.5 01/01: options_behavior: disable "hide cursor"'s slider when needed
billiob pushed a commit to branch terminology-1.5.
http://git.enlightenment.org/apps/terminology.git/commit/?id=fe63070139a697df54e2a8d096d51dc9efd1323d
commit fe63070139a697df54e2a8d096d51dc9efd1323d
Author: Boris Faure
Date: Tue Oct 1 22:43:05 2019 +0200
options_behavior: disable "hide cursor"'s slider when needed
---
src/bin/options_behavior.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 7216472..524ecc7 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -644,6 +644,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
elm_slider_unit_format_set(o, _("%1.1f s"));
elm_slider_indicator_format_set(o, _("%1.1f s"));
elm_slider_min_max_set(o, 0.0, CONFIG_CURSOR_IDLE_TIMEOUT_MAX);
+ elm_object_disabled_set(o, config->hide_cursor >=
CONFIG_CURSOR_IDLE_TIMEOUT_MAX);
elm_slider_value_set(o, config->hide_cursor);
elm_box_pack_end(bx, o);
evas_object_show(o);
--
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=109e804eae740bf4ecd9464f392af7f97b617d86 commit 109e804eae740bf4ecd9464f392af7f97b617d86 Merge: 43964c1 fe63070 Author: Boris Faure Date: Tue Oct 1 22:44:24 2019 +0200 Merge branch 'terminology-1.5' src/bin/options_behavior.c | 1 + 1 file changed, 1 insertion(+) --
[EGIT] [apps/terminology] master 01/01: circleci: test with efl-1.22.5
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c74b793b973bee899cc11e5815d14be9759378fb
commit c74b793b973bee899cc11e5815d14be9759378fb
Author: Boris Faure
Date: Thu Oct 3 12:13:51 2019 +0200
circleci: test with efl-1.22.5
---
.circleci/config.yml | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2272988..4177232 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
- run:
name: Compile with Clang
command: |
@@ -51,7 +51,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
- run:
name: Compile with Clang
command: |
@@ -73,7 +73,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
- run:
name: Compile with GCC
environment:
@@ -96,7 +96,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-21/efl-1.21.1-r0.apk
/pkg/efl-21/efl-dev-1.21.1-r0.apk
+ command: apk add /pkg/efl-1.21/efl-1.21.1-r0.apk
/pkg/efl-1.21/efl-dev-1.21.1-r0.apk
- run:
name: Compile with GCC
command: |
@@ -113,7 +113,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-20/efl-1.20.7-r0.apk
/pkg/efl-20/efl-dev-1.20.7-r0.apk
+ command: apk add /pkg/efl-1.20/efl-1.20.7-r0.apk
/pkg/efl-1.20/efl-dev-1.20.7-r0.apk
- run:
name: Compile with GCC
command: |
@@ -130,7 +130,7 @@ jobs:
key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-22/efl-1.22.2-r0.apk
/pkg/efl-22/efl-dev-1.22.2-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
- run:
name: Launch tests
command: |
--
[EGIT] [apps/terminology] master 01/01: circleci: test with efl-1.22.6
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=9b3e4168904ca1026c68a59997d96c75af663da2
commit 9b3e4168904ca1026c68a59997d96c75af663da2
Author: Boris Faure
Date: Fri Oct 4 21:30:21 2019 +0200
circleci: test with efl-1.22.6
---
.circleci/config.yml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4177232..5582439 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
- run:
name: Compile with Clang
command: |
@@ -51,7 +51,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
- run:
name: Compile with Clang
command: |
@@ -73,7 +73,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
- run:
name: Compile with GCC
environment:
@@ -130,7 +130,7 @@ jobs:
key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.5-r0.apk
/pkg/efl-1.22/efl-dev-1.22.5-r0.apk
+ command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
- run:
name: Launch tests
command: |
--
[EGIT] [apps/terminology] master 01/01: tabs: show tabs that have a bell
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=a32b9cee884cf2a44b102a0c05eee2f9f26f7933
commit a32b9cee884cf2a44b102a0c05eee2f9f26f7933
Author: Boris Faure
Date: Sat Oct 5 15:29:56 2019 +0200
tabs: show tabs that have a bell
---
ChangeLog.theme | 7 ++-
data/themes/default.edc | 13 -
src/bin/win.c | 3 ++-
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ChangeLog.theme b/ChangeLog.theme
index 7a18ef4..9b5d3d9 100644
--- a/ChangeLog.theme
+++ b/ChangeLog.theme
@@ -1,7 +1,12 @@
=
-Terminology 1.5.0
+Terminology 1.6.0
=
+Changes since 1.5.0:
+
+ * In group "terminology/tabbar_back", add signal "bell" from "terminology"
+ to mark a tab as having the bell on.
+
Changes since 1.2.0:
* Color class "BG" has to be set with the color of the background.
diff --git a/data/themes/default.edc b/data/themes/default.edc
index bd30d2e..ec3d475 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -2116,7 +2116,7 @@ collections {
}
part { name: "terminology.title"; type: TEXT; mouse_events: 0;
scale: 1;
-effect: GLOW;
+effect: OUTLINE_SOFT_SHADOW;
description { state: "default" 0.0;
text { font: "Sans:style=Bold"; size: 10;
align: 0.5 0.5;
@@ -2128,6 +2128,12 @@ collections {
rel1.to: "tab_bevel_top2";
rel2.to: "tab_bevel_top2";
}
+description { state: "bell" 0.0;
+ inherit: "default" 0.0;
+ color: 255 219 0 96;
+ color2: 255 51 0 48;
+ color3: 255 51 0 8;
+}
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
@@ -2143,6 +2149,11 @@ collections {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "tab,activate" "terminology";
}
+ program { name: "bell";
+signal: "bell"; source: "terminology";
+action: STATE_SET "bell" 0.0;
+target: "terminology.title";
+ }
}
}
diff --git a/src/bin/win.c b/src/bin/win.c
index e90b542..be771e8 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -2567,7 +2567,6 @@ _split_split(Term_Container *tc, Term_Container *child,
Term_Container *tc_split, *tc_solo_new;
Evas_Object *obj_split;
- DBG(" ");
assert (tc->type == TERM_CONTAINER_TYPE_SPLIT);
split = (Split *)tc;
wn = tc->wn;
@@ -2921,6 +2920,8 @@ _tabbar_fill(Tabs *tabs)
term->tabbar.r.tabs = eina_list_append(term->tabbar.r.tabs,
o);
elm_box_pack_end(term->tabbar.r.box, o);
}
+ if (solo->term->missed_bell)
+ edje_object_signal_emit(o, "bell", "terminology");
evas_object_data_set(o, "term", term);
evas_object_show(o);
edje_object_signal_callback_add(o, "tab,activate", "terminology",
--
Re: [E-devel] [EGIT] [apps/terminology] master 01/01: tabs: show tabs that have a bell
On 19-10-06 13:32, Carsten Haitzler wrote: > On Sat, 05 Oct 2019 06:31:18 -0700 Boris Faure said: > > You forgot some signal to clear the bell state... :) This is not needed here but will be on my next commit :) -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: splits: show missed bells when a title tab is shown
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=424ddba2c8a29aa959c440b692715dbf33c9ff52
commit 424ddba2c8a29aa959c440b692715dbf33c9ff52
Author: Boris Faure
Date: Sun Oct 6 23:36:28 2019 +0200
splits: show missed bells when a title tab is shown
---
data/themes/default.edc | 21 +
src/bin/win.c | 15 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index ec3d475..c98e91d 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -7,6 +7,12 @@ color_classes {
#include "default_colors.in.edc"
}
#endif
+#ifndef BG_COLOR_BELL_NO_ALPHA
+#define BG_COLOR_BELL_NO_ALPHA BG_COLOR_NO_ALPHA
+#endif
+#ifndef FG_COLOR_BELL_NO_ALPHA
+#define FG_COLOR_BELL_NO_ALPHA 255 153 51
+#endif
efl_version: 1 20;
@@ -1414,6 +1420,21 @@ collections {
inherit: "default" 0.0;
visible: 1;
}
+description { state: "bell" 0.0;
+ inherit: "tab" 0.0;
+ color: FG_COLOR_BELL_NO_ALPHA 255;
+ color3: BG_COLOR_BELL_NO_ALPHA 18;
+}
+ }
+ program { name: "tab,bell,on";
+signal: "tab,bell,on"; source: "terminology";
+action: STATE_SET "bell" 0.0;
+target: "tabtitle";
+ }
+ program { name: "tab,bell,off";
+signal: "tab,bell,off"; source: "terminology";
+action: STATE_SET "tab" 0.0;
+target: "tabtitle";
}
part { name: "tablimit0"; type: SPACER;
description { state: "default" 0.0;
diff --git a/src/bin/win.c b/src/bin/win.c
index be771e8..e7e3958 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -536,7 +536,8 @@ _solo_bell(Term_Container *tc,
solo = (Solo*) tc;
term = solo->term;
- term->missed_bell = EINA_TRUE;
+ if (!tc->is_focused)
+ term->missed_bell = EINA_TRUE;
if (!tc->wn->config->disable_visual_bell)
{
@@ -548,6 +549,12 @@ _solo_bell(Term_Container *tc,
elm_layout_signal_emit(term->base, "bell,ring", "terminology");
}
}
+ if ((term->missed_bell) && (term->config->show_tabs)
+ && (tc->parent->type == TERM_CONTAINER_TYPE_SPLIT))
+ {
+edje_object_signal_emit(term->bg, "tab,bell,on", "terminology");
+ }
+ edje_object_message_signal_process(term->bg);
tc->parent->bell(tc->parent, tc);
}
@@ -599,6 +606,11 @@ _solo_focus(Term_Container *tc, Term_Container *relative)
return;
term->missed_bell = EINA_FALSE;
+ if ((term->config->show_tabs)
+ && (tc->parent->type == TERM_CONTAINER_TYPE_SPLIT))
+ {
+edje_object_signal_emit(term->bg, "tab,bell,off", "terminology");
+ }
if (tc->parent != relative)
{
@@ -626,6 +638,7 @@ _solo_focus(Term_Container *tc, Term_Container *relative)
if (term->missed_bell)
term->missed_bell = EINA_FALSE;
+ edje_object_message_signal_process(term->bg);
}
static Eina_Bool
--
[EGIT] [apps/terminology] master 01/01: ChangeLog.theme: add entry about previous commit
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=e0fde8a9e225f094139b7c5f70092e6c0d2fab5b commit e0fde8a9e225f094139b7c5f70092e6c0d2fab5b Author: Boris Faure Date: Mon Oct 7 00:19:16 2019 +0200 ChangeLog.theme: add entry about previous commit --- ChangeLog.theme | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog.theme b/ChangeLog.theme index 9b5d3d9..a6acf98 100644 --- a/ChangeLog.theme +++ b/ChangeLog.theme @@ -6,6 +6,9 @@ Changes since 1.5.0: * In group "terminology/tabbar_back", add signal "bell" from "terminology" to mark a tab as having the bell on. + * In group "terminology/background", add signals "tab,bell,on" and + "tab,bell,off" from "terminology" to set bell status on tab if there is a + tab. Changes since 1.2.0: --
[EGIT] [apps/terminology] master 04/04: win: clean up popmedia code. Closes T8330
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=a9ec48191dbaf40f56dccdfa578972ddbbb18b29
commit a9ec48191dbaf40f56dccdfa578972ddbbb18b29
Author: Boris Faure
Date: Thu Oct 10 23:40:32 2019 +0200
win: clean up popmedia code. Closes T8330
Mainly add _popmedia_now() that flushes down the queue then add an
element. This is no longer the job of _popmedia_show().
Also add _popmedia_queue_free().
---
src/bin/win.c | 60 +++
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index 09c6bc4..a71c230 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -4085,6 +4085,20 @@ _cb_media_loop(void *data,
}
}
+static void
+_popmedia_queue_free(Term *term)
+{
+ struct Pop_Media *pm;
+ if (!term->popmedia_queue)
+ return;
+
+ EINA_LIST_FREE(term->popmedia_queue, pm)
+ {
+eina_stringshare_del(pm->src);
+free(pm);
+ }
+}
+
static void
_popmedia_queue_add(Term *term, const char *src,
Eina_Bool from_user_interaction)
@@ -4102,6 +4116,22 @@ _popmedia_queue_add(Term *term, const char *src,
_popmedia_queue_process(term);
}
+static void
+_popmedia_now(Term *term, const char *src,
+ Eina_Bool from_user_interaction)
+{
+ struct Pop_Media *pm;
+
+ /* Flush queue */
+ EINA_LIST_FREE(term->popmedia_queue, pm)
+ {
+eina_stringshare_del(pm->src);
+ }
+ edje_object_signal_emit(term->bg, "popmedia,off", "terminology");
+
+ _popmedia_queue_add(term, src, from_user_interaction);
+}
+
static void
_popmedia_show(Term *term, const char *src, Media_Type type)
@@ -4109,21 +4139,8 @@ _popmedia_show(Term *term, const char *src, Media_Type
type)
Evas_Object *o;
Config *config = termio_config_get(term->termio);
+ assert(!term->popmedia);
EINA_SAFETY_ON_NULL_RETURN(config);
- if (term->popmedia)
- {
-struct Pop_Media *pm;
-
-/* Flush queue */
-EINA_LIST_FREE(term->popmedia_queue, pm)
- {
- eina_stringshare_del(pm->src);
- }
-/* queue new item */
-_popmedia_queue_add(term, src, EINA_FALSE);
-edje_object_signal_emit(term->bg, "popmedia,off", "terminology");
-return;
- }
termio_mouseover_suspend_pushpop(term->termio, 1);
term->popmedia = o = media_add(win_evas_object_get(term->wn),
src, config, MEDIA_POP, type);
@@ -4268,7 +4285,7 @@ error:
#endif
static void
-_popmedia(Term *term, const char *src, Eina_Bool from_user_interaction)
+_popmedia_unknown(Term *term, const char *src, Eina_Bool from_user_interaction)
{
Media_Type type;
Config *config = termio_config_get(term->termio);
@@ -4337,7 +4354,7 @@ _popmedia_queue_process(Term *term)
term->popmedia_queue);
if (!pm)
return;
- _popmedia(term, pm->src, pm->from_user_interaction);
+ _popmedia_unknown(term, pm->src, pm->from_user_interaction);
eina_stringshare_del(pm->src);
free(pm);
}
@@ -4359,7 +4376,7 @@ _cb_popup(void *data,
}
if (!src)
return;
- _popmedia(term, src, from_user_interaction);
+ _popmedia_unknown(term, src, from_user_interaction);
if (!event)
free((void*)src);
}
@@ -5100,7 +5117,7 @@ _cb_command(void *data,
{
if (cmd[1] == 'n') // now
{
- _popmedia(term, cmd + 2, EINA_FALSE);
+ _popmedia_now(term, cmd + 2, EINA_FALSE);
}
else if (cmd[1] == 'q') // queue it to display after current one
{
@@ -5586,8 +5603,6 @@ main_config_sync(const Config *config)
static void
_term_free(Term *term)
{
- const char *s;
-
if (term->sendfile_request)
{
evas_object_del(term->sendfile_request);
@@ -5613,10 +5628,7 @@ _term_free(Term *term)
eina_stringshare_del(term->sendfile_dir);
term->sendfile_dir = NULL;
}
- EINA_LIST_FREE(term->popmedia_queue, s)
- {
-eina_stringshare_del(s);
- }
+ _popmedia_queue_free(term);
if (term->media)
{
evas_object_event_callback_del(term->media,
--
[EGIT] [apps/terminology] master 01/04: win: reorganize code to have popup media fold
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=6b8e6f05169e976aa4931a57638546a3a36a38da
commit 6b8e6f05169e976aa4931a57638546a3a36a38da
Author: Boris Faure
Date: Thu Oct 10 22:29:30 2019 +0200
win: reorganize code to have popup media fold
---
src/bin/win.c | 667 +-
1 file changed, 335 insertions(+), 332 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index e7e3958..6ff4daa 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -4016,80 +4016,11 @@ _tabs_new(Term_Container *child, Term_Container *parent)
/* }}} */
-/* {{{ Term */
-
-Eina_Bool
-term_is_visible(Term *term)
-{
- Term_Container *tc;
-
- if (!term)
- return EINA_FALSE;
-
- tc = term->container;
- if (!tc)
- return EINA_FALSE;
-
- return tc->is_visible(tc, tc);
-}
-
-void
-background_set_shine(Config *config, Evas_Object *bg)
-{
- Edje_Message_Int msg;
-
- if (config)
- msg.val = config->shine;
- else
- msg.val = 255;
-
- if (bg)
- edje_object_message_send(bg, EDJE_MESSAGE_INT, 2, &msg);
-}
-
-void
-term_apply_shine(Term *term, int shine)
-{
- Config *config = term->config;
-
- if (config->shine != shine)
- {
-config->shine = shine;
-background_set_shine(config, term->bg);
-config_save(config);
- }
-}
-
-
-static void
-_set_trans(Config *config, Evas_Object *bg, Evas_Object *base)
-{
- Edje_Message_Int msg;
-
- if (config && config->translucent)
- msg.val = config->opacity;
- else
- msg.val = 100;
-
- if (bg)
- edje_object_message_send(bg, EDJE_MESSAGE_INT, 1, &msg);
- if (base) {
- Evas_Object *edje = elm_layout_edje_get(base);
- edje_object_message_send(edje, EDJE_MESSAGE_INT, 1, &msg);
- }
-}
-
-static void
-_term_config_set(Term *term, Config *config)
-{
- Config *old_config = term->config;
-
- term->config = config;
- termio_config_set(term->termio, config);
- _term_media_update(term, term->config);
- if (old_config != term->wn->config)
- config_del(old_config);
-}
+/* {{{ Popup Media */
+struct Pop_Media {
+ const char *src;
+ Eina_Bool from_user_interaction;
+};
Eina_Bool
term_has_popmedia(const Term *term)
@@ -4104,181 +4035,6 @@ term_popmedia_close(Term *term)
edje_object_signal_emit(term->bg, "popmedia,off", "terminology");
}
-
-Eina_Bool
-term_is_focused(Term *term)
-{
- Term_Container *tc;
-
- if (!term)
- return EINA_FALSE;
-
- tc = term->container;
- if (!tc)
- return EINA_FALSE;
-
- DBG("tc:%p tc->is_focused:%d", tc, tc->is_focused);
- return tc->is_focused;
-}
-
-void change_theme(Evas_Object *win, Config *config)
-{
- const Eina_List *terms, *l;
- Term *term;
-
- terms = terms_from_win_object(win);
- if (!terms) return;
-
- EINA_LIST_FOREACH(terms, l, term)
- {
-Evas_Object *edje = term->bg;
-
-if (!theme_apply(edje, config, "terminology/background"))
- ERR("Couldn't find terminology theme!");
-colors_term_init(termio_textgrid_get(term->termio), edje, config);
-termio_config_set(term->termio, config);
- }
-
- l = elm_theme_overlay_list_get(NULL);
- if (l) l = eina_list_last(l);
- if (l) elm_theme_overlay_del(NULL, l->data);
- elm_theme_overlay_add(NULL, config_theme_path_get(config));
- main_trans_update(config);
-}
-
-void
-term_focus(Term *term)
-{
- Term_Container *tc;
-
- DBG("is focused? tc:%p", term->container);
- if (term_is_focused(term))
- return;
-
- tc = term->container;
- DBG("tc:%p", tc);
- tc->focus(tc, tc);
-}
-
-void
-term_unfocus(Term *term)
-{
- Term_Container *tc;
-
- DBG("is focused? tc:%p", term->container);
- if (!term_is_focused(term))
- return;
-
- tc = term->container;
- DBG("tc:%p", tc);
- tc->unfocus(tc, tc);
-}
-
-enum term_to_direction {
- TERM_TO_PREV,
- TERM_TO_NEXT,
- TERM_TO_UP,
- TERM_TO_DOWN,
- TERM_TO_LEFT,
- TERM_TO_RIGHT,
-};
-
-static void
-term_go_to(Term *from, enum term_to_direction dir)
-{
- Term *new_term, *focused_term;
- Win *wn = from->wn;
- Term_Container *tc;
-
- tc = (Term_Container *) wn;
-
- focused_term = tc->focused_term_get(tc);
- if (!focused_term)
- focused_term = from;
- tc = focused_term->container;
-
- switch (dir)
- {
- case TERM_TO_PREV:
- new_term = tc->term_prev(tc, tc);
- break;
- case TERM_TO_NEXT:
- new_term = tc->term_next(tc, tc);
- break;
- case TERM_TO_UP:
- new_term = tc->term_up(tc, tc);
- break;
- case TERM_TO_DOWN:
- new_term = tc->term_down(tc, tc);
- break;
- case TERM_TO_LEFT:
- new_term =
[EGIT] [apps/terminology] master 02/04: win: no longer segfaults from typop with multiple files
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=80124a72ca2d71c31ee5b9c0b446881fd8e40131
commit 80124a72ca2d71c31ee5b9c0b446881fd8e40131
Author: Boris Faure
Date: Thu Oct 10 22:55:21 2019 +0200
win: no longer segfaults from typop with multiple files
---
src/bin/win.c | 49 -
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index 6ff4daa..09c6bc4 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -4085,6 +4085,24 @@ _cb_media_loop(void *data,
}
}
+static void
+_popmedia_queue_add(Term *term, const char *src,
+Eina_Bool from_user_interaction)
+{
+ struct Pop_Media *pm = calloc(1, sizeof(struct Pop_Media));
+
+ if (!pm)
+ return;
+
+ pm->src = eina_stringshare_add(src);
+ pm->from_user_interaction = from_user_interaction;
+
+ term->popmedia_queue = eina_list_append(term->popmedia_queue, pm);
+ if (!term->popmedia)
+ _popmedia_queue_process(term);
+}
+
+
static void
_popmedia_show(Term *term, const char *src, Media_Type type)
{
@@ -4094,14 +4112,15 @@ _popmedia_show(Term *term, const char *src, Media_Type
type)
EINA_SAFETY_ON_NULL_RETURN(config);
if (term->popmedia)
{
-const char *s;
+struct Pop_Media *pm;
-EINA_LIST_FREE(term->popmedia_queue, s)
+/* Flush queue */
+EINA_LIST_FREE(term->popmedia_queue, pm)
{
- eina_stringshare_del(s);
+ eina_stringshare_del(pm->src);
}
-term->popmedia_queue = eina_list_append(term->popmedia_queue,
-eina_stringshare_add(src));
+/* queue new item */
+_popmedia_queue_add(term, src, EINA_FALSE);
edje_object_signal_emit(term->bg, "popmedia,off", "terminology");
return;
}
@@ -4162,7 +4181,6 @@ _ty_http_head_delete(Ty_Http_Head *ty_head)
free(ty_head);
}
-
static Eina_Bool
_media_http_head_timeout(void *data)
{
@@ -4307,8 +4325,6 @@ error:
}
}
-
-
static void
_popmedia_queue_process(Term *term)
{
@@ -4326,23 +4342,6 @@ _popmedia_queue_process(Term *term)
free(pm);
}
-static void
-_popmedia_queue_add(Term *term, const char *src,
-Eina_Bool from_user_interaction)
-{
- struct Pop_Media *pm = calloc(1, sizeof(struct Pop_Media));
-
- if (!pm)
- return;
-
- pm->src = eina_stringshare_add(src);
- pm->from_user_interaction = from_user_interaction;
-
- term->popmedia_queue = eina_list_append(term->popmedia_queue, pm);
- if (!term->popmedia)
- _popmedia_queue_process(term);
-}
-
static void
_cb_popup(void *data,
Evas_Object *_obj EINA_UNUSED,
--
[EGIT] [apps/terminology] master 03/04: typop: with many args, pop first then queue the others
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=4b24157e2bb7d02d7fab5f63904cafb25efa756f
commit 4b24157e2bb7d02d7fab5f63904cafb25efa756f
Author: Boris Faure
Date: Thu Oct 10 23:37:51 2019 +0200
typop: with many args, pop first then queue the others
---
src/bin/typop.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/typop.c b/src/bin/typop.c
index 13fe262..8a9e159 100644
--- a/src/bin/typop.c
+++ b/src/bin/typop.c
@@ -37,7 +37,8 @@ main(int argc, char **argv)
path = argv[i];
if (realpath(path, buf)) path = buf;
-snprintf(tbuf, sizeof(tbuf), "%c}pn%s", 0x1b, path);
+snprintf(tbuf, sizeof(tbuf), "%c}p%c%s", 0x1b,
+ (i == 1) ? 'n': 'q', path);
if (write(1, tbuf, strlen(tbuf) + 1) != (signed)(strlen(tbuf) + 1))
perror("write");
}
return 0;
--
[EGIT] [apps/terminology] master 01/01: main: better handle stalled unix socket used to spawn multiple instances
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=fb2c8deb7464560cc8c65ba7b45c13eca4b63477
commit fb2c8deb7464560cc8c65ba7b45c13eca4b63477
Author: Boris Faure
Date: Sun Oct 13 17:58:25 2019 +0200
main: better handle stalled unix socket used to spawn multiple instances
Have a 2-seconds waiter and if we couldn't create a new instance, unlink
the unix socket and restart Terminology.
---
src/bin/ipc.c | 21 +-
src/bin/ipc.h | 44 ++--
src/bin/main.c | 620 -
3 files changed, 397 insertions(+), 288 deletions(-)
diff --git a/src/bin/ipc.c b/src/bin/ipc.c
index c9b9ee7..83b265c 100644
--- a/src/bin/ipc.c
+++ b/src/bin/ipc.c
@@ -1,6 +1,7 @@
#include "private.h"
#include
+#include
#include
#include
#include "ipc.h"
@@ -171,6 +172,19 @@ ipc_instance_new_func_set(void (*func) (Ipc_Instance
*inst))
func_new_inst = func;
}
+void
+ipc_instance_conn_free(void)
+{
+ char *hash = _ipc_hash_get();
+ char *address = ecore_con_local_path_new(EINA_FALSE,
+hash,
+0);
+ errno = 0;
+ unlink(address);
+ ERR("unlinking: '%s': %s", address, strerror(errno));
+ free(address);
+}
+
Eina_Bool
ipc_instance_add(Ipc_Instance *inst)
{
@@ -178,7 +192,7 @@ ipc_instance_add(Ipc_Instance *inst)
void *data;
char *hash = _ipc_hash_get();
Ecore_Ipc_Server *ipcsrv;
-
+
if (!hash) return EINA_FALSE;
data = eet_data_descriptor_encode(new_inst_edd, inst, &size);
if (!data)
@@ -186,6 +200,7 @@ ipc_instance_add(Ipc_Instance *inst)
free(hash);
return EINA_FALSE;
}
+
ipcsrv = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, hash, 0, NULL);
if (ipcsrv)
{
@@ -196,6 +211,10 @@ ipc_instance_add(Ipc_Instance *inst)
ecore_ipc_server_del(ipcsrv);
return EINA_TRUE;
}
+ else
+ {
+DBG("connect failed");
+ }
free(data);
free(hash);
return EINA_FALSE;
diff --git a/src/bin/ipc.h b/src/bin/ipc.h
index 4ade907..419f389 100644
--- a/src/bin/ipc.h
+++ b/src/bin/ipc.h
@@ -7,28 +7,29 @@ typedef struct _Ipc_Instance Ipc_Instance;
struct _Ipc_Instance
{
- const char *cmd;
- const char *cd;
- const char *background;
- const char *name;
- const char *role;
- const char *title;
- const char *icon_name;
- const char *font;
- const char *startup_id;
- const char *startup_split;
+ char *cmd;
+ char *cd;
+ char *background;
+ char *name;
+ char *role;
+ char *title;
+ char *icon_name;
+ char *font;
+ char *startup_id;
+ char *startup_split;
int x, y, w, h;
- int pos;
- int login_shell;
- int fullscreen;
- int iconic;
- int borderless;
- int override;
- int maximized;
- int hold;
- int nowm;
- int xterm_256color;
- int active_links;
+ Eina_Bool pos;
+ Eina_Bool login_shell;
+ Eina_Bool fullscreen;
+ Eina_Bool iconic;
+ Eina_Bool borderless;
+ Eina_Bool override;
+ Eina_Bool maximized;
+ Eina_Bool hold;
+ Eina_Bool nowm;
+ Eina_Bool xterm_256color;
+ Eina_Bool active_links;
+ Config *config;
};
void ipc_init(void);
@@ -36,5 +37,6 @@ void ipc_shutdown(void);
Eina_Bool ipc_serve(void);
void ipc_instance_new_func_set(void (*func) (Ipc_Instance *inst));
Eina_Bool ipc_instance_add(Ipc_Instance *inst);
+void ipc_instance_conn_free(void);
#endif
diff --git a/src/bin/main.c b/src/bin/main.c
index b50dbbe..57e5454 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -468,65 +468,279 @@ _log_void(const Eina_Log_Domain *_d EINA_UNUSED,
}
#endif
+static void
+_start(Ipc_Instance *instance)
+{
+ Win *wn;
+ Evas_Object *win;
+ Term *term;
+ Config *config;
+
+ wn = win_new(instance->name, instance->role, instance->title,
+instance->icon_name, instance->config,
+instance->fullscreen, instance->iconic, instance->borderless,
+instance->override, instance->maximized);
+ // set an env so terminal apps can detect they are in terminology :)
+ putenv("TERMINOLOGY=1");
+ unsetenv("DESKTOP_STARTUP_ID");
+
+ config_del(instance->config);
+ config = NULL;
+ if (!wn)
+ {
+CRITICAL(_("Could not create window."));
+goto exit;
+ }
+
+ config = win_config_get(wn);
+
+ term = term_new(wn, config, instance->cmd, instance->login_shell,
+ instance->cd,
+ instance->w, instance->h, instance->hold, instance->title);
+ if (!term)
+ {
+CRITICAL(_("Could not create terminal widget."));
+config = NULL;
+goto exit;
+ }
+
+ if (win_term_set(wn, term) < 0)
+ {
+goto exit;
+ }
+
+ main_trans_update(conf
[EGIT] [apps/terminology] master 01/01: Revert "main: better handle stalled unix socket used to spawn multiple instances"
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=e716ad5812194f33d8dc8e1269d6e76149b11431
commit e716ad5812194f33d8dc8e1269d6e76149b11431
Author: Boris Faure
Date: Sun Oct 13 18:39:58 2019 +0200
Revert "main: better handle stalled unix socket used to spawn multiple
instances"
This is not stable enough.
This reverts commit fb2c8deb7464560cc8c65ba7b45c13eca4b63477.
---
src/bin/ipc.c | 21 +-
src/bin/ipc.h | 44 ++--
src/bin/main.c | 620 +
3 files changed, 288 insertions(+), 397 deletions(-)
diff --git a/src/bin/ipc.c b/src/bin/ipc.c
index 83b265c..c9b9ee7 100644
--- a/src/bin/ipc.c
+++ b/src/bin/ipc.c
@@ -1,7 +1,6 @@
#include "private.h"
#include
-#include
#include
#include
#include "ipc.h"
@@ -172,19 +171,6 @@ ipc_instance_new_func_set(void (*func) (Ipc_Instance
*inst))
func_new_inst = func;
}
-void
-ipc_instance_conn_free(void)
-{
- char *hash = _ipc_hash_get();
- char *address = ecore_con_local_path_new(EINA_FALSE,
-hash,
-0);
- errno = 0;
- unlink(address);
- ERR("unlinking: '%s': %s", address, strerror(errno));
- free(address);
-}
-
Eina_Bool
ipc_instance_add(Ipc_Instance *inst)
{
@@ -192,7 +178,7 @@ ipc_instance_add(Ipc_Instance *inst)
void *data;
char *hash = _ipc_hash_get();
Ecore_Ipc_Server *ipcsrv;
-
+
if (!hash) return EINA_FALSE;
data = eet_data_descriptor_encode(new_inst_edd, inst, &size);
if (!data)
@@ -200,7 +186,6 @@ ipc_instance_add(Ipc_Instance *inst)
free(hash);
return EINA_FALSE;
}
-
ipcsrv = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, hash, 0, NULL);
if (ipcsrv)
{
@@ -211,10 +196,6 @@ ipc_instance_add(Ipc_Instance *inst)
ecore_ipc_server_del(ipcsrv);
return EINA_TRUE;
}
- else
- {
-DBG("connect failed");
- }
free(data);
free(hash);
return EINA_FALSE;
diff --git a/src/bin/ipc.h b/src/bin/ipc.h
index 419f389..4ade907 100644
--- a/src/bin/ipc.h
+++ b/src/bin/ipc.h
@@ -7,29 +7,28 @@ typedef struct _Ipc_Instance Ipc_Instance;
struct _Ipc_Instance
{
- char *cmd;
- char *cd;
- char *background;
- char *name;
- char *role;
- char *title;
- char *icon_name;
- char *font;
- char *startup_id;
- char *startup_split;
+ const char *cmd;
+ const char *cd;
+ const char *background;
+ const char *name;
+ const char *role;
+ const char *title;
+ const char *icon_name;
+ const char *font;
+ const char *startup_id;
+ const char *startup_split;
int x, y, w, h;
- Eina_Bool pos;
- Eina_Bool login_shell;
- Eina_Bool fullscreen;
- Eina_Bool iconic;
- Eina_Bool borderless;
- Eina_Bool override;
- Eina_Bool maximized;
- Eina_Bool hold;
- Eina_Bool nowm;
- Eina_Bool xterm_256color;
- Eina_Bool active_links;
- Config *config;
+ int pos;
+ int login_shell;
+ int fullscreen;
+ int iconic;
+ int borderless;
+ int override;
+ int maximized;
+ int hold;
+ int nowm;
+ int xterm_256color;
+ int active_links;
};
void ipc_init(void);
@@ -37,6 +36,5 @@ void ipc_shutdown(void);
Eina_Bool ipc_serve(void);
void ipc_instance_new_func_set(void (*func) (Ipc_Instance *inst));
Eina_Bool ipc_instance_add(Ipc_Instance *inst);
-void ipc_instance_conn_free(void);
#endif
diff --git a/src/bin/main.c b/src/bin/main.c
index 57e5454..b50dbbe 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -468,279 +468,65 @@ _log_void(const Eina_Log_Domain *_d EINA_UNUSED,
}
#endif
-static void
-_start(Ipc_Instance *instance)
-{
- Win *wn;
- Evas_Object *win;
- Term *term;
- Config *config;
-
- wn = win_new(instance->name, instance->role, instance->title,
-instance->icon_name, instance->config,
-instance->fullscreen, instance->iconic, instance->borderless,
-instance->override, instance->maximized);
- // set an env so terminal apps can detect they are in terminology :)
- putenv("TERMINOLOGY=1");
- unsetenv("DESKTOP_STARTUP_ID");
-
- config_del(instance->config);
- config = NULL;
- if (!wn)
- {
-CRITICAL(_("Could not create window."));
-goto exit;
- }
-
- config = win_config_get(wn);
-
- term = term_new(wn, config, instance->cmd, instance->login_shell,
- instance->cd,
- instance->w, instance->h, instance->hold, instance->title);
- if (!term)
- {
-CRITICAL(_("Could not create terminal widget."));
-config = NULL;
-goto exit;
- }
-
- if (win_term_set(wn, term) < 0)
- {
-goto exit;
- }
-
- main_trans_update
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=bb6d54014528d423bce2a2a8e90fc2e73cbbfd26 commit bb6d54014528d423bce2a2a8e90fc2e73cbbfd26 Merge: e716ad5 96095b5 Author: Boris Faure Date: Mon Oct 14 21:55:53 2019 +0200 Merge branch 'terminology-1.5' src/bin/win.c | 4 1 file changed, 4 insertions(+) --
[EGIT] [apps/terminology] terminology-1.5 01/01: win: remove hide_cursor_timer when closing a window
billiob pushed a commit to branch terminology-1.5.
http://git.enlightenment.org/apps/terminology.git/commit/?id=96095b5b9d6b90b20a1f2944ed56aff7d895364a
commit 96095b5b9d6b90b20a1f2944ed56aff7d895364a
Author: Boris Faure
Date: Mon Oct 14 21:54:47 2019 +0200
win: remove hide_cursor_timer when closing a window
@fix
---
src/bin/win.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/bin/win.c b/src/bin/win.c
index c4c8be9..a021351 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -774,6 +774,10 @@ win_free(Win *wn)
(wn->khdl.imf, ECORE_IMF_CALLBACK_COMMIT, _imf_event_commit_cb);
ecore_imf_context_del(wn->khdl.imf);
}
+ if (wn->hide_cursor_timer)
+ {
+ecore_timer_del(wn->hide_cursor_timer);
+ }
ecore_imf_shutdown();
free(wn);
}
--
[EGIT] [apps/terminology] master 01/01: circleci: use new packages path
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=233004c03a12dd4c509d58013067028e7c0486e0
commit 233004c03a12dd4c509d58013067028e7c0486e0
Author: Boris Faure
Date: Mon Oct 14 23:27:11 2019 +0200
circleci: use new packages path
---
.circleci/config.yml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5582439..e6a6ab0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
+ command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
- run:
name: Compile with Clang
command: |
@@ -51,7 +51,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
+ command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
- run:
name: Compile with Clang
command: |
@@ -73,7 +73,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
+ command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
- run:
name: Compile with GCC
environment:
@@ -130,7 +130,7 @@ jobs:
key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22/efl-1.22.6-r0.apk
/pkg/efl-1.22/efl-dev-1.22.6-r0.apk
+ command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
- run:
name: Launch tests
command: |
--
[EGIT] [apps/terminology] master 01/01: circleci: elf-1.2{0, 1} packages have moved
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=951b415cd99838066a45ebd44c5cfa28828294e2
commit 951b415cd99838066a45ebd44c5cfa28828294e2
Author: Boris Faure
Date: Tue Oct 15 10:06:12 2019 +0200
circleci: elf-1.2{0,1} packages have moved
---
.circleci/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6a6ab0..74174e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,7 +96,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.21/efl-1.21.1-r0.apk
/pkg/efl-1.21/efl-dev-1.21.1-r0.apk
+ command: apk add /pkg/efl-1.21.1-r0.apk /pkg/efl-dev-1.21.1-r0.apk
- run:
name: Compile with GCC
command: |
@@ -113,7 +113,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.20/efl-1.20.7-r0.apk
/pkg/efl-1.20/efl-dev-1.20.7-r0.apk
+ command: apk add /pkg/efl-1.20.7-r0.apk /pkg/efl-dev-1.20.7-r0.apk
- run:
name: Compile with GCC
command: |
--
[EGIT] [apps/terminology] terminology-1.5 01/01: options_font: fix use after free
billiob pushed a commit to branch terminology-1.5.
http://git.enlightenment.org/apps/terminology.git/commit/?id=fd2212afd8d98c39ff8ad25d86c7209a2a5f
commit fd2212afd8d98c39ff8ad25d86c7209a2a5f
Author: Boris Faure
Date: Thu Oct 17 00:02:38 2019 +0200
options_font: fix use after free
---
src/bin/options_font.c | 50 --
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/bin/options_font.c b/src/bin/options_font.c
index 407694a..f9f54ce 100644
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@ -16,10 +16,13 @@
typedef struct _Font_Ctx
{
+ Evas_Object *fr;
+ Evas_Object *opbox;
Evas_Object *op_fontslider;
Evas_Object *op_fontlist;
Evas_Object *op_fsml;
Evas_Object *op_fbig;
+ Evas_Object *cx;
Evas_Object *term;
Eina_List *fonts;
Eina_Hash *fonthash;
@@ -358,14 +361,16 @@ _cb_term_resize(void *data,
}
static void
-_cb_font_del(void *data,
- Evas *_e EINA_UNUSED,
- Evas_Object *_obj EINA_UNUSED,
- void *_event EINA_UNUSED)
+_cb_font_bolditalic(void *data,
+Evas_Object *obj,
+void *_event EINA_UNUSED)
{
Font_Ctx *ctx = data;
- evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE,
- _cb_term_resize, ctx);
+ Config *config = ctx->config;
+
+ config->font.bolditalic = elm_check_state_get(obj);
+ termio_config_update(ctx->term);
+ config_save(config, NULL);
}
static void
@@ -385,26 +390,20 @@ _parent_del_cb(void *data,
}
eina_hash_free(ctx->fonthash);
- free(ctx);
-}
-
-static void
-_cb_font_bolditalic(void *data,
-Evas_Object *obj,
-void *_event EINA_UNUSED)
-{
- Font_Ctx *ctx = data;
- Config *config = ctx->config;
+ evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE,
+ _cb_term_resize, ctx);
+ evas_object_smart_callback_del_full(ctx->cx, "changed",
+ _cb_font_bolditalic, ctx);
+ evas_object_smart_callback_del_full(ctx->op_fontslider, "delay,changed",
+ _cb_op_fontsize_sel, ctx);
- config->font.bolditalic = elm_check_state_get(obj);
- termio_config_update(ctx->term);
- config_save(config, NULL);
+ free(ctx);
}
void
options_font(Evas_Object *opbox, Evas_Object *term)
{
- Evas_Object *o, *bx, *fr, *bx0;
+ Evas_Object *o, *bx, *bx0;
char buf[4096], *file, *fname;
Eina_List *files, *fontlist, *l;
Font *f;
@@ -418,21 +417,22 @@ options_font(Evas_Object *opbox, Evas_Object *term)
ctx->config = config;
ctx->term = term;
+ ctx->opbox = opbox;
- fr = o = elm_frame_add(opbox);
+ ctx->fr = o = elm_frame_add(opbox);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o, _("Font"));
elm_box_pack_end(opbox, o);
evas_object_show(o);
- evas_object_event_callback_add(fr, EVAS_CALLBACK_DEL,
+ evas_object_event_callback_add(ctx->fr, EVAS_CALLBACK_DEL,
_parent_del_cb, ctx);
bx0 = o = elm_box_add(opbox);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_content_set(fr, o);
+ elm_object_content_set(ctx->fr, o);
evas_object_show(o);
bx = o = elm_box_add(opbox);
@@ -588,7 +588,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
evas_object_size_hint_align_set(opbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(o);
- o = elm_check_add(bx0);
+ ctx->cx = o = elm_check_add(bx0);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
elm_object_text_set(o, _("Display bold and italic in the terminal"));
@@ -602,6 +602,4 @@ options_font(Evas_Object *opbox, Evas_Object *term)
evas_object_geometry_get(term, NULL, NULL, &ctx->tsize_w, &ctx->tsize_h);
evas_object_event_callback_add(term, EVAS_CALLBACK_RESIZE,
_cb_term_resize, ctx);
- evas_object_event_callback_add(opbox, EVAS_CALLBACK_DEL,
- _cb_font_del, ctx);
}
--
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=688a45dc150e295a084b86d17d59dcd30ca54205
commit 688a45dc150e295a084b86d17d59dcd30ca54205
Merge: 951b415 fd2212a
Author: Boris Faure
Date: Thu Oct 17 00:11:13 2019 +0200
Merge branch 'terminology-1.5'
Conflicts:
src/bin/options_font.c
src/bin/options_font.c | 50 --
1 file changed, 24 insertions(+), 26 deletions(-)
diff --cc src/bin/options_font.c
index d90e7e9,f9f54ce..3945f6e
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@@ -358,14 -361,16 +361,16 @@@ _cb_term_resize(void *data
}
static void
- _cb_font_del(void *data,
- Evas *_e EINA_UNUSED,
- Evas_Object *_obj EINA_UNUSED,
- void *_event EINA_UNUSED)
+ _cb_font_bolditalic(void *data,
+ Evas_Object *obj,
+ void *_event EINA_UNUSED)
{
Font_Ctx *ctx = data;
-evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE,
-_cb_term_resize, ctx);
+Config *config = ctx->config;
+
+config->font.bolditalic = elm_check_state_get(obj);
+termio_config_update(ctx->term);
- config_save(config, NULL);
++ config_save(config);
}
static void
--
[EGIT] [apps/terminology] master 01/01: circleci: test with efl-1.23.1 and rework file
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=8dcfc51f1e283c6fa6f58ca2bc0de2659c747688
commit 8dcfc51f1e283c6fa6f58ca2bc0de2659c747688
Author: Boris Faure
Date: Thu Oct 17 22:41:03 2019 +0200
circleci: test with efl-1.23.1 and rework file
---
.circleci/config.yml | 121 ++-
1 file changed, 80 insertions(+), 41 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74174e0..d61ea66 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,52 +20,41 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
paths:
- /terminology
-
- build_full_clang_efl-1.22:
+ build_minimal_gcc_efl-1.20:
docker:
- image: borisfaure/terminology-ci:latest
-environment:
- - CC: clang
steps:
- restore_cache:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
+ command: apk add /pkg/efl-1.20.7-r0.apk /pkg/efl-dev-1.20.7-r0.apk
- run:
- name: Compile with Clang
+ name: Compile with GCC
command: |
cd /terminology
-meson -Dtests=true -Dfuzzing=true . build
+meson . build
meson configure build
cd build
ninja -j4
- build_and_test_clang_ubsan_efl-1.22:
+ build_minimal_gcc_efl-1.21:
docker:
- image: borisfaure/terminology-ci:latest
-environment:
- - CC: clang
- - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=undefined
-fno-sanitize-recover=undefined
steps:
- restore_cache:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
+ command: apk add /pkg/efl-1.21.1-r0.apk /pkg/efl-dev-1.21.1-r0.apk
- run:
- name: Compile with Clang
+ name: Compile with GCC
command: |
cd /terminology
-meson -Dtests=true . build
+meson . build
meson configure build
cd build
ninja -j4
- - run:
- name: Launch tests
- command: |
-cd /terminology
-tests/run_tests.sh -v -t build/src/bin/tytest -r
tests/tests.results -d tests/
- build_full_gcc_efl-1.22:
+ build_minimal_gcc_efl-1.22:
docker:
- image: borisfaure/terminology-ci:latest
steps:
@@ -76,19 +65,13 @@ jobs:
command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
- run:
name: Compile with GCC
- environment:
-CFLAGS: -O0 -g
command: |
cd /terminology
-meson -Dtests=true -Dfuzzing=true -Db_coverage=true . build
+meson . build
meson configure build
cd build
ninja -j4
- - save_cache:
- key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
- paths:
-- /terminology
- build_minimal_gcc_efl-1.21:
+ build_minimal_gcc_efl-1.23:
docker:
- image: borisfaure/terminology-ci:latest
steps:
@@ -96,7 +79,7 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.21.1-r0.apk /pkg/efl-dev-1.21.1-r0.apk
+ command: apk add /pkg/efl-1.23.1-r0.apk /pkg/efl-dev-1.23.1-r0.apk
- run:
name: Compile with GCC
command: |
@@ -105,7 +88,7 @@ jobs:
meson configure build
cd build
ninja -j4
- build_minimal_gcc_efl-1.20:
+ build_full_gcc_efl_latest:
docker:
- image: borisfaure/terminology-ci:latest
steps:
@@ -113,24 +96,30 @@ jobs:
key: checkout-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install EFL
- command: apk add /pkg/efl-1.20.7-r0.apk /pkg/efl-dev-1.20.7-r0.apk
+ command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
- run:
name: Compile with GCC
+ environment:
+CFLAGS: -O0 -g
command: |
cd /terminology
-meson . build
+meson -Dtests=true -Dfuzzing=true -Db_coverage=true . build
meson configure build
cd build
ninja -j4
- tests_gcc:
+ - save_cache:
+ key: build_full_gcc_efl_latest-{{ .Environment.CIRCLE_SHA1 }}
+ paths:
+- /terminology
+ tests_gcc_efl_latest:
docker:
- image: borisfaure/terminology-ci:latest
steps:
- restore_cache:
- key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
+ key: build_full_gcc_efl_latest-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Install
[E-devel] git.enlightenment.org
Did anyone changed something on the server? It seems that I can't push anymore as it's asking for a password on g...@git.enlightenment.org and not using my key. -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/02: main: change prototype for main_new()
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c130c6f683ae1a552f6411813937e9dbcb824124
commit c130c6f683ae1a552f6411813937e9dbcb824124
Author: Boris Faure
Date: Sat Oct 26 18:13:25 2019 +0200
main: change prototype for main_new()
---
src/bin/controls.c | 2 +-
src/bin/main.h | 2 +-
src/bin/win.c | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/controls.c b/src/bin/controls.c
index 279fea3..255eb6b 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -101,7 +101,7 @@ _cb_ct_new(void *data,
void *_event EINA_UNUSED)
{
Controls_Ctx *ctx = data;
- main_new(ctx->win, ctx->term);
+ main_new(ctx->term);
}
static void
diff --git a/src/bin/main.h b/src/bin/main.h
index 1a961d4..e870b32 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -4,7 +4,7 @@
#include "config.h"
Config * main_config_get(void);
-void main_new(Evas_Object *win, Evas_Object *term);
+void main_new(Evas_Object *term);
void main_new_with_dir(Evas_Object *win, Evas_Object *term, const char *wdir);
void main_split_h(Evas_Object *win, Evas_Object *term, const char *cmd);
void main_split_v(Evas_Object *win, Evas_Object *term, const char *cmd);
diff --git a/src/bin/win.c b/src/bin/win.c
index 05fdd34..387331b 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -3668,8 +3668,7 @@ _cb_close(void *data,
}
void
-main_new(Evas_Object *_win EINA_UNUSED,
- Evas_Object *term)
+main_new(Evas_Object *term)
{
Term *tm;
--
[EGIT] [apps/terminology] master 02/02: default.edc: move tab selector on the tab line
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=1195c022f35306808f81ce5abc3bde949a82d5ec
commit 1195c022f35306808f81ce5abc3bde949a82d5ec
Author: Boris Faure
Date: Sat Oct 26 18:18:03 2019 +0200
default.edc: move tab selector on the tab line
---
ChangeLog.theme | 5 +
data/themes/default.edc | 250 ++--
data/themes/mild.edc| 14 ++-
src/bin/win.c | 119 ---
4 files changed, 323 insertions(+), 65 deletions(-)
diff --git a/ChangeLog.theme b/ChangeLog.theme
index a6acf98..2b2ba8d 100644
--- a/ChangeLog.theme
+++ b/ChangeLog.theme
@@ -9,6 +9,11 @@ Changes since 1.5.0:
* In group "terminology/background", add signals "tab,bell,on" and
"tab,bell,off" from "terminology" to set bell status on tab if there is a
tab.
+ * In group "terminology/background", change signals "tabcount,go",
+ "tabcount,prev", "tabcount,next" to "tab,go", "tab,prev" and "tab,next"
+ respectively.
+ * In group "terminology/background", add signal "tab,new" from "terminology"
+ to create a new tab.
Changes since 1.2.0:
diff --git a/data/themes/default.edc b/data/themes/default.edc
index c98e91d..a7c4226 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -629,15 +629,19 @@ collections {
}
program {
signal: "mouse,clicked,1"; source: "tabcount_ev";
-action: SIGNAL_EMIT "tabcount,go" "terminology";
+action: SIGNAL_EMIT "tab,go" "terminology";
+ }
+ program {
+signal: "mouse,clicked,3"; source: "tabcount_ev";
+action: SIGNAL_EMIT "tab,new" "terminology";
}
program {
signal: "mouse,wheel,0,1"; source: "tabcount_ev";
-action: SIGNAL_EMIT "tabcount,prev" "terminology";
+action: SIGNAL_EMIT "tab,prev" "terminology";
}
program {
signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
-action: SIGNAL_EMIT "tabcount,next" "terminology";
+action: SIGNAL_EMIT "tab,next" "terminology";
}
program {
signal: "tabcount,off"; source: "terminology";
@@ -1332,6 +1336,233 @@ collections {
target: "tabtitle";
target: "tabclose";
}
+ program {
+signal: "tab_btn,on"; source: "terminology";
+action: STATE_SET "on" 0.0;
+target: "tab_btn_clip";
+target: "terminology.tab_btn";
+ }
+ program {
+signal: "tab_btn,off"; source: "terminology";
+action: STATE_SET "default" 0.0;
+target: "tab_btn_clip";
+target: "terminology.tab_btn";
+ }
+ part { name: "tab_btn_clip"; type: RECT;
+description { state: "default" 0.0;
+ color: 255 255 255 0;
+ visible: 0;
+}
+description { state: "on" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+}
+ }
+ part { name: "tab_btn_glow_r0";
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "tab_btn_r0";
+ rel2.to: "tab_btn_r0";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ image {
+ normal: "cr_glow.png";
+ border: 9 9 9 9;
+ }
+ color: 51 153 255 32;
+}
+description { state: "over" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+}
+ }
+ part { name: "tab_btn_glow_r1";
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "tab_btn_r1";
+ rel2.to: "tab_btn_r1";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ image {
+ normal: "cr_glow.png";
+ border: 9 9 9 9;
+ }
+ color: 51 153 255 32;
+}
+descri
[EGIT] [apps/terminology] master 01/01: default.edc: it's way better with some background!
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=2ff19839816b3187ef539d748958861974e7467d
commit 2ff19839816b3187ef539d748958861974e7467d
Author: Boris Faure
Date: Sat Oct 26 19:02:13 2019 +0200
default.edc: it's way better with some background!
---
data/themes/default.edc | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index a7c4226..af1f8e9 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1340,12 +1340,14 @@ collections {
signal: "tab_btn,on"; source: "terminology";
action: STATE_SET "on" 0.0;
target: "tab_btn_clip";
+target: "tab_btn_bg";
target: "terminology.tab_btn";
}
program {
signal: "tab_btn,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "tab_btn_clip";
+target: "tab_btn_bg";
target: "terminology.tab_btn";
}
part { name: "tab_btn_clip"; type: RECT;
@@ -1359,6 +1361,24 @@ collections {
color: 255 255 255 255;
}
}
+ part { name: "tab_btn_bg";
+mouse_events: 0;
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "terminology.tab_btn";
+ rel2.to: "terminology.tab_btn";
+ image.normal: "tab_bg_r0.png";
+ image.border: 0 2 4 4;
+ fill.smooth: 0;
+ visible: 0;
+ fixed: 1 1;
+}
+description { state: "on" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+}
+ }
part { name: "tab_btn_glow_r0";
clip_to: "tab_btn_clip";
description { state: "default" 0.0;
@@ -1694,7 +1714,6 @@ collections {
visible: 1;
}
}
- /*TODO boris */
part { name: "tabright"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
--
[EGIT] [apps/terminology] master 01/01: mild: also add tab selector on tab line
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=bd9bdaeaeaad6ba7d5d95c7f063620dc03aa1fee
commit bd9bdaeaeaad6ba7d5d95c7f063620dc03aa1fee
Author: Boris Faure
Date: Sat Oct 26 21:35:59 2019 +0200
mild: also add tab selector on tab line
---
data/themes/mild.edc | 258 ++-
1 file changed, 254 insertions(+), 4 deletions(-)
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index 7559035..bd5f63c 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -647,6 +647,254 @@ collections {
target: "tabtitle";
}
+ program {
+signal: "tab_btn,on"; source: "terminology";
+action: STATE_SET "on" 0.0;
+target: "tab_btn_clip";
+target: "tab_btn_bg";
+target: "terminology.tab_btn";
+ }
+ program {
+signal: "tab_btn,off"; source: "terminology";
+action: STATE_SET "default" 0.0;
+target: "tab_btn_clip";
+target: "tab_btn_bg";
+target: "terminology.tab_btn";
+ }
+ part { name: "tab_btn_clip"; type: RECT;
+description { state: "default" 0.0;
+ color: 255 255 255 0;
+ visible: 0;
+}
+description { state: "on" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+}
+ }
+ part { name: "tab_btn_bg";
+mouse_events: 0;
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "terminology.tab_btn";
+ rel2.to: "terminology.tab_btn";
+ image.normal: "tab_bg_r0.png";
+ image.border: 0 2 4 4;
+ fill.smooth: 0;
+ visible: 0;
+ fixed: 1 1;
+}
+description { state: "on" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+}
+ }
+ part { name: "tab_btn_glow_r0";
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "tab_btn_r0";
+ rel2.to: "tab_btn_r0";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ image {
+ normal: "cr_glow.png";
+ border: 9 9 9 9;
+ }
+ color: 51 153 255 32;
+}
+description { state: "over" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+}
+ }
+ part { name: "tab_btn_glow_r1";
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "tab_btn_r1";
+ rel2.to: "tab_btn_r1";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ image {
+ normal: "cr_glow.png";
+ border: 9 9 9 9;
+ }
+ color: 51 153 255 32;
+}
+description { state: "over" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+}
+ }
+ part { name: "tab_btn_glow_r2";
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "tab_btn_r2";
+ rel2.to: "tab_btn_r2";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ image {
+ normal: "cr_glow.png";
+ border: 9 9 9 9;
+ }
+ color: 51 153 255 32;
+}
+description { state: "over" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+}
+ }
+ part { name: "tab_btn_glow_r3";
+clip_to: "tab_btn_clip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "tab_btn_r3";
+ rel2.to: "tab_btn_r3";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ image {
+ normal: "cr_glow.png";
+ border: 9 9 9 9;
+
[EGIT] [apps/terminology] master 04/07: termio_selection_get(): simplify by using macros
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=7dcb9e4e43f5af67d3f989d9e69aa6f4a328d607
commit 7dcb9e4e43f5af67d3f989d9e69aa6f4a328d607
Author: Boris Faure
Date: Sun Oct 27 12:06:18 2019 +0100
termio_selection_get(): simplify by using macros
---
src/bin/termiointernals.c | 60 +++
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/src/bin/termiointernals.c b/src/bin/termiointernals.c
index 555c27a..bb91705 100644
--- a/src/bin/termiointernals.c
+++ b/src/bin/termiointernals.c
@@ -21,6 +21,16 @@ termio_selection_get(Termio *sd,
{
int x, y;
+#define SB_ADD(STR, LEN) do { \
+ if (ty_sb_add(sb, STR, LEN) < 0) \
+ goto err; \
+} while (0)
+
+#define RTRIM() do { \
+ if (rtrim) \
+ ty_sb_spaces_rtrim(sb);\
+} while (0)
+
termpty_backlog_lock();
for (y = c1y; y <= c2y; y++)
{
@@ -33,15 +43,14 @@ termio_selection_get(Termio *sd,
cells = termpty_cellrow_get(sd->pty, y, &w);
if (!cells || !w)
{
- if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+ SB_ADD("\n", 1);
continue;
}
if (w > sd->grid.w) w = sd->grid.w;
if (y == c1y && c1x >= w)
{
- if (rtrim)
- ty_sb_spaces_rtrim(sb);
- if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+ RTRIM();
+ SB_ADD("\n", 1);
continue;
}
start_x = c1x;
@@ -60,18 +69,20 @@ termio_selection_get(Termio *sd,
{
if ((cells[x].codepoint == 0) && (cells[x].att.dblwidth))
{
- if (x < end_x) x++;
- else break;
+ if (x < end_x)
+x++;
+ else
+break;
}
- if (x >= w) break;
+ if (x >= w)
+ break;
if (cells[x].att.newline)
{
last0 = -1;
if ((y != c2y) || (x != end_x))
{
- if (rtrim)
- ty_sb_spaces_rtrim(sb);
- if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+ RTRIM();
+ SB_ADD("\n", 1);
}
break;
}
@@ -90,21 +101,20 @@ termio_selection_get(Termio *sd,
last0 = -1;
while (v >= 0)
{
-if (ty_sb_add(sb, " ", 1) < 0) goto err;
+SB_ADD(" ", 1);
v--;
}
}
txtlen = codepoint_to_utf8(cells[x].codepoint, txt);
if (txtlen > 0)
-if (ty_sb_add(sb, txt, txtlen) < 0) goto err;
+SB_ADD(txt, txtlen);
if ((x == (w - 1)) &&
((x != c2x) || (y != c2y)))
{
if (!cells[x].att.autowrapped)
{
-if (rtrim)
- ty_sb_spaces_rtrim(sb);
-if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+RTRIM();
+SB_ADD("\n", 1);
}
}
}
@@ -133,9 +143,8 @@ termio_selection_get(Termio *sd,
}
if (!have_more)
{
- if (rtrim)
- ty_sb_spaces_rtrim(sb);
- if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+ RTRIM();
+ SB_ADD("\n", 1);
}
else
{
@@ -148,27 +157,27 @@ termio_selection_get(Termio *sd,
else break;
}
if (x >= w) break;
-if (ty_sb_add(sb, " ", 1) < 0) goto err;
+SB_ADD(" ", 1);
}
}
}
else
{
- if (rtrim)
-ty_sb_spaces_rtrim(sb);
- if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+ RTRIM();
+ SB_ADD("\n", 1);
}
}
}
termpty_backlog_unlock();
- if (rtrim)
- ty_sb_spaces
[EGIT] [apps/terminology] master 03/07: termio: allow \t to be pasted
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=7634b61283a92266afb81293ceb49f27f020c44c
commit 7634b61283a92266afb81293ceb49f27f020c44c
Author: Boris Faure
Date: Sat Oct 26 23:20:38 2019 +0200
termio: allow \t to be pasted
---
src/bin/termio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index dea782e..0451b71 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1043,8 +1043,7 @@ _getsel_cb(void *data,
int prev_i = i;
g = eina_unicode_utf8_next_get(s, &i);
/* Skip escape codes as a security measure */
- if ((g < '\n') ||
- ((g > '\n') && (g < ' ')))
+ if (! ((g == '\t') || (g == '\n') || (g >= ' ')))
{
continue;
}
--
[EGIT] [apps/terminology] master 07/07: termiointernals: be able to select tabs + test
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=e197c04f65b01fd75f85e6b73135bbda69f4633f
commit e197c04f65b01fd75f85e6b73135bbda69f4633f
Author: Boris Faure
Date: Sun Oct 27 16:14:28 2019 +0100
termiointernals: be able to select tabs + test
---
src/bin/termiointernals.c | 64 ---
tests/tests.results | 1 +
2 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/src/bin/termiointernals.c b/src/bin/termiointernals.c
index bb91705..598c724 100644
--- a/src/bin/termiointernals.c
+++ b/src/bin/termiointernals.c
@@ -46,7 +46,10 @@ termio_selection_get(Termio *sd,
SB_ADD("\n", 1);
continue;
}
-if (w > sd->grid.w) w = sd->grid.w;
+
+/* Define how much needs to be read on that line */
+if (w > sd->grid.w)
+ w = sd->grid.w;
if (y == c1y && c1x >= w)
{
RTRIM();
@@ -57,14 +60,17 @@ termio_selection_get(Termio *sd,
end_x = (c2x >= w) ? w - 1 : c2x;
if (c1y != c2y)
{
- if (y == c1y) end_x = w - 1;
- else if (y == c2y) start_x = 0;
+ if (y == c1y)
+ end_x = w - 1;
+ else if (y == c2y)
+ start_x = 0;
else
{
start_x = 0;
end_x = w - 1;
}
}
+
for (x = start_x; x <= end_x; x++)
{
if ((cells[x].codepoint == 0) && (cells[x].att.dblwidth))
@@ -76,6 +82,36 @@ termio_selection_get(Termio *sd,
}
if (x >= w)
break;
+ if (cells[x].att.tab_inserted)
+ {
+ /* There was a tab inserted.
+ * Only output it if there were spaces/empty cells "bellow"
+ */
+ Eina_Bool is_tab = EINA_TRUE;
+ while ((is_tab) && (x < end_x))
+{
+ if (((cells[x].codepoint == 0) ||
+(cells[x].att.invisible == 1) ||
+(cells[x].codepoint == ' ')))
+ {
+ x++;
+ }
+ else
+ {
+is_tab = EINA_FALSE;
+ }
+ if (cells[x].att.tab_last)
+ {
+SB_ADD("\t", 1);
+if (is_tab)
+ {
+ x++;
+ is_tab = EINA_FALSE;
+ }
+break;
+ }
+}
+ }
if (cells[x].att.newline)
{
last0 = -1;
@@ -88,7 +124,10 @@ termio_selection_get(Termio *sd,
}
else if (cells[x].codepoint == 0)
{
- if (last0 < 0) last0 = x;
+ /* empty cell, track it to know whether to replace with
+ * spaces */
+ if (last0 < 0)
+last0 = x;
}
else
{
@@ -121,6 +160,8 @@ termio_selection_get(Termio *sd,
}
if (last0 >= 0)
{
+ /* line stop by empty cell, need to know whether to insert spaces
+ * or just go to next line */
if (y == c2y)
{
Eina_Bool have_more = EINA_FALSE;
@@ -130,8 +171,10 @@ termio_selection_get(Termio *sd,
if ((cells[x].codepoint == 0) &&
(cells[x].att.dblwidth))
{
-if (x < (w - 1)) x++;
-else break;
+if (x < (w - 1))
+ x++;
+else
+ break;
}
if (((cells[x].codepoint != 0) &&
(cells[x].codepoint != ' ')) ||
@@ -153,10 +196,13 @@ termio_selection_get(Termio *sd,
if ((cells[x].codepoint == 0) &&
(cells[x].att.dblwidth))
{
- if (x < (w - 1)) x++;
- else break;
+ if (x < (w - 1))
+ x++;
+ else
+ break;
}
-
[EGIT] [apps/terminology] master 02/07: README: add link to Twitter account
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=c80d2d99a546325605010b95e6b2b9a4126b86c9 commit c80d2d99a546325605010b95e6b2b9a4126b86c9 Author: Boris Faure Date: Sun Oct 27 11:28:06 2019 +0100 README: add link to Twitter account --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 796c230..ba7fafe 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This is an EFL terminal emulator with some extra bells and whistles. [](https://circleci.com/gh/billiob/terminology) [](https://codecov.io/gh/billiob/terminology) [](https://www.codacy.com/app/billiob/terminology) - +[](https://twitter.com/_Terminology_) Requirements --
[EGIT] [apps/terminology] master 01/07: github: add sponsorship
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=c66b50d31b94206899dedaeacd51d5bd5be9c169 commit c66b50d31b94206899dedaeacd51d5bd5be9c169 Author: Boris Faure Date: Sun Oct 27 11:28:53 2019 +0100 github: add sponsorship --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000..ce883be --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: billiob --
[EGIT] [apps/terminology] master 05/07: termptyesc: store when tab are inserted and where they stop
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=e1ff4d877e896254500d79b9e07cfafd9537112e
commit e1ff4d877e896254500d79b9e07cfafd9537112e
Author: Boris Faure
Date: Sun Oct 27 16:04:43 2019 +0100
termptyesc: store when tab are inserted and where they stop
---
src/bin/termpty.h| 8 +---
src/bin/termptyesc.c | 6 ++
src/bin/termptyops.c | 2 ++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index ef07cb9..ca1605c 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -81,12 +81,14 @@ struct _Termatt
unsigned short fraktur : 1;
unsigned short framed : 1;
unsigned short encircled : 1;
- unsigned short overlined : 1;
+ unsigned short overlined : 1; // TODO: support it
+ unsigned short tab_inserted : 1;
+ unsigned short tab_last : 1;
#if defined(SUPPORT_80_132_COLUMNS)
unsigned short is_80_132_mode_allowed : 1;
- unsigned short bit_padding : 11;
+ unsigned short bit_padding : 9;
#else
- unsigned short bit_padding : 12;
+ unsigned short bit_padding : 10;
#endif
uint16_t link_id;
};
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index a92b4db..256c819 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -207,6 +207,8 @@ _cursor_to_start_of_line(Termpty *ty)
static void
_handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
{
+ Termcell *cell;
+
switch (*cc)
{
case 0x07: // BEL '\a' (bell)
@@ -220,7 +222,11 @@ _handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
return;
case 0x09: // HT '\t' (horizontal tab)
DBG("->HT");
+ cell = &(TERMPTY_SCREEN(ty, ty->cursor_state.cx,
ty->cursor_state.cy));
+ cell->att.tab_inserted = 1;
_tab_forward(ty, 1);
+ cell = &(TERMPTY_SCREEN(ty, ty->cursor_state.cx -1,
ty->cursor_state.cy));
+ cell->att.tab_last = 1;
return;
case 0x0a: // LF '\n' (new line)
case 0x0b: // VT '\v' (vertical tab)
diff --git a/src/bin/termptyops.c b/src/bin/termptyops.c
index dfc7558..27c4399 100644
--- a/src/bin/termptyops.c
+++ b/src/bin/termptyops.c
@@ -427,6 +427,8 @@ termpty_reset_att(Termatt *att)
att->framed = 0;
att->encircled = 0;
att->overlined = 0;
+ att->tab_inserted = 0;
+ att->tab_last = 0;
}
void
--
[EGIT] [apps/terminology] master 06/07: tests: update tests.results due to new attributes about tabs
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=37a8f0b9c1ba2177f3a9885441e151012c711957 commit 37a8f0b9c1ba2177f3a9885441e151012c711957 Author: Boris Faure Date: Sun Oct 27 16:11:25 2019 +0100 tests: update tests.results due to new attributes about tabs --- tests/tests.results | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/tests.results b/tests/tests.results index 7471fa2..7da2572 100644 --- a/tests/tests.results +++ b/tests/tests.results @@ -16,7 +16,7 @@ cursor-shape-4.sh 9070bf259b9903c4b03093f49db983c3 cursor-shape-5.sh 5cb9f8b58fb2fd04c69ab28ae4df4780 cursor-shape-6.sh 5cb9f8b58fb2fd04c69ab28ae4df4780 cursor-shape-7.sh 1eb9cb9b57039a7433cf42fb3a2e0c36 -tabs.sh 9061f029fde70c7ff934ca3cea86dca3 +tabs.sh e76b0d1496e49aa8e8d7f31374a34e58 xterm-osc-0-title-icon.sh ea7316b8d4c916a931ec73f9758d1175 xterm-osc-1-icon.sh e60271df97e969133fbab2ca9c5b3390 xterm-osc-2-title.sh 4f3b26d8bec904642c97344e0d59a717 @@ -40,7 +40,7 @@ cnl.sh d1c2d442aa03cd51c1586ff68bbda683 cpl.sh 6ced7ec58e7ce8cfa71df23edd92bcdc cup.sh 82888abb80398e567127fb19d7edba35 hvp.sh 82888abb80398e567127fb19d7edba35 -decaln.sh d84a6b46f8c1570e557ecc2fb53db8c7 +decaln.sh fe5c6e2303a2c4e8f782dcac56ad7a1d decawm.sh 1fb75f8c87343b850317f3f9ae0cf3b6 decbi.sh 54e0fe739ecdaba232fa5957e58a5811 decfi.sh 57a22efd5e7153811e95ba2c3ef1cad9 @@ -65,16 +65,16 @@ il.sh 5d8c6747e46f3f41e139e081c314bdef dl.sh 482604b7d0f5b4285e17b0a8131ac0df su.sh 34b34dec1553c31f8789c75953f57bd6 sd.sh bc3a669737edc0fbdf9ea470270d9576 -decst8c.sh ddec736f0497f8c92a8233990ee7571c -ctc.sh b85bf1ef39e3d2b350e834d38f8cf88e -tbc.sh dfeafa1e1ca07c9fa7a2ea47ab7a9ac2 +decst8c.sh c30f84f8a445b5e38fc83ebffd9ff7e1 +ctc.sh f82151d262acca1e0c5b74311bfe8a27 +tbc.sh 8cfe0f4523ce5c4689fc9112d961aa56 ech.sh b4b9a19b9c33b5d275106ac0919df3a2 text_append_after_right_margin.sh a10e5f7596777fdef31bd07cda1ad999 -cbt.sh bcf65795669588e6978bebd56583d274 +cbt.sh e38fc0607eaadae384267114ea44325e hpa.sh 45484618660b9e06c5203a8151797513 rep.sh eb165b5b179d3fe73bd2cfd3e8857856 da.sh d513dc05ebc6d73d1e584f4282e5769b -uts.sh 075ff9f8c4f718784330bac4fcae932b +uts.sh 367ad447dedfa3ca4dcbe9c5ffede69b vpa.sh 4614f3c337e9d47fed3a4233df719617 decswbv.sh f90ffe93b1bd99c6b7385ca71c6793de c2.sh 9f264ee84b6d89f1f9fa7b76abd442c0 --
[EGIT] [apps/terminology] master 01/01: tests: works better with the file being committed xD
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=6148707ee71adcb553f52c3dedd2452d44cc0c8b commit 6148707ee71adcb553f52c3dedd2452d44cc0c8b Author: Boris Faure Date: Sun Oct 27 16:21:03 2019 +0100 tests: works better with the file being committed xD --- tests/selection_with_tabs.sh | 33 + 1 file changed, 33 insertions(+) diff --git a/tests/selection_with_tabs.sh b/tests/selection_with_tabs.sh new file mode 100755 index 000..36b2d7e --- /dev/null +++ b/tests/selection_with_tabs.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# char width: 7 +# char height: 15 + +# clear screen +printf '\033[2J' + +# set color +printf '\033[46;31;3m' + +# move to 2; 2 +printf '\033[2;2H' + +# Set string to select +printf 'a\011b\011' + +# mouse down to start selection +printf '\033}td;0;24;1;0;0\0' + +# mouse move +printf '\033}tm;78;24\0' + +# mouse up +printf '\033}tu;78;24;1;0;0\0' + +# force render +printf '\033}tr\0' + +# selection is 'E' +printf '\033}ts a\011b\n\0' + + --
[EGIT] [apps/terminology] master 01/01: termio: only the TEXT case shouldn't happen in that switch-case
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=998f25ba775ca09aa26b5deaed7fe9fdc283d5cd
commit 998f25ba775ca09aa26b5deaed7fe9fdc283d5cd
Author: Boris Faure
Date: Mon Oct 28 09:56:03 2019 +0100
termio: only the TEXT case shouldn't happen in that switch-case
---
src/bin/termio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 0451b71..f366cb5 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1073,9 +1073,9 @@ _getsel_cb(void *data,
const char *fmt = "UNKNOWN";
switch (ev->format)
{
- case ELM_SEL_FORMAT_TARGETS: fmt = "TARGETS"; break; /* shouldn't
happen */
+ case ELM_SEL_FORMAT_TARGETS: fmt = "TARGETS"; break;
case ELM_SEL_FORMAT_NONE: fmt = "NONE"; break;
- case ELM_SEL_FORMAT_TEXT: fmt = "TEXT"; break;
+ case ELM_SEL_FORMAT_TEXT: fmt = "TEXT"; break; /* shouldn't happen
*/
case ELM_SEL_FORMAT_MARKUP: fmt = "MARKUP"; break;
case ELM_SEL_FORMAT_IMAGE: fmt = "IMAGE"; break;
case ELM_SEL_FORMAT_VCARD: fmt = "VCARD"; break;
--
[E-devel] Release Candidate for Terminology 1.6.0
Hi fellow Terminology enthusiasts! I'd like to release Terminology 1.6.0 soon. My actual plan is to make the release announcement in a week. If anything goes wrong, I'll delay the release accordingly. I've put the release tarball here: https://download.enlightenment.org/pre-releases/terminology-1.6.0.tar.xz Please test it and report any issue you may encounter! Also, I'd like to announce that I've been tweeting about Terminology at https://twitter.com/_Terminology_ . Feel free to follow if you'd like to know more about what's going on with Terminology! Happy testing! Best Regards -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 02/02: build: detect whether there is strchrnul
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=02f41733879ffb650e4dd6e96ea49c5acbe10296
commit 02f41733879ffb650e4dd6e96ea49c5acbe10296
Author: Boris Faure
Date: Thu Nov 7 20:43:27 2019 +0100
build: detect whether there is strchrnul
This should help compiling on macosx
---
meson.build | 4
src/bin/termptyesc.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3932ecc..dbac9a7 100644
--- a/meson.build
+++ b/meson.build
@@ -78,6 +78,10 @@ if cc.has_function('mkstemps')
config_data.set('HAVE_MKSTEMPS', 1)
endif
+if cc.has_function('strchrnul')
+ config_data.set('HAVE_STRCHRNUL', 1)
+endif
+
url_head_code = '''#include
int main(void) { ecore_con_url_head(NULL); return 0; }
'''
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 256c819..25da608 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -3418,7 +3418,7 @@ _eina_unicode_to_hex(Eina_Unicode u)
return -1;
}
-#if defined(__OpenBSD__)
+#if !defined(HAVE_STRCHRNUL)
char *
strchrnul(const char *s, int c)
{
--
[EGIT] [apps/terminology] master 01/02: Prepare release 1.6.0
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=6f8997d194f17cac112b4770ee055f16cadf42e7
commit 6f8997d194f17cac112b4770ee055f16cadf42e7
Author: Boris Faure
Date: Wed Nov 6 22:09:59 2019 +0100
Prepare release 1.6.0
---
ChangeLog | 26 ++
NEWS | 35 ++-
README.md | 2 +-
man/terminology-helpers.1 | 2 +-
man/terminology.1 | 2 +-
meson.build | 2 +-
6 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6b5fc5e..8054a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2019-11-14
+* Release v1.5.0
+* Show title tab on splits, depending on configuration
+* Show tabs that had a bell rang and had not been focused
+* Add wizard on new configuration to set scaling
+* Add scale configuration in the Settings panel
+* Add Polish translation
+* Themes: make tab title readable based on theme default colors
+* Move the tab selector on the tab line
+* Be able to select and copy tabs
+* Better handle stalled unix socket when using one terminology with
+ multiple instances
+* Change typop behavior to queue files in case there are multiple
files to
+ look at
+* Update Italian translation
+* Fix live selections in the scrollback
+* Fix unchecking "auto-hide cursor" not working
+* Fix memory leaks related to looking for links under the mouse
+* Ensure Terminology compiles with EFL-1.20
+* Fix link detection over spaces
+* Fix tab selector no longer taking into account the new destination
+* Fix crash when using typop with multiple files
+* No longer set environment variable DESKTOP_STARTUP_ID as it may no
+ longer be accurate
+* Allow tabs to be pasted
+
2019-07-20
* Release v1.5.0
* Handle emoji has double-width character, introduced in Unicode 9.0.
diff --git a/NEWS b/NEWS
index e992e23..59c9774 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,40 @@
=
-Terminology 1.5.0
+Terminology 1.6.0
=
+Changes since 1.5.0:
+
+
+Additions:
+* Show title tab on splits, depending on configuration
+* Show tabs that had a bell rang and had not been focused
+* Add wizard on new configuration to set scaling
+* Add scale configuration in the Settings panel
+* Add Polish translation
+
+Improvements:
+* Themes: make tab title readable based on theme default colors
+* Move the tab selector on the tab line
+* Be able to select and copy tabs
+* Better handle stalled unix socket when using one terminology with
+ multiple instances
+* Change typop behavior to queue files in case there are multiple files to
+ look at
+* Update Italian translation
+
+Fixes:
+* Fix live selections in the scrollback
+* Fix unchecking "auto-hide cursor" not working
+* Fix memory leaks related to looking for links under the mouse
+* Ensure Terminology compiles with EFL-1.20
+* Fix link detection over spaces
+* Fix tab selector no longer taking into account the new destination
+* Fix crash when using typop with multiple files
+* No longer set environment variable DESKTOP_STARTUP_ID as it may no
+ longer be accurate
+* Allow tabs to be pasted
+
+
Changes since 1.4.1:
diff --git a/README.md b/README.md
index ba7fafe..3659fca 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Terminology 1.5.0
+Terminology 1.6.0
=
This is an EFL terminal emulator with some extra bells and whistles.
diff --git a/man/terminology-helpers.1 b/man/terminology-helpers.1
index 901ed3e..6d883b0 100644
--- a/man/terminology-helpers.1
+++ b/man/terminology-helpers.1
@@ -1,5 +1,5 @@
.\" Manpage for terminology helpers
-.TH TERMINOLOGY-HELPERS 1 "Jul 20, 2019"
+.TH TERMINOLOGY-HELPERS 1 "Nov 14, 2019"
.SH NAME
terminiology-helpers \- programs that enhance
.B terminology(1)
diff --git a/man/terminology.1 b/man/terminology.1
index 1ee3b60..f83d0d5 100644
--- a/man/terminology.1
+++ b/man/terminology.1
@@ -1,5 +1,5 @@
.\" Manpage for Terminology
-.TH TERMINOLOGY 1 "Jul 20, 2019" "1.5.0" "Terminology man page"
+.TH TERMINOLOGY 1 "Nov 14, 2019" "1.6.0" "Terminology man page"
.SH NAME
Terminology \- Terminal Emulator written with EFL (Enlightenment Foundation
Libraries).
.SH SYNOPSIS
diff --git a/meson.build b/meson.build
index 2f52f5a..3932ecc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('terminology', 'c',
-version: '1.5.99',
+version: '1.6.0',
default_options: ['buildtype=plain', 'c_std=gnu99'],
license: 'BSD')
--
Re: [E-devel] Release Candidate for Terminology 1.6.0
I've added detection at build time of `strchrnul()` to help build on systems that do not have that function. The new RC is at the same place: https://download.enlightenment.org/pre-releases/terminology-1.6.0.tar.xz Happy testing :) -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 02/02: config: add error message if config is from a new Terminology
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=2a02a03625451ff77fa159531108b5d369c1d8f4
commit 2a02a03625451ff77fa159531108b5d369c1d8f4
Author: Boris Faure
Date: Tue Nov 12 10:57:01 2019 +0100
config: add error message if config is from a new Terminology
Also mark it as temporary
---
src/bin/config.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 3566d61..97e10a9 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -736,10 +736,12 @@ config_load(void)
if (config->version < CONF_VER)
{
// currently no upgrade path so reset config.
+ ERR("config is from a newer Terminology, discard it");
config_del(config);
- config = NULL;
+ config = config_new();
+ config->temporary = EINA_TRUE;
}
- /* do no thing in case the config is from a newer
+ /* do nothing in case the config is from a newer
* terminology, we don't want to remove it. */
}
}
--
[EGIT] [apps/terminology] master 01/02: config: add error messages when saving config
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=b327ff2f191c62fef912bf05b27c91c908e023be
commit b327ff2f191c62fef912bf05b27c91c908e023be
Author: Boris Faure
Date: Tue Nov 12 10:56:41 2019 +0100
config: add error messages when saving config
---
src/bin/config.c | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 52ff2d2..3566d61 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -216,6 +216,7 @@ config_save(Config *config)
char buf[PATH_MAX], buf2[PATH_MAX];
const char *cfgdir;
int ok;
+ Eet_Error err;
EINA_SAFETY_ON_NULL_RETURN(config);
@@ -236,11 +237,28 @@ config_save(Config *config)
snprintf(buf, sizeof(buf), "%s/terminology/config/standard/base.cfg.tmp",
cfgdir);
snprintf(buf2, sizeof(buf2), "%s/terminology/config/standard/base.cfg",
cfgdir);
ef = eet_open(buf, EET_FILE_MODE_WRITE);
- if (ef)
+ if (!ef)
+ {
+ERR("error opening file '%s' for writing", buf);
+return;
+ }
+ ok = eet_data_write(ef, edd_base, CONFIG_KEY, config, 1);
+ if (!ok)
{
-ok = eet_data_write(ef, edd_base, CONFIG_KEY, config, 1);
eet_close(ef);
-if (ok) ecore_file_mv(buf, buf2);
+ERR("error writing to file '%s'", buf);
+return;
+ }
+ err = eet_close(ef);
+ if (err != EET_ERROR_NONE)
+ {
+ERR("error #%d closing file '%s'", err, buf);
+return;
+ }
+ if (!ecore_file_mv(buf, buf2))
+ {
+ERR("error moving file '%s' to '%s'", buf, buf2);
+return;
}
main_config_sync(config);
}
--
[EGIT] [apps/terminology] master 01/01: main: do not set config as temporary by default
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=dcf31cf140fbcce42af7144302721d6a765366c5
commit dcf31cf140fbcce42af7144302721d6a765366c5
Author: Boris Faure
Date: Thu Nov 14 12:57:59 2019 +0100
main: do not set config as temporary by default
---
src/bin/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 4aabc07..9bcd88b 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -111,7 +111,7 @@ _configure_instance(Ipc_Instance *inst)
config->temporary = EINA_TRUE;
}
- if (inst->login_shell)
+ if (inst->login_shell != 0xff)
{
inst->config->login_shell = inst->login_shell;
inst->config->temporary = EINA_TRUE;
--
[EGIT] [core/efl] master 01/01: efreet: fix typo
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b26085819e974a0706cf5bc9196d208291803053
commit b26085819e974a0706cf5bc9196d208291803053
Author: Boris Faure
Date: Fri Nov 15 12:54:55 2019 +0100
efreet: fix typo
Summary: efreet: fix typo
Test Plan: None
Reviewers: cedric, raster, lauromoura, devilhorns, marcelhollerbach,
segfaultxavi, zmike, vtorri
Reviewed By: segfaultxavi, vtorri
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10676
---
src/lib/efreet/efreet_cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index 2045d70c23..883cf5e3c2 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -144,7 +144,7 @@ _ipc_launch(void)
usleep(try_gap);
ipc = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, "efreetd", 0,
NULL);
}
- if (!ipc) ERR("Timeout in trying to start and then connect to efrteed");
+ if (!ipc) ERR("Timeout in trying to start and then connect to efreetd");
}
static Eina_Bool
--
[EGIT] [website/www-content] master 01/01: Terminology 1.6.0
billiob pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c0e6af40262dd0361029fbf28788e3ca7a4b2d27 commit c0e6af40262dd0361029fbf28788e3ca7a4b2d27 Author: Boris Faure Date: Sat Nov 16 11:00:56 2019 +0100 Terminology 1.6.0 --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index cdde10b99..104e65ae7 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -3,7 +3,7 @@ efl_v = 1.23.2 python_efl_v = 1.23.0 enlightenment_v = 0.23.1 -terminology_v = 1.5.0 +terminology_v = 1.6.0 rage_v= 0.3.1 econnman_v= 1.1 ephoto_v = 1.5 --
[EGIT] [apps/terminology] master 01/01: 1.6.0 release is now \o/
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=6019e0ee07563ea5098ec3098b239f16782d6012 commit 6019e0ee07563ea5098ec3098b239f16782d6012 Author: Boris Faure Date: Sat Nov 16 10:59:17 2019 +0100 1.6.0 release is now \o/ --- ChangeLog | 2 +- man/terminology-helpers.1 | 2 +- man/terminology.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8054a85..c0e2a0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2019-11-14 +2019-11-16 * Release v1.5.0 * Show title tab on splits, depending on configuration * Show tabs that had a bell rang and had not been focused diff --git a/man/terminology-helpers.1 b/man/terminology-helpers.1 index 6d883b0..cbb1eba 100644 --- a/man/terminology-helpers.1 +++ b/man/terminology-helpers.1 @@ -1,5 +1,5 @@ .\" Manpage for terminology helpers -.TH TERMINOLOGY-HELPERS 1 "Nov 14, 2019" +.TH TERMINOLOGY-HELPERS 1 "Nov 16, 2019" .SH NAME terminiology-helpers \- programs that enhance .B terminology(1) diff --git a/man/terminology.1 b/man/terminology.1 index f83d0d5..3d840f9 100644 --- a/man/terminology.1 +++ b/man/terminology.1 @@ -1,5 +1,5 @@ .\" Manpage for Terminology -.TH TERMINOLOGY 1 "Nov 14, 2019" "1.6.0" "Terminology man page" +.TH TERMINOLOGY 1 "Nov 16, 2019" "1.6.0" "Terminology man page" .SH NAME Terminology \- Terminal Emulator written with EFL (Enlightenment Foundation Libraries). .SH SYNOPSIS --
[EGIT] [website/www-content] master 01/01: Wiki media news:terminology-1.6.0.png uploaded by Boris Faure
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=169be3825c762ef7ccc29cd4520f3558726fd309 commit 169be3825c762ef7ccc29cd4520f3558726fd309 Author: Boris Faure Date: Sat Nov 16 02:40:11 2019 -0800 Wiki media news:terminology-1.6.0.png uploaded by Boris Faure --- media/news/terminology-1.6.0.png | Bin 0 -> 71539 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/news/terminology-1.6.0.png b/media/news/terminology-1.6.0.png new file mode 100644 index 0..ef7ad327e Binary files /dev/null and b/media/news/terminology-1.6.0.png differ --
[EGIT] [website/www-content] master 01/01: Wiki page 2019-11-16-terminology-1.6.0 changed with summary [created] by Boris Faure
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=fb166f79610b9e164a8e11bb8ec88658e3f5e98e
commit fb166f79610b9e164a8e11bb8ec88658e3f5e98e
Author: Boris Faure
Date: Sat Nov 16 02:43:42 2019 -0800
Wiki page 2019-11-16-terminology-1.6.0 changed with summary [created] by
Boris Faure
---
pages/news/2019-11-16-terminology-1.6.0.txt | 43 +
1 file changed, 43 insertions(+)
diff --git a/pages/news/2019-11-16-terminology-1.6.0.txt
b/pages/news/2019-11-16-terminology-1.6.0.txt
new file mode 100644
index 0..78654f0da
--- /dev/null
+++ b/pages/news/2019-11-16-terminology-1.6.0.txt
@@ -0,0 +1,43 @@
+=== Terminology 1.5.0 Release ===
+ * //2019-07-20 - by Boris Faure//
+
+> “Adopt the pace of nature: her secret is patience.” ― Ralph Waldo Emerson
+
+With 95 new commits, Terminology 1.6.0 is ready. It packs UI improvements
around tabs and splits, a welcome wizard to adjust the scaling factor,
translation updates and its load of fixes. During development of this release,
Terminology's Twitter account
[[https://twitter.com/_Terminology_|@_Terminology_]] was created.
+
+== Additions ==
+* Show title tab on splits, depending on configuration
+* Show tabs that had a bell rang and had not been focused
+* Add wizard on new configuration to set scaling
+* Add scale configuration in the Settings panel
+* Add Polish translation
+
+== Improvements ==
+* Themes: make tab title readable based on theme default colors
+* Move the tab selector on the tab line
+* Be able to select and copy tabs
+* Better handle stalled unix socket when using one terminology with
multiple instances
+* Change `typop` behavior to queue files in case there are multiple files
to look at
+* Update Italian translation
+
+== Fixes ==
+* Fix live selections in the scrollback
+* Fix unchecking `auto-hide cursor` not working
+* Fix memory leaks related to looking for links under the mouse
+* Ensure Terminology compiles with `EFL-1.20`
+* Fix link detection over spaces
+* Fix tab selector no longer taking into account the new destination
+* Fix crash when using `typop` with multiple files
+* No longer set environment variable `DESKTOP_STARTUP_ID` as it may no
longer be accurate
+* Allow tabs to be pasted
+
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz
| Terminology 1.6.0 XZ]] |
''b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77'' |
+
+== In action ==
+{{ :news:terminology-1.6.0.png?nolink |}}
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
\ No newline at end of file
--
[EGIT] [website/www-content] master 01/01: Wiki page 2019-11-16-terminology-1.6.0 changed with summary [] by Boris Faure
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=18239af64d9a970032a8e7f163a88498a981d8e2 commit 18239af64d9a970032a8e7f163a88498a981d8e2 Author: Boris Faure Date: Sat Nov 16 02:49:27 2019 -0800 Wiki page 2019-11-16-terminology-1.6.0 changed with summary [] by Boris Faure --- pages/news/2019-11-16-terminology-1.6.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/news/2019-11-16-terminology-1.6.0.txt b/pages/news/2019-11-16-terminology-1.6.0.txt index 78654f0da..31442d92d 100644 --- a/pages/news/2019-11-16-terminology-1.6.0.txt +++ b/pages/news/2019-11-16-terminology-1.6.0.txt @@ -1,5 +1,5 @@ -=== Terminology 1.5.0 Release === - * //2019-07-20 - by Boris Faure// +=== Terminology 1.6.0 Release === + * //2019-11-16 - by Boris Faure// > “Adopt the pace of nature: her secret is patience.” ― Ralph Waldo Emerson --
[EGIT] [apps/terminology] master 01/01: back on the road again
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c0d84ff738687d31044944f6286a2890127d3bdf
commit c0d84ff738687d31044944f6286a2890127d3bdf
Author: Boris Faure
Date: Sat Nov 16 12:11:22 2019 +0100
back on the road again
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index dbac9a7..81e80fd 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('terminology', 'c',
-version: '1.6.0',
+version: '1.6.99',
default_options: ['buildtype=plain', 'c_std=gnu99'],
license: 'BSD')
--
[E-devel] Terminology 1.6.0
"Adopt the pace of nature: her secret is patience." Ralph Waldo Emerson Hello fellow Terminology enthusiasts! With 95 new commits, Terminology 1.6.0 is ready. It packs UI improvements around tabs and splits, a welcome wizard to adjust the scaling factor, translation updates and its load of fixes. During development of this release, Terminology's Twitter account @_Terminology_ was created. == Additions == * Show title tab on splits, depending on configuration * Show tabs that had a bell rang and had not been focused * Add wizard on new configuration to set scaling * Add scale configuration in the Settings panel * Add Polish translation == Improvements == * Themes: make tab title readable based on theme default colors * Move the tab selector on the tab line * Be able to select and copy tabs * Better handle stalled unix socket when using one terminology with multiple instances * Change `typop` behavior to queue files in case there are multiple files to look at * Update Italian translation == Fixes == * Fix live selections in the scrollback * Fix unticking `auto-hide cursor` not working * Fix memory leaks related to looking for links under the mouse * Ensure Terminology compiles with `EFL-1.20` * Fix link detection over spaces * Fix tab selector no longer taking into account the new destination * Fix crash when using `typop` with multiple files * No longer set environment variable `DESKTOP_STARTUP_ID` as it may no longer be accurate * Allow tabs to be pasted The tarball can be found at : - https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz - https://downloads.terminolo.gy/terminology-1.6.0.tar.xz sha256sum: b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77 Happy compiling! ( https://xkcd.com/303/ ) -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] (no subject)
"Adopt the pace of nature: her secret is patience." Ralph Waldo Emerson Hello fellow Terminology enthusiasts! With 95 new commits, Terminology 1.6.0 is ready. It packs UI improvements around tabs and splits, a welcome wizard to adjust the scaling factor, translation updates and its load of fixes. During development of this release, Terminology's Twitter account @_Terminology_ was created. == Additions == * Show title tab on splits, depending on configuration * Show tabs that had a bell rang and had not been focused * Add wizard on new configuration to set scaling * Add scale configuration in the Settings panel * Add Polish translation == Improvements == * Themes: make tab title readable based on theme default colors * Move the tab selector on the tab line * Be able to select and copy tabs * Better handle stalled unix socket when using one terminology with multiple instances * Change `typop` behavior to queue files in case there are multiple files to look at * Update Italian translation == Fixes == * Fix live selections in the scrollback * Fix unticking `auto-hide cursor` not working * Fix memory leaks related to looking for links under the mouse * Ensure Terminology compiles with `EFL-1.20` * Fix link detection over spaces * Fix tab selector no longer taking into account the new destination * Fix crash when using `typop` with multiple files * No longer set environment variable `DESKTOP_STARTUP_ID` as it may no longer be accurate * Allow tabs to be pasted The tarball can be found at : - https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz - https://downloads.terminolo.gy/terminology-1.6.0.tar.xz sha256sum: b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77 Happy compiling! ( https://xkcd.com/303/ ) -- Boris Faure Pointer Arithmetician signature.asc Description: PGP signature ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: add first version of snapcraft.yaml
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=a8479528db32eef2abf5c88098d33f33916c958f commit a8479528db32eef2abf5c88098d33f33916c958f Author: Boris Faure Date: Sat Nov 16 16:56:26 2019 +0100 add first version of snapcraft.yaml --- data/snap/snapcraft.yaml | 185 +++ 1 file changed, 185 insertions(+) diff --git a/data/snap/snapcraft.yaml b/data/snap/snapcraft.yaml new file mode 100644 index 000..2dfb666 --- /dev/null +++ b/data/snap/snapcraft.yaml @@ -0,0 +1,185 @@ +name: terminology +version: git +summary: Terminal Emulator written with the Enlightenment Foundation Libraries +description: | + Terminology is a terminal emulator for Linux/BSD/UNIX systems that uses EFL. + It has a whole bunch of bells and whistles. Use it as your regular vt100 + terminal emulator with all the usual features, such as 256 color support. + Terminology is designed to emulate Xterm as closely as possible in most + respects. +base: core18 +license: BSD-2-Clause +confinement: classic +grade: stable +icon: data/images/terminology.png +apps: + terminology: +command: terminology +desktop: usr/share/applications/terminology.desktop +plugs: + - desktop + - desktop-legacy + - network + - network-bind + - home + - opengl + - pulseaudio + - x11 + - wayland + - unity7 + - audio-playback + tyalpha: +command: tyalpha + tybg: +command: tybg + tycat: +command: tycat + tyls: +command: tyls + typop: +command: typop + tyq: +command: tyq + tysend: +command: tysend +parts: + efl: +plugin: meson +source-type: tar +source: https://download.enlightenment.org/rel/libs/efl/efl-1.23.2.tar.xz +meson-parameters: + - --prefix=/usr + - --libdir=/usr/lib + - --buildtype=release + - --default-library=shared + - -Dnls=false + - -Dopengl=es-egl + - -Dxinput22=true + - -Dbuffer=false + - -Dfb=false + - -Ddrm=false + - -Dtslib=false + - -Dharfbuzz=true + - -Dwl=true + - -Dnetwork-backend=connman + - -Devas-loaders-disabler=pdf,ps,raw,tiff,json,webp + - -Dphysics=false + - -Davahi=false + - -Deeze=false + - -Dbindings= + - -Dbuild-examples=false + - -Dbuild-tests=false +build-packages: + - gcc + - pkg-config + - libdbus-1-dev + - libssl-dev + - libfontconfig1-dev + - libfreetype6-dev + - libfribidi-dev + - libgif-dev + - libgstreamer1.0-dev + - libgstreamer-plugins-base1.0-dev + - libharfbuzz-dev + - libjpeg-turbo8-dev + - libpng-dev + - libpulse-dev + - librsvg2-dev + - libsndfile1-dev + - libx11-dev + - libxkbcommon-dev + - libxkbcommon-x11-dev + - libxcomposite-dev + - libxcursor-dev + - libxdamage-dev + - libxinerama-dev + - libxrandr-dev + - libxss-dev + - libxtst-dev + - libsystemd-dev + - libluajit-5.1-dev + - libibus-1.0-dev + - libscim-dev +stage-packages: + - libcairo2 + - libcroco3 + - libdatrie1 + - libegl1 + - libfontconfig1 + - libfreetype6 + - libfribidi0 + - libgdk-pixbuf2.0-0 + - libgif7 + - libgles2 + - libglvnd0 + - libgraphite2-3 + - libgstreamer-plugins-base1.0-0 + - libgstreamer1.0-0 + - libharfbuzz0b + - libibus-1.0-5 + - libicu60 + - libjpeg-turbo8 + - libluajit-5.1-2 + - liborc-0.4-0 + - libpango-1.0-0 + - libpangocairo-1.0-0 + - libpangoft2-1.0-0 + - libpixman-1-0 + - libpng16-16 + - librsvg2-2 + - libthai0 + - libx11-6 + - libx11-xcb1 + - libxau6 + - libxcb-render0 + - libxcb-shm0 + - libxcb1 + - libxcomposite1 + - libxcursor1 + - libxdamage1 + - libxdmcp6 + - libxext6 + - libxfixes3 + - libxi6 + - libxinerama1 + - libxkbcommon-x11-0 + - libxml2 + - libxrandr2 + - libxrender1 + - libxss1 + - libxtst6 + terminology: +plugin: meson +after: [ efl ] +source-type: git +source: https://github.com/billiob/terminology +meson-parameters: + - --prefix=/usr +stage-packages: + - libcurl4 + - libfontconfig1 + - libfreetype6 + - libfribidi0 + - libgif7 + - libgraphite2-3 + - libharfbuzz0b + - libjpeg-turbo8 + - libluajit-5.1-2 + - libpcre3 + - libpng16-16 + - libx11-6 + - libx11-xcb1 + - libxau6 + - libxcb1 + - libxcomposite1 + - libxcursor1 + - libxdamage1 + - libxdmcp6 + - libxext6 + - libxfixes3 + - libxi6 + - libxinerama1 + - libxrandr2 + - libxrender1 + - libxss1 + - libxtst6 --
[EGIT] [apps/terminology] master 01/01: mv data/snap /
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=abefcdcca1cbc6d963306b8c7b74304e153e312e
commit abefcdcca1cbc6d963306b8c7b74304e153e312e
Author: Boris Faure
Date: Sat Nov 16 17:22:36 2019 +0100
mv data/snap /
---
{data/snap => snap}/snapcraft.yaml | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/data/snap/snapcraft.yaml b/snap/snapcraft.yaml
similarity index 100%
rename from data/snap/snapcraft.yaml
rename to snap/snapcraft.yaml
--
[EGIT] [apps/terminology] terminology-1.6 01/01: start work on possible 1.6.1
billiob pushed a commit to branch terminology-1.6.
http://git.enlightenment.org/apps/terminology.git/commit/?id=b14ca5b4eb8af91a7095831f83f3e21242beff37
commit b14ca5b4eb8af91a7095831f83f3e21242beff37
Author: Boris Faure
Date: Sat Nov 16 17:33:55 2019 +0100
start work on possible 1.6.1
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index dbac9a7..b081ddc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('terminology', 'c',
-version: '1.6.0',
+version: '1.6.1',
default_options: ['buildtype=plain', 'c_std=gnu99'],
license: 'BSD')
--
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.6'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=f6c15410dc5146ecc415fce8c5e4dd1bb46cc2eb commit f6c15410dc5146ecc415fce8c5e4dd1bb46cc2eb Merge: abefcdc b14ca5b Author: Boris Faure Date: Sat Nov 16 17:36:34 2019 +0100 Merge branch 'terminology-1.6' --
[EGIT] [apps/terminology] master 01/02: snap: add libwayland-egl1 as dependency
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=b53dad69cc20676e6c11f749fc4ec70cf7180a0a commit b53dad69cc20676e6c11f749fc4ec70cf7180a0a Author: Boris Faure Date: Sat Nov 16 18:00:43 2019 +0100 snap: add libwayland-egl1 as dependency --- snap/snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2dfb666..661ec13 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -128,6 +128,7 @@ parts: - libpng16-16 - librsvg2-2 - libthai0 + - libwayland-egl1 - libx11-6 - libx11-xcb1 - libxau6 --
[EGIT] [apps/terminology] master 02/02: terminology.desktop: set full path of icon
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=06bdea5142b8191fd64c3ff80aa8fd662e8a2347
commit 06bdea5142b8191fd64c3ff80aa8fd662e8a2347
Author: Boris Faure
Date: Mon Nov 18 19:00:08 2019 +0100
terminology.desktop: set full path of icon
---
data/desktop/meson.build | 14 --
.../{terminology.desktop => terminology.desktop.in}| 2 +-
meson.build| 2 ++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/data/desktop/meson.build b/data/desktop/meson.build
index 1eb4019..8c16dbe 100644
--- a/data/desktop/meson.build
+++ b/data/desktop/meson.build
@@ -1,2 +1,12 @@
-install_data('terminology.desktop',
- install_dir: join_paths(get_option('datadir'), 'applications'))
+icon_sed = 's~%ICON_PATH%~@0@~'.format(join_paths(get_option('prefix'),
+ get_option('datadir'),
+
'icons/hicolor/128x128/apps'))
+
+custom_target(
+ 'terminology.desktop',
+ input : 'terminology.desktop.in',
+ output: 'terminology.desktop',
+ command : [sed, icon_sed, '@INPUT@'],
+ capture : true,
+ install : true,
+ install_dir : join_paths(get_option('datadir'), 'applications'))
diff --git a/data/desktop/terminology.desktop
b/data/desktop/terminology.desktop.in
similarity index 95%
rename from data/desktop/terminology.desktop
rename to data/desktop/terminology.desktop.in
index 020891d..6d57027 100644
--- a/data/desktop/terminology.desktop
+++ b/data/desktop/terminology.desktop.in
@@ -19,6 +19,6 @@ Comment[ru]=Эмулятор терминала
Comment[ko]=터미널 에뮬레이터
Keywords=shell;prompt;command;commandline;
Exec=terminology
-Icon=terminology
+Icon=%ICON_PATH%/terminology.png
Categories=System;TerminalEmulator;
StartupWMClass=terminology
diff --git a/meson.build b/meson.build
index 81e80fd..36ac0e0 100644
--- a/meson.build
+++ b/meson.build
@@ -127,6 +127,8 @@ endif
message('edje_cc set to:' + edje_cc)
+sed = find_program('sed')
+
configure_file(output: 'terminology_config.h',
configuration: config_data)
--
[EGIT] [apps/terminology] master 01/02: terminology.desktop.in: add french translation
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=3e0f20c61aaa367737cb1b1835cd259d0a8563c6 commit 3e0f20c61aaa367737cb1b1835cd259d0a8563c6 Author: Boris Faure Date: Tue Nov 19 22:59:35 2019 +0100 terminology.desktop.in: add french translation Thanks to Philippe Jean Guillaumie --- data/desktop/terminology.desktop.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/desktop/terminology.desktop.in b/data/desktop/terminology.desktop.in index 6d57027..5fcfa40 100644 --- a/data/desktop/terminology.desktop.in +++ b/data/desktop/terminology.desktop.in @@ -12,6 +12,7 @@ Comment=Terminal emulator Comment[da]=Terminalemulator Comment[eo]=Terminalimitilo Comment[es]=Emulador de terminal +Comment[fr]=Émulateur de terminal Comment[gl]=Emulador de terminal Comment[it]=Emulatore di terminale Comment[pt]=Emulador de terminal --
[EGIT] [apps/terminology] master 02/02: snap: no plugs with classic confinement
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=79dfb0f287d8da720a58c028ab2de94662a2320d commit 79dfb0f287d8da720a58c028ab2de94662a2320d Author: Boris Faure Date: Tue Nov 19 23:00:21 2019 +0100 snap: no plugs with classic confinement --- snap/snapcraft.yaml | 12 1 file changed, 12 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 661ec13..737a586 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,18 +16,6 @@ apps: terminology: command: terminology desktop: usr/share/applications/terminology.desktop -plugs: - - desktop - - desktop-legacy - - network - - network-bind - - home - - opengl - - pulseaudio - - x11 - - wayland - - unity7 - - audio-playback tyalpha: command: tyalpha tybg: --
[EGIT] [apps/terminology] terminology-1.6 02/02: mv data/snap /
billiob pushed a commit to branch terminology-1.6.
http://git.enlightenment.org/apps/terminology.git/commit/?id=b5fdc13990b91a5f6cb24d3f58edd2964cfa44a4
commit b5fdc13990b91a5f6cb24d3f58edd2964cfa44a4
Author: Boris Faure
Date: Sat Nov 16 17:22:36 2019 +0100
mv data/snap /
---
{data/snap => snap}/snapcraft.yaml | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/data/snap/snapcraft.yaml b/snap/snapcraft.yaml
similarity index 100%
rename from data/snap/snapcraft.yaml
rename to snap/snapcraft.yaml
--
[EGIT] [apps/terminology] terminology-1.6 01/02: add first version of snapcraft.yaml
billiob pushed a commit to branch terminology-1.6. http://git.enlightenment.org/apps/terminology.git/commit/?id=beafe2d226cd660a7f467b8d1c22ca7fcc53a835 commit beafe2d226cd660a7f467b8d1c22ca7fcc53a835 Author: Boris Faure Date: Sat Nov 16 16:56:26 2019 +0100 add first version of snapcraft.yaml --- data/snap/snapcraft.yaml | 185 +++ 1 file changed, 185 insertions(+) diff --git a/data/snap/snapcraft.yaml b/data/snap/snapcraft.yaml new file mode 100644 index 000..2dfb666 --- /dev/null +++ b/data/snap/snapcraft.yaml @@ -0,0 +1,185 @@ +name: terminology +version: git +summary: Terminal Emulator written with the Enlightenment Foundation Libraries +description: | + Terminology is a terminal emulator for Linux/BSD/UNIX systems that uses EFL. + It has a whole bunch of bells and whistles. Use it as your regular vt100 + terminal emulator with all the usual features, such as 256 color support. + Terminology is designed to emulate Xterm as closely as possible in most + respects. +base: core18 +license: BSD-2-Clause +confinement: classic +grade: stable +icon: data/images/terminology.png +apps: + terminology: +command: terminology +desktop: usr/share/applications/terminology.desktop +plugs: + - desktop + - desktop-legacy + - network + - network-bind + - home + - opengl + - pulseaudio + - x11 + - wayland + - unity7 + - audio-playback + tyalpha: +command: tyalpha + tybg: +command: tybg + tycat: +command: tycat + tyls: +command: tyls + typop: +command: typop + tyq: +command: tyq + tysend: +command: tysend +parts: + efl: +plugin: meson +source-type: tar +source: https://download.enlightenment.org/rel/libs/efl/efl-1.23.2.tar.xz +meson-parameters: + - --prefix=/usr + - --libdir=/usr/lib + - --buildtype=release + - --default-library=shared + - -Dnls=false + - -Dopengl=es-egl + - -Dxinput22=true + - -Dbuffer=false + - -Dfb=false + - -Ddrm=false + - -Dtslib=false + - -Dharfbuzz=true + - -Dwl=true + - -Dnetwork-backend=connman + - -Devas-loaders-disabler=pdf,ps,raw,tiff,json,webp + - -Dphysics=false + - -Davahi=false + - -Deeze=false + - -Dbindings= + - -Dbuild-examples=false + - -Dbuild-tests=false +build-packages: + - gcc + - pkg-config + - libdbus-1-dev + - libssl-dev + - libfontconfig1-dev + - libfreetype6-dev + - libfribidi-dev + - libgif-dev + - libgstreamer1.0-dev + - libgstreamer-plugins-base1.0-dev + - libharfbuzz-dev + - libjpeg-turbo8-dev + - libpng-dev + - libpulse-dev + - librsvg2-dev + - libsndfile1-dev + - libx11-dev + - libxkbcommon-dev + - libxkbcommon-x11-dev + - libxcomposite-dev + - libxcursor-dev + - libxdamage-dev + - libxinerama-dev + - libxrandr-dev + - libxss-dev + - libxtst-dev + - libsystemd-dev + - libluajit-5.1-dev + - libibus-1.0-dev + - libscim-dev +stage-packages: + - libcairo2 + - libcroco3 + - libdatrie1 + - libegl1 + - libfontconfig1 + - libfreetype6 + - libfribidi0 + - libgdk-pixbuf2.0-0 + - libgif7 + - libgles2 + - libglvnd0 + - libgraphite2-3 + - libgstreamer-plugins-base1.0-0 + - libgstreamer1.0-0 + - libharfbuzz0b + - libibus-1.0-5 + - libicu60 + - libjpeg-turbo8 + - libluajit-5.1-2 + - liborc-0.4-0 + - libpango-1.0-0 + - libpangocairo-1.0-0 + - libpangoft2-1.0-0 + - libpixman-1-0 + - libpng16-16 + - librsvg2-2 + - libthai0 + - libx11-6 + - libx11-xcb1 + - libxau6 + - libxcb-render0 + - libxcb-shm0 + - libxcb1 + - libxcomposite1 + - libxcursor1 + - libxdamage1 + - libxdmcp6 + - libxext6 + - libxfixes3 + - libxi6 + - libxinerama1 + - libxkbcommon-x11-0 + - libxml2 + - libxrandr2 + - libxrender1 + - libxss1 + - libxtst6 + terminology: +plugin: meson +after: [ efl ] +source-type: git +source: https://github.com/billiob/terminology +meson-parameters: + - --prefix=/usr +stage-packages: + - libcurl4 + - libfontconfig1 + - libfreetype6 + - libfribidi0 + - libgif7 + - libgraphite2-3 + - libharfbuzz0b + - libjpeg-turbo8 + - libluajit-5.1-2 + - libpcre3 + - libpng16-16 + - libx11-6 + - libx11-xcb1 + - libxau6 + - libxcb1 + - libxcomposite1 + - libxcursor1 + - libxdamage1 + - libxdmcp6 + - libxext6 + - libxfixes3 + - libxi6 + - libxinerama1 + - libxrandr2 + - libxrender1 + - libxss1 + - libxtst6 --
[EGIT] [apps/terminology] terminology-1.6 01/04: snap: add libwayland-egl1 as dependency
billiob pushed a commit to branch terminology-1.6. http://git.enlightenment.org/apps/terminology.git/commit/?id=35391f4c5e1cbf6c33ae49122f3284b375d80682 commit 35391f4c5e1cbf6c33ae49122f3284b375d80682 Author: Boris Faure Date: Sat Nov 16 18:00:43 2019 +0100 snap: add libwayland-egl1 as dependency --- snap/snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2dfb666..661ec13 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -128,6 +128,7 @@ parts: - libpng16-16 - librsvg2-2 - libthai0 + - libwayland-egl1 - libx11-6 - libx11-xcb1 - libxau6 --
[EGIT] [apps/terminology] terminology-1.6 03/04: terminology.desktop.in: add french translation
billiob pushed a commit to branch terminology-1.6. http://git.enlightenment.org/apps/terminology.git/commit/?id=a120692339cca4561c38c49e4cd1262ec68e7065 commit a120692339cca4561c38c49e4cd1262ec68e7065 Author: Boris Faure Date: Tue Nov 19 22:59:35 2019 +0100 terminology.desktop.in: add french translation Thanks to Philippe Jean Guillaumie --- data/desktop/terminology.desktop.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/desktop/terminology.desktop.in b/data/desktop/terminology.desktop.in index 6d57027..5fcfa40 100644 --- a/data/desktop/terminology.desktop.in +++ b/data/desktop/terminology.desktop.in @@ -12,6 +12,7 @@ Comment=Terminal emulator Comment[da]=Terminalemulator Comment[eo]=Terminalimitilo Comment[es]=Emulador de terminal +Comment[fr]=Émulateur de terminal Comment[gl]=Emulador de terminal Comment[it]=Emulatore di terminale Comment[pt]=Emulador de terminal --
[EGIT] [apps/terminology] terminology-1.6 02/04: terminology.desktop: set full path of icon
billiob pushed a commit to branch terminology-1.6.
http://git.enlightenment.org/apps/terminology.git/commit/?id=631aeeda970e9fa82074c13c74d991975ba5c4e3
commit 631aeeda970e9fa82074c13c74d991975ba5c4e3
Author: Boris Faure
Date: Mon Nov 18 19:00:08 2019 +0100
terminology.desktop: set full path of icon
---
data/desktop/meson.build | 14 --
.../{terminology.desktop => terminology.desktop.in}| 2 +-
meson.build| 2 ++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/data/desktop/meson.build b/data/desktop/meson.build
index 1eb4019..8c16dbe 100644
--- a/data/desktop/meson.build
+++ b/data/desktop/meson.build
@@ -1,2 +1,12 @@
-install_data('terminology.desktop',
- install_dir: join_paths(get_option('datadir'), 'applications'))
+icon_sed = 's~%ICON_PATH%~@0@~'.format(join_paths(get_option('prefix'),
+ get_option('datadir'),
+
'icons/hicolor/128x128/apps'))
+
+custom_target(
+ 'terminology.desktop',
+ input : 'terminology.desktop.in',
+ output: 'terminology.desktop',
+ command : [sed, icon_sed, '@INPUT@'],
+ capture : true,
+ install : true,
+ install_dir : join_paths(get_option('datadir'), 'applications'))
diff --git a/data/desktop/terminology.desktop
b/data/desktop/terminology.desktop.in
similarity index 95%
rename from data/desktop/terminology.desktop
rename to data/desktop/terminology.desktop.in
index 020891d..6d57027 100644
--- a/data/desktop/terminology.desktop
+++ b/data/desktop/terminology.desktop.in
@@ -19,6 +19,6 @@ Comment[ru]=Эмулятор терминала
Comment[ko]=터미널 에뮬레이터
Keywords=shell;prompt;command;commandline;
Exec=terminology
-Icon=terminology
+Icon=%ICON_PATH%/terminology.png
Categories=System;TerminalEmulator;
StartupWMClass=terminology
diff --git a/meson.build b/meson.build
index b081ddc..baaf6e3 100644
--- a/meson.build
+++ b/meson.build
@@ -127,6 +127,8 @@ endif
message('edje_cc set to:' + edje_cc)
+sed = find_program('sed')
+
configure_file(output: 'terminology_config.h',
configuration: config_data)
--
[EGIT] [apps/terminology] terminology-1.6 04/04: snap: no plugs with classic confinement
billiob pushed a commit to branch terminology-1.6. http://git.enlightenment.org/apps/terminology.git/commit/?id=8e3263d42af9eecb86884a36170eb1c601dcd33e commit 8e3263d42af9eecb86884a36170eb1c601dcd33e Author: Boris Faure Date: Tue Nov 19 23:00:21 2019 +0100 snap: no plugs with classic confinement --- snap/snapcraft.yaml | 12 1 file changed, 12 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 661ec13..737a586 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,18 +16,6 @@ apps: terminology: command: terminology desktop: usr/share/applications/terminology.desktop -plugs: - - desktop - - desktop-legacy - - network - - network-bind - - home - - opengl - - pulseaudio - - x11 - - wayland - - unity7 - - audio-playback tyalpha: command: tyalpha tybg: --
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.6'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=7461c9896df1448b5f25e94e832a5fb16ffe3ea2 commit 7461c9896df1448b5f25e94e832a5fb16ffe3ea2 Merge: 79dfb0f 8e3263d Author: Boris Faure Date: Wed Nov 20 23:09:57 2019 +0100 Merge branch 'terminology-1.6' --
[EGIT] [apps/terminology] terminology-1.6 01/01: tests: add one about selecting over empty lines
billiob pushed a commit to branch terminology-1.6. http://git.enlightenment.org/apps/terminology.git/commit/?id=1333e80866591f4507b5e038f47aaf4647030399 commit 1333e80866591f4507b5e038f47aaf4647030399 Author: Boris Faure Date: Thu Nov 21 21:50:18 2019 +0100 tests: add one about selecting over empty lines --- tests/selection_empty_lines.sh | 42 ++ tests/tests.results| 1 + 2 files changed, 43 insertions(+) diff --git a/tests/selection_empty_lines.sh b/tests/selection_empty_lines.sh new file mode 100755 index 000..5bb671e --- /dev/null +++ b/tests/selection_empty_lines.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# char width: 7 +# char height: 15 + +# clear screen +printf '\033[2J' + +# set color +printf '\033[46;31;3m' + +#move to 0,0 +printf '\033[H' + +# set text +TEXT="The path of the righteous man is beset on all sides by the iniquities of the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who would attempt to poison and destroy My brothers. And you will know My name is the Lord when I lay My vengeance u [...] +printf "%s\r\n\r\n%s" "$TEXT" "$TEXT" + + +# mouse down to start selection +printf '\033}td;16;85;1;0;0\0' + +# mouse move +printf '\033}tm;244;150;0\0' + +# mouse up +printf '\033}tu;244;150;1;0;0\0' + +# force render +printf '\033}tr\0' + +# selection is +printf '\033}tsdestroy My brothers. And you will know My name is the Lord when I lay My vengeance upon thee.\n\nThe path of the righteous man is beset on all sides by the iniquities of the selfish and the tyranny of evil men. B\0' + +# remove selection +printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0' + +# force render +printf '\033}tr\0' + +# no more selection +printf '\033}tn\0' diff --git a/tests/tests.results b/tests/tests.results index bbc8190..356b5ad 100644 --- a/tests/tests.results +++ b/tests/tests.results @@ -121,3 +121,4 @@ shift_in_out.sh 3896bcc6887998bbc41b43840a6b2e33 osc-11-query.sh b762d503e40641ff896dac46391ad7a8 link_detection.sh bbe87a849586e8b922f26ad5d88146dc selection_with_tabs.sh 23557497a8f28ca246048bb2443b3dab +selection_empty_lines.sh 7a90d9bfde9e9fb7f067f6c08eac57ff --
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.6'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=b2ff5f3ccdcd758af8a76c288ba758e6166197ae commit b2ff5f3ccdcd758af8a76c288ba758e6166197ae Merge: 7461c98 1333e80 Author: Boris Faure Date: Thu Nov 21 21:51:54 2019 +0100 Merge branch 'terminology-1.6' tests/selection_empty_lines.sh | 42 ++ tests/tests.results| 1 + 2 files changed, 43 insertions(+) --
