WebSVN – Kolibri OS – Diff – /kernel/branches/net/applications/ircc/serverparser.inc

         mov     esi, action_header
         call    print_text2
         mov     eax, servercommand+1
-        mov     dl, ' '
+        mov     dl, '!'
         call    print_text
         ret
-cmd_nick:       ; FIXME
-        add     esi, 5  ; skip 'NICK '
-        push    esi
-; test for change of my nick
-        mov     esi, servercommand+1
-        mov     edi, user_nick
-        mov     ecx, MAX_NICK_LEN
-        rep     cmpsb
-        cmp     byte[edi-1], 0
-        jne     .notmy
-        cmp     byte[esi-1], '!'
-        jne     .notmy
-; yes, this is my nick, set to new
-        pop     esi
-        or      ecx, -1
-        mov     edi, esi
-        xor     eax, eax
-        repne   scasb
-        neg     ecx
-        cmp     ecx, MAX_NICK_LEN
-        jb      @f
-        mov     ecx, MAX_NICK_LEN
-      @@:
-        mov     edi, user_nick
-        rep     movsb
-  .notmy:
-; replace nick in all lists of users
-        mov     ebx, windows
-  .channels:
+cmd_nick:
-        mov     esi, [ebx + window.data_ptr]
-        lea     esi, [esi + window_data.names]
-;;;;;        mov     edx, [esi + window_data.nameslen]
-        add     edx, esi
-  .nicks:
-        mov     edi, servercommand+1
-        cmp     byte[esi], '@'
+        add     esi, 5  ; skip 'NICK '
-        jne     @f
-        inc     esi
-  @@:
-        cmp     esi, edx
-        jae     .srcdone
-        lodsb
-        cmp     al, ' '
-        je      .srcdone
-        scasb
-        je      @b
-  @@:
-        cmp     esi, edx
+        push    esi
-        jae     .nextchannel
+; Is it me who changed nick?
-        lodsb
+        mov     edi, servercommand+1
+        call    compare_to_nick
+        jne     .not_me
         cmp     al, ' '
-        jne     @b
+        mov     ecx, MAX_NICK_LEN-1
-  .nextnick:
-        cmp     esi, edx
-        jae     .nextchannel
-        lodsb
-        cmp     al, ' '
-        jz      .nextnick
-        dec     esi
-        jmp     .nicks
-  .srcdone:
-        cmp     byte [edi], '!'
-        jne     .nextnick
+        push    esi
-; here we have esi -> end of nick which must be replaced to [servercommand_position]+6
-        lea     edx, [edi-servercommand-1]
+  .copyloop:
-        sub     esi, edx
-        or      ecx, -1
-        xor     eax, eax
-;        mov     edi, [servercommand_position]        ;;;;; FIXME
+        lodsb
-        repnz   scasb
-        not     ecx
-        dec     ecx
-        push    ecx
-        cmp     ecx, edx
-        jb      .decrease
-        jz      .copy
-  .increase:
-; new nick is longer than the old
-        push    esi
-        lea     edi, [ebx+120*10] ;;;;;;
-        lea     esi, [edi+edx]
-        sub     esi, ecx
-        mov     ecx, esi
-        sub     ecx, [esp]
-        dec     esi
-        dec     edi
-        std
-        rep     movsb
-        cld
-        pop     esi
-        jmp     .copy
-  .decrease:
-; new nick is shorter than the old
-        push    esi
+        test    al, al
-        lea     edi, [esi+ecx]
-        add     esi, edx
-        lea     ecx, [ebx+120*10]
-        sub     ecx, edi
-        rep     movsb
-        pop     esi
-  .copy:
-; copy nick
-        mov     edi, esi
+        jz      .copydone
-        dec     edi
+        cmp     al, ' '
+        je      .copydone
-;        mov     esi, [servercommand_position]        ;;;;; FIXME
+        stosb
-        pop     ecx
-        sub     edx, ecx
-        sub     [ebx-4], edx
-        rep     movsb
+        dec     ecx
-        mov     al, ' '
+        jnz     .copyloop
-        stosb
+  .copydone:
         xor     al, al
-  .nextchannel:
+        stosb
-        add     ebx, sizeof.window
+        pop     esi
         cmp     ebx, windows + sizeof.window*MAX_WINDOWS
-        jb      .channels
+  .not_me:
-;        mov  [text_start], window_text + 120*80
+; TODO: if we reach here: change nick in userlist(s)
  new_all_channels3:
-        mov     esi, action_header_short
-        call    print_text2
-        mov     eax, servercommand+1
+        push    esi
-        mov     dl,'!'
-        call    print_text
+        mov     esi, action_header_short
         call    print_text2
         call    print_text2
         pop     esi
+        call    print_text2
+        mov     esi, str_newline
         call    print_text2
 cmd_353:        ; channel usernames reply
-        add     esi, 4  ; skip '353 '
-; TODO: mark a bit that we are receiving names
+        add     esi, 4  ; skip '353 '
 ; first, find the channel name
   .loop1:
         lodsb
         cmp     al, '#'
-        je      .got_channel
-        test    al, al
+        je      .got_channel
-        jnz     .loop1
+        test    al, al
-        ret
-  .got_channel:
-;        call    find_channel   ;;;; ASSUME current channel for now
-        mov     ebx, [window_print]
-        mov     [ebx + window.users], 0              ;;; FIXME: Only if we have just set the receiving names bit
+        jnz     .loop1
-        mov     eax, [ebx + window.data_ptr]
+        ret
         lea     edi, [eax + window_data.names]
-        mov     edx, edi
+  .got_channel:
 ; now find the semicolon separating channelname and usernames
   .loop2:
-        lodsb
-        cmp     al, ':'
+        lodsb
+        cmp     al, ':'
+        je      .got_list
+        test    al, al
+        jnz     .loop2
+        ret
+  .got_list:
+; now find window ptr and check if this is the first 353 message
+        mov     ebx, [window_print]
-        je      .newname
+        test    [ebx + window.flags], FLAG_RECEIVING_NAMES
+        jnz     .start
-        test    al, al
+        or      [ebx + window.flags], FLAG_RECEIVING_NAMES
+        mov     [ebx + window.users], 0
+  .start:
+        mov     eax, [ebx + window.users]
-        jnz     .loop2
+        xor     edx, edx
+        mov     ecx, MAX_NICK_LEN
+        mul     ecx
+        ; eax is now offset
-        ret
+        add     eax, [ebx + window.data_ptr]
+        lea     edi, [eax + window_data.names]
+        mov     edx, edi
-  .next:
+        lea     ecx, [eax + window_data.names]
-        add     edx, MAX_NICK_LEN
-        mov     edi, edx
+        add     ecx, MAX_NICK_LEN + MAX_USERS
 ;;;        cmp     edi, ..              ; TODO: Check for buffer overflow
   .newname:
-  .newname:
+        cmp     edi, ecx                ; check buffer overflow
-        inc     [ebx + window.users]
+        jae     .done
-  .namesloop:
+        inc     [ebx + window.users]
-; now the names list begins, separated with spaces
+  .namesloop:
+        lodsb
+        test    al, al
+        jz      .done
+        cmp     al, ' '                 ; names list is separated with spaces
+        je      .next
+        stosb
+        jmp     .namesloop
+  .next:
+        add     edx, MAX_NICK_LEN
+        mov     edi, edx
+  .loop3:
         lodsb
-        test    al, al
-        jz      .done
+        test    al, al
-        cmp     al, ' '
+        jz      .done
-        jz      .next
+        cmp     al, ' '
-        stosb
+        je      .loop3
+        stosb
-        jmp     .namesloop
+        jmp     .newname

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/ircc/serverparser.inc – Rev 3220 → 3222