git-svn-id: svn://kolibrios.org@803 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/trunk/docs/sysfuncr.txt

@@ -621,10 +621,11 @@
   * eax = 17 - <20><><EFBFBD><EFBFBD><EFBFBD> <20>㭪樨
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD>:
   * <20>᫨ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><E9A0A5><EFBFBD> eax=1
-  * <20>᫨ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><E9A0A5><EFBFBD> al=0, <20><><EFBFBD><EFBFBD>訥 24 <20><><EFBFBD><EFBFBD> eax
+  * <20>᫨ <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ⮣<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><E9A0A5><EFBFBD>:  <20><><EFBFBD><EFBFBD>訥 24 <20><><EFBFBD><EFBFBD> eax
     ᮤ<>ঠ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><><EFBFBD>⭮<EFBFBD><E2ADAE><EFBFBD>, <20> ah <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD>
     <20><><EFBFBD><EFBFBD>訩 <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD><EFBFBD>; <20>᫨ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD>,
-    <20><><EFBFBD><EFBFBD>訩 256, <20><> <20><><EFBFBD> ࠧ<><E0A0A7>祭<EFBFBD><E7A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>筮 ah)
+    <20><><EFBFBD><EFBFBD>訩 256, <20><> <20><><EFBFBD> ࠧ<><E0A0A7>祭<EFBFBD><E7A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>筮 ah),
+    <20> <20> al <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD><E9A0A5><EFBFBD> 0 - <20>᫨ <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> ⮩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>砭<EFBFBD><EFBFBD>:
   * "<22><><EFBFBD><EFBFBD><EFBFBD>" <20>࠭<EFBFBD><E0A0AD> ⮫쪮 <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⨨ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     <20><><EFBFBD><EFBFBD>ଠ<EFBFBD><E0ACA0><EFBFBD> <20> <20><><EFBFBD>ன <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.

kernel/trunk/docs/sysfuncs.txt

@@ -613,10 +613,11 @@ Parameters:
   * eax = 17 - function number
 Returned value:
   * if the buffer is empty, function returns eax=1
-  * if the buffer is not empty, function returns al=0,
+  * if the buffer is not empty, function returns:
     high 24 bits of eax contain button identifier (in particular, ah
     contains low byte of the identifier; if all buttons have
-    the identifier less than 256, ah is enough to distinguish).
+    the identifier less than 256, ah is enough to distinguish),
+    and al contain 0 - if used left mouse button or bit of the used another mouse button
 Remarks:
   * "Buffer" keeps only one button, at pressing the new button the
     information about old is lost.

kernel/trunk/gui/button.inc

@@ -563,6 +563,13 @@ checkbuttons:
     call negativebutton
 
     pushad
+; // Alver 22.06.2008 // {
+    push  eax
+    mov  al, byte [BTN_DOWN]
+    mov  byte [btn_down_determ], al
+    pop  eax
+; } \\ Alver \\
+
   cbwaitmouseup:
 
     call  checkidle
@@ -586,6 +593,7 @@ iglobal
     mx dw 0x0 ; keeps the x mouse's position when it was clicked
     my dw 0x0 ; keeps the y mouse's position when it was clicked
     bPressedMouseXY_B db 0x0
+    btn_down_determ     db 0x0        ; << // Alver 22.06.2008// <<
 endg
 
    pusha

kernel/trunk/gui/font.inc

@@ -7,6 +7,14 @@
 
 $Revision$
 
+; // Alver 22.06.2008 // {
+align 4
+dtext_asciiz_esi:                          ; for skins title out
+    push eax
+    xor eax, eax
+    inc eax
+    jmp    dtext.1
+; } \\ Alver \\
 
 align 4
 dtext:  ; Text String Output (rw by Johnny_B[john@kolibrios.org])
@@ -19,6 +27,11 @@ dtext:  ; Text String Output (rw by Johnny_B[john@kolibrios.org])
         ; edx start of text
         ; edi 1 force
 
+; // Alver 22.06.2008 // {
+       push eax
+        xor     eax, eax
+.1:
+; } \\ Alver \\
         pushad
         call    [disable_mouse]
 
@@ -37,6 +50,12 @@ dtext:  ; Text String Output (rw by Johnny_B[john@kolibrios.org])
 .test_asciiz:
         cmp     byte [edx], 0
         jz      .end
+; // Alver 22.06.2008 // {
+        cmp byte [esp+28], 1
+        jne   @f
+        dec     esi
+        js        .end
+; } \\ Alver \\
 @@:
         inc     edx
         pushad
@@ -109,4 +128,5 @@ dtext:  ; Text String Output (rw by Johnny_B[john@kolibrios.org])
         jmp     .loop
 .end:
         popad
+        pop  eax                ; << // Alver 22.06.2008 // <<
         ret

kernel/trunk/kernel.asm

@@ -2515,6 +2515,10 @@ sys_getbutton:
 	jz	.exit
 	mov	eax, [BTN_BUFF]
 	shl	eax, 8
+; // Alver 22.06.2008 // {
+        mov       al, byte [btn_down_determ]
+        and       al,0xFE                                       ; delete left button bit
+; } \\ Alver \\
 	mov	[BTN_COUNT], byte 0
 	mov	[esp + 32], eax
 .exit:
@@ -2925,7 +2929,10 @@ draw_window_caption:
 	mov	ecx,[common_colours+16];0x00FFFFFF
 	or	ecx, 0x80000000
 	xor	edi,edi
-	call	dtext
+; // Alver 22.06.2008 // {
+;	call	dtext
+        call dtext_asciiz_esi
+; } \\ Alver \\
 
     @@:
 ;--------------------------------------------------------------