WebSVN – Kolibri OS – Diff – /programs/cmm/Calypte/Calypte.c

-//Calypte 0.3 - Leency
+//Calypte 0.35 - Leency
 //Calypte 0.15 - Punk Joker
-#define MEMSIZE 1024*80
+#define MEMSIZE 1024*100
 #ifndef AUTOBUILD
 #include "../lib/kolibri.h"
 #include "../lib/file_system.h"
 #include "../lib/gui.h"
 #include "../lib/list_box.h"
 #include "../lib/menu.h"
+//#include "../lib/collection.h"
+#include "../lib/obj/iconv.h"
-#include "../lib/obj/iconv.h"
+#include "../lib/obj/box_lib.h"
-//#include "../lib/obj/box_lib.h" //TO CHECK: boxlib doesn't work well with opendial
+#include "../lib/obj/libio_lib.h" //TO CHECK: why opendial is a peace of shit!
-#include "../lib/obj/proc_lib.h"
-#include "../lib/obj/libio_lib.h"
+#include "../lib/obj/proc_lib.h"
 #include "../lib/patterns/simple_open_dialog.h"
 #include "../lib/patterns/simple_open_dialog.h"
 char default_dir[] = "/rd/1";
 #define TOPPANELH 23
 #define BOTPANELH 10
 #define WIN_W 750
+#define WIN_H 550
-#define WIN_H 550
+#define SCROLL_SIZE 15
 proc_info Form;
 dword bufpointer;
 dword bufsize;
+dword draw_sruct;
+scroll_bar scroll_v = { SCROLL_SIZE,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
+scroll_bar scroll_h = { SCROLL_SIZE,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
-dword draw_sruct;
+//collection s;
 //===================================================//
 //                                                   //
 //                       CODE                        //
 //                                                   //
 //===================================================//
 void InitDlls()
+{
-	//load_dll(boxlib,    #box_lib_init,   0);
+	load_dll(boxlib,    #box_lib_init,   0);
 	load_dll(libio,     #libio_init,     1);
 	load_dll(iconv_lib, #iconv_open,     0);
 			break;
 		case evButton:
 			id=GetButtonID();
 			if (id==1) ExitProcess();
-			if (id==MENU_ID_FILE) menu.show(
+			if (id==MENU_ID_FILE)
-				Form.left+5 + menu_file_x,
-				Form.top+skin_height + TOPPANELH,
-,
-				#menu_file_list,
-				MENU_ID_FILE);
+				EventShowMenu(menu_file_x, #menu_file_list, MENU_ID_FILE, NULL);
-			if (id==MENU_ID_ENCODING) menu.show(
+			if (id==MENU_ID_ENCODING)
-				Form.left+5 + menu_encoding_x,
-				Form.top+skin_height + TOPPANELH,
-,
-				#menu_encoding_list,
-				MENU_ID_ENCODING);
+				EventShowMenu(menu_encoding_x, #menu_encoding_list, MENU_ID_ENCODING, encoding+1);
-			if (id==MENU_ID_REOPEN) menu.show(
+			if (id==MENU_ID_REOPEN)
-				Form.left+5 + menu_reopen_x,
-				Form.top+skin_height + TOPPANELH,
-,
-				#menu_reopen_list,
-				MENU_ID_REOPEN);
+				EventShowMenu(menu_reopen_x, #menu_reopen_list, MENU_ID_REOPEN, NULL);
 			break;
 		case evKey:
 			break;
+	  }
+   }
+}
+void ReopenFileIn(dword _app)
+{
+	RunProgram(_app, #param);
+}
-void ReopenFileIn(dword app)
+void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected)
 {
+	menu.selected = _selected;
+	menu.show(
+	Form.left+5 + _menu_item_x,
+	Form.top+skin_height + TOPPANELH,
+,
+	_menu_list,
-	RunProgram(app, #param);
+	_id);
+}
 void EventOpenFile()
+{
 	OpenDialog_start stdcall (#o_dialog);
-	OpenDialog_start stdcall (#o_dialog);
+	if (!o_dialog.status) return;
 	OpenFile(#openfile_path);
 	Prepare();
 	draw_window();
+}
 void EventCloseFile()
 void EventCloseFile()
 	if (!bufpointer) return;
 	strcpy(#win_title, TITLE);
 		old_width = Form.width;
 		old_height = Form.height;
 		rows.no_selection = true;
 		rows.SetFont(8, 14, 0x90);
-		rows.SetSizes(0, TOPPANELH, Form.cwidth, Form.cheight - TOPPANELH - BOTPANELH, 20);
+		rows.SetSizes(0, TOPPANELH, Form.cwidth - SCROLL_SIZE, Form.cheight - TOPPANELH - BOTPANELH, 20);
 		rows.column_max = rows.w / rows.font_w;
 		if (bufpointer) Prepare();
 		rows.CheckDoesValuesOkey();
-	}
 	if (bufpointer)
 	DrawRectangle(rows.x+rows.w-1, rows.y, SCROLL_SIZE, rows.h-1, 0xEEEeee);
-		DrawText();
-	}
-	else DrawBar(0, TOPPANELH, Form.cwidth, Form.cheight-BOTPANELH-TOPPANELH, 0xFFFFFF);
+	DrawText();
+}
 void OpenFile(dword _path)
+}
 void FreeBuf()
+{
+	int i;
-	int i;
+	if (!bufpointer) return;
 	for (i=0; i
+	{
 		mem_Free(DSDWORD[i*4+draw_sruct]);
+	}
 	Parse(PARSE_CALCULATE_ROWS_COUNT);
+}
 void DrawText()
 {
-	int i, top;
+	int i=0, top;
 	if (rows.count
 	else
+	{
 		if (rows.count-rows.first<=rows.visible) top = rows.count-rows.first-1;
 		else top = rows.visible;
+	}
-	for (i=0; i
+	if (bufpointer) for (i=0; i
+	{
-		DrawBar(0, i*rows.item_h+TOPPANELH, Form.cwidth, rows.item_h, 0xFFFFFF);
+		DrawBar(0, i*rows.item_h+TOPPANELH, rows.w, rows.item_h, 0xFFFFFF);
+		WriteText(2, i*rows.item_h+TOPPANELH, 0x90, 0x000000, DSDWORD[i+rows.first*4+draw_sruct]);
+	}
+	DrawBar(0, i*rows.item_h+rows.y, rows.w, -i*rows.item_h + rows.h, 0xFFFfff);
+	DrawVerticalScroll();
+}
+void DrawVerticalScroll()
+{
+	scroll_v.max_area = rows.count;
+	scroll_v.cur_area = rows.visible;
+	scroll_v.position = rows.first;
+	scroll_v.start_y = rows.y;
+	scroll_v.size_y = rows.h;
-		WriteText(2, i*rows.item_h+TOPPANELH, 0x90, 0x000000, DSDWORD[i+rows.first*4+draw_sruct]);
+	scroll_v.start_x = rows.w + rows.x -1;
 	scroll_v.all_redraw = 0;
-	DrawBar(0, i*rows.item_h+rows.y, rows.w, -i*rows.item_h + rows.h, 0xFFFfff);
+	scrollbar_v_draw(#scroll_v);

Subversion Repositories Kolibri OS

(root)/programs/cmm/Calypte/Calypte.c – Rev 7041 → 7043