Changeset 5973 for branches/newosd

Timestamp:

12/31/07 20:03:04 (11 months ago)

Author:

eugene

Message:

A bit more event processing added.

Location:

branches/newosd/src

Files:

• iface.cpp (modified) (4 diffs)
• iface.h (modified) (2 diffs)
• plugin.cpp (modified) (1 diff)

branches/newosd/src/iface.cpp

@@ -4 +4 @@
 
 #include <licq_icqd.h>
+#include <licq_translate.h>
 
 Iface::Iface()
@@ -48 +49 @@
 void Iface::processSignal(CICQSignal* sig)
 {
-  if (setText(sig->Id(), sig->PPID()))
-    aosd_flash(aosd, 0, 1000, 150);
+  clearLayout();
+
+  switch (sig->Signal())
+  {
+    case SIGNAL_UPDATExUSER:
+    {
+      if (!checkDisabledTimer() ||
+          !checkOwner(sig->Id(), sig->PPID()))
+        break;
+
+      ICQUser* u = checkUser(sig->Id(), sig->PPID());
+      if (u == NULL)
+        break;
+
+      string msg = "";
+
+      switch (sig->SubSignal())
+      {
+        case USER_STATUS:
+          msg = u->GetAlias();
+          msg += " changed status to: ";
+          msg += u->StatusStr();
+          if (sig->Argument() > 0)
+            msg += " [logged on]";
+          break;
+
+        case USER_EVENTS:
+          break;
+
+        default:
+          break;
+      }
+
+      gUserManager.DropUser(u);
+      pango_layout_set_text_aosd(trd.lay, const_cast<char*>(msg.c_str()));
+      displayLayout();
+    }
+      break;
+
+    case SIGNAL_LOGON:
+      break;
+
+    case SIGNAL_LOGOFF:
+      break;
+
+    default:
+      break;
+  }
 }
 
-bool Iface::setText(char* id, unsigned long ppid)
+void Iface::clearLayout()
 {
-  int tag_width;
-  unsigned width, height;
+  pango_layout_set_text(trd.lay, "", -1);
+  pango_layout_set_indent(trd.lay, 0);
+}
 
+ICQUser* Iface::checkUser(char* id, unsigned long ppid)
+{
   if (id == NULL)
+    return NULL;
+
+  ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
+
+  if (u == NULL)
+    return NULL;
+
+  if (u->IgnoreList())
+  {
+    gUserManager.DropUser(u);
+    return NULL;
+  }
+
+  return u;
+}
+
+bool Iface::checkOwner(char* id, unsigned long ppid)
+{
+  ICQOwner* o = gUserManager.FetchOwner(ppid, LOCK_R);
+
+  if (o == NULL)
     return false;
 
-  ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
-  if (u == NULL)
-    return false;
+  bool ret = true;
 
+  do
+  {
+    if (strcmp(id, o->IdString()) == 0)
+    {
+      ret = false;
+      break;
+    }
+
+    // TODO status check
+  } while (false);
+
+  gUserManager.DropOwner(ppid);
+  return ret;
+}
+
+bool Iface::checkDisabledTimer()
+{
+  return true;
+}
+
+const char* Iface::setLayoutTag(ICQUser* u)
+{
   string str = u->GetAlias();
-  gUserManager.DropUser(u);
+  str += (true && u->Secure()) ? " (S)" : "";
   str += ": ";
+
+  int tag_width = 0;
 
   pango_layout_set_text(trd.lay, str.c_str(), -1);
@@ -72 +165 @@
   pango_layout_set_indent(trd.lay, -tag_width);
 
-  str += "received\nthe\nsignal";
+  return str.c_str();
+}
 
-  pango_layout_set_text_aosd(trd.lay, const_cast<char*>(str.c_str()));
+void Iface::displayLayout()
+{
+  if (strlen(pango_layout_get_text(trd.lay)) == 0)
+    return;
+
+  unsigned width, height;
+
   pango_layout_get_size_aosd(trd.lay, &width, &height, &trd.lbearing);
 
@@ -83 +183 @@
       80, 80);
 
-  return true;
+  aosd_flash(aosd, 0, 1000, 150);
 }
 

branches/newosd/src/iface.h

@@ -3 +3 @@
 
 class CICQSignal;
+class ICQUser;
 
 extern "C"
@@ -23 +24 @@
   TextRenderData trd;
 
-  bool setText(char* id, unsigned long ppid);
+  ICQUser* checkUser(char* id, unsigned long ppid);
+  bool checkOwner(char* id, unsigned long ppid);
+  bool checkDisabledTimer();
+
+  const char* setLayoutTag(ICQUser* u);
+  void clearLayout();
+  void displayLayout();
 };
 

branches/newosd/src/plugin.cpp

@@ -88 +88 @@
         break;
 
+      case 'E':
+        {
+          ICQEvent* ev = daemon->PopPluginEvent();
+          if (ev != NULL)
+            delete ev;
+        }
+        break;
+
       case 'X':
         finita = true;