XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Dicty 2.2: bigger font, no speaker

Browse Source 
Clipview 1.02: better show content 

git-svn-id: svn://kolibrios.org@6638 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-10-30 22:47:57 +00:00
parent 74e17c9a4d
commit 33fb425969
6 changed files with 38 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
programs/cmm/clipview/clipview
View File

Binary file not shown.

24
programs/cmm/clipview/clipview.c
View File

@ -17,7 +17,7 @@
// // // //
//===================================================// //===================================================//
?define WINDOW_HEADER "Clipboard Viewer v1.01" ?define WINDOW_HEADER "Clipboard Viewer v1.02"
?define T_DELETE_LAST_SLOT "Delete last slot" ?define T_DELETE_LAST_SLOT "Delete last slot"
?define T_DELETE_ALL_SLOTS "Delete all slots" ?define T_DELETE_ALL_SLOTS "Delete all slots"
?define T_RESET_BUFFER_LOCK "Reset the lock buffer" ?define T_RESET_BUFFER_LOCK "Reset the lock buffer"
@ -149,18 +149,24 @@ void DrawScroller()
scrollbar_v_draw(#scroll1); scrollbar_v_draw(#scroll1);
} }
replace_char(dword in_str, char from_char, to_char, int length) {
int i;
for (i=0; i<length; i++) {
if (ESBYTE[in_str+i] == from_char) ESBYTE[in_str+i] = to_char;
}
ESBYTE[in_str+length]=0;
}
void Draw_List() void Draw_List()
{ {
int i, yyy, list_last, slot_data_type_number; int i, yyy, list_last, slot_data_type_number, length;
dword text_color = 0x000000; dword line_text[2048];
char line_text[512];
dword size_kb; dword size_kb;
dword text_color = 0;
list.count = clipboard.GetSlotCount(); list.count = clipboard.GetSlotCount();
list.CheckDoesValuesOkey(); list.CheckDoesValuesOkey();
if (list.count > list.visible) list_last = list.visible; else list_last = list.count; if (list.count > list.visible) list_last = list.visible; else list_last = list.count;
for (i=0; i<list.visible; i++;) DeleteButton(list.first + i + 100); for (i=0; i<list.visible; i++;) DeleteButton(list.first + i + 100);
@ -181,11 +187,15 @@ void Draw_List()
DefineButton(list.x+list.w - 95, yyy, 50, list.item_h, 100+i+BT_HIDE, NULL); DefineButton(list.x+list.w - 95, yyy, 50, list.item_h, 100+i+BT_HIDE, NULL);
DefineButton(list.x+list.w - 95 + 51, yyy, 40, list.item_h, 300+i+BT_HIDE, NULL); DefineButton(list.x+list.w - 95 + 51, yyy, 40, list.item_h, 300+i+BT_HIDE, NULL);
strlcpy(#line_text, clipboard.slot_data.content, list.w-236 - 95/list.font_w-3); length = list.w-236 - 95 / list.font_w - 2;
if (clipboard.slot_data.size-8 < length) length = clipboard.slot_data.size-8;
memmov(#line_text, clipboard.slot_data.content, length);
replace_char(#line_text, 0, 31, length); // 31 is a dot
WriteText(list.x+236, yyy+list.text_y, list.font_type, text_color, #line_text); WriteText(list.x+236, yyy+list.text_y, list.font_type, text_color, #line_text);
} }
DrawBar(list.x,i*list.item_h+list.y, list.w, -i*list.item_h+ list.h, 0xFFFfff); DrawBar(list.x,i*list.item_h+list.y, list.w, -i*list.item_h+ list.h, 0xFFFfff);
if (!list.count) WriteText(-strlen(T_CLIPBOARD_IS_EMPTY)*list.font_w + list.w / 2 + list.x + 1, list.h / 2 - 8 + list.y, list.font_type, 0x999999, T_CLIPBOARD_IS_EMPTY); if (!list.count) WriteText(-strlen(T_CLIPBOARD_IS_EMPTY)*list.font_w + list.w / 2 + list.x + 1,
list.h / 2 - 8 + list.y, list.font_type, 0x999999, T_CLIPBOARD_IS_EMPTY);
DrawScroller(); DrawScroller();
} }

92
programs/cmm/dicty/dicty.c
View File

@ -8,35 +8,33 @@
#include "..\lib\gui.h" #include "..\lib\gui.h"
#include "..\lib\obj\box_lib.h" #include "..\lib\obj\box_lib.h"
unsigned char speaker[23*40*3]= FROM "speaker.raw";
#ifdef LANG_RUS #ifdef LANG_RUS
#define WINDOW_TITLE "‘«®¢ à¨ª 2.0" #define WINDOW_TITLE "‘«®¢ à¨ª 2.2"
#define DICTIONARY_NOT_FOUND "‘«®¢ àì ­¥ ­ ©¤¥­" #define DICTIONARY_NOT_FOUND "‘«®¢ àì ­¥ ­ ©¤¥­"
#define DICTIONARY_LOADED "‘«®¢ àì § £à㦥­" #define DICTIONARY_LOADED "‘«®¢ àì § £à㦥­"
#define WORD_NOT_FOUND "‘«®¢® ­¥ ­ ©¤¥­® ¢ á«®¢ à¥" #define WORD_NOT_FOUND "‘«®¢® ­¥ ­ ©¤¥­® ¢ á«®¢ à¥"
#define ERROR "Žè¨¡ª  #" #define ERROR "Žè¨¡ª  #%d"
#else #else
#define WINDOW_TITLE "Dictionary v2.0" #define WINDOW_TITLE "Dictionary v2.2"
#define DICTIONARY_NOT_FOUND "Dictionary not found" #define DICTIONARY_NOT_FOUND "Dictionary not found"
#define DICTIONARY_LOADED "Dictionary loaded" #define DICTIONARY_LOADED "Dictionary loaded"
#define WORD_NOT_FOUND "Word isn't found in the dictionary" #define WORD_NOT_FOUND "Word isn't found in the dictionary"
#define ERROR "Error #" #define ERROR "Error #%d"
#endif #endif
proc_info Form; proc_info Form;
char edword[256], search_word[256], translate_result[4096]; char edword[256], search_word[256], translate_result[4096];
#define PRONOUNCED_FILE "/sys/pronounced.txt"
#define SPEECH_PATH "/kolibrios/media/speech/speech"
#define TOPH 44 #define TOPH 44
#define TEXT_ENG_RUS "ENG\26RUS" #define TEXT_ENG_RUS "ENG\26RUS"
#define TEXT_RUS_ENG "RUS\26ENG" #define TEXT_RUS_ENG "RUS\26ENG"
#define TEXT_VOCABULARIES "ENG RUS"
#define ENG_RUS 0 #define ENG_RUS 0
#define RUS_ENG 1 #define RUS_ENG 1
#define BUTTON_CHANGE_LANGUAGE 10
int active_dict=2; int active_dict=2;
int mouse_dd, speaker_id; int mouse_dd;
edit_box edit1= {200,16,16,0xffffff,0x94AECE,0xffffff,0x94AECE,0,248,#edword,#mouse_dd,100000000000010b}; edit_box edit1= {200,16,16,0xffffff,0x94AECE,0xffffff,0x94AECE,0,248,#edword,#mouse_dd,100000000000010b};
@ -62,23 +60,10 @@ void main()
case evButton: case evButton:
id=GetButtonID(); id=GetButtonID();
if (id==01) { KillProcess(speaker_id); ExitProcess(); } if (id==01) ExitProcess();
if (id==10) { OpenDictionary(ENG_RUS); DrawLangButtons(); } if (id==BUTTON_CHANGE_LANGUAGE) {
if (id==11) { OpenDictionary(RUS_ENG); DrawLangButtons(); } if (active_dict == ENG_RUS) OpenDictionary(RUS_ENG); else OpenDictionary(ENG_RUS);
if (id==15) DrawLangButtons();
{
if (GetProcessSlot(speaker_id)!=0))
{
KillProcess(speaker_id);
pause(50);
}
else
{
if (WriteFile(strlen(#translate_result)+1, #translate_result, PRONOUNCED_FILE)!=0) break;
pause(50);
speaker_id = RunProgram(SPEECH_PATH, PRONOUNCED_FILE);
}
SpeakerDraw();
} }
break; break;
@ -91,7 +76,7 @@ void main()
case evReDraw: case evReDraw:
system.color.get(); system.color.get();
DefineAndDrawWindow(215,120,400,250,0x73,system.color.work,WINDOW_TITLE); DefineAndDrawWindow(215,120,500,350,0x73,system.color.work,WINDOW_TITLE);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break; if (Form.status_window>2) break;
if (Form.height<140) { MoveSize(OLD,OLD,OLD,140); break; } if (Form.height<140) { MoveSize(OLD,OLD,OLD,140); break; }
@ -102,6 +87,7 @@ void main()
edit_box_draw stdcall(#edit1); edit_box_draw stdcall(#edit1);
DrawWideRectangle(edit1.left-2, edit1.top-2, edit1.width+3, 19, 2, 0xffffff); DrawWideRectangle(edit1.left-2, edit1.top-2, edit1.width+3, 19, 2, 0xffffff);
DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 20, system.color.work_graph); DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 20, system.color.work_graph);
WriteText(Form.width-120, edit1.top, 0x90, system.color.work_text, TEXT_VOCABULARIES);
DrawTranslation(); DrawTranslation();
DrawLangButtons(); DrawLangButtons();
} }
@ -111,34 +97,16 @@ void main()
void DrawLangButtons() void DrawLangButtons()
{ {
DrawCaptButton(Form.width-130, edit1.top-3, 50,19, 10, system.color.work_button, system.color.work_button_text, TEXT_ENG_RUS); dword direction;
DrawCaptButton(Form.width-70, edit1.top-3, 50,19, 11, system.color.work_button, system.color.work_button_text, TEXT_RUS_ENG); DefineButton(Form.width-88, edit1.top-4, 20, 20, BUTTON_CHANGE_LANGUAGE, system.color.work_button);
PutShadow(-active_dict*60 + Form.width-70, edit1.top-3, 50,19, 1, 2); if (active_dict == ENG_RUS) direction = "\26"; else direction = "\27";
SpeakerDraw(); WriteText(Form.width-82, edit1.top-1, 10000001b, system.color.work_button_text, direction);
}
void SpeakerDraw()
{
dword x, y;
x = Form.cwidth-38;
y = Form.cheight-32;
if (active_dict)
{
DeleteButton(15);
DrawBar(x,y,23,20,0xFFFFFF);
}
else
{
DefineButton(x-5, y-5, 23+10, 20+9, 15+BT_HIDE+BT_NOFRAME, 0);
if (GetProcessSlot(speaker_id)==0)) _PutImage(x, y, 23,20, #speaker); else _PutImage(x, y, 23,20, 23*20*3+#speaker);
}
} }
void Translate() void Translate()
{ {
dword translation_start, translation_end; dword translation_start, translation_end;
KillProcess(speaker_id);
sprintf(#search_word, "\10%s\13", #edword); sprintf(#search_word, "\10%s\13", #edword);
strupr(#search_word); strupr(#search_word);
@ -165,7 +133,6 @@ void OpenDictionary(dword dict_id)
{ {
dword res; dword res;
if (dict_id==active_dict) return; if (dict_id==active_dict) return;
KillProcess(speaker_id);
active_dict = dict_id; active_dict = dict_id;
if (io.buffer_data) free(io.buffer_data); if (io.buffer_data) free(io.buffer_data);
if (active_dict==ENG_RUS) res=io.read("dictionaries/eng - rus.dict"); if (active_dict==ENG_RUS) res=io.read("dictionaries/eng - rus.dict");
@ -187,33 +154,16 @@ void OpenDictionary(dword dict_id)
void DrawTranslation() void DrawTranslation()
{ {
int text_break=0;
char tt[4096]='';
int y_pos=TOPH+1; int y_pos=TOPH+1;
char draw_buf[4096]; char draw_buf[4096];
strcpy(#draw_buf, #translate_result); strlcpy(#draw_buf, #translate_result, sizeof(draw_buf));
DrawBar(0, y_pos, Form.width-9, Form.cheight - y_pos, 0xFFFFFF); DrawBar(0, y_pos, Form.width-9, Form.cheight - y_pos, 0xFFFFFF);
strttl(#draw_buf); strttl(#draw_buf);
WriteTextB(10+1, y_pos+8, 10000001b, 0x800080, #search_word); WriteTextB(10+1, y_pos+8, 10000001b, 0x800080, #search_word);
while (draw_buf)
{ DrawTextViewArea(10, y_pos+31, Form.cwidth-20, Form.cheight-30, 15,
text_break= Form.width/6-6; #draw_buf, -1, 0x000000);
if (text_break>strlen(#draw_buf))
{
WriteText(10, y_pos+31, 0x80, 0, #draw_buf);
break;
}
while (draw_buf[text_break]<>' ') && (text_break>0) text_break--;
strcpy(#tt, #draw_buf+text_break+1);
draw_buf[text_break]=0x0;
WriteText(10, y_pos+31, 0x80, 0, #draw_buf);
strcpy(#draw_buf, #tt);
y_pos+=12;
if (y_pos+24+8>Form.cheight) break;
}
SpeakerDraw();
} }

BIN
programs/cmm/dicty/speaker.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

1
programs/cmm/dicty/speaker.raw
View File

@ -1 +0,0 @@
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>蓙鴪<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鴪鯒津播爆煇<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>都<EFBFBD><EFBFBD><EFBFBD><EFBFBD>D;A孀<41><E5AD80><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>遧竑杷把梅渤<E6A285><E6B8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>蜑<EFBFBD>mgkC;AC;A澱<41><E6BEB1><EFBFBD><EFBFBD>裴衢瞥諡<E79EA5><E8ABA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>渟淒吐蒜副弡<E589AF><E5BCA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>汎<EFBFBD>SJPE<BE<BE<B澱<42><E6BEB1><EFBFBD><EFBFBD>玳瀏吐棉油<E6A389><E6B2B9><EFBFBD><EFBFBD>嵭刕独氾煤珀<E785A4><E78F80><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>G?EF>DF>DF>DF>D澱<44><E6BEB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>吐氾賠竇<E8B3A0><E7AB87><EFBFBD><EFBFBD><EFBFBD><EFBFBD>樛榿吐緬<E59090><E7B7AC><EFBFBD><EFBFBD>窶甍<E7AAB6>綿<EFBFBD><E7B6BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>H?EH?EH?EH?EH?EH?E禿<45><E7A6BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>掎挌波曜満<E69B9C><E6BA80><EFBFBD><EFBFBD>迯軾波版毘都<E6AF98><EFA8A6><EFBFBD>IAG{ty<74><79><EFBFBD>gafIAGIAGIAGIAGIAGIAG督<47><E79DA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>韶霾波頁備<E9A081><E58299><EFBFBD><EFBFBD><EFBFBD><EFBFBD>波頁非鴦<E99D9E><E9B4A6><EFBFBD>KBH<42>{<7B><><EFBFBD><EFBFBD>c\aKBHKBHKBHKBHKBHKBH氾<48><E6B0BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>嶹劦波頁肥銕<E882A5><E98A95><EFBFBD><EFBFBD><EFBFBD>波頁緋謖<E7B78B><E8AC96><EFBFBD>LDJ<44><4A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_X^LDJLDJLDJLDJLDJLDJ氾<4A><E6B0BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>綿綿琶聽<E790B6><E881BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>藁亙琶籵<E790B6><E7B1B5><EFBFBD><EFBFBD>NEK<45><4B><EFBFBD><EFBFBD><EFBFBD><EFBFBD>bZ_NEKNEKNEKNEKNEKNEK氾<4B><E6B0BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>量綿畔聽<E79594><E881BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>冦亙畔粐<E79594><E7B290><EFBFBD><EFBFBD>OFL<46>|<7C><><EFBFBD><EFBFBD>hafOFLOFLOFLOFLOFLOFL錨<4C><E98CA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>嶹勛畔免菩銕<E88FA9><E98A95><EFBFBD><EFBFBD><EFBFBD>畔免簿跛<E7B0BF><E8B79B><EFBFBD>QHN<48>{~<7E><><EFBFBD>pinQHNQHNQHNQHNQHNQHN米<4E><E7B1B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>髑駝畔免峯<E5858D><E5B3AF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>畔免報齠嶹奛矮髑<E79FAE><E9AB91><EFBFBD><EFBFBD>控<EFBFBD>TKQRIORIORIORIORIO米<4F><E7B1B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>槞枳別侏<E588A5><E4BE8F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>迯輒別綿愈鄕<E68488><E98495><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>嗤<EFBFBD>d\aSKQSKQSKQSKQ僻<51><E583BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>別擁門肄<E99680><E88284><EFBFBD><EFBFBD><EFBFBD><EFBFBD>烟瀝別冢<E588A5><E586A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>闕<EFBFBD><E99795>y}ULRULRULR僻<52><E583BB><EFBFBD><EFBFBD>痿瀝別冢劑<E586A2><E58A91><EFBFBD><EFBFBD>嶹匀僕擁問邃<E5958F><E98283><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>WOUVNT鉾<54><E989BE><EFBFBD><EFBFBD>蒿舁僕諡<E58395><E8ABA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>痼疝瞥量煉都<E78589><EFA8A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>厠<EFBFBD><E58EA0><EFBFBD><EFBFBD>竟<EFBFBD><E7AB9F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>都綷摸楊翼痺<E7BFBC><E797BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鴃靉麺陵吏嶹<E5908F><E5B6B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>聿髏<E881BF><E9AB8F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>墹<EFBFBD><E5A2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>孑<EFBFBD>@8>D=C謚<43><E8AC9A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>都<EFBFBD><EFA8A6><EFBFBD><EFBFBD>D;A孀<41><E5AD80><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>闕<EFBFBD>G>DB9?<3F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>蜑<EFBFBD>mgkC;AC;A澱<41><E6BEB1><EFBFBD><EFBFBD>元<EFBFBD>TLR住<52><E4BD8F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C;AJBH闕<48><E99795><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>汎<EFBFBD>RJPD<BD<BD<B澱<42><E6BEB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>D<BSLQ<4C><51><EFBFBD><EFBFBD><EFBFBD>蒟<EFBFBD>G@ED<B<><42><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>G?EF>DF>DF>DF>D澱<44><E6BEB1><EFBFBD><EFBFBD>掎<EFBFBD>F>DF>DΒ<44><CE92><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>F>DVNT<4E><54><EFBFBD>痼甎<E797BC>綿<EFBFBD><E7B6BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>G?EG?EG?EG?EG?EG?E禿<45><E7A6BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>y~G?ESLQ都<51><EFA8A6><EFBFBD><EFBFBD>西<EFBFBD>G?EG?E齟<45><E9BD9F><EFBFBD><EFBFBD>I@F{sx<73><78><EFBFBD>g_dI@FI@FI@FI@FI@FI@F督<46><E79DA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>綿<EFBFBD>I@FI@F窶<46><E7AAB6><EFBFBD><EFBFBD>毓<EFBFBD>I@FI@F慟<46><E6859F><EFBFBD><EFBFBD>JBH<42>{<7B><><EFBFBD><EFBFBD>c\aJBHJBHJBHJBHJBHJBH禿<48><E7A6BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>裴<EFBFBD>JBHJBH涜<48><E6B69C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>KCIJBH執<48><E59FB7><EFBFBD><EFBFBD>LCI<43><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_W]LCILCILCILCILCILCI氾<49><E6B0BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ULRLCI<43><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`X]LCI<43><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD>MEK<45><4B><EFBFBD><EFBFBD><EFBFBD><EFBFBD>bZ_MEKMEKMEKMEKMEKMEK氾<4B><E6B0BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>VNTMEK<45><4B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>bZ_MEK<45><4B><EFBFBD><EFBFBD><EFBFBD><EFBFBD>OFL<46>|<7C><><EFBFBD><EFBFBD>hafOFLOFLOFLOFLOFLOFL錨<4C><E98CA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>謚<EFBFBD>OFLOFL播<4C><E692AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>PGMOFL深召<E6B7B1><E58FAC>PHN<48>{~<7E><><EFBFBD>oinPHNPHNPHNPHNPHNPHN米<4E><E7B1B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>量<EFBFBD>PHNPHN粃<4E><E7B283><EFBFBD><EFBFBD>毫<EFBFBD>PHNPHN旒戈嶹繧糀髑<E7B380><E9AB91><EFBFBD>控<EFBFBD>TKQRIORIORIORIORIO米<4F><E7B1B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>RIO]U[￢<><EFBFA2><EFBFBD><EFBFBD>胆<EFBFBD>RIORIO齠<4F><E9BDA0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>嗜<EFBFBD>d[`SJPSJPSJPSJP米<50><E7B1B3><EFBFBD><EFBFBD>毟<EFBFBD>SJPSJP<4A><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>SJPbY_<59><5F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>闕<EFBFBD><E99795>y}ULRULRULR僻<52><E583BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ULRbZ_<5A><5F><EFBFBD><EFBFBD><EFBFBD>謚<EFBFBD>XOUULR<4C><52><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>WNTVMS鉾<53><E989BE><EFBFBD><EFBFBD>⑨<EFBFBD>ZQW昇<57><E69887><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>VMS\SY闔<59><E99794><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>侘<EFBFBD><E4BE98><EFBFBD><EFBFBD>竟<EFBFBD><E7AB9F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>都<EFBFBD><EFA8A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>髏<EFBFBD>\TZWOU<4F><55><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>防<EFBFBD>YPV]TZ諡<5A><E8ABA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>￤鉎Й擁<D099><E69381><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

3
programs/cmm/lib/gui.h
View File

@ -291,9 +291,6 @@ TODO: scroll
buf_end = strlen(buf_start) + buf_start; buf_end = strlen(buf_start) + buf_start;
label_length_max = w / 8; // 8 big font char width label_length_max = w / 8; // 8 big font char width
//DrawRectangle(x-2, y-2, w+4, h+4, system.color.work_graph);
//DrawRectangle3D(x-1, y-1, w+2, h+2, 0xDDDddd, 0xffffff);
loop() loop()
{ {
if (bg_col!=-1) DrawBar(x, y, w+1, line_h, bg_col); if (bg_col!=-1) DrawBar(x, y, w+1, line_h, bg_col);