Skip to content

Commit

Permalink
update wlroots dep
Browse files Browse the repository at this point in the history
  • Loading branch information
vaxerski committed Nov 19, 2022
1 parent 0ffaa8d commit df132e5
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
6 changes: 2 additions & 4 deletions src/Compositor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ CCompositor::CCompositor() {
wl_event_loop_add_signal(m_sWLEventLoop, SIGTERM, handleCritSignal, nullptr);
//wl_event_loop_add_signal(m_sWLEventLoop, SIGINT, handleCritSignal, nullptr);

m_sWLRBackend = wlr_backend_autocreate(m_sWLDisplay);
m_sWLRBackend = wlr_backend_autocreate(m_sWLDisplay, &m_sWLRSession);

if (!m_sWLRBackend) {
Debug::log(CRIT, "m_sWLRBackend was NULL!");
Expand Down Expand Up @@ -132,7 +132,7 @@ CCompositor::CCompositor() {

m_sWLRIdle = wlr_idle_create(m_sWLDisplay);

m_sWLRLayerShell = wlr_layer_shell_v1_create(m_sWLDisplay);
m_sWLRLayerShell = wlr_layer_shell_v1_create(m_sWLDisplay, 4);

m_sWLRServerDecoMgr = wlr_server_decoration_manager_create(m_sWLDisplay);
m_sWLRXDGDecoMgr = wlr_xdg_decoration_manager_v1_create(m_sWLDisplay);
Expand Down Expand Up @@ -173,8 +173,6 @@ CCompositor::CCompositor() {

m_sWLRPointerGestures = wlr_pointer_gestures_v1_create(m_sWLDisplay);

m_sWLRSession = wlr_backend_get_session(m_sWLRBackend);

m_sWLRTextInputMgr = wlr_text_input_manager_v3_create(m_sWLDisplay);

m_sWLRIMEMgr = wlr_input_method_manager_v2_create(m_sWLDisplay);
Expand Down
1 change: 1 addition & 0 deletions src/events/Events.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ namespace Events {
// Monitor part 2 the sequel
DYNLISTENFUNC(monitorFrame);
DYNLISTENFUNC(monitorDestroy);
DYNLISTENFUNC(monitorStateRequest);

// XWayland
LISTENER(readyXWayland);
Expand Down
7 changes: 7 additions & 0 deletions src/events/Monitors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,10 @@ void Events::listener_monitorDestroy(void* owner, void* data) {
}
}
}

void Events::listener_monitorStateRequest(void* owner, void* data) {
const auto PMONITOR = (CMonitor*)owner;
const auto E = (wlr_output_event_request_state*)data;

wlr_output_commit_state(PMONITOR->output, E->state);
}
4 changes: 3 additions & 1 deletion src/helpers/Monitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
void CMonitor::onConnect(bool noRule) {
hyprListener_monitorDestroy.removeCallback();
hyprListener_monitorFrame.removeCallback();
hyprListener_monitorStateRequest.removeCallback();
hyprListener_monitorFrame.initCallback(&output->events.frame, &Events::listener_monitorFrame, this);
hyprListener_monitorDestroy.initCallback(&output->events.destroy, &Events::listener_monitorDestroy, this);
hyprListener_monitorStateRequest.initCallback(&output->events.request_state, &Events::listener_monitorStateRequest, this);

if (m_bEnabled) {
wlr_output_enable(output, 1);
Expand Down Expand Up @@ -183,7 +185,7 @@ void CMonitor::onDisconnect() {
if (!BACKUPMON) {
Debug::log(WARN, "Unplugged last monitor, entering an unsafe state. Good luck my friend.");

hyprListener_monitorMode.removeCallback();
hyprListener_monitorStateRequest.removeCallback();
hyprListener_monitorDestroy.removeCallback();

g_pCompositor->m_bUnsafeState = true;
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/Monitor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class CMonitor {

DYNLISTENER(monitorFrame);
DYNLISTENER(monitorDestroy);
DYNLISTENER(monitorMode);
DYNLISTENER(monitorStateRequest);

// hack: a group = workspaces on a monitor.
// I don't really care lol :P
Expand Down
4 changes: 2 additions & 2 deletions src/helpers/SubsurfaceTree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "../Compositor.hpp"

void addSurfaceGlobalOffset(SSurfaceTreeNode* node, int* lx, int* ly) {
*lx += node->pSurface->sx;
*ly += node->pSurface->sy;
*lx += node->pSurface->current.dx;
*ly += node->pSurface->current.dy;

if (node->offsetfn) {
// This is the root node
Expand Down
2 changes: 1 addition & 1 deletion subprojects/wlroots
Submodule wlroots updated from 627a5c to 4ff46e

0 comments on commit df132e5

Please sign in to comment.