Changeset 15746

Timestamp:

05/17/12 14:36:16 (11 years ago)

Author:

nit

Message:

[titan] add tuxtxt rc for rc simulation

Location:

titan

Files:

• doc/copyright.txt (modified) (1 diff)
• titan/rc.h (modified) (6 diffs)
• titan/struct.h (modified) (1 diff)
• titan/titan.c (modified) (1 diff)

titan/doc/copyright.txt

@@ -5 +5 @@
 /* copyright by NIT                                  */
 /*****************************************************/
+
+
+#*****************************************************#
+#* this file is part of the tiTan / tiTanNIT Project *#
+#* and allowed only for use with this.               *#
+#*                                                   *#
+#* copyright by NIT                                  *#
+#*****************************************************#

titan/titan/rc.h

@@ -2 +2 @@
 #define RC_H
 
-int openrcsim()
-{
-        status.fdrcsim = -1;
-
-        mkfifo("/tmp/rcsimpipe", 0666);
-        status.fdrcsim = open("/tmp/rcsimpipe", O_RDWR);
-        if(status.fdrcsim < 0)
-        {
-                perr("open or create /tmp/rcsimpipe");
-                return 1;
-        }
-
-        closeonexec(status.fdrcsim);
+int sendtuxtxt(int code)
+{
+        int rc;
+    
+        if((rc = open("/tmp/block.tmp", O_RDONLY)) >= 0)
+        {
+                close(rc);
+        
+                if(status.fdrctxt <= 0)
+                {
+                        struct sockaddr_un vAddr;
+                        vAddr.sun_family = AF_UNIX;
+                        strcpy(vAddr.sun_path, "/tmp/rc.socket");
+                        status.fdrctxt = socket(PF_UNIX, SOCK_STREAM, 0);
+        
+                        if(status.fdrctxt <= 0)
+                        {
+                                err("open tuxtxt rc socket");
+                                return 1;
+                        };
+
+                        if(connect(status.fdrctxt, (struct sockaddr *)&vAddr, sizeof(vAddr)) !=0)
+                        {
+                                close(status.fdrctxt);
+                                status.fdrctxt = -1;
+                                err("connect to tuxtxt rc socket");
+                                return 1;
+                        }
+                }
+        
+                if(status.fdrctxt > 0)
+                {
+                        char* tmpstr = malloc(8);
+                        if(tmpstr != NULL)
+                        {
+                                sprintf(tmpstr, "%08d", code);
+
+                                if(write(status.fdrctxt, tmpstr, 8) <= 0)
+                                {
+                                        err("forwarding to rc socket");
+                                        close(status.fdrctxt);
+                                        status.fdrctxt = -1;
+                                        free(tmpstr); tmpstr = NULL;
+                                        return 1;
+                                }
+                        }
+                        free(tmpstr); tmpstr = NULL;
+                }
+                else
+                {
+                        err("forwarding to rc socket");
+                }
+                return 0;
+        }
+
+        if(status.fdrctxt != -1)
+        {
+                close(status.fdrctxt);
+                status.fdrctxt = -1;
+        }
         return 0;
 }
@@ -124 +171 @@
 
         gettimeofday(&akttime, 0);
-        
+        sendtuxtxt(keycode);
+
         rcdata.time = akttime;
         rcdata.type = EV_KEY;
@@ -130 +178 @@
         rcdata.value = 1;
         write(status.fdrc, &rcdata, sizeof(rcdata));
-        
+
         rcdata.time = akttime;
         rcdata.type = EV_KEY;
         rcdata.code = keycode;
         rcdata.value = 0;
-
-        //return write(status.fdrcsim, &rcdata, sizeof(rcdata));
-        return write(status.fdrc, &rcdata, sizeof(rcdata));
+        
+        return  write(status.fdrc, &rcdata, sizeof(rcdata));
 }
 
@@ -168 +215 @@
                 }
         }
-  
-  return 0;
+
+        return 0;
 }
 
@@ -196 +243 @@
                 FD_ZERO(&rfds);
                 FD_SET(status.fdrc, &rfds);
-                FD_SET(status.fdrcsim, &rfds);
 
                 if(fromthread == 0) status.sec = 0;
                 if((fromthread == 0 && status.rckey == 0) || fromthread == 1)
                 {
-                        ret = TEMP_FAILURE_RETRY(select(status.fdrcsim + 1, &rfds, NULL, NULL, &tv));
+                        ret = TEMP_FAILURE_RETRY(select(status.fdrc + 1, &rfds, NULL, NULL, &tv));
                         if(status.rcowner != NULL && status.rcowner != owner)
                         {
@@ -214 +260 @@
                         if(FD_ISSET(status.fdrc, &rfds))
                                 len = TEMP_FAILURE_RETRY(read(status.fdrc, &rcdata, sizeof(struct input_event)));
-                        if(FD_ISSET(status.fdrcsim, &rfds))
-                                len = TEMP_FAILURE_RETRY(read(status.fdrcsim, &rcdata, sizeof(struct input_event)));
 
                         if(rcdata.type != EV_KEY)

titan/titan/struct.h

@@ -936 +936 @@
         // rc filedescriptor
         int fdrc;
-        // rc filedescriptor for simulating keypress (fifo)
-        int fdrcsim;
+        // rc filedescriptor for tuxtxt
+        int fdrctxt;
         int writeconfig;
         int writeownconfig;

titan/titan/titan.c

@@ -559 +559 @@
                 goto starterror;
         }
-        ret = openrcsim();
-        if(ret != 0)
-        {
-                tmpstr = ostrcat(tmpstr, _("Error: open rcsim device !!"), 1, 0);
-                goto starterror;
-        }
 
         if(fegetdev() < 1)