[gentoo-commits] gentoo-x86 commit in x11-wm/musca/files: musca-0.9.24_p20100226-dmenu-4.4.patch

[gentoo-commits] gentoo-x86 commit in x11-wm/musca/files: musca-0.9.24_p20100226-dmenu-4.4.patch

[Jeroen Roovers (jer)]

jer         11/10/06 20:31:53

  Added:                musca-0.9.24_p20100226-dmenu-4.4.patch
  Log:
  Revision bump (bug #376675).
  
  (Portage version: 2.2.0_alpha62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch?rev=1.1&content-type=text/plain

Index: musca-0.9.24_p20100226-dmenu-4.4.patch
===================================================================
https://bugs.archlinux.org/task/25232
https://bugs.launchpad.net/musca/+bug/816890

diff --git a/config.h b/config.h
index f27e122..dcad60f 100644
--- a/config.h
+++ b/config.h
@@ -39,7 +39,7 @@ setting settings[] = {
 	// optional startup file of musca commands, one per line
 	{ "startup",                 mst_str,   { .s = ".musca_start" }, ".+" },
 	// customize the dmenu command.
-	{ "dmenu",                   mst_str,   { .s = "sort | dmenu -i -b"  }, ".+" },
+	{ "dmenu",                   mst_str,   { .s = "-i -b"  }, ".+" },
 	// customize the actions of dmenu driven window/group/command menus.  by default we
 	// just spit commands back to musca, but you can wrap or redirect stuff.  the $MUSCA
 	// environment variable is set to argv[0] in setup().  -i means execute stdin.
diff --git a/musca.c b/musca.c
index 7f1d6a3..794bb9c 100644
--- a/musca.c
+++ b/musca.c
@@ -2162,8 +2162,16 @@ void launch(char *cmd)
 }
 void menu(char *cmd, char *after)
 {
+	// we keep original behaviour by sorting
 	char *tmp = allocate(strlen(cmd)+strlen(after)+BLOCK);
-	sprintf(tmp, "%s | %s | %s", cmd, settings[ms_dmenu].s, after);
+	sprintf(tmp, "%s | sort | dmenu %s | %s", cmd, settings[ms_dmenu].s, after);
+	printf("%s\n", tmp);
+	launch(tmp); free(tmp);
+}
+void menufix(char *cmd, char*after)
+{
+	char *tmp = allocate(strlen(cmd)+strlen(after)+BLOCK);
+	sprintf(tmp, "%s %s | %s",cmd, settings[ms_dmenu].s, after);
 	printf("%s\n", tmp);
 	launch(tmp); free(tmp);
 }
@@ -2631,7 +2639,7 @@ char* com_command(char *cmd, regmatch_t *subs)
 }
 char* com_shell(char *cmd, regmatch_t *subs)
 {
-	menu("dmenu_path", settings[ms_run_shell_command].s);
+	menufix("dmenu_run", settings[ms_run_shell_command].s);
 	return NULL;
 }
 char* com_alias(char *cmd, regmatch_t *subs)
diff --git a/musca_proto.h b/musca_proto.h
index dc14d75..e25c1ea 100644
--- a/musca_proto.h
+++ b/musca_proto.h
@@ -145,6 +145,7 @@ void head_focus(head *h);
 void head_next();
 void launch(char *cmd);
 void menu(char *cmd, char *after);
+void menufix(char *cmd, char *after);
 void menu_wrapper(char *cmd, char *after);
 void shutdown();
 dcell parse_size(char *cmd, regmatch_t *subs, ucell index, ucell limit);

[gentoo-commits] gentoo-x86 commit in x11-wm/musca/files: musca-0.9.24_p20100226-dmenu-4.4.patch

[Jeroen Roovers (jer)]

jer         12/03/06 21:39:45

  Modified:             musca-0.9.24_p20100226-dmenu-4.4.patch
  Log:
  Remove config.h patch from patch, use sed instead. Call restore_config before patching. Add sed script to remove sed subtitution that hangs waiting for pipe input now that dmenu_run does not return output.
  
  (Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch?r1=1.1&r2=1.2

Index: musca-0.9.24_p20100226-dmenu-4.4.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- musca-0.9.24_p20100226-dmenu-4.4.patch	6 Oct 2011 20:31:51 -0000	1.1
+++ musca-0.9.24_p20100226-dmenu-4.4.patch	6 Mar 2012 21:39:45 -0000	1.2
@@ -1,21 +1,6 @@
 https://bugs.archlinux.org/task/25232
 https://bugs.launchpad.net/musca/+bug/816890
 
-diff --git a/config.h b/config.h
-index f27e122..dcad60f 100644
---- a/config.h
-+++ b/config.h
-@@ -39,7 +39,7 @@ setting settings[] = {
- 	// optional startup file of musca commands, one per line
- 	{ "startup",                 mst_str,   { .s = ".musca_start" }, ".+" },
- 	// customize the dmenu command.
--	{ "dmenu",                   mst_str,   { .s = "sort | dmenu -i -b"  }, ".+" },
-+	{ "dmenu",                   mst_str,   { .s = "-i -b"  }, ".+" },
- 	// customize the actions of dmenu driven window/group/command menus.  by default we
- 	// just spit commands back to musca, but you can wrap or redirect stuff.  the $MUSCA
- 	// environment variable is set to argv[0] in setup().  -i means execute stdin.
-diff --git a/musca.c b/musca.c
-index 7f1d6a3..794bb9c 100644
 --- a/musca.c
 +++ b/musca.c
 @@ -2162,8 +2162,16 @@ void launch(char *cmd)