Changeset 4197 for trunk/console

Timestamp:

08/27/05 08:17:33 (3 years ago)

Author:

phatfil

Message:

this does three things:
- saves the last user correctly when using the F10 menu
- adds support for specifying a users protocol (when not using the F10 menu) - ie. /message foo.Licq or /message foo.MSN (sf task id 115776)
- removes \t's from source

Location:

trunk/console/src

Files:

• console.cpp (modified) (6 diffs)
• console.h (modified) (1 diff)
• console_menu.cpp (modified) (15 diffs)
• console_print.cpp (modified) (2 diffs)
• window.cpp (modified) (3 diffs)

trunk/console/src/console.cpp

@@ -257 +257 @@
     scrollok(winCon[i]->Win(), true);
     winCon[i]->fProcessInput = &CLicqConsole::InputCommand;
-    winCon[i]->data = NULL;
+    winCon[i]->data = NULL;
   }
   winCon[0]->fProcessInput = &CLicqConsole::InputLogWindow;
@@ -1452 +1452 @@
 }
 
-
-
+/*---------------------------------------------------------------------------
+ * CLicqConsole::SaveLastUser
+ *-------------------------------------------------------------------------*/
+void CLicqConsole::SaveLastUser(const char *szId, unsigned long nPPID)
+{
+  // Save this as the last user
+  if (winMain->sLastContact.szId == 0 ||
+      !(strcmp(szId, winMain->sLastContact.szId) == 0 &&
+      nPPID == winMain->sLastContact.nPPID))
+  {
+    if (winMain->sLastContact.szId)
+      free(winMain->sLastContact.szId);
+    winMain->sLastContact.nPPID = nPPID;
+    winMain->sLastContact.szId = strdup(szId);
+    PrintStatus();
+  }
+}
 
 /*---------------------------------------------------------------------------
@@ -2072 +2087 @@
 
       winMain->event = licqDaemon->icqFileTransfer(strtoul(data->szId, (char **)NULL, 10),
-              data->szFileName, data->szDescription, lFileList, ICQ_TCPxMSG_NORMAL,
+              data->szFileName, data->szDescription, lFileList, ICQ_TCPxMSG_NORMAL,
                        !bDirect);
       break;
@@ -2960 +2975 @@
             }
 
-        winMain->state = STATE_QUERY;
-        winMain->wprintf("\nSave password? (y/N) ");
+            winMain->state = STATE_QUERY;
+            winMain->wprintf("\nSave password? (y/N) ");
           }
           break;
@@ -3008 +3023 @@
 
             // Passwords match if we are this far, now set up the new user
-        winMain->wprintf("Registration complete for user %s\n",data->szUin);
+            winMain->wprintf("Registration complete for user %s\n",data->szUin);
             gUserManager.SetOwnerUin(atol(data->szUin));
             ICQOwner *owner = gUserManager.FetchOwner(LOCK_W);
@@ -3014 +3029 @@
             gUserManager.DropOwner();
 
-        winMain->wprintf("Save password? (y/N) ");
-        winMain->state = STATE_QUERY;
+            winMain->wprintf("Save password? (y/N) ");
+            winMain->state = STATE_QUERY;
           }
           break;

trunk/console/src/console.h

@@ -209 +209 @@
   bool ParseMacro(char *);
   unsigned long GetUinFromArg(char **);
+  void SaveLastUser(const char *, unsigned long);
   struct SContact GetContactFromArg(char **);
 };

trunk/console/src/console_menu.cpp

@@ -11 +11 @@
     "Force a refresh of the contact list." },
   { "console", &CLicqConsole::MenuSwitchConsole, NULL,
-    " %B%ccons%bole <num>",
-    "Switch to a console." },
+    " %B%ccons%bole <num>",
+    "Switch to a console." },
   { "group", &CLicqConsole::MenuGroup, NULL,
     " %B%cg%broup [ %B#%b ]",
@@ -26 +26 @@
     "Authorize grant or refuse  the given user." },
   { "history", &CLicqConsole::MenuHistory, &CLicqConsole::TabUser,
-    " %B%chi%bstory %B<user>%b [ %B#%b,%B#%b ]",
+    " %B%chi%bstory %B<user>[.protocol]%b [ %B#%b,%B#%b ]",
     "Print the given range of events from the history.\n"
     "'$' represents the last message, and +/- can be used to specify "
@@ -42 +42 @@
     "...\n" },
   { "message", &CLicqConsole::MenuMessage, &CLicqConsole::TabUser,
-    " %B%cm%bessage %B<user>%b",
+    " %B%cm%bessage %B<user>[.protocol]%b",
     "Send a message to a user." },
   { "url", &CLicqConsole::MenuUrl, &CLicqConsole::TabUser,
@@ -57 +57 @@
     "Display user information." },
   { "view", &CLicqConsole::MenuView, &CLicqConsole::TabUser,
-    " %B%cv%biew [ %B<user>%b ]",
+    " %B%cv%biew [ %B<user>[.protocol]%b ]",
     "View an incoming event." },
   { "secure", &CLicqConsole::MenuSecure, &CLicqConsole::TabUser,
@@ -66 +66 @@
     "View a user's auto-reponse or set your own (use #)." },
   { "remove", &CLicqConsole::MenuRemove, &CLicqConsole::TabUser,
-    " %B%cr%bemove %B<user>%b",
+    " %B%cr%bemove %B<user>[.protocol]%b",
     "Remove a user from your contact list." },
   { "status", &CLicqConsole::MenuStatus, &CLicqConsole::TabStatus,
@@ -150 +150 @@
             break;
         }
-      }
-      break;
+      }
+      SaveLastUser((*it)->szId, (*it)->nPPID);
+      break;
     }
   }
@@ -189 +190 @@
   {
     list <SScrollUser *>::iterator it;
-    for (it = m_lScrollUsers.begin(); it != m_lScrollUsers.end(); it++)
+    for (it = m_lScrollUsers.begin(); it != m_lScrollUsers.end(); it++)
     {
       if ((*it)->pos == userSelected)
@@ -205 +206 @@
           UserCommand_Msg((*it)->szId, (*it)->nPPID, NULL);
         }
+        SaveLastUser((*it)->szId, (*it)->nPPID);
         break;
       }
@@ -274 +276 @@
     PrintBoxLeft();
     winMain->wprintf("[%3d] %s v%s", (*pit)->Id(), (*pit)->Name(),
-             (*pit)->Version());
+             (*pit)->Version());
     PrintBoxRight(70);
   }
@@ -692 +694 @@
   char *szAlias, *szCmd;
   char *szArg = *p_szArg;
+  unsigned long nPPID = 0;
   struct SContact scon;
   scon.szId = NULL;
@@ -698 +701 @@
     return scon;
   }
+
+  string strArg(szArg);
+  string::size_type nPos = strArg.find_last_of(".");
+  if (nPos != string::npos)
+  {
+    string strProtocol(strArg, nPos + 1, strArg.size());
+    ProtoPluginsList pl;
+    ProtoPluginsListIter it;
+    licqDaemon->ProtoPluginList(pl);
+    for (it = pl.begin(); it != pl.end(); it++)
+    {
+      if (strcasecmp((*it)->Name(), strProtocol.c_str()) == 0)
+      {
+        nPPID = (*it)->PPID();
+        szArg[strArg.find_last_of(".")] = '\0';
+        break;
+      }
+    }
+  }
+ 
 
   // Check if the alias is quoted
@@ -741 +764 @@
   FOR_EACH_USER_START(LOCK_R)
   {
-    if (strcasecmp(szAlias, pUser->GetAlias()) == 0)
+    if ((nPPID && pUser->PPID() == nPPID && strcasecmp(szAlias, pUser->GetAlias()) == 0) ||
+        (!nPPID && strcasecmp(szAlias, pUser->GetAlias()) == 0))
     {
       scon.szId = pUser->IdString();
@@ -747 +771 @@
       FOR_EACH_PROTO_USER_BREAK;
     }
-    else if (strcasecmp(szAlias, pUser->IdString()) == 0)
+    else if ((nPPID && pUser->PPID() == nPPID && strcasecmp(szAlias, pUser->IdString()) == 0) ||
+             (!nPPID && strcasecmp(szAlias, pUser->IdString()) == 0))
     {
       scon.szId = pUser->IdString();
@@ -762 +787 @@
     return scon;
   }
- 
-  // Save this as the last user
-  if (winMain->sLastContact.szId == 0 ||
-      !(strcmp(scon.szId, winMain->sLastContact.szId) == 0 &&
-      scon.nPPID == winMain->sLastContact.nPPID))
-  {
-    if (winMain->sLastContact.szId)
-      free(winMain->sLastContact.szId);
-    winMain->sLastContact.nPPID = scon.nPPID;
-    winMain->sLastContact.szId = strdup(scon.szId);
-    PrintStatus();
-  }
-
+  SaveLastUser(scon.szId, scon.nPPID);
   return scon;
 }
@@ -890 +903 @@
       {
         szId = pUser->IdString();
-    nPPID = pUser->PPID();
+        nPPID = pUser->PPID();
         t = pUser->Touched();
       }

trunk/console/src/console_print.cpp

@@ -336 +336 @@
 
     // Create the line to printout now
-    if (pUser->NewMessages() > 0)
+    if (pUser->NewMessages() > 0)
     {
       s->szLine = new char[strlen(szTmp) + 19];
       snprintf(s->szLine, strlen(szTmp) + 19, "</%d></K>%s<!K><!%d>", s->color->nColor - 6, szTmp ? szTmp : "", s->color->nColor - 6);
       s->szLine[strlen(szTmp) + 18] = '\0';
-    } else {
+    } else {
       s->szLine = new char[strlen(szTmp) + 11];
-      snprintf(s->szLine, strlen(szTmp) + 11, "</%d>%s<!%d>", s->color->nColor, szTmp ? szTmp : "", s->color->nColor);
+      snprintf(s->szLine, strlen(szTmp) + 11, "</%d>%s<!%d>", s->color->nColor, szTmp ? szTmp : "", s->color->nColor);
       s->szLine[strlen(szTmp) + 10] = '\0';
-    }
+    }
     free(szTmp);
     
@@ -385 +385 @@
   {
     s = new SScrollUser;
-    s->pos = i;
-    s->nPPID = (*it)->nPPID;
+    s->pos = i;
+    s->nPPID = (*it)->nPPID;
         s->color = (*it)->color;
-    sprintf(s->szId, "%s", (*it)->szId);
-    
+    sprintf(s->szId, "%s", (*it)->szId);
+
     m_lScrollUsers.push_back(s);
     ulist[i++] = copyChar((*it)->szLine);

trunk/console/src/window.cpp

@@ -63 +63 @@
   else
   {
-    win = newwin(rows, cols, y, x);
+    win = newwin(rows, cols, y, x);
     wmove(win, 0, 0);
   }
@@ -73 +73 @@
   if (_useCDK)
   { 
-    initCDKColor();
+    initCDKColor();
     cdkscreen = initCDKScreen(win);
     if (cdkscreen == NULL)
@@ -81 +81 @@
     }
   }
-    
+
   nLastUin = 0;
   sLastContact.szId = 0;