From 2c8b040e9719fb338a859f8e5c64c6b3442ef14a Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 29 Apr 2018 20:42:03 +0000
Subject: [PATCH] IconEdit 0.51: tools cursor support

git-svn-id: svn://kolibrios.org@7262 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/iconedit/cursors/bar.cur  | Bin 0 -> 766 bytes
 programs/cmm/iconedit/cursors/fill.cur | Bin 0 -> 766 bytes
 programs/cmm/iconedit/cursors/line.cur | Bin 0 -> 766 bytes
 programs/cmm/iconedit/iconedit.c       |  15 ++++++++++++++-
 programs/cmm/iconedit/tools.h          |  18 ++++++++++++++++++
 programs/cmm/iconedit/tools/pipette.h  |   2 +-
 programs/cmm/lib/cursor.h              |   2 ++
 7 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 programs/cmm/iconedit/cursors/bar.cur
 create mode 100644 programs/cmm/iconedit/cursors/fill.cur
 create mode 100644 programs/cmm/iconedit/cursors/line.cur

diff --git a/programs/cmm/iconedit/cursors/bar.cur b/programs/cmm/iconedit/cursors/bar.cur
new file mode 100644
index 0000000000000000000000000000000000000000..acbdc2e85964f507d92bd589947a950421c39836
GIT binary patch
literal 766
zcmd5$F^<A85FFqn=t4!E@@hU{ihB#+z&~)ybAs-46%V0wnIh8MY;4EmkZ5RFYj$@$
zyY>J}EYP-FtaWZnU<cq+XoZ8Yz=ty6rIpy0M%7!d<a6UQ>AFsL9yDEvxnU+u7pA^f
z$k-UgRZLAYarR_j<pBYGQ+XdZu?dyOG%)Q;)<D%w4tL!4H|71PNCRnKRR8Pbeesz;
z$us{&9)}vz<l@BYWMd?c`fOh_uX6iliemL??ciAOy?4Bv9e=KlzemT+hp(#}4yZVh
MepNAu|A+ng2Ra_lPyhe`

literal 0
HcmV?d00001

diff --git a/programs/cmm/iconedit/cursors/fill.cur b/programs/cmm/iconedit/cursors/fill.cur
new file mode 100644
index 0000000000000000000000000000000000000000..7dbcfec10c7a525a6740cfaba4428d4957bb71a6
GIT binary patch
literal 766
zcmeHFF%p763|zn&%TQTU`V0M;*J<JS1;4@%_=2UK_X5`qClYLJ4Qy_Y-ARrBP@_WE
zwP?`dUIQBdTcH#7LWPwwkfcq~PGnq@M3I!rqAV&T^nEXZ;|<c8pvxb5`bU{fn1dmQ
z9gt~pZ?GH<;?ZC-M+0qPP;pJ&O(o1o8Rml7Kg&mUt18U0A14Rd4c;NdQufmX@r$b2
lPw^PY;V3lZr6SMzt4=sDVfTh}vX^#~=ebrpy)v(*?F(9pqVNC!

literal 0
HcmV?d00001

diff --git a/programs/cmm/iconedit/cursors/line.cur b/programs/cmm/iconedit/cursors/line.cur
new file mode 100644
index 0000000000000000000000000000000000000000..6aa73f7f58e25071d8c9e76430bb55c8e0577e1c
GIT binary patch
literal 766
zcmdT?F%H5o5OWI>W0+XU$S>e8yr2^!`2k<*#zR;bv%!EcJ~a}(r~^VQIPxX7)6=yo
z(4s+%ODwdmEwBQx5u>;h8_ZP&Wm8CIs-$vAMf80yFM*b;upC$f2gA}oK=w0+;C1%-
z4`X$9&2#q6Eg#R~E-P?4kh%Kq?nNeY_k7*&3q77y|HP-b>EcB^izjhSKDXrKNZz$|
Q;$A!qmf30crs<j#Ue(00rT_o{

literal 0
HcmV?d00001

diff --git a/programs/cmm/iconedit/iconedit.c b/programs/cmm/iconedit/iconedit.c
index 5c1364db2a..a6da905886 100644
--- a/programs/cmm/iconedit/iconedit.c
+++ b/programs/cmm/iconedit/iconedit.c
@@ -16,6 +16,7 @@ pipet aside color view
 #include "../lib/gui.h"
 #include "../lib/random.h"
 #include "../lib/mem.h"
+#include "../lib/cursor.h"
 
 #include "../lib/obj/libimg.h"
 #include "../lib/obj/box_lib.h"
@@ -31,7 +32,7 @@ pipet aside color view
 //                                                   //
 //===================================================//
 
-#define T_TITLE "Icon Editor 0.50 Alpha"
+#define T_TITLE "Icon Editor 0.51 Alpha"
 
 #define TOOLBAR_H    24+8
 #define PANEL_LEFT_W 16+5+5+3+3
@@ -114,6 +115,15 @@ dword last_used_colors[13*2] = {
 0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF
 };
 
+CustomCursor Cursor;
+dword CursorBar = FROM "cursors/bar.cur";
+dword CursorFill = FROM "cursors/fill.cur";
+dword CursorLine = FROM "cursors/line.cur";
+dword CursorPencil = FROM "cursors/pencil.cur";
+dword CursorPipette = FROM "cursors/pipette.cur";
+dword CursorRectangle = FROM "cursors/rectangle.cur";
+dword CursorSelect = FROM "cursors/select.cur";
+
 _image image;
 
 #include "actions_history.h"
@@ -200,6 +210,9 @@ void main()
 				DrawEditArea();
 			}
 
+			if (wrapper.hovered()) SetCursor();
+			else Cursor.Restore();
+
 			if (mouse.down) {
 				if (b_color_gradient.hovered()) 
 				|| (b_last_colors.hovered())
diff --git a/programs/cmm/iconedit/tools.h b/programs/cmm/iconedit/tools.h
index 300b82e02f..be4f2b4e13 100644
--- a/programs/cmm/iconedit/tools.h
+++ b/programs/cmm/iconedit/tools.h
@@ -4,6 +4,7 @@
 
 struct Tool {
 	int id;
+	dword cursor;
 	void (*activate)();
 	void (*deactivate)();
 	void (*onMouseEvent)(int x, int y, int lkm, int pkm);
@@ -37,35 +38,42 @@ enum {
 void initTools() 
 {
 	tools[TOOL_PENCIL].id = TOOL_PENCIL;
+	tools[TOOL_PENCIL].cursor = #CursorPencil;
 	tools[TOOL_PENCIL].onMouseEvent = #PencilTool_onMouseEvent;
 	tools[TOOL_PENCIL].deactivate = #PencilTool_reset;
 	
 	tools[TOOL_PIPETTE].id = TOOL_PIPETTE;
+	tools[TOOL_PIPETTE].cursor = #CursorPipette;
 	tools[TOOL_PIPETTE].activate = #PipetteTool_activate;
 	tools[TOOL_PIPETTE].onMouseEvent = #PipetteTool_onMouseEvent;
 	
 	tools[TOOL_FILL].id = TOOL_FILL;
+	tools[TOOL_FILL].cursor = #CursorFill;
 	tools[TOOL_FILL].onMouseEvent = #FillTool_onMouseEvent;
 	
 	tools[TOOL_LINE].id = TOOL_LINE;
+	tools[TOOL_LINE].cursor = #CursorLine;
 	tools[TOOL_LINE].activate = #SimpleFigureTool_Reset;
 	tools[TOOL_LINE].deactivate = #SimpleFigureTool_Reset;
 	tools[TOOL_LINE].onMouseEvent = #SimpleFigureTool_onMouseEvent;
 	tools[TOOL_LINE].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;
 	
 	tools[TOOL_RECT].id = TOOL_RECT;
+	tools[TOOL_RECT].cursor = #CursorRectangle;
 	tools[TOOL_RECT].activate = #SimpleFigureTool_Reset;
 	tools[TOOL_RECT].deactivate = #SimpleFigureTool_Reset;
 	tools[TOOL_RECT].onMouseEvent = #SimpleFigureTool_onMouseEvent;
 	tools[TOOL_RECT].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;	
 
 	tools[TOOL_BAR].id = TOOL_BAR;
+	tools[TOOL_BAR].cursor = #CursorBar;
 	tools[TOOL_BAR].activate = #SimpleFigureTool_Reset;
 	tools[TOOL_BAR].deactivate = #SimpleFigureTool_Reset;
 	tools[TOOL_BAR].onMouseEvent = #SimpleFigureTool_onMouseEvent;
 	tools[TOOL_BAR].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;	
 
 	tools[TOOL_SELECT].id = TOOL_SELECT;
+	tools[TOOL_SELECT].cursor = #CursorSelect;
 	tools[TOOL_SELECT].activate = #SelectTool_activate;
 	tools[TOOL_SELECT].deactivate = #SelectTool_deactivate;
 	tools[TOOL_SELECT].onMouseEvent = #SelectTool_onMouseEvent;
@@ -73,6 +81,7 @@ void initTools()
 	tools[TOOL_SELECT].onKeyEvent = #SelectTool_onKeyEvent;	
 
 	tools[TOOL_SCREEN_COPY].id = TOOL_SCREEN_COPY;
+	tools[TOOL_SCREEN_COPY].cursor = NULL;
 	tools[TOOL_SCREEN_COPY].activate = #ScreenCopy_activate;
 	tools[TOOL_SCREEN_COPY].onMouseEvent = #ScreenCopy_onMouseEvent;
 }
@@ -94,7 +103,16 @@ void setCurrentTool(int index) {
 	if ((index != TOOL_NONE) && (tools[index].activate != 0))
 		tools[index].activate();
 
+	Cursor.Restore();
+	if (wrapper.hovered()) SetCursor();
 	DrawLeftPanel();
 	DrawCanvas();
 }
 
+void SetCursor()
+{
+	if (tools[currentTool].cursor) && (!Cursor.CursorPointer) {
+		Cursor.Load(tools[currentTool].cursor);
+		Cursor.Set();
+	}
+}
\ No newline at end of file
diff --git a/programs/cmm/iconedit/tools/pipette.h b/programs/cmm/iconedit/tools/pipette.h
index b605ee5914..065e75dba7 100644
--- a/programs/cmm/iconedit/tools/pipette.h
+++ b/programs/cmm/iconedit/tools/pipette.h
@@ -4,7 +4,7 @@ void PipetteTool_activate() {
 }
 
 void PipetteTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
-	//if (!canvas.hovered()) return; //TODO: option "Restrict pipette to canvas area"
+	if (!canvas.hovered()) return; //TODO: option "Restrict pipette to canvas area"
 	tool_color = GetPixelUnderMouse();
 	DrawBar(Form.cwidth-30, 5, 20, 20, tool_color);
 	
diff --git a/programs/cmm/lib/cursor.h b/programs/cmm/lib/cursor.h
index b4026c0152..e9142cda17 100644
--- a/programs/cmm/lib/cursor.h
+++ b/programs/cmm/lib/cursor.h
@@ -37,10 +37,12 @@ dword CustomCursor::Set()
 
 dword CustomCursor::Restore()
 {
+  if (!CursorPointer) return;
   EAX = 37;
   EBX = 5;
   ECX = 0;
   $int 0x40
+  CursorPointer = 0;
 }
 
 void CustomCursor::Delete()