yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use own screen number instead of asking QX11Info

Browse source 
Wouldn't compile with Qt 5 as there the method is missing and the ctor
is private.

REVIEW: 109338
This commit is contained in:
Martin Gräßlin 2013-03-07 13:48:17 +01:00
parent 6424a44632
commit e9eb48c735
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
workspace.cpp
View file

@ -79,7 +79,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <QX11Info>
#include <stdio.h> #include <stdio.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwindowsystem.h> #include <kwindowsystem.h>
@ -168,8 +167,7 @@ Workspace::Workspace(bool restore)
options->loadConfig(); options->loadConfig();
options->loadCompositingConfig(false); options->loadCompositingConfig(false);
mgr = new PluginMgr; mgr = new PluginMgr;
QX11Info info; default_colormap = DefaultColormap(display(), screen_number);
default_colormap = DefaultColormap(display(), info.screen());
installed_colormap = default_colormap; installed_colormap = default_colormap;
connect(&temporaryRulesMessages, SIGNAL(gotMessage(QString)), connect(&temporaryRulesMessages, SIGNAL(gotMessage(QString)),
@ -375,8 +373,7 @@ void Workspace::init()
if (hasDecorationPlugin() && mgr->factory()->supports(AbilityExtendIntoClientArea)) if (hasDecorationPlugin() && mgr->factory()->supports(AbilityExtendIntoClientArea))
protocols[ NETRootInfo::PROTOCOLS2 ] |= NET::WM2FrameOverlap; protocols[ NETRootInfo::PROTOCOLS2 ] |= NET::WM2FrameOverlap;
QX11Info info; rootInfo = new RootInfo(this, display(), supportWindow->winId(), "KWin", protocols, 5, screen_number);
rootInfo = new RootInfo(this, display(), supportWindow->winId(), "KWin", protocols, 5, info.screen());
// create VirtualDesktopManager and perform dependency injection // create VirtualDesktopManager and perform dependency injection
VirtualDesktopManager *vds = VirtualDesktopManager::self(); VirtualDesktopManager *vds = VirtualDesktopManager::self();