WebSVN – Kolibri OS – Diff – /programs/network/ircc/userparser.inc

 user_parser:
-        mov     ebp, [window_active]   ; print to the current window
+        mov     ebp, [window_active]                    ; print to the current window
         mov     [window_print], ebp
-        mov     eax, [edit1.size]
+        mov     ecx, [edit1.size]
-        test    eax, eax
+        test    ecx, ecx
+        jz      .ret                                    ; ignore empty commands
+        mov     esi, input_text
+        mov     edi, user_command
+        call    recode                                  ; Convert to UTF-8
+        mov     word[edi], 0x0a0d                       ; terminate the line
-        jz      .ret                                    ; ignore empty commands
+        sub     edi, user_command
-        mov     word[usercommand + eax], 0x0a0d         ; terminate the line
+        mov     [user_command.size], edi
-        cmp     byte[usercommand], '/'                  ; is it a server command ?
+        cmp     byte[user_command], '/'                 ; is it a server command ?
         je      .command
-        cmp     [status], STATUS_CONNECTED
+        cmp     [status], STATUS_LOGGED_IN
-        jne     .not_connected
+        jne     .not_loggedin
         mov     al, '>'
         call    print_char
         mov     al, ' '
         call    print_char
-        mov     eax, [edit1.size]
+        mov     eax, [user_command.size]
-        mov     byte[usercommand + eax],0
+        mov     byte[user_command + eax],0
-        mov     esi, usercommand
+        mov     esi, user_command
         call    print_asciiz
   .done:
         mov     ax, ' :'
         stosw
-        mov     esi, usercommand
+        mov     esi, user_command
-        mov     ecx, [edit1.size]
+        mov     ecx, [user_command.size]
-        inc     ecx
+;        inc     ecx
-        call    recode
+        rep     movsb
   .ret:
         ret
 ; Text begins with a '/' lets try to find the command in the lookup table.
   .command:
-        mov     eax, dword[usercommand+1]       ; skip '/'
+        mov     eax, dword[user_command+1]      ; skip '/'
         or      eax, 0x20202020                 ; convert to lowercase
         mov     edi, user_commands
         mov     ecx, user_commands.number
         cmp     [status], STATUS_CONNECTED
-        je      .cmd_loop
+        jae     .cmd_loop
         mov     ecx, user_commands.number2
   .cmd_loop:
         scasd
         je      .got_cmd
         add     edi, 4
         dec     ecx
         jnz     .cmd_loop
         cmp     [status], STATUS_CONNECTED
-        jne     .not_connected
+        jb      .not_connected
         jmp     cmd_usr_send
   .got_cmd:
+        jmp     dword[edi]
+  .not_loggedin:
+        mov     esi, str_notloggedin
+        call    print_asciiz
-        jmp     dword[edi]
+        ret
   .not_connected:
         mov     esi, str_notconnected
 cmd_usr_msg:
 cmd_usr_quit:
         mov     esi, quit_msg
-        cmp     byte[usercommand+5], ' '
+        cmp     byte[user_command+5], ' '
         jne     quit_server
-        lea     esi, [usercommand+6]
+        lea     esi, [user_command+6]
 cmd_usr_nick:
-        cmp     [edit1.size], 5
+        cmp     [user_command.size], 5
         je      .justprint
-        cmp     byte[usercommand+5], ' '
+        cmp     byte[user_command+5], ' '
         jne     .fail
         cmp     [socketnum], 0
         je      .dontsend
 ; Request nickname change to server
-        mov     dword[usercommand+1], 'NICK'
+        mov     dword[user_command+1], 'NICK'
-        mov     esi, [edit1.size]
+        mov     esi, [user_command.size]
-        mov     word[usercommand + esi], 0x0a0d
+        mov     word[user_command + esi], 0x0a0d
         inc     esi
-        mcall   send, [socketnum], usercommand+1, , 0
+        mcall   send, [socketnum], user_command+1, , 0
   .fail:
         ret
 ; We arent logged in yet, directly change user_nick field and print notification to user.
   .dontsend:
 cmd_usr_real:
-        cmp     byte[usercommand+5], ' '
+        cmp     byte[user_command+5], ' '
         jne     cmd_usr_send
         mov     ecx, MAX_REAL_LEN
-        mov     esi, usercommand+6
+        mov     esi, user_command+6
 cmd_usr_server:
-        mov     eax, dword[usercommand+5]       ; check for 'er ', we only checked 'serv'
+        mov     eax, dword[user_command+5]      ; check for 'er ', we only checked 'serv'
         or      eax, 0x00002020
         and     eax, 0x00ffffff
         cmp     eax, 'er '
         jne     cmd_usr_send
 ; Server window is always first window in the list, switch to it.
         mov     [window_print], windows
         mov     [window_active], windows
-        mov     ecx, [edit1.size]               ; ok now set the address
+        mov     ecx, [user_command.size]        ; ok now set the address
         sub     ecx, 8
         ret
 cmd_usr_quer:
-        mov     esi, usercommand+7
+        mov     esi, user_command+7
         call    window_open
 ; User typed a part command
 cmd_usr_part:
-        cmp     byte[usercommand+5], 13         ; parameters given?
+        cmp     byte[user_command+5], 13        ; parameters given?
 cmd_usr_ctcp:
-        cmp     byte[usercommand+5], ' '
+        cmp     byte[user_command+5], ' '
         jne     cmd_usr_send
         stosd
         mov     al, 'N'
         stosb
 ; copy the message itself (including first space)
-        mov     esi, usercommand+3
+        mov     esi, user_command+3
   @@:
         lodsb
         cmp     al, 13
         je      @f
         call    print_asciiz
         mov     esi, user_nick
         call    print_asciiz
-        mov     esi, usercommand+3
+        mov     esi, user_command+3
         mov     bl, 13
         call    print_string
         mov     al, 10
         call    print_char
         ret
-; The user typed some undefined command, just recode it and send to the server
-cmd_usr_send:
+; The user typed some undefined command, just send it to the server
-        mov     esi, usercommand+1
+cmd_usr_send:

Subversion Repositories Kolibri OS

(root)/programs/network/ircc/userparser.inc – Rev 6026 → 6027