modify how sessions propagate

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
jezze · Nov 15, 2018 · 3f44e19 · 3f44e19
1 parent cc93acc
commit 3f44e19
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/lib/abi/job.c b/lib/abi/job.c
@@ -42,7 +42,7 @@ static void runjob(union event_message *imessage, union event_message *omessage,
         event_request(omessage, imessage, EVENT_INIT, session);
 
         for (x = njobs; x > j + 1; x--)
-            event_route(omessage, jobs[x - 1].id);
+            event_addroute(omessage, jobs[x - 1].id, session);
 
         event_place(jobs[j].id, omessage);
 
@@ -60,7 +60,7 @@ static void runjob(union event_message *imessage, union event_message *omessage,
                 event_request(omessage, imessage, EVENT_FILE, session);
 
                 for (x = njobs; x > j + 1; x--)
-                    event_route(omessage, jobs[x - 1].id);
+                    event_addroute(omessage, jobs[x - 1].id, session);
 
                 event_addfile(omessage, FILE_P0 + k);
                 event_place(jobs[j].id, omessage);
@@ -78,7 +78,7 @@ static void runjob(union event_message *imessage, union event_message *omessage,
                 event_request(omessage, imessage, EVENT_DATA, session);
 
                 for (x = njobs; x > j + 1; x--)
-                    event_route(omessage, jobs[x - 1].id);
+                    event_addroute(omessage, jobs[x - 1].id, session);
 
                 event_append(omessage, ascii_length(jobs[j].data[k]), jobs[j].data[k]);
                 event_place(jobs[j].id, omessage);
@@ -93,7 +93,7 @@ static void runjob(union event_message *imessage, union event_message *omessage,
             event_request(omessage, imessage, EVENT_FILE, session);
 
             for (x = njobs; x > j + 1; x--)
-                event_route(omessage, jobs[x - 1].id);
+                event_addroute(omessage, jobs[x - 1].id, session);
 
             event_addfile(omessage, 0);
             event_place(jobs[j].id, omessage);
@@ -108,7 +108,7 @@ static void runjob(union event_message *imessage, union event_message *omessage,
         event_request(omessage, imessage, EVENT_STOP, session);
 
         for (x = njobs; x > j + 1; x--)
-            event_route(omessage, jobs[x - 1].id);
+            event_addroute(omessage, jobs[x - 1].id, session);
 
         event_place(jobs[j].id, omessage);
 

diff --git a/lib/fudge/event.c b/lib/fudge/event.c
@@ -34,11 +34,17 @@ unsigned int event_avail(union event_message *message)
 
 }
 
-unsigned int event_route(union event_message *message, unsigned int target)
+unsigned int event_addroute(union event_message *message, unsigned int target, unsigned int session)
 {
 
     if (message->header.nroutes < 16)
-        message->header.routes[message->header.nroutes++] = target;
+    {
+
+        message->header.routes[message->header.nroutes].target = target;
+        message->header.routes[message->header.nroutes].session = session;
+        message->header.nroutes++;
+
+    }
 
     return message->header.nroutes;
 
@@ -266,7 +272,7 @@ void event_forward(union event_message *omessage, union event_message *imessage,
     omessage->header.session = imessage->header.session;
 
     for (i = 0; i < imessage->header.nroutes; i++)
-        event_route(omessage, imessage->header.routes[i]);
+        event_addroute(omessage, imessage->header.routes[i].target, imessage->header.routes[i].session);
 
 }
 
@@ -280,9 +286,9 @@ void event_request(union event_message *omessage, union event_message *imessage,
     omessage->header.session = session;
 
     for (i = 0; i < imessage->header.nroutes; i++)
-        event_route(omessage, imessage->header.routes[i]);
+        event_addroute(omessage, imessage->header.routes[i].target, imessage->header.routes[i].session);
 
-    event_route(omessage, imessage->header.target);
+    event_addroute(omessage, imessage->header.target, session);
 
 }
 
@@ -294,14 +300,19 @@ void event_reply(union event_message *omessage, union event_message *imessage, u
     event_create(omessage, type);
 
     omessage->header.session = imessage->header.session;
-    omessage->header.source = imessage->header.target;
     omessage->header.target = imessage->header.source;
 
     for (i = 0; i < imessage->header.nroutes; i++)
-        event_route(omessage, imessage->header.routes[i]);
+        event_addroute(omessage, imessage->header.routes[i].target, imessage->header.routes[i].session);
 
     if (omessage->header.nroutes)
-        omessage->header.target = omessage->header.routes[--omessage->header.nroutes];
+    {
+
+        omessage->header.nroutes--;
+        omessage->header.target = omessage->header.routes[omessage->header.nroutes].target;
+        omessage->header.session = omessage->header.routes[omessage->header.nroutes].session;
+
+    }
 
 }
 
diff --git a/lib/fudge/event.h b/lib/fudge/event.h
@@ -24,6 +24,14 @@
 #define EVENT_WMMOUSEPRESS              0x93
 #define EVENT_WMMOUSERELEASE            0x94
 
+struct event_route
+{
+
+    unsigned int target;
+    unsigned int session;
+
+};
+
 struct event_header
 {
 
@@ -33,7 +41,7 @@ struct event_header
     unsigned int session;
     unsigned int length;
     unsigned int nroutes;
-    unsigned int routes[16];
+    struct event_route routes[16];
 
 };
 
@@ -170,7 +178,7 @@ struct event_wmmousemove
 void *event_getdata(union event_message *message);
 unsigned int event_getdatasize(union event_message *message);
 unsigned int event_avail(union event_message *message);
-unsigned int event_route(union event_message *message, unsigned int target);
+unsigned int event_addroute(union event_message *message, unsigned int target, unsigned int session);
 unsigned int event_addfile(union event_message *message, unsigned int descriptor);
 unsigned int event_addconsoledata(union event_message *message, char data);
 unsigned int event_addkeypress(union event_message *message, unsigned char scancode);