Skip to content

Commit 983e755

Browse files
fixups
1 parent 29992e2 commit 983e755

File tree

7 files changed

+27
-28
lines changed

7 files changed

+27
-28
lines changed

include/hyprtoolkit/core/Output.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Hyprtoolkit {
1313
virtual uint32_t fps() = 0;
1414

1515
struct {
16-
// output removed
16+
/* output removed */
1717
Hyprutils::Signal::CSignalT<> removed;
1818
} m_events;
1919
};

include/hyprtoolkit/window/Window.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Hyprtoolkit {
3030
Hyprutils::Memory::CSharedPointer<CWindowBuilder> preferredSize(const Hyprutils::Math::Vector2D&);
3131
Hyprutils::Memory::CSharedPointer<CWindowBuilder> minSize(const Hyprutils::Math::Vector2D&);
3232
Hyprutils::Memory::CSharedPointer<CWindowBuilder> maxSize(const Hyprutils::Math::Vector2D&);
33-
// FIXME: implement for window types other than HT_WINDOW_LOCK_SURFACE
33+
// TODO: implement for window types other than HT_WINDOW_LOCK_SURFACE
3434
Hyprutils::Memory::CSharedPointer<CWindowBuilder> prefferedOutput(const Hyprutils::Memory::CSharedPointer<IOutput>& output);
3535

3636
// only for HT_WINDOW_LAYER

src/core/platforms/WaylandPlatform.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@ namespace Hyprtoolkit {
4343
CWaylandPlatform() = default;
4444
~CWaylandPlatform();
4545

46-
bool attempt();
46+
bool attempt();
4747

48-
void initSeat();
49-
void initShell();
50-
bool initDmabuf();
51-
void initIM();
52-
void setCursor(ePointerShape shape);
48+
void initSeat();
49+
void initShell();
50+
bool initDmabuf();
51+
void initIM();
52+
void setCursor(ePointerShape shape);
5353

54-
bool dispatchEvents();
54+
bool dispatchEvents();
5555

56-
SP<IWaylandWindow> windowForSurf(wl_proxy* proxy);
57-
WP<CWaylandOutput> outputForHandle(uint32_t handle);
56+
SP<IWaylandWindow> windowForSurf(wl_proxy* proxy);
57+
WP<CWaylandOutput> outputForHandle(uint32_t handle);
5858

59-
void onKey(uint32_t keycode, bool state);
60-
void startRepeatTimer();
61-
void stopRepeatTimer();
59+
void onKey(uint32_t keycode, bool state);
60+
void startRepeatTimer();
61+
void stopRepeatTimer();
6262

63-
void onRepeatTimerFire();
63+
void onRepeatTimerFire();
6464

65-
SP<CWaylandSessionLockState> aquireSessionLock();
65+
SP<CWaylandSessionLockState> aquireSessionLock();
6666

6767
// dmabuf formats
6868
std::vector<Aquamarine::SDRMFormat> m_dmabufFormats;

src/window/IWaylandWindow.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ namespace Hyprtoolkit {
100100
friend class CWaylandWindow;
101101
};
102102

103-
}
103+
}

src/window/WaylandLockSurface.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ void CWaylandLockSurface::open() {
8080
} else
8181
m_waylandState.surface->sendAttach(nullptr, 0, 0);
8282

83-
m_lockSurfaceState.lockSurface =
84-
makeShared<CCExtSessionLockSurfaceV1>(lockObject->sendGetLockSurface(m_waylandState.surface->resource(), wlOutput->m_wlOutput->resource()));
83+
m_lockSurfaceState.lockSurface = makeShared<CCExtSessionLockSurfaceV1>(lockObject->sendGetLockSurface(m_waylandState.surface->resource(), wlOutput->m_wlOutput->resource()));
8584
if (!m_lockSurfaceState.lockSurface->resource()) {
8685
g_logger->log(HT_LOG_ERROR, "lock surface opening failed: no lock surface. Errno: {}", errno);
8786
return;

src/window/Window.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace Hyprtoolkit {
1111
std::optional<Hyprutils::Math::Vector2D> preferredSize;
1212
std::optional<Hyprutils::Math::Vector2D> minSize;
1313
std::optional<Hyprutils::Math::Vector2D> maxSize;
14-
std::string title = "Hyprtoolkit App";
15-
std::string class_ = "hyprtoolkit-app";
16-
uint32_t prefferedOutputId;
14+
std::string title = "Hyprtoolkit App";
15+
std::string class_ = "hyprtoolkit-app";
16+
uint32_t prefferedOutputId = 0;
1717

1818
// popups
1919
Hyprutils::Math::Vector2D pos;

tests/SimpleSessionLock.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ static void createLockSurface(SP<IOutput> output) {
114114
}
115115

116116
int main(int argc, char** argv, char** envp) {
117-
int unlockSecs = 10;
118-
if (argc == 2)
119-
unlockSecs = atoi(argv[1]);
117+
int unlockSecs = 10;
118+
if (argc == 2)
119+
unlockSecs = atoi(argv[1]);
120120

121121
backend = IBackend::create();
122122
if (!backend) {
@@ -140,10 +140,10 @@ int main(int argc, char** argv, char** envp) {
140140
}
141141
});
142142

143-
backend->m_events.outputAdded.listenStatic(createLockSurface);
143+
backend->m_events.outputAdded.listenStatic(createLockSurface);
144144

145-
for (const auto& o: backend->getOutputs()) {
146-
createLockSurface(o);
145+
for (const auto& o : backend->getOutputs()) {
146+
createLockSurface(o);
147147
}
148148

149149
backend->addTimer(std::chrono::seconds(unlockSecs), [](auto, auto) { lockState->unlock(); }, nullptr);

0 commit comments

Comments
 (0)