1 files changed, 55 insertions, 21 deletions

diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index 28ba5afc..3900c877 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -375,9 +375,26 @@ begin
   end;
 end;
 
+procedure DoQuit;
+begin
+  // if question option is enabled then show exit popup
+  if (Ini.AskbeforeDel = 1) then
+  begin
+    Display.CurrentScreen^.CheckFadeTo(nil,'MSG_QUIT_USDX');
+  end
+  else // if ask-for-exit is disabled then simply exit
+  begin
+    Display.Fade := 0;
+    Display.NextScreenWithCheck := nil;
+    Display.CheckOK := True;
+  end;
+end;
+
 procedure CheckEvents;
 var
   Event: TSDL_event;
+  mouseDown:  Boolean;
+  mouseBtn: Integer;
 begin
   if Assigned(Display.NextScreen) then
     Exit;
@@ -391,17 +408,46 @@ begin
         Display.NextScreenWithCheck := nil;
         Display.CheckOK := true;
       end;
-      SDL_MOUSEBUTTONDOWN:
+
+      SDL_MOUSEMOTION, SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP:
       begin
-{
-        with Event.button do
+        if (Ini.Mouse > 0) then
         begin
-          if State = SDL_BUTTON_LEFT then
+          case Event.type_ of
+            SDL_MOUSEMOTION:
+            begin
+              mouseDown := False;
+              mouseBtn := 0;
+            end;
+            SDL_MOUSEBUTTONDOWN:
+            begin
+              mouseDown := True;
+              mouseBtn := Event.button.button;
+            end;
+            SDL_MOUSEBUTTONUP:
+            begin
+              mouseDown := False;
+              mouseBtn := Event.button.button;
+            end;
+          end;
+
+          Display.MoveCursor(Event.button.X * 800 / Screen.w,
+                             Event.button.Y * 600 / Screen.h,
+                             mouseDown and ((mouseBtn <> SDL_BUTTON_WHEELDOWN) or (mouseBtn <> SDL_BUTTON_WHEELUP)));
+
+          if (ScreenPopupError <> nil) and (ScreenPopupError.Visible) then
+            done := not ScreenPopupError.ParseMouse(mouseBtn, mouseDown, Event.button.x, Event.button.y)
+          else if (ScreenPopupCheck <> nil) and (ScreenPopupCheck.Visible) then
+            done := not ScreenPopupCheck.ParseMouse(mouseBtn, mouseDown, Event.button.x, Event.button.y)
+          else
           begin
-            //
+            done := not Display.CurrentScreen^.ParseMouse(mouseBtn, mouseDown, Event.button.x, Event.button.y);
+
+            // if screen wants to exit
+            if done then
+              DoQuit;
           end;
         end;
-}
       end;
       SDL_VIDEORESIZE:
       begin
@@ -437,14 +483,14 @@ begin
             if boolean( Ini.FullScreen ) then
             begin
               SDL_SetVideoMode(ScreenW, ScreenH, (Ini.Depth+1) * 16, SDL_OPENGL or SDL_FULLSCREEN);
-              SDL_ShowCursor(0);
             end
             else
             begin
               SDL_SetVideoMode(ScreenW, ScreenH, (Ini.Depth+1) * 16, SDL_OPENGL or SDL_RESIZABLE);
-              SDL_ShowCursor(1);
             end;
 
+            Display.SetCursor;
+
             glViewPort(0, 0, ScreenW, ScreenH);
             {$IFEND}
           end
@@ -464,19 +510,7 @@ begin
 
             // if screen wants to exit
             if Done then
-            begin
-              // if question option is enabled then show exit popup
-              if (Ini.AskbeforeDel = 1) then
-              begin
-                Display.CurrentScreen^.CheckFadeTo(nil,'MSG_QUIT_USDX');
-              end
-              else // if ask-for-exit is disabled then simply exit
-              begin
-                Display.Fade := 0;
-                Display.NextScreenWithCheck := nil;
-                Display.CheckOK := true;
-              end;
-            end;
+              DoQuit;
 
           end;
         end;