X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fivac.git;a=blobdiff_plain;f=src%2Fivac.c;h=12e5f5961f2251ec7a2b16b7f195568323b8c47a;hp=8b8acbc50923ad9b58fd6340546a838479455c72;hb=84516616d9547a46e6676ba7e942edc60009345a;hpb=2fb65b9beceb0945b593e28332507aa1b7c3fd90

diff --git a/src/ivac.c b/src/ivac.c
index 8b8acbc..12e5f59 100644
--- a/src/ivac.c
+++ b/src/ivac.c
@@ -21,10 +21,25 @@
  *
  */
 
-// #define DISPLAY
-
 #include "ivac.h"
 
+int usage(void) {
+
+  puts("");
+  puts("usage: ivac <options>");
+  puts("");
+  puts("options:");
+  puts("-h \t\t show this help");
+  puts("-n <name> \t specify your name");
+  puts("-p <port> \t specify port to listen for incoming connections");
+  puts("-u <port> \t specify udp data port");
+  puts("-d <device> \t specify audio device");
+  puts("-i <iface> \t specify network interface");
+  puts("");
+
+  return SUCCESS;
+}
+
 int main(int argc,char **argv) {
 
   /* TESTING BY NOW */
@@ -32,8 +47,46 @@ int main(int argc,char **argv) {
   t_ivac ivac;
   int i;
 
-  /* set username (futur: read from config or entered later) */
-  strcpy(ivac.username,"hackbard");
+  /* default values */
+  strcpy(ivac.username,"ivac");
+  ivac.net.l_port=IVAC_LISTEN_PORT;
+  ivac.net.l_udp_port=IVAC_UDP_PORT;
+  strcpy(ivac.audio.dsp_dev,SOUND_DEVICE);
+  strcpy(ivac.net.nic,"eth0");
+ 
+  /* parse argv and change default values */
+  for(i=1;i<argc;i++) {
+    if(argv[i][0]=='-') {
+      switch(argv[i][1]) {
+        case 'h':
+          usage();
+          return SUCCESS;
+        case 'n':
+          strncpy(ivac.username,argv[++i],CHAR_USERNAME);
+          break;
+        case 'p':
+          ivac.net.l_port=atoi(argv[++i]);
+          break;
+        case 'u':
+          ivac.net.l_udp_port=atoi(argv[++i]);
+          break;
+        case 'd':
+          strncpy(ivac.audio.dsp_dev,argv[++i],MAX_CHAR_DEVICE);
+          break;
+        case 'i':
+          strncpy(ivac.net.nic,argv[++i],MAX_NIC_DEVICE);
+        default:
+          usage();
+          return ERROR;
+      }
+    }
+    else usage();
+  }
+
+  /* clear challenger struct */
+  for(i=0;i<MAX_CONNECTIONS;i++)
+    memset(&(ivac.challenger[i]),0,sizeof(t_challenger));
+  /* zero console buffer */
   for(i=0;i<IVAC_CONSOLE_LEN;i++)
     memset(ivac.console[i],0,IVAC_CONSOLE_STRING_LEN);
 
@@ -45,14 +98,19 @@ int main(int argc,char **argv) {
   ivac.event.timeout.tv_sec=IVAC_S_SEC;
   ivac.event.timeout.tv_usec=IVAC_S_USEC;
   /* event init */
-  event_init(&(ivac.event));
+  if(event_init(&(ivac.event))==E_ERROR) {
+    ivac_shutdown(&ivac);
+    return ERROR;
+  }
 
   /* input init */
   ivac.input.mode=CONTENT_BUFFER;
-  input_init(&(ivac.input));
+  ivac.input.c_count=0;
+  if(input_init(&(ivac.input))==I_ERROR) {
+    ivac_shutdown(&ivac);
+    return ERROR;
+  }
 
-  /* set listen port (futur: read from config or entered later) */
-  network_set_listen_port(&(ivac.net),IVAC_LISTEN_PORT);
   /* network init */
   if(network_init(&(ivac.net))==N_ERROR) {
     printf("[ivac] use 'fuser -n tcp %d' to determine the process to kill!\n",
@@ -61,36 +119,45 @@ int main(int argc,char **argv) {
     return ERROR;
   }
 
-  /* add listening port + stdin to (read) event system */
+  /* network udp init */
+  network_udp_listen_init(&(ivac.net));
+
+  /* add listening port(s) + stdin to (read) event system */
   event_math(ivac.net.l_fd,&(ivac.event),READ,ADD);
+  event_math(ivac.net.l_udp_fd,&(ivac.event),READ,ADD);
   event_math(0,&(ivac.event),READ,ADD);
 
+  /* use hardcoded audio settings by now */
+  ivac.audio.fmt=BIT_8;
+  ivac.audio.channels=MONO;
+  ivac.audio.speed=8000;
+  /* audio init */
+  audio_init(&(ivac.audio));
+  /* audio setup */
+  audio_setup(&(ivac.audio));
+
   /* display init */
-#ifdef DISPLAY
   display_init(&(ivac.display));
-#endif
 
   /* display */
-#ifdef DISPLAY
-  ivac_display(&(ivac.display));
-#endif
+  ivac_display(&ivac);
+  ivac_display_content(&ivac);
+  ivac_display_draw(&ivac);
 
   /* start event system - callbacks used: ivac_event_cb + ivac_regular_cb */
   event_start(&(ivac.event),(void *)&ivac,ivac_event_cb,ivac_regular_cb);
 
-  // ivac_shutdown(&ivac);
-
   return SUCCESS;
 }
 
 int ivac_shutdown(t_ivac *ivac) {
 
+  display_shutdown(&(ivac->display));
   network_shutdown(&(ivac->net));
+  network_udp_shutdown(&(ivac->net));
   input_shutdown(&(ivac->input));
   event_stop(&(ivac->event));
-#ifdef DISPLAY
-  display_shutdown(&(ivac->display));
-#endif
+  audio_shutdown(&(ivac->audio));
 
   return SUCCESS;
 }
@@ -126,9 +193,26 @@ int ivac_send_info(int channel,t_ivac *ivac) {
   return SUCCESS;
 }
 
+int ivac_send_quit(int channel,t_ivac *ivac) {
+
+  char data[7]; /* one more for \0 */
+
+  data[0]=IVAC_SEND_QUIT;
+  data[1]=4;
+  strcpy(data+2,"quit");
+
+  if(network_send(ivac->net.connection[channel].fd,data,6)==N_ERROR) {
+    puts("[ivac] ivac_send_quit failed");
+    return ERROR;
+  }
+
+  return SUCCESS;
+}
+
 int ivac_receive_info(int channel,t_ivac *ivac) {
 
   char data[SEND_N_MAX];
+  char c_str[IVAC_CONSOLE_STRING_LEN];
   int count,length;
 
   count=0;
@@ -143,7 +227,7 @@ int ivac_receive_info(int channel,t_ivac *ivac) {
     switch(data[count]) {
       case IVAC_SEND_NAME:
         strncpy(ivac->challenger[channel].name,data+count+2,data[count+1]);
-        ivac->challenger[channel].name[data[count+1]]='\0';
+        ivac->challenger[channel].name[(int)data[count+1]]='\0';
         count+=(data[count+1]+2);
         break;
       case IVAC_SEND_G_CAP:
@@ -155,50 +239,86 @@ int ivac_receive_info(int channel,t_ivac *ivac) {
         ivac->challenger[channel].av_cap|=data[count+3];
         count+=4;
         break;
+      case IVAC_SEND_QUIT:
+        if(!(strncmp(data+count+2,"quit",data[1])))
+          sprintf(c_str,"channel %02d: connection closed by remote host",
+                  channel);
+          event_math(ivac->net.connection[channel].fd,&(ivac->event),
+                     READ,REMOVE);
+          network_close(&(ivac->net),channel);
+          memset(&(ivac->challenger[channel]),0,sizeof(t_challenger));
+          ivac_add_to_monitor(ivac,c_str);
+          count+=6;
+          break;
       default:
-        puts("[ivac] ivac_receive_info, unknown character");
+        sprintf(c_str,"ivac_receive_info, unknown character: 0x%02x\n",
+               data[count]);
+        ivac_add_to_monitor(ivac,c_str);
         return ERROR;
         break;
     }
   }
 
-  return SUCCESS;
+  return length;
 }
 
 int ivac_event_cb(t_event *event,void *ptr) {
  
   t_ivac *ivac;
   int channel;
+  char c_str[IVAC_CONSOLE_STRING_LEN];
 
   ivac=(t_ivac *)ptr;
 
+  /* incoming connection -- first contact => send info */
   if(FD_ISSET(ivac->net.l_fd,&(event->rfds))) {
-    /* manage incoming + send info */
     channel=network_manage_incoming(&(ivac->net));
-    event_math(ivac->net.connection[channel].fd,event,READ,ADD);
-    ivac_send_info(channel,ivac);
+    if(channel==N_E_ACCEPT)
+      sprintf(c_str,"accept failed");
+    else if(channel==N_E_MAXC)
+      sprintf(c_str,"maximum connections reached");
+    else {
+      sprintf(c_str,"connection from %s port %d on channel %d",
+              ivac->net.connection[channel].ip,
+              ivac->net.connection[channel].port,channel);
+      ivac_add_to_monitor(ivac,c_str);
+      event_math(ivac->net.connection[channel].fd,event,READ,ADD);
+      ivac_send_info(channel,ivac);
+    }
+    ivac_display_content(ivac);
+    ivac_display_draw(ivac);
   }
 
-  /* receive info */
-  for(channel=0;channel<MAX_CONNECTIONS;channel++)
-    if(ivac->net.connection[channel].status&C_ESTABL)
-      if(FD_ISSET(ivac->net.connection[channel].fd,&(event->rfds)))
-        ivac_receive_info(channel,ivac);
+  /* wait for user info */
+  for(channel=0;channel<MAX_CONNECTIONS;channel++) {
+    if(ivac->net.connection[channel].status&C_ESTABL) {
+      /* remote is sending info */
+      if(FD_ISSET(ivac->net.connection[channel].fd,&(event->rfds))) {
+        if(ivac_receive_info(channel,ivac)==0) {
+          event_math(ivac->net.connection[channel].fd,event,READ,REMOVE);
+          network_close(&(ivac->net),channel);
+          sprintf(c_str,"channel %02d: broken pipe - disconnected",channel);
+          ivac_add_to_monitor(ivac,c_str);
+        }
+        ivac_display_content(ivac);
+        ivac_display_draw(ivac);
+      }
+    }
+  } 
 
   /* user interaction */
   if(FD_ISSET(0,&(event->rfds)))
     input_get_event(&(ivac->input),ivac_parse_command,ivac);
 
-  /* display ivac gui */
-#ifdef DISPLAY
-  ivac_display_content(ivac);
-#endif
-    
   return SUCCESS;
 }
 
 int ivac_regular_cb(t_event *event,void *ptr) {
 
+  t_ivac *ivac;
+
+  ivac=(t_ivac *)ptr;
+
   /* usual jobs like audio & video transmit ... */
 
   return SUCCESS;
@@ -213,44 +333,70 @@ int ivac_parse_command(t_input *input,void *ptr) {
   char *data,valid;
   char c_str[IVAC_CONSOLE_STRING_LEN];
   char arg[IVAC_ARG_COUNT][IVAC_ARG_LEN];
+#ifdef DEBUG
+  char debug_string[IVAC_CONSOLE_STRING_LEN];
+#endif
 
   ivac=(t_ivac *)ptr;
   data=input->content;
   valid=0;
 
-  printf("%c",data[input->c_count-1]);
-  fflush(NULL);
+  /* refresh prompt content only */
+#ifdef DEBUG
+  sprintf(debug_string,"-> %02x c_count = %d",input->content[input->c_count-1],
+                       input->c_count);
+  ivac_add_to_monitor(ivac,debug_string);
+#endif
+  ivac_display_prompt_content(ivac);
+  ivac_display_draw(ivac);
 
   /* parse command routines */
+  if(data[input->c_count-1]=='\n'||data[input->c_count-1]=='\r') {
 
-  if(data[input->c_count-1]=='\n') {
+#ifdef DEBUG
+    sprintf(debug_string,"got %02x",data[input->c_count-1]);
+    ivac_add_to_monitor(ivac,debug_string);
+#endif
 
     /* delete console string + args */
     memset(c_str,0,IVAC_CONSOLE_STRING_LEN);
     for(j=0;j<IVAC_ARG_COUNT;j++) memset(arg[j],0,IVAC_ARG_LEN);
 
     /* get args */
-
     len=0;
-    while(data[len]!='\n') len++;
+    while(data[len]!='\n'&&data[len]!='\r') len++;
+#ifdef DEBUG
+    sprintf(debug_string,"len = %d\n",len);
+    ivac_add_to_monitor(ivac,debug_string);
+#endif
     i=0; j=0;
     while((i<len) && (j<IVAC_ARG_COUNT)) {
       k=0;
-      while((data[i+k]!=' ')&&(data[i+k]!='\n')) {
+      while(data[i+k]==' ') i++;
+      while(data[i+k]!=' '&&data[i+k]!='\n'&&data[i+k]!='\r') {
         arg[j][k]=data[i+k];
         k++;
       }
       arg[j][k]='\0';
       j++;
-      /* skip all ' ' */
-      while(data[i+k]==' ') k++;
       i+=k;
     }
 
+#ifdef DEBUG
+    sprintf(debug_string,"got args: %s ...",arg[0]);
+    ivac_add_to_monitor(ivac,debug_string);
+#endif
+
     /* parse command  aka arg[0] */
     if(!(strncmp(arg[0],"quit",4))) {
       valid=1;
       sprintf(c_str,"ivac shutdown ...");
+      for(i=0;i<MAX_CONNECTIONS;i++) {
+        if(ivac->net.connection[i].status&C_ESTABL) {
+          ivac_send_quit(i,ivac);
+          network_close(&(ivac->net),i);
+        }
+      }
       ivac_shutdown(ivac);
     }
     if(!(strncmp(arg[0],"set",3))) {
@@ -262,15 +408,11 @@ int ivac_parse_command(t_input *input,void *ptr) {
         sprintf(c_str,"changed username to %s",ivac->username);
       }
       else if((channel>=0)&&(channel<MAX_CONNECTIONS)) {
-        if(ivac->net.connection[channel].status&C_IN_USE) {
+        i=network_set_connection_info(&(ivac->net),channel,arg[2],atoi(arg[3]));
+        if(i==N_E_IN_USE)
           sprintf(c_str,"channel %02d: connection in use",channel);
-        }
-        else {
-          strncpy(ivac->net.connection[channel].ip,arg[2],IP_DIGITS);
-          ivac->net.connection[channel].port=atoi(arg[3]);
+        if(i==N_SUCCESS)
           sprintf(c_str,"channel %02d: set connection info",channel);
-          ivac->net.connection[channel].status|=C_INFO_A;
-        }
       } else snprintf(c_str,IVAC_CONSOLE_STRING_LEN,"unknown argument: '%s'",
                       arg[1]);
     }
@@ -279,17 +421,21 @@ int ivac_parse_command(t_input *input,void *ptr) {
       if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]);
       else channel=-1;
       if((channel>=0)&&(channel<MAX_CONNECTIONS)) {
-        if(!ivac->net.connection[channel].status&C_INFO_A)
+        i=network_connect(&(ivac->net),channel);
+        if(i==N_E_IN_USE)
+          sprintf(c_str,"channel %02d: connection in use",channel);
+        else if(i==N_E_NO_INFO)
           sprintf(c_str,"channel %02d: channel not configured",channel);
-        else {
-          if(ivac->net.connection[channel].status&C_IN_USE)
-            sprintf(c_str,"channel %02d: connection in use",channel);
-          else {
-            sprintf(c_str,"channel %02d: trying to connect to %s:%d",channel,
-                    ivac->net.connection[channel].ip,
-                    ivac->net.connection[channel].port);
-          }
+        else if(i==N_SUCCESS) {
+          sprintf(c_str,"channel %02d: connected to %s:%d",channel,
+                  ivac->net.connection[channel].ip,
+                  ivac->net.connection[channel].port);
+          event_math(ivac->net.connection[channel].fd,&(ivac->event),READ,ADD);
+          ivac_send_info(channel,ivac);
         }
+        else if(i==N_E_CONNECT)
+          sprintf(c_str,"channel %02d: connection error - %s",
+                        channel,sys_errlist[errno]);
       }
       else sprintf(c_str,"invalid argument: '%s'",arg[1]);
     } 
@@ -298,12 +444,16 @@ int ivac_parse_command(t_input *input,void *ptr) {
       if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]);
       else channel=-1;
       if((channel>=0)&&(channel<MAX_CONNECTIONS)) {
-        if(!ivac->net.connection[channel].status&C_ESTABL)
-          sprintf(c_str,"channel %02d: no active connection",channel);
-        else {
-          ivac->net.connection[channel].status|=C_HANGUP;
+        if(ivac->net.connection[channel].status&C_ESTABL) {
+          ivac_send_quit(channel,ivac);
+          event_math(ivac->net.connection[channel].fd,&(ivac->event),
+                     READ,REMOVE);
+          network_close(&(ivac->net),channel);
           sprintf(c_str,"channel %02d: connection closed",channel);
+          memset(&(ivac->challenger[channel]),0,sizeof(t_challenger));
         }
+        else
+          sprintf(c_str,"channel %02d: no active connection",channel);
       }
       else sprintf(c_str,"invalid argument: '%s'",arg[1]);
     }
@@ -312,11 +462,11 @@ int ivac_parse_command(t_input *input,void *ptr) {
       if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]);
       else channel=-1;
       if((channel>=0)&&(channel<MAX_CONNECTIONS)) {
-        ivac->net.sendmask|=(1<<channel);
+        network_select(&(ivac->net),channel);
         sprintf(c_str,"selected channel %d",channel);
       }
-      else if(arg[1][0]='*') {
-        ivac->net.sendmask=0xff;
+      else if(arg[1][0]=='*') {
+        network_select(&(ivac->net),MAX_CONNECTIONS);
         strcpy(c_str,"selected all channels");
       }
       else sprintf(c_str,"invalid argument: '%s'",arg[1]);
@@ -326,11 +476,11 @@ int ivac_parse_command(t_input *input,void *ptr) {
       if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]);
       else channel=-1;
       if((channel>=0)&&(channel<MAX_CONNECTIONS)) {
-        ivac->net.sendmask&=(~(1<<channel));
+        network_deselect(&(ivac->net),channel);
         sprintf(c_str,"deselected channel %d",channel);
       }
-      else if(arg[1][0]='*') {
-        ivac->net.sendmask=0;
+      else if(arg[1][0]=='*') {
+        network_deselect(&(ivac->net),MAX_CONNECTIONS);
         strcpy(c_str,"deselected all channels");
       }
       else sprintf(c_str,"invalid argument: '%s'",arg[1]);
@@ -339,127 +489,122 @@ int ivac_parse_command(t_input *input,void *ptr) {
     if(!valid)
       snprintf(c_str,IVAC_CONSOLE_STRING_LEN,"unknown command: '%s'",arg[0]);
 
+    /* call network functions */
+    network_manage_connection(&(ivac->net));
+
+    /* add console string to console buffer */
     ivac_add_to_monitor(ivac,c_str);
-      
 
-    /* delete content buffer + reset counter */
+    /* delete input content buffer + reset counter */
     memset(input->content,0,input->c_count-1);
     input->c_count=0;
 
+    /* refresh whole display content */
+    ivac_display_content(ivac);
+    ivac_display_draw(ivac);
   }
 
   return SUCCESS;
 }
 
-int ivac_display_head(t_display *display) {
-
-  int x,y;
+int ivac_display_head(t_ivac *ivac) {
 
-  move(0,0);
-  for(x=0;x<display->max_x;x++) addch('#');
-  mvaddstr(1,0,"##");
-  mvaddstr(1,(display->max_x-4)/2-4,"- ivac -");
-  mvaddstr(1,(display->max_x-2),"##");
-  move(2,0);
-  for(x=0;x<display->max_x;x++) addch('#');
-  refresh();
+  display_line(&(ivac->display),0,0,ivac->display.max_x,0,'#');
+  display_string(&(ivac->display),(ivac->display.max_x-strlen(PROG_NAME))/2,1,
+                 PROG_NAME,strlen(PROG_NAME));
+  display_line(&(ivac->display),0,2,ivac->display.max_x,2,'#');
 
   return SUCCESS;
 }
 
-int ivac_display_box(t_display *display) {
-  
-  int x,y;
-
-  for(y=IVAC_PROMPT_LEN;y<display->max_y-IVAC_PROMPT_LEN;y++) {
-    mvaddch(y,0,'#');
-    mvaddch(y,display->max_x-1,'#');
-  }
+int ivac_display_box(t_ivac *ivac) {
 
+  display_line(&(ivac->display),0,3,ivac->display.max_x,3,'-');
+  display_line(&(ivac->display),0,5,ivac->display.max_x,5,'-');
+  display_string(&(ivac->display),0,6,"connections:",12);
+  display_line(&(ivac->display),
+               0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN-1,
+               ivac->display.max_x,
+               ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN-1,'-');
+ 
   return SUCCESS;
 }
 
 int ivac_display_box_content(t_ivac *ivac) {
 
+  int channel;
+  char string[MAX_BOX_CHARS];
 
-  return SUCCESS;
-}
-
-int ivac_display_console(t_display *display) {
-                                             
-  int x,y;
-         
-  move(display->max_y-IVAC_CONSOLE_LEN-IVAC_PROMPT_LEN-1,0);
-  for(x=0;x<display->max_x;x++) addch('#');                         
-                                          
-  return SUCCESS;
-}
-
-int ivac_display_console_content(t_ivac *ivac) {
-
-  int x,y;
-  int len;
-
-  for(y=0;y<IVAC_CONSOLE_LEN;y++) {
-    len=strlen(ivac->console[y]);
-    move(ivac->display.max_y-IVAC_CONSOLE_LEN-IVAC_PROMPT_LEN+y,2);
-    for(x=0;x<len;x++)
-       addch(((ivac->console[y][x]>' ')||(ivac->console[y][x]<='~'))
-               ?ivac->console[y][x]:' ');
-    for(x=len;x<IVAC_CONSOLE_STRING_LEN-4;x++) addch(' ');
+  /* prepare challenger names */
+  for(channel=0;channel<MAX_CONNECTIONS;channel++)
+    if(ivac->challenger[channel].name[0]==0)
+      strcpy(ivac->challenger[channel].name,"<empty>");
+
+  sprintf(string,"username: %s, capabilities: %02x|%04x",
+          ivac->username,ivac->g_cap,ivac->av_cap);
+  display_string(&(ivac->display),0,4,string,strlen(string));
+
+  for(channel=0;channel<MAX_CONNECTIONS;channel++) {
+    if(ivac->net.connection[channel].status&C_INFO_A) {
+      snprintf(string,MAX_BOX_CHARS,
+               "channel %02d: %s:%d, status: %02x, name: %s\n",channel,
+               ivac->net.connection[channel].ip,
+               ivac->net.connection[channel].port,
+               ivac->net.connection[channel].status,
+               ivac->challenger[channel].name);
+      display_string(&(ivac->display),0,IVAC_HEAD_LEN+4+channel,
+                     string,strlen(string));
+    }
   }
-  refresh();
 
   return SUCCESS;
 }
 
-int ivac_display_prompt(t_display *display) {
-
-  int x,y;
+int ivac_display_console(t_ivac *ivac) {
 
-  move(display->max_y-3,0);
-  for(x=0;x<display->max_x;x++) addch('#');
-  mvaddstr(display->max_y-2,0,"## command: ");
-  mvaddstr(display->max_y-2,display->max_x-2,"##");
-  move(display->max_y-1,0);
-  for(x=0;x<display->max_x;x++) addch('#');
-  refresh();
+  display_string(&(ivac->display),
+                 0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN,
+                 "console messages:",17);
 
   return SUCCESS;
 }
 
-int ivac_display_prompt_content(t_ivac *ivac) {
-
-  int x,y;
+int ivac_display_console_content(t_ivac *ivac) {
 
-  /* delete old command */
-  if(ivac->input.c_count==0) {
-    move(ivac->display.max_y-2,12);
-    for(x=12;x<ivac->display.max_x-1;x++) addch(' ');
+  int i,size;
+  char string[IVAC_CONSOLE_STRING_LEN];
+
+  for(i=0;i<IVAC_CONSOLE_LEN;i++) {
+    size=strlen(ivac->console[i]);
+    size=(size<IVAC_CONSOLE_STRING_LEN)?size:IVAC_CONSOLE_STRING_LEN;
+    memcpy(string,ivac->console[i],size);
+    memset(string+size,' ',IVAC_CONSOLE_STRING_LEN-size);
+    display_string(&(ivac->display),
+                   0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN+1+i,
+                   string,IVAC_CONSOLE_STRING_LEN);
   }
 
-  for(x=0;x<ivac->input.c_count;x++)
-    mvaddch(ivac->display.max_y-2,x+12,ivac->input.content[x]);
-  refresh();
-
   return SUCCESS;
 }
 
-int ivac_display(t_display *display) {
+int ivac_display_prompt(t_ivac *ivac) {
 
-  int x,y;
+  display_string(&(ivac->display),0,ivac->display.max_y-1,"prompt: ",8);
 
-  /* display head */
-  ivac_display_head(display);
+  return SUCCESS;
+}
 
-  /* display box */
-  ivac_display_box(display);
+int ivac_display_prompt_content(t_ivac *ivac) {
 
-  /* display console */
-  ivac_display_console(display);
+  char string[IVAC_CONSOLE_STRING_LEN];
+  int count;
 
-  /* display command prompt */
-  ivac_display_prompt(display);
+  for(count=0;count<ivac->input.c_count;count++)
+    string[count]=ivac->input.content[count];
+  for(count=ivac->input.c_count;count<IVAC_CONSOLE_STRING_LEN-8;count++)
+    string[count]=' ';
+  display_string(&(ivac->display),8,ivac->display.max_y-1,
+                 string,IVAC_CONSOLE_STRING_LEN-8);
 
   return SUCCESS;
 }
@@ -478,6 +623,32 @@ int ivac_display_content(t_ivac *ivac) {
   return SUCCESS;
 }
 
+int ivac_display(t_ivac *ivac) {
+
+  /* display static head */
+  ivac_display_head(ivac);
+
+  /* display static box */
+  ivac_display_box(ivac);
+
+  /* display static console */
+  ivac_display_console(ivac);
+
+  /* display command prompt */
+  ivac_display_prompt(ivac);
+
+  return SUCCESS;
+}
+
+int ivac_display_draw(t_ivac *ivac) {
+  
+  display_draw(&(ivac->display));
+  display_set_cursor(&(ivac->display),ivac->input.c_count+8,
+                     ivac->display.max_y-1);
+
+  return SUCCESS;
+}
+
 int ivac_add_to_monitor(t_ivac *ivac,char *msg) {
 
   int i;
@@ -486,11 +657,8 @@ int ivac_add_to_monitor(t_ivac *ivac,char *msg) {
     memcpy(ivac->console[i],ivac->console[i+1],IVAC_CONSOLE_STRING_LEN);
   memcpy(ivac->console[IVAC_CONSOLE_LEN-1],msg,IVAC_CONSOLE_STRING_LEN);
 
-  for(i=0;i<IVAC_CONSOLE_LEN;i++)
-    printf("[ivac] console line %d: %s\n",i,ivac->console[i]);
-#ifdef DISPLAY
   ivac_display_console_content(ivac);
-#endif
+  ivac_display_draw(ivac);
 
   return SUCCESS;
 }