From b1a086dee9bf5846b31323ba2c438f8853a9c87f Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Thu, 9 Jan 2020 21:47:14 -0500
Subject: devdraw: refactor, clean up mac screen

Also turn mac-srv.c into a generic srv.c,
so we can remove the duplication with x11-srv.c.
---
 src/cmd/devdraw/devdraw.h | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'src/cmd/devdraw/devdraw.h')

diff --git a/src/cmd/devdraw/devdraw.h b/src/cmd/devdraw/devdraw.h
index fe9532b3..30586228 100644
--- a/src/cmd/devdraw/devdraw.h
+++ b/src/cmd/devdraw/devdraw.h
@@ -28,6 +28,8 @@ struct Kbdbuf
 	int wi;
 	int stall;
 	int alting;
+	Rune k[10];
+	int nk;
 };
 
 struct Mousebuf
@@ -75,7 +77,7 @@ struct Client
 
 	int		rfd;
 	int		wfd;
-	void*		view;
+	const void*		view;
 	
 	QLock inputlk;
 	Kbdbuf kbd;
@@ -163,6 +165,22 @@ void	_drawreplacescreenimage(Client*, Memimage*);
 int _latin1(Rune*, int);
 int parsewinsize(char*, Rectangle*, int*);
 int mouseswap(int);
-void abortcompose(Client*);
+
+void	gfx_abortcompose(Client*);
+void	gfx_keystroke(Client*, int);
+void	gfx_mousetrack(Client*, int, int, int, uint);
+
+void	rpc_setmouse(Client*, Point);
+void	rpc_setcursor(Client*, Cursor*, Cursor2*);
+void	rpc_setlabel(Client*, char*);
+void	rpc_resizeimg(Client*);
+void	rpc_resizewindow(Client*, Rectangle);
+void	rpc_topwin(Client*);
+char*	rpc_getsnarf(void);
+void	rpc_putsnarf(char*);
+Memimage *rpc_attachscreen(Client*, char*, char*);
+void	rpc_flushmemscreen(Client*, Rectangle);
 
 extern Client *client0;
+
+void	servep9p(Client*);
-- 
cgit v1.2.3