diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 94b3ba5775..cf13fd8784 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -371,7 +371,7 @@ void main() break; } - if (TestBit(key_modifier, 2)) + if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) { switch(key_scancode) { diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 591195b447..58f9f719cd 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -84,6 +84,18 @@ char program_path[4096]; #define SCAN_CODE_PGDN 081 #define SCAN_CODE_PGUP 073 +#define KEY_LSHIFT 00000000001b +#define KEY_RSHIFT 00000000010b +#define KEY_LCTRL 00000000100b +#define KEY_RCTRL 00000001000b +#define KEY_LALT 00000010000b +#define KEY_RALT 00000100000b +#define KEY_CAPSLOCK 00001000000b +#define KEY_NUMLOCK 00010000000b +#define KEY_SCROLLLOCK 00100000000b +#define KEY_LWIN 01000000000b +#define KEY_RWIN 10000000000b + inline fastcall word GetKey() //+Gluk fix { diff --git a/programs/cmm/pixie/pixie.c b/programs/cmm/pixie/pixie.c index bb498bf97a..8990562917 100644 --- a/programs/cmm/pixie/pixie.c +++ b/programs/cmm/pixie/pixie.c @@ -20,6 +20,11 @@ od_filter filter2 = { "MP3", 0 }; #include "..\lib\patterns\libimg_load_skin.h" +#define ABOUT_MESSAGE "'Pixies Player v1.31\n\nOpen file: O key\nChange skin: F1/F2 +Play/Stop: Space or P key\nStart playing selected file: Enter +Goto next/previous track: Ctrl + Left/Right +Change sound volume: Left/Right key\nMute: M key' -St\n" + scroll_bar scroll1 = { 5,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1}; llist list; proc_info Form; @@ -133,9 +138,7 @@ void main() if (mouse.vert) if (list.MouseScroll(mouse.vert)) DrawPlayList(); if (mouse.dblclick) {current_playing_file_n=list.current; StartPlayingMp3();} if (mouse.down) && (mouse.key&MOUSE_LEFT) if (list.ProcessMouse(mouse.x, mouse.y)) DrawPlayList(); - if (mouse.down) && (mouse.key&MOUSE_RIGHT) NotifyAndBackFocus( - "'Pixies Player v1.3\n\nOpen file: O key\nChange skin: F1/F2\nPlay/Stop: Space or P key\nStart playing selected file: Enter\nChange sound volume: Left/Right key\nMute: M key' -St\n" - ); + if (mouse.down) && (mouse.key&MOUSE_RIGHT) NotifyAndBackFocus(ABOUT_MESSAGE); } //drag window - emulate windows header if(mouse.key&MOUSE_LEFT) && (mouse.y