mcabber/mcabber/screen.c
changeset 2028 7b5bd6ad83b4
parent 2015 db8ec238cd2c
child 2029 ca40744c03be
equal deleted inserted replaced
2027:107d39cd968b 2028:7b5bd6ad83b4
    59 #include "settings.h"
    59 #include "settings.h"
    60 #include "utils.h"
    60 #include "utils.h"
    61 #include "xmpp.h"
    61 #include "xmpp.h"
    62 #include "main.h"
    62 #include "main.h"
    63 
    63 
    64 #define get_color(col)  (COLOR_PAIR(col)|COLOR_ATTRIB[col])
    64 #define get_color(col)      (COLOR_PAIR(col)|COLOR_ATTRIB[col])
    65 #define compose_color(col)  (COLOR_PAIR(col->color_pair)|col->color_attrib)
    65 #define compose_color(col)  (COLOR_PAIR(col->color_pair)|col->color_attrib)
    66 
    66 
    67 #define DEFAULT_LOG_WIN_HEIGHT (5+2)
    67 #define DEFAULT_LOG_WIN_HEIGHT (5+2)
    68 #define DEFAULT_ROSTER_WIDTH    24
    68 #define DEFAULT_ROSTER_WIDTH    24
    69 #define CHAT_WIN_HEIGHT (maxY-1-Log_Win_Height)
    69 #define CHAT_WIN_HEIGHT (maxY-1-Log_Win_Height)
   430     "", "",
   430     "", "",
   431     "general",
   431     "general",
   432     "msgout",
   432     "msgout",
   433     "msghl",
   433     "msghl",
   434     "status",
   434     "status",
       
   435     "log",
   435     "roster",
   436     "roster",
   436     "rostersel",
   437     "rostersel",
   437     "rosterselmsg",
   438     "rosterselmsg",
   438     "rosternewmsg",
   439     "rosternewmsg",
   439     "info",
   440     "info",
   489                     find_color(background));
   490                     find_color(background));
   490           break;
   491           break;
   491       case COLOR_STATUS:
   492       case COLOR_STATUS:
   492           init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
   493           init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
   493                     find_color(backstatus));
   494                     find_color(backstatus));
       
   495           break;
       
   496       case COLOR_LOG:
       
   497           init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
       
   498                     find_color(background));
   494           break;
   499           break;
   495       case COLOR_ROSTER:
   500       case COLOR_ROSTER:
   496           init_pair(i+1, ((color) ? find_color(color) : COLOR_GREEN),
   501           init_pair(i+1, ((color) ? find_color(color) : COLOR_GREEN),
   497                     find_color(background));
   502                     find_color(background));
   498           break;
   503           break;
   797   settings_set_guard("color_msgin", scr_color_guard);
   802   settings_set_guard("color_msgin", scr_color_guard);
   798   settings_set_guard("color_msgout", scr_color_guard);
   803   settings_set_guard("color_msgout", scr_color_guard);
   799   settings_set_guard("color_msghl", scr_color_guard);
   804   settings_set_guard("color_msghl", scr_color_guard);
   800   settings_set_guard("color_bgstatus", scr_color_guard);
   805   settings_set_guard("color_bgstatus", scr_color_guard);
   801   settings_set_guard("color_status", scr_color_guard);
   806   settings_set_guard("color_status", scr_color_guard);
       
   807   settings_set_guard("color_log", scr_color_guard);
   802   settings_set_guard("color_roster", scr_color_guard);
   808   settings_set_guard("color_roster", scr_color_guard);
   803   settings_set_guard("color_bgrostersel", scr_color_guard);
   809   settings_set_guard("color_bgrostersel", scr_color_guard);
   804   settings_set_guard("color_rostersel", scr_color_guard);
   810   settings_set_guard("color_rostersel", scr_color_guard);
   805   settings_set_guard("color_rosterselmsg", scr_color_guard);
   811   settings_set_guard("color_rosterselmsg", scr_color_guard);
   806   settings_set_guard("color_rosternewmsg", scr_color_guard);
   812   settings_set_guard("color_rosternewmsg", scr_color_guard);
  1622     wbkgd(chatWnd,        get_color(COLOR_GENERAL));
  1628     wbkgd(chatWnd,        get_color(COLOR_GENERAL));
  1623     wbkgd(activechatWnd,  get_color(COLOR_GENERAL));
  1629     wbkgd(activechatWnd,  get_color(COLOR_GENERAL));
  1624     wbkgd(logWnd,         get_color(COLOR_GENERAL));
  1630     wbkgd(logWnd,         get_color(COLOR_GENERAL));
  1625     wbkgd(chatstatusWnd,  get_color(COLOR_STATUS));
  1631     wbkgd(chatstatusWnd,  get_color(COLOR_STATUS));
  1626     wbkgd(mainstatusWnd,  get_color(COLOR_STATUS));
  1632     wbkgd(mainstatusWnd,  get_color(COLOR_STATUS));
       
  1633 
       
  1634     wattrset(logWnd,      get_color(COLOR_LOG));
  1627   } else {
  1635   } else {
  1628     /* Resize/move windows */
  1636     /* Resize/move windows */
  1629     wresize(rosterWnd, CHAT_WIN_HEIGHT, Roster_Width);
  1637     wresize(rosterWnd, CHAT_WIN_HEIGHT, Roster_Width);
  1630     wresize(chatWnd, CHAT_WIN_HEIGHT, maxX - Roster_Width);
  1638     wresize(chatWnd, CHAT_WIN_HEIGHT, maxX - Roster_Width);
  1631     wresize(logWnd, Log_Win_Height-2, maxX);
  1639     wresize(logWnd, Log_Win_Height-2, maxX);