WebSVN – Kolibri OS – Diff – /programs/other/table/hello.cpp

-//ñâîåâðåìåííîå ðåàãèðîâàíèå íà ñîáûòèÿ ìûøè
-//ìèíèìàëüíûå ðàçìåðû îêíà
-//óáðàíà ïåðåðèñîâêà çàãîëîâêà îêíà òàì, ãäå îíà íå íóæíà
-//óáðàíî "çàïîëçàíèå" ïàíåëè ñíèçó íà ãðàíèöû îêíà
-//èñïðàâëåí áàã èç-çà êîòîðîãî ïîñëå äåéñòâèé ìûøêîé óäàëÿëàñü êíîïêà çàêðûòèÿ îêíà
-//çà÷åì ñòðîêà 450?
-//åñëè âûäåëèòü îáëàñòü ÿ÷ååê è ñäâèíóòü êóðñîð ââîäà ñ ïîìîùüþ êëàâèø, "ñëåäû" îñòàíóòüñÿ
-//íåëüçÿ ïåðåìåùàòüñÿ ïî áóêâàì â ðåäàêòèðóåìîé ñòðîêå
 #include "func.h"
 #include "parser.h"
 #include "calc.h"
 #include "use_library.h"
-#define TABLE_VERSION "0.96"
+#define TABLE_VERSION "0.97"
 // ñòðîêè, êîòîðûå âûâîäèò ïðîãðàììà
 const char *sFileSign = "KolibriTable File\n";
+					}
 				if (!sel_moved || (is_x_changed(i))) kos_WriteTextToWindow(x-x0+2+dx,dy,0,text_color,cells[i][0],strlen(cells[i][0]));
 				// åñòü êíîïêà ñòîáëöà è åùå êíîïêà èçìåíåíèÿ øèðèíû
+				if (x - x0 + col_width[i] <= wi - col_width[0])
+				{
-				if (x - x0 + col_width[i] <= wi - col_width[0])
+					//kos_DeleteButton(COL_HEAD_BUTTON+i);
+					kos_DefineButton(x-x0+5,0,cur_width - 10,row_height[0]-1,0x60000000+COL_HEAD_BUTTON+i,0);
 					kos_DefineButton(x-x0+5,0,cur_width - 10,row_height[0]-1,0x60000000+COL_HEAD_BUTTON+i,0);
 				//kos_DefineButton(x-x0+col_width[i]-10,0,15,row_height[0]-1,0x60000000+COL_SIZE_BUTTON+i,0);
 				col_left[i] = x - x0;
+			}
 			if (x - x0 > wi - col_width[0])
+					}
 				if (!sel_moved || (is_y_changed(i)))
+					kos_WriteTextToWindow(2+dx,y-y0+dy,0,text_color,cells[0][i],strlen(cells[0][i]));
 					kos_WriteTextToWindow(2+dx,y-y0+dy,0,text_color,cells[0][i],strlen(cells[0][i]));
 				kos_DefineButton(0,y-y0+5,col_width[0]-1,row_height[i]-6,0x60000000+ROW_HEAD_BUTTON+i,0);
 				//kos_DefineButton(0,y-y0+row_height[i]-5,col_width[0]-1,10,0x60000000+ROW_SIZE_BUTTON+i,0);
 				row_top[i] = y - y0;
 	kos_DrawLine(x0, y1, x1, y1, DCOLOR, DINVERT);
+}
 void draw_window()
-{
 	int i;
 	double xx0=0.0, yy0=0.0;
 	sProcessInfo info;
 	void *p;
 	if (sel_end_move)
 		sel_moved = 0;
 	memset((Byte*)&info, 0, 1024);
 	memset((Byte*)&info, 0, 1024);
 	kos_ProcessInfo(&info, 0xFFFFFFFF);
 	kos_ProcessInfo(&info, 0xFFFFFFFF);
 	p = info.rawData + 42;			// magic
 		he = WND_H;
 	he -= kos_GetSkinHeight() + MENU_PANEL_HEIGHT; // äîñòóïíàÿ âûñîòà îêíà
-	wi -= 10;
-	//Leency{
+	wi -= 10;
 	// start redraw
 	if (window_drawall==true){
-		kos_WindowRedrawStatus(1);
-		kos_DefineAndDrawWindow(10,40,WND_W,WND_H,0x33,0x40FFFFFF,0,0,(Dword)"Table v" TABLE_VERSION);
-		if (he + MENU_PANEL_HEIGHT <= 8) //åñëè îêíî ñâ¸ðíóòî â çàãîëîâîê
+		kos_WindowRedrawStatus(1);
-		{
-			kos_WindowRedrawStatus(2);
+		kos_DefineAndDrawWindow(10,40,WND_W,WND_H,0x33,0x40FFFFFF,0,0,(Dword)"Table v" TABLE_VERSION);
+		kos_WindowRedrawStatus(2);
 			return;
 		if (info.rawData[70]&0x04) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
 		if (he < 100) kos_ChangeWindow( -1, -1, -1, 180 );
 		if (wi < 340) kos_ChangeWindow( -1, -1, 350, -1 );
 	kos_DefineButton(90 + 160 + 70, y - 5, 60, 20, NEW_BUTTON, 0xd0d0d0);
 	kos_WriteTextToWindow(92 + 160 + 10 + 70, y + 2, 0, 0x000000, (char*)sNew, strlen(sNew));
 	*/
 	panel_y = y;
-	//kos_DefineButton(0,0,WND_W,WND_H,0x60000002,0);
-	//if (is_edit) KEdit();
 	if ((void*)edit_box_draw != NULL)
+	{
 		if (is_edit)
 			edit_box_draw((DWORD)&cell_box);
 		edit_box_draw((DWORD)&file_box);
+	}
-	draw_grid();
 	// end redraw
-	kos_WindowRedrawStatus(2);
+	draw_grid();
 	window_drawall=false;
 	sel_moved = 0;
+}
 void process_mouse()
+{
 	Dword mouse_btn, ckeys, shift, ctrl;
-	int mouse_x, mouse_y, i, p, dx = 0, dy = 0;
+	int mouse_x, mouse_y, i, dx = 0, dy = 0;
 	kos_GetScrollInfo(vert, hor);
 	//sprintf(debuf, "scroll %U %U", vert, hor);
+	//rtlDebugOutString(debuf);
 	//rtlDebugOutString(debuf);
+	if (vert != 0) //òðóú ïåðåðèñîâêà!
 	if (vert != 0) //òðóú ïåðåðèñîâêà!
-	{
-		move_sel(sel_x, sel_y + vert);
+		if (!((sel_end_y + vert) >= (row_count-1))) //çàãëóøêà
-		//move_sel(sel_x + hor, sel_y);
+		move_sel(sel_x, sel_y + vert);
 		return;
+	}
 	mouse_btn &= 0x0001;
 	ckeys = kos_GetSpecialKeyState();
+	shift = ckeys & 0x3;
 	shift = ckeys & 0x3;
 	if (mouse_y < 0 && mouse_btn)	// ò.ê. ìûøêà íà çàãîëîâêå îêíà
+	{
 		window_is_dragged = 1;
+}
 void process_key()
+{
 	Dword mouse_btn, ckeys, shift, ctrl;
-	int mouse_x, mouse_y, i, p, dx = 0, dy = 0;
+	int mouse_x, mouse_y, dx = 0, dy = 0;
 	// key pressed, read it
 	Byte keyCode;
+			{
 				stop_edit();
 				draw_window();
+			}
 			break;
-		//case 0x08:			// backspace
-			/*if (is_edit || fn_edit)
-			{
-				if (strlen(edit_text) != 0)
-					edit_text[strlen(edit_text) - 1] = '\0';
-				KEdit();
-			}
-			else if (cells[sel_x][sel_y])
-			{
-				start_edit(sel_x, sel_y);
-			}
-			*/
-		//	break;
 		case 22:	// contol-v
+			{
 				if (ctrl)
+				{
 					//rtlDebugOutString("control-v!");
 					edit_box_key((dword)&cell_box);
+				}
+			}
 			if (is_edit)
 				edit_box_draw((dword)&cell_box);
-			/*
-			if (strlen(edit_text)<256)
-			{
-				edit_text[strlen(edit_text)]=keyCode;
-				edit_text[strlen(edit_text) + 1]='\0';
-				KEdit();
-			}
-			*/
 			break;
+	}
 	if (dx != 0)
+	{
 		if (shift)
 	*/
 	if ((dx || dy))
+	{
 		if (!shift)
+		{
+			if ((sel_end_x + dx) >= (col_count-1)) {dx=0;} //çàãëóøêà
+			else if ((sel_end_y + dy) >= (row_count-1)) {dy=0;}
+			else {
 			move_sel(sel_x + dx, sel_y + dy);
+			}
+		}
 		else
+		{
 			sel_moved = 0;
 			stop_edit();
 			draw_grid();
 	load_edit_box();
 	init();
 	for (;;)
 	{
-		switch (kos_CheckForEvent())
+		switch (kos_WaitForEvent(10))
+		{
 		case 0:
 			process_mouse();
 			break;

Subversion Repositories Kolibri OS

(root)/programs/other/table/hello.cpp – Rev 1218 → 2749