Changeset 4363 for trunk/console

Timestamp:

01/15/06 10:58:47 (3 years ago)

Author:

phatfil

Message:

restore symbolic colour names. undef's ncurses colour defines so as to not conflict with the cdk ones. Thanks to Mitch Davis <mjd at afork.com> for this patch.

Location:

trunk/console/src

Files:

• console.cpp (modified) (44 diffs)
• console_menu.cpp (modified) (26 diffs)
• console_print.cpp (modified) (14 diffs)
• window.cpp (modified) (1 diff)
• window.h (modified) (1 diff)

trunk/console/src/console.cpp

@@ -91 +91 @@
 const struct SColorMap aColorMaps[NUM_COLORMAPS] =
   {
-    { "green", 24, A_NORMAL }
+    { "green", COLOR_GREEN, A_NORMAL }
     ,          // 0
-    { "red", 16, A_NORMAL }
+    { "red", COLOR_RED, A_NORMAL }
     ,              // 1
-    { "cyan", 56, A_NORMAL }
+    { "cyan", COLOR_CYAN, A_NORMAL }
     ,            // 2
-    { "white", 8, A_NORMAL }
+    { "white", COLOR_WHITE, A_NORMAL }
     ,          // 3
-    { "magenta", 48, A_NORMAL }
+    { "magenta", COLOR_MAGENTA, A_NORMAL }
     ,      // 4
-    { "blue", 40, A_NORMAL }
+    { "blue", COLOR_BLUE, A_NORMAL }
     ,            // 5
-    { "yellow", 32, A_NORMAL }
+    { "yellow", COLOR_YELLOW, A_NORMAL }
     ,        // 6
-    { "black", 8, A_NORMAL }
+    { "black", COLOR_BLACK, A_NORMAL }
     ,          // 7
-    { "bright_green", 24, A_BOLD }
+    { "bright_green", COLOR_GREEN, A_BOLD }
     ,     // 8
-    { "bright_red", 16, A_BOLD }
+    { "bright_red", COLOR_RED, A_BOLD }
     ,         // 9
-    { "bright_cyan", 56, A_BOLD }
+    { "bright_cyan", COLOR_CYAN, A_BOLD }
     ,       // 10
-    { "bright_white", 8, A_BOLD }
+    { "bright_white", COLOR_WHITE, A_BOLD }
     ,     // 11
-    { "bright_magenta", 48, A_BOLD }
+    { "bright_magenta", COLOR_MAGENTA, A_BOLD }
     , // 12
-    { "bright_blue", 40, A_BOLD }
+    { "bright_blue", COLOR_BLUE, A_BOLD }
     ,       // 13
-    { "bright_yellow", 32, A_BOLD }    // 14
+    { "bright_yellow", COLOR_YELLOW, A_BOLD }    // 14
   };
 
@@ -436 +436 @@
   {
   case L_WARN:
-    cp = 32;
+    cp = COLOR_YELLOW;
     break;
   case L_ERROR:
-    cp = 16;
+    cp = COLOR_RED;
     break;
   case L_PACKET:
-    cp = 40;
+    cp = COLOR_BLUE;
     break;
   case L_UNKNOWN:
-    cp = 48;
+    cp = COLOR_MAGENTA;
     break;
   case L_INFO:
   default:
-    cp = 8;
+    cp = COLOR_WHITE;
     break;
   }
@@ -455 +455 @@
   char *l = &p[LOG_PREFIX_OFFSET];
   p[LOG_PREFIX_OFFSET - 1] = '\0';
-  winLog->wprintf("%C%s %C%s", 24, p, cp, l);
+  winLog->wprintf("%C%s %C%s", COLOR_GREEN, p, cp, l);
   if (log->NextLogType() == L_ERROR)
   {
-    winMain->wprintf("%C%s %C%s", 24, p, cp, l);
+    winMain->wprintf("%C%s %C%s", COLOR_GREEN, p, cp, l);
     winMain->RefreshWin();
   }
@@ -632 +632 @@
   case ICQ_CMDxSND_LOGON:
     if (e->Result() != EVENT_SUCCESS)
-      winMain->wprintf("%CLogon failed.  See the log console for details.\n", 16);
+      winMain->wprintf("%CLogon failed.  See the log console for details.\n", COLOR_RED);
     break;
 
@@ -670 +670 @@
       winMain->wprintf("%C%AFile transfer could not connect.  See network "
                        "window for details.%C%Z\n",
-                       16, A_BOLD, 8, A_BOLD);
+                       COLOR_RED, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -677 +677 @@
       winMain->wprintf("%C%AFile transfer could not bind to a port.  See "
                        "network window for details.%C%Z\n",
-                       16, A_BOLD, 8, A_BOLD);
+                       COLOR_RED, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -684 +684 @@
       winMain->wprintf("%C%AFile transfer unable to create new thread.  See "
                        "network window for details.%C%Z\n",
-                       16, A_BOLD, 8, A_BOLD);
+                       COLOR_RED, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -693 +693 @@
     case FT_DONExBATCH:
       winMain->wprintf("%C%AFile transfer successfuly finished.%C%Z\n",
-                       24, A_BOLD, 8, A_BOLD);
+                       COLOR_GREEN, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -699 +699 @@
     case FT_ERRORxCLOSED:
       winMain->wprintf("%C%AFile transfer closed.%C%Z\n",
-                       16, A_BOLD, 8, A_BOLD);
+                       COLOR_RED, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -705 +705 @@
     case FT_ERRORxFILE:
       winMain->wprintf("%C%AFile transfer I/O error.%C%Z\n",
-                       16, A_BOLD, 8, A_BOLD);
+                       COLOR_RED, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -711 +711 @@
     case FT_ERRORxHANDSHAKE:
       winMain->wprintf("%C%AFile transfer handshake error.%C%Z\n",
-                       16, A_BOLD, 8, A_BOLD);
+                       COLOR_RED, A_BOLD, COLOR_WHITE, A_BOLD);
       bCloseFT = true;
       break;
@@ -761 +761 @@
   if (e == NULL)
   {
-    win->wprintf("%A%Cerror\n", A_BOLD, 16);
+    win->wprintf("%A%Cerror\n", A_BOLD, COLOR_RED);
   }
   else
@@ -797 +797 @@
     {
       win->wprintf("%C%ADirect send failed, send through server (y/N)? %C%Z",
-                   m_cColorQuery->nColor, m_cColorQuery->nAttr, 8,
+                   m_cColorQuery->nColor, m_cColorQuery->nAttr, COLOR_WHITE,
                    A_BOLD);
       win->state = STATE_QUERY;
@@ -965 +965 @@
   {
     win->wprintf("%C%s%A,%Z %s %s %A(%Z%s%A) -%Z %lu %A(%Z%s%A)\n",
-                 8,
+                 COLOR_WHITE,
                  e->SearchAck()->Alias(),
                  A_BOLD, A_BOLD,
@@ -1003 +1003 @@
   else
   {
-    win->wprintf("%CSearch failed.\n", 16);
+    win->wprintf("%CSearch failed.\n", COLOR_RED);
   }
 
@@ -1039 +1039 @@
   winConStatus->wprintf("%A%C) ]", A_BOLD, 29);
   wclrtoeol(winConStatus->Win());
-  wbkgdset(winConStatus->Win(), COLOR_PAIR(8));
+  wbkgdset(winConStatus->Win(), COLOR_PAIR(COLOR_WHITE));
   mvwhline(winConStatus->Win(), 1, 0, ACS_HLINE, COLS);
   //mvwaddch(winConStatus->Win(), 1, COLS - USER_WIN_WIDTH - 1, ACS_TTEE);
@@ -1274 +1274 @@
       { // No matches
         Beep();
-        winMain->wprintf("%CNo matches.\n", 16);
+        winMain->wprintf("%CNo matches.\n", COLOR_RED);
         wprintw(winPrompt->Win(), "");
         break;
@@ -1454 +1454 @@
   if (iter == listMacros.end())
   {
-    winMain->wprintf("%CNo such macro \"%A%s%Z\"\n", 16, A_BOLD,
+    winMain->wprintf("%CNo such macro \"%A%s%Z\"\n", COLOR_RED, A_BOLD,
                      szMacro, A_BOLD);
     szMacro[0] = '\0';
@@ -1532 +1532 @@
                    "for %s (%s)? %C%Z",
                    m_cColorQuery->nColor, m_cColorQuery->nAttr,
-                   u->GetAlias(), szId, 8, A_BOLD);
+                   u->GetAlias(), szId, COLOR_WHITE, A_BOLD);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -1574 +1574 @@
       break;
     default:
-      winMain->wprintf("%CInvalid key.\n", 16);
+      winMain->wprintf("%CInvalid key.\n", COLOR_RED);
     }
 
@@ -1590 +1590 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -1665 +1665 @@
   winMain->wprintf("%C%ARemove %s (%s) from contact list (y/N)? %C%Z",
                    m_cColorQuery->nColor, m_cColorQuery->nAttr,
-                   u->GetAlias(), szId, 8, A_BOLD);
+                   u->GetAlias(), szId, COLOR_WHITE, A_BOLD);
   winMain->RefreshWin();
   gUserManager.DropUser(u);
@@ -1706 +1706 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -1812 +1812 @@
     {
       winMain->wprintf("%CYou must specify an event number. (1-%d)\n",
-                       16, nLast);
+                       COLOR_RED, nLast);
     }
     else
     {
-      winMain->wprintf("%CNo System Events.\n", 8);
+      winMain->wprintf("%CNo System Events.\n", COLOR_WHITE);
     }
     free(szFrom);
@@ -1833 +1833 @@
   if (nStart == -1)
   {
-    winMain->wprintf("%CInvalid start range: %A%s\n", 16,
+    winMain->wprintf("%CInvalid start range: %A%s\n", COLOR_RED,
                      A_BOLD, szStart);
     free(szFrom);
@@ -1841 +1841 @@
   {
     winMain->wprintf("%CStart value out of range, history contains %d events.\n",
-                     16, nLast);
+                     COLOR_RED, nLast);
     free(szFrom);
     return;
@@ -1851 +1851 @@
     if (nEnd == -1)
     {
-      winMain->wprintf("%CInvalid end range: %A%s\n", 16,
+      winMain->wprintf("%CInvalid end range: %A%s\n", COLOR_RED,
                        A_BOLD, szEnd);
       free(szFrom);
@@ -1859 +1859 @@
     {
       winMain->wprintf("%CEnd value out of range, history contains %d events.\n",
-                       16, nLast);
+                       COLOR_RED, nLast);
       free(szFrom);
       return;
@@ -1992 +1992 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -2161 +2161 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -2268 +2268 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -2341 +2341 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -2403 +2403 @@
 
   default:
-    winMain->wprintf("%CInvalid state: %A%d%Z.\n", 16, A_BOLD, A_BOLD);
+    winMain->wprintf("%CInvalid state: %A%d%Z.\n", COLOR_RED, A_BOLD, A_BOLD);
   }
 
@@ -2702 +2702 @@
                              "2 %A-%Z Male\n"
                              "%A%CGender: ",
-                             8, A_BOLD, A_BOLD, A_BOLD, A_BOLD,
+                             COLOR_WHITE, A_BOLD, A_BOLD, A_BOLD, A_BOLD,
                              A_BOLD, A_BOLD, m_cColorQuery->nAttr, m_cColorQuery->nColor);
             return;
@@ -2732 +2732 @@
             {
               winMain->wprintf("%C%s %A(%Z%d%A)%s%Z",
-                               8, gLanguages[i].szName,
+                               COLOR_WHITE, gLanguages[i].szName,
                                A_BOLD, A_BOLD, gLanguages[i].nCode,
                                A_BOLD,
@@ -2790 +2790 @@
             {
               winMain->wprintf("%C%s %A(%Z%d%A)%s%Z",
-                               8, gCountries[i].szName,
+                               COLOR_WHITE, gCountries[i].szName,
                                A_BOLD, A_BOLD, gCountries[i].nCode,
                                A_BOLD,
@@ -2902 +2902 @@
 
   winMain->wprintf("%A%CWelcome to the Licq Console Registration Wizard\n\nPress 1 to register a new UIN\nPress 2 if you have a UIN and password\n\n",
-                   A_BOLD, 24);
+                   A_BOLD, COLOR_GREEN);
 
   return;
@@ -3089 +3089 @@
   winMain->data = new DataFileChatOffer(f, _szId, _nPPID);
   winMain->wprintf("%C%ADo you wish to accept this request? (y/N) %C%Z",
-                   m_cColorQuery->nColor, m_cColorQuery->nAttr, 8, A_BOLD);
+                   m_cColorQuery->nColor, m_cColorQuery->nAttr, COLOR_WHITE, A_BOLD);
   winMain->RefreshWin();
 
@@ -3112 +3112 @@
       case 'y':
         {
-          winMain->wprintf("%C%A\nAccepting file\n", 24, A_BOLD);
+          winMain->wprintf("%C%A\nAccepting file\n", COLOR_GREEN, A_BOLD);
 
           // Make the ftman
@@ -3189 +3189 @@
   {
     winMain->wprintf("%CYou need to recompile Licq with OpenSSL for this "
-                     "feature to work!\n", 16);
+                     "feature to work!\n", COLOR_RED);
     return;
   }
@@ -3196 +3196 @@
   {
     winMain->wprintf("%CThe remote end is not using a supported client.  "
-                     "This may not work!\n", 16);
+                     "This may not work!\n", COLOR_RED);
   }
 
@@ -3238 +3238 @@
   else
   {
-    winMain->wprintf("%C<user> secure <open | close | (blank)>\n", 16);
+    winMain->wprintf("%C<user> secure <open | close | (blank)>\n", COLOR_RED);
   }
 
@@ -3262 +3262 @@
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
   winMain->wprintf("%A%CEnter your password for %s (%lu):%C%Z\n", A_BOLD,
-                   24, o->GetAlias(), o->Uin(), 8, A_BOLD);
+                   COLOR_GREEN, o->GetAlias(), o->Uin(), COLOR_WHITE, A_BOLD);
   gUserManager.DropOwner();
 }
@@ -3284 +3284 @@
 
       // Next stage is saving the password possibly
-      winMain->wprintf("%C%ASave password? (y/N) %C%Z", 24, A_BOLD,
-                       8, A_BOLD);
+      winMain->wprintf("%C%ASave password? (y/N) %C%Z", COLOR_GREEN, A_BOLD,
+                       COLOR_WHITE, A_BOLD);
       winMain->state = STATE_QUERY;
       break;

trunk/console/src/console_menu.cpp

@@ -263 +263 @@
   ProtoPluginsListIter pit;
   licqDaemon->ProtoPluginList(p1);
-  PrintBoxTop("Plugins", 40, 70);
+  PrintBoxTop("Plugins", COLOR_BLUE, 70);
   for (it = l.begin(); it != l.end(); it++)
   {
@@ -316 +316 @@
       }
     }
-    winMain->wprintf("%CNo such macro \"%A%s%Z\"\n", 16, A_BOLD,
+    winMain->wprintf("%CNo such macro \"%A%s%Z\"\n", COLOR_RED, A_BOLD,
       szArg, A_BOLD);
     return;
@@ -374 +374 @@
     if (nCurrentGroup > NUM_GROUPS_SYSTEM || nCurrentGroup == 0)
     {
-      winMain->wprintf("%CInvalid group number (0 - %d)\n", 16,
+      winMain->wprintf("%CInvalid group number (0 - %d)\n", COLOR_RED,
                        NUM_GROUPS_SYSTEM);
       return;
@@ -392 +392 @@
     if (nCurrentGroup > gUserManager.NumGroups())
     {
-      winMain->wprintf("%CInvalid group number (0 - %d)\n", 16,
+      winMain->wprintf("%CInvalid group number (0 - %d)\n", COLOR_RED,
                        gUserManager.NumGroups());
       return;
@@ -420 +420 @@
   if (szArg == NULL)
   {
-    winMain->wprintf("%CSpecify a UIN to add.\n", 16);
+    winMain->wprintf("%CSpecify a UIN to add.\n", COLOR_RED);
     return;
   }
@@ -438 +438 @@
   {
     winMain->wprintf("%CAdding user %s failed (duplicate user or invalid uin).\n",
-     16, szArg);
+     COLOR_RED, szArg);
     return;
   }
@@ -465 +465 @@
   if (szArg == NULL)
   {
-    winMain->wprintf("%CSpecify \"grant/refuse\" and a UIN/Screen Name to authorize.\n", 16);
+    winMain->wprintf("%CSpecify \"grant/refuse\" and a UIN/Screen Name to authorize.\n", COLOR_RED);
     return;
   }
@@ -506 +506 @@
   if (_szArg == NULL)
   {
-    winMain->wprintf("%CSpecify status.\n", 16);
+    winMain->wprintf("%CSpecify status.\n", COLOR_RED);
     return;
   }
@@ -528 +528 @@
   if (i == NUM_STATUS)
   {
-    winMain->wprintf("%CInvalid status: %A%s\n", 16, A_BOLD, _szArg);
+    winMain->wprintf("%CInvalid status: %A%s\n", COLOR_RED, A_BOLD, _szArg);
     return;
   }
@@ -613 +613 @@
     if (szCmd == NULL)
     {
-      winMain->wprintf("%CUnbalanced quotes.\n", 16);
+      winMain->wprintf("%CUnbalanced quotes.\n", COLOR_RED);
       return (unsigned long)-1;
     }
@@ -664 +664 @@
     if (nUin == 0)
     {
-      winMain->wprintf("%CInvalid user: %A%s\n", 16, A_BOLD, szAlias);
+      winMain->wprintf("%CInvalid user: %A%s\n", COLOR_RED, A_BOLD, szAlias);
       return (unsigned long)-1;
     }
@@ -672 +672 @@
     if (!gUserManager.IsOnList(nUin))
     {
-      winMain->wprintf("%CInvalid uin: %A%lu\n", 16, A_BOLD, nUin);
+      winMain->wprintf("%CInvalid uin: %A%lu\n", COLOR_RED, A_BOLD, nUin);
       return (unsigned long)-1;
     }
@@ -732 +732 @@
     if (szCmd == NULL)
     {
-      winMain->wprintf("%CUnbalanced quotes.\n", 16);
+      winMain->wprintf("%CUnbalanced quotes.\n", COLOR_RED);
       return scon;
     }
@@ -785 +785 @@
   if (scon.szId == NULL)
   {
-    winMain->wprintf("%CInvalid user: %A%s\n", 16, A_BOLD, szAlias);
+    winMain->wprintf("%CInvalid user: %A%s\n", COLOR_RED, A_BOLD, szAlias);
     scon.szId = NULL;
     scon.nPPID = (unsigned long)-1;
@@ -805 +805 @@
 
   if (!scon.szId && scon.nPPID != (unsigned long)-1)
-    winMain->wprintf("%CYou must specify a user to send a message to.\n", 16);
+    winMain->wprintf("%CYou must specify a user to send a message to.\n", COLOR_RED);
   else if (scon.nPPID != (unsigned long)-1)
     UserCommand_Msg(scon.szId, scon.nPPID, sz);
@@ -821 +821 @@
 
   if (nUin == gUserManager.OwnerUin())
-    winMain->wprintf("%CSetting personal info not implemented yet.\n", 16);
+    winMain->wprintf("%CSetting personal info not implemented yet.\n", COLOR_RED);
   else if (nUin == 0) {
     char szUin[24];
@@ -842 +842 @@
 
   if (nUin == gUserManager.OwnerUin())
-    winMain->wprintf("%CYou can't send URLs to yourself!\n", 16);
+    winMain->wprintf("%CYou can't send URLs to yourself!\n", COLOR_RED);
   else if (nUin == 0)
-    winMain->wprintf("%CYou must specify a user to send a URL to.\n", 16);
+    winMain->wprintf("%CYou must specify a user to send a URL to.\n", COLOR_RED);
   else if (nUin != (unsigned long)-1)
     sprintf(szArg, "%lu", nUin);
@@ -862 +862 @@
 
   if (nUin == 0)
-    winMain->wprintf("%CInvalid user\n", 16);
+    winMain->wprintf("%CInvalid user\n", COLOR_RED);
   else if (nUin != (unsigned long)-1)
   {
@@ -933 +933 @@
 
   if (nUin == gUserManager.OwnerUin())
-    winMain->wprintf("%CYou can't establish a secure connection to yourself!\n", 16);
+    winMain->wprintf("%CYou can't establish a secure connection to yourself!\n", COLOR_RED);
   else if (nUin == 0)
-    winMain->wprintf("%CYou must specify a user to talk to.\n", 16);
+    winMain->wprintf("%CYou must specify a user to talk to.\n", COLOR_RED);
   else if (nUin != (unsigned long)-1)
   {
@@ -953 +953 @@
 
   if (nUin == gUserManager.OwnerUin())
-    winMain->wprintf("%CYou can't send files to yourself!\n", 16);
+    winMain->wprintf("%CYou can't send files to yourself!\n", COLOR_RED);
   else if (nUin == 0)
   {