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

 BLACK_ON_WHITE  = 0
 MOVIEOS         = 1
+WHITE_ON_BLACK  = 2
+;-----------------------------------------------------------------------------
+;                                Font
+FONT            equ 0           ; 0 to 3
+FONT_MULTIPLIER equ 1           ; 1 to 8
+;-----------------------------------------------------------------------------
+;                       GUI elements size and position
+TEXT_Y_CLEARANCE        = 1                                                     ; in pixels
+DATA_WIDTH              = 80                                                    ; in characters
+DATA_X_POS              = 12                                                    ; in pixels
+TITLE_X_POS             = 30                                                    ; in pixels
+TITLE_Y_POS             = 8                                                     ; in pixels
+DUMP_HEIGHT             = 6                                                     ; in text lines
+MIN_DISASM_HEIGHT       = 18                                                    ; in text lines
+MSG_HEIGHT              = 14                                                    ; in text lines
+;-----------------------------------------------------------------------------
+if (FONT eq 0)
+        FONT_X_SIZE     = 6*FONT_MULTIPLIER
+else
+        FONT_X_SIZE     = 8*FONT_MULTIPLIER
+end if
+if (FONT eq 0)
+        FONT_Y_SIZE     = 9*FONT_MULTIPLIER
+else
+        FONT_Y_SIZE     = 16*FONT_MULTIPLIER
+end if
+TITLE_Y_SIZE            = (FONT_Y_SIZE + TEXT_Y_CLEARANCE)
+DUMP_Y_POS              = (TITLE_Y_POS + TITLE_Y_SIZE)
+DUMP_Y_SIZE             = (DUMP_HEIGHT*(FONT_Y_SIZE + TEXT_Y_CLEARANCE))
+DISASM_Y_POS            = (DUMP_Y_POS + DUMP_Y_SIZE + 4)
+MSG_WIDTH               = DATA_WIDTH
+MSG_X_POS               = DATA_X_POS
+MSG_X_SIZE              = MSG_WIDTH*FONT_X_SIZE
+MSG_Y_SIZE              = MSG_HEIGHT*(FONT_Y_SIZE + TEXT_Y_CLEARANCE)
+CMD_WIDTH               = DATA_WIDTH
+CMD_X_POS               = DATA_X_POS
+CMD_Y_SIZE              = (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
+REGISTERS_Y_POS         = DUMP_Y_POS
+REGISTERS_X_SIZE        = (22+2)*(FONT_X_SIZE)                                  ; 22 characters + 2 spacing
+wnd_x_size              = (DATA_X_POS + MSG_X_SIZE + DATA_X_POS + REGISTERS_X_SIZE + 3) + 10
+wnd_y_size              = (((DISASM_Y_POS + (MIN_DISASM_HEIGHT*(FONT_Y_SIZE + TEXT_Y_CLEARANCE)) + 4) + MSG_Y_SIZE + 4) + CMD_Y_SIZE + DATA_X_POS)
-WHITE_ON_BLACK  = 2
+;-----------------------------------------------------------------------------
 ;                         format - 0xRRGGBB
 if COLOR_THEME eq MOVIEOS
+}
-;-----------------------------------------------------------------------------
-data_width              = 80
-data_x_pos              = 12
-data_x_size             = data_width*6
-title_x_pos             = 30
-title_y_pos             = 8
-title_y_size            = 10
-dump_y_pos              = (title_y_pos + title_y_size)
-dump_height             = 6
-dump_y_size             = (dump_height*10)
-disasm_y_pos            = (dump_y_pos + dump_y_size + 4)
-min_disasm_height       = 18
-min_disasm_y_size       = (min_disasm_height*10)
-messages_width          = data_width
-messages_height         = 8
-messages_x_pos          = data_x_pos
-min_messages_y_pos      = (disasm_y_pos + min_disasm_y_size + 4)
-messages_x_size         = messages_width*6
-messages_y_size         = messages_height*10
-cmdline_width           = data_width
-cmdline_x_pos           = data_x_pos
-min_cmdline_y_pos       = (min_messages_y_pos + messages_y_size + 4)
-cmdline_x_size          = messages_x_size
-cmdline_y_size          = 10
-registers_x_pos         = (data_x_pos + messages_x_size + 4)
-registers_y_pos         = (title_y_pos + title_y_size - 3)
-registers_x_size        = 134+2*6
-registers_y_size        = (min_cmdline_y_pos + cmdline_y_size - registers_y_pos+1)
-wnd_x_size              = (data_x_pos + messages_x_size + data_x_pos + registers_x_size+3) + 10
 wnd_y_size              = (min_cmdline_y_pos + cmdline_y_size + data_x_pos)
 ;-----------------------------------------------------------------------------
         push    eax
         fldcw   word [esp]
         pop     eax
         mov     edi, messages
-        mov     ecx, messages_width*messages_height
+        mov     ecx, MSG_WIDTH*MSG_HEIGHT
         mov     al, ' '
         rep stosb
         xor     eax, eax
         mov     [messages_pos], eax
         mov     ecx, (needzeroend-needzerostart+3)/4
         rep stosd
         mov     esi, begin_str
         call    put_message_nodraw
         ; set event mask - default events and debugging events
-        mcall   40, 0x107
+        mcall   40, EVM_REDRAW or EVM_KEY or EVM_BUTTON or EVM_DEBUG
         ; set debug messages buffer
         mov     ecx, dbgbufsize
         mov     dword [ecx], 256
         xor     ebx, ebx
         mov     [ecx+4], ebx
         call    draw_fpu_regs
 .draw_label:
         pop     edx
         mov     edx, [btn2_tab+edx*4]
         mov     edi, COLOR_BG_NORMAL
-        mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
         mov     esi, 7
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 4*10000h+registers_y_pos+2
+        add     ebx, 4*10000h+REGISTERS_Y_POS
         mcall   4
         jmp     waitevent
 align 4
         jz      .up
         cmp     ah, 0x41
         jz      F7
         cmp     ah, 0x42
         jz      F8
-        cmp     [cmdline_len], cmdline_width
+        cmp     [cmdline_len], CMD_WIDTH
         jae     waitevent
         push    eax
         call    clear_cmdline_end
         pop     eax
         mov     edi, cmdline
 clear_cmdline_end:
         mov     ebx, [cmdline_pos]
         mov     ecx, [cmdline_len]
         sub     ecx, ebx
-        imul    ebx, 6
+        imul    ebx, FONT_X_SIZE
-        imul    ecx, 6
+        imul    ecx, FONT_X_SIZE
         inc     ecx
-        add     ebx, cmdline_x_pos
+        add     ebx, CMD_X_POS
         shl     ebx, 16
         or      ebx, ecx
         mov     ecx, [cmdline_y_pos_dd]
-        mov     cx, cmdline_y_size
+        mov     cx, CMD_Y_SIZE
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box for cmdline
         mcall   13
     @@:
         mov     esi, [cmdline_len]
         sub     esi, ebx
-        mov     ecx, COLOR_TXT_NORMAL
+        mov     ecx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
         lea     edx, [cmdline+ebx]
-        imul    ebx, 6
+        imul    ebx, FONT_X_SIZE
-        add     ebx, cmdline_x_pos
+        add     ebx, CMD_X_POS
         shl     ebx, 16
         mov     bx, word[cmdline_y_pos_dd+4]
         inc     bx
         inc     edx
         jmp     .l
     .newline:
         push    edx
-        mov     ecx, messages_width
+        mov     ecx, MSG_WIDTH
         xor     eax, eax
         xchg    eax, edx
         div     ecx
         xchg    eax, edx
         sub     ecx, 4
         jns     .writenibble
         jmp     .l
 test_scroll:
-        cmp     edx, messages_width*messages_height
+        cmp     edx, MSG_WIDTH*MSG_HEIGHT
         jnz     .ret
         push    esi
         mov     edi, messages
-        lea     esi, [edi+messages_width]
+        lea     esi, [edi+MSG_WIDTH]
-        mov     ecx, (messages_height-1)*messages_width/4
+        mov     ecx, (MSG_HEIGHT-1)*MSG_WIDTH/4
         rep movsd
         push    eax
         mov     al, ' '
         push    edi
-        push    messages_width
+        push    MSG_WIDTH
         pop     ecx
         sub     edx, ecx
         rep stosb
         pop     edi
 put_message:
         call    put_message_nodraw
 draw_messages:
         ; draw container rectangle/box
-        mov     ebx, messages_x_pos shl 16
+        mov     ebx, MSG_X_POS shl 16
         add     ebx, [messages_x_size_dd+4]
         mov     ecx, [messages_y_pos_dd]
-        mov     cx, messages_y_size
+        mov     cx, MSG_Y_SIZE
         mcall   13, , , COLOR_BG_NORMAL
         mov     edx, messages
-        push    messages_width
+        push    MSG_WIDTH
         pop     esi
-        mov     ecx, COLOR_TXT_NORMAL
+        mov     ecx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
-        mov     ebx, messages_x_pos*10000h
+        mov     ebx, MSG_X_POS*10000h
         mov     bx, word[messages_y_pos_dd+4]
     @@:
         ; display text string in the window
         mcall   4
         add     edx, esi
-        add     ebx, 10
+        add     ebx, FONT_Y_SIZE+TEXT_Y_CLEARANCE
-        cmp     edx, messages+messages_width*messages_height
+        cmp     edx, messages+MSG_WIDTH*MSG_HEIGHT
         jb      @b
         ret
 ;-----------------------------------------------------------------------------
 ;                     Show/hide cursor in command line
 ; TODO: make it cursor.draw and cursor.hide ???
 draw_cursor:
         mov     ecx, [cmdline_y_pos_dd+2]
-        add     cx, cmdline_y_size-1
+        add     cx, CMD_Y_SIZE-1
         mov     ebx, [cmdline_pos]
-        imul    ebx, 6
+        imul    ebx, FONT_X_SIZE
-        add     ebx, cmdline_x_pos
+        add     ebx, CMD_X_POS
         mov     edx, ebx
         shl     ebx, 16
         or      ebx, edx
-        mov     edx, COLOR_TXT_NORMAL
+        mov     edx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
         ; draw line
         mcall   38
         ret
 hide_cursor:
         mov     ebx, [cmdline_pos]
-        imul    ebx, 6
+        imul    ebx, FONT_X_SIZE
-        add     ebx, cmdline_x_pos
+        add     ebx, CMD_X_POS
         shl     ebx, 16
         inc     ebx
         mov     ecx, [cmdline_y_pos_dd]
-        mov     cx, cmdline_y_size
+        mov     cx, CMD_Y_SIZE
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box
         mcall   13
         mov     ebx, [cmdline_pos]
         cmp     ebx, [cmdline_len]
         jae     .ret
         ; setting up text color scheme and attributes
-        mov     ecx, COLOR_TXT_NORMAL
+        mov     ecx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
         lea     edx, [cmdline+ebx]
-        imul    ebx, 6
+        imul    ebx, FONT_X_SIZE
-        add     ebx, cmdline_x_pos
+        add     ebx, CMD_X_POS
 ; FIXME: something wrong here
 redraw_title:
         ; draw container rectangle/box
         mov     ebx, [data_x_size_dd+4]
-        add     ebx, title_x_pos*10000h+data_x_pos-title_x_pos
+        add     ebx, TITLE_X_POS*10000h+DATA_X_POS-TITLE_X_POS
-        mcall   13, , 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
+        mcall   38, (DATA_X_POS-2)*10000h+TITLE_X_POS-5, (TITLE_Y_POS+(FONT_Y_SIZE/2))*10001h, COLOR_LINE
         push    NoPrgLoaded_len
         pop     esi
         cmp     [debuggee_pid], 0
         jz      @f
         mov     esi, [prgname_len]
     @@:
-        imul    ebx, esi, 6
+        imul    ebx, esi, FONT_X_SIZE
-        add     ebx, title_x_pos+4
+        add     ebx, TITLE_X_POS+4
         shl     ebx, 16
-        mov     bx, data_x_pos-10-5-6*7
+        mov     bx, DATA_X_POS-10-5-FONT_X_SIZE*7
         add     bx, word[data_x_size_dd+4]
         cmp     [bSuspended], 0
         jz      @f
-        add     ebx, 6
+        add     ebx, FONT_X_SIZE
     @@:
         ; draw line with COLOR_LINE (in edx)
         mcall
         mov     ebx, [data_x_size_dd+2]
-        add     ebx, (data_x_pos-10+4)*0x10000 + data_x_pos+2
+        add     ebx, (DATA_X_POS-10+4)*0x10000 + DATA_X_POS+2
         ; draw line with COLOR_LINE (in edx)
         mcall
         mov     al, 4
-        mov     ebx, title_x_pos*10000h+title_y_pos
+        mov     ebx, TITLE_X_POS*10000h+TITLE_Y_POS
         ; setting up text color scheme and attributes
-        mov     ecx, COLOR_TXT_NORMAL
+        mov     ecx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
         ; draw text string in the window
         mcall
         cmp     [debuggee_pid], 0
         jz      .nodebuggee
         mov     ebx, [data_x_size_dd]
-        add     ebx, (data_x_pos-10-6*7)*10000h + title_y_pos
+        add     ebx, (DATA_X_POS-10-FONT_X_SIZE*7)*10000h + TITLE_Y_POS
         mov     edx, aRunning
         push    7
         pop     esi
         cmp     [bSuspended], 0
         jz      @f
-        add     ebx, 6*10000h
+        add     ebx, FONT_X_SIZE*10000h
         mov     edx, aPaused
         dec     esi
     @@:
         ; draw line with COLOR_LINE (in edx) in one case
-        ; and draw text string with color COLOR_TXT_NORMAL (in ecx) in another
+        ; and draw text string with color (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL (in ecx) in another
         mcall
         ret
     .nodebuggee:
         mov     al, 38
         mov     ebx, [data_x_size_dd+2]
-        add     ebx, (data_x_pos-10-6*7-5)*0x10000 + data_x_pos+2
+        add     ebx, (DATA_X_POS-10-FONT_X_SIZE*7-5)*0x10000 + DATA_X_POS+2
-        mov     ecx, (title_y_pos+5)*10001h
+        mov     ecx, (TITLE_Y_POS+(FONT_Y_SIZE/2))*10001h
         mov     edx, COLOR_LINE
         jmp     @b
         mov     ebp, ecx
         mov     eax, [esi]
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .cd
         cmp     [bSuspended], 0
         jz      .cd
-        mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
         cmp     eax, dword [esi+oldcontext-context]
         je      .cd
-        mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_CHANGED or 0x40000000)
 .cd:
         push    eax                       ;store reg value
         mov     esi, ebp
         ; draw a text string in the window
         mcall   4
-        imul    esi, 60000h
+        imul    esi, FONT_X_SIZE*10000h
         lea     edx, [ebx+esi]
         mov     esi, ecx
         pop     ecx
         ; draw a number in the window
         rol     ecx, 16
         shl     dx,4
         loop    .w_exp
 .display:
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .do_label
         cmp     [bSuspended], 0
         jz      .do_label
-        mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
         mov     ax, word [_st0+ebp+8]
         cmp     ax, word [_st0+(oldcontext-context)+ebp+8]
         je      .do_label
 .scol:
-        mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_CHANGED or 0x40000000)
-.do_label:
-        ; draw a text string in the window
 .do_label:
-        mov     eax, 4
+        ; draw a text string in the window
         mov     esi, 23
         mov     edx, .str_buf
         mov     edi, COLOR_BG_NORMAL
-        int     0x40
+        mcall   4
         call    .hex_2_str
         mov     al, ' '
         stosb
         call    .hex_2_str
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .cd
         cmp     [bSuspended], 0
         jz      .cd
-        mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
         mov     eax, dword [_mm0+ebp]
         cmp     eax, dword [_mm0+(oldcontext-context)+ebp]
         jne     .scol
         mov     eax, dword [_mm0+ebp+4]
         cmp     eax, dword [_mm0+(oldcontext-context)+ebp+4]
         je     .cd
 .scol:
-        mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
+.scol:
-.cd:
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_CHANGED or 0x40000000)
-        ; draw a text string in the window
+.cd:
         ; draw a text string in the window
         mov     eax, 4
         mov     esi, 23
         mov     edx, esp
 draw_fpu_regs:
         push    ebp
         push    8
         xor     ebp, ebp
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+142
+        add     ebx, 2*10000h+REGISTERS_Y_POS+14*(TEXT_Y_CLEARANCE+FONT_Y_SIZE)
 .draw_regs:
         call    draw_fpu_register_2
-        add     ebx, 10
+        add     ebx, FONT_Y_SIZE+TEXT_Y_CLEARANCE
         inc     ebp
         dec     dword [esp]
         jnz     .draw_regs
         pop     eax                         ;restore stack
         pop     ebp
 draw_mmx_regs:
         push    ebp
         push    8
         xor     ebp, ebp
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+142
+        add     ebx, 2*10000h+REGISTERS_Y_POS+14*(TEXT_Y_CLEARANCE+FONT_Y_SIZE)
 .draw_regs:
         call    draw_mmx_register_2
-        add     ebx, 10
+        add     ebx, FONT_Y_SIZE+TEXT_Y_CLEARANCE
         inc     ebp
         dec     dword [esp]
         jnz     .draw_regs
         pop     eax
         pop     ebp
 draw_sse_regs:
         push    ebp
         push    8
         xor     ebp, ebp
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+232
+        add     ebx, 2*10000h+REGISTERS_Y_POS+14*(TEXT_Y_CLEARANCE+FONT_Y_SIZE)
 .draw_regs:
      ;   call    draw_sse_register
-        add     ebx, 10
+        add     ebx, FONT_Y_SIZE+TEXT_Y_CLEARANCE
         inc     ebp
         dec     dword [esp]
         jnz     .draw_regs
         pop     eax
         pop     ebp
     .on:
         and     byte [edx], not 20h
     .onoff:
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .doit
         cmp     [bSuspended], 0
         jz      .doit
-        mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
         bt      [_eflags], edi
         lahf
         bt      dword [_eflags + oldcontext - context], edi
         rcl     ah, 1
         test    ah, 3
         jp      .doit
-        mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_CHANGED or 0x40000000)
 ;                      Draw registers frame title
 ; Also show current register set (common + MMX, SSE or AVX)
 draw_reg_title:
         mov     edi, COLOR_BG_NORMAL
-        mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
         mov     esi, 7
         cmp     [reg_mode], REG_MODE_CPU
         jz      @f
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
     @@:
         movzx   edx, [fpu_mode]
         mov     edx, [btn2_tab+edx*4]
         ; draw a text string in the window
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 4*10000h+registers_y_pos+2
+        add     ebx, 4*10000h+REGISTERS_Y_POS
         mcall   4
         cmp     [reg_mode], REG_MODE_SSE
         jz      @f
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
     @@:
         mov     edx, aSSE
         ; draw a text string in the window
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 46*10000h+registers_y_pos+2
+        add     ebx, (7*FONT_X_SIZE+4)*10000h+REGISTERS_Y_POS
         mcall   4
         cmp     [reg_mode], REG_MODE_AVX
         jz      @f
-        mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
     @@:
         mov     edx, aAVX
         ; draw a text string in the window
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 88*10000h+registers_y_pos+2
+        add     ebx, (14*FONT_X_SIZE+4)*10000h+REGISTERS_Y_POS
         mov     esi, _eax
         push    4
         pop     ecx
         mov     edx, regs_strs
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+22
+        add     ebx, 2*10000h+REGISTERS_Y_POS+2*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+32
+        add     ebx, 2*10000h+REGISTERS_Y_POS+3*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _ebx-_eax
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+42
+        add     ebx, 2*10000h+REGISTERS_Y_POS+4*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _ecx-_ebx
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+52
+        add     ebx, 2*10000h+REGISTERS_Y_POS+5*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _edx-_ecx
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+62
+        add     ebx, 2*10000h+REGISTERS_Y_POS+6*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _esi-_edx
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+72
+        add     ebx, 2*10000h+REGISTERS_Y_POS+7*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _edi-_esi
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+82
+        add     ebx, 2*10000h+REGISTERS_Y_POS+8*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _ebp-_edi
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+92
+        add     ebx, 2*10000h+REGISTERS_Y_POS+9*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _esp-_ebp
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+102
+        add     ebx, 2*10000h+REGISTERS_Y_POS+10*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         add     esi, _eip-_esp
         call    draw_register
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 2*10000h+registers_y_pos+112
+        add     ebx, 2*10000h+REGISTERS_Y_POS+11*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         mov     cl, 7
         add     esi, _eflags-_eip
         call    draw_mmx_regs
         jmp     @f
-.fpu:
+  .fpu:
         call    draw_fpu_regs
-@@:
+    @@:
-        mov     ecx, COLOR_TXT_INACTIVE
+        mov     ecx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE
         cmp     [debuggee_pid], 0
         jz      @f
         cmp     [bSuspended], 0
         jz      @f
-        mov     ecx, COLOR_TXT_NORMAL
+        mov     ecx, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
     @@:
         mov     edx, aColon
         xor     esi, esi
         inc     esi
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, 10*10000h+registers_y_pos+122
+        add     ebx, 10*10000h+REGISTERS_Y_POS+12*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         mcall   4
         mov     edx, flags
     @@:
-        add     ebx, 2*6*10000h
+        add     ebx, 2*FONT_X_SIZE*10000h
         call    draw_flag
         inc     edx
         cmp     dl, flags_bits and 0xFF
         jnz     @b
 ;                 Draw all registers sets
 draw_registers:
         ; draw container rectangle/box with COLOR_BG_NORMAL
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, (-1)*10000h+(registers_x_size+2)
+        add     ebx, (-1)*10000h+(REGISTERS_X_SIZE+2)
         mov     ecx, [registers_y_size_dd+4]
-        add     ecx, (registers_y_pos-1)*10000h+2
+        add     ecx, ((TITLE_Y_POS+(FONT_Y_SIZE/2))+1)*10000h+2
         mcall   13, , , COLOR_BG_NORMAL
         call    draw_reg_title
 ;                     Display memory dump
 draw_dump:
         ; draw container rectangle/box in the window
         mov     ebx, [data_x_size_dd+4]
-        add     ebx, data_x_pos*10000h
+        add     ebx, DATA_X_POS*10000h
-        mcall   13, , dump_y_pos*10000h+dump_y_size, COLOR_BG_NORMAL
+        mcall   13, , DUMP_Y_POS*10000h+DUMP_Y_SIZE, COLOR_BG_NORMAL
     .redraw:
         ; addresses
         mov     ebx, 80100h
-        mov     edx, data_x_pos*10000h + dump_y_pos
+        mov     edx, DATA_X_POS*10000h + DUMP_Y_POS
         mov     ecx, [dumppos]
         mov     edi, COLOR_BG_NORMAL
-        mov     esi, (COLOR_TXT_INACTIVE or 0x40000000)
+        mov     esi, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      @f
         cmp     [bSuspended], 0
         jz      @f
-        mov     esi, (COLOR_TXT_NORMAL or 0x40000000)
+        mov     esi, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL or 0x40000000)
     @@:
         ; draw a number in the window
         mcall   47
         add     ecx, 10h
-        add     edx, 10
+        add     edx, FONT_Y_SIZE + TEXT_Y_CLEARANCE
-        cmp     dl, dump_y_pos + dump_y_size
+        cmp     dl, DUMP_Y_POS + DUMP_Y_SIZE
         jb      @b
         ; hex dump of data
         mov     ecx, dumpdata
         push    ecx
         xor     ebx, ebx
-        mov     edx, (data_x_pos+12*6)*10000h + dump_y_pos
+        mov     edx, (DATA_X_POS+12*FONT_X_SIZE)*10000h + DUMP_Y_POS
         cmp     [dumpread], ebx
         jz      .hexdumpdone1
     .hexdumploop1:
         push    ebx
         mov     ebx, 20101h
         ; draw a number in the window
         mcall
         pop     ebx
-        add     edx, 3*6*10000h
+        add     edx, 3*FONT_X_SIZE*10000h
         inc     ecx
         inc     ebx
         test    bl, 15
         jz      .16
         test    bl, 7
         jnz     @f
-        add     edx, 2*6*10000h - 10 + 6*(3*10h+2)*10000h
+        add     edx, 2*FONT_X_SIZE*10000h - (FONT_Y_SIZE+TEXT_Y_CLEARANCE) + FONT_X_SIZE*(3*10h+2)*10000h
     .16:
         xchg    ebx, edx
         push    2
         pop     esi
     .hexdumploop2:
-        cmp     edx, dump_height*10h
+        cmp     edx, DUMP_HEIGHT*10h
         jae     .hexdumpdone2
         push    edx
         mov     edx, aQuests
         ; draw text string with color in ecx, copied from esi
         mcall
         pop     edx
-        add     ebx, 3*6*10000h
+        add     ebx, 3*FONT_X_SIZE*10000h
         inc     edx
         test    dl, 15
         jz      .16x
         test    dl, 7
         jnz     .hexdumploop2
-        add     ebx, 2*6*10000h - 10 + 6*(3*10h+2)*10000h
+        add     ebx, 2*FONT_X_SIZE*10000h - (FONT_Y_SIZE+TEXT_Y_CLEARANCE) + FONT_X_SIZE*(3*10h+2)*10000h
-    .16x:
+  .16x:
-        add     ebx, 10 - 6*(3*10h+2)*10000h
+        add     ebx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE) - FONT_X_SIZE*(3*10h+2)*10000h
         jmp     .hexdumploop2
-    .hexdumpdone2:
+  .hexdumpdone2:
         dec     esi
         ; colon, minus signs
-        mov     ebx, (data_x_pos+8*6)*10000h + dump_y_pos
+        mov     ebx, (DATA_X_POS+8*FONT_X_SIZE)*10000h + DUMP_Y_POS
         mov     edx, aColon
     @@:
         mcall
-        add     ebx, 10
+        add     ebx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
-        cmp     bl, dump_y_pos+dump_height*10
+        cmp     bl, DUMP_Y_POS+DUMP_HEIGHT*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         jb      @b
-        mov     ebx, (data_x_pos+(12+3*8)*6)*10000h + dump_y_pos
+        mov     ebx, (DATA_X_POS+(12+3*8)*FONT_X_SIZE)*10000h + DUMP_Y_POS
         mov     edx, aMinus
     @@:
         mcall
-        add     ebx, 10
+        add     ebx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
-        cmp     bl, dump_y_pos+dump_height*10
+        cmp     bl, DUMP_Y_POS+DUMP_HEIGHT*(FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         jb      @b
         ; ASCII data
-        mov     ebx, (data_x_pos+(12+3*10h+2+2)*6)*10000h + dump_y_pos
+        mov     ebx, (DATA_X_POS+(12+3*10h+2+2)*FONT_X_SIZE)*10000h + DUMP_Y_POS
         pop     edx
     @@:
         ; draw a text string in the window, color in ecx
         mcall
         pop     edx
         inc     edx
-        add     ebx, 6*10000h
+        add     ebx, FONT_X_SIZE*10000h
         dec     dword [esp]
         jz      .asciidone
         test    byte [esp], 15
         jnz     .asciiloop
-        add     ebx, 10 - 6*10h*10000h
+        add     ebx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE) - FONT_X_SIZE*10h*10000h
         jmp     .asciiloop
     .asciidone:
         pop     ecx
     .loop:
         mov     eax, [disasm_cur_pos]
         call    find_symbol
         jc      .nosymb
         mov     ebx, [disasm_cur_str]
-        imul    ebx, 10
+        imul    ebx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         push    ebx
-        lea     ecx, [ebx+disasm_y_pos-1]
+        lea     ecx, [ebx+DISASM_Y_POS-1]
         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]
-        add     ebx, data_x_pos*10000h
+        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
+        add     ebx, (DATA_X_POS+FONT_X_SIZE*2)*10000h+DISASM_Y_POS
         mov     edx, esi
     @@:
         lodsb
         test    al, al
         jnz     @b
         mov     byte [esi-1], ':'
         sub     esi, edx
         ; normal color
         ; was 0x40000000
-        mov     ecx, (COLOR_TXT_LABEL or 0x40000000)
+        mov     ecx, ((FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_LABEL or 0x40000000)
         mov     al, 4
         ; draw a text string in the window with color COLOR_TXT_NORMAL in ecx
         mcall
         mov     byte [esi+edx-1], 0
         shr     ebx, 16
         lea     ebx, [ebx+esi*2]
         shl     ecx, 16
         mov     cl, 10
         imul    ebx, 10001h
-        sub     bx, data_x_pos
+        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
         push    [disasm_cur_pos]
         call    disasm_instr
         pop     ebp
         jc      .loopend
         mov     edx, COLOR_BG_NORMAL
-        mov     esi, COLOR_TXT_NORMAL
+        mov     esi, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_NORMAL
-        mov     ebx, data_x_pos*10000h
+        mov     ebx, DATA_X_POS*10000h
         add     ebx, [data_x_size_dd+4]
         mov     ecx, [disasm_cur_str]
-        imul    ecx, 10*10000h
+        imul    ecx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)*10000h
-        add     ecx, (disasm_y_pos-1)*10000h + 10
+        add     ecx, (DISASM_Y_POS-1)*10000h + (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         mov     eax, ebp
         pushad
         call    find_enabled_breakpoint
         popad
         jnz     .nobp
         mov     edx, COLOR_BG_BREAKPOINT
-        mov     esi, COLOR_TXT_BREAKPOINT
+        mov     esi, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_BREAKPOINT
     .nobp:
         mov     eax, [_eip]
         cmp     eax, ebp
         jnz     .notcurrent
         mov     edx, COLOR_BG_SELECTED
-        mov     esi, COLOR_TXT_SELECTED
+        mov     esi, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_SELECTED
     .notcurrent:
         push    esi     ; Save color value for disassembled text
         ; draw container rectangle/box for disassembled text
         ; color in edx
         mcall   13
         mov     edx, [disasm_cur_str]
-        imul    edx, 10
+        imul    edx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
-        add     edx, data_x_pos*10000h + disasm_y_pos
+        add     edx, DATA_X_POS*10000h + DISASM_Y_POS
         ; draw a number in the window, color in esi
         mcall   47, 80100h, ebp
-        lea     ebx, [edx+8*6*10000h]
+        lea     ebx, [edx+8*FONT_X_SIZE*10000h]
         mov     ecx, esi    ; text color
         push    2
         pop     esi
         mov     edx, aColon
         ; draw the colon
         mcall   4
         push    9
         pop     edi
-        lea     edx, [ebx+2*6*10000h]
+        lea     edx, [ebx+2*FONT_X_SIZE*10000h]
         mov     ecx, ebp
         sub     ecx, [disasm_start_pos]
         add     ecx, disasm_buffer
-        mov     esi, COLOR_TXT_HEX
+        mov     esi, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_HEX
         mov     eax, [_eip]
         cmp     eax, ebp
         jnz     @f
-        mov     esi, COLOR_TXT_SELECTED
+        mov     esi, (FONT and 11b) shl 28 or ((FONT_MULTIPLIER - 1) and 111b) shl 24 or COLOR_TXT_SELECTED
   @@:
     .drawhex:
         ; draw a number in the window, color in esi
         mcall   47, 20101h
-        add     edx, 6*3*10000h
+        add     edx, FONT_X_SIZE*3*10000h
         dec     esi
         cmp     esi, ebp
         pop     esi
         jbe     .drawhex
-        lea     ebx, [edx-6*10000h]
+        lea     ebx, [edx-FONT_X_SIZE*10000h]
         ; copy color value from esi
         mov     ecx, esi
         push    3
         pop     esi
         repnz scasb
         not     ecx
         dec     ecx
         xchg    ecx, esi
         mov     ebx, [disasm_cur_str]
-        imul    ebx, 10
+        imul    ebx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
-        add     ebx, (data_x_pos+6*40)*10000h+disasm_y_pos
+        add     ebx, (DATA_X_POS+FONT_X_SIZE*40)*10000h+DISASM_Y_POS
         ; draw a text string in the window, color in ecx
         mcall   4
         inc     [disasm_cur_str]
     .loopend:
         mov     ecx, [disasm_height_dd]
         sub     ecx, [disasm_cur_str]
         jz      @f
-        imul    ecx, 10
+        imul    ecx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         inc     ecx
-        mov     eax, disasm_y_pos
+        mov     eax, DISASM_Y_POS
         add     eax, [disasm_y_size_dd+4]
         sub     eax, ecx
         shl     eax, 16
         add     ecx, eax
         ; Draw filled rectangle
         mov     ebx, [data_x_size_dd+4]
-        add     ebx, data_x_pos*10000h
+        add     ebx, DATA_X_POS*10000h
         mcall   13, , , COLOR_BG_NORMAL
         add     esi, ebx
         mcall   67, -1, -1      ; set the new sizes
         ; (re)calculate coordinates of GUI elements
         mov     eax, [thread_info.client_box.width]
-        sub     eax, data_x_pos + data_x_pos + registers_x_size+3
+        sub     eax, DATA_X_POS + DATA_X_POS + REGISTERS_X_SIZE+3
         mov     [data_x_size_dd+4], eax
         mov     [messages_x_size_dd+4], eax
         shl     eax, 16
         mov     [data_x_size_dd], eax
         mov     [messages_x_size_dd], eax
         shr     eax, 16
-        add     eax, data_x_pos + 4
+        add     eax, DATA_X_POS + 4
         mov     [registers_x_pos_dd+4], eax
         shl     eax, 16
         mov     [registers_x_pos_dd], eax
         mov     eax, [thread_info.client_box.height]
-        sub     eax, cmdline_y_size + data_x_pos
+        sub     eax, CMD_Y_SIZE + DATA_X_POS
         mov     [cmdline_y_pos_dd+4], eax
         shl     eax, 16
         mov     [cmdline_y_pos_dd], eax
         shr     eax, 16
-        sub     eax, messages_y_size + 4
+        sub     eax, MSG_Y_SIZE + 4
         mov     [messages_y_pos_dd+4], eax
         shl     eax, 16
         mov     [messages_y_pos_dd], eax
         shr     eax, 16
-        sub     eax, disasm_y_pos + 4
+        sub     eax, DISASM_Y_POS + 4
         mov     [disasm_y_size_dd+4], eax
         shl     eax, 16
         mov     [disasm_y_size_dd], eax
         shr     eax, 16
-        mov     ecx, 10
+        mov     ecx, (FONT_Y_SIZE+TEXT_Y_CLEARANCE)
         xor     edx, edx
         div     ecx
         mov     [disasm_height_dd], eax
         mov     eax, [thread_info.client_box.height]
-        sub     eax, data_x_pos + registers_y_pos-1
+        sub     eax, DATA_X_POS + TITLE_Y_POS+(FONT_Y_SIZE/2)+2
         mov     [registers_y_size_dd+4], eax
         shl     eax, 16
         mov     [registers_y_size_dd], eax
         ; messages frame
         mov     ebx, [messages_x_size_dd+4]
-        add     ebx, (messages_x_pos-2)*10000h + (messages_x_pos+2)
+        add     ebx, (MSG_X_POS-2)*10000h + (MSG_X_POS+2)
         push    ebx
         mov     ecx, [messages_y_pos_dd+2]
         add     ecx, -2*10001h
         mov     edx, COLOR_LINE
         mcall   38
-        add     ecx, (messages_y_size+2+2)*10001h
+        add     ecx, (MSG_Y_SIZE+2+2)*10001h
         mcall
-        mov     ebx, (messages_x_pos-2)*10001h
+        mov     ebx, (MSG_X_POS-2)*10001h
         push    ebx
         mov     ecx, [messages_y_pos_dd+2]
-        add     ecx, (-2*10000h) + (messages_y_size+2)
+        add     ecx, (-2*10000h) + (MSG_Y_SIZE+2)
         mcall
         mov     ebx, [messages_x_size_dd+2]
-        add     ebx, (messages_x_pos+2)*10001h
+        add     ebx, (MSG_X_POS+2)*10001h
         push    ebx
         mcall
         ; command line frame
         mov     ecx, [cmdline_y_pos_dd+2]
-        add     ecx, (-2*10000h) + (cmdline_y_size+2)
+        add     ecx, (-2*10000h) + (CMD_Y_SIZE+2)
         pop     ebx
         mcall
         pop     ebx
         mcall
         pop     ebx
         mov     ecx, [cmdline_y_pos_dd+2]
-        add     ecx, (cmdline_y_size+2)*10001h
+        add     ecx, (CMD_Y_SIZE+2)*10001h
         mcall
         mov     ecx, [cmdline_y_pos_dd+2]
         add     ecx, (-2*10001h)
         mcall
         ; registers frame
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, (-2) shl 16 + (registers_x_size+3)
+        add     ebx, (-2) shl 16 + (REGISTERS_X_SIZE+3)
-        mov     ecx, (registers_y_pos-2) shl 16 + 1
+        mov     ecx, (TITLE_Y_POS+(FONT_Y_SIZE/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
+        add     ebx, ((-2)+(REGISTERS_X_SIZE+3)) shl 16 + 1
         mov     ecx, [registers_y_size_dd+4]
-        add     ecx, (registers_y_pos-2) shl 16 + (+3+1)
+        add     ecx, (TITLE_Y_POS+(FONT_Y_SIZE/2)) shl 16 + (+3+1)
         mcall                           ; right
         mov     ebx, [registers_x_pos_dd]
-        add     ebx, (-2) shl 16 + (registers_x_size+3)
+        add     ebx, (-2) shl 16 + (REGISTERS_X_SIZE+3+1)
         mov     ecx, [registers_y_size_dd]
-        add     ecx, ((registers_y_pos-2)+(+3)) shl 16 + 1
+        add     ecx, ((TITLE_Y_POS+(FONT_Y_SIZE/2))+4) shl 16 + 1
         mcall                           ; bottom
         ; messages
         call    draw_messages
         ; command line & cursor
         call    draw_cmdline
         call    draw_cursor
         ; title & registers & dump & disasm
-        mov     ebx, (data_x_pos-2)*10001h
+        mov     ebx, (DATA_X_POS-2)*10001h
-        mov     ecx, (title_y_pos+5)*10000h + (-2)
+        mov     ecx, (TITLE_Y_POS+(FONT_Y_SIZE/2))*10000h + (-2)
         add     ecx, [messages_y_pos_dd+4]
         mov     edx, COLOR_LINE
         mcall   38
         mov     ebx, [data_x_size_dd+2]
-        add     ebx, (data_x_pos+2)*10001h
+        add     ebx, (DATA_X_POS+2)*10001h
         mcall

Subversion Repositories Kolibri OS

(root)/programs/develop/mtdbg/gui.inc – Rev 7675 → 7677