From 353ece5fd4d96755c92f727b322ac967fec67d01 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Fri, 1 Mar 2019 14:31:27 +0100
Subject: [PATCH] Remove more globals variables
---
include/logglobals.h | 10 ----------
include/window.h | 1 +
src/pen.c | 2 +-
src/window.c | 5 +++++
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/include/logglobals.h b/include/logglobals.h
index e9170a1..466e5ea 100644
--- a/include/logglobals.h
+++ b/include/logglobals.h
@@ -36,16 +36,6 @@
extern log_action_t gg; /* External global variables */
-extern short cursx1, cursy1; /* Wire starting point */
-extern short cursx2, cursy2; /* Wire ending point */
-extern short chairx, chairy; /* Current position of crosshair */
-
-extern int cursorflag; /* Cursor is displayed */
-extern int prevcursorflag;
-/* Cursor was displayed before operation began */
-extern int chairflag; /* Crosshair is on screen */
-extern int chairflag2; /* Crosshair will be on screen */
-extern int rbandflag; /* Rubber-band wire is on screen */
extern int rabbits, rabflag; /* Rabbit mode */
extern int avoidrabbits;
diff --git a/include/window.h b/include/window.h
index 3ba494b..7f0e07c 100644
--- a/include/window.h
+++ b/include/window.h
@@ -135,5 +135,6 @@ void init_X_window();
short getcursorxposition();
short getcursoryposition();
+int getcursorflag();
#endif
diff --git a/src/pen.c b/src/pen.c
index 6ff04f8..dea02bc 100644
--- a/src/pen.c
+++ b/src/pen.c
@@ -203,7 +203,7 @@ void pen()
}
else
{
- if (!cursorflag)
+ if (!getcursorflag())
drawcursor((int)gg.t.x, (int)gg.t.y);
if (!probeflag)
{
diff --git a/src/window.c b/src/window.c
index caac8f3..4934f84 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2195,3 +2195,8 @@ short getcursoryposition()
return cursy;
}
+int getcursorflag()
+{
+ return cursorflag;
+}
+
--
GitLab