From 7b25f80de68e606c5bc103ed4b40263defc2f034 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 7 Feb 2022 10:11:11 -0500 Subject: [PATCH] mocicon: mostly formatting cleanup Signed-off-by: Vincent Batts --- mocicon.c | 139 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 68 deletions(-) diff --git a/mocicon.c b/mocicon.c index 5829043..6b4c6cf 100644 --- a/mocicon.c +++ b/mocicon.c @@ -17,59 +17,60 @@ GtkWidget *menu, *quit_item, *launch_item, *play_item, *stop_item, *start_item, static gboolean button_press_cb(GtkStatusIcon *icon, GdkEventButton *ev, gpointer user_data); static void -send( GtkMenuItem *item, gpointer data) { - - switch(GPOINTER_TO_INT(data)) { - case PTR_START: - g_spawn_command_line_async("mocp --play", NULL); - break; - case PTR_PLAYTOGGLE: - g_spawn_command_line_async("mocp --toggle-pause", NULL); - break; - case PTR_EXIT: - g_spawn_command_line_async("mocp --exit", NULL); - break; - case PTR_NEXT: - g_spawn_command_line_async("mocp --next", NULL); - break; - case PTR_PREV: - g_spawn_command_line_async("mocp --previous", NULL); - break; - case PTR_NOTIFY: - g_spawn_command_line_async(notify, NULL); - break; - case PTR_LAUNCH: - g_spawn_command_line_async("xterm -C mocp", NULL); - break; +send( GtkMenuItem *item, gpointer data) +{ + switch(GPOINTER_TO_INT(data)) { + case PTR_START: + g_spawn_command_line_async("mocp --play", NULL); + break; + case PTR_PLAYTOGGLE: + g_spawn_command_line_async("mocp --toggle-pause", NULL); + break; + case PTR_EXIT: + g_spawn_command_line_async("mocp --exit", NULL); + break; + case PTR_NEXT: + g_spawn_command_line_async("mocp --next", NULL); + break; + case PTR_PREV: + g_spawn_command_line_async("mocp --previous", NULL); + break; + case PTR_NOTIFY: + g_spawn_command_line_async(notify, NULL); + break; + case PTR_LAUNCH: + g_spawn_command_line_async("xterm -C mocp", NULL); + break; default: - break; - } + 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 - 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); - + + // 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(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(gtk_main_quit), NULL); g_signal_connect(G_OBJECT(play_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_PLAYTOGGLE )); g_signal_connect(G_OBJECT(start_item),"activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_START )); g_signal_connect(G_OBJECT(stop_item), "activate", G_CALLBACK(send), GINT_TO_POINTER( PTR_EXIT )); @@ -79,46 +80,48 @@ static void setup() { 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), 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 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. - // Idk. needs work. - - { - 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) { - send(NULL, GINT_TO_POINTER( PTR_NOTIFY )); + // show widgets + gtk_widget_show_all(menu); } - - - if(ev->button == 1) { + +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. + // Idk. needs work. + + 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) { + send(NULL, GINT_TO_POINTER( PTR_NOTIFY )); + } + + if(ev->button == 1) { send(NULL, GINT_TO_POINTER( PTR_PLAYTOGGLE )); - } + } return FALSE; } //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 main(gint argc, gchar **argv) +gint +main(gint argc, gchar **argv) { - gtk_init(&argc, &argv); - setup(); - gtk_main(); + gtk_init(&argc, &argv); + setup(); + gtk_main(); - return 0; + return 0; }