--- a/Interface.pde	Wed Jul 04 11:55:02 2018 +0300
+++ b/Interface.pde	Wed Jul 04 12:10:35 2018 +0300
@@ -485,10 +485,15 @@
 boolean moicon(int xx, int yy, int ww, int hh) {
     //check mouse/icon boundary without actually drawing the icon
     if (g_data[int('m')] == 0 && g_data[int('M')] == 0) {
-        if (g_mx + g_windowx >= xx && g_mx + g_windowx < xx + ww && g_my + g_windowy >= yy && g_my + g_windowy < yy + hh) return true;
+        if (g_mx + g_windowx >= xx && g_mx + g_windowx < xx + ww &&
+            g_my + g_windowy >= yy && g_my + g_windowy < yy + hh)
+            return true;
     }
-    if (g_data[int('m')] == 1 || g_data[int('M')] == 1) {
-        if (g_mx >= xx && g_mx <= xx + ww && g_my >= yy && g_my <= yy + hh) return true;
+    else
+    {
+        if (g_mx >= xx && g_mx <= xx + ww &&
+            g_my >= yy && g_my <= yy + hh)
+            return true;
     }
     return false;
 }

--- a/events.pde	Wed Jul 04 11:55:02 2018 +0300
+++ b/events.pde	Wed Jul 04 12:10:35 2018 +0300
@@ -1,5 +1,11 @@
 //collects mouse/key events and directly related command parsing
 
+boolean insidewindow(int x, int y) {
+    // XXX is this correct?
+    return (x > width - g_hedge || y > height - g_vedge);
+}
+
+
 void keyPressed() {
     if (key == ESC) {
         key = 0;
@@ -28,6 +34,7 @@
     command(int(key));
 }
 
+
 void keyReleased() {
     if (key == CODED) {
         if (keyCode == CONTROL) g_control = false;
@@ -42,6 +49,7 @@
     }
 }
 
+
 void mouseDragged() {
     int msx, msy;
     g_iconx = mouseX;
@@ -82,10 +90,6 @@
     if (g_tooltrigger == 0) g_tooltrigger = 1;
 }
 
-boolean insidewindow(int x, int y) {
-    if (x > width - g_hedge || y > height - g_vedge) return true;
-    return false;
-}
 
 void mousePressed() {
     int msx, msy;

--- a/multipaint.pde	Wed Jul 04 11:55:02 2018 +0300
+++ b/multipaint.pde	Wed Jul 04 12:10:35 2018 +0300
@@ -401,40 +401,38 @@
     if (moicon(width - 32 * g_uizoom, 0, 32 * g_uizoom, 16 * g_uizoom)) help(int('.'));
 
     if (g_data[int('m')] == 0 && g_data[int('M')] == 0) {
-        msx = mouseX - g_windowx;
-        msy = mouseY - g_windowy;
-        msx = g_msx - g_windowx;
-        msy = g_msy - g_windowy;
+        g_mx = g_msx - g_windowx;
+        g_my = g_msy - g_windowy;
     } else {
-        msx = mouseX;
-        msy = mouseY;
-        //msx=g_msx;msy=g_msy;
-    }
-    g_mx = msx;
-    g_my = msy;
-
-    //actual tool drawing
-    if (g_tooltrigger == 1) { // comes from mousepressed, or mousedragged
-        if (g_mx <= width - g_hedge && g_my <= height - g_vedge) do_tool(msx, msy, g_button);
+        g_mx = mouseX;
+        g_my = mouseY;
     }
 
     g_msx = mouseX;
     g_msy = mouseY;
+
+    //actual tool drawing
+    if (g_tooltrigger == 1) { // comes from mousepressed, or mousedragged
+        if (g_mx <= width - g_hedge && g_my <= height - g_vedge) do_tool(g_mx, g_my, g_button);
+    }
+
     switcher(0);
 
     for (int i = 0; i < 1024; i++) {
         g_remdo[i] = 0;
     }
+
     int lipo = g_button;
     //tool drawing for shows
     if (tool() != 5) {
         if (g_phase == 0) g_button = LEFT;
-        do_tool(msx, msy, LEFT);
+        do_tool(g_mx, g_my, LEFT);
     }
     if (tool() == 6) doline(g_rx, g_ry, g_rx2, g_ry2, 0);
     if (tool() == 7) docircle(g_rx, g_ry, g_rx2, g_ry2);
     if (tool() == 8) rectangle(g_rx, g_ry, g_rx2, g_ry2);
     g_button = lipo;
+
     loadPixels();
     viewport();
     //magport();