Commit graph

11964 commits

Author SHA1 Message Date
Àlex Fiestas
7b14e38132 Merge branch 'KDE/4.11'
Conflicts:
	kcontrol/desktoppaths/desktoppath.desktop
	kcontrol/desktoptheme/desktoptheme.desktop
	kcontrol/input/cursortheme.desktop
	ksmserver/themes/contour/metadata.desktop
	ksmserver/themes/default/metadata.desktop
	ksplash/kcm/ksplashthememgr.desktop
	kstyles/themes/mega.themerc
	libs/ksysguard/processui/ProcessWidgetUI.ui
	libs/ksysguard/processui/ksysguardprocesslist.cpp
	libs/taskmanager/taskactions.cpp
	plasma/generic/runners/solid/plasma-runner-solid.desktop
	solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop
	solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop
2014-03-21 10:55:43 +01:00
Martin Gräßlin
46cb75c33f [kwin] Drop timestampDiff and timestampCompare from utils.h
They just delegate to same method from NET:: and those were used already
quite a lot in KWin already as classes inherit from NET and thus get it
directly.

REVIEW: 116918
2014-03-21 08:08:49 +01:00
Aleix Pol
7ae2fe422c Move find_package() calls into the respective directories
All should be done except for KF5 and Qt.
I tried to go through all projects and see whether it depended on the
different modules. I would appreciate it very much if the different
maintainers could take a look and see if everything is correct.

CCMAIL: plasma-devel@kde.org
2014-03-20 23:40:40 +01:00
Aleix Pol
7c1538957d Remove the need of having a global HAVE_X11 variable
Use the standard X11_FOUND instead
Also properly set the HAVE_X11 value, since it's checked with #if HAVE_X11
instead of #ifdef.
2014-03-20 18:33:29 +01:00
Aleix Pol
845d5872c4 solve fixme
use a meaningful version for the kwin oxygen client
2014-03-20 13:08:00 +01:00
Aleix Pol
dde2519cd3 Move libs/oxygen into oxygen
Also make liboxygenstyle carry the include directories instead of doing it
explicitly from the scripts.
2014-03-20 13:08:00 +01:00
Martin Gräßlin
5428a15266 [kwin] Fix build if Wayland is found, but xkbcommon is missing
It enabled the Wayland build, but it should be disabled if xkbcommon
is missing.

Thanks to Project Neon for finding this issue.
2014-03-20 12:54:24 +01:00
Martin Gräßlin
d6b346df92 [kwin] Remove TemporaryAssign from utils.h
Only used in geometry.cpp for MaximizationState and that's no
longer needed.

REVIEW: 116902
2014-03-20 07:05:41 +01:00
Martin Gräßlin
1bc624f9f7 [kwin] Move Client specific code from utils.h to client.(h|cpp)
* Motif to client.cpp
* ClientWinMask to client.cpp
* ForceGeometry_t to Client

REVIEW: 116901
2014-03-19 18:54:00 +01:00
Martin Gräßlin
c5def47bf5 Share implementation for adding shortcut (keyboard/pointer/axis)
Using templated function instead of copy and pasted code.
2014-03-19 14:14:57 +01:00
Martin Gräßlin
19c5a06fe9 Improve handleDestroyedAction
--crash on restart
2014-03-19 14:14:57 +01:00
Martin Gräßlin
5b3529acf8 Add axis support to zoom effect
Using Ctrl+Meta+Wheel as Meta+Wheel is already used by Weston for this
feature, so it would not be possible to test it.
2014-03-19 14:14:57 +01:00
Martin Gräßlin
2d4d14b1b7 Export Pointer Axis shortcuts to the effect system 2014-03-19 14:14:57 +01:00
Martin Gräßlin
4b372ba57e Switch virtual desktops with ctrl+alt+mouse wheel 2014-03-19 14:14:56 +01:00
Martin Gräßlin
89c2f2bf02 Support for global pointer axis activation
Just as pointer buttons...
2014-03-19 14:14:56 +01:00
Martin Gräßlin
5ea990a740 Export global pointer shortcuts to effect system and use it for cube
Used in cube effect as an example with hard coded ctrl+alt+left click.

BUG: 163121
2014-03-19 14:14:56 +01:00
Martin Gräßlin
28406d153d Support for global pointer shortcut activation
Sharing most of the code with keyboard shortcuts allowing to trigger a
QAction with holding modifiers and clicking a mouse button.
2014-03-19 14:14:56 +01:00
Martin Gräßlin
38201a8295 Properly support key events in TabBox over InputRedirection
Forward all key press events to the TabBox if it is currently grabbed and
connect the TabBox to the modifiers changed signal for checking if TabBox
should be ended.
2014-03-19 14:14:56 +01:00
Martin Gräßlin
b274fb9297 InputRedirection emits a signal when the modifiers change
Used by Cursor to properly emit the mouseChanged signal which for
historic reasons includes the keyboard modifiers.

Again some fiddling around with the autotests and kcmrules needed to
make it compile. This needs improvement!
2014-03-19 14:14:56 +01:00
Martin Gräßlin
b57885a1bf Add registerGlobalShortcut method to kwineffects
Implemented in KWin core to forward to new global shortcut system. This
method should be extended/changed once we go to Qt5/KF5 to make the usage
easier (no more KAction).

Each global shortcut in the effects makes use of this new method.
2014-03-19 14:14:56 +01:00
Martin Gräßlin
d1d3401b9f Register KWin's global shortcuts with the new shortcut system
All the KWin core shortcuts get also registered inside the new global
shortcut system so that they are still triggered when running KWin on
Wayland.
2014-03-19 14:14:56 +01:00
Martin Gräßlin
24b23dfc01 Beginning of global shortcut handling inside KWin
A new GlobalShortcutsManager is introduced which is responsible for
holding the registered shortcuts and triggering the matching action.

The InputRedirection checks with the GlobalShortcutManager whether a key
press event triggers a global shortcut and stops processing the event in
that case.

At the moment the GlobalShortcutsManager only supports the very basics
for KWin internal usage. External applications can not yet make usage of
the global shortcut system inside KWin.
2014-03-19 14:14:56 +01:00
Martin Gräßlin
95c6e2d7ba Wayland implementation of Screens interface
Uses the information provided by the Wayland outputs to setup the data
about the available screens.

In order to properly work together with the X Server the implementation
syncs the data to the X system using XRandR. If XRandR is not available
this is most likely going to not work correctly.
2014-03-19 14:14:40 +01:00
Martin Gräßlin
02c4ae1002 Track information about connected outputs to the Wayland Compositor
The Wayland Backend connects to the wl_output interface to get
information about the connected outputs and their modes. This information
can be used to setup screen information.
2014-03-19 14:14:40 +01:00
Martin Gräßlin
263b1f1faf [kwin/scene_xrender] Use size of shell surface as xpixmap size in XRender/Wayland
Most important connect to the surface size changed signal so that we can
create a new xpixmap which matches the size of the surface.
2014-03-19 14:14:39 +01:00
Martin Gräßlin
823deba1d6 [kwin/scene_qpainter] Use size of shell surface as back buffer size
Most important connect to the surface size changed signal so that we can
create a new back buffer which matches the size of the surface.
2014-03-19 14:14:39 +01:00
Martin Gräßlin
82fd9020e4 [kwin] Improve setting HAVE_WAYLAND_EGL
On the CI system that seemed to have been true although
Wayland Client lib was not found.
2014-03-19 11:02:39 +01:00
Martin Gräßlin
ca9642b80f Watch whether the Wayland socket goes away
The Wayland Backend watches the socket it uses for communicating with the
Wayland compositor. If the socket is removed we have to perform a kind of
emergency stop. The backend tears down all data structures created from
the Wayland display and emits a signal that the system compositor died.

In addition the Wayland Backend starts to monitor the XDG_RUNTIME_DIR for
the socket to be added again. If the socket is created again the backend
reinitializes the Wayland connection.

This also requires the Compositor to restart. Therefore it connects to
the new signals emitted by the Wayland Backend to stop and start
compositing.
2014-03-19 09:30:17 +01:00
Martin Gräßlin
8699fe5e5a [kwin/genericscriptedkcm] Generate dbus interface from XML description 2014-03-19 08:10:45 +01:00
Martin Gräßlin
7ca25ac703 [kwin] Suppress unused variable warning when building KCMRULES
This really needs to be improved. It cannot be that the kcm rules
includes more and more parts of KWin core!
2014-03-19 08:04:20 +01:00
Martin Gräßlin
317ad3d537 [kwin] Suppress unused variable usage when building without appmenu 2014-03-19 08:02:58 +01:00
Martin Gräßlin
0d07738ca9 [kwin] Fix genericscripted config
* Use metadata as json
* set Q_PLUGIN_METADATA and Q_INTERFACES
* port away from kde4_add_plugin

Only tested with effects, scripts might need further adjustements.

REVIEW: 116862
2014-03-19 08:00:28 +01:00
Martin Gräßlin
c8b4f1e9e2 [kwin] Add hack for finding the ksmserver and screenlocker DBus interface
Uses find_package in standalone build - that's for the future and in
combined build just sets the same variable to hardcoded path in the repo.
2014-03-19 07:56:17 +01:00
Aleix Pol
d8fea66396 Add missing include 2014-03-18 18:24:44 +01:00
Aleix Pol
df58c38b7c Stop including KDE4_INCLUDES globally
Depend on libraries specifically instead.
2014-03-18 18:02:03 +01:00
Aleix Pol
e5bffd744b Stop using deprecated headers
Most things were already ported away, only that nobody realized they
weren't used.
2014-03-18 18:02:02 +01:00
Martin Gräßlin
570ce05974 [kwin] Adjust CMakeLists.txt to allow standalone built of KWin
Preparation step before splitting:
* adds project(KWIN)
* lists all KWin dependencies

KWin can be built standalone if cmake is run with:
-DKWIN_BUILD_OXYGEN=OFF
-DKWIN_BUILD_KAPPMENU=OFF

Oxygen because it needs liboxygen - for standalone clients/oxygen needs
to be moved out of KWin.

KAppmenu because it includes the DBus xml file.

REVIEW: 116872
2014-03-18 17:42:19 +01:00
Martin Gräßlin
0265ae48ec Completely remove the legacy ksmserver shutdown effect
Painting was already disabled in the effect inside ksmserver, thus it
was more or less dead code. Let's remove it completely.

This also allows to remove the "temporary" hack inside KWin's logout
effect.

REVIEW: 116869
2014-03-18 17:25:08 +01:00
Aurélien Gâteau
90498594c2 kwin: add missing library. Fixes build 2014-03-18 16:39:34 +01:00
Martin Gräßlin
a4fe0b1d19 [kwin/oxygen] Include KPluginFactory
Got removed from kdecoration.h - sorry for the build failure.
2014-03-18 16:14:56 +01:00
Martin Gräßlin
23e6fbbb71 [kwin] Add missing target link libraries
Missing libs caused compile error if built standalone.
2014-03-18 14:38:00 +01:00
Martin Gräßlin
704e42163d [kwin] Add missing includes
Were missing if built stand-alone.
2014-03-18 14:37:01 +01:00
Martin Gräßlin
5e1dc24bf7 [kwin/libkdecoration] Drop unused include from kdecoration.h 2014-03-18 14:36:07 +01:00
Martin Gräßlin
18a37d7ee8 [kwin] Fix includes of kde4support headers
* drop unused headers
* use QExplicitlySharedDataPointer instead of KSharedPointer
* drop KDE/ from includes
2014-03-18 14:34:36 +01:00
Martin Gräßlin
ca6f3e329d [kwin] Fix includes of NETWM
Used kde4support variant.
2014-03-18 14:32:53 +01:00
Aleix Pol
6d3acfc71e Properly point to ksmserver from kwin 2014-03-18 14:22:57 +01:00
Aleix Pol
0283d67998 Move the repositories into plasma-* subdirectories before splitting
Creates two subdirectories: plasma-workspace and plasma-desktop
plasma-workspace contains the modules that should be re-usable between
different form factors. plasma-desktop contains the modules that
are specific to the Desktop.
See http://community.kde.org/Plasma/Tokamak7/split_proposal

Reviewed by Àlex Fiestas
2014-03-18 13:45:23 +01:00
Martin Gräßlin
7382b6d8b1 [kwin] Resolve path to ksmserver dbus interfaces through KWIN_SOURCE_DIR
This is a temporary solution to have less dependencies on
KDEBASE_WORKSPACE_SOURCE_DIR. Once kde-workspace is going to be splitted
this won't work, we need a proper way to find the dbus interfaces
provided by ksmserver.

Note: for appmenu the same problem exists, but doesn't affect us once we
are splitted as we can turn off the usage through a build option. So for
a splitted kde-workspace the appmenu dependency can just be temporarily
be removed.
2014-03-18 12:18:15 +01:00
Martin Gräßlin
9874187099 [kwin] Add a KWIN_SOURCE_DIR to the CMakeLists.txt
This is used to get to KWin's sources instead of
KDEBASE_WORKSPACE_SOURCE_DIR.
2014-03-18 12:08:14 +01:00
Martin Gräßlin
642f643dff [kwin/kcmtabbox] Port away from kde4_add_ui_files 2014-03-18 11:51:35 +01:00