comparing tweaks from Lukkario

https://github.com/Lukkario/mocicon-tweak/blob/master/mocicon.c

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>

LICENSE

@@ -1,7 +0,0 @@
-Copyright 2009 Calvin Morrison
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,6 +1,12 @@
 # mocicon
 
 Mocicon is a Music On Console tray icon for quick access.
+Report Bugs (which there aren't any) or suggestions to MutantTurkey@gmail.com, MutantTurkey@freenode.net
+
+By Calvin Morrison 2009
+
+https://sourceforge.net/projects/mocicon
+
 
 ## OPTIONS/SOURCE:
 
@@ -10,6 +16,7 @@ On debian, build dependencies install with:
 apt install -y build-essential libgtk-3-dev
 ```
 
+
 compiling without make:
 
 ```shell
@@ -26,11 +33,3 @@ it's simple enough. you'll need the gtk+ 3.0 libs and that's it.
 
 run `./install` as root. It just installs mocicon in `/usr/local/bin/`
 
-## Attribution
-
-The MIT License was introduced for changes after the original author's works.
-(The email addresses and existing contacts all bounced as the author deleted all those accounts)
-
-Copyright 2009 Calvin Morrison
-Original project: https://sourceforge.net/projects/mocicon
-

mocicon.c

@@ -1,114 +1,126 @@
 //MocIcon. see README for help.
-//compile with: gcc -Wall -g mocicon.c -o mocicon $(pkg-config --cflags --libs gtk+-3.0)
+//compile with gcc -Wall -g mocicon.c -o mocicon `pkg-config --cflags --libs gtk+-2.0`
 #include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-static char *notify = "bash -c 'notify-send -t 2000 \"$(mocp -Q %artist)\" \"$(mocp -Q %song)\" -i gtk-cdrom'";
+static char *notify = "bash -c 'notify-send -t 2000 \"$(mocp -Q %artist)\" \"$(mocp -Q %song)\" -i gnome-music'";
 
-GtkWidget *menu, *quit_item, *launch_item, *play_item, *stop_item, *start_item, *next_item, *prev_item; 
+GtkWidget *menu, *quit_item, *launch_item, *next_item, *prev_item;
-
+GtkStatusIcon *icon;
-#define PTR_START 0
-#define PTR_PLAYTOGGLE 1
-#define PTR_EXIT 2
-#define PTR_NEXT 3
-#define PTR_PREV 4
-#define PTR_NOTIFY 5
-#define PTR_LAUNCH 6
 
 static gboolean button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_data);
 
 static void
-send( GtkMenuItem *item, gpointer data)
+send( GtkMenuItem *item, gpointer data) {
-{
+
 		switch(GPOINTER_TO_INT(data)) {
-		case PTR_START:
+			case 0:
-			g_spawn_command_line_async("mocp --play", NULL);
+				g_spawn_command_line_async("mocp -x", NULL);
+				g_spawn_command_line_async("pkill mocicon", NULL);
 					break;
-		case PTR_PLAYTOGGLE:
+			case 1:
 				g_spawn_command_line_async("mocp --toggle-pause", NULL);
 					break;
-		case PTR_EXIT:
+			case 2:
-			g_spawn_command_line_async("mocp --exit", NULL);
-			break;
-		case PTR_NEXT:
 				g_spawn_command_line_async("mocp --next", NULL);
+				gtk_status_icon_set_from_stock(icon, GTK_STOCK_MEDIA_PAUSE);
 					break;
-		case PTR_PREV:
+			case 3:
 				g_spawn_command_line_async("mocp --previous", NULL);
+				gtk_status_icon_set_from_stock(icon, GTK_STOCK_MEDIA_PAUSE);
 					break;
-		case PTR_NOTIFY: 
+			case 4:
 				g_spawn_command_line_async(notify, NULL);
 					break;
-		case PTR_LAUNCH:
+			case 5:
-			g_spawn_command_line_async("xterm -C mocp", NULL);
+				g_spawn_command_line_async("xfce4-terminal -e mocp", NULL);
 					break;
 		default:
 				break;
 		}
 }
 
-static void
+
-setup()
+static void setup() {
-{
+
-	GtkStatusIcon *icon; 
 	icon = gtk_status_icon_new_from_stock(GTK_STOCK_MEDIA_PLAY);
 	g_signal_connect(icon,"button-press-event", G_CALLBACK(button_press_cb), NULL);
 	menu = gtk_menu_new();
 
-	// Create Items
+// Create Items
-	start_item = gtk_image_menu_item_new_with_label("Start Server");
-	stop_item  = gtk_image_menu_item_new_with_label("Stop Server");
 	 next_item  = gtk_image_menu_item_new_with_label("Next");
 	 prev_item  = gtk_image_menu_item_new_with_label("Previous");
-	play_item  = gtk_image_menu_item_new_with_label("Play/Pause");
 	 launch_item = gtk_image_menu_item_new_with_label("Launch Moc");
 	 quit_item  = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
 
 	// Comment this section out if you don't want icons. sorry about the quit, it's stock.
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(start_item), gtk_image_new_from_stock(GTK_STOCK_YES, GTK_ICON_SIZE_MENU));
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(stop_item), gtk_image_new_from_stock(GTK_STOCK_NO, GTK_ICON_SIZE_MENU));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(next_item), gtk_image_new_from_stock(GTK_STOCK_MEDIA_FORWARD, GTK_ICON_SIZE_MENU));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(prev_item), gtk_image_new_from_stock(GTK_STOCK_MEDIA_REWIND, GTK_ICON_SIZE_MENU));
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(play_item), gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(launch_item), gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU));
-	g_signal_connect(G_OBJECT(quit_item), "activate", G_CALLBACK(gtk_main_quit), NULL);
+ 	g_signal_connect(G_OBJECT(quit_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 0 ));
-	g_signal_connect(G_OBJECT(play_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_PLAYTOGGLE ));
+	g_signal_connect(G_OBJECT(next_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 2 ));
-	g_signal_connect(G_OBJECT(start_item),"activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_START ));
+	g_signal_connect(G_OBJECT(prev_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 3 ));
-	g_signal_connect(G_OBJECT(stop_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_EXIT ));
+	g_signal_connect(G_OBJECT(launch_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 5 ));
-	g_signal_connect(G_OBJECT(next_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_NEXT ));
-	g_signal_connect(G_OBJECT(prev_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_PREV ));
-	g_signal_connect(G_OBJECT(launch_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_LAUNCH ));
 
-	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), stop_item); 
-	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), start_item); 
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), play_item); 
 	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), next_item);
 	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), prev_item);
 	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), launch_item);
 	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), quit_item);
  	 // show widgets
         gtk_widget_show_all(menu);
-}
+};
 
-gboolean
+gboolean button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_data)
-button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_data) 
 {
-	// I am not entirely sure what to do, double click implementation is
+	// I am not entirely sure what to do, double click implementation is possible. say double  click to get info. single click just pause/plays. but it will STILL register the first click, so it would pause and then give info.
-	// possible. say double  click to get info. single click just
-	// pause/plays. but it will STILL register the first click, so it would
-	// pause and then give info.
 	// Idk. needs work.
-
+  if(ev->button == 3)
-	if(ev->button == 3) { 
+	{
       // Popup the menu
     	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, ev->button, ev->time);
   }
 
-	if(ev->button == 2) {
+	if(ev->button == 2)
-		send(NULL, GINT_TO_POINTER( PTR_NOTIFY ));
+	{
+		send(NULL, GINT_TO_POINTER( 4 ));
 	}
 
-	if(ev->button == 1)  { 
+  if(ev->button == 1)
-		send(NULL, GINT_TO_POINTER( PTR_PLAYTOGGLE ));
+	{
+
+		//Check if mocp is running (this prevent crashing app while mocp is not running and pressing play)
+		if( 0 == system("pidof -x mocp > /dev/null"))
+		{
+			//Getting mocp status and changing tray icon
+			FILE *get_mocp_status;
+			char mocp_status_output[4];
+			get_mocp_status = popen("/bin/mocp -Q %state", "r");
+
+			if (get_mocp_status == NULL)
+			{
+				printf("Error: could not get status from mocp\n");
+			}
+
+			else
+			{
+				char *mocp_output = fgets(mocp_status_output, sizeof(mocp_status_output), get_mocp_status);
+
+					if (strcmp(mocp_output, "PLA") == 0)
+					{
+						gtk_status_icon_set_from_stock(icon, GTK_STOCK_MEDIA_PLAY);
+					}
+
+					else if (strcmp(mocp_output, "PAU") == 0)
+					{
+						gtk_status_icon_set_from_stock(icon, GTK_STOCK_MEDIA_PAUSE);
+					}
+			}
+
+			pclose(get_mocp_status);
+			send(NULL, GINT_TO_POINTER( 1 ));
+		}
 	}
 	return FALSE;
 }
@@ -116,8 +128,7 @@ button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_data)
 //this whole section really should just be one function with an if/then statement instead of a dozen different little functions
 
 //play or pause
-gint
+gint main(gint argc, gchar **argv)
-main(gint argc, gchar **argv) 
 {
     gtk_init(&argc, &argv);
     setup();