From c51962a648b3f38fc378ad0081b1d1aa037142d5 Mon Sep 17 00:00:00 2001
From: Peter Mikkelsen <petermikkelsen10@gmail.com>
Date: Fri, 16 Feb 2024 23:26:32 +0000
Subject: Implement mouse menus

Setup a menu/some menus by writing to an elements props/menus file
---
 graphics.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'graphics.c')

diff --git a/graphics.c b/graphics.c
index 64641ba..9f14058 100644
--- a/graphics.c
+++ b/graphics.c
@@ -8,8 +8,8 @@
 #include "guifs.h"
 
 Point mousexy;
-Mousectl *mouse;
-Keyboardctl *keyboard;
+Mousectl *mousectl;
+Keyboardctl *keyboardctl;
 Channel *updatechan;
 Channel *mkcolourchan;
 Channel *newcolourchan;
@@ -122,9 +122,9 @@ guiproc(void *)
 	if(initdraw(nil, nil, "guifs") < 0)
 		sysfatal("initdraw failed");
 
-	if((mouse = initmouse(nil, screen)) == nil)
+	if((mousectl = initmouse(nil, screen)) == nil)
 		sysfatal("initmouse failed");
-	if((keyboard = initkeyboard(nil)) == nil)
+	if((keyboardctl = initkeyboard(nil)) == nil)
 		sysfatal("initkeyboard failed");
 
 	enum {
@@ -139,13 +139,13 @@ guiproc(void *)
 		[Aupdategui] =
 			{updatechan, &i, CHANRCV},
 		[Aresize] =
-			{mouse->resizec, nil, CHANRCV},
+			{mousectl->resizec, nil, CHANRCV},
 		[Amkcolour] =
 			{mkcolourchan, &c, CHANRCV},
 		[Amouse] =
-			{mouse->c, &mouse->Mouse, CHANRCV},
+			{mousectl->c, &mousectl->Mouse, CHANRCV},
 		[Akeyboard] =
-			{keyboard->c, &r, CHANRCV},
+			{keyboardctl->c, &r, CHANRCV},
 		[Aaltend] =
 			{nil, nil, CHANEND},
 	};
@@ -169,10 +169,10 @@ guiproc(void *)
 			}
 			break;
 		case Amouse:
-			mousexy = mouse->Mouse.xy;
+			mousexy = mousectl->Mouse.xy;
 			if(!root)
 				break;
-			if(mouseevent(mouse->Mouse))
+			if(mouseevent(mousectl->Mouse))
 				resized(0);
 			break;
 		case Akeyboard:
-- 
cgit v1.2.3