X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fivac.git;a=blobdiff_plain;f=src%2Finput.c;h=14030175d41e77ef1ec25689fb10116c260b9538;hp=a2886ee0399e6cd53c9113eaeba0fa2ae8623c09;hb=d3c5d3d150e9f9368b2ba9f8d0f957dbb58c14d4;hpb=f7d9ad56ad9c10284c067cb2db36a7c72b33c5b3

diff --git a/src/input.c b/src/input.c
index a2886ee..1403017 100644
--- a/src/input.c
+++ b/src/input.c
@@ -18,11 +18,13 @@ int input_init(t_input *input) {
   }
   input->c_count=0;
 
-  tcgetattr(0,&tios);
-  /* switch off canonical mode */
-  tios.c_lflag&=(~ICANON);
-  tios.c_lflag&=(~ECHO);
-  tcsetattr(0,TCSANOW,&tios);
+  if(!(input->mode&LINE_BUFFERED)) {
+    tcgetattr(0,&tios);
+    /* switch off canonical mode */
+    tios.c_lflag&=(~ICANON);
+    tios.c_lflag&=(~ECHO);
+    tcsetattr(0,TCSANOW,&tios);
+  }
 
   return I_SUCCESS;
 }
@@ -43,25 +45,27 @@ int input_shutdown(t_input *input) {
   return I_SUCCESS;
 }
 
-int input_get_char(t_input *input,int (*callback)(t_input *input,void *ptr),
+int input_get_event(t_input *input,int (*callback)(t_input *input,void *ptr),
                    void *ptr) {
 
-  char data[1];
+  char data[MAX_CONTENT];
+  int count;
 
-  if(read(0,data,1)==-1) {
+  /* delete char counter if not buffered */
+  if(!(input->mode&CONTENT_BUFFER)) input->c_count=0;
+
+  if((count=read(0,data,MAX_CONTENT))==-1) {
     perror("[input] read call");
     return I_ERROR;
   }
 
-  if(input->c_count==MAX_CONTENT) {
+  if(input->c_count>=MAX_CONTENT) {
     puts("[input] max input length reached");
     return I_ERROR;
   }
 
-  input->content[input->c_count]=data[0];
-  input->c_count++;
-
-  if(data[0]=='\n') input->c_count=0;
+  strncpy(&(input->content[input->c_count]),data,count);
+  input->c_count+=count;
 
   callback(input,ptr);