Skip to content

Commit b8eddd3

Browse files
committed
refactor(gesture): extract gesture dispatcher from compositor to gesture manager
- Update all handleGesture() calls in gesture.cpp to use gestureManager() - Add public gestureManager() getter method to CwlCompositor - Include gesture-manager.h for complete type definitions
1 parent b932cb9 commit b8eddd3

3 files changed

Lines changed: 13 additions & 14 deletions

File tree

src/cutie-wlc.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,6 @@ void CwlCompositor::handleMouseReleaseEvent(QList<QEventPoint> points,
311311
defaultSeat()->sendMouseReleaseEvent(btn);
312312
}
313313

314-
bool CwlCompositor::handleGesture(QPointerEvent *ev, int edge, int corner)
315-
{
316-
// Delegate to gesture manager
317-
return m_gestureManager->handleGesture(ev, edge, corner);
318-
}
319-
320314
void CwlCompositor::viewSurfaceDestroyed()
321315
{
322316
CwlView *view = qobject_cast<CwlView *>(sender());
@@ -465,6 +459,11 @@ ForeignToplevelManagerV1 *CwlCompositor::foreignTlManagerV1()
465459
return m_foreignTlManagerV1;
466460
}
467461

462+
CwlGestureManager *CwlCompositor::gestureManager()
463+
{
464+
return m_gestureManager;
465+
}
466+
468467
void CwlCompositor::grabSurface(QWaylandSurfaceGrabber *grabber,
469468
const QWaylandBufferRef &buffer)
470469
{

src/cutie-wlc.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ class CwlCompositor : public QWaylandCompositor {
5050
void handleMouseReleaseEvent(QList<QEventPoint> points,
5151
Qt::MouseButton btn);
5252

53-
bool handleGesture(QPointerEvent *ev, int edge, int corner);
54-
5553
void handleKeyPress(quint32 nativeScanCode);
5654
void handleKeyRelease(quint32 nativeScanCode);
5755

@@ -64,6 +62,7 @@ class CwlCompositor : public QWaylandCompositor {
6462
CwlView *getTopPanel();
6563
GlWindow *glWindow();
6664
ForeignToplevelManagerV1 *foreignTlManagerV1();
65+
CwlGestureManager *gestureManager();
6766

6867
CwlView *m_launcherView = nullptr;
6968
CwlWorkspace *m_workspace = nullptr;

src/gesture.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <gesture.h>
2+
#include <gesture-manager.h>
23
#include <QDebug>
34

45
CwlGesture::CwlGesture(CwlCompositor *compositor, QSize screenSize)
@@ -37,19 +38,19 @@ void CwlGesture::handlePointerEvent(
3738
corner = (CornerSwipe)c;
3839

3940
if (edge < EDGE_UNDEFINED || corner < CORNER_UNDEFINED)
40-
handled = m_cwlcompositor->handleGesture(ev, edge,
41-
corner);
41+
handled = m_cwlcompositor->gestureManager()
42+
->handleGesture(ev, edge, corner);
4243
}
4344

4445
if (ev->isUpdateEvent())
4546
if (edge < EDGE_UNDEFINED || corner < CORNER_UNDEFINED)
46-
handled = m_cwlcompositor->handleGesture(ev, edge,
47-
corner);
47+
handled = m_cwlcompositor->gestureManager()
48+
->handleGesture(ev, edge, corner);
4849

4950
if (ev->isEndEvent())
5051
if (edge < EDGE_UNDEFINED || corner < CORNER_UNDEFINED) {
51-
handled = m_cwlcompositor->handleGesture(ev, edge,
52-
corner);
52+
handled = m_cwlcompositor->gestureManager()
53+
->handleGesture(ev, edge, corner);
5354
corner = CORNER_UNDEFINED;
5455
edge = EDGE_UNDEFINED;
5556

0 commit comments

Comments
 (0)