import from 0.1.4 release
Copyright 2009 Calvin Morrison
This commit is contained in:
Calvin Morrison
commit
713059fdfb
5 changed files with 240 additions and 0 deletions
14
CHANGELOG
Normal file
14
CHANGELOG
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
2010 Changelog
|
||||||
|
|
||||||
|
-- Fixed Syntax Error causing bug. (poplarch)
|
||||||
|
-- Make Integration (Jake Dukam)
|
||||||
|
-- Added Xterm + Mocp Launch item (MUTU)
|
||||||
|
-- Reworked the Icon calls, now only does it once. (MUTU)
|
||||||
|
-- Added notification support. Default IS notify-send, but you can redefine it in the source. variable is named notify (MUTU)
|
||||||
|
-- GTK-STOCK-QUIT fix
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
50
Makefile
Normal file
50
Makefile
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
# surf - simple browser
|
||||||
|
# See LICENSE file for copyright and license details.
|
||||||
|
|
||||||
|
include config.mk
|
||||||
|
|
||||||
|
SRC = mocicon.c
|
||||||
|
OBJ = ${SRC:.c=.o}
|
||||||
|
|
||||||
|
all: options mocicon
|
||||||
|
|
||||||
|
options:
|
||||||
|
@echo mocicon build options:
|
||||||
|
@echo "CFLAGS = ${CFLAGS}"
|
||||||
|
@echo "LDFLAGS = ${LDFLAGS}"
|
||||||
|
@echo "CC = ${CC}"
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
@echo CC $<
|
||||||
|
@${CC} -c ${CFLAGS} $<
|
||||||
|
|
||||||
|
${OBJ}: config.mk
|
||||||
|
|
||||||
|
|
||||||
|
mocicon: ${OBJ}
|
||||||
|
@echo CC -o $@
|
||||||
|
@${CC} -o $@ mocicon.o ${LDFLAGS}
|
||||||
|
|
||||||
|
clean:
|
||||||
|
@echo cleaning
|
||||||
|
@rm -f mocicon ${OBJ} mocicon-${VERSION}.tar.gz
|
||||||
|
|
||||||
|
dist: clean
|
||||||
|
@echo creating dist tarball
|
||||||
|
@mkdir -p mocicon-${VERSION}
|
||||||
|
@cp -R CHANGELOG Makefile README config.mk ${SRC} mocicon-${VERSION}
|
||||||
|
@tar -cf mocicon-${VERSION}.tar mocicon-${VERSION}
|
||||||
|
@bzip2 mocicon-${VERSION}.tar
|
||||||
|
@rm -rf mocicon-${VERSION}
|
||||||
|
|
||||||
|
install: all
|
||||||
|
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
||||||
|
@mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||||
|
@cp -f mocicon ${DESTDIR}${PREFIX}/bin
|
||||||
|
@chmod 755 ${DESTDIR}${PREFIX}/bin/mocicon
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
|
||||||
|
@rm -f ${DESTDIR}${PREFIX}/bin/mocicon
|
||||||
|
|
||||||
|
.PHONY: all options clean dist install uninstall
|
||||||
31
README
Normal file
31
README
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
README
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
Mocicon.sourceforge.net
|
||||||
|
|
||||||
|
|
||||||
|
OPTIONS/SOURCE:
|
||||||
|
|
||||||
|
The source is fairly simple, and there are plenty of options to go around.
|
||||||
|
I don't do much source commenting, but it is all fairly self explanitory.
|
||||||
|
|
||||||
|
compiling without make:gcc -Wall -g -O2 mocicon.c -o mocicon `pkg-config --cflags --libs gtk+-2.0`
|
||||||
|
|
||||||
|
with make it is the regular as root:
|
||||||
|
|
||||||
|
Make clean install
|
||||||
|
|
||||||
|
it's simple enough. you'll need the gtk+ 2.0 libs and that's it.
|
||||||
|
|
||||||
|
|
||||||
|
run ./install as root. it just installs mocicon in /usr/local/bin/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
28
config.mk
Normal file
28
config.mk
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
# mocicon version
|
||||||
|
VERSION = 0.1.4
|
||||||
|
|
||||||
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
# paths
|
||||||
|
PREFIX = /usr
|
||||||
|
MANPREFIX = ${PREFIX}/share/man
|
||||||
|
|
||||||
|
|
||||||
|
# includes and libs
|
||||||
|
|
||||||
|
GTKINC=$(shell pkg-config --cflags gtk+-2.0)
|
||||||
|
GTKLIB=$(shell pkg-config --libs gtk+-2.0 )
|
||||||
|
|
||||||
|
INCS = -I. -I/usr/include ${GTKINC}
|
||||||
|
LIBS = -L/usr/lib -lc ${GTKLIB}
|
||||||
|
# flags
|
||||||
|
CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
|
CFLAGS = -std=c99 -O2 ${INCS} ${CPPFLAGS}
|
||||||
|
LDFLAGS = -s ${LIBS}
|
||||||
|
|
||||||
|
# Solaris
|
||||||
|
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
||||||
|
#LDFLAGS = ${LIBS}
|
||||||
|
|
||||||
|
# compiler and linker
|
||||||
|
CC = cc
|
||||||
117
mocicon.c
Normal file
117
mocicon.c
Normal file
|
|
@ -0,0 +1,117 @@
|
||||||
|
//MocIcon. see README for help.
|
||||||
|
//compile with gcc -Wall -g mocicon.c -o mocicon `pkg-config --cflags --libs gtk+-2.0`
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
static char *notify = "bash -c 'notify-send -t 2000 \"$(mocp -Q %artist)\" \"$(mocp -Q %song)\" -i gtk-cdrom'";
|
||||||
|
|
||||||
|
GtkWidget *menu, *quit_item, *launch_item, *play_item, *stop_item, *start_item, *next_item, *prev_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 0:
|
||||||
|
g_spawn_command_line_async("mocp --play", NULL);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
g_spawn_command_line_async("mocp --toggle-pause", NULL);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
g_spawn_command_line_async("mocp --exit", NULL);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
g_spawn_command_line_async("mocp --next", NULL);
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
g_spawn_command_line_async("mocp --previous", NULL);
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
g_spawn_command_line_async(notify, NULL);
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
g_spawn_command_line_async("xterm -C mocp", NULL);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
// 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(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 ));
|
||||||
|
|
||||||
|
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 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( 5 ));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(ev->button == 1) {
|
||||||
|
send(NULL, GINT_TO_POINTER( 1 ));
|
||||||
|
}
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
gtk_init(&argc, &argv);
|
||||||
|
setup();
|
||||||
|
gtk_main();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue