Changeset 5974 for branches/newosd

Timestamp:

01/01/08 02:35:22 (11 months ago)

Author:

eugene

Message:

More message processing.

Location:

branches/newosd/src

Files:

• iface.cpp (modified) (6 diffs)
• iface.h (modified) (1 diff)

branches/newosd/src/iface.cpp

@@ -39 +39 @@
   if (max_width > 0)
     pango_layout_set_width(trd.lay, max_width * PANGO_SCALE);
+  pango_layout_set_wrap(trd.lay, PANGO_WRAP_WORD_CHAR);
 }
 
@@ -56 +57 @@
     {
       if (!checkDisabledTimer() ||
-          !checkOwner(sig->Id(), sig->PPID()))
+          !checkOwner(sig))
         break;
 
@@ -76 +77 @@
 
         case USER_EVENTS:
+          if (sig->Argument() < 0)
+            break;
+
+          if (sig->Argument() == 0)
+          {
+            msg = u->GetAlias();
+            msg += " checked your auto-response";
+            break;
+          }
+
+          {
+            CUserEvent* ue = u->EventPeekId(sig->Argument());
+            if (ue == NULL)
+              break;
+            msg = setLayoutTag(u);
+            char* trans = gTranslator.ToUnicode(const_cast<char*>(ue->Text()),
+                u->UserEncoding());
+            msg += trans;
+            delete[] trans;
+          }
           break;
 
@@ -124 +145 @@
 }
 
-bool Iface::checkOwner(char* id, unsigned long ppid)
-{
-  ICQOwner* o = gUserManager.FetchOwner(ppid, LOCK_R);
+bool Iface::checkOwner(CICQSignal* sig)
+{
+  ICQOwner* o = gUserManager.FetchOwner(sig->PPID(), LOCK_R);
 
   if (o == NULL)
@@ -135 +156 @@
   do
   {
-    if (strcmp(id, o->IdString()) == 0)
+    // TODO status check
+
+    if (sig->Signal() == SIGNAL_UPDATExUSER &&
+        sig->SubSignal() == USER_EVENTS &&
+        sig->Argument() > 0)
+      break;
+
+    if (strcmp(sig->Id(), o->IdString()) == 0)
     {
       ret = false;
@@ -141 +169 @@
     }
 
-    // TODO status check
   } while (false);
 
-  gUserManager.DropOwner(ppid);
+  gUserManager.DropOwner(sig->PPID());
   return ret;
 }

branches/newosd/src/iface.h

@@ -25 +25 @@
 
   ICQUser* checkUser(char* id, unsigned long ppid);
-  bool checkOwner(char* id, unsigned long ppid);
+  bool checkOwner(CICQSignal* sig);
   bool checkDisabledTimer();