Move emulator GLES from development.git to sdk.git

The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: I2c3bce627ecfd0a4b3e688d1839fe10755a21e58

1 files changed, 131 insertions, 0 deletions

diff --git a/emulator/opengl/tests/ut_renderer/X11Windowing.cpp b/emulator/opengl/tests/ut_renderer/X11Windowing.cpp
new file mode 100644
index 0000000..cc94fdd
--- /dev/null
+++ b/emulator/opengl/tests/ut_renderer/X11Windowing.cpp
@@ -0,0 +1,131 @@
+/*
+* Copyright (C) 2011 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include "X11Windowing.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#define DEBUG 0
+#if DEBUG
+#  define D(...) printf(__VA_ARGS__), printf("\n")
+#else
+#  define D(...) ((void)0)
+#endif
+
+/* Try to remember the window position between creates/destroys */
+static int X11_wmXPos = 100;
+static int X11_wmYPos = 100;
+
+static int X11_wmXAdjust = 0;
+static int X11_wmYAdjust = 0;
+
+static void
+get_window_pos( Display *disp, Window win, int *px, int *py )
+{
+    Window  child;
+
+    XTranslateCoordinates( disp, win, DefaultRootWindow(disp),  0, 0, px, py, &child );
+}
+
+
+static void
+set_window_pos(Display *disp, Window win, int x, int y)
+{
+    int   xNew, yNew;
+    int   xAdjust = X11_wmXAdjust;
+    int   yAdjust = X11_wmYAdjust;
+
+    /* this code is tricky because some window managers, but not all,
+     * will translate the final window position by a given offset
+     * corresponding to the frame decoration.
+     *
+     * so we first try to move the window, get the position that the
+     * window manager has set, and if they are different, re-position the
+     * window again with an adjustment.
+     *
+     * this causes a slight flicker since the window 'jumps' very
+     * quickly from one position to the other.
+     */
+
+    D("%s: move to [%d,%d] adjusted to [%d,%d]", __FUNCTION__,
+      x, y, x+xAdjust, y+yAdjust);
+    XMoveWindow(disp, win, x + xAdjust, y + yAdjust);
+    XSync(disp, True);
+    get_window_pos(disp, win, &xNew, &yNew);
+    if (xNew != x || yNew != y) {
+        X11_wmXAdjust = xAdjust = x - xNew;
+        X11_wmYAdjust = yAdjust = y - yNew;
+        D("%s: read pos [%d,%d], recomputing adjust=[%d,%d] moving to [%d,%d]\n",
+          __FUNCTION__, xNew, yNew, xAdjust, yAdjust, x+xAdjust, y+yAdjust);
+        XMoveWindow(disp, win, x + xAdjust, y + yAdjust );
+    }
+    XSync(disp, False);
+}
+
+
+NativeDisplayType X11Windowing::getNativeDisplay()
+{
+    Display *dpy = XOpenDisplay(NULL);
+    return (NativeDisplayType)dpy;
+}
+
+NativeWindowType X11Windowing::createNativeWindow(NativeDisplayType _dpy, int width, int height)
+{
+    Display *dpy = (Display *) _dpy;
+
+    long defaultScreen = DefaultScreen( dpy );
+    Window rootWindow = RootWindow(dpy, defaultScreen);
+    int depth = DefaultDepth(dpy, defaultScreen);
+    XVisualInfo *visualInfo = new XVisualInfo;
+
+    XMatchVisualInfo(dpy, defaultScreen, depth, TrueColor, visualInfo);
+    if (visualInfo == NULL) {
+        fprintf(stderr, "couldn't find matching visual\n");
+        return NULL;
+    }
+
+    Colormap x11Colormap = XCreateColormap(dpy, rootWindow, visualInfo->visual, AllocNone);
+    XSetWindowAttributes sWA;
+    sWA.colormap = x11Colormap;
+    sWA.event_mask = StructureNotifyMask | ExposureMask;
+    sWA.background_pixel = 0;
+    sWA.border_pixel = 0;
+    unsigned int attributes_mask = CWBackPixel | CWBorderPixel | CWEventMask | CWColormap;
+
+    Window win = XCreateWindow( dpy,
+                                rootWindow,
+                                X11_wmXPos, X11_wmYPos, width, height,
+                                0, CopyFromParent, InputOutput,
+                                CopyFromParent, attributes_mask, &sWA);
+
+    XMapWindow(dpy, win);
+    XFlush(dpy);
+    set_window_pos(dpy, win, X11_wmXPos, X11_wmYPos);
+    return NativeWindowType(win);
+}
+
+int X11Windowing::destroyNativeWindow(NativeDisplayType _dpy, NativeWindowType _win)
+{
+    Display *dpy = (Display *)_dpy;
+    Window win = (Window)_win;
+    get_window_pos(dpy, win, &X11_wmXPos, &X11_wmYPos);
+    D("%s: Saved window position [%d, %d]\n", __FUNCTION__, X11_wmXPos, X11_wmYPos);
+    XDestroyWindow(dpy, win);
+    XFlush(dpy);
+    return 0;
+}