From d72cadf521c81e1eedaaf95dc6545c7b1bd2c61d Mon Sep 17 00:00:00 2001
From: "Michael D. Lowis" <mike.lowis@gentex.com>
Date: Mon, 9 Mar 2020 16:41:22 -0400
Subject: [PATCH] clients no longer track screens

---
 client.c | 2 --
 lwm.c    | 2 --
 lwm.h    | 2 --
 manage.c | 1 -
 4 files changed, 7 deletions(-)

diff --git a/client.c b/client.c
index 6ecace5..1cdc8da 100644
--- a/client.c
+++ b/client.c
@@ -147,8 +147,6 @@ Client_Add(Window w, Window root) {
 void
 Client_Remove(Client *c) {
     Client * cc;
-    ScreenInfo *screen = c->screen;
-
     if (c == 0)
         return;
 
diff --git a/lwm.c b/lwm.c
index 644da6d..52deac7 100644
--- a/lwm.c
+++ b/lwm.c
@@ -56,7 +56,6 @@ Cursor cursor_map[E_LAST];
 
 int screen_count;       /* The number of screens. */
 ScreenInfo * screens;       /* Information about these screens. */
-ScreenInfo * current_screen;
 
 XFontSet font_set = NULL;   /* Font set for title var */
 XFontSetExtents *font_set_ext = NULL;
@@ -164,7 +163,6 @@ scanWindowTree(int screen) {
             continue;
         c = Client_Add(wins[i], root);
         if (c != 0 && c->window == wins[i]) {
-            c->screen = &screens[screen];
             c->size.x = attr.x;
             c->size.y = attr.y;
             c->size.width  = attr.width;
diff --git a/lwm.h b/lwm.h
index 004643d..d3ee85e 100644
--- a/lwm.h
+++ b/lwm.h
@@ -88,7 +88,6 @@ typedef struct Client {
     int namelen;         /* Length of client name */
     Edge cursor;         /* indicates which cursor is being used for parent window */
     IState internal_state;
-    ScreenInfo * screen;
 } Client;
 
 /*
@@ -119,7 +118,6 @@ extern Cursor cursor_map[E_LAST];
 
 extern int screen_count;
 extern ScreenInfo * screens;
-extern ScreenInfo * current_screen;
 extern XFontSet font_set;
 extern XFontSetExtents *font_set_ext;
 extern Atom wm_state;
diff --git a/manage.c b/manage.c
index eb0caba..75e5493 100644
--- a/manage.c
+++ b/manage.c
@@ -30,7 +30,6 @@
 
 static int getProperty(Window, Atom, Atom, long, unsigned char **);
 static int getWindowState(Window, int *);
-static void applyGravity(Client *);
 
 /*ARGSUSED*/
 void
-- 
2.55.0