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

         COLOR_TXT_NORMAL          = 0xffffff
         COLOR_TXT_INACTIVE        = 0x8f7948
         COLOR_TXT_CHANGED         = 0xec9300
         COLOR_TXT_LABEL           = 0x22b14c
         COLOR_TXT_SELECTED        = 0x1d272f
-        COLOR_TXT_ADDR            = 0xec9300
+        COLOR_TXT_HEX             = 0xec9300
         COLOR_TXT_BREAKPOINT      = 0xec9300
 else if COLOR_THEME eq WHITE_ON_BLACK
         COLOR_TXT_NORMAL          = 0xFFFFFF ; white
         COLOR_TXT_INACTIVE        = 0x808080 ; grey
         COLOR_TXT_CHANGED         = 0x00AA00 ; green
         COLOR_TXT_LABEL           = COLOR_TXT_NORMAL
         COLOR_TXT_SELECTED        = 0xFFFFFF ; white
-        COLOR_TXT_ADDR            = COLOR_TXT_NORMAL
+        COLOR_TXT_HEX             = COLOR_TXT_NORMAL
         COLOR_TXT_BREAKPOINT      = COLOR_TXT_NORMAL
 else  ; BLACK ON WHITE
         COLOR_TXT_NORMAL          = 0x000000 ; black
         COLOR_TXT_INACTIVE        = 0x808080 ; grey
         COLOR_TXT_CHANGED         = 0x00AA00 ; green
         COLOR_TXT_LABEL           = COLOR_TXT_NORMAL
         COLOR_TXT_SELECTED        = 0xFFFFFF ; white
-        COLOR_TXT_ADDR            = COLOR_TXT_NORMAL
+        COLOR_TXT_HEX             = COLOR_TXT_NORMAL
         COLOR_TXT_BREAKPOINT      = COLOR_TXT_NORMAL
 end if
 ;-----------------------------------------------------------------------------
 ;                     Show/hide cursor in command line
 ; TODO: make it cursor.draw and cursor.hide ???
-draw_cursor:
-        ;push   38
-        ;pop    eax
+draw_cursor:
         mov     ecx, cmdline_y_pos*10001h+cmdline_y_size-1
         mov     ebx, [cmdline_pos]
         imul    ebx, 6
         add     ebx, cmdline_x_pos
         mov     edx, ebx
         shl     ebx, 16
-        or      ebx, edx
-        ; setting line color
-        ; was 'xor     edx, edx' - black
+        or      ebx, edx
-        mov     edx, COLOR_LINE
+        mov     edx, COLOR_TXT_NORMAL
-        ; draw line, color in edx
+        ; draw line
         mcall   38
         ret
-hide_cursor:
-        mov     ebx, [cmdline_pos]
-        ;push   13
+hide_cursor:
-        ;pop    eax
+        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
-        ; setting up rectangle color
+        inc     ebx
-        ; was 0xFFFFFF
+        mov     ecx, cmdline_y_pos*10000h + cmdline_y_size
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box
         mcall   13
         mov     ebx, [cmdline_pos]
-        cmp     ebx, [cmdline_len]
-        jae     .ret
+        cmp     ebx, [cmdline_len]
-        ;mov    al, 4
-        ; setting up text color scheme and attributes
+        jae     .ret
-        ;was 'xor     ecx, ecx'
+        ; setting up text color scheme and attributes
         mov     ecx, COLOR_TXT_NORMAL
         lea     edx, [cmdline+ebx]
         imul    ebx, 6
 ;-----------------------------------------------------------------------------
 ;                      Draw registers frame title
 ; Also show current register set (common + MMX, SSE or AVX)
-draw_reg_title:
-        ;push   4
-        ;pop    eax
-    ; setting up text backround color
-        ; was 0xFFFFFF - white
+draw_reg_title:
-        mov     edi, COLOR_BG_NORMAL
-    ; setting up text color
-    ; can be usual and inactive
-        ; normal color
-        ; was 0x40000000 - black
+        mov     edi, COLOR_BG_NORMAL
         mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
         mov     esi, 7
         cmp     [reg_mode], REG_MODE_CPU
-        jz      @f
-        ; inactive color
-        ; was 0x40808080 - grey
+        jz      @f
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
     @@:
-        mov     edx, aMain
-        ;mov    ebx, (registers_x_pos+4)*10000h + registers_y_pos+2
+        mov     edx, aMain
         ; draw a text string in the window
+        mcall   4, (registers_x_pos+4)*10000h+registers_y_pos+2
         mcall   4, (registers_x_pos+4)*10000h+registers_y_pos+2
         cmp     [reg_mode], REG_MODE_SSE
-        jz      @f
-        ; inactive color
-        ; was 0x40808080 - grey
+        jz      @f
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
     @@:
-        mov     edx, aSSE
-        ;mov        ebx, (registers_x_pos+46)*10000h + registers_y_pos+2
+        mov     edx, aSSE
         ; draw a text string in the window
+        mcall   4, (registers_x_pos+46)*10000h+registers_y_pos+2
         mcall   4, (registers_x_pos+46)*10000h+registers_y_pos+2
         cmp     [reg_mode], REG_MODE_AVX
-        jz      @f
-        ; inactive color
-        ; was 0x40808080 - grey
+        jz      @f
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
     @@:
-        mov     edx, aAVX
-        ;mov    ebx, (registers_x_pos+88)*10000h + registers_y_pos+2
+        mov     edx, aAVX
         ; draw a text string in the window
         mcall   4, (registers_x_pos+88)*10000h+registers_y_pos+2
         ret
 ;-----------------------------------------------------------------------------
-;                Display common registers set + MMX + FPU
-draw_main_registers:
-        ;push    13
-        ;pop     eax
-        ;mov     edx, 0xFFFFFF
-        ;mov     ebx, (registers_x_pos-1)*10000h + (registers_x_size+2)
-        ;mov     ecx, (registers_y_pos-1)*10000h + (registers_y_size+2)
-        ; draw container rectangle/box with COLOR_BG_NORMAL
-        ; color in edx, was 0xFFFFFF - white
+;                Display common registers set + MMX + FPU
-        mcall   13, (registers_x_pos-1)*10000h+(registers_x_size+2), (registers_y_pos-1)*10000h+(registers_y_size+2), COLOR_BG_NORMAL
-    ; TODO: add support for FPU ST0-ST7 registers
     .redraw:
-        ; setting up background color for text and numbers output
+draw_main_registers:
-        ; was 0xFFFFFF - white
+; TODO: add support for FPU ST0-ST7 registers
         mov     edi, COLOR_BG_NORMAL
         mov     esi, _eax
 ;-----------------------------------------------------------------------------
 ;                  Draw SSE registers set
 draw_sse_registers:
     .redraw:
         ret
 ;-----------------------------------------------------------------------------
 ;                  Draw AVX registers set
 draw_avx_registers:
     .redraw:
+        ret
+;-----------------------------------------------------------------------------
-        ret
+;                 Draw all registers sets
+draw_registers:
         ; draw container rectangle/box with COLOR_BG_NORMAL
-;-----------------------------------------------------------------------------
+        mcall   13, (registers_x_pos-1)*10000h+(registers_x_size+2), (registers_y_pos-1)*10000h+(registers_y_size+2), COLOR_BG_NORMAL
-;                 Draw all registers sets
+        call    draw_reg_title
 draw_registers:
     @@:
         call    draw_avx_registers
-        ret
-    .redraw:
-        call    draw_reg_title
-        cmp     [reg_mode], REG_MODE_CPU
-        jnz     @f
-        call    draw_main_registers.redraw
-        ret
-    @@:
-        cmp     [reg_mode], REG_MODE_SSE
-        jnz     @f
-        call    draw_sse_registers.redraw
-        ret
-    @@:
-        call    draw_avx_registers.redraw
         ret
 ;-----------------------------------------------------------------------------
-;                     Display memory dump
-draw_dump:
-        ;push    13
-        ;pop     eax
-        ;mov     edx, 0xFFFFFF
+;                     Display memory dump
-        ;mov     ebx, data_x_pos*10000h + data_x_size
         ;mov     ecx, dump_y_pos*10000h + dump_y_size
-        ; draw container rectangle/box in the window
+draw_dump:
-        ; with color in COLOR_BG_NORMAL (was 0xFFFFFF - white)
+        ; draw container rectangle/box in the window
-        mcall   13, data_x_pos*10000h+data_x_size, dump_y_pos*10000h+dump_y_size, COLOR_BG_NORMAL
         mcall   13, data_x_pos*10000h+data_x_size, dump_y_pos*10000h+dump_y_size, COLOR_BG_NORMAL
     .redraw:
-    ; addresses
+    .redraw:
-        ;mov    al, 47
-        mov     ebx, 80100h
-        mov     edx, data_x_pos*10000h + dump_y_pos
+        ; addresses
-        mov     ecx, [dumppos]
-        ; background color for text string
-        ; was 0xFFFFFF - white
+        mov     ebx, 80100h
-        mov     edi, COLOR_BG_NORMAL
+        mov     edx, data_x_pos*10000h + dump_y_pos
-        ; inactive color
+        mov     ecx, [dumppos]
-        ; was 0x40808080 - grey
+        mov     edi, COLOR_BG_NORMAL
         mov     esi, (COLOR_TXT_INACTIVE or 0x40000000)
-        cmp     [debuggee_pid], 0
-        jz      @f
-        cmp     [bSuspended], 0
+        cmp     [debuggee_pid], 0
-        jz      @f
-        ; normal color
+        jz      @f
-        ; was 0x40000000 - black
+        cmp     [bSuspended], 0
-        mov     esi, (COLOR_TXT_NORMAL or 0x40000000)
+        jz      @f
         mov     esi, (COLOR_TXT_NORMAL or 0x40000000)
     @@:
-        ; draw a number in the window, color in esi
+        ; draw a number in the window
         mcall   47
         jz      .hexdumpdone1
     .hexdumploop1:
         push    ebx
         mov     ebx, 20101h
-        ; draw a number in the window, color in esi
+        ; draw a number in the window
         mcall
         pop     ebx
         add     edx, 3*6*10000h
         inc     ecx
         lea     edx, [ebx+2*6*10000h]
         mov     ecx, ebp
         sub     ecx, [disasm_start_pos]
         add     ecx, disasm_buffer
-        mov     esi, COLOR_TXT_ADDR
+        mov     esi, COLOR_TXT_HEX
         mov     eax, [_eip]
         cmp     eax, ebp
         jnz     @f
         mov     esi, COLOR_TXT_SELECTED

Subversion Repositories Kolibri OS

(root)/programs/develop/mtdbg/gui.inc – Rev 4886 → 4888