remove rendertarget

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>

lib/fudge/event.c

@@ -158,12 +158,11 @@ unsigned int event_addblockrequest(union event_message *message, unsigned int of
 
 }
 
-unsigned int event_addwmconfigure(union event_message *message, unsigned int rendertarget, unsigned int x, unsigned int y, unsigned int w, unsigned int h, unsigned int padding, unsigned int lineheight)
+unsigned int event_addwmconfigure(union event_message *message, unsigned int x, unsigned int y, unsigned int w, unsigned int h, unsigned int padding, unsigned int lineheight)
 {
 
     struct event_wmconfigure *wmconfigure = addpayload(message, sizeof (struct event_wmconfigure));
 
-    wmconfigure->rendertarget = rendertarget;
     wmconfigure->x = x;
     wmconfigure->y = y;
     wmconfigure->w = w;

lib/fudge/event.h

@@ -122,7 +122,6 @@ struct event_blockrequest
 struct event_wmconfigure
 {
 
-    unsigned int rendertarget;
     unsigned int x;
     unsigned int y;
     unsigned int w;
@@ -182,7 +181,7 @@ unsigned int event_addmousemove(union event_message *message, char relx, char re
 unsigned int event_addtimertick(union event_message *message, unsigned int counter);
 unsigned int event_addvideomode(union event_message *message, unsigned int w, unsigned int h, unsigned int bpp);
 unsigned int event_addblockrequest(union event_message *message, unsigned int offset, unsigned int count);
-unsigned int event_addwmconfigure(union event_message *message, unsigned int rendertarget, unsigned int x, unsigned int y, unsigned int w, unsigned int h, unsigned int padding, unsigned int lineheight);
+unsigned int event_addwmconfigure(union event_message *message, unsigned int x, unsigned int y, unsigned int w, unsigned int h, unsigned int padding, unsigned int lineheight);
 unsigned int event_addwmkeypress(union event_message *message, unsigned char scancode);
 unsigned int event_addwmkeyrelease(union event_message *message, unsigned char scancode);
 unsigned int event_addwmmousepress(union event_message *message, unsigned int button);

src/wm/wedit.c

@@ -11,7 +11,6 @@ static char inputdata1[FUDGE_BSIZE];
 static struct ring input1;
 static char inputdata2[FUDGE_BSIZE];
 static struct ring input2;
-static unsigned int rendertarget;
 
 static void updatecontent(union event_message *imessage)
 {
@@ -174,8 +173,6 @@ static unsigned int onwmconfigure(union event_message *imessage, union event_mes
 
     struct event_wmconfigure *wmconfigure = event_getdata(imessage);
 
-    rendertarget = wmconfigure->rendertarget;
-
     ring_reset(&input1);
     ring_reset(&input2);
     box_setsize(&content.size, wmconfigure->x, wmconfigure->y, wmconfigure->w, wmconfigure->h - (wmconfigure->lineheight + 2 * wmconfigure->padding));
@@ -345,7 +342,7 @@ void main(void)
 
             event_request(&omessage, &imessage, EVENT_DATA, 0);
             event_append(&omessage, ring_count(&output), outputdata);
-            event_place(rendertarget, &omessage);
+            file_writeall(FILE_G0, &omessage, omessage.header.length);
             ring_reset(&output);
 
         }

src/wm/wm.c

@@ -40,7 +40,6 @@ static struct view *currentview = &views[0];
 static unsigned int padding;
 static unsigned int lineheight;
 static unsigned int steplength;
-static unsigned int rendertarget;
 
 static void updateremote(union event_message *imessage, struct remote *remote)
 {
@@ -178,7 +177,7 @@ static void configureremotes(union event_message *imessage, union event_message
         struct remote *remote = current->data;
 
         event_request(omessage, imessage, EVENT_WMCONFIGURE, 0);
-        event_addwmconfigure(omessage, imessage->header.target, remote->window.size.x + 2, remote->window.size.y + 2, remote->window.size.w - 4, remote->window.size.h - 4, padding, lineheight);
+        event_addwmconfigure(omessage, remote->window.size.x + 2, remote->window.size.y + 2, remote->window.size.w - 4, remote->window.size.h - 4, padding, lineheight);
         event_place(remote->source, omessage);
 
     }
@@ -771,7 +770,7 @@ static unsigned int onvideomode(union event_message *imessage, union event_messa
 
     /* Sending to self not allowed */
     event_request(omessage, imessage, EVENT_WMCONFIGURE, 0);
-    event_addwmconfigure(omessage, imessage->header.target, 0, 0, videomode->w, videomode->h, padding, lineheight);
+    event_addwmconfigure(omessage, 0, 0, videomode->w, videomode->h, padding, lineheight);
     event_place(imessage->header.target, omessage);
     /* Sending to self not allowed */
     event_request(omessage, imessage, EVENT_WMSHOW, 0);
@@ -788,8 +787,6 @@ static unsigned int onwmconfigure(union event_message *imessage, union event_mes
     struct list_item *current;
     unsigned int i = 0;
 
-    rendertarget = wmconfigure->rendertarget;
-
     box_setsize(&screen, wmconfigure->x, wmconfigure->y, wmconfigure->w, wmconfigure->h);
     box_setsize(&body, wmconfigure->x, wmconfigure->y + (wmconfigure->lineheight + wmconfigure->padding * 2), wmconfigure->w, wmconfigure->h - (wmconfigure->lineheight + wmconfigure->padding * 2));
     box_setsize(&background.size, wmconfigure->x, wmconfigure->y, wmconfigure->w, wmconfigure->h);
@@ -1016,7 +1013,7 @@ void main(void)
 
             event_request(&omessage, &imessage, EVENT_DATA, 0);
             event_append(&omessage, ring_count(&output), outputdata);
-            event_place(rendertarget, &omessage);
+            file_writeall(FILE_G0, &omessage, omessage.header.length);
             ring_reset(&output);
 
         }

src/wm/wshell.c

@@ -16,7 +16,6 @@ static char textdata[FUDGE_BSIZE];
 static struct ring text;
 static unsigned int totalrows;
 static unsigned int visiblerows;
-static unsigned int rendertarget;
 
 static void updatecontent(union event_message *imessage)
 {
@@ -285,8 +284,6 @@ static unsigned int onwmconfigure(union event_message *imessage, union event_mes
 
     struct event_wmconfigure *wmconfigure = event_getdata(imessage);
 
-    rendertarget = wmconfigure->rendertarget;
-
     box_setsize(&content.size, wmconfigure->x, wmconfigure->y, wmconfigure->w, wmconfigure->h);
     box_resize(&content.size, wmconfigure->padding);
 
@@ -480,7 +477,7 @@ void main(void)
 
             event_request(&omessage, &imessage, EVENT_DATA, 0);
             event_append(&omessage, ring_count(&output), outputdata);
-            event_place(rendertarget, &omessage);
+            file_writeall(FILE_G0, &omessage, omessage.header.length);
             ring_reset(&output);
 
         }