Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fix mousecfg (thanks tsdima for report)

Browse Source 
git-svn-id: svn://kolibrios.org@7248 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-04-20 20:42:48 +00:00
parent 28837dd7d7
commit 642bfaad85
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/cmm/lib/keyboard.h
View File

@ -52,6 +52,11 @@
#define SCAN_CODE_KEY_P 025 #define SCAN_CODE_KEY_P 025
#define SCAN_CODE_KEY_R 019 #define SCAN_CODE_KEY_R 019
#define SCAN_CODE_KEY_S 031 #define SCAN_CODE_KEY_S 031
#define SCAN_CODE_KEY_V 047
#define SCAN_CODE_KEY_X 045
#define SCAN_CODE_KEY_Y 021
#define SCAN_CODE_KEY_Z 044
#define KEY_LSHIFT 00000000001b #define KEY_LSHIFT 00000000001b
#define KEY_RSHIFT 00000000010b #define KEY_RSHIFT 00000000010b

22
programs/cmm/mousecfg/mousecfg.c
View File

@ -40,7 +40,6 @@ block mouse_frame = { 18, 18, NULL, 130 };
more_less_box pointer_speed = { NULL, 0, 64, POINTER_SPEED }; more_less_box pointer_speed = { NULL, 0, 64, POINTER_SPEED };
more_less_box acceleration = { NULL, 0, 64, ACCELERATION_TEXT }; more_less_box acceleration = { NULL, 0, 64, ACCELERATION_TEXT };
more_less_box double_click_delay = { NULL, 0, 999, DOUBLE_CLICK_TEXT, 8 }; more_less_box double_click_delay = { NULL, 0, 999, DOUBLE_CLICK_TEXT, 8 };
checkbox emulation = { MOUSE_EMULATION, NULL }; checkbox emulation = { MOUSE_EMULATION, NULL };
checkbox madmouse = { MADMOUSE, NULL }; checkbox madmouse = { MADMOUSE, NULL };
@ -49,12 +48,12 @@ raw_image panels_img = { 59, 101, #panels_img_data };
_ini ini = { "/sys/settings/system.ini", "mouse" }; _ini ini = { "/sys/settings/system.ini", "mouse" };
dword click_status;
void main() { void main() {
char id; char id;
int click_status;
load_dll(libini, #lib_init,1); load_dll(libini, #lib_init,1);
load_dll(boxlib, #box_lib_init,0); load_dll(boxlib, #box_lib_init,0);
@ -71,11 +70,11 @@ void main() {
if (mouse.key&MOUSE_LEFT) click_status = 1; if (mouse.key&MOUSE_LEFT) click_status = 1;
if (mouse.key&MOUSE_RIGHT) click_status = 2; if (mouse.key&MOUSE_RIGHT) click_status = 2;
if (mouse.key&MOUSE_CENTER) click_status = 3; if (mouse.key&MOUSE_CENTER) click_status = 3;
DrawMouseImage(click_status); DrawMouseImage();
} }
if (mouse.up) { if (mouse.up) {
click_status=0; click_status=0;
DrawMouseImage(click_status); DrawMouseImage();
} }
break; break;
@ -116,20 +115,19 @@ void main() {
} }
void DrawMouseImage(dword status) { void DrawMouseImage() {
_PutImage(mouse_frame.x+30, mouse_frame.y + 15, panels_img.w, panels_img.h, _PutImage(mouse_frame.x+30, mouse_frame.y + 15, panels_img.w, panels_img.h,
status * panels_img.w * panels_img.h * 3 + panels_img.data); click_status * panels_img.w * panels_img.h * 3 + panels_img.data);
} }
void DrawControls() { void DrawControls() {
int x = mouse_frame.x;
incn y; incn y;
y.n = mouse_frame.y+115; y.n = mouse_frame.y+115;
pointer_speed.draw(x, y.inc(30)); pointer_speed.draw(mouse_frame.x, y.inc(30));
acceleration.draw(x, y.inc(30)); acceleration.draw(mouse_frame.x, y.inc(30));
double_click_delay.draw(x, y.inc(30)); double_click_delay.draw(mouse_frame.x, y.inc(30));
emulation.draw(x, y.inc(33)); emulation.draw(mouse_frame.x, y.inc(33));
madmouse.draw(x, y.inc(27)); madmouse.draw(mouse_frame.x, y.inc(27));
} }
void LoadCfg() { void LoadCfg() {