~gerboland/qtubuntu/fix_1351024

Viewing changes to src/platforms/ubuntulegacy/screen.cc

Committer: CI bot
Author(s): Gerry Boland, Daniel d'Andrada
Date: 2014-07-28 02:37:08 UTC
mfrom: (231.1.14 ubuntumirclient-only)
Revision ID: ps-jenkins@lists.canonical.com-20140728023708-iv11mcwrd0pzjv0c

Major refactor: remove SurfaceFlinger & Mir in-server-process-client support, flatten class hierarchy. Only Mir client QPA remains

Approved by: Michael Terry, Ricardo Mendoza

files added:
src/ubuntumirclient/plugin.h

files removed:
TODO

deploy.sh

src/platforms

src/platforms/platforms.pro

src/platforms/ubuntu

src/platforms/ubuntu/ubuntu

src/platforms/ubuntu/ubuntu.pro

src/platforms/ubuntu/ubuntu/main.cc

src/platforms/ubuntu/ubuntu/ubuntu.json

src/platforms/ubuntu/ubuntu/ubuntu.pro

src/platforms/ubuntu/ubuntucommon

src/platforms/ubuntu/ubuntucommon/clipboard.cc

src/platforms/ubuntu/ubuntucommon/clipboard.h

src/platforms/ubuntu/ubuntucommon/input.cc

src/platforms/ubuntu/ubuntucommon/input.h

src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h

src/platforms/ubuntu/ubuntucommon/integration.cc

src/platforms/ubuntu/ubuntucommon/integration.h

src/platforms/ubuntu/ubuntucommon/screen.cc

src/platforms/ubuntu/ubuntucommon/screen.h

src/platforms/ubuntu/ubuntucommon/ubuntucommon.pro

src/platforms/ubuntu/ubuntucommon/window.cc

src/platforms/ubuntu/ubuntucommon/window.h

src/platforms/ubuntu/ubuntumir

src/platforms/ubuntu/ubuntumir/ubuntumir.pro

src/platforms/ubuntu/ubuntumir/ubuntumirclient

src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro

src/platforms/ubuntu/ubuntumir/ubuntumircommon

src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc

src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h

src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc

src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h

src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro

src/platforms/ubuntu/ubuntumir/ubuntumirserver

src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc

src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json

src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro

src/platforms/ubuntulegacy

src/platforms/ubuntulegacy/input.cc

src/platforms/ubuntulegacy/input.h

src/platforms/ubuntulegacy/integration.cc

src/platforms/ubuntulegacy/integration.h

src/platforms/ubuntulegacy/main.cc

src/platforms/ubuntulegacy/screen.cc

src/platforms/ubuntulegacy/screen.h

src/platforms/ubuntulegacy/ubuntulegacy.json

src/platforms/ubuntulegacy/ubuntulegacy.pro

src/platforms/ubuntulegacy/window.cc

src/platforms/ubuntulegacy/window.h

files renamed:
src/platforms/base/ => src/ubuntumirclient/

src/platforms/base/backing_store.cc => src/ubuntumirclient/backingstore.cpp

src/platforms/base/backing_store.h => src/ubuntumirclient/backingstore.h

src/platforms/base/clipboard.cc => src/ubuntumirclient/clipboard.cpp

src/platforms/base/context.cc => src/ubuntumirclient/glcontext.cpp

src/platforms/base/context.h => src/ubuntumirclient/glcontext.h

src/platforms/base/input.cc => src/ubuntumirclient/input.cpp

src/platforms/base/integration.cc => src/ubuntumirclient/integration.cpp

src/platforms/base/native_interface.cc => src/ubuntumirclient/nativeinterface.cpp

src/platforms/base/native_interface.h => src/ubuntumirclient/nativeinterface.h

src/platforms/base/platformservices.cc => src/ubuntumirclient/platformservices.cpp

src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc => src/ubuntumirclient/plugin.cpp

src/platforms/base/screen.cc => src/ubuntumirclient/screen.cpp

src/platforms/base/theme.cc => src/ubuntumirclient/theme.cpp

src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.json => src/ubuntumirclient/ubuntumirclient.json

src/platforms/base/base.pro => src/ubuntumirclient/ubuntumirclient.pro

src/platforms/base/window.cc => src/ubuntumirclient/window.cpp

files modified:
README

debian/changelog

debian/control

debian/copyright

debian/docs

debian/rules *

qtubuntu.pro

src/src.pro

src/ubuntumirclient/clipboard.h

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.h

src/ubuntumirclient/logging.h

src/ubuntumirclient/platformservices.h

src/ubuntumirclient/screen.h

src/ubuntumirclient/theme.h

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

src/platforms/ubuntulegacy/screen.cc

// This file is part of QtUbuntu, a set of Qt components for Ubuntu.

// This program is free software: you can redistribute it and/or modify it under

// the terms of the GNU Lesser General Public License version 3, as published by

// the Free Software Foundation.

// This program is distributed in the hope that it will be useful, but WITHOUT

// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

// Lesser General Public License for more details.

// You should have received a copy of the GNU Lesser General Public License

// along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "screen.h"

#include "base/logging.h"

#include <surface_flinger/surface_flinger_compatibility_layer.h>

QUbuntuLegacyScreen::QUbuntuLegacyScreen() {

const int kScreenWidth = sf_get_display_width(SURFACE_FLINGER_DEFAULT_DISPLAY_ID);

const int kScreenHeight = sf_get_display_height(SURFACE_FLINGER_DEFAULT_DISPLAY_ID);

ASSERT(kScreenWidth > 0 && kScreenHeight > 0);

geometry_ = QRect(0, 0, kScreenWidth, kScreenHeight);

ASSERT((sfClient_ = sf_client_create_full(false)) != NULL);

DLOG("QUbuntuLegacyScreen::QUbuntuLegacyScreen (this=%p)", this);

}

QUbuntuLegacyScreen::~QUbuntuLegacyScreen() {

DLOG("QUbuntuLegacyScreen::~QUbuntuLegacyScreen");

// FIXME(loicm) Invalid because the struct is forward declarated, we need a way to clean the

// handle correctly.

// delete sfClient_;

}

Older »