| /programs/develop/libraries/console/console.asm |
|---|
| 809,9 → 809,94 |
| .not_digit: |
| mov [con_esc], 0 |
| mov [con_sci], 0 ; in any case, leave Esc mode |
| cmp al, 'J' |
| jz .cls |
| cmp al, 'H' |
| jz .setcursor |
| cmp al, 'f' |
| jz .setcursor |
| cmp al, 'm' |
| jz .set_attr |
| cmp al, 'A' |
| jz .cursor_up |
| cmp al, 'B' |
| jz .cursor_down |
| cmp al, 'C' |
| jz .cursor_right |
| cmp al, 'D' |
| jz .cursor_left |
| ret ; simply skip unknown sequences |
| .cls: |
| push ecx |
| and [con.cur_x], 0 |
| and [con.cur_y], 0 |
| mov edi, [con.data] |
| push edi |
| mov ecx, [con.scr_width] |
| imul ecx, [con.scr_height] |
| mov ax, 0720h |
| rep stosw |
| pop edi ecx |
| .nosetcursor: |
| ret |
| .setcursor: |
| cmp [con_esc_attr_n], 2 |
| jnz .nosetcursor |
| mov eax, [con_esc_attrs] |
| cmp eax, [con.scr_width] |
| jae @f |
| mov [con.cur_x], eax |
| @@: |
| mov eax, [con_esc_attrs+4] |
| cmp eax, [con.scr_height+4] |
| jae @f |
| mov [con.cur_y], eax |
| .j_get_data: |
| jmp con.get_data_ptr |
| .cursor_up: |
| cmp [con_esc_attr_n], 1 |
| jnz .nosetcursor |
| mov eax, [con.cur_y] |
| sub eax, [con_esc_attrs] |
| jnc @f |
| xor eax, eax |
| @@: |
| mov [con.cur_y], eax |
| jmp .j_get_data |
| .cursor_down: |
| cmp [con_esc_attr_n], 1 |
| jnz .nosetcursor |
| mov eax, [con.cur_y] |
| add eax, [con_esc_attrs] |
| cmp eax, [con.scr_height] |
| jb @f |
| mov eax, [con.scr_height] |
| dec eax |
| @@: |
| mov [con.cur_y], eax |
| jmp .j_get_data |
| .cursor_right: |
| cmp [con_esc_attr_n], 1 |
| jnz .nosetcursor |
| mov eax, [con.cur_x] |
| add eax, [con_esc_attrs] |
| cmp eax, [con.scr_width] |
| jb @f |
| mov eax, [con.scr_width] |
| dec eax |
| @@: |
| mov [con.cur_x], eax |
| jmp .j_get_data |
| .cursor_left: |
| cmp [con_esc_attr_n], 1 |
| jnz .nosetcursor |
| mov eax, [con.cur_x] |
| sub eax, [con_esc_attrs] |
| jnc @f |
| xor eax, eax |
| @@: |
| mov [con.cur_x], eax |
| jmp .j_get_data |
| .set_attr: |
| push eax ecx edx |
| xor ecx, ecx |
| 1453,6 → 1538,43 |
| popad |
| ret 12 |
| ; void __stdcall con_cls(); |
| con_cls: |
| push edi |
| call con.write_special_char.cls |
| pop edi |
| call con.update_screen |
| ret |
| ; void __stdcall con_get_cursor_pos(int* px, int* py); |
| con_get_cursor_pos: |
| push eax ecx |
| mov eax, [esp+12] |
| mov ecx, [con.cur_x] |
| mov [eax], ecx |
| mov eax, [esp+16] |
| mov ecx, [con.cur_y] |
| mov [eax], ecx |
| pop ecx eax |
| ret 8 |
| ; void __stdcall con_set_cursor_pos(int px, int py); |
| con_set_cursor_pos: |
| push eax |
| mov eax, [esp+8] |
| cmp eax, [con.scr_width] |
| jae @f |
| mov [con.cur_x], eax |
| @@: |
| mov eax, [esp+12] |
| cmp eax, [con.scr_height] |
| jae @f |
| mov [con.cur_y], eax |
| @@: |
| pop eax |
| call con.update_screen |
| ret 8 |
| con.update_screen: |
| push eax |
| mov eax, [con.cur_y] |
| 2127,7 → 2249,7 |
| align 16 |
| EXPORTS: |
| dd szStart, START |
| dd szVersion, 0x00020004 |
| dd szVersion, 0x00020005 |
| dd szcon_init, con_init |
| dd szcon_write_asciiz, con_write_asciiz |
| dd szcon_printf, con_printf |
| 2142,6 → 2264,9 |
| dd szcon_get_font_height, con_get_font_height |
| dd szcon_get_cursor_height,con_get_cursor_height |
| dd szcon_set_cursor_height,con_set_cursor_height |
| dd szcon_cls, con_cls |
| dd szcon_get_cursor_pos, con_get_cursor_pos |
| dd szcon_set_cursor_pos, con_set_cursor_pos |
| dd 0 |
| con_flags dd 7 |
| 2175,6 → 2300,9 |
| szcon_get_font_height db 'con_get_font_height',0 |
| szcon_get_cursor_height db 'con_get_cursor_height',0 |
| szcon_set_cursor_height db 'con_set_cursor_height',0 |
| szcon_cls db 'con_cls',0 |
| szcon_get_cursor_pos db 'con_get_cursor_pos',0 |
| szcon_set_cursor_pos db 'con_set_cursor_pos',0 |
| con.thread_err db 'Cannot create console thread!',13,10,0 |
| con.nomem_err db 'Not enough memory!',13,10,0 |
| /programs/develop/libraries/console/console.txt |
|---|
| 77,6 → 77,14 |
| 45 = ôèîëåòîâûé ôîí |
| 46 = áèðþçîâûé ôîí |
| 47 = áåëûé ôîí |
| Ñëåäóþùèå ïîñëåäîâàòåëüíîñòè ïîÿâèëèñü â âåðñèè 5 áèáëèîòåêè: |
| Esc[2J - î÷èñòèòü ýêðàí, ïåðåìåñòèòü êóðñîð â ëåâûé âåðõíèé óãîë |
| Esc[<number1>;<number2>H = Esc[<number1>;<number2>f - |
| óñòàíîâèòü êóðñîð â ïîçèöèþ ñ êîîðäèíàòàìè <number1>,<number2> |
| Esc[<number>A - ïåðåìåñòèòü êóðñîð íà <number> ñòðîê ââåðõ |
| Esc[<number>B - ïåðåìåñòèòü êóðñîð íà <number> ñòðîê âíèç |
| Esc[<number>C - ïåðåìåñòèòü êóðñîð íà <number> ïîçèöèé âïðàâî |
| Esc[<number>D - ïåðåìåñòèòü êóðñîð íà <number> ïîçèöèé âëåâî |
| */ |
| Çíà÷åíèå ïî óìîë÷àíèþ äëÿ ôëàãîâ = 7. |
| 115,6 → 123,7 |
| typedef int (__stdcall * con_gets2_callback)(int keycode, char** pstr, int* pn, int* ppos); |
| void __stdcall con_gets2(con_gets2_callback callback, char* str, int n); |
| Ôóíêöèÿ ïîÿâèëàñü â âåðñèè 4 áèáëèîòåêè. |
| Ïîëíîñòüþ àíàëîãè÷íà con_gets çà èñêëþ÷åíèåì òîãî, ÷òî êîãäà ïîëüçîâàòåëü |
| íàæèìàåò íåðàñïîçíàííóþ êëàâèøó, âûçûâàåòñÿ óêàçàííàÿ callback-ïðîöåäóðà |
| (êîòîðàÿ ìîæåò, íàïðèìåð, îáðàáàòûâàòü up/down äëÿ èñòîðèè ââîäà è tab äëÿ |
| 125,3 → 134,18 |
| Âîçâðàùàåìîå çíà÷åíèå: 0=ñòðîêà íå ìåíÿëàñü; 1=ñòðîêà èçìåíèëàñü, íåîáõîäèìî |
| óäàëèòü ñòàðóþ è âûâåñòè íîâóþ; 2=ñòðîêà èçìåíèëàñü, íåîáõîäèìî å¸ âûâåñòè; |
| 3=íåìåäëåííî âûéòè èç ôóíêöèè. |
| void __stdcall con_cls(); |
| Ôóíêöèÿ ïîÿâèëàñü â âåðñèè 5 áèáëèîòåêè. |
| Î÷èùàåò ýêðàí è ïåðåâîäèò êóðñîð â ëåâûé âåðõíèé óãîë. |
| void __stdcall con_get_cursor_pos(int* px, int* py); |
| Ôóíêöèÿ ïîÿâèëàñü â âåðñèè 5 áèáëèîòåêè. |
| Çàïèñûâàåò â *px òåêóùóþ êîîðäèíàòó êóðñîðà ïî îñè x, â *py - ïî îñè y. |
| void __stdcall con_set_cursor_pos(int x, int y); |
| Ôóíêöèÿ ïîÿâèëàñü â âåðñèè 5 áèáëèîòåêè. |
| Óñòàíàâëèâàåò êóðñîð â ïîçèöèþ ñ óêàçàííûìè êîîðäèíàòàìè. Åñëè êàêîé-òî èç |
| ïàðàìåòðîâ âûõîäèò çà ïðåäåëû ñîîòâåòñòâóþùåãî äèàïàçîíà (îò 0 äî scr_width-1 |
| äëÿ x, îò 0 äî scr_height-1 äëÿ y, scr_width è scr_height áûëè çàäàíû ïðè |
| âûçîâå con_init), òî ñîîòâåòñòâóþùàÿ êîîðäèíàòà êóðñîðà íå ìåíÿåòñÿ. |
| /programs/develop/libraries/console/examples/test_gets2.asm |
|---|
| 31,10 → 31,10 |
| ; yes! Now do some work (gets2() demo in this case). |
| push caption |
| push -1 |
| push -1 |
| push -1 |
| push -1 |
| push 25 |
| push 80 |
| push 25 |
| push 80 |
| call [con_init] |
| ; C-equivalent of the following code: |