From 673ce6c84edd8792dbb2c7747c769084ff3a9132 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 29 Mar 2012 13:41:06 -0700 Subject: eglfs: Implement xlib based hook for testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a hook implementation for X11 using xlib. This is primarily for testing. xcb is not used since the x11/egl-mesa integration appears to be done through xlib. Currently, there is no input mechanism. The size can be adjusted using EGLFS_X11_SIZE environment variable. Change-Id: Ifcfbfd958d9d110d94e22f04dfad1f6c29818103 Reviewed-by: Samuel Rødal --- src/plugins/platforms/eglfs/eglfs.pro | 4 ++ src/plugins/platforms/eglfs/qeglfs_hooks_x11.cpp | 90 ++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 src/plugins/platforms/eglfs/qeglfs_hooks_x11.cpp (limited to 'src/plugins') diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro index 89d56efc82..9a36cacd05 100644 --- a/src/plugins/platforms/eglfs/eglfs.pro +++ b/src/plugins/platforms/eglfs/eglfs.pro @@ -12,6 +12,10 @@ DESTDIR = $$QT.gui.plugins/platforms #Avoid X11 header collision DEFINES += MESA_EGL_NO_X11_HEADERS +#To test the hooks on x11 (xlib), comment the above define too +#EGLFS_PLATFORM_HOOKS_SOURCES += qeglfs_hooks_x11.cpp +#LIBS += -lX11 + SOURCES = main.cpp \ qeglfsintegration.cpp \ qeglfswindow.cpp \ diff --git a/src/plugins/platforms/eglfs/qeglfs_hooks_x11.cpp b/src/plugins/platforms/eglfs/qeglfs_hooks_x11.cpp new file mode 100644 index 0000000000..baba3be492 --- /dev/null +++ b/src/plugins/platforms/eglfs/qeglfs_hooks_x11.cpp @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qeglfs_hooks.h" + +#include + +QEglFSHooks platform_hooks; +static Display *display = 0; + +void QEglFSHooks::platformInit() +{ + display = XOpenDisplay(NULL); + if (!display) + qFatal("Could not open display"); +} + +void QEglFSHooks::platformDestroy() +{ + XCloseDisplay(display); +} + +EGLNativeDisplayType QEglFSHooks::platformDisplay() const +{ + return display; +} + +QSize QEglFSHooks::screenSize() const +{ + QList env = qgetenv("EGLFS_X11_SIZE").split('x'); + if (env.length() != 2) + return QSize(640, 480); + return QSize(env.at(0).toInt(), env.at(1).toInt()); +} + +EGLNativeWindowType QEglFSHooks::createNativeWindow(const QSize &size) +{ + Window root = DefaultRootWindow(display); + XSetWindowAttributes swa; + memset(&swa, 0, sizeof(swa)); + Window win = XCreateWindow(display, root, 0, 0, size.width(), size.height(), 0, CopyFromParent, + InputOutput, CopyFromParent, CWEventMask, &swa); + XMapWindow(display, win); + XStoreName(display, win, "EGLFS"); + return win; +} + +void QEglFSHooks::destroyNativeWindow(EGLNativeWindowType window) +{ + XDestroyWindow(display, window); +} + -- cgit v1.2.3