1 files changed, 35 insertions, 35 deletions

diff --git a/vchat-ui.c b/vchat-ui.c
index ce0260c..99951a6 100755
--- a/vchat-ui.c
+++ b/vchat-ui.c
@@ -174,8 +174,8 @@ linecomplete (char *line)
 
       /* wipe input line and reset cursor */
       wmove (input, 0, 0);
-      for (i = 0; i < input->_maxx; i++)
-      waddch (input, ' ');
+      for (i = 0; i < getmaxx(input); i++)
+        waddch (input, ' ');
       wmove (input, 0, 0);
       wrefresh (input);
   }
@@ -198,22 +198,22 @@ vciredraw (void)
   /* calculate horizontal scrolling offset */
   if (rl_point - scroff < 0)
     scroff = rl_point - 4;
-  if (rl_point - scroff > input->_maxx)
-    scroff = rl_point - input->_maxx + 2;
-  if (rl_point - scroff > input->_maxx - (hscroll - 2))
+  if (rl_point - scroff > getmaxx(input))
+    scroff = rl_point - getmaxx(input) + 2;
+  if (rl_point - scroff > getmaxx(input) - (hscroll - 2))
     scroff += hscroll;
-  else if (rl_point - scroff < input->_maxx - (hscroll + 2))
+  else if (rl_point - scroff < getmaxx(input) - (hscroll + 2))
     scroff -= hscroll;
   if (scroff < 0)
     scroff = 0;
 
   /* wipe input line */
   wmove (input, 0, 0);
-  for (i = 0; i < input->_maxx; i++)
+  for (i = 0; i < getmaxx(input); i++)
   waddch (input, ' ');
 
   /* show current line, move cursor, redraw! */
-  mvwaddnstr (input, 0, 0, &rl_line_buffer[scroff], input->_maxx);
+  mvwaddnstr (input, 0, 0, &rl_line_buffer[scroff], getmaxx(input));
   wmove (input, 0, rl_point - scroff);
   wrefresh (input);
 }
@@ -488,15 +488,15 @@ writescr ( WINDOW *win, struct sb_entry *entry ) {
       }
   }
 
-  if (win->_curx) waddch(win,'\n');
+  if (getcurx(win)) waddch(win,'\n');
 
   for( i = 0; i < charcount; i++ ) {
       /* on start of line or attribute changes set new attribute */
       if( !i || memcmp( attrbuffer+i, attrbuffer+i-1, sizeof(ncurs_attr)))
           WATTR_SET( win, attrbuffer[i]);
       if( textbuffer[ i ] == ' ') {
-          if ((calcdrawcus(textbuffer+i+1) + win->_curx > win->_maxx - 1)&&
-              (calcdrawcus(textbuffer+i+1) < win->_maxx)) {
+          if ((calcdrawcus(textbuffer+i+1) + getcurx(win) > getmaxx(win) - 1)&&
+              (calcdrawcus(textbuffer+i+1) < getmaxx(win))) {
               /* line wrap found */
               WATTR_SET( win, orgattr);
               waddstr( win, "\n   ");
@@ -532,7 +532,7 @@ doscroll ( int up ) {
   WINDOW *destwin = (sb_win && private) ? private : channel;
   struct sb_data *sb = (sb_win && private) ? sb_priv : sb_pub;
   struct sb_entry *now = sb->entries, *prev = NULL, *tmp;
-  int lines = destwin->_maxy>>1;
+  int lines = getmaxy(destwin)>>1;
 
   if( sb->scroll != sb->count )
       while( now && (now->id != sb->scroll) ) {
@@ -547,7 +547,7 @@ doscroll ( int up ) {
   while( now && (lines > 0)) {
       if ( (!filtertype) || ( (now->stamp != currentstamp) && ( (now->stamp == (currentstamp | (1<<15))) || testfilter( now ) ) ) )
       {
-          lines -= getsbeheight( now, destwin->_maxx, usetime );
+          lines -= getsbeheight( now, getmaxx(destwin), usetime );
       }
       tmp = now; now = (struct sb_entry*)((unsigned long)now->link ^ (unsigned long)prev); prev = tmp;
   }
@@ -674,7 +674,7 @@ clearpriv ()
 
   /* clear window, move cursor to bottom, redraw */
   wclear (dest);
-  wmove (dest, dest->_maxy, dest->_maxx);
+  wmove (dest, getmaxy(dest), getmaxx(dest));
   wrefresh (dest);
 
 }
@@ -685,7 +685,7 @@ clearchan ()
 {
   /* clear window, move cursor to bottom, redraw */
   wclear (channel);
-  wmove (channel, channel->_maxy, channel->_maxx);
+  wmove (channel, getmaxy(channel), getmaxx(channel));
   wrefresh (channel);
 }
 
@@ -972,7 +972,7 @@ drawwin (WINDOW *win, struct sb_data *sb )
 {
   if (win) {
       struct sb_entry *now = sb->entries, *prev = NULL, *tmp;
-      struct sb_entry *vis[win->_maxy + 1];
+      struct sb_entry *vis[getmaxy(win) + 1];
       int sumlines = 0, sumbuffers = 0;
 
       /* public scrollback */
@@ -982,13 +982,13 @@ drawwin (WINDOW *win, struct sb_data *sb )
           }
 
       if( (win == output) || (filtertype == 0)) {
-          while( now && (sumlines <= win->_maxy )) {
-              sumlines += getsbeheight( now, win->_maxx, ((win == channel)||(win == private)) && usetime );
+          while( now && (sumlines <= getmaxy(win) )) {
+              sumlines += getsbeheight( now, getmaxx(win), ((win == channel)||(win == private)) && usetime );
               vis[ sumbuffers++ ] = now;
               tmp = now; now = (struct sb_entry*)((unsigned long)now->link ^ (unsigned long)prev); prev = tmp;
           }
       } else {
-          while( now && (sumlines <= win->_maxy )) {
+          while( now && (sumlines <= getmaxy(win) )) {
 
               /* If stamp matches exactly, line has been filtered out, since top
                  bit off means hidden */
@@ -999,7 +999,7 @@ drawwin (WINDOW *win, struct sb_data *sb )
                      tested against filters, which updates stamp. */
                   if( (now->stamp == (currentstamp | 0x8000) ) || testfilter( now ))
                   {
-                      sumlines += getsbeheight( now, win->_maxx, ((win == channel)||(win == private)) && usetime );
+                      sumlines += getsbeheight( now, getmaxx(win), ((win == channel)||(win == private)) && usetime );
                       vis[ sumbuffers++ ] = now;
                   }
 
@@ -1009,11 +1009,11 @@ drawwin (WINDOW *win, struct sb_data *sb )
       }
 
       /* If buffer is not completely filled, clear window */
-      if( sumlines < win->_maxy + 1 )
+      if( sumlines < getmaxy(win) + 1 )
           wclear(win);
 
       /* Move pointer to bottom to let curses scroll */
-      wmove(win, win->_maxy, win->_maxx);
+      wmove(win, getmaxy(win), getmaxx(win));
 
       /* Plot visible lines */
       while (sumbuffers--) writescr( win, vis[sumbuffers] );
@@ -1275,7 +1275,7 @@ consoleline (char *message)
   WATTR_GET( console, old_att);
   if(sb_pub->scroll!=sb_pub->count) WATTR_SET( console, new_att);
 
-  for (i = 0; i < console->_maxx; i++)
+  for (i = 0; i < getmaxx(console); i++)
      waddch (console, ' ');
 
   if( !message && usetime )
@@ -1284,14 +1284,14 @@ consoleline (char *message)
       time_t now = time(NULL);
       strftime( date, sizeof(date), getformatstr(FS_CONSOLETIME), localtime(&now));
       snprintf( tmpstr, TMPSTRSIZE, "%s%s", date, consolestr);
-      mvwaddnstr (console, 0, 0, tmpstr, console->_maxx);
+      mvwaddnstr (console, 0, 0, tmpstr, getmaxx(console));
   } else {
-      mvwaddnstr (console, 0, 0, message ? message : consolestr, console->_maxx);
+      mvwaddnstr (console, 0, 0, message ? message : consolestr, getmaxx(console));
   }
 
   snprintf(tmpstr,TMPSTRSIZE,getformatstr(FS_SBINF),sb_pub->scroll,sb_pub->count);
-  mvwaddstr (console, 0, console->_maxx - (strlen(tmpstr)-1),tmpstr);
-  if (sb_win == 0) mvwaddch (console, 0, console->_maxx,'*');
+  mvwaddstr (console, 0, getmaxx(console) - (strlen(tmpstr)-1),tmpstr);
+  if (sb_win == 0) mvwaddch (console, 0, getmaxx(console),'*');
 
   WATTR_SET( console, old_att);
 
@@ -1328,13 +1328,13 @@ topicline (char *message)
   if( private && (sb_priv->scroll!=sb_priv->count))
       WATTR_SET( topic, new_att);
 
-  for (i = 0; i < topic->_maxx; i++)
+  for (i = 0; i < getmaxx(topic); i++)
      waddch (topic, ' ');
-  mvwaddnstr (topic, 0, 0, message ? message : topicstr, topic->_maxx);
+  mvwaddnstr (topic, 0, 0, message ? message : topicstr, getmaxx(topic));
   if (private) {
      snprintf(tmpstr,TMPSTRSIZE,getformatstr(FS_SBINF),sb_priv->scroll,sb_priv->count);
-     mvwaddstr (topic, 0, topic->_maxx - (strlen(tmpstr)-1),tmpstr);
-     if (sb_win == 1) mvwaddch (topic, 0, topic->_maxx,'*');
+     mvwaddstr (topic, 0, getmaxx(topic) - (strlen(tmpstr)-1),tmpstr);
+     if (sb_win == 1) mvwaddch (topic, 0, getmaxx(topic),'*');
   }
   WATTR_SET( topic, old_att);
 
@@ -1403,13 +1403,13 @@ vcnredraw (void)
 
   /* wipe input line and reset cursor */
   wmove(input, 0, 0);
-  for (i = 0; i < input->_maxx; i++)
+  for (i = 0; i < getmaxx(input); i++)
   waddch(input, ' ');
   wmove(input, 0, 0);
 
   /* draw as many stars as there are characters */
   mvwaddnstr(input, 0, 0, &passbof[rl_point%2], 12);
-  wmove(input, 0, input->_maxx);
+  wmove(input, 0, getmaxx(input));
   wrefresh(input);
 }
 
@@ -1451,7 +1451,7 @@ passprompt (char *buf, int size, int rwflag, void *userdata)
   
   /* wipe input line and reset cursor */
   wmove (input, 0, 0);
-  for (i = 0; i < input->_maxx; i++)
+  for (i = 0; i < getmaxx(input); i++)
   waddch (input, ' ');
   wmove (input, 0, 0);
   wrefresh (input);
@@ -1563,7 +1563,7 @@ removefilter( char *tail ) {
   if(!rmv) {
       val = strtol(tail, &end, 10);
       if( (tail != end) && (!*end) )
-      rmv = removefromfilterlist( test_numericrm, (void *)val, 0);
+      rmv = removefromfilterlist( test_numericrm, (void *)(uintptr_t)val, 0);
   }
 
   if( rmv ) {