summaryrefslogtreecommitdiff
path: root/WindowServer
diff options
context:
space:
mode:
Diffstat (limited to 'WindowServer')
-rw-r--r--WindowServer/WSMessageLoop.cpp8
-rw-r--r--WindowServer/WSWindowManager.cpp4
2 files changed, 9 insertions, 3 deletions
diff --git a/WindowServer/WSMessageLoop.cpp b/WindowServer/WSMessageLoop.cpp
index 2ba401d92e..8e68215381 100644
--- a/WindowServer/WSMessageLoop.cpp
+++ b/WindowServer/WSMessageLoop.cpp
@@ -14,7 +14,7 @@
#include <LibC/stdio.h>
#include <LibC/errno.h>
-//#define WSEVENTLOOP_DEBUG
+//#define WSMESSAGELOOP_DEBUG
static WSMessageLoop* s_the;
@@ -62,7 +62,7 @@ int WSMessageLoop::exec()
for (auto& queued_message : messages) {
auto* receiver = queued_message.receiver.ptr();
auto& message = *queued_message.message;
-#ifdef WSEVENTLOOP_DEBUG
+#ifdef WSMESSAGELOOP_DEBUG
dbgprintf("WSMessageLoop: receiver{%p} message %u\n", receiver, (unsigned)message.type());
#endif
if (receiver)
@@ -73,7 +73,7 @@ int WSMessageLoop::exec()
void WSMessageLoop::post_message(WSMessageReceiver& receiver, OwnPtr<WSMessage>&& message)
{
-#ifdef WSEVENTLOOP_DEBUG
+#ifdef WSMESSAGELOOP_DEBUG
dbgprintf("WSMessageLoop::post_message: {%u} << receiver=%p, message=%p (type=%u)\n", m_queued_messages.size(), receiver, message.ptr(), message->type());
#endif
m_queued_messages.append({ receiver.make_weak_ptr(), move(message) });
@@ -166,7 +166,9 @@ void WSMessageLoop::wait_for_message()
sockaddr_un address;
socklen_t address_size = sizeof(address);
int client_fd = accept(m_server_fd, (sockaddr*)&address, &address_size);
+#ifdef WSMESSAGELOOP_DEBUG
dbgprintf("accept() returned fd=%d, address=%s\n", client_fd, address.sun_path);
+#endif
ASSERT(client_fd >= 0);
new WSClientConnection(client_fd);
}
diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp
index d738bf8e8c..0913c09b14 100644
--- a/WindowServer/WSWindowManager.cpp
+++ b/WindowServer/WSWindowManager.cpp
@@ -231,7 +231,9 @@ WSWindowManager::WSWindowManager()
}
return;
}
+#ifdef DEBUG_MENUS
dbgprintf("WSMenu 1 item activated: '%s'\n", item.text().characters());
+#endif
};
}
@@ -340,7 +342,9 @@ void WSWindowManager::set_current_menubar(WSMenuBar* menubar)
m_current_menubar = menubar->make_weak_ptr();
else
m_current_menubar = nullptr;
+#ifdef DEBUG_MENUS
dbgprintf("[WM] Current menubar is now %p\n", menubar);
+#endif
Point next_menu_location { menubar_menu_margin() / 2, 0 };
for_each_active_menubar_menu([&] (WSMenu& menu) {
int text_width = font().width(menu.name());