diff --git a/include/logglobals.h b/include/logglobals.h index e9170a108bbd356a574558daac55b48e6aca1c65..466e5ea15bcbf4728b47edddf8a9e867230172d7 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 3ba494b9a54b789628b1455c697866ede71893f1..7f0e07cd0cca531160f1c874ee60b42c16913252 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 6ff04f8f612328e9743a64145a27e00684674369..dea02bccfcee065c1f9f59f657dcc726858d85f0 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 caac8f32b6718fa643a90ca6a6daefaf6cb53c25..4934f84ac17426745990c0e5226e6033ccbcfddf 100644 --- a/src/window.c +++ b/src/window.c @@ -2195,3 +2195,8 @@ short getcursoryposition() return cursy; } +int getcursorflag() +{ + return cursorflag; +} +