WebSVN – Kolibri OS – Diff – /programs/develop/mtdbg/gui.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; GUI ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-macro DrawRectangle x, y, w, h, color
-{
-        mcall 13, x shl 16 + w,     y shl 16 + 1,     color   ; top
-        mcall   , x shl 16 + 1,     y shl 16 + h,     color   ; left
-        mcall   , (x+w) shl 16 +1,  y shl 16 + (h+1), color   ; right
-        mcall   , x shl 16 + w,   (y+h) shl 16 + 1,   color   ; bottom
-}
 ;-----------------------------------------------------------------------------
 ;                             Color scheme
 data_width      equ 80
 data_x_pos      equ 12
 data_x_size     equ data_width*6
 title_x_pos     equ 30
-title_y_pos     equ 32
+title_y_pos     equ 8
 title_y_size    equ 10
 ;dump_y_pos      equ (registers_y_pos + registers_y_size + 5)
 registers_x_pos equ (data_x_pos + messages_x_size + 4)
 registers_y_pos equ (title_y_pos + title_y_size - 3)
 registers_x_size equ 134+2*6
 registers_y_size equ (cmdline_y_pos + cmdline_y_size - registers_y_pos+1)
-wnd_x_size      equ (data_x_pos + messages_x_size + data_x_pos + registers_x_size+3)
+wnd_x_size      equ (data_x_pos + messages_x_size + data_x_pos + registers_x_size+3) + 10
 wnd_y_size      equ (cmdline_y_pos + cmdline_y_size + data_x_pos)
         imul    ecx, 6
         inc     ecx
         add     ebx, cmdline_x_pos
         shl     ebx, 16
         or      ebx, ecx
-        mov     ecx, cmdline_y_pos*10000h + cmdline_y_size
+        mov     ecx, [cmdline_y_pos_dd]
+        mov     cx, cmdline_y_size
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box for cmdline
         mcall   13
         ret
         mov     ecx, COLOR_TXT_NORMAL
         lea     edx, [cmdline+ebx]
         imul    ebx, 6
         add     ebx, cmdline_x_pos
         shl     ebx, 16
-        or      ebx, cmdline_y_pos+1
+        mov     bx, word[cmdline_y_pos_dd+4]
+        inc     bx
         ; draw a text string in the window
         mcall   4
         ret
 put_message:
         call    put_message_nodraw
 draw_messages:
+        ; draw container rectangle/box
+        mov     ebx, messages_x_pos shl 16
+        add     ebx, [messages_x_size_dd+4]
+        mov     ecx, [messages_y_pos_dd]
-        ; draw container rectangle/box
+        mov     cx, messages_y_size
-        mcall   13, messages_x_pos*10000h+messages_x_size, messages_y_pos*10000h+messages_y_size, COLOR_BG_NORMAL
+        mcall   13, , , COLOR_BG_NORMAL
         mov     edx, messages
         push    messages_width
         pop     esi
         mov     ecx, COLOR_TXT_NORMAL
+        mov     ebx, messages_x_pos*10000h
-        mov     ebx, messages_x_pos*10000h+messages_y_pos
+        mov     bx, word[messages_y_pos_dd+4]
     @@:
         ; display text string in the window
 ;-----------------------------------------------------------------------------
 ;                     Show/hide cursor in command line
 ; TODO: make it cursor.draw and cursor.hide ???
 draw_cursor:
+        mov     ecx, [cmdline_y_pos_dd+2]
-        mov     ecx, cmdline_y_pos*10001h+cmdline_y_size-1
+        add     cx, cmdline_y_size-1
         mov     ebx, [cmdline_pos]
         imul    ebx, 6
         add     ebx, cmdline_x_pos
         mov     edx, ebx
         mov     ebx, [cmdline_pos]
         imul    ebx, 6
         add     ebx, cmdline_x_pos
         shl     ebx, 16
         inc     ebx
-        mov     ecx, cmdline_y_pos*10000h + cmdline_y_size
+        mov     ecx, [cmdline_y_pos_dd]
+        mov     cx, cmdline_y_size
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box
         mcall   13
         mov     ebx, [cmdline_pos]
         cmp     ebx, [cmdline_len]
         mov     ecx, COLOR_TXT_NORMAL
         lea     edx, [cmdline+ebx]
         imul    ebx, 6
         add     ebx, cmdline_x_pos
         shl     ebx, 16
-        or      ebx, cmdline_y_pos+1
+        mov     bx, word[cmdline_y_pos_dd+4]
+        inc     bx
         push    1
         pop     esi
         ; draw text string in the window
         mcall   4
 ;                       Draw program window title
 ; FIXME: something wrong here
 redraw_title:
+        ; draw container rectangle/box
+        mov     ebx, [data_x_size_dd+4]
-        ; draw container rectangle/box
+        add     ebx, title_x_pos*10000h+data_x_pos-title_x_pos
-        mcall   13, title_x_pos*10000h+data_x_pos+data_x_size-title_x_pos, title_y_pos*10000h+title_y_size, COLOR_BG_NORMAL
+        mcall   13, , title_y_pos*10000h+title_y_size, COLOR_BG_NORMAL
 draw_title:
         mcall   38, (data_x_pos-2)*10000h+title_x_pos-5, (title_y_pos+5)*10001h, COLOR_LINE
     @@:
         imul    ebx, esi, 6
         add     ebx, title_x_pos+4
         shl     ebx, 16
+        mov     bx, data_x_pos-10-5-6*7
-        mov     bx, data_x_pos+data_x_size-10-5-6*7
+        add     bx, word[data_x_size_dd+4]
         cmp     [bSuspended], 0
         jz      @f
         add     ebx, 6
     @@:
+        ; draw line with COLOR_LINE (in edx)
-        ; draw line with COLOR_LINE (in edx)
+        mcall
-        mcall
+        mov     ebx, [data_x_size_dd+2]
-        mov     ebx, (data_x_pos+data_x_size-10+4)*0x10000 + data_x_pos+data_x_size+2
+        add     ebx, (data_x_pos-10+4)*0x10000 + data_x_pos+2
         ; draw line with COLOR_LINE (in edx)
         mcall
         mov     al, 4
     @@:
         ; draw text string in the window
         mcall
         cmp     [debuggee_pid], 0
         jz      .nodebuggee
+        mov     ebx, [data_x_size_dd]
-        mov     ebx, (data_x_pos+data_x_size-10-6*7)*10000h + title_y_pos
+        add     ebx, (data_x_pos-10-6*7)*10000h + title_y_pos
         mov     edx, aRunning
         push    7
         pop     esi
         cmp     [bSuspended], 0
         jz      @f
         mcall
         ret
     .nodebuggee:
+        mov     al, 38
-        mov     al, 38
+        mov     ebx, [data_x_size_dd+2]
-        mov     ebx, (data_x_pos+data_x_size-10-6*7-5)*0x10000 + data_x_pos+data_x_size+2
+        add     ebx, (data_x_pos-10-6*7-5)*0x10000 + data_x_pos+2
         mov     ecx, (title_y_pos+5)*10001h
         mov     edx, COLOR_LINE
         jmp     @b
         jz      @f
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
     @@:
         mov     edx, aMain
         ; draw a text string in the window
+        mov     ebx, [registers_x_pos_dd]
-        mcall   4, (registers_x_pos+4)*10000h+registers_y_pos+2
+        add     ebx, 4*10000h+registers_y_pos+2
+        mcall   4
         cmp     [reg_mode], REG_MODE_SSE
         jz      @f
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
     @@:
         mov     edx, aSSE
+        ; draw a text string in the window
-        ; draw a text string in the window
+        mov     ebx, [registers_x_pos_dd]
+        add     ebx, 46*10000h+registers_y_pos+2
-        mcall   4, (registers_x_pos+46)*10000h+registers_y_pos+2
+        mcall   4
         cmp     [reg_mode], REG_MODE_AVX
         jz      @f
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
     @@:
+        mov     edx, aAVX
-        mov     edx, aAVX
+        ; draw a text string in the window
+        mov     ebx, [registers_x_pos_dd]
-        ; draw a text string in the window
+        add     ebx, 88*10000h+registers_y_pos+2
-        mcall   4, (registers_x_pos+88)*10000h+registers_y_pos+2
+        mcall   4
         ret
         mov     edi, COLOR_BG_NORMAL
         mov     esi, _eax
         push    4
         pop     ecx
         mov     edx, regs_strs
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+22
+        add     ebx, 2*10000h+registers_y_pos+22
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+32
+        add     ebx, 2*10000h+registers_y_pos+32
         add     esi, _ebx-_eax
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+42
+        add     ebx, 2*10000h+registers_y_pos+42
         add     esi, _ecx-_ebx
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+52
+        add     ebx, 2*10000h+registers_y_pos+52
         add     esi, _edx-_ecx
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+62
+        add     ebx, 2*10000h+registers_y_pos+62
         add     esi, _esi-_edx
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+72
+        add     ebx, 2*10000h+registers_y_pos+72
         add     esi, _edi-_esi
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+82
+        add     ebx, 2*10000h+registers_y_pos+82
         add     esi, _ebp-_edi
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+92
+        add     ebx, 2*10000h+registers_y_pos+92
         add     esi, _esp-_ebp
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+102
+        add     ebx, 2*10000h+registers_y_pos+102
         add     esi, _eip-_esp
         call    draw_register
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+112
+        add     ebx, 2*10000h+registers_y_pos+112
         mov     cl, 7
         add     esi, _eflags-_eip
         call    draw_register
         push    ebp
+        push    8
-        push    8
+        xor     ebp, ebp
-        xor     ebp, ebp
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+142
+        add     ebx, 2*10000h+registers_y_pos+142
         ;int3
         ;nop
         mov     [esp], byte 8
+        xor     ebp, ebp
-        xor     ebp, ebp
+        mov     ebx, [registers_x_pos_dd]
-        mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+232
+        add     ebx, 2*10000h+registers_y_pos+232
 align 4
         mov     ecx, COLOR_TXT_NORMAL
     @@:
         mov     edx, aColon
         xor     esi, esi
         inc     esi
+        mov     ebx, [registers_x_pos_dd]
-        mcall   4, (registers_x_pos+10)*10000h+registers_y_pos+122
+        add     ebx, 10*10000h+registers_y_pos+122
+        mcall   4
         mov     edx, flags
     @@:
         add     ebx, 2*6*10000h
 ;-----------------------------------------------------------------------------
 ;                 Draw all registers sets
 draw_registers:
+        ; draw container rectangle/box with COLOR_BG_NORMAL
-        ; draw container rectangle/box with COLOR_BG_NORMAL
+        mov     ebx, [registers_x_pos_dd]
+        add     ebx, (-1)*10000h+(registers_x_size+2)
+        mov     ecx, [registers_y_size_dd+4]
+        add     ecx, (registers_y_pos-1)*10000h+2
-        mcall   13, (registers_x_pos-1)*10000h+(registers_x_size+2), (registers_y_pos-1)*10000h+(registers_y_size+2), COLOR_BG_NORMAL
+        mcall   13, , , COLOR_BG_NORMAL
         call    draw_reg_title
     .redraw:
 ;-----------------------------------------------------------------------------
 ;                     Display memory dump
 draw_dump:
+        ; draw container rectangle/box in the window
+        mov     ebx, [data_x_size_dd+4]
-        ; draw container rectangle/box in the window
+        add     ebx, data_x_pos*10000h
-        mcall   13, data_x_pos*10000h+data_x_size, dump_y_pos*10000h+dump_y_size, COLOR_BG_NORMAL
+        mcall   13, , dump_y_pos*10000h+dump_y_size, COLOR_BG_NORMAL
     .redraw:
         ; addresses
         shl     ecx, 16
         mov     cl, 11
         ; setting up background color for disassembled text
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box with color COLOR_BG_NORMAL (was 0xFFFFFF - white)
+        mov     ebx, [data_x_size_dd+4]
-        mcall   13, data_x_pos*10000h+data_x_size
+        add     ebx, data_x_pos*10000h
+        mcall   13
         pop     ebx
         ; copy color value from edx (COLOR_BG_NORMAL)
         mov     edi, edx
         add     ebx, (data_x_pos+6*2)*10000h+disasm_y_pos
         mov     edx, esi
         shr     ebx, 16
         lea     ebx, [ebx+esi*2]
         shl     ecx, 16
         mov     cl, 10
         imul    ebx, 10001h
-        sub     bx, data_x_pos+data_x_size
+        sub     bx, data_x_pos
+        sub     bx, word[data_x_size_dd+4]
         neg     bx
         mov     al, 13
         ; copy color value from edi
         mov     edx, edi
         ; draw container rectangle/box for disassembled text, color in edx
         mcall
         inc     [disasm_cur_str]
+        mov     eax, [disasm_height_dd]
-        cmp     [disasm_cur_str], disasm_height
+        cmp     [disasm_cur_str], eax
         jae     .loopend
     .nosymb:
         push    [disasm_cur_pos]
         call    disasm_instr
         pop     ebp
         jc      .loopend
         mov     edx, COLOR_BG_NORMAL
         mov     esi, COLOR_TXT_NORMAL
+        mov     ebx, data_x_pos*10000h
-        mov     ebx, data_x_pos*10000h + data_x_size
+        add     ebx, [data_x_size_dd+4]
         mov     ecx, [disasm_cur_str]
         imul    ecx, 10*10000h
         add     ecx, (disasm_y_pos-1)*10000h + 10
         mov     eax, ebp
         add     ebx, (data_x_pos+6*40)*10000h+disasm_y_pos
         ; draw a text string in the window, color in ecx
         mcall   4
+        inc     [disasm_cur_str]
-        inc     [disasm_cur_str]
+        mov     eax, [disasm_height_dd]
-        cmp     [disasm_cur_str], disasm_height
+        cmp     [disasm_cur_str], eax
         jb      .loop
     .loopend:
-        mov     ecx, disasm_height
+        mov     ecx, [disasm_height_dd]
         sub     ecx, [disasm_cur_str]
         jz      @f
         imul    ecx, 10
+        inc     ecx
-        inc     ecx
+        mov     eax, disasm_y_pos
-        mov     eax, disasm_y_pos + disasm_y_size
+        add     eax, [disasm_y_size_dd+4]
         sub     eax, ecx
         shl     eax, 16
+        add     ecx, eax
+        ; Draw filled rectangle
-        add     ecx, eax
+        mov     ebx, [data_x_size_dd+4]
-        ; Draw filled rectangle
+        add     ebx, data_x_pos*10000h
-        mcall   13, data_x_pos*10000h+data_x_size, , COLOR_BG_NORMAL
+        mcall   13, , , COLOR_BG_NORMAL
     @@:
         ret
 ;-----------------------------------------------------------------------------
 ; TODO: cleanup of this function, make some global labels local
 update_disasm_eip:
 ; test if instruction at eip is showed
 draw_window:
         ; start window redraw
         mcall   12, 1
         ; define window
-        mcall   0, wnd_x_size, wnd_y_size, (COLOR_BG_NORMAL or 0x54000000), , caption_str
+        mcall   0, wnd_x_size, wnd_y_size, (COLOR_BG_NORMAL or 0x33000000), ,caption_str
-        ; clear unused areas
-        ; get window skin height
-        mcall   48, 4
-        cmp     eax, title_y_pos
-        jb      @f
+        ; Get actual window size
+        mcall   9, thread_info, -1
+        ; Check if window is rolled up
+        test    [thread_info.wnd_state], 100b
+        jnz     .done
+        ; Check if window isnt smaller then permisseable
+        mov     eax, [thread_info.box.width]            ; window xsize
+        mov     ebx, [thread_info.box.height]           ; ysize
+        mov     edx, [thread_info.client_box.width]     ; work area xsize
+        mov     esi, [thread_info.client_box.height]    ; ysize
+        sub     eax, edx
+        sub     ebx, esi
-        push    registers_y_pos
+        cmp     edx, wnd_x_size
+        jae     .x_ok
+        mov     edx, wnd_x_size
-        pop     eax
+  .x_ok:
+        add     edx, eax
-    @@:
+        cmp     esi, wnd_y_size
-        push    registers_y_pos
+        jae     .y_ok
+        mov     esi, wnd_y_size
+  .y_ok:
+        add     esi, ebx
+        mcall   67, -1, -1      ; set the new sizes
+        ; (re)calculate coordinates of GUI elements
+        mov     eax, [thread_info.client_box.width]
-        pop     ecx
+        sub     eax, data_x_pos + data_x_pos + registers_x_size+3
-        push    eax
+        mov     [data_x_size_dd+4], eax
-        sub     ecx, eax
+        mov     [messages_x_size_dd+4], eax
+        shl     eax, 16
-        shl     eax, 16
+        mov     [data_x_size_dd], eax
-        add     ecx, eax
+        mov     [messages_x_size_dd], eax
-        mov     ebx, 5*10000h + (wnd_x_size-9)
+        shr     eax, 16
-        mov     edx, COLOR_BG_NORMAL
+        add     eax, data_x_pos + 4
+        mov     [registers_x_pos_dd+4], eax
-        ; draw container rectangle/box for registers information region
+        shl     eax, 16
-        mcall   13
+        mov     [registers_x_pos_dd], eax
-        mov     ecx, (dump_y_pos+dump_y_size)*10000h + (disasm_y_pos-dump_y_pos-dump_y_size)
+        mov     eax, [thread_info.client_box.height]
-        ; draw container rectangle/box for dump memory region
+        sub     eax, cmdline_y_size + data_x_pos
-        mcall
+        mov     [cmdline_y_pos_dd+4], eax
-        mov     ecx, (disasm_y_pos-1+disasm_y_size)*10000h + (messages_y_pos-disasm_y_pos+1-disasm_y_size)
+        shl     eax, 16
-        ; draw container rectangle/box for disassembled code region
+        mov     [cmdline_y_pos_dd], eax
-        mcall
+        shr     eax, 16
-        mov     ecx, (messages_y_pos+messages_y_size)*10000h + (wnd_y_size-messages_y_pos-messages_y_size-4)
+        sub     eax, messages_y_size + 4
-        ; draw container rectangle/box for messages window region
+        mov     [messages_y_pos_dd+4], eax
-        mcall
+        shl     eax, 16
-        mov     ebx, 5*10000h + (data_x_pos-5)
+        mov     [messages_y_pos_dd], eax
-        pop     ecx
+        shr     eax, 16
-        imul    ecx, 10001h
+        sub     eax, disasm_y_pos + 4
-        sub     cx, wnd_y_size-4
+        mov     [disasm_y_size_dd+4], eax
-        neg     cx
+        shl     eax, 16
-        ; draw container rectangle/box
+        mov     [disasm_y_size_dd], eax
-        mcall
+        shr     eax, 16
+        mov     ecx, 10
+        xor     edx, edx
-        mov     ebx, (data_x_pos+data_x_size)*10000h + (wnd_x_size-data_x_pos-data_x_size-4)
+        div     ecx
-        ; draw container rectangle/box
+        mov     [disasm_height_dd], eax
-        mcall
-        mov     ebx, 5*10000h + title_x_pos - 5
+        mov     eax, [thread_info.client_box.height]
+        sub     eax, data_x_pos + registers_y_pos-1
-        mov     ecx, (title_y_pos)*10000h + (title_y_size)
+        mov     [registers_y_size_dd+4], eax
+        shl     eax, 16
-        ; draw container rectangle/box for dump memory region title
+        mov     [registers_y_size_dd], eax
         mcall
+        ; messages frame
+        mov     ebx, [messages_x_size_dd+4]
-        ; messages frame
+        add     ebx, (messages_x_pos-2)*10000h + (messages_x_pos+2)
-        mov     ebx, (messages_x_pos-2)*10000h + (messages_x_pos+messages_x_size+2)
+        push    ebx
-        push    ebx
+        mov     ecx, [messages_y_pos_dd+2]
-        mov     ecx, (messages_y_pos-2)*10001h
+        add     ecx, -2*10001h
         mov     edx, COLOR_LINE
         mcall   38
+        add     ecx, (messages_y_size+2+2)*10001h
-        mov     ecx, (messages_y_pos+messages_y_size+2)*10001h
+        mcall
-        mcall
+        mov     ebx, (messages_x_pos-2)*10001h
+        push    ebx
-        mov     ebx, (messages_x_pos-2)*10001h
+        mov     ecx, [messages_y_pos_dd+2]
-        push    ebx
+        add     ecx, (-2*10000h) + (messages_y_size+2)
-        mov     ecx, (messages_y_pos-2)*10000h + (messages_y_pos+messages_y_size+2)
+        mcall
-        mcall
+        mov     ebx, [messages_x_size_dd+2]
+        add     ebx, (messages_x_pos+2)*10001h
-        mov     ebx, (messages_x_pos+messages_x_size+2)*10001h
+        push    ebx
-        push    ebx
+        mcall
         mcall
         ; command line frame
-        ; command line frame
+        mov     ecx, [cmdline_y_pos_dd+2]
-        mov     ecx, (cmdline_y_pos-2)*10000h + (cmdline_y_pos+cmdline_y_size+2)
+        add     ecx, (-2*10000h) + (cmdline_y_size+2)
+        pop     ebx
-        pop     ebx
+        mcall
+        pop     ebx
         mcall
         pop     ebx
+        mov     ecx, [cmdline_y_pos_dd+2]
-        mcall
+        add     ecx, (cmdline_y_size+2)*10001h
         pop     ebx
+        mcall
+        mov     ecx, [cmdline_y_pos_dd+2]
+        add     ecx, (-2*10001h)
+        mcall
+        ; registers frame
-        mov     ecx, (cmdline_y_pos+cmdline_y_size+2)*10001h
+        mov     ebx, [registers_x_pos_dd]
+        add     ebx, (-2) shl 16 + (registers_x_size+3)
+        mov     ecx, (registers_y_pos-2) shl 16 + 1
+        mov     edx, COLOR_LINE
+        mcall   13                      ; top
+        mov     ebx, [registers_x_pos_dd]
+        add     ebx, ((-2)+(registers_x_size+3)) shl 16 +1
-        mcall
+        mov     ecx, [registers_y_size_dd+4]
+        add     ecx, (registers_y_pos-2) shl 16 + (+3+1)
-        mov     ecx, (cmdline_y_pos-2)*10001h
+        mcall                           ; right
-        mcall
+        mov     ebx, [registers_x_pos_dd]
         add     ebx, (-2) shl 16 + (registers_x_size+3)
-        ; registers frame
+        mov     ecx, [registers_y_size_dd]
-        DrawRectangle (registers_x_pos-2), (registers_y_pos-2), (registers_x_size+3), (registers_y_size+3), COLOR_LINE
+        add     ecx, ((registers_y_pos-2)+(+3)) shl 16 + 1
-        ; draw container rectangle/box for registers information window region
+        mcall                           ; bottom
         ; messages
+        call    draw_messages
         call    draw_messages
         ; command line & cursor
+        call    draw_cmdline
-        ; command line & cursor
+        call    draw_cursor
         call    draw_cmdline
+        ; title & registers & dump & disasm
-        call    draw_cursor
+        mov     ebx, (data_x_pos-2)*10001h
         mov     ecx, (title_y_pos+5)*10000h + (-2)
-        ; title & registers & dump & disasm
+        add     ecx, [messages_y_pos_dd+4]
-        mov     ebx, (data_x_pos-2)*10001h
+        mov     edx, COLOR_LINE
-        mov     ecx, (title_y_pos+5)*10000h + (messages_y_pos-2)
+        mcall   38
-        mov     edx, COLOR_LINE
+        mov     ebx, [data_x_size_dd+2]
-        mcall   38
+        add     ebx, (data_x_pos+2)*10001h
-        mov     ebx, (data_x_pos+data_x_size+2)*10001h
+        mcall
+        mov     ebx, [data_x_size_dd+4]
+        add     ebx, (data_x_pos-2)*10000h + (data_x_pos+2)
-        mcall
+        mov     ecx, (disasm_y_pos-4)*10001h
-        mov     ebx, (data_x_pos-2)*10000h + (data_x_pos+data_x_size+2)
+        mcall
         mov     ecx, (disasm_y_pos-4)*10001h
-        mcall
+        ; redraw whole window again

Subversion Repositories Kolibri OS

(root)/programs/develop/mtdbg/gui.inc – Rev 4907 → 4908