WindowServer: Remove client struct and make a client equivalent to a window

1 files changed, 2 insertions, 6 deletions

diff --git a/userland/windowserver/ws.h b/userland/windowserver/ws.h
index 864fc53..80f4726 100644
--- a/userland/windowserver/ws.h
+++ b/userland/windowserver/ws.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 
 typedef struct {
+  int fd;
   int bitmap_fd;
   uint32_t *bitmap_ptr;
   int x;
@@ -13,11 +14,6 @@ typedef struct {
 } WINDOW;
 
 typedef struct {
-  int fd;
-  WINDOW *w;
-} CLIENT;
-
-typedef struct {
   int vga_fd;
   int wallpaper_fd;
   uint8_t *wallpaper_buffer;
@@ -27,6 +23,6 @@ typedef struct {
   uint8_t border_size;
   uint8_t border_color;
   uint8_t wallpaper_color;
-  CLIENT **clients;
+  WINDOW **windows;
 } DISPLAY;
 #endif