1
=== modified file 'src/modules/Unity/Application/dbusfocusinfo.cpp'
2
--- src/modules/Unity/Application/dbusfocusinfo.cpp	2016-08-25 15:27:47 +0000
3
+++ src/modules/Unity/Application/dbusfocusinfo.cpp	2016-08-30 12:31:05 +0000
4
@@ -18,6 +18,9 @@
5
18
18
6
19
// local
19
// local
7
20
#include "cgmanager.h"
20
#include "cgmanager.h"
8
21
#include "mirsurfacelistmodel.h"
9
22
#include "mirsurfaceinterface.h"
10
23
#include "session_interface.h"
11
21
24
12
22
// QPA mirserver
25
// QPA mirserver
13
23
#include <logging.h>
26
#include <logging.h>
14
@@ -93,3 +96,35 @@
15
93
    });
96
    });
16
94
    return sessionWithPid;
97
    return sessionWithPid;
17
95
}
98
}
18
99
19
100
bool DBusFocusInfo::isSurfaceFocused(const QString &serializedId)
20
101
{
21
102
    MirSurfaceInterface *qmlSurface = findQmlSurface(serializedId);
22
103
    bool result = qmlSurface ? qmlSurface->activeFocus() : false;
23
104
    qCDebug(QTMIR_DBUS).nospace() << "DBusFocusInfo: isSurfaceFocused("<<serializedId<<") -> " << result;
24
105
    return result;
25
106
}
26
107
27
108
MirSurfaceInterface *DBusFocusInfo::findQmlSurface(const QString &serializedId)
28
109
{
29
110
    for (Application* application : m_applications) {
30
111
        auto session = application->session();
31
112
32
113
        auto surfaceList = static_cast<MirSurfaceListModel*>(session->surfaceList());
33
114
        for (int i = 0; i < surfaceList->count(); ++i) {
34
115
            auto qmlSurface = static_cast<MirSurfaceInterface*>(surfaceList->get(i));
35
116
            if (qmlSurface->persistentId() == serializedId) {
36
117
                return qmlSurface;
37
118
            }
38
119
        }
39
120
40
121
        surfaceList = static_cast<MirSurfaceListModel*>(session->promptSurfaceList());
41
122
        for (int i = 0; i < surfaceList->count(); ++i) {
42
123
            auto qmlSurface = static_cast<MirSurfaceInterface*>(surfaceList->get(i));
43
124
            if (qmlSurface->persistentId() == serializedId) {
44
125
                return qmlSurface;
45
126
            }
46
127
        }
47
128
    }
48
129
    return nullptr;
49
130
}
50
96
131
51
=== modified file 'src/modules/Unity/Application/dbusfocusinfo.h'
52
--- src/modules/Unity/Application/dbusfocusinfo.h	2016-08-25 15:10:24 +0000
53
+++ src/modules/Unity/Application/dbusfocusinfo.h	2016-08-30 12:31:05 +0000
54
@@ -22,10 +22,11 @@
55
22
namespace qtmir {
22
namespace qtmir {
56
23
23
57
24
class CGManager;
24
class CGManager;
58
25
class MirSurfaceInterface;
59
25
26
60
26
/*
27
/*
63
27
  FIXME: This is a hack to provide OSK with needed info for avoiding input snooping.
28
   Enables other processes to check what is the currently focused application or surface,
64
28
         Remove when possible
29
   normally for security purposes.
65
29
 */
30
 */
66
30
class DBusFocusInfo : public QObject
31
class DBusFocusInfo : public QObject
67
31
{
32
{
68
@@ -39,13 +40,22 @@
69
39
40
70
40
    /*
41
    /*
71
41
        Returns true if the application with the given PID has input focus
42
        Returns true if the application with the given PID has input focus
72
43
73
44
        FIXME: Identifying an app through its PID is deemed racy.
74
45
               isSurfaceFocused() is the preferred method.
75
42
     */
46
     */
76
43
    Q_SCRIPTABLE bool isPidFocused(unsigned int pid);
47
    Q_SCRIPTABLE bool isPidFocused(unsigned int pid);
77
44
48
78
49
    /*
79
50
        Returns true if the surface with the given id has input focus
80
51
     */
81
52
    Q_SCRIPTABLE bool isSurfaceFocused(const QString &surfaceId);
82
53
83
45
private:
54
private:
84
46
    QSet<pid_t> fetchAssociatedPids(pid_t pid);
55
    QSet<pid_t> fetchAssociatedPids(pid_t pid);
85
47
    SessionInterface* findSessionWithPid(const QSet<pid_t> &pidSet);
56
    SessionInterface* findSessionWithPid(const QSet<pid_t> &pidSet);
86
48
    SessionInterface* findSessionWithPid(SessionInterface* session, const QSet<pid_t> &pidSet);
57
    SessionInterface* findSessionWithPid(SessionInterface* session, const QSet<pid_t> &pidSet);
87
58
    MirSurfaceInterface *findQmlSurface(const QString &serializedId);
88
49
59
89
50
    const QList<Application*> &m_applications;
60
    const QList<Application*> &m_applications;
90
51
61
Status:	Merged
Approved by:	Michael Terry on 2016-08-29
Approved revision:	no longer in the source branch.
Merged at revision:	555
Proposed branch:	lp:~dandrader/qtmir/focusInfoSurfaceId
Merge into:	lp:qtmir
Prerequisite:	lp:~unity-team/qtmir/persistent_surface_id
Diff against target:	89 lines (+47/-2) 2 files modified src/modules/Unity/Application/dbusfocusinfo.cpp (+35/-0) src/modules/Unity/Application/dbusfocusinfo.h (+12/-2)
To merge this branch:	bzr merge lp:~dandrader/qtmir/focusInfoSurfaceId
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Terry (community)			Approve on 2016-08-29
Unity8 CI Bot (community)	continuous-integration		Needs Fixing on 2016-08-24
Gerry Boland (community)		2016-08-23	Needs Fixing on 2016-08-24
Review via email: mp+303737@code.launchpad.net