WebSVN – Kolibri OS – Path Comparison – / – /programs/cmm/lib/ Rev 5778 and /programs/cmm/lib/ Rev 5779

Compare Revisions

 /programs/cmm/lib/kolibri.h
 ,12 → 103,24
                 $shr eax,8
 }
 unsigned char key_ascii;
 dword key_scancode, key_modifier;
 int GetKeys()
 {
+                $push edx
+GETKEY:
         $mov  eax,2
         $int  0x40
+                $cmp eax,1
+                $jne GETKEYI
+                $mov eax,edx
+                $jmp GETKEYII
+GETKEYI:
+                $mov edx,eax
+                $jmp GETKEY
+GETKEYII:
+                $pop edx
         key_ascii = AH;
         $shr  eax,16
         key_scancode = AL;

 /programs/cmm/lib/list_box.h
 ,10 → 10,11
 struct llist
 {
         int x, y, w, h, line_h, text_y;
+        int count, visible, first, current, column_max; //visible = row_max
         dword font_w, font_h, font_type;
-        int count, visible, first, current, column_max; //visible = row_max
-        int wheel_size;
-        int active;
+        byte wheel_size;
+        byte active;
+        byte no_selection;
         void ClearList();
         int MouseOver(int xx, yy);
         int ProcessMouse(int xx, yy);
 ,7 → 126,7
 int llist::KeyDown()
 {
-        if (current-first+1<visible)
+        if (current-first+1<visible) && (!no_selection)
         {
                 if (current + 1 >= count) return 0;
                 current++;
 ,7 → 147,7
 int llist::KeyUp()
 {
-        if (current > first)
+        if (current > first) && (!no_selection)
         {
                 current--;
         }