Package: notion / 4.0.2+dfsg-5

0002-206_use-x-terminal-emulator.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
From: Arnout Engelen <arnouten@bzzt.net>
Date: Fri, 30 Oct 2015 18:58:59 -0700
Subject: 206_use-x-terminal-emulator

Use x-terminal-emulator as the default terminal emulator
---
 etc/cfg_bindings.lua                      | 8 ++++----
 etc/cfg_notion.lua                        | 2 +-
 etc/cfg_notion3_keybindings.lua           | 4 ++--
 utils/ion-runinxterm                      | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/cfg_bindings.lua b/etc/cfg_bindings.lua
index e1b7510..7eeb233 100644
--- a/etc/cfg_bindings.lua
+++ b/etc/cfg_bindings.lua
@@ -175,9 +175,9 @@ defbindings("WMPlex.toplevel", {
     bdoc("Lock screen", "lock"),
     kpress(META.."L", "notioncore.exec_on(_, notioncore.lookup_script('notion-lock'))"),
 
-    bdoc("Run a terminal emulator.", "xterm"),
-    kpress(META.."Return", "mod_query.exec_on_merr(_, XTERM or 'xterm')"),
-    kpress("F2", "mod_query.exec_on_merr(_, XTERM or 'xterm')"),
+    bdoc("Run a terminal emulator.", "x-terminal-emulator"),
+    kpress(META.."Return", "mod_query.exec_on_merr(_, XTERM or 'x-terminal-emulator')"),
+    kpress("F2", "mod_query.exec_on_merr(_, XTERM or 'x-terminal-emulator')"),
 
     bdoc("Query for command line to execute.", "run"),
     kpress(META.."J", "mod_query.query_exec(_)"),
@@ -359,7 +359,7 @@ defbindings("WMoveresMode", {
 -- Main menu
 defmenu("mainmenu", {
     menuentry("Run...",         "mod_query.query_exec(_)"),
-    menuentry("Terminal",       "mod_query.exec_on_merr(_, XTERM or 'xterm')"),
+    menuentry("Terminal",       "mod_query.exec_on_merr(_, XTERM or 'x-terminal-emulator')"),
     menuentry("Lock screen",
         "notioncore.exec_on(_, notioncore.lookup_script('notion-lock'))"),
     menuentry("Help",           "mod_query.query_man(_)"),
diff --git a/etc/cfg_notion.lua b/etc/cfg_notion.lua
index 170d746..8b2f363 100644
--- a/etc/cfg_notion.lua
+++ b/etc/cfg_notion.lua
@@ -18,7 +18,7 @@
 --ALTMETA="Mod4+Shift+"
 
 -- Terminal emulator.
---XTERM="xterm"
+--XTERM="x-terminal-emulator"
 -- Edit file command, mod_query.query_editfile
 --EDIT_COMMAND="run-mailcap --action=edit"
 -- View file command, mod_query.query_viewfile
diff --git a/etc/cfg_notion3_keybindings.lua b/etc/cfg_notion3_keybindings.lua
index 213867d..f6fd346 100644
--- a/etc/cfg_notion3_keybindings.lua
+++ b/etc/cfg_notion3_keybindings.lua
@@ -162,7 +162,7 @@ defbindings("WMPlex.toplevel", {
     kpress(META.."F1", "ioncore.exec_on(_, ':man notion')"),
 
     bdoc("Run a terminal emulator."),
-    kpress(ALTMETA.."F2", "mod_query.exec_on_merr(_, XTERM or 'xterm')"),
+    kpress(ALTMETA.."F2", "mod_query.exec_on_merr(_, XTERM or 'x-terminal-emulator')"),
 
     bdoc("Query for command line to execute."),
     kpress(ALTMETA.."F3", "mod_query.query_exec(_)"),
@@ -340,7 +340,7 @@ defbindings("WMoveresMode", {
 -- Main menu
 defmenu("mainmenu", {
     menuentry("Run...",         "mod_query.query_exec(_)"),
-    menuentry("Terminal",       "mod_query.exec_on_merr(_, XTERM or 'xterm')"),
+    menuentry("Terminal",       "mod_query.exec_on_merr(_, XTERM or 'x-terminal-emulator')"),
     menuentry("Lock screen",
         "notioncore.exec_on(_, notioncore.lookup_script('notion-lock'))"),
     menuentry("Help",           "mod_query.query_man(_)"),
diff --git a/utils/ion-runinxterm b/utils/ion-runinxterm
index fc16dac..b0aa3a5 100755
--- a/utils/ion-runinxterm
+++ b/utils/ion-runinxterm
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test "$XTERMCMD" || XTERMCMD="xterm"
+test "$XTERMCMD" || XTERMCMD="x-terminal-emulator"
 
 title=""
 wait=""