Changeset 5965 for branches/newosd

Timestamp:

12/21/07 00:22:39 (11 months ago)

Author:

eugene

Message:

Updated to the new libaosd API.

Location:

branches/newosd/src

Files:

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

branches/newosd/src/iface.cpp

@@ -1 +1 @@
 #include "iface.h"
+
+#include <stdlib.h>
+#include <sys/wait.h>
 
 #include <licq_icqd.h>
 
-extern "C"
-{
-#include <libaosd/aosd.h>
-#include <libaosd/aosd-text.h>
-}
-
 Iface::Iface()
 {
-  aosd = aosd_new_text(
-      "<span font_desc='Times New Roman 20' color='red'>"
-      "Received a signal..."
-      "</span>",
-      80, 80);
+  aosd = aosd_new();
+  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_names(aosd, "OSD Plugin", "Licq");
 
-  aosd_set_transparency(aosd, TRANSPARENCY_COMPOSITE);
+  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 = 127;
+
+  trd.fore.color = "green";
+  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);
 }
 
@@ -23 +44 @@
 {
   aosd_destroy(aosd);
+  pango_layout_unref_aosd(trd.lay);
 }
 
 void Iface::processSignal(CICQSignal* sig)
 {
-  aosd_flash(aosd, 0, 100);
+  if (setText(sig->Id(), sig->PPID()))
+    aosd_flash(aosd, 0, 1000, 150);
+}
+
+bool Iface::setText(char* id, unsigned long ppid)
+{
+  int tag_width;
+  unsigned width, height;
+
+  if (id == NULL)
+    return false;
+
+  ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
+  if (u == NULL)
+    return false;
+
+  char* alias = strdup(u->GetAlias());
+  gUserManager.DropUser(u);
+  alias = static_cast<char*>(realloc(alias, strlen(alias) + 3));
+  strcat(alias, ": ");
+
+  pango_layout_set_text(trd.lay, alias, -1);
+  pango_layout_get_size(trd.lay, &tag_width, NULL);
+  pango_layout_set_indent(trd.lay, -tag_width);
+
+  char* x = "received\nthe\nsignal";
+  alias = static_cast<char*>(realloc(alias, strlen(alias) + strlen(x) + 1));
+  strcat(alias, x);
+
+  pango_layout_set_text_aosd(trd.lay, alias);
+  free(alias);
+  pango_layout_get_size_aosd(trd.lay, &width, &height, &trd.lbearing);
+
+  aosd_set_position_with_offset(aosd,
+      COORDINATE_MINIMUM, COORDINATE_MINIMUM,
+      width + 2 * trd.geom.x_offset + trd.shadow.x_offset,
+      height + 2 * trd.geom.y_offset + trd.shadow.y_offset,
+      80, 80);
+
+  return true;
 }
 

branches/newosd/src/iface.h

@@ -4 +4 @@
 class CICQSignal;
 
-typedef struct _Aosd Aosd;
+extern "C"
+{
+#include <libaosd/aosd.h>
+#include <libaosd/aosd-text.h>
+#undef Status
+}
 
 class Iface
@@ -16 +21 @@
 private:
   Aosd* aosd;
+  TextRenderData trd;
+
+  bool setText(char* id, unsigned long ppid);
 };
 
 #endif
+
 /* vim: set ts=2 sw=2 et : */