From db3c02d4c37d57e8c84b7abe4d5009dc371be45a Mon Sep 17 00:00:00 2001
From: pavelyakov <pavelyakov@kolibrios.org>
Date: Sun, 2 Aug 2015 23:43:40 +0000
Subject: [PATCH] CMM: mouse: new event drag

git-svn-id: svn://kolibrios.org@5657 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/eolite/Eolite.c | 10 +++++-----
 programs/cmm/lib/kolibri.h   | 38 ++++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 7c9d9d86cd..f1ee459c17 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -189,13 +189,13 @@ void main()
 	if (param)
 	{
 		tmp = strlen(#path);
-		strncpy(#path, #param, tmp);
+		strlcpy(#path, #param, tmp);
 		$dec tmp
 		if (path[tmp]!='/') DSBYTE[#path+tmp] = '/'; //add "/" to the end of the string
 	}
 	else
 	{
-		strncpy(#path, "/rd/1/", 6);		
+		strlcpy(#path, "/rd/1/", 6);		
 	}
 	Open_Dir(#path,ONLY_OPEN);
 	SetEventMask(1100111b);
@@ -213,7 +213,7 @@ void main()
 				mouse.get();
 				
 				if (!mouse.mkm) && (stats>0) stats = 0;
-				if (mouse.mkm) && (stats==0)
+				if (mouse.mkm) && (!stats)
 				{
 					x_old = mouse.x;
 					y_old = mouse.y;
@@ -252,7 +252,7 @@ void main()
 						}
 					}
 				}	
-				if (files.MouseOver(mouse.x, mouse.y))&&((mouse.up)||(mouse.down)||(mouse.dblclick))
+				if (files.MouseOver(mouse.x, mouse.y))&&((mouse.down)||(mouse.dblclick))
 				{
 					//select/open file {
 					if (mouse.key&MOUSE_LEFT)&&((mouse.down)||(mouse.dblclick))
@@ -263,7 +263,7 @@ void main()
 							if (files.current!=id)
 							{
 								mouse.clearTime();
-								if (id<files.visible) List_Current(id-files.current);
+								if(id<files.visible) List_Current(id-files.current);
 							}
 							else if(mouse.dblclick)Open(0);
 						}
diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h
index f81b95b57f..865585f0e1 100644
--- a/programs/cmm/lib/kolibri.h
+++ b/programs/cmm/lib/kolibri.h
@@ -4,7 +4,6 @@
 
 #startaddress 0
 #code32 TRUE
-
 char   os_name[8]   = {'M','E','N','U','E','T','0','1'};
 dword  os_version   = 0x00000001;
 dword  start_addr   = #______INIT______;
@@ -93,12 +92,13 @@ char program_path[4096];
  *  move - event MOUSE movements
  *  click - when clicked
  *  dblclick - double-click the default 50 (500 ms)
+ *  drag - drag the element event
  */
 
 :dword __TMP_TIME,MOUSE_TIME;
 :struct MOUSE
 {
-	signed x,y,xx,yy,lkm,mkm,pkm,key,tmp,tmp_time,hor,vert,down,up,move,click,dblclick,left,top;
+	signed x,y,xx,yy,lkm,mkm,pkm,key,tmp,tmp_time,hor,vert,down,up,move,click,dblclick,drag,left,top;
 	dword handle,_;
 	byte cmd;
 	void clearTime();
@@ -203,14 +203,26 @@ char program_path[4096];
 	mkm = ECX;
 	
 	//when you release the MOUSE button
+	// Mouse Move Event
+	if(xx!=x)||(yy!=y)
+	{
+		move = true;
+		xx = x;
+		yy = y;
+	}
+	else move = false;
 	// Mouse Up Event
-	if((cmd)&&!(key)){
-		up = true;
+	if(cmd)&&(!key){
+		up   = true;
 		down = false;
+		drag = false;
 		if(!move) click = true;
-		move = false;
 		__TMP_TIME = GetStartTime();
-		if(__TMP_TIME-tmp_time<=MOUSE_TIME){ dblclick = true;click = false; }
+		if(__TMP_TIME-tmp_time<=MOUSE_TIME)
+		{ 
+			dblclick = true;
+			click    = false; 
+		}
 		tmp_time = __TMP_TIME;
 		//returns the key code
 		key = tmp;
@@ -224,20 +236,20 @@ char program_path[4096];
 	
 	//when you press the MOUSE button
 	// Mouse Down Event/Move Event
-	else {
+	else 
+	{
 	    up       = false;
 		click    = false;
 		dblclick = false;
 		down     = false;
 		// Mouse Move Event
-		if((xx!=x)||(yy!=y))
+		if(key)if(!cmd) 
 		{
-			move = true;
-			xx = x;
-			yy = y;
+			down = true;
+			if(move)drag = true;
+			cmd = true;
+			tmp=key;
 		}
-		else move = false;
-		if(key)if(!cmd) {down = true;cmd = true;tmp=key;}
 	}
 	
 	//scroll