Changeset 233 for trunkTweet

Timestamp:

Jan 19, 2011, 1:34:23 PM (12 years ago)

Author:

sam

Message:

Make SdlInput regularly inject the mouse position into the Input singleton.

Location:

trunk/src

Files:

• input.cpp (modified) (2 diffs)
• input.h (modified) (1 diff)
• sdlinput.cpp (modified) (1 diff)

trunk/src/input.cpp

@@ -30 +30 @@
 
 public:
-    int dummy;
+    InputData()
+    {
+        mouse.x = mouse.y = -1;
+    }
+
+    Int2 mouse;
 }
 inputdata;
@@ -60 +65 @@
 }
 
+void Input::SetMousePos(Int2 coord)
+{
+    data->mouse = coord;
+}
+
+Int2 Input::GetMousePos()
+{
+    return data->mouse;
+}
+

trunk/src/input.h

@@ -23 +23 @@
 public:
     static Float2 GetAxis(int axis);
+    static void SetMousePos(Int2 coord);
+    static Int2 GetMousePos();
 };
 

trunk/src/sdlinput.cpp

@@ -49 +49 @@
 
     /* Handle mouse input */
-    SDL_GetMouseState(&data->mx, &data->my);
+    Int2 mouse;
+    if (SDL_GetAppState() & SDL_APPMOUSEFOCUS)
+        SDL_GetMouseState(&mouse.x, &mouse.y);
+    else
+        mouse.x = mouse.y = -1;
+    Input::SetMousePos(mouse);
 
     /* Handle keyboard and WM events */