From e4c5d95ed37611acc6a186522315195b4ebfb9ef Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 9 Jul 2012 11:42:54 -0700
Subject: Apply Android changes from sdl-1.2.12 to sdl-1.2.15

These changes come from diffing Android's sdl-1.2.12 tree against a
pure upstream sdl-1.2.12 tree, and then manually applying those
differences to the sdl-1.2.15 tree.

Change-Id: I05fa6e8004bb629fa2482f092b6ab127b7e51e73
---
 distrib/sdl-1.2.15/src/video/SDL_video.c | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

(limited to 'distrib/sdl-1.2.15/src/video/SDL_video.c')

diff --git a/distrib/sdl-1.2.15/src/video/SDL_video.c b/distrib/sdl-1.2.15/src/video/SDL_video.c
index 46285c9..43c1826 100644
--- a/distrib/sdl-1.2.15/src/video/SDL_video.c
+++ b/distrib/sdl-1.2.15/src/video/SDL_video.c
@@ -1963,6 +1963,66 @@ int SDL_WM_ToggleFullScreen(SDL_Surface *surface)
 }
 
 /*
+ *  Set window position
+ */
+void  SDL_WM_SetPos(int  x, int  y)
+{
+    SDL_VideoDevice*  video = current_video;
+
+    if (video && video->SetWindowPos)
+        video->SetWindowPos(video, x, y);
+}
+
+/*
+ * Get window position
+ */
+void  SDL_WM_GetPos(int  *px, int  *py)
+{
+    SDL_VideoDevice*  video = current_video;
+
+    if (video && video->GetWindowPos)
+        video->GetWindowPos(video, px, py);
+    else {
+        *px = 100;
+        *py = 100;
+    }
+}
+
+int   SDL_WM_IsFullyVisible( int  recenter )
+{
+    int  result = 1;
+
+    SDL_VideoDevice*  video = current_video;
+
+    if (video && video->IsWindowVisible) {
+        result = video->IsWindowVisible(video, recenter);
+    }
+    return result;
+}
+
+int   SDL_WM_GetMonitorDPI( int  *xDpi, int  *yDpi )
+{
+    int               result = -1;
+    SDL_VideoDevice*  video  = current_video;
+
+    if (video && video->GetMonitorDPI) {
+        result = video->GetMonitorDPI(video, xDpi, yDpi);
+    }
+    return result;
+}
+
+int   SDL_WM_GetMonitorRect( SDL_Rect  *rect )
+{
+    int               result = -1;
+    SDL_VideoDevice*  video  = current_video;
+
+    if (video && video->GetMonitorRect) {
+        result = video->GetMonitorRect(video, rect);
+    }
+    return result;
+}
+
+/*
  * Get some platform dependent window manager information
  */
 int SDL_GetWMInfo (SDL_SysWMinfo *info)
-- 
cgit v1.1