Differential D27464 Diff 76804 src/client/plasmawindowmanagement.cpp

Changeset View

Standalone View

View Options

src/client/plasmawindowmanagement.cpp

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Line(s)66public:
92 QIcon icon; 92​ QIcon icon;
93 PlasmaWindowManagement *wm = nullptr; 93​ PlasmaWindowManagement *wm = nullptr;
94 bool unmapped = false; 94​ bool unmapped = false;
95 QPointer<PlasmaWindow> parentWindow; 95​ QPointer<PlasmaWindow> parentWindow;
96 QMetaObject::Connection parentWindowUnmappedConnection; 96​ QMetaObject::Connection parentWindowUnmappedConnection;
97 QStringList plasmaVirtualDesktops; 97​ QStringList plasmaVirtualDesktops;
98 QRect geometry; 98​ QRect geometry;
99 quint32 pid = 0; 99​ quint32 pid = 0;
100​ QString applicationMenuServiceName;
101​ QString applicationMenuObjectPath;
100 102​
101private: 103​private:
102 static void titleChangedCallback(void *data, org_kde_plasma_window *window, const char *title); 104​ static void titleChangedCallback(void *data, org_kde_plasma_window *window, const char *title);
103 static void appIdChangedCallback(void *data, org_kde_plasma_window *window, const char *app_id); 105​ static void appIdChangedCallback(void *data, org_kde_plasma_window *window, const char *app_id);
104 static void pidChangedCallback(void *data, org_kde_plasma_window *window, uint32_t pid); 106​ static void pidChangedCallback(void *data, org_kde_plasma_window *window, uint32_t pid);
105 static void stateChangedCallback(void *data, org_kde_plasma_window *window, uint32_t state); 107​ static void stateChangedCallback(void *data, org_kde_plasma_window *window, uint32_t state);
106 static void virtualDesktopChangedCallback(void *data, org_kde_plasma_window *window, int32_t number); 108​ static void virtualDesktopChangedCallback(void *data, org_kde_plasma_window *window, int32_t number);
107 static void themedIconNameChangedCallback(void *data, org_kde_plasma_window *window, const char *name); 109​ static void themedIconNameChangedCallback(void *data, org_kde_plasma_window *window, const char *name);
108 static void unmappedCallback(void *data, org_kde_plasma_window *window); 110​ static void unmappedCallback(void *data, org_kde_plasma_window *window);
109 static void initialStateCallback(void *data, org_kde_plasma_window *window); 111​ static void initialStateCallback(void *data, org_kde_plasma_window *window);
110 static void parentWindowCallback(void *data, org_kde_plasma_window *window, org_kde_plasma_window *parent); 112​ static void parentWindowCallback(void *data, org_kde_plasma_window *window, org_kde_plasma_window *parent);
111 static void windowGeometryCallback(void *data, org_kde_plasma_window *window, int32_t x, int32_t y, uint32_t width, uint32_t height); 113​ static void windowGeometryCallback(void *data, org_kde_plasma_window *window, int32_t x, int32_t y, uint32_t width, uint32_t height);
112 static void iconChangedCallback(void *data, org_kde_plasma_window *org_kde_plasma_window); 114​ static void iconChangedCallback(void *data, org_kde_plasma_window *org_kde_plasma_window);
113 static void virtualDesktopEnteredCallback(void *data, org_kde_plasma_window *org_kde_plasma_window, const char *id); 115​ static void virtualDesktopEnteredCallback(void *data, org_kde_plasma_window *org_kde_plasma_window, const char *id);
114 static void virtualDesktopLeftCallback(void *data, org_kde_plasma_window *org_kde_plasma_window, const char *id); 116​ static void virtualDesktopLeftCallback(void *data, org_kde_plasma_window *org_kde_plasma_window, const char *id);
117​ static void appmenuChangedCallback(void *data, org_kde_plasma_window *org_kde_plasma_window, const char *service_name, const char *object_path);
115 void setActive(bool set); 118​ void setActive(bool set);
116 void setMinimized(bool set); 119​ void setMinimized(bool set);
117 void setMaximized(bool set); 120​ void setMaximized(bool set);
118 void setFullscreen(bool set); 121​ void setFullscreen(bool set);
119 void setKeepAbove(bool set); 122​ void setKeepAbove(bool set);
120 void setKeepBelow(bool set); 123​ void setKeepBelow(bool set);
121 void setOnAllDesktops(bool set); 124​ void setOnAllDesktops(bool set);
122 void setDemandsAttention(bool set); 125​ void setDemandsAttention(bool set);
▲ Show 20 Lines • Show All 225 Lines • ▼ Show 20 Line(s)346org_kde_plasma_window_listener PlasmaWindow::Private::s_listener = {
348 themedIconNameChangedCallback, 351​ themedIconNameChangedCallback,
349 unmappedCallback, 352​ unmappedCallback,
350 initialStateCallback, 353​ initialStateCallback,
351 parentWindowCallback, 354​ parentWindowCallback,
352 windowGeometryCallback, 355​ windowGeometryCallback,
353 iconChangedCallback, 356​ iconChangedCallback,
354 pidChangedCallback, 357​ pidChangedCallback,
355 virtualDesktopEnteredCallback, 358​ virtualDesktopEnteredCallback,
356 virtualDesktopLeftCallback 359​ virtualDesktopLeftCallback,
360​ appmenuChangedCallback
357}; 361​};
358 362​
363​void PlasmaWindow::Private::appmenuChangedCallback(void *data, org_kde_plasma_window *window, const char *service_name, const char *object_path)
zzagUnsubmitted
Done

Coding style: put whitespace before * and keep using snake_case.

void PlasmaWindow::Private::appmenuChangedCallback(void *data, org_kde_plasma_window *window, const char *service_name, const char *object_path)
zzag: Coding style: put whitespace before `*` and keep using snake_case. ```lang=cpp void…
364​{
365​ Private *p = cast(data);
366​
367​ p->applicationMenuServiceName = QString::fromUtf8(service_name);
368​ p->applicationMenuObjectPath = QString::fromUtf8(object_path);
369​
370​ emit p->q->applicationMenuChanged();
371​
372​ Q_UNUSED(window);
zzagUnsubmitted
Not Done

Please move it to the top of the method and remove the semicolon.

zzag: Please move it to the top of the method and remove the semicolon.
373​}
374​
359void PlasmaWindow::Private::parentWindowCallback(void *data, org_kde_plasma_window *window, org_kde_plasma_window *parent) 375​void PlasmaWindow::Private::parentWindowCallback(void *data, org_kde_plasma_window *window, org_kde_plasma_window *parent)
360{ 376​{
361 Q_UNUSED(window) 377​ Q_UNUSED(window)
362 Private *p = cast(data); 378​ Private *p = cast(data);
363 const auto windows = p->wm->windows(); 379​ const auto windows = p->wm->windows();
364 auto it = std::find_if(windows.constBegin(), windows.constEnd(), 380​ auto it = std::find_if(windows.constBegin(), windows.constEnd(),
365 [parent] (const PlasmaWindow *w) { 381​ [parent] (const PlasmaWindow *w) {
366 return *w == parent; 382​ return *w == parent;
▲ Show 20 Lines • Show All 556 Lines • ▼ Show 20 Line(s)938{
923 return d->movable; 939​ return d->movable;
924} 940​}
925 941​
926bool PlasmaWindow::isVirtualDesktopChangeable() const 942​bool PlasmaWindow::isVirtualDesktopChangeable() const
927{ 943​{
928 return d->virtualDesktopChangeable; 944​ return d->virtualDesktopChangeable;
929} 945​}
930 946​
947​QString PlasmaWindow::applicationMenuObjectPath() const
948​{
949​ return d->applicationMenuObjectPath;
950​}
951​
952​QString PlasmaWindow::applicationMenuServiceName() const
953​{
954​ return d->applicationMenuServiceName;
955​}
956​
931void PlasmaWindow::requestActivate() 957​void PlasmaWindow::requestActivate()
932{ 958​{
933 org_kde_plasma_window_set_state(d->window, 959​ org_kde_plasma_window_set_state(d->window,
934 ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_ACTIVE, 960​ ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_ACTIVE,
935 ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_ACTIVE); 961​ ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_ACTIVE);
936} 962​}
937 963​
938void PlasmaWindow::requestClose() 964​void PlasmaWindow::requestClose()
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines