api: Use a single signal for UI events

This allows additional UI events to be added as sub signals instead of taking up bits in the signal mask.
licq-im · Dec 21, 2011 · ab59e4c · ab59e4c
1 parent d1275f2
commit ab59e4c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/licq/include/licq/daemon.h b/licq/include/licq/daemon.h
@@ -115,10 +115,6 @@ class Daemon : private boost::noncopyable
   bool ignoreType(unsigned type) const          { return (myIgnoreTypes & type); }
   void setIgnoreType(unsigned type, bool ignore);
 
-  void pluginUIViewEvent(const UserId& userId);
-
-  void pluginUIMessage(const UserId& userId);
-
   /**
    * Get path for the base dir (e.g. /home/fred/.licq/)
    *

diff --git a/licq/include/licq/pluginsignal.h b/licq/include/licq/pluginsignal.h
@@ -43,15 +43,14 @@ class PluginSignal
     SignalLogon         = 1<<2,         // Owner logged on, userId is owner
     SignalLogoff        = 1<<3,         // Owner logged off, userId is owner
     SignalOnEvent       = 1<<4,         // ?
-    SignalUiViewEvent   = 1<<5,         // UI should popup oldest unread event for userId (if set)
-    SignalUiMessage     = 1<<6,         // UI should open message dialog for userId
     SignalAddedToServer = 1<<7,         // userId has been successfully added to server list
     SignalNewProtocol   = 1<<8,         // A new protocol plugin has been loaded, subtype is protocolId
     SignalConversation  = 1<<9,         // Conversation signal
     SignalVerifyImage   = 1<<17,        // A registration verification image is available as basedir/verify.jpg
     SignalNewOwner      = 1<<18,        // Registration complete, userId is new owner
+    SignalPluginEvent   = 1<<19,        // Event to perform in a plugin, subtype specifies event
 
-    SignalAll           = 0x000603ff,   // Mask for all known signals
+    SignalAll           = 0x000e039f,   // Mask for all known signals
   };
 
   enum ListSubSignal
@@ -95,6 +94,12 @@ class PluginSignal
     ConvoLeave          = 3,            // userId left conversation
   };
 
+  enum PluginSubSignal
+  {
+    PluginViewEvent     = 1,            // UI should popup oldest unread event for userId (if set)
+    PluginStartMessage  = 2,            // UI should open message dialog for userId
+  };
+
   /**
    * Constructor
    *

diff --git a/licq/src/daemon.cpp b/licq/src/daemon.cpp
@@ -57,7 +57,6 @@
 using namespace std;
 using namespace LicqDaemon;
 using Licq::gLog;
-using Licq::PluginSignal;
 using Licq::User;
 using Licq::UserId;
 
@@ -435,16 +434,6 @@ void Licq::Daemon::cancelEvent(Licq::Event* event)
   gIcqProtocol.CancelEvent(event);
 }
 
-void Licq::Daemon::pluginUIViewEvent(const Licq::UserId& userId)
-{
-  gPluginManager.pushPluginSignal(new PluginSignal(PluginSignal::SignalUiViewEvent, 0, userId));
-}
-
-void Licq::Daemon::pluginUIMessage(const Licq::UserId& userId)
-{
-  gPluginManager.pushPluginSignal(new PluginSignal(PluginSignal::SignalUiMessage, 0, userId));
-}
-
 void Daemon::shutdownPlugins()
 {
   licq->ShutdownPlugins();

diff --git a/licq/src/fifo.cpp b/licq/src/fifo.cpp
@@ -53,6 +53,7 @@
 #include "licq.h"
 
 using std::string;
+using Licq::PluginSignal;
 using Licq::UserId;
 using Licq::gDaemon;
 using Licq::gLog;
@@ -647,7 +648,8 @@ static int fifo_ui_viewevent(int argc, const char* const* argv)
     return 0;
   }
 
-  gDaemon.pluginUIViewEvent(UserId(szId, nPPID));
+  gPluginManager.pushPluginSignal(new PluginSignal(PluginSignal::SignalPluginEvent,
+      PluginSignal::PluginViewEvent, UserId(szId, nPPID)));
 
   if (szId != NULL)
     free(szId);
@@ -668,7 +670,10 @@ static int fifo_ui_message(int argc, const char* const* argv)
     nRet = -1;
   }
   else if (atoid(argv[1], true, &szId, &nPPID))
-    gDaemon.pluginUIMessage(UserId(szId, nPPID));
+  {
+    gPluginManager.pushPluginSignal(new PluginSignal(PluginSignal::SignalPluginEvent,
+        PluginSignal::PluginStartMessage, UserId(szId, nPPID)));
+  }
   else
   {
     ReportBadBuddy(argv[0],argv[1]);

diff --git a/qt4-gui/src/core/signalmanager.cpp b/qt4-gui/src/core/signalmanager.cpp
@@ -100,15 +100,20 @@ void SignalManager::ProcessSignal(Licq::PluginSignal* sig)
       emit logoff();
       break;
 
-    case Licq::PluginSignal::SignalUiViewEvent:
-      emit ui_viewevent(userId);
-      break;
+    case Licq::PluginSignal::SignalPluginEvent:
+    {
+      switch (sig->subSignal())
+      {
+        case Licq::PluginSignal::PluginViewEvent:
+          emit ui_viewevent(userId);
+          break;
 
-    case Licq::PluginSignal::SignalUiMessage:
-      //TODO
-      emit ui_message(userId);
+        case Licq::PluginSignal::PluginStartMessage:
+          emit ui_message(userId);
+          break;
+      }
       break;
-
+    }
     case Licq::PluginSignal::SignalAddedToServer:
       //TODO
       gProtocolManager.updateUserAlias(userId);