Added double and triple click detection for SDL2 and GL (#309)

Bill-Gray · Nov 17, 2023 · a4e563d · a4e563d
1 parent d1c1d26
commit a4e563d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/gl/pdckbd.c b/gl/pdckbd.c
@@ -415,12 +415,22 @@ static int _process_mouse_event(void)
         {
             SDL_Event rel;
 
-            if (SDL_WaitEventTimeout(&rel, SP->mouse_wait))
+            while (action != BUTTON_TRIPLE_CLICKED && SDL_WaitEventTimeout(&rel, SP->mouse_wait))
             {
                 if (rel.type == SDL_MOUSEBUTTONUP && rel.button.button == btn)
-                    action = BUTTON_CLICKED;
-                else
+                {
+                    if (action == BUTTON_PRESSED)
+                        action = BUTTON_CLICKED;
+                    else if (action == BUTTON_CLICKED)
+                        action = BUTTON_DOUBLE_CLICKED;
+                    else if (action == BUTTON_DOUBLE_CLICKED)
+                        action = BUTTON_TRIPLE_CLICKED;
+                }
+                else if(rel.type != SDL_MOUSEBUTTONDOWN || rel.button.button != btn)
+                {
                     SDL_PushEvent(&rel);
+                    break;
+                }
             }
         }
 

diff --git a/sdl2/pdckbd.c b/sdl2/pdckbd.c
@@ -408,12 +408,22 @@ static int _process_mouse_event(void)
         {
             SDL_Event rel;
 
-            if (SDL_WaitEventTimeout(&rel, SP->mouse_wait))
+            while (action != BUTTON_TRIPLE_CLICKED && SDL_WaitEventTimeout(&rel, SP->mouse_wait))
             {
                 if (rel.type == SDL_MOUSEBUTTONUP && rel.button.button == btn)
-                    action = BUTTON_CLICKED;
-                else
+                {
+                    if (action == BUTTON_PRESSED)
+                        action = BUTTON_CLICKED;
+                    else if (action == BUTTON_CLICKED)
+                        action = BUTTON_DOUBLE_CLICKED;
+                    else if (action == BUTTON_DOUBLE_CLICKED)
+                        action = BUTTON_TRIPLE_CLICKED;
+                }
+                else if(rel.type != SDL_MOUSEBUTTONDOWN || rel.button.button != btn)
+                {
                     SDL_PushEvent(&rel);
+                    break;
+                }
             }
         }