Changeset 5978 for branches/newosd

Timestamp:

01/02/08 11:25:29 (11 months ago)

Author:

eugene

Message:

Updated to the latest devel version of libaosd and cleaned a code a little bit.

Location:

branches/newosd/src

Files:

• iface.cpp (modified) (10 diffs)
• iface.h (modified) (2 diffs)

branches/newosd/src/iface.cpp

@@ -1 +1 @@
 #include "iface.h"
-
-#include <string>
 
 #include <licq_icqd.h>
@@ -11 +9 @@
   aosd_set_transparency(aosd, TRANSPARENCY_COMPOSITE);
   aosd_set_hide_upon_mouse_event(aosd, True);
-  aosd_set_renderer(aosd,
-      reinterpret_cast<AosdRenderer>(aosd_text_renderer), &trd);
+  aosd_set_renderer(aosd, aosd_text_renderer, &trd);
   aosd_set_names(aosd, "OSD Plugin", "Licq");
 
@@ -27 +24 @@
   trd.shadow.y_offset = 2;
   trd.shadow.color = "black";
-  trd.shadow.opacity = 127;
-
-  trd.fore.color = "green";
+  trd.shadow.opacity = 192;
+
   trd.fore.opacity = 255;
 
@@ -50 +46 @@
 void Iface::processSignal(CICQSignal* sig)
 {
-  clearLayout();
+  string msg = "";
+  bool message = false;
 
   switch (sig->Signal())
@@ -64 +61 @@
         break;
 
-      string msg = "";
+      msg = u->GetAlias();
 
       switch (sig->SubSignal())
       {
         case USER_STATUS:
-          msg = u->GetAlias();
           msg += " changed status to: ";
           msg += u->StatusStr();
@@ -78 +74 @@
         case USER_EVENTS:
           if (sig->Argument() < 0)
+          {
+            msg.clear();
             break;
+          }
 
           if (sig->Argument() == 0)
           {
-            msg = u->GetAlias();
             msg += " checked your auto-response";
             break;
@@ -91 +89 @@
             if (ue == NULL)
               break;
-            msg = setLayoutTag(u);
+            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;
           }
           break;
 
         default:
+          msg.clear();
           break;
       }
 
       gUserManager.DropUser(u);
-      pango_layout_set_text_aosd(trd.lay, const_cast<char*>(msg.c_str()));
-      displayLayout();
     }
       break;
@@ -118 +118 @@
       break;
   }
-}
-
-void Iface::clearLayout()
-{
-  pango_layout_set_text(trd.lay, "", -1);
-  pango_layout_set_indent(trd.lay, 0);
+
+  if (!msg.empty())
+    displayLayout(msg, message);
 }
 
@@ -180 +177 @@
 }
 
-const char* Iface::setLayoutTag(ICQUser* u)
-{
-  string str = u->GetAlias();
-  str += (true && u->Secure()) ? " (S)" : "";
-  str += ": ";
-
-  int tag_width = 0;
-
-  pango_layout_set_text(trd.lay, str.c_str(), -1);
-  pango_layout_get_size(trd.lay, &tag_width, NULL);
-  pango_layout_set_indent(trd.lay, -tag_width);
-
-  return str.c_str();
-}
-
-void Iface::displayLayout()
-{
-  if (strlen(pango_layout_get_text(trd.lay)) == 0)
-    return;
+void Iface::displayLayout(string& msg, bool message)
+{
+/*
+  string nl = "‹"; // U+2028
+  string::size_type pos = 0;
+  while ((pos = msg.find('\n', pos)) != string::npos)
+    msg.replace(pos, nl.length(), nl);
+*/
+  pango_layout_set_text(trd.lay, const_cast<char*>(msg.c_str()), -1);
+
+  trd.fore.color = const_cast<char*>(message ? "green" : "gray");
 
   unsigned width, height;
@@ -205 +194 @@
 
   aosd_set_position_with_offset(aosd,
-      COORDINATE_MINIMUM, COORDINATE_MINIMUM,
+      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, 1000, 150);
+      80, -80);
+
+  aosd_flash(aosd, 0, 3000, 150);
 }
 

branches/newosd/src/iface.h

@@ -2 +2 @@
 #define IFACE_H
 
-class CICQSignal;
-class ICQUser;
+#include <string>
 
-extern "C"
-{
 #include <libaosd/aosd.h>
 #include <libaosd/aosd-text.h>
 #undef Status
-}
+
+class CICQSignal;
+class ICQUser;
 
 class Iface
@@ -29 +28 @@
 
   const char* setLayoutTag(ICQUser* u);
-  void clearLayout();
-  void displayLayout();
+  void displayLayout(std::string& msg, bool message);
 };