cleaned up more, commented, CONFIG::: denotes sections to be configurable, etc

1 files changed, 22 insertions, 13 deletions

diff --git a/mocicon.c b/mocicon.c
index 30fe46b..2fbbfe1 100644
--- a/mocicon.c
+++ b/mocicon.c
@@ -2,11 +2,12 @@
 //compile with gcc -Wall -g mocicon.c -o mocicon `pkg-config --cflags --libs gtk+-2.0`
 #include <gtk/gtk.h> 
 
+
+//CONFIG ::: user defined information 
+//static char *notify = "bash -c 'notify-send -t 2000 \"$(mocp -i)\" -i gtk-cdrom";
 //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 -i 2>/dev/null | grep Artist)\" \"$(mocp -i 2>/dev/null | grep Song)\" -i gtk-cdrom'";
-//static char *notify = "bash -c 'notify-send -t 2000 \"$(mocp -i)\" -i gtk-cdrom";
 GtkWidget *menu, *quit_item, *launch_item, *play_item, *stop_item, *start_item, *next_item, *prev_item; 
-static gchar *temp;
 
 
 
@@ -22,6 +23,7 @@ static gchar *temp;
 		g_free(stdoutput);
 		return (char *)temp;
 }*/
+
 static void send( GtkMenuItem *item, int data) {
 
 		switch(data) {
@@ -41,9 +43,8 @@ static void send( GtkMenuItem *item, int data) {
 					break;
 			case 7:
 
-//	    	dialog = gtk_file_chooser_dialog_new( "Select file",  NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_SAVE, 1, GTK_STOCK_CANCEL, 0, NULL ); 
-  //          gtk_dialog_run( GTK_DIALOG( dialog ));
-
+    //	    	dialog = gtk_file_chooser_dialog_new( "Select file",  NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_SAVE, 1, GTK_STOCK_CANCEL, 0, NULL ); 
+    //          gtk_dialog_run( GTK_DIALOG( dialog ));
     //    playlist = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( dialog ) ); 
 		//g_spawn_command_line_sync("mocp -c",  NULL, NULL, NULL, NULL);
 		//g_spawn_command_line_sync(g_strconcat("mocp -a ", playlist),  NULL, NULL, NULL, NULL);
@@ -53,13 +54,17 @@ static void send( GtkMenuItem *item, int data) {
 		default:
 				break;
 		}
-		g_free(temp);
+		//g_free(temp);
 }
 
 gboolean button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_data) 
 {  
-	// 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.
-     
+	// I am not entirely sure what to do, double click implementation is possible. 
+  // if the double  click was to get info, then the single click just pause/plays.
+  // but it will STILL register the first click before the double, so it would pause 
+  // and then give info, which is not gonna work.
+  
+  // CONFIG ::: user defined mouseclicks   
     if(ev->button == 3) { 
          gtk_menu_popup(GTK_MENU(menu), NULL,
                                         NULL,
@@ -76,34 +81,38 @@ gboolean button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_
 
 static void setup() {
 	GtkStatusIcon *icon; 
-	gchar *querychar=NULL;
+	//gchar *querychar=NULL;
 	icon = gtk_status_icon_new_from_stock(GTK_STOCK_MEDIA_PLAY); 
 	g_signal_connect(icon,"button-press-event", G_CALLBACK(button_press_cb), NULL); 
 	//tooltip
 
 	menu = gtk_menu_new(); 
-		// Create Items
+  // init 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.
+	 quit_item  = gtk_image_menu_item_new_with_label("Quit MocIcon");
+	
+  // Comment this section out if you don't want icons.
+  // CONFIG::: icons size, icons on/off 
  	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));
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(quit_item), gtk_image_new_from_stock(GTK_STOCK_QUIT, GTK_ICON_SIZE_MENU));
+
  	g_signal_connect(G_OBJECT(quit_item), "activate", G_CALLBACK(gtk_main_quit), NULL);
 	g_signal_connect(G_OBJECT(play_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 1 ));
 	g_signal_connect(G_OBJECT(start_item),"activate", G_CALLBACK(send), GINT_TO_POINTER( 0 ));
 	g_signal_connect(G_OBJECT(stop_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 2 ));
 	g_signal_connect(G_OBJECT(next_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 3 ));
 	g_signal_connect(G_OBJECT(prev_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 4 ));
-	g_signal_connect(G_OBJECT(launch_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( 6 ));
+	g_signal_connect(G_OBJECT(launch_item),"activate", G_CALLBACK(send), GINT_TO_POINTER( 6 ));
         
 	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), stop_item); 
 	 gtk_menu_shell_append(GTK_MENU_SHELL(menu), start_item);