Melhoria na fonte

Author: humbertotecnologia

Distro/Linux64/Plataformas/8086/Font.hfn

@@ -9,6 +9,7 @@ Structure VideoMode
     Dim DrawEllipse as Action(Of VideoMode, UInt16, UInt16, UInt16, UInt16, UInt16, UInt16)
     Dim DrawLine as Action(Of VideoMode, UInt16, UInt16, UInt16, UInt16, UInt16)
     Dim ClearScreen as Action(Of VideoMode, UInt16)
+    Dim Refresh as Action(Of VideoMode, UInt16)
 End
 
 Structure Size
@@ -29,6 +30,17 @@ Structure Font
     Dim CalcSize as Action(Of Font, PtrByteArray, Size, UInt16, UInt16)
 End
 
+Structure FontChar
+    Dim Char as PtrByteArray
+    Dim CharX as PtrByteArray
+    Dim Above as PtrByteArray
+    Dim AboveX as PtrByteArray
+    Dim Below as PtrByteArray
+    Dim BelowX as PtrByteArray
+    Dim HasAbove as UInt8
+    Dim HasBellow as UInt8
+End
+
 Module Graphics
     Dim Active as UInt16
     Dim Video as VideoMode
@@ -118,6 +130,11 @@ Module Graphics
         Font.Initialize
     End
 
+    Public Sub Refresh()
+        If Active == 0 Then Throw AccessDeniedError
+        Video.Refresh.Invoke
+    End
+
 End
 
 Module GenericVideo
@@ -317,10 +334,62 @@ Module Font
         Return ptrChar
     End
 
+    Function ConvertCharToFont(font as Font, char as FontChar, text as PtrByteArray, pos as UInt16) as UInt16
+        Dim index as UInt16
+        Dim aboveIndex as UInt16
+        Dim belowIndex as UInt16
+
+        index = 0
+        aboveIndex = 0
+        belowIndex = 0
+        @text = @text + pos
+
+        If (text >= 0x30) AndAlso (text <= 0x39) Then 
+            index = text - 0x30 + 2
+            Goto charfontend
+        End
+        If (text >= 0x41) AndAlso (text <= 0x5a) Then 
+            index = text - 0x41 + 12
+            Goto charfontend
+        End
+        If (text >= 0x61) AndAlso (text <= 0x7a) Then 
+            index = text - 0x61 + 38
+            Goto charfontend
+        End
+        If text == 0x20 Then 
+            index = 1
+            Goto charfontend
+        End
+        If text == 0xc3 Then
+            @text++
+            pos++
+            If text == 0xb3 Then 
+                index = 26
+                aboveIndex = 74
+                Goto charfontend
+            End
+        End
+        charfontend:
+        If aboveIndex <> 0 Then
+            char.HasAbove = 1
+            char.Above = FindChar(font, aboveIndex)
+        Else
+            char.HasAbove = 0
+        End
+        If belowIndex <> 0 Then
+            char.HasBellow = 1
+            char.Below = FindChar(font, belowIndex)
+        Else
+            char.HasBellow = 0
+        End
+        char.Char = FindChar(font, index)
+        pos++
+        Return pos
+    End
+
     Sub DrawText(font as Font, text as PtrByteArray, x1 as UInt16, y1 as UInt16, x2 as UInt16, y2 as UInt16, color as UInt16, multiline as UInt16)
         Dim ptrChar as PtrByteArray
         Dim len as UInt16
-        Dim index as UInt16
         Dim width as UInt16
         Dim maxBytes as UInt16
         Dim subWidth as UInt16
@@ -333,22 +402,16 @@ Module Font
         Dim yCalc as UInt16
         Dim xCalc as UInt16
         Dim tmp as UInt16
-        Dim useAbove as UInt16
-        Dim useBelow as UInt16
         Dim totalWidth as UInt16
+        Dim fontChar as FontChar
+        fontChar = New
         totalWidth = x2 - x1
         len = String.Length(text)
-        @text++
         x = 0
-        For pos = 1 to len
-            useAbove = 0
-            useBelow = 0
-            index = 0
-            If (text >= 0x30) andalso (text <= 0x39) Then index = text - 0x30 + 2
-            If (text >= 0x41) andalso (text <= 0x5a) Then index = text - 0x41 + 12
-            If (text >= 0x61) andalso (text <= 0x7a) Then index = text - 0x61 + 12
-            If text == 0x20 Then index = 1
-            ptrChar = FindChar(font, index)
+        pos = 1
+        While pos <= len
+            pos = ConvertCharToFont(font, fontChar, text, pos)
+            ptrChar = fontChar.Char
             width = ptrChar
             @ptrChar++
             extraOffset = ptrChar
@@ -386,14 +449,12 @@ Module Font
                 End
             End
             x = x + width + font.Spacing
-            @text++
         End
     End
 
     Sub CalcSize(font as Font, text as PtrByteArray, output as Size, totalWidth as UInt16, multiline as UInt16)
         Dim ptrChar as PtrByteArray
         Dim len as UInt16
-        Dim index as UInt16
         Dim width as UInt16
         Dim maxBytes as UInt16
         Dim subWidth as UInt16
@@ -409,18 +470,16 @@ Module Font
         Dim useAbove as UInt16
         Dim useBelow as UInt16
         Dim newLine as UInt16
+        Dim fontChar as FontChar
+        fontChar = New
         newLine = 0
         len = String.Length(text)
-        @text++
         x = 0
         output.Height = font.Height
-        For pos = 1 to len
-            index = 0
-            If (text >= 0x30) andalso (text <= 0x39) Then index = text - 0x30 + 2
-            If (text >= 0x41) andalso (text <= 0x5a) Then index = text - 0x41 + 12
-            If (text >= 0x61) andalso (text <= 0x7a) Then index = text - 0x61 + 12
-            If text == 0x20 Then index = 1
-            ptrChar = FindChar(font, index)
+        pos = 1
+        While pos <= len
+            pos = ConvertCharToFont(font, fontChar, text, pos)
+            ptrChar = fontChar.Char
             width = ptrChar
             If (x + width) > totalWidth Then
                 If multiline Then
@@ -434,7 +493,6 @@ Module Font
             End
             x = x + width + font.Spacing
             If newLine == 0 Then output.Width = x
-            @text++
         End
     End
 End

Distro/Linux64/Plataformas/8086/System.Drawing.hcb

@@ -270,14 +270,14 @@ Module Control
     Public Sub Focus(ctrl as Control)
         Dim old as Control
         old = Application.CurrentFocus
+        Application.CurrentFocus = ctrl
+        ctrl.HasFocus = 1
+        ctrl.ControlFocusChanged.Invoke 1
         If #old <> 0 Then 
             old.HasFocus = 0
             old.ControlFocusChanged.Invoke 0
             If old.RedrawOnFocusChanged Then Redraw old
         End
-        Application.CurrentFocus = ctrl
-        ctrl.HasFocus = 1
-        ctrl.ControlFocusChanged.Invoke 1
         If ctrl.RedrawOnFocusChanged Then Redraw ctrl
     End
 
@@ -312,6 +312,8 @@ Module Control
     Public Sub Show(ctrl as Control)
         If ctrl.HasParent == 0 Then
             Add Screen.ScreenControl, ctrl
+            Application.CurrentFocus = ctrl
+            Application.CurrentFocusForm = ctrl
         End
         ctrl.Visible = 1
         Dim parent as Control
@@ -495,11 +497,13 @@ Module Form
         leftText = ctrl.CalcX1 + ((ctrl.CalcWidth - size.Width) SHR 1)
         rightText = ctrl.CalcX2 - ((ctrl.CalcWidth - size.Width) SHR 1)
         Graphics.DrawText fnt, ctrl.Text, leftText, ctrl.CalcY1+1, rightText, ctrl.CalcY1+1+fnt.Height, SystemColors.WindowTitleColor(), 0
-        For i = ctrl.CalcY1 + 4 to ctrl.CalcY1 + fnt.Height - 3
-            Graphics.DrawLine ctrl.CalcX1 + 2, i, ctrl.CalcX1 + 3, i, SystemColors.WindowBorderColor()
-            Graphics.DrawLine ctrl.CalcX1 + 13, i, leftText - 5, i, SystemColors.WindowBorderColor()
-            Graphics.DrawLine rightText + 4, i, ctrl.CalcX2 - 2, i, SystemColors.WindowBorderColor()
-            i++
+        If (#ctrl == #Application.CurrentFocusForm) And (@ctrl == @Application.CurrentFocusForm) Then
+            For i = ctrl.CalcY1 + 4 to ctrl.CalcY1 + fnt.Height - 3
+                Graphics.DrawLine ctrl.CalcX1 + 2, i, ctrl.CalcX1 + 3, i, SystemColors.WindowBorderColor()
+                Graphics.DrawLine ctrl.CalcX1 + 13, i, leftText - 5, i, SystemColors.WindowBorderColor()
+                Graphics.DrawLine rightText + 4, i, ctrl.CalcX2 - 2, i, SystemColors.WindowBorderColor()
+                i++
+            End
         End
         Graphics.DrawRectangle ctrl.CalcX1 + 5, ctrl.CalcY1 + 4, ctrl.CalcX1 + 11, ctrl.CalcY1 + fnt.Height -3, SystemColors.WindowBorderColor(),SystemColors.WindowColor()
         ctrl.PaddingTop = 2 + fnt.Height

Distro/Linux64/Plataformas/8086/System.Forms.hcb

@@ -43,7 +43,45 @@ dw wmai
 dw xmai
 dw ymai
 dw zmai ' 37
-
+dw amai ' 38
+dw bmai
+dw cmai
+dw dmai
+dw emai
+dw fmai
+dw gmai
+dw hmai
+dw imai
+dw jmai
+dw kmai
+dw lmai
+dw mmai
+dw nmai
+dw omai
+dw pmai
+dw qmai
+dw rmai
+dw smai
+dw tmai
+dw umai
+dw vmai
+dw wmai
+dw xmai
+dw ymai
+dw zmai ' 63
+dw agudo ' 64
+dw grave ' 65
+dw agudo_duplo ' 66
+dw grave_duplo ' 67
+dw til ' 68
+dw circunflexo ' 69
+dw macron ' 70
+dw braquia ' 71
+dw braquia_invertida ' 72
+dw caron ' 73
+dw anel ' 74
+dw cedilha ' 75
+dw gancho_polaco ' 76
 
 nome:
     db .fim - $ 
@@ -433,4 +471,89 @@ db 0b00001000
 db 0b00010000
 db 0b00100000
 db 0b01000000
-db 0b11111110
+db 0b11111110
+
+
+agudo:
+db 2, 0
+db 0b01000000
+db 0b10000000
+db 0b00000000
+
+grave:
+db 2, 0
+db 0b10000000
+db 0b01000000
+db 0b00000000
+
+agudo_duplo:
+db 5, 0
+db 0b01001000
+db 0b10010000
+db 0b00000000
+
+grave_duplo:
+db 5, 0
+db 0b10010000
+db 0b01001000
+db 0b00000000
+
+til:
+db 5, 0
+db 0b01001000
+db 0b10110000
+db 0b00000000
+
+circunflexo:
+db 3, 0
+db 0b01000000
+db 0b10100000
+db 0b00000000
+
+macron:
+db 3, 0
+db 0b00000000
+db 0b11100000
+db 0b00000000
+
+braquia:
+db 4, 0
+db 0b10010000
+db 0b01100000
+db 0b00000000
+
+braquia_invertida:
+db 4, 0
+db 0b01100000
+db 0b10010000
+db 0b00000000
+
+caron:
+db 3, 0
+db 0b10100000
+db 0b01000000
+db 0b00000000
+
+trema:
+db 3, 0
+db 0b00000000
+db 0b10100000
+db 0b00000000
+
+anel:
+db 4, 0
+db 0b01100000
+db 0b10010000
+db 0b01100000
+
+cedilha:
+db 3, 0
+db 0b00100000
+db 0b10010000
+db 0b01100000
+
+gancho_polaco:
+db 3, 0
+db 0b01000000
+db 0b10010000
+db 0b01100000