Changeset 5981 for branches/newosd

Timestamp:

01/03/08 00:56:18 (11 months ago)

Author:

eugene

Message:

Major update. Converted almost everything to take config parameters.

Location:

branches/newosd/src

Files:

• CMakeLists.txt (modified) (1 diff)
• conf.cpp (added)
• conf.h (added)
• iface.cpp (modified) (8 diffs)
• iface.h (modified) (2 diffs)
• plugin.cpp (modified) (1 diff)

branches/newosd/src/CMakeLists.txt

@@ -3 +3 @@
 set(SRCS
     plugin.cpp
+    conf.cpp
     iface.cpp)
 

branches/newosd/src/iface.cpp

@@ -4 +4 @@
 #include <licq_translate.h>
 
+#include "conf.h"
+
 Iface::Iface()
 {
   aosd = aosd_new();
   aosd_set_transparency(aosd, TRANSPARENCY_COMPOSITE);
-  aosd_set_hide_upon_mouse_event(aosd, True);
   aosd_set_renderer(aosd, aosd_text_renderer, &trd);
   aosd_set_names(aosd, "OSD Plugin", "Licq");
 
+  g_type_init();
   memset(&trd, 0, sizeof(TextRenderData));
-
-  g_type_init();
-
   trd.lay = pango_layout_new_aosd();
-
-  trd.geom.x_offset = 10;
-  trd.geom.y_offset = 10;
-
-  trd.shadow.x_offset = 2;
-  trd.shadow.y_offset = 2;
-  trd.shadow.color = "black";
-  trd.shadow.opacity = 192;
-
-  trd.fore.opacity = 255;
-
-  pango_layout_set_font_aosd(trd.lay, "Times New Roman Bold 24");
-
-  int max_width;
-  aosd_get_screen_size(aosd, &max_width, NULL);
-  max_width -= 2 * trd.geom.x_offset + trd.shadow.x_offset + 80;
-  if (max_width > 0)
-    pango_layout_set_width(trd.lay, max_width * PANGO_SCALE);
   pango_layout_set_wrap(trd.lay, PANGO_WRAP_WORD_CHAR);
+
+  conf = new Conf();
+
+  updateTextRenderData();
+
+  FOR_EACH_OWNER_START(LOCK_R)
+  {
+    ppidTimers[pOwner->PPID()] = time(NULL);
+  }
+  FOR_EACH_OWNER_END;
 }
 
 Iface::~Iface()
 {
+  delete conf;
+  ppidTimers.clear();
   aosd_destroy(aosd);
   pango_layout_unref_aosd(trd.lay);
@@ -47 +40 @@
 {
   string msg = "";
-  bool message = false;
+  bool control = true;
 
   switch (sig->Signal())
@@ -53 +46 @@
     case SIGNAL_UPDATExUSER:
     {
-      if (!checkDisabledTimer() ||
-          !checkOwner(sig))
+      if (filterSignal(sig))
         break;
 
-      ICQUser* u = checkUser(sig->Id(), sig->PPID());
+      ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
       if (u == NULL)
         break;
@@ -86 +78 @@
 
           {
-            CUserEvent* ue = u->EventPeekId(sig->Argument());
-            if (ue == NULL)
-              break;
-            if (u->Secure()) // TODO config check
-              msg += " (S)";
-            msg += ": ";
-            char* trans = gTranslator.ToUnicode(const_cast<char*>(ue->Text()),
-                u->UserEncoding());
-            msg += trans;
-            delete[] trans;
-            message = true;
+            control = false;
+            if (conf->notifyOnly)
+            {
+              msg = "Message from ";
+              msg += u->GetAlias();
+              if (conf->markSecure && u->Secure())
+                msg += " [secured]";
+              msg += ".";
+            }
+            else
+            {
+              CUserEvent* ue = u->EventPeekId(sig->Argument());
+              if (ue == NULL)
+                break;
+              if (conf->markSecure && u->Secure())
+                msg += " (S)";
+              msg += ": ";
+              char* trans = gTranslator.ToUnicode(const_cast<char*>(ue->Text()),
+                  u->UserEncoding());
+              msg += trans;
+              delete[] trans;
+            }
           }
           break;
@@ -110 +113 @@
 
     case SIGNAL_LOGON:
-      break;
-
     case SIGNAL_LOGOFF:
+      ppidTimers[sig->PPID()] = time(NULL) + conf->quietTimeout;
       break;
 
@@ -120 +122 @@
 
   if (!msg.empty())
-    displayLayout(msg, message);
-}
-
-ICQUser* Iface::checkUser(char* id, unsigned long ppid)
-{
-  if (id == NULL)
-    return NULL;
-
-  ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
-
+    displayLayout(msg, control);
+}
+
+void Iface::updateTextRenderData()
+{
+  conf->loadConfig();
+
+  aosd_set_hide_upon_mouse_event(aosd, conf->mouseActive);
+  pango_layout_set_font_aosd(trd.lay, conf->font);
+
+  trd.geom.x_offset = conf->marginHorizontal;
+  trd.geom.y_offset = conf->marginVertical;
+
+  trd.back.color = conf->backColor;
+  trd.back.opacity = conf->backOpacity;
+
+  trd.shadow.x_offset = conf->shadowOffset;
+  trd.shadow.y_offset = conf->shadowOffset;
+  trd.shadow.color = conf->shadowColor;
+  trd.shadow.opacity = conf->shadowOpacity;
+
+  trd.fore.opacity = conf->textOpacity;
+
+  int width = aosd_text_get_screen_wrap_width(aosd, &trd);
+  if (conf->wrapWidth == 0 || width < 0)
+    pango_layout_set_width(trd.lay, -1);
+  else
+    pango_layout_set_width(trd.lay,
+        (width > conf->wrapWidth ? conf->wrapWidth : width) * PANGO_SCALE);
+}
+
+bool Iface::filterSignal(CICQSignal* sig)
+{
+  if (ppidTimers[sig->PPID()] > time(NULL))
+    return true;
+
+  bool ret = false;
+
+  ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
   if (u == NULL)
-    return NULL;
+    return true;
 
   if (u->IgnoreList())
-  {
-    gUserManager.DropUser(u);
-    return NULL;
-  }
-
-  return u;
-}
-
-bool Iface::checkOwner(CICQSignal* sig)
-{
+    ret = true;
+
+  gUserManager.DropUser(u);
+
+  if (ret)
+    return true;
+
   ICQOwner* o = gUserManager.FetchOwner(sig->PPID(), LOCK_R);
-
   if (o == NULL)
-    return false;
-
-  bool ret = true;
+    return true;
 
   do
@@ -155 +180 @@
     // TODO status check
 
+    // Don't let owner messages (e.g. auth-reqs) be filtered
     if (sig->Signal() == SIGNAL_UPDATExUSER &&
         sig->SubSignal() == USER_EVENTS &&
@@ -162 +188 @@
     if (strcmp(sig->Id(), o->IdString()) == 0)
     {
-      ret = false;
+      ret = true;
       break;
     }
-
   } while (false);
 
-  gUserManager.DropOwner(sig->PPID());
+  gUserManager.DropOwner(o->PPID());
+
   return ret;
 }
 
-bool Iface::checkDisabledTimer()
-{
-  return true;
-}
-
-void Iface::displayLayout(string& msg, bool message)
+void Iface::displayLayout(string& msg, bool control)
 {
   pango_layout_set_text(trd.lay, const_cast<char*>(msg.c_str()), -1);
 
-  trd.fore.color = const_cast<char*>(message ? "green" : "gray");
+  trd.fore.color = control ? conf->textControlColor : conf->textColor;
 
   unsigned width, height;
 
-  pango_layout_get_size_aosd(trd.lay, &width, &height, &trd.lbearing);
+  aosd_text_get_size(&trd, &width, &height);
 
   aosd_set_position_with_offset(aosd,
-      COORDINATE_MINIMUM, COORDINATE_MAXIMUM,
-      width + 2 * trd.geom.x_offset + trd.shadow.x_offset,
-      height + 2 * trd.geom.y_offset + trd.shadow.y_offset,
-      80, -80);
-
-  aosd_flash(aosd, 0, 3000, 150);
+      conf->posHorizontal, conf->posVertical,
+      width, height, conf->offsetHorizontal, conf->offsetVertical);
+
+  aosd_flash(aosd, conf->fadeIn,
+      conf->fadeFull + msg.size() * conf->delayPerChar, conf->fadeOut);
 }
 

branches/newosd/src/iface.h

@@ -3 +3 @@
 
 #include <string>
+#include <map>
+#include <time.h>
 
-#include <libaosd/aosd.h>
-#include <libaosd/aosd-text.h>
+#include <aosd.h>
+#include <aosd-text.h>
 #undef Status
 
 class CICQSignal;
 class ICQUser;
+
+class Conf;
 
 class Iface
@@ -18 +22 @@
 
   void processSignal(CICQSignal* sig);
+  void updateTextRenderData();
 
 private:
   Aosd* aosd;
   TextRenderData trd;
+  Conf* conf;
+  std::map<unsigned long, time_t> ppidTimers;
 
-  ICQUser* checkUser(char* id, unsigned long ppid);
-  bool checkOwner(CICQSignal* sig);
-  bool checkDisabledTimer();
+  bool filterSignal(CICQSignal* sig);
 
-  const char* setLayoutTag(ICQUser* u);
-  void displayLayout(std::string& msg, bool message);
+  void displayLayout(std::string& msg, bool control);
 };
 

branches/newosd/src/plugin.cpp

@@ -108 +108 @@
 
       case '1':
+        iface->updateTextRenderData();
         blocked = false;
         break;