forked from KolibriOS/kolibrios
Calypte 0.15: support various encodings
git-svn-id: svn://kolibrios.org@5915 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
e7401d7710
commit
fe9ea95716
@ -9,34 +9,60 @@
|
|||||||
#include "..\lib\file_system.h"
|
#include "..\lib\file_system.h"
|
||||||
#include "..\lib\dll.h"
|
#include "..\lib\dll.h"
|
||||||
#include "..\lib\gui.h"
|
#include "..\lib\gui.h"
|
||||||
#include "..\lib\list_box.h"
|
#include "..\lib\obj\iconv.h"
|
||||||
|
|
||||||
#include "..\lib\obj\box_lib.h"
|
#include "..\lib\obj\box_lib.h"
|
||||||
#include "..\lib\obj\proc_lib.h"
|
#include "..\lib\obj\proc_lib.h"
|
||||||
#include "..\lib\obj\libio_lib.h"
|
#include "..\lib\obj\libio_lib.h"
|
||||||
|
//#include "..\lib\obj\wword.h"
|
||||||
|
|
||||||
#ifdef LANG_RUS
|
#ifdef LANG_RUS
|
||||||
?define T_FILE "” ©«"
|
?define T_FILE "” ©«"
|
||||||
?define T_TYPE "’¨¯"
|
?define T_TYPE "’¨¯"
|
||||||
?define T_SIZE "<EFBFBD> §¬¥à"
|
?define T_SIZE "<EFBFBD> §¬¥à"
|
||||||
|
|
||||||
?define MENU1 "” ©«"
|
?define MENU1 "” ©«"
|
||||||
?define MENU1_SUBMENU1 "Žâªàëâì"
|
?define MENU1_SUBMENU1 "Žâªàëâì"
|
||||||
?define MENU1_SUBMENU2 "‡ ªàëâì"
|
?define MENU1_SUBMENU2 "‡ ªàëâì"
|
||||||
?define MENU1_SUBMENU3 "‘¢®©á⢠"
|
?define MENU1_SUBMENU3 "‘¢®©á⢠"
|
||||||
?define MENU1_SUBMENU4 "‚ë室"
|
?define MENU1_SUBMENU4 "‚ë室"
|
||||||
|
|
||||||
|
?define MENU2 "Š®¤¨à®¢ª "
|
||||||
|
?define MENU2_SUBMENU1 "UTF-8"
|
||||||
|
?define MENU2_SUBMENU2 "KOI8-RU"
|
||||||
|
?define MENU2_SUBMENU3 "CP1251"
|
||||||
|
?define MENU2_SUBMENU4 "CP1252"
|
||||||
|
?define MENU2_SUBMENU5 "ISO8859-5"
|
||||||
|
?define MENU2_SUBMENU6 "CP866"
|
||||||
|
|
||||||
|
?define ERROR_LOAD_BOX_LIB "Žè¨¡ª ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ - box_lib.obj"
|
||||||
|
?define ERROR_LOAD_LIBIO "Žè¨¡ª ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ - libio.obj"
|
||||||
|
?define ERROR_LOAD_PROC_LIB "Žè¨¡ª ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ - proc_lib.obj"
|
||||||
#else
|
#else
|
||||||
?define T_FILE "File"
|
?define T_FILE "File"
|
||||||
?define T_TYPE "Type"
|
?define T_TYPE "Type"
|
||||||
?define T_SIZE "Size"
|
?define T_SIZE "Size"
|
||||||
?define MENU1 "File"
|
?define MENU1 "File"
|
||||||
|
|
||||||
?define MENU1_SUBMENU1 "Open"
|
?define MENU1_SUBMENU1 "Open"
|
||||||
?define MENU1_SUBMENU2 "Close"
|
?define MENU1_SUBMENU2 "Close"
|
||||||
?define MENU1_SUBMENU3 "Properties"
|
?define MENU1_SUBMENU3 "Properties"
|
||||||
?define MENU1_SUBMENU4 "Exit"
|
?define MENU1_SUBMENU4 "Exit"
|
||||||
|
|
||||||
|
?define MENU2 "Encoding"
|
||||||
|
?define MENU2_SUBMENU1 "UTF-8"
|
||||||
|
?define MENU2_SUBMENU2 "KOI8-RU"
|
||||||
|
?define MENU2_SUBMENU3 "CP1251"
|
||||||
|
?define MENU2_SUBMENU4 "CP1252"
|
||||||
|
?define MENU2_SUBMENU5 "ISO8859-5"
|
||||||
|
?define MENU2_SUBMENU6 "CP866"
|
||||||
|
|
||||||
|
?define ERROR_LOAD_BOX_LIB "Error while loading library - box_lib.obj"
|
||||||
|
?define ERROR_LOAD_LIBIO "Error while loading library - libio.obj"
|
||||||
|
?define ERROR_LOAD_PROC_LIB "Error while loading library - proc_lib.obj"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LANG_RUS
|
#ifdef LANG_RUS
|
||||||
struct menu_text_struct
|
struct menu1_text_struct
|
||||||
{
|
{
|
||||||
char menu[5];
|
char menu[5];
|
||||||
char sub_menu1[8];
|
char sub_menu1[8];
|
||||||
@ -45,8 +71,19 @@ struct menu_text_struct
|
|||||||
char sub_menu4[6];
|
char sub_menu4[6];
|
||||||
byte end;
|
byte end;
|
||||||
};
|
};
|
||||||
|
struct menu2_text_struct
|
||||||
|
{
|
||||||
|
char menu[10];
|
||||||
|
char sub_menu1[6];
|
||||||
|
char sub_menu2[8];
|
||||||
|
char sub_menu3[7];
|
||||||
|
char sub_menu4[7];
|
||||||
|
char sub_menu5[10];
|
||||||
|
char sub_menu6[6];
|
||||||
|
byte end;
|
||||||
|
};
|
||||||
#else
|
#else
|
||||||
struct menu_text_struct
|
struct menu1_text_struct
|
||||||
{
|
{
|
||||||
char menu[5];
|
char menu[5];
|
||||||
char sub_menu1[5];
|
char sub_menu1[5];
|
||||||
@ -55,27 +92,34 @@ struct menu_text_struct
|
|||||||
char sub_menu4[5];
|
char sub_menu4[5];
|
||||||
byte end;
|
byte end;
|
||||||
};
|
};
|
||||||
|
struct menu2_text_struct
|
||||||
|
{
|
||||||
|
char menu[9];
|
||||||
|
char sub_menu1[6];
|
||||||
|
char sub_menu2[8];
|
||||||
|
char sub_menu3[7];
|
||||||
|
char sub_menu4[7];
|
||||||
|
char sub_menu5[10];
|
||||||
|
char sub_menu6[6];
|
||||||
|
byte end;
|
||||||
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define TITLE "Calypte v0.15"
|
||||||
|
|
||||||
#define TOPPANELH 19
|
#define TOPPANELH 19
|
||||||
#define BOTPANELH 10
|
#define BOTPANELH 10
|
||||||
#define WIN_W 600
|
#define WIN_W 600
|
||||||
#define WIN_H 400
|
#define WIN_H 400
|
||||||
|
|
||||||
#define TITLE "Calypte v0.13"
|
|
||||||
char win_title[4096] = TITLE;
|
|
||||||
proc_info Form;
|
proc_info Form;
|
||||||
|
|
||||||
dword old_width,old_height;
|
|
||||||
llist tview;
|
|
||||||
|
|
||||||
byte active_properties = 0;
|
byte active_properties = 0;
|
||||||
|
int encoding;
|
||||||
dword properties_window;
|
dword properties_window;
|
||||||
|
|
||||||
#include "include\gui.h"
|
#include "include\gui.h"
|
||||||
#include "include\properties.h"
|
#include "include\properties.h"
|
||||||
// #include "include\top_menu.h"
|
|
||||||
// #include "include\open_dial.h"
|
|
||||||
|
|
||||||
struct filter
|
struct filter
|
||||||
{
|
{
|
||||||
@ -88,10 +132,20 @@ struct filter
|
|||||||
};
|
};
|
||||||
|
|
||||||
filter filter2;
|
filter filter2;
|
||||||
menu_text_struct menu_text_area1;
|
menu1_text_struct menu1_text_area1;
|
||||||
|
menu2_text_struct menu2_text_area2;
|
||||||
|
|
||||||
int read=0;
|
char win_title[4096] = "Calypte v0.15";
|
||||||
|
|
||||||
|
int
|
||||||
|
cur_row=0,
|
||||||
|
read=0,
|
||||||
|
pos=0,
|
||||||
|
row_num=0,
|
||||||
|
col_count=0,
|
||||||
|
row_count=0;
|
||||||
|
|
||||||
|
dword old_width,old_height;
|
||||||
|
|
||||||
proc_info pr_inf;
|
proc_info pr_inf;
|
||||||
char communication_area_name[] = "FFFFFFFF_open_dialog";
|
char communication_area_name[] = "FFFFFFFF_open_dialog";
|
||||||
@ -107,7 +161,8 @@ dword bufpointer;
|
|||||||
dword bufsize;
|
dword bufsize;
|
||||||
dword draw_sruct;
|
dword draw_sruct;
|
||||||
|
|
||||||
menu_data menudata1 = {0, 40, 2, 15, 2, #menu_text_area1.menu, #menu_text_area1.sub_menu1, #menu_text_area1.end, 0, 0, 80, 2, 100, 18, 0xEEEEEE, 0xFF, 0xEEEEEE, 0, 0, 0, #Form, 0, 0, 0, 16, 0, 0, 0x00CC00, 0, 0xFFFFFF, 0, 8, 0, 0};
|
menu_data menudata1 = {0, 40, 2, 15, 2, #menu1_text_area1.menu, #menu1_text_area1.sub_menu1, #menu1_text_area1.end, 0, 0, 80, 2, 100, 18, 0xEEEEEE, 0xFF, 0xEEEEEE, 0, 0, 0, #Form, 0, 0, 0, 16, 0, 0, 0x00CC00, 0, 0xFFFFFF, 0, 8, 0, 0};
|
||||||
|
menu_data menudata2 = {0, 70, 44, 15, 2, #menu2_text_area2.menu, #menu2_text_area2.sub_menu1, #menu2_text_area2.end, 0, 0, 80, 44, 100, 18, 0xEEEEEE, 0xFF, 0xEEEEEE, 0, 0, 0, #Form, 0, 0, 0, 16, 0, 0, 0x00CC00, 0, 0xFFFFFF, 0, 8, 0, 0};
|
||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
@ -120,28 +175,38 @@ void main()
|
|||||||
filter2.size = 8;
|
filter2.size = 8;
|
||||||
filter2.end = 0;
|
filter2.end = 0;
|
||||||
|
|
||||||
strcpy(#menu_text_area1.menu, MENU1);
|
strcpy(#menu1_text_area1.menu, MENU1);
|
||||||
strcpy(#menu_text_area1.sub_menu1, MENU1_SUBMENU1);
|
strcpy(#menu1_text_area1.sub_menu1, MENU1_SUBMENU1);
|
||||||
strcpy(#menu_text_area1.sub_menu2, MENU1_SUBMENU2);
|
strcpy(#menu1_text_area1.sub_menu2, MENU1_SUBMENU2);
|
||||||
//strcpy(#menu_text_area1.sub_menu3, MENU1_SUBMENU3);
|
//strcpy(#menu1_text_area1.sub_menu3, MENU1_SUBMENU3);
|
||||||
strcpy(#menu_text_area1.sub_menu4, MENU1_SUBMENU4);
|
strcpy(#menu1_text_area1.sub_menu4, MENU1_SUBMENU4);
|
||||||
menu_text_area1.end = 0;
|
menu1_text_area1.end = 0;
|
||||||
|
|
||||||
|
strcpy(#menu2_text_area2.menu, MENU2);
|
||||||
|
strcpy(#menu2_text_area2.sub_menu1, MENU2_SUBMENU1);
|
||||||
|
strcpy(#menu2_text_area2.sub_menu2, MENU2_SUBMENU2);
|
||||||
|
strcpy(#menu2_text_area2.sub_menu3, MENU2_SUBMENU3);
|
||||||
|
strcpy(#menu2_text_area2.sub_menu4, MENU2_SUBMENU4);
|
||||||
|
strcpy(#menu2_text_area2.sub_menu5, MENU2_SUBMENU5);
|
||||||
|
strcpy(#menu2_text_area2.sub_menu6, MENU2_SUBMENU6);
|
||||||
|
menu2_text_area2.end = 0;
|
||||||
|
|
||||||
|
//mem_Init();
|
||||||
load_dll(boxlib, #box_lib_init,0);
|
load_dll(boxlib, #box_lib_init,0);
|
||||||
load_dll(libio, #libio_init,1);
|
load_dll(libio, #libio_init,1);
|
||||||
|
load_dll(iconv_lib, #iconv_open,0);
|
||||||
load_dll(Proc_lib, #OpenDialog_init,0);
|
load_dll(Proc_lib, #OpenDialog_init,0);
|
||||||
OpenDialog_init stdcall (#o_dialog);
|
OpenDialog_init stdcall (#o_dialog);
|
||||||
|
|
||||||
SetEventMask(0x27);
|
SetEventMask(0x27);
|
||||||
loop()
|
loop()
|
||||||
{
|
{
|
||||||
switch(WaitEvent())
|
switch(WaitEvent())
|
||||||
{
|
{
|
||||||
case evMouse:
|
case evMouse:
|
||||||
mouse.get();
|
menu_bar_mouse stdcall (#menudata1);
|
||||||
if (tview.MouseScroll(mouse.vert)) DrawText();
|
menu_bar_mouse stdcall (#menudata2);
|
||||||
|
if (menudata1.click==1)
|
||||||
menu_bar_mouse stdcall (#menudata1);
|
|
||||||
if (menudata1.click)
|
|
||||||
{
|
{
|
||||||
switch(menudata1.cursor_out)
|
switch(menudata1.cursor_out)
|
||||||
{
|
{
|
||||||
@ -153,7 +218,6 @@ void main()
|
|||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
read = 0;
|
read = 0;
|
||||||
tview.cur_y = 0;
|
|
||||||
strcpy(#win_title, TITLE);
|
strcpy(#win_title, TITLE);
|
||||||
FreeBuf();
|
FreeBuf();
|
||||||
draw_window();
|
draw_window();
|
||||||
@ -174,17 +238,22 @@ void main()
|
|||||||
ExitProcess();
|
ExitProcess();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (menudata2.click==1)
|
||||||
|
{
|
||||||
|
encoding = menudata2.cursor_out - 1;
|
||||||
|
OpenFile(#openfile_path);
|
||||||
|
Prepare();
|
||||||
|
draw_window();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case evButton:
|
case evButton:
|
||||||
id=GetButtonID();
|
id=GetButtonID();
|
||||||
if (id==1) ExitProcess();
|
if (id==1) || (id==10) ExitProcess();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case evKey:
|
case evKey:
|
||||||
if (Form.status_window>2) break;
|
GetKeys();
|
||||||
GetKeys();
|
|
||||||
if (tview.ProcessKey(key_scancode)) DrawText();
|
|
||||||
if (TestBit(key_modifier, 2))
|
if (TestBit(key_modifier, 2))
|
||||||
{
|
{
|
||||||
switch(key_scancode)
|
switch(key_scancode)
|
||||||
@ -200,21 +269,34 @@ void main()
|
|||||||
}
|
}
|
||||||
switch (key_scancode)
|
switch (key_scancode)
|
||||||
{
|
{
|
||||||
/*case SCAN_CODE_HOME:
|
if (Form.status_window>2) break;
|
||||||
|
case SCAN_CODE_HOME:
|
||||||
|
cur_row = 0;
|
||||||
|
DrawText();
|
||||||
|
break;
|
||||||
case SCAN_CODE_END:
|
case SCAN_CODE_END:
|
||||||
|
cur_row = row_num - row_count - 1;
|
||||||
|
DrawText();
|
||||||
|
break;
|
||||||
case SCAN_CODE_UP:
|
case SCAN_CODE_UP:
|
||||||
|
if (!cur_row) break;
|
||||||
|
else cur_row = cur_row-1;
|
||||||
|
DrawText();
|
||||||
|
break;
|
||||||
case SCAN_CODE_DOWN:
|
case SCAN_CODE_DOWN:
|
||||||
if (tview.ProcessKey(key_scancode)) DrawText();
|
if (cur_row+row_count>=row_num) break;
|
||||||
break;*/
|
cur_row = cur_row+1;
|
||||||
|
DrawText();
|
||||||
|
break;
|
||||||
case SCAN_CODE_PGUP:
|
case SCAN_CODE_PGUP:
|
||||||
if (!tview.cur_y) break;
|
if (!cur_row) break;
|
||||||
if (tview.cur_y<tview.visible) tview.cur_y = 0;
|
if (cur_row<row_count) cur_row = 0;
|
||||||
else tview.cur_y = tview.cur_y-tview.visible;
|
else cur_row = cur_row-row_count;
|
||||||
DrawText();
|
DrawText();
|
||||||
break;
|
break;
|
||||||
case SCAN_CODE_PGDN:
|
case SCAN_CODE_PGDN:
|
||||||
if (tview.cur_y+tview.visible>tview.count) break;
|
if (cur_row+row_count>row_num) break;
|
||||||
tview.cur_y = tview.cur_y+tview.visible;
|
cur_row = cur_row+row_count;
|
||||||
DrawText();
|
DrawText();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -233,26 +315,30 @@ void draw_window()
|
|||||||
system.color.get();
|
system.color.get();
|
||||||
DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2,WIN_W,WIN_H,0x73,0xFFFFFF,#win_title);
|
DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2,WIN_W,WIN_H,0x73,0xFFFFFF,#win_title);
|
||||||
GetProcessInfo(#Form, SelfInfo);
|
GetProcessInfo(#Form, SelfInfo);
|
||||||
if (Form.status_window>2) return;
|
|
||||||
tview.SetSizes(0, TOPPANELH, Form.cwidth, Form.cheight-BOTPANELH-TOPPANELH, 12);
|
|
||||||
DrawBar(0, 0, Form.cwidth, TOPPANELH, system.color.work);
|
DrawBar(0, 0, Form.cwidth, TOPPANELH, system.color.work);
|
||||||
DrawBar(0, Form.cheight-BOTPANELH, Form.cwidth, BOTPANELH, system.color.work);
|
DrawBar(0, Form.cheight-BOTPANELH, Form.cwidth, BOTPANELH, system.color.work);
|
||||||
|
|
||||||
menudata1.bckg_col = system.color.work;
|
menudata1.bckg_col = system.color.work;
|
||||||
|
menudata2.bckg_col = system.color.work;
|
||||||
menu_bar_draw stdcall (#menudata1);
|
menu_bar_draw stdcall (#menudata1);
|
||||||
|
menu_bar_draw stdcall (#menudata2);
|
||||||
|
|
||||||
if (old_width!=Form.width) || (old_height!=Form.height)
|
if (old_width!=Form.width) || (old_height!=Form.height)
|
||||||
{
|
{
|
||||||
old_width = Form.width;
|
old_width = Form.width;
|
||||||
old_height = Form.height;
|
old_height = Form.height;
|
||||||
|
|
||||||
|
col_count = Form.cwidth/6;
|
||||||
|
row_count = Form.cheight-BOTPANELH-TOPPANELH-2;
|
||||||
|
row_count = row_count/10;
|
||||||
|
|
||||||
if (read==1) Prepare();
|
if (read==1) Prepare();
|
||||||
tview.debug_values();
|
|
||||||
}
|
}
|
||||||
if (read==1)
|
if (read==1)
|
||||||
{
|
{
|
||||||
DrawText();
|
DrawText();
|
||||||
}
|
}
|
||||||
else DrawBar(tview.x, tview.y, tview.w, tview.h, 0xFFFFFF);
|
else DrawBar(0, TOPPANELH, Form.cwidth, Form.cheight-BOTPANELH-TOPPANELH, 0xFFFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenFile(dword path)
|
void OpenFile(dword path)
|
||||||
@ -269,12 +355,13 @@ void OpenFile(dword path)
|
|||||||
ReadFile(0, bufsize, bufpointer, path);
|
ReadFile(0, bufsize, bufpointer, path);
|
||||||
read=1;
|
read=1;
|
||||||
}
|
}
|
||||||
|
if (encoding!=CH_CP866) ChangeCharset(charsets[encoding], "CP866", bufpointer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FreeBuf()
|
void FreeBuf()
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for (i=0; i<tview.count; i++)
|
for (i=0; i<row_num; i++)
|
||||||
{
|
{
|
||||||
mem_Free(DSDWORD[i*4+draw_sruct]);
|
mem_Free(DSDWORD[i*4+draw_sruct]);
|
||||||
}
|
}
|
||||||
@ -285,17 +372,16 @@ void FreeBuf()
|
|||||||
void Prepare()
|
void Prepare()
|
||||||
{
|
{
|
||||||
int i, sub_pos;
|
int i, sub_pos;
|
||||||
static int cur_pos;
|
|
||||||
int len_str = 0;
|
int len_str = 0;
|
||||||
byte do_eof = 0;
|
byte do_eof = 0;
|
||||||
word bukva[2];
|
word bukva[2];
|
||||||
dword address;
|
dword address;
|
||||||
tview.count = 0;
|
row_num = 0;
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
bukva = DSBYTE[bufpointer+cur_pos+len_str];
|
bukva = DSBYTE[bufpointer+pos+len_str];
|
||||||
if (bukva=='\0')
|
if (bukva=='\0')
|
||||||
{
|
{
|
||||||
do_eof = 1;
|
do_eof = 1;
|
||||||
@ -304,22 +390,22 @@ void Prepare()
|
|||||||
if (bukva==0x0a) break;
|
if (bukva==0x0a) break;
|
||||||
else len_str++;
|
else len_str++;
|
||||||
}
|
}
|
||||||
if (len_str<=tview.column_max)
|
if (len_str<=col_count)
|
||||||
{
|
{
|
||||||
cur_pos=cur_pos+len_str+1;
|
pos=pos+len_str+1;
|
||||||
tview.count++;
|
row_num++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cur_pos=cur_pos+tview.column_max;
|
pos=pos+col_count;
|
||||||
tview.count++;
|
row_num++;
|
||||||
}
|
}
|
||||||
len_str = 0;
|
len_str = 0;
|
||||||
if (do_eof) break;
|
if (do_eof) break;
|
||||||
}
|
}
|
||||||
mem_Free(draw_sruct);
|
mem_Free(draw_sruct);
|
||||||
draw_sruct = mem_Alloc(tview.count*4);
|
draw_sruct = mem_Alloc(row_num*4);
|
||||||
cur_pos=0;
|
pos=0;
|
||||||
sub_pos=0;
|
sub_pos=0;
|
||||||
len_str = 0;
|
len_str = 0;
|
||||||
do_eof = 0;
|
do_eof = 0;
|
||||||
@ -327,7 +413,7 @@ void Prepare()
|
|||||||
{
|
{
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
bukva = DSBYTE[bufpointer+cur_pos+len_str];
|
bukva = DSBYTE[bufpointer+pos+len_str];
|
||||||
if (bukva=='\0')
|
if (bukva=='\0')
|
||||||
{
|
{
|
||||||
do_eof = 1;
|
do_eof = 1;
|
||||||
@ -336,44 +422,44 @@ void Prepare()
|
|||||||
if (bukva==0x0a) break;
|
if (bukva==0x0a) break;
|
||||||
else len_str++;
|
else len_str++;
|
||||||
}
|
}
|
||||||
if (len_str<=tview.column_max)
|
if (len_str<=col_count)
|
||||||
{
|
{
|
||||||
address = mem_Alloc(len_str+1);
|
address = mem_Alloc(len_str+1);
|
||||||
ESDWORD[sub_pos*4+draw_sruct] = address;
|
ESDWORD[sub_pos*4+draw_sruct] = address;
|
||||||
strlcpy(DSDWORD[sub_pos*4+draw_sruct], bufpointer+cur_pos, len_str);
|
strlcpy(DSDWORD[sub_pos*4+draw_sruct], bufpointer+pos, len_str);
|
||||||
cur_pos=cur_pos+len_str+1;
|
pos=pos+len_str+1;
|
||||||
sub_pos++;
|
sub_pos++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
address = mem_Alloc(len_str+1);
|
address = mem_Alloc(len_str+1);
|
||||||
ESDWORD[sub_pos*4+draw_sruct] = address;
|
ESDWORD[sub_pos*4+draw_sruct] = address;
|
||||||
strlcpy(DSDWORD[sub_pos*4+draw_sruct], bufpointer+cur_pos, tview.column_max);
|
strlcpy(DSDWORD[sub_pos*4+draw_sruct], bufpointer+pos, col_count);
|
||||||
cur_pos=cur_pos+tview.column_max;
|
pos=pos+col_count;
|
||||||
sub_pos++;
|
sub_pos++;
|
||||||
}
|
}
|
||||||
len_str = 0;
|
len_str = 0;
|
||||||
if (cur_pos>=bufsize-1) break;
|
if (pos>=bufsize-1) break;
|
||||||
}
|
}
|
||||||
cur_pos=0;
|
pos=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawText()
|
void DrawText()
|
||||||
{
|
{
|
||||||
int i, top, num_line;
|
int i, top, num_line;
|
||||||
if (tview.count<tview.visible) top = tview.count;
|
if (row_num<row_count) top = row_num;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (tview.count-tview.cur_y<=tview.visible) top = tview.count-tview.cur_y-1;
|
if (row_num-cur_row<=row_count) top = row_num-cur_row-1;
|
||||||
else top = tview.visible;
|
else top = row_count;
|
||||||
}
|
}
|
||||||
DrawBar(tview.x, tview.y, tview.w, 3, 0xFFFFFF);
|
DrawBar(0, TOPPANELH, Form.cwidth, 3, 0xFFFFFF);
|
||||||
for (i=0, num_line = tview.cur_y; i<top; i++, num_line++)
|
for (i=0, num_line = cur_row; i<top; i++, num_line++)
|
||||||
{
|
{
|
||||||
DrawBar(tview.x, i * tview.item_h + tview.y + 3, tview.w, tview.item_h, 0xFFFFFF);
|
DrawBar(0, i*10+TOPPANELH+3, Form.cwidth, 10, 0xFFFFFF);
|
||||||
WriteText(tview.x + 2, i * tview.item_h + tview.y + 3, 0x80, 0x000000, DSDWORD[num_line*4+draw_sruct]);
|
WriteText(2, i*10+TOPPANELH+3, 0x80, 0x000000, DSDWORD[num_line*4+draw_sruct]);
|
||||||
}
|
}
|
||||||
DrawBar(0, i * tview.item_h + tview.y + 3, tview.w, -i* tview.item_h + tview.h, 0xFFFFFF);
|
DrawBar(0, i*10+TOPPANELH+3, Form.cwidth, -i*10-TOPPANELH-BOTPANELH+Form.cheight, 0xFFFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
stop:
|
stop:
|
||||||
|
Loading…
Reference in New Issue
Block a user