Mercurial > audlegacy-plugins

changeset 439:84029a5250c1 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - status icon plugin: made a tooltip popup that displays metadata of the current song
author giacomo
date Tue, 16 Jan 2007 10:34:12 -0800
parents 4fec4a3ca1a4
children 84fdf898438b
files ChangeLog src/statusicon/si.h src/statusicon/si_common.h src/statusicon/si_ui.c
diffstat 4 files changed, 136 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 15 14:04:11 2007 -0800
+++ b/ChangeLog	Tue Jan 16 10:34:12 2007 -0800
@@ -1,3 +1,10 @@
+2007-01-15 22:04:11 +0000  Giacomo Lozito <james@develia.org>
+  revision [960]
+  - evdev-plug: check that the player local datadir exists before attempting to create evdev-plug.conf
+  trunk/src/evdev-plug/ed_internals.c |   20 ++++++++++++++------
+  1 file changed, 14 insertions(+), 6 deletions(-)
+
+
 2007-01-15 21:25:41 +0000  Giacomo Lozito <james@develia.org>
   revision [958]
   - amidiplug: on midi backend init, pass a function that helps the backend to get the location of amidi-plug.conf
--- a/src/statusicon/si.h	Mon Jan 15 14:04:11 2007 -0800
+++ b/src/statusicon/si.h	Tue Jan 16 10:34:12 2007 -0800
@@ -34,7 +34,7 @@
     NULL,					/* handle */
     NULL,					/* filename */
     -1,						/* session */
-    "Status Icon Plugin " SI_VERSION_PLUGIN,	/* description */
+    "Status Icon " SI_VERSION_PLUGIN,		/* description */
     si_init,					/* init */
     si_about,					/* about */
     NULL,					/* configure */
--- a/src/statusicon/si_common.h	Mon Jan 15 14:04:11 2007 -0800
+++ b/src/statusicon/si_common.h	Tue Jan 16 10:34:12 2007 -0800
@@ -30,6 +30,6 @@
 
 #include "../../config.h"
 
-#define SI_VERSION_PLUGIN "0.1beta"
+#define SI_VERSION_PLUGIN "0.1"
 
 #endif /* !_I_ED_COMMON_H */
--- a/src/statusicon/si_ui.c	Mon Jan 15 14:04:11 2007 -0800
+++ b/src/statusicon/si_ui.c	Tue Jan 16 10:34:12 2007 -0800
@@ -23,8 +23,12 @@
 #include "si_common.h"
 #include "gtktrayicon.h"
 #include "si.xpm"
+#include <audacious/playlist.h>
+#include <audacious/titlestring.h>
+#include <audacious/ui_fileinfopopup.h>
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 
@@ -68,15 +72,124 @@
       break;
     }
 
-/*
+    /*
     case 3:
     {
+
       GtkWidget *si_rmenu = GTK_WIDGET(g_object_get_data( G_OBJECT(evbox) , "rmenu" ));
       gtk_menu_popup( GTK_MENU(si_rmenu) , NULL , NULL ,
                       NULL , NULL , event->button , event->time );
       break;
     }
-*/
+    */
+  }
+
+  return FALSE;
+}
+
+
+static gboolean
+si_ui_statusicon_popup_show ( gpointer evbox )
+{
+  if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "timer_active" )) == 1 )
+  {
+    TitleInput *tuple;
+    Playlist *pl_active = playlist_get_active();
+    gint pos = playlist_get_position(pl_active);
+    GtkWidget *popup = g_object_get_data( G_OBJECT(evbox) , "popup" );
+
+    tuple = playlist_get_tuple( pl_active , pos );
+    audacious_fileinfopopup_show_from_tuple( popup , tuple );
+
+    g_object_set_data( G_OBJECT(evbox) , "popup_active" , GINT_TO_POINTER(1) );
+  }
+
+  g_object_set_data( G_OBJECT(evbox) , "timer_id" , GINT_TO_POINTER(0) );
+  g_object_set_data( G_OBJECT(evbox) , "timer_active" , GINT_TO_POINTER(0) );
+  return FALSE;
+}
+
+
+static void
+si_ui_statusicon_popup_hide ( gpointer evbox )
+{
+  if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 )
+  {
+    GtkWidget *popup = g_object_get_data( G_OBJECT(evbox) , "popup" );
+    g_object_set_data( G_OBJECT(evbox) , "popup_active" , GINT_TO_POINTER(0) );
+    audacious_fileinfopopup_hide( popup , NULL );
+  }
+}
+
+
+static void
+si_ui_statusicon_popup_timer_start ( GtkWidget * evbox )
+{
+  gint timer_id = g_timeout_add( 500 , si_ui_statusicon_popup_show , evbox );
+  g_object_set_data( G_OBJECT(evbox) , "timer_id" , GINT_TO_POINTER(timer_id) );
+  g_object_set_data( G_OBJECT(evbox) , "timer_active" , GINT_TO_POINTER(1) );
+  return;
+}
+
+
+static void
+si_ui_statusicon_popup_timer_stop ( GtkWidget * evbox )
+{
+  if ( GPOINTER_TO_INT(g_object_get_data(G_OBJECT(evbox),"timer_active")) == 1 )
+    g_source_remove( GPOINTER_TO_INT(g_object_get_data(G_OBJECT(evbox),"timer_id")) );
+
+  g_object_set_data( G_OBJECT(evbox) , "timer_id" , GINT_TO_POINTER(0) );
+  g_object_set_data( G_OBJECT(evbox) , "timer_active" , GINT_TO_POINTER(0) );
+  return;
+}
+
+
+static gboolean
+si_ui_statusicon_cb_popup ( GtkWidget * evbox , GdkEvent * event )
+{
+  if ((event->type == GDK_LEAVE_NOTIFY || event->type == GDK_ENTER_NOTIFY) &&
+    event->crossing.detail == GDK_NOTIFY_INFERIOR)
+      return FALSE;
+
+  if ( event->type != GDK_KEY_PRESS && event->type != GDK_KEY_RELEASE )
+  {
+    GtkWidget *event_widget = gtk_get_event_widget( event );
+    if ( event_widget != evbox )
+      return FALSE;
+  }
+
+  switch (event->type)
+  {
+    case GDK_EXPOSE:
+      /* do nothing */
+      break;
+
+    case GDK_ENTER_NOTIFY:
+        si_ui_statusicon_popup_timer_start( evbox );
+      break;
+
+     case GDK_LEAVE_NOTIFY:
+       si_ui_statusicon_popup_timer_stop( evbox );
+       if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 )
+         si_ui_statusicon_popup_hide( evbox );
+       break;
+
+     case GDK_MOTION_NOTIFY:
+       break; /* ignore */
+
+     case GDK_BUTTON_PRESS:
+     case GDK_BUTTON_RELEASE:
+     case GDK_KEY_PRESS:
+     case GDK_KEY_RELEASE:
+     case GDK_PROXIMITY_IN:
+     case GDK_SCROLL:
+       si_ui_statusicon_popup_timer_stop( evbox );
+       if ( GPOINTER_TO_INT(g_object_get_data( G_OBJECT(evbox) , "popup_active" )) == 1 )
+         si_ui_statusicon_popup_hide( evbox );
+       break;
+
+     default:
+       break;
   }
 
   return FALSE;
@@ -88,6 +201,7 @@
 {
   GtkWidget *si_image;
   GtkWidget *si_rmenu;
+  GtkWidget *si_popup;
   GdkPixbuf *si_pixbuf;
   GtkTrayIcon *si_applet;
 
@@ -104,11 +218,21 @@
 
   si_evbox = gtk_event_box_new();
   si_rmenu = si_ui_rmenu_create( si_evbox );
+  si_popup = audacious_fileinfopopup_create();
 
   g_object_set_data( G_OBJECT(si_evbox) , "rmenu" , si_rmenu );
   g_object_set_data( G_OBJECT(si_evbox) , "applet" , si_applet );
+
+  g_object_set_data( G_OBJECT(si_evbox) , "timer_id" , GINT_TO_POINTER(0) );
+  g_object_set_data( G_OBJECT(si_evbox) , "timer_active" , GINT_TO_POINTER(0) );
+
+  g_object_set_data( G_OBJECT(si_evbox) , "popup_active" , GINT_TO_POINTER(0) );
+  g_object_set_data( G_OBJECT(si_evbox) , "popup" , si_popup );
+
   g_signal_connect( G_OBJECT(si_evbox) , "button-press-event" ,
                     G_CALLBACK(si_ui_statusicon_cb_btpress) , NULL );
+  g_signal_connect_after( G_OBJECT(si_evbox) , "event-after" ,
+                          G_CALLBACK(si_ui_statusicon_cb_popup) , NULL );
 
   gtk_container_add( GTK_CONTAINER(si_evbox), si_image );
   gtk_container_add( GTK_CONTAINER(si_applet), si_evbox );
@@ -125,6 +249,7 @@
   {
     GtkTrayIcon *si_applet = g_object_get_data( G_OBJECT(si_evbox) , "applet" );
     GtkWidget *si_rmenu = g_object_get_data( G_OBJECT(si_evbox) , "rmenu" );
+    si_ui_statusicon_popup_timer_stop( si_evbox ); /* just in case the timer is active */
     gtk_widget_destroy( GTK_WIDGET(si_evbox) );
     gtk_widget_destroy( GTK_WIDGET(si_rmenu) );
     gtk_widget_destroy( GTK_WIDGET(si_applet) );