Changeset 3801 for trunk/console

Timestamp:

08/09/04 23:48:55 (4 years ago)

Author:

emostar

Message:

* Fix some documentation for the help.
* Add support for $ (last user)

Location:

trunk/console/src

Files:

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

trunk/console/src/console.cpp

@@ -2323 +2323 @@
         winMain->wprintf("%C%AGranting authorizing to %s...", m_cColorInfo->nColor,
                          m_cColorInfo->nAttr, data->szId);
-        winMain->event = licqDaemon->icqAuthorizeGrant(strtoul(data->szId, (char **)NULL, 10), data->szMsg);
+        winMain->event = licqDaemon->ProtoAuthorizeGrant(data->szId, data->nPPID, data->szMsg);
       }
       else
@@ -2329 +2329 @@
         winMain->wprintf("%C%ARefusing authorizing to %s...", m_cColorInfo->nColor,
                          m_cColorInfo->nAttr, data->szId);
-        winMain->event = licqDaemon->icqAuthorizeRefuse(strtoul(data->szId, (char **)NULL, 10), data->szMsg);
+        winMain->event = licqDaemon->ProtoAuthorizeRefuse(data->szId, data->nPPID, data->szMsg);
       }
 

trunk/console/src/console.h

@@ -35 +35 @@
   bool bOffline;
   const struct SColorMap *color;
-};
-
-struct SContact
-{
-  char *szId;
-  unsigned long nPPID;
 };
 

trunk/console/src/console_menu.cpp

@@ -92 +92 @@
     "a space.  The command can be any valid command, do not\n"
     "prepend the command character when defining.\n"
-    "Example: \"/define r last message\" creates a macro \"r\"\n"
+    "Example: \"/define r message $\" creates a macro \"r\"\n"
     "which replies to the last user you talked to."},
   { "help", &CLicqConsole::MenuHelp, NULL,
@@ -352 +352 @@
  * CLicqConsole::MenuAuthorize
  *-------------------------------------------------------------------------*/
-//TODO: update for other protocols
 void CLicqConsole::MenuAuthorize(char *szArg)
 {
   if (szArg == NULL)
   {
-    winMain->wprintf("%CSpecify \"grant/refuse\" and a UIN to authorize.\n", COLOR_RED);
+    winMain->wprintf("%CSpecify \"grant/refuse\" and a UIN/Screen Name to authorize.\n", COLOR_RED);
     return;
   }
@@ -372 +371 @@
     bGrant = false;
     szArg += 6;
-  }
-
-  // Try to change groups
-  int nUin = atol(szArg);
-  
-  if (nUin == 0)
-  {
-    winMain->wprintf("%CUIN must be non-zero.\n", COLOR_RED);
-    return;
   }
 
@@ -394 +384 @@
 
   return;
-
-
 }
 
@@ -617 +605 @@
     szCmd = strchr(szCmd, ' ');
   }
-  //TODO - fix this
-  //else if (szArg[0] == '#')
-  //{
-  //  *p_szArg = NULL;
-  //  return gUserManager.OwnerUin();
-  //}
-  //else if (szArg[0] == '$')
-  //{
-  //  *p_szArg = NULL;
-  //  return winMain->nLastUin;
-  //}
+  else if (szArg[0] == '#')
+  {
+    *p_szArg = NULL;
+    ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+    scon.szId = o->IdString();
+    scon.nPPID = o->PPID(); 
+    gUserManager.DropOwner();
+    return scon;
+  }
+  else if (szArg[0] == '$')
+  {
+    *p_szArg = NULL;
+    return winMain->sLastContact;
+  }
   else
   {
@@ -659 +650 @@
   }
  
-  //TODO
   // Save this as the last user
-  //if (winMain->nLastUin != nUin)
-  //{
-  //  winMain->nLastUin = nUin;
-  //  PrintStatus();
-  //}
+  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();
+  }
 
   return scon;

trunk/console/src/console_print.cpp

@@ -141 +141 @@
     strcpy(szMsgStr, "No Messages");
 
-  if (winMain->nLastUin != 0)
-  {
-    ICQUser *u = gUserManager.FetchUser(winMain->nLastUin, LOCK_R);
+  if (winMain->sLastContact.szId != 0)
+  {
+    ICQUser *u = gUserManager.FetchUser(winMain->sLastContact.szId,
+      winMain->sLastContact.nPPID, LOCK_R);
     if (u == NULL)
       strcpy(szLastUser, "<Removed>");
@@ -293 +294 @@
     s->bOffline = pUser->StatusOffline();
 
-    unsigned long iStatus = pUser->StatusFull();
-
-    if(iStatus & ICQ_STATUS_FxPRIVATE)
+    unsigned short nStatus = pUser->Status();
+
+    if(pUser->StatusInvisible())
     {
       szTmp = pUser->usprintf(m_szOtherOnlineFormat);
@@ -301 +302 @@
     }
 
-    if((unsigned short)iStatus == ICQ_STATUS_OFFLINE)
+    else if(nStatus == ICQ_STATUS_OFFLINE)
     {
       szTmp = pUser->usprintf(m_szOfflineFormat);
       s->color = m_cColorOffline;
     }
-    else if( (unsigned short) iStatus != ICQ_STATUS_OFFLINE &&
-        ((iStatus & ICQ_STATUS_DND) || (iStatus & ICQ_STATUS_OCCUPIED) ||
-        (iStatus & ICQ_STATUS_NA) || (iStatus & ICQ_STATUS_AWAY)))
+    else if(nStatus == ICQ_STATUS_DND || nStatus == ICQ_STATUS_OCCUPIED ||
+            nStatus == ICQ_STATUS_NA || nStatus == ICQ_STATUS_AWAY)
     {
       szTmp = pUser->usprintf(m_szAwayFormat);
       s->color = m_cColorAway;
     }
-    else if((unsigned short)iStatus == ICQ_STATUS_FREEFORCHAT)
+    else if(nStatus == ICQ_STATUS_FREEFORCHAT)
     {
       szTmp = pUser->usprintf(m_szOtherOnlineFormat);
       s->color = m_cColorOnline;
     }
-    else if((unsigned short)iStatus == ICQ_STATUS_ONLINE)
+    else if(nStatus == ICQ_STATUS_ONLINE)
     {
       szTmp = pUser->usprintf(m_szOnlineFormat);

trunk/console/src/window.cpp

@@ -67 +67 @@
   wbkgd(win, COLOR_PAIR(COLOR_WHITE));
   nLastUin = 0;
+  sLastContact.szId = 0;
+  sLastContact.nPPID = 0;
   nLastHistory = 1;
 }
@@ -72 +74 @@
 CWindow::~CWindow()
 {
+   if (sLastContact.szId)
+     free(sLastContact.szId);
    delwin(win);
 }

trunk/console/src/window.h

@@ -15 +15 @@
 class CLicqConsole;
 class CData;
+
+struct SContact
+{
+  char *szId;
+  unsigned long nPPID;
+};
+
 
 class CWindow
@@ -43 +50 @@
   CData *data;
   unsigned long nLastUin;
-  //struct SContact sLastContact;
+  struct SContact sLastContact;
   unsigned short nLastHistory;
 protected: