From 675056ebf59a22ff89da1c719f636bdff2a9027d Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Fri, 1 Mar 2019 14:22:15 +0100
Subject: [PATCH] Remove two globals variables from logglobals and add getters
---
include/logglobals.h | 1 -
include/window.h | 3 +++
src/pen.c | 2 ++
src/window.c | 10 ++++++++++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/include/logglobals.h b/include/logglobals.h
index 0301447..e9170a1 100644
--- a/include/logglobals.h
+++ b/include/logglobals.h
@@ -36,7 +36,6 @@
extern log_action_t gg; /* External global variables */
-extern short cursx, cursy; /* Current position of cursor */
extern short cursx1, cursy1; /* Wire starting point */
extern short cursx2, cursy2; /* Wire ending point */
extern short chairx, chairy; /* Current position of crosshair */
diff --git a/include/window.h b/include/window.h
index 6a255a9..3ba494b 100644
--- a/include/window.h
+++ b/include/window.h
@@ -133,4 +133,7 @@ int hvline(short x1, short y1, short *x2, short *y2);
void init_X_window();
+short getcursorxposition();
+short getcursoryposition();
+
#endif
diff --git a/src/pen.c b/src/pen.c
index bc62e0c..6ff04f8 100644
--- a/src/pen.c
+++ b/src/pen.c
@@ -192,6 +192,8 @@ void pen()
if (gg.probemode)
{
+ short cursx = getcursorxposition();
+ short cursy = getcursoryposition();
if (cursx != gg.t.x || cursy != gg.t.y)
{
if (gg.probesimtype != NULL)
diff --git a/src/window.c b/src/window.c
index 1649469..caac8f3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2185,3 +2185,13 @@ void init_X_window()
choose_log_cursor(0);
}
+short getcursorxposition()
+{
+ return cursx;
+}
+
+short getcursoryposition()
+{
+ return cursy;
+}
+
--
GitLab