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;
+ }
/* network init */
if(network_init(&(ivac.net))==N_ERROR) {
ivac_shutdown(&ivac);
return ERROR;
}
+
+ /* network udp init */
network_udp_listen_init(&(ivac.net));
/* add listening port(s) + stdin to (read) event system */
event_math(ivac.net.l_udp_fd,&(ivac.event),READ,ADD);
event_math(0,&(ivac.event),READ,ADD);
- /* display init */
- display_init(&(ivac.display));
-
/* 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 */
+ display_init(&(ivac.display));
+
/* display */
-#ifdef XXX_GUI
- /* "constant" graphics */
- ivac_display_head(&ivac);
- ivac_display_box(&ivac);
- ivac_display_console(&ivac);
-#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);
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));
audio_shutdown(&(ivac->audio));
- display_shutdown(&(ivac->display));
return SUCCESS;
}
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:
event_math(ivac->net.connection[channel].fd,event,READ,ADD);
ivac_send_info(channel,ivac);
}
- ivac_display(ivac);
+ ivac_display_content(ivac);
+ ivac_display_draw(ivac);
}
/* wait for user info */
sprintf(c_str,"channel %02d: broken pipe - disconnected",channel);
ivac_add_to_monitor(ivac,c_str);
}
- ivac_display(ivac);
+ ivac_display_content(ivac);
+ ivac_display_draw(ivac);
}
}
}
int ivac_regular_cb(t_event *event,void *ptr) {
+ t_ivac *ivac;
+
+ ivac=(t_ivac *)ptr;
+
+ ivac_add_to_monitor(ivac,"event HUGH");
+
/* usual jobs like audio & video transmit ... */
return SUCCESS;
char *data,valid;
char c_str[IVAC_CONSOLE_STRING_LEN];
char arg[IVAC_ARG_COUNT][IVAC_ARG_LEN];
+ char debug_string[128];
ivac=(t_ivac *)ptr;
data=input->content;
/* refresh prompt content only */
ivac_display_prompt_content(ivac);
+ ivac_display_draw(ivac);
+
+#ifdef DEBUG
+ ivac_add_to_monitor(ivac,"nach display refresh");
+#endif
/* parse command routines */
- if(data[input->c_count-1]=='\n') {
+ if(data[input->c_count-1]=='\n'||data[input->c_count-1]=='\r') {
+
+#ifdef DEBUG
+ ivac_add_to_monitor(ivac,"got newline or carriage return!");
+#endif
/* delete console string + args */
memset(c_str,0,IVAC_CONSOLE_STRING_LEN);
/* get args */
len=0;
- while(data[len]!='\n') len++;
+ while(data[len]!='\n'||data[len]!='\r') len++;
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]!=' ')&&(data[i+k]!='\n'||data[i+k]!='\r')) {
arg[j][k]=data[i+k];
k++;
}
i+=k;
}
+
/* parse command aka arg[0] */
if(!(strncmp(arg[0],"quit",4))) {
valid=1;
network_select(&(ivac->net),channel);
sprintf(c_str,"selected channel %d",channel);
}
- else if(arg[1][0]='*') {
+ else if(arg[1][0]=='*') {
network_select(&(ivac->net),MAX_CONNECTIONS);
strcpy(c_str,"selected all channels");
}
network_deselect(&(ivac->net),channel);
sprintf(c_str,"deselected channel %d",channel);
}
- else if(arg[1][0]='*') {
+ else if(arg[1][0]=='*') {
network_deselect(&(ivac->net),MAX_CONNECTIONS);
strcpy(c_str,"deselected all channels");
}
ivac_add_to_monitor(ivac,c_str);
/* refresh whole display content */
- ivac_display(ivac);
+ ivac_display_content(ivac);
+ ivac_display_draw(ivac);
- /* delete content buffer + reset counter */
+ /* delete input content buffer + reset counter */
memset(input->content,0,input->c_count-1);
input->c_count=0;
}
+ ivac_add_to_monitor(ivac,"debug: end of parse function");
+
return SUCCESS;
}
int ivac_display_head(t_ivac *ivac) {
-#ifndef XXX_GUI
- display_term_line(&(ivac->display),'#');
- puts("##### ivac - - Copyright (C) 2004 Frank Zirkelbach #####");
- puts("#########################################################");
-#endif
+ 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_ivac *ivac) {
-#ifndef XXX_GUI
- puts("---------------------------------------------------------------------");
- printf("username: %s, capabilities: %02x|%04x\n",ivac->username,ivac->g_cap,
- ivac->av_cap);
- puts("---------------------------------------------------------------------");
- puts("connections:");
-#endif
+ 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];
/* prepare challenger names */
for(channel=0;channel<MAX_CONNECTIONS;channel++)
if(ivac->challenger[channel].name[0]==0)
strcpy(ivac->challenger[channel].name,"<empty>");
-#ifndef XXX_GUI
+ 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)
- printf("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);
+ 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));
+ }
}
-#endif
return SUCCESS;
}
int ivac_display_console(t_ivac *ivac) {
-#ifndef XXX_GUI
- puts("---------------------------------------------------------------------");
- puts("console messages:");
-#endif
+ display_string(&(ivac->display),
+ 0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN,
+ "console messages:",17);
return SUCCESS;
}
int ivac_display_console_content(t_ivac *ivac) {
int i;
+ char string[IVAC_CONSOLE_STRING_LEN];
-#ifndef XXX_GUI
- for(i=0;i<IVAC_CONSOLE_LEN;i++)
- printf("| %s\n",ivac->console[i]);
-#endif
+ for(i=0;i<IVAC_CONSOLE_LEN;i++) {
+ snprintf(string,IVAC_CONSOLE_STRING_LEN,"%s\n",ivac->console[i]);
+ display_string(&(ivac->display),
+ 0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN+1+i,
+ string,strlen(string));
+ }
return SUCCESS;
}
int ivac_display_prompt(t_ivac *ivac) {
-#ifndef XXX_GUI
- puts("---------------------------------------------------------------------");
- printf("prompt: ");
-#endif
+ display_string(&(ivac->display),0,ivac->display.max_y-1,"prompt: ",8);
return SUCCESS;
}
int ivac_display_prompt_content(t_ivac *ivac) {
-#ifndef XXX_GUI
- printf("%c",ivac->input.content[ivac->input.c_count-1]);
- fflush(NULL);
-#endif
+ char string[IVAC_CONSOLE_STRING_LEN];
+ int count;
+ for(count=0;count<ivac->input.c_count;count++)
+ string[count]=ivac->input.content[count];
+ for(;count<ivac->display.max_x-8;count++) string[count]=' ';
+ display_string(&(ivac->display),8,ivac->display.max_y-1,
+ string,ivac->display.max_x);
+
return SUCCESS;
}
-int ivac_display(t_ivac *ivac) {
+int ivac_display_content(t_ivac *ivac) {
+
+ /* display box content */
+ ivac_display_box_content(ivac);
+
+ /* display console content */
+ ivac_display_console_content(ivac);
+
+ /* display prompt content */
+ ivac_display_prompt_content(ivac);
- int x,y;
+ return SUCCESS;
+}
+
+int ivac_display(t_ivac *ivac) {
-#ifndef XXX_GUI
- /* display head */
+ /* display static head */
ivac_display_head(ivac);
- /* display box */
+ /* display static box */
ivac_display_box(ivac);
-#endif
- ivac_display_box_content(ivac);
-#ifndef XXX_GUI
- /* display console */
+ /* display static console */
ivac_display_console(ivac);
-#endif
- ivac_display_console_content(ivac);
-#ifndef XXX_GUI
/* display command prompt */
ivac_display_prompt(ivac);
-#endif
- fflush(NULL);
+
+ 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;
}
memcpy(ivac->console[i],ivac->console[i+1],IVAC_CONSOLE_STRING_LEN);
memcpy(ivac->console[IVAC_CONSOLE_LEN-1],msg,IVAC_CONSOLE_STRING_LEN);
+ ivac_display_console_content(ivac);
+ ivac_display_draw(ivac);
+
return SUCCESS;
}
projects / my-code / ivac.git / blobdiff