KolibriOS/kolibrios
13
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

SDL: Fixed cursor freezing in some cases.

Browse Source 
git-svn-id: svn://kolibrios.org@9961 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2024-01-14 05:54:27 +00:00
parent 59b6eb6013
commit dd61eaf93d
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
contrib/sdk/sources/SDL-1.2.2_newlib/src/video/kolibrios/SDL_kolibri_events.c
View File

@ -137,8 +137,6 @@ void kos_PumpEvents(_THIS)
SDL_keysym key; SDL_keysym key;
static int ext_code = 0; static int ext_code = 0;
static uint8_t old_mode = 0; static uint8_t old_mode = 0;
// static uint32_t old_mouse_but = 0;
static uint32_t mouse_but = 0;
while (1) { while (1) {
kos_event = _ksys_check_event(); kos_event = _ksys_check_event();
@ -189,6 +187,8 @@ void kos_PumpEvents(_THIS)
if (_ksys_get_button() == 1) exit(0); if (_ksys_get_button() == 1) exit(0);
break; break;
case KSYS_EVENT_MOUSE: { case KSYS_EVENT_MOUSE: {
static uint32_t old_mouse_but = 0;
mouse_pos = _ksys_get_mouse_pos(KSYS_MOUSE_WINDOW_POS); mouse_pos = _ksys_get_mouse_pos(KSYS_MOUSE_WINDOW_POS);
if (mouse_pos.x >= 0 && mouse_pos.x < this->hidden->win_size_x && if (mouse_pos.x >= 0 && mouse_pos.x < this->hidden->win_size_x &&
mouse_pos.y >= 0 && mouse_pos.y < this->hidden->win_size_y || mouse_pos.y >= 0 && mouse_pos.y < this->hidden->win_size_y ||
@ -205,26 +205,33 @@ void kos_PumpEvents(_THIS)
SDL_PrivateMouseMotion(0, 0, mouse_pos.x, mouse_pos.y); SDL_PrivateMouseMotion(0, 0, mouse_pos.x, mouse_pos.y);
} }
mouse_but = _ksys_get_mouse_buttons(); uint32_t mouse_but = _ksys_get_mouse_buttons();
if (mouse_but & KSYS_MOUSE_LBUTTON_PRESSED) { if ((mouse_but ^ old_mouse_but) & KSYS_MOUSE_LBUTTON_PRESSED) {
SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_LEFT, 0, 0); if(mouse_but & KSYS_MOUSE_LBUTTON_PRESSED) {
return; SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LEFT,0,0);
} else { } else {
SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_LEFT, 0, 0); SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_LEFT,0,0);
} }
if (mouse_but & KSYS_MOUSE_RBUTTON_PRESSED) { }
SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_RIGHT, 0, 0);
return; if ((mouse_but ^ old_mouse_but) & KSYS_MOUSE_RBUTTON_PRESSED) {
if(mouse_but & KSYS_MOUSE_RBUTTON_PRESSED) {
SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RIGHT,0,0);
} else { } else {
SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_RIGHT, 0, 0); SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RIGHT,0,0);
} }
if (mouse_but & KSYS_MOUSE_MBUTTON_PRESSED) { }
SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_MIDDLE, 0, 0);
return; if ((mouse_but ^ old_mouse_but) & KSYS_MOUSE_MBUTTON_PRESSED) {
if(mouse_but & KSYS_MOUSE_MBUTTON_PRESSED) {
SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_MIDDLE,0,0);
} else { } else {
SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_MIDDLE, 0, 0); SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_MIDDLE,0,0);
} }
} }
old_mouse_but = mouse_but;
}
} }
} }
} }