Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3c76aceedaa398000245782f3544fce7c8da466a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3c76aceedaa398000245782f3544fce7c8da466a)
  • Date: Fri, 6 Apr 2018 13:00:59 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

wm-addons/jgmenu/CONFIGURE | 1
wm-addons/jgmenu/HISTORY | 6 +
wm-addons/jgmenu/PRE_BUILD | 6 +
wm-addons/jgmenu/single_window.patch | 118
+++++++++++++++++++++++++++++++++++
4 files changed, 131 insertions(+)

New commits:
commit 3c76aceedaa398000245782f3544fce7c8da466a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

jgmenu: added single window mode option

diff --git a/wm-addons/jgmenu/CONFIGURE b/wm-addons/jgmenu/CONFIGURE
new file mode 100755
index 0000000..7ae3323
--- /dev/null
+++ b/wm-addons/jgmenu/CONFIGURE
@@ -0,0 +1 @@
+config_query JGMENU_SINGLE_WINDOW "Re-enable single window mode option?" n
diff --git a/wm-addons/jgmenu/HISTORY b/wm-addons/jgmenu/HISTORY
index ae4fe12..29a8658 100644
--- a/wm-addons/jgmenu/HISTORY
+++ b/wm-addons/jgmenu/HISTORY
@@ -1,2 +1,8 @@
+2018-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added, for single window mode option
+ * PRE_BUILD: added, to apply patch
+ * single_window.patch: added, reversed patch to re-enable single
+ window mode
+
2018-04-05 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS, BUILD, INSTALL: created spell, version 0.8.2
diff --git a/wm-addons/jgmenu/PRE_BUILD b/wm-addons/jgmenu/PRE_BUILD
new file mode 100755
index 0000000..064396d
--- /dev/null
+++ b/wm-addons/jgmenu/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [ ${JGMENU_SINGLE_WINDOW} == y ]; then
+ patch -p1 < "${SPELL_DIRECTORY}/single_window.patch"
+fi
diff --git a/wm-addons/jgmenu/single_window.patch
b/wm-addons/jgmenu/single_window.patch
new file mode 100644
index 0000000..d241441
--- /dev/null
+++ b/wm-addons/jgmenu/single_window.patch
@@ -0,0 +1,118 @@
+--- b/config.c
++++ a/config.c
+@@ -110,6 +110,8 @@
+ xatoi(&config.tint2_look, value, XATOI_NONNEG,
"config.tint2_look");
+ } else if (!strcmp(option, "at_pointer")) {
+ xatoi(&config.at_pointer, value, XATOI_NONNEG,
"config.at_pointer");
++ } else if (!strcmp(option, "multi_window")) {
++ xatoi(&config.multi_window, value, XATOI_NONNEG,
"config.multi_window");
+ } else if (!strcmp(option, "terminal_exec")) {
+ xfree(config.terminal_exec);
+ config.terminal_exec = xstrdup(value);
+reverted:
+--- b/docs/jgmenurc
++++ a/docs/jgmenurc
+@@ -7,6 +7,7 @@
+ #csv_cmd = pmenu
+ #tint2_look = 1
+ #at_pointer = 0
++#multi_window = 1
+ #terminal_exec = x-terminal-emulator
+ #terminal_args = -e
+ #monitor = 0
+reverted:
+--- b/docs/manual/jgmenu.1
++++ a/docs/manual/jgmenu.1
+@@ -1,6 +1,6 @@
+ .\" Automatically generated by Pandoc 2.0.6
+ .\"
++.TH "JGMENU" "1" "29 January, 2017" "" ""
+-.TH "JGMENU" "1" "17 February, 2017" "" ""
+ .hy
+ .SH NAME
+ .PP
+@@ -454,6 +454,10 @@
+ .PD
+ \ \ \ \ ignoring \f[C]menu_margin_?\f[] and \f[C]menu_?align\f[] values.
+ .PP
++multi_window = \f[B]boolean\f[] (default 1)
++.PP
++\ \ \ \ If enabled, submenus open in new windows.
++.PP
+ terminal_exec = \f[B]string\f[] (default x\-terminal\-emulator)
+ .PD 0
+ .P
+reverted:
+--- b/docs/manual/jgmenu.1.md
++++ a/docs/manual/jgmenu.1.md
+@@ -1,6 +1,6 @@
+ % JGMENU(1)
+ % Johan Malm
++% 29 January, 2017
+-% 17 February, 2017
+
+ # NAME
+
+@@ -215,6 +215,10 @@
+     If enabled, the menu is launched at the pointer position,
+     ignoring `menu_margin_?` and `menu_?align` values.
+
++multi_window = __boolean__ (default 1)
++
++    If enabled, submenus open in new windows.
++
+ terminal_exec = __string__ (default x-terminal-emulator)
+ terminal_args = __string__ (default -e)
+
+reverted:
+--- b/examples/ex01/jgmenurc
++++ a/examples/ex01/jgmenurc
+@@ -8,3 +8,4 @@
+ color_norm_fg = #111111 100
+ color_sel_bg = #2222dd 80
+ color_sel_fg = #eeeeee 100
++multi_window = 1
+reverted:
+--- b/examples/ex02/jgmenurc
++++ a/examples/ex02/jgmenurc
+@@ -1,5 +1,7 @@
+ # .jgmenurc example
+
++multi_window = 0
++
+ menu_margin_x = 10
+ menu_margin_y = 40
+ menu_width = 250
+reverted:
+--- b/examples/ex03/jgmenurc
++++ a/examples/ex03/jgmenurc
+@@ -1,6 +1,7 @@
+ # .jgmenurc example
+
+ at_pointer = 1
++multi_window = 1
+
+ menu_margin_x = 10
+ menu_margin_y = 40
+reverted:
+--- b/examples/ex13/jgmenurc
++++ a/examples/ex13/jgmenurc
+@@ -7,6 +7,7 @@
+ #csv_cmd = pmenu
+ tint2_look = 0
+ #at_pointer = 0
++multi_window = 1
+ #terminal_exec = x-terminal-emulator
+ #terminal_args = -e
+ #
+reverted:
+--- b/jgmenu-init.sh
++++ a/jgmenu-init.sh
+@@ -27,6 +27,7 @@
+ csv_cmd = pmenu
+ tint2_look = 1
+ at_pointer = 0
++multi_window = 1
+ terminal_exec = x-terminal-emulator
+ terminal_args = -e
+ monitor = 0



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3c76aceedaa398000245782f3544fce7c8da466a), Vlad Glagolev, 04/06/2018

Archive powered by MHonArc 2.6.24.

Top of Page