WebSVN – Kolibri OS – Diff – /programs/develop/libraries/console/console.asm

 ; ãªæ¨¨ à ¡®âë á ª®á®«ìî ¤«ï ¯à®£à ¬¬ ®«¨¡à¨
-; diamond, 2006, 2007
+; diamond, 2006-2008
         xchg    ax, [con.entered_char]
         ret
 ; void __stdcall con_gets(char* str, int n);
+con_gets:
+        pop     eax
+        push    0
+        push    eax
+; void __stdcall con_gets2(con_gets2_callback callback, char* str, int n);
-con_gets:
+con_gets2:
         pushad
-        mov     esi, [esp+20h+4]        ; str
+        mov     esi, [esp+20h+8]        ; str
-        mov     ebx, [esp+20h+8]        ; n
+        mov     ebx, [esp+20h+12]       ; n
         sub     ebx, 1
         jle     .ret
         mov     byte [esi], 0
         xor     ecx, ecx                ; ¤«¨  ã¦¥ ¢¢¥¤ñ®© áâà®ª¨
         call    con.get_data_ptr
 .loop:
-        call    con_getch
+        call    con_getch2
         test    al, al
         jz      .extended
         cmp     al, 8
         jz      .backspace
         cmp     al, 27
         jz      .esc
         cmp     al, 13
+        jz      .enter
+        cmp     al, 9
-        jz      .enter
+        jz      .tab
         inc     ecx
         mov     dl, al
         call    con.write_char_ex
         push    [con.cur_x]
         pop     [con.cur_x]
 .update_screen_and_loop:
         call    con.update_screen
         cmp     ecx, ebx
         jb      .loop
+.ret_us:
         mov     edx, [con.cur_x]
 @@:
         lodsb
         test    al, al
         jz      @f
         call    con.get_data_ptr
         dec     esi
         xor     ecx, ecx
 @@:
         mov     byte [esi], 0
-        cmp     esi, [esp+20h+4]
+        cmp     esi, [esp+20h+8]
         jbe     .update_screen_and_loop
         mov     al, 8
         call    con.write_special_char
         mov     al, ' '
         call    con.write_char
         cmp     byte [esi], 0
         jz      .loop
         lodsb
         call    con.write_char_ex
 .backspace:
-        cmp     esi, [esp+20h+4]
+        cmp     esi, [esp+20h+8]
         jbe     .loop
         push    esi
         mov     edx, [con.cur_x]
 @@:
         lodsb
         mov     [esi-1], al
         mov     byte [esi], 0
         call    con.write_special_char
         call    con.update_screen
         jmp     .ret
+.tab:
+        mov     al, 0
+        mov     ah, 0xF
 .extended:
-        call    con_getch
+        xchg    al, ah
         cmp     al, 0x4B
         jz      .left
         cmp     al, 0x4D
         jz      .right
         cmp     al, 0x47
         jz      .home
         cmp     al, 0x4F
         jz      .end
         cmp     al, 0x53
         jz      .delete
+; give control to callback function
+        cmp     dword [esp+20h+4], 0
+        jz      .loop
+; remember length of text before and length of text after
+; and advance cursor to the end of line
+        push    ecx
+        push    eax
+        lea     edx, [esi+1]
+@@:
+        lodsb
+        test    al, al
+        jz      @f
+        call    con.write_char_ex
+        jmp     @b
+@@:
+        sub     esi, edx
+        pop     eax
+        push    esi
+        dec     edx
+        sub     edx, [esp+28h+8]
+        push    edx
+        push    esp             ; ppos
+        mov     ecx, [esp+30h+4]
+        lea     edx, [esp+30h+12]
+        push    edx             ; pn
+        lea     edx, [esp+34h+8]
+        push    edx             ; pstr
+        push    eax             ; keycode
+        call    ecx
+        call    con.get_data_ptr
+        dec     eax
+        js      .callback_nochange
+        jz      .callback_del
+        dec     eax
+        jz      .callback_output
+; callback returned 2 - exit
+        add     esp, 12
+        jmp     .ret
+.callback_nochange:
+; callback returned 0 - string was not changed, only restore cursor position
+        pop     esi
+        pop     ecx
+        test    ecx, ecx
+        jz      .cncs
+@@:
+        mov     al, 8
+        call    con.write_special_char
+        loop    @b
+.cncs:
+        pop     ecx
+        add     esi, [esp+20h+8]
+        jmp     .callback_done
+.callback_del:
+; callback returned 1 - string was changed, delete old string and output new
+        mov     ecx, [esp+8]
+        test    ecx, ecx
+        jz      .cds
+@@:
+        mov     al, 8
+        call    con.write_special_char
+        mov     al, ' '
+        call    con.write_char_ex
+        mov     al, 8
+        call    con.write_special_char
+        loop    @b
+.cds:
+.callback_output:
+; callback returned 2 - string was changed, output new string
+        pop     edx
+        pop     esi
+        pop     ecx
+        mov     esi, [esp+20h+8]
+        xor     ecx, ecx
+@@:
+        lodsb
+        test    al, al
+        jz      @f
+        call    con.write_char_ex
+        inc     ecx
+        jmp     @b
+@@:
+        dec     esi
+        push    ecx
+        sub     ecx, edx
+        jz      .cos
+@@:
+        mov     al, 8
+        call    con.write_special_char
+        dec     esi
+        loop    @b
+.cos:
+        pop     ecx
+.callback_done:
+        call    con.update_screen
+        mov     ebx, [esp+20h+12]
+        dec     ebx
+        cmp     ecx, ebx
+        jae     .ret_us
         jmp     .loop
 .left:
-        cmp     esi, [esp+20h+4]
+        cmp     esi, [esp+20h+8]
         jbe     .loop
         dec     esi
         mov     al, 8
         call    con.write_special_char
         jmp     .update_screen_and_loop
         jz      .loop
         lodsb
         call    con.write_char_ex
         jmp     .update_screen_and_loop
 .home:
-        cmp     esi, [esp+20h+4]
+        cmp     esi, [esp+20h+8]
         jz      .update_screen_and_loop
         dec     esi
         mov     al, 8
         call    con.write_special_char
         jmp     .home
 @@:
         dec     esi
         jmp     .update_screen_and_loop
 .ret:
         popad
-        ret     8
+        ret     12
 con.update_screen:
         push    eax
         mov     eax, [con.cur_y]
 con.vscroll_pt      dd    -1
 align 16
 EXPORTS:
         dd      szStart,                START
-        dd      szVersion,              0x00020003
+        dd      szVersion,              0x00020004
         dd      szcon_init,             con_init
         dd      szcon_write_asciiz,     con_write_asciiz
         dd      szcon_printf,           con_printf
         dd      szcon_exit,             con_exit
         dd      szcon_get_flags,        con_get_flags
         dd      szcon_set_flags,        con_set_flags
         dd      szcon_kbhit,            con_kbhit
         dd      szcon_getch,            con_getch
         dd      szcon_getch2,           con_getch2
+        dd      szcon_gets,             con_gets
-        dd      szcon_gets,             con_gets
+        dd      szcon_gets2,            con_gets2
         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
 szcon_set_flags         db 'con_set_flags',0
 szcon_kbhit             db 'con_kbhit',0
 szcon_getch             db 'con_getch',0
 szcon_getch2            db 'con_getch2',0
 szcon_gets              db 'con_gets',0
+szcon_gets2             db 'con_gets2',0
 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

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/console/console.asm – Rev 836 → 852