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

 #include "func.h"
 #include "parser.h"
 #include "calc.h"
 #include "use_library.h"
-#define TABLE_VERSION "0.98.9"
+#define TABLE_VERSION "0.99"
 // strings
 const char *sFileSign = "KolibriTable File\n";
 #define SCROLL_SIZE 16
 scroll_bar scroll_v = { SCROLL_SIZE,200,398, NULL, SCROLL_SIZE,0,115,15,0,0xeeeeee,0xD2CED0,0x555555,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 scroll_bar scroll_h = { 200,NULL,SCROLL_SIZE, NULL, SCROLL_SIZE,0,115,15,0,0xeeeeee,0xD2CED0,0x555555,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 // ячейки - их параметры и текст
-DWORD col_count = 101, row_count = 101;
+DWORD col_count = 100, row_count = 100;
 DWORD *cell_w, *cell_h;
 char ***cells;
 bool sel_end_move = 0;
 // сколько ячеек помещается в окне по х и у
 DWORD nx = 0, ny = 0;
-// флаг реадктирования ячейки
-//bool is_edit = 0;
-#define ed_focus 2
+// флаг реадктирования ячейки
 #define is_edit (cell_box.flags & ed_focus)
 // редактирование имени файла
 // растаскивание ячейки при ее тащении за правый нижний угол, с заполнением ячеек
 int drag_x, drag_y;
-int old_end_x, old_end_y;
 int old_end_x, old_end_y;
 void draw_window();
 void draw_grid();
 		ch = 1;
+	}
 	if (ch)
+	{
 		sel_moved = 1;
-		draw_window();
+		draw_grid();
+	}
 	file_box.flags &= ~ed_focus;
-	cell_box.flags |= ed_focus;
+	cell_box.flags = ed_focus;
 	cell_box.left = cell_x[x] + 1;
 	cell_box.top = cell_y[y];
 	cell_box.width = cell_w[x] - 2;
 	memset((Byte*)edit_text, 0, sizeof(edit_text));
 	if (cells[x][y])
-	{
 		strcpy(edit_text, cells[x][y]);
+		strcpy(edit_text, cells[x][y]);
 		edit_text[strlen(cells[x][y]) - 1] = '\0';
-	}
+	cell_box.offset = cell_box.shift = cell_box.shift_old = 0;
 	cell_box.pos = cell_box.size = strlen(edit_text);
 	cell_box.offset = 0;
 	edit_box_draw((DWORD)&cell_box);
-	draw_window();
+	edit_box_draw((DWORD)&file_box);
+}
+{
 	if (!is_edit)
 		return;
 	cell_box.flags &= ~ed_focus;
 	memset((Byte*)edit_text,0, 256);
-	draw_window();
+	draw_grid();
+}
 void check_sel()
+{
 				else {
 					text = (values[j][i] && !display_formulas ? values[j][i] : cells[j][i]);
+				}
 				DrawCell(x+1, y+1, cell_w[j]-1, cell_h[i]-1, 0, bg_color, text, false);
-				if (draw_frame_selection) {
+				if (draw_frame_selection && j
-					DrawSelectedFrame(x+1,y, cell_w[j]-1, cell_h[i], TEXT_COLOR);
+					DrawSelectedFrame(x+1,y, cell_w[j]-1, cell_h[i]+1, TEXT_COLOR);
+				}
 				else if (error) kos_DrawRegion(x+1, y+1, cell_w[j]-1, cell_h[i]-1, 0xff0000, 0);
+			}
 			x += cell_w[j];
 	kos_DrawLine(x0, y0, x1, y0, DCOLOR, DINVERT);
 	kos_DrawLine(x1, y0, x1, y1, DCOLOR, DINVERT);
 	kos_DrawLine(x0, y1, x1, y1, DCOLOR, DINVERT);
+}
-bool draw_and_define_window()
+void draw_window()
+{
 	kos_WindowRedrawStatus(1);
 	kos_DefineAndDrawWindow(110,40,WND_W,WND_H,0x73,0x40FFFFFF,0,0,(Dword)"Table v" TABLE_VERSION);
 	grid.x = 0;
 	grid.y = 0;
 	grid.w = cWidth - SCROLL_SIZE - 1;
 	grid.h = cHeight - MENU_PANEL_HEIGHT - SCROLL_SIZE;
-	if (info.processInfo.status_window&0x04) return false; //draw nothing if window is rolled-up
+	if (info.processInfo.status_window&0x04) return; //draw nothing if window is rolled-up
-	if (cWidth < 430) { kos_ChangeWindow( -1, -1, 450, -1 ); return false; }
+	if (cWidth  < 430) { kos_ChangeWindow( -1, -1, 450, -1 ); return; }
+	if (cHeight < 250) { kos_ChangeWindow( -1, -1, -1, 300 ); return; }
-	if (cHeight < 250) { kos_ChangeWindow( -1, -1, -1, 300 ); return false; }
-	sel_moved = 0;
-	return true;
-void draw_window()
+	sel_moved = 0;
 	if (is_edit) stop_edit();
-	int panel_y = cHeight - MENU_PANEL_HEIGHT + 1;
-	kos_DrawBar(0, panel_y, cWidth, MENU_PANEL_HEIGHT-1, sc.work);
-	kos_WriteTextToWindow(3 + 1, panel_y + 14, 0x90, sc.work_text, (char*)sFilename, 0);
+	int panel_y = cHeight - MENU_PANEL_HEIGHT + 1;
 	kos_DrawBar(0, panel_y, cWidth, MENU_PANEL_HEIGHT-1, sc.work);
-	file_box.top = panel_y + 10;
+	kos_WriteTextToWindow(3 + 1, panel_y + 14, 0x90, sc.work_text, (char*)sFilename, 0);
 	file_box.top = panel_y + 10;
 	#define BTX 230
-	#define BTW 70
-	//save
+	#define BTW 70
-	kos_DefineButton(BTX + 25, file_box.top, BTW, 21, SAVE_BUTTON, sc.work);
+	//save
-	kos_WriteTextToWindow(BTX + 25 + (BTW - strlen(sSave) * 8) / 2, panel_y + 14, 0x90, sc.work_text, (char*)sSave, 0);
+	kos_DefineButton(BTX + 25, file_box.top, BTW, 21, SAVE_BUTTON, sc.work);
-	//load
+	kos_WriteTextToWindow(BTX + 25 + (BTW - strlen(sSave) * 8) / 2, panel_y + 14, 0x90, sc.work_text, (char*)sSave, 0);
-	kos_DefineButton(BTX + 25+BTW+5, file_box.top, BTW, 21, LOAD_BUTTON, sc.work);
-	kos_WriteTextToWindow(BTX + 25+BTW+5 + (BTW - strlen(sLoad) * 8) / 2, panel_y + 14, 0x90, sc.work_text, (char*)sLoad, 0);
+	//load
+	kos_DefineButton(BTX + 25+BTW+5, file_box.top, BTW, 21, LOAD_BUTTON, sc.work);
-	//new (clean)
-	/*
-	kos_DefineButton(90 + 160 + 70, panel_y + 9, 60, 20, NEW_BUTTON, sc.work);
-	kos_WriteTextToWindow(92 + 160 + 10 + 70, panel_y + 16, 0, sc.work_text, (char*)sNew, strlen(sNew));
-	*/
-	if ((void*)edit_box_draw != NULL)
-	{
-		if (is_edit)
+	kos_WriteTextToWindow(BTX + 25+BTW+5 + (BTW - strlen(sLoad) * 8) / 2, panel_y + 14, 0x90, sc.work_text, (char*)sLoad, 0);
-			edit_box_draw((DWORD)&cell_box);
+	// // new (clean)
-		edit_box_draw((DWORD)&file_box);
+	// kos_DefineButton(90 + 160 + 70, panel_y + 9, 60, 20, NEW_BUTTON, sc.work);
+	// kos_WriteTextToWindow(92 + 160 + 10 + 70, panel_y + 16, 0, sc.work_text, (char*)sNew, strlen(sNew));
+	if (sel_end_move) sel_moved = 0;
 	draw_grid();
 	sel_moved = 0;
 	if (sel_end_move) sel_moved = 0;
-	draw_grid();
+	if (is_edit) edit_box_draw((DWORD)&cell_box);
 	if (!sel_moved && !size_state) //do not handle scrollbars when user selects cells
+	{
 		if (!scroll_h.delta2) scrollbar_v_mouse((DWORD)&scroll_v);
 		if (scroll_v.position != grid.firsty-1)
+		{
+			stop_edit();
 			grid.firsty = scroll_v.position + 1;
 			draw_grid();
+		}
 		if (!scroll_v.delta2) scrollbar_h_mouse((DWORD)&scroll_h);
 		if (scroll_h.position != grid.firstx-1)
+		{
 			stop_edit();
 			grid.firstx = scroll_h.position + 1;
 			draw_grid();
+		}
+	}
 	if (scroll_v.delta2 || scroll_h.delta2) return;
-	edit_box_mouse((dword)&cell_box);
+	if (is_edit) edit_box_mouse((dword)&cell_box);
 	edit_box_mouse((dword)&file_box);
 	int mouse_x, mouse_y, i;
+	kos_GetMouseState(mouse_btn, mouse_x, mouse_y);
+	mouse_x -= 5;
+	mouse_y -= kos_GetSkinHeight();
 	kos_GetMouseState(mouse_btn, mouse_x, mouse_y);
-	mouse_x -= 5;
+	if (is_edit && mouse_x>=cell_box.left && mouse_x<=cell_box.left+cell_box.width
-	mouse_y -= kos_GetSkinHeight();
+		&& mouse_y>=cell_box.top && mouse_y<=cell_box.top+22) return;
+	}
 	size_mouse_x = mouse_x;
 	size_mouse_y = mouse_y;
+}
+void shift_selection(int dx, int dy, Dword shift)
+{
+	if (dx != 0)
+	{
+		if (shift)
+		{
+			sel_end_x += dx;
+			if (sel_end_x <= 1)
+				sel_end_x = 1;
+			else if (sel_end_x >= col_count)
+				sel_end_x = col_count - 1;
+		//	sprintf(debuf,"sel end x change. sel end %U %U",sel_end_x,sel_end_y);
+		//	rtlDebugOutString(debuf);
+			sel_moved = sel_end_move = 1;
+			//stop_edit();
+			//draw_grid();
+		}
+		else
+		{
+		}
+	}
+	if (dy != 0)
+	{
+		if (shift)
+		{
+			sel_end_y += dy;
+			if (sel_end_y <= 1)
+				sel_end_y = 1;
+			else if (sel_end_y >= row_count)
+				sel_end_y = row_count - 1;
+		//	sprintf(debuf,"sel end y change. sel end %U %U",sel_end_x,sel_end_y);
+		//	rtlDebugOutString(debuf);
+			sel_moved = sel_end_move = 1;
+			//stop_edit();
+			//draw_grid();
+		}
+	}
+	/*
+	if (sel_end_x < sel_x)
+	{
+		Dword tmp = sel_end_x; sel_end_x = sel_x; sel_x = tmp;
+	}
+	if (sel_end_y < sel_y)
+	{
+		Dword tmp = sel_end_y; sel_end_y = sel_y; sel_y = tmp;
+	}
+	*/
+	if ((dx || dy))
+	{
+		if (!shift)
+		{
+			if ((sel_end_x + dx) >= (col_count-1)) {dx=0;} //stub
+			else if ((sel_end_y + dy) >= (row_count-1)) {dy=0;}
+			else {
+			move_selection(sel_x + dx, sel_y + dy);
+			}
+		}
+		else
+		{
+			sel_moved = 0;
+			stop_edit();
+			draw_grid();
+		}
+	}
+}
 void process_key()
 {
+	Dword ckeys, shift, ctrl;
-	Dword mouse_btn, ckeys, shift, ctrl;
+	dword key_editbox;
-	int mouse_x, mouse_y, dx = 0, dy = 0;
+	Byte key_ascii, key_scancode;
 	// key pressed, read it
-	Byte keyCode;
+	// key pressed, read it
 	ckeys = kos_GetSpecialKeyState();
 	shift = ckeys & 0x3;
 	ctrl = ckeys & 0x0c;
-	sel_moved = 0;
-	sel_end_move = 0;
-	kos_GetKey(keyCode);
-	__asm
-	{
+	sel_moved = 0;
-		mov ah, keyCode
-	}
-	edit_box_key((dword)&cell_box);
-	edit_box_key((dword)&file_box);
-	switch (keyCode)
-	{
-		case 178:
-			dy = -1;
-			break;
-		case 176:
-			dx = -1;
-			break;
-		case 179:
-			dx = 1;
-			break;
-		case 177:
+	sel_end_move = 0;
-			dy = 1;
-			break;
-		case 183:
-			dy = ny - grid.firsty-1;
-			break;
-		case 184:
-			dy = - (ny - grid.firsty);
-			break;
+	kos_GetKeys(key_editbox, key_ascii, key_scancode);
-		case 180: //home
-			dx = -sel_x + 1;
-			dy = 0;
-			draw_grid();
 			break;
-		case 181: //end
+	if (cell_box.flags & ed_focus) {
-			dx = col_count - (nx - grid.firstx) - 1 - sel_x;
+		if (SCAN_CODE_ENTER == key_scancode) {
-			dy = 0;
+			stop_edit();
-			draw_grid();
-			break;
-		case 27:		// escape
+			draw_grid();
-			cancel_edit();
-			break;
-		case 182:		// delete
-			{
-				int i,j,n0,n1,k0,k1;
-				n0 = min(sel_x, sel_end_x);
-				n1 = max(sel_x, sel_end_x);
-				k0 = min(sel_y, sel_end_y);
-				k1 = max(sel_y, sel_end_y);
+		}
+		else if (SCAN_CODE_ESC == key_scancode) {
-				for (i = n0; i <= n1; i++)
+			cancel_edit();
-					for (j = k0; j <= k1; j++)
+		}
-					{
-						if (cells[i][j])
+		else {
+			__asm
+			{
-							freemem(cells[i][j]);
-							cells[i][j] = NULL;
-						}
 				mov eax, key_editbox
-				calculate_values();
+			}
-				draw_grid();
+			edit_box_key((dword)&cell_box);
 				break;
-			}
+	}
-		case 0x0D:		// enter
-			if (is_edit)
+	else if (file_box.flags & ed_focus) {
+		__asm
-			{
+		{
+			mov eax, key_editbox
+		}
-				stop_edit();
+		edit_box_key((dword)&file_box);
-				draw_grid();
+		return;
-			}
+	}
-			break;
+	else if (ctrl) {
-		case 22:	// contol-v
+		switch (key_scancode)
+		{
-				if (ctrl)
+			case SCAN_CODE_KEY_V:
+				{
 					calculate_values();
 					draw_grid();
 					break;
-				}
-			}
+				}
-			case 24:	// control-x
+				case SCAN_CODE_KEY_X:
-			case 03:	// control-c
+				case SCAN_CODE_KEY_C:
-			{
-				if (ctrl)
-				{
 					//rtlDebugOutString("control-c!");
 					int i, j, x0, y0;
 						buffer[i] = (char**)allocmem(buf_row * sizeof(char*));
 						for (j = 0; j < buf_row; j++)
+						{
 							if (cells[i + x0][j + y0])
+							{
-								if (keyCode == 03)	// ctrl-c
+								if (SCAN_CODE_KEY_C == key_scancode)
+								{
 									buffer[i][j] = (char*)allocmem(strlen(cells[i + x0][j + y0]));
 									strcpy(buffer[i][j], cells[i + x0][j + y0]);
+								}
 								else
+							}
 							else
 								buffer[i][j] = NULL;
+						}
+					}
-					if (keyCode == 24)
+					if (key_ascii == 24)     ///////WTF????
 						calculate_values();
 					draw_grid();
 					break;
+				}
-			}
-		case 06:		// control-f
+			case SCAN_CODE_KEY_F:
-			{
 				display_formulas = !display_formulas;
 				draw_grid();
 				break;
+		}
-		default:
-			if (!is_edit && !(file_box.flags & ed_focus))
-			{
-				start_edit(sel_x, sel_y);
-				if (keyCode == 8)
-				{
-					cell_box.pos = strlen(edit_text);
+	}
-				else
-				{
-					__asm
+	else switch (key_scancode)
+	{
-						mov ah, keyCode
-					}
-					edit_box_key((dword)&cell_box);
-				}
-			}
-			if (is_edit)
+		case SCAN_CODE_UP:
-				edit_box_draw((dword)&cell_box);
+			shift_selection(0, -1, shift);
 			break;
-	}
-	if (dx != 0)
+		case SCAN_CODE_LEFT:
-	{
-		if (shift)
+			shift_selection(-1, 0, shift);
-		{
+			break;
-			sel_end_x += dx;
+		case SCAN_CODE_RIGHT:
-			if (sel_end_x <= 1)
+			shift_selection(1, 0, shift);
-				sel_end_x = 1;
+			break;
-			else if (sel_end_x >= col_count)
+		case SCAN_CODE_DOWN:
-				sel_end_x = col_count - 1;
+			shift_selection(0, 1, shift);
-		//	sprintf(debuf,"sel end x change. sel end %U %U",sel_end_x,sel_end_y);
+			break;
-		//	rtlDebugOutString(debuf);
+		case SCAN_CODE_PGDN:
-			sel_moved = sel_end_move = 1;
+			shift_selection(0, ny-grid.firsty-1, shift);
-			//stop_edit();
+			break;
-			//draw_grid();
+		case SCAN_CODE_PGUP:
+			shift_selection(0, -(ny-grid.firsty), shift);
-		}
+			break;
-		else
+		case SCAN_CODE_HOME:
-		{
+			shift_selection(-sel_x + 1, 0, shift);
-		}
+			break;
-	}
-	if (dy != 0)
+		case SCAN_CODE_END:
+			shift_selection(col_count - (nx - grid.firstx) - 1 - sel_x, 0, shift);
-	{
+			break;
-		if (shift)
+		case SCAN_CODE_DEL:
+			{
-			sel_end_y += dy;
-			if (sel_end_y <= 1)
+				int n0 = min(sel_x, sel_end_x);
-				sel_end_y = 1;
-			else if (sel_end_y >= row_count)
+				int n1 = max(sel_x, sel_end_x);
-				sel_end_y = row_count - 1;
+				int k0 = min(sel_y, sel_end_y);
-		//	sprintf(debuf,"sel end y change. sel end %U %U",sel_end_x,sel_end_y);
-		//	rtlDebugOutString(debuf);
-			sel_moved = sel_end_move = 1;
+				int k1 = max(sel_y, sel_end_y);
-			//stop_edit();
-			//draw_grid();
-		}
-	}
-	/*
-	if (sel_end_x < sel_x)
+				for (int i = n0; i <= n1; i++)
+					for (int j = k0; j <= k1; j++)
+					{
-		Dword tmp = sel_end_x; sel_end_x = sel_x; sel_x = tmp;
-	}
-	if (sel_end_y < sel_y)
+						if (cells[i][j])
+						{
-		Dword tmp = sel_end_y; sel_end_y = sel_y; sel_y = tmp;
+							freemem(cells[i][j]);
+							cells[i][j] = NULL;
+						}
-	*/
-	if ((dx || dy))
-	{
-		if (!shift)
-		{
-			if ((sel_end_x + dx) >= (col_count-1)) {dx=0;} //stub
-			else if ((sel_end_y + dy) >= (row_count-1)) {dy=0;}
-			else {
-			move_selection(sel_x + dx, sel_y + dy);
+					}
+				calculate_values();
+				draw_grid();
+				break;
+			}
-		else
+			break;
-		{
+		case SCAN_CODE_F2:
-			sel_moved = 0;
+			start_edit(sel_x, sel_y);
-			stop_edit();
+			break;
+		case SCAN_CODE_F5:
 			draw_grid();
+			break;
+		default:
+			start_edit(sel_x, sel_y);
+			__asm
+			{
+				mov eax, key_editbox
+			}
+			edit_box_key((dword)&cell_box);
+			break;
+	}
+}
 void process_button()
 		case EM_BUTTON_CLICK:
 			process_button();
 			break;
 		case EM_WINDOW_REDRAW:
-			if (draw_and_define_window()) draw_window();
+			draw_window();
 			break;
+		}
+	}

Subversion Repositories Kolibri OS

(root)/programs/other/table/hello.cpp – Rev 7504 → 7507