pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ewmh): Use deleter to deallocate atoms

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-03 15:44:54 +01:00
parent 158d4dd515
commit 0f91d3d8df
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/utils/memory.hpp
View File

@ -8,9 +8,9 @@ namespace memory_util {
/** /**
* Create a shared pointer using malloc/free * Create a shared pointer using malloc/free
*/ */
template <typename T> template <typename T, typename Deleter = decltype(free)>
inline auto make_malloc_ptr(size_t size = sizeof(T)) { inline auto make_malloc_ptr(size_t size = sizeof(T), Deleter deleter = free) {
return shared_ptr<T>(static_cast<T*>(malloc(size)), free); return shared_ptr<T>(static_cast<T*>(malloc(size)), deleter);
} }
/** /**

1
include/x11/ewmh.hpp
View File

@ -15,7 +15,6 @@ namespace ewmh_util {
extern ewmh_connection_t g_ewmh_connection; extern ewmh_connection_t g_ewmh_connection;
ewmh_connection_t initialize(); ewmh_connection_t initialize();
void dealloc();
bool supports(xcb_ewmh_connection_t* ewmh, xcb_atom_t atom, int screen = 0); bool supports(xcb_ewmh_connection_t* ewmh, xcb_atom_t atom, int screen = 0);

18
src/x11/ewmh.cpp
View File

@ -1,5 +1,5 @@
#include "components/types.hpp"
#include "x11/ewmh.hpp" #include "x11/ewmh.hpp"
#include "components/types.hpp"
#include "x11/xutils.hpp" #include "x11/xutils.hpp"
POLYBAR_NS POLYBAR_NS
@ -9,19 +9,16 @@ namespace ewmh_util {
ewmh_connection_t initialize() { ewmh_connection_t initialize() {
if (!g_ewmh_connection) { if (!g_ewmh_connection) {
g_ewmh_connection = memory_util::make_malloc_ptr<xcb_ewmh_connection_t>(); g_ewmh_connection = memory_util::make_malloc_ptr<xcb_ewmh_connection_t>(
sizeof(xcb_ewmh_connection_t), bind(xcb_ewmh_connection_wipe, std::placeholders::_1));
auto* xconn = xutils::get_connection(); auto* xconn = xutils::get_connection();
auto* conn = g_ewmh_connection.get(); auto* conn = g_ewmh_connection.get();
xcb_ewmh_init_atoms_replies(conn, xcb_ewmh_init_atoms(xconn, conn), nullptr); xcb_ewmh_init_atoms_replies(conn, xcb_ewmh_init_atoms(xconn, conn), nullptr);
} }
return g_ewmh_connection;
}
void dealloc() { return g_ewmh_connection;
if (g_ewmh_connection) {
xcb_ewmh_connection_wipe(g_ewmh_connection.get());
g_ewmh_connection.reset();
}
} }
bool supports(xcb_ewmh_connection_t* ewmh, xcb_atom_t atom, int screen) { bool supports(xcb_ewmh_connection_t* ewmh, xcb_atom_t atom, int screen) {
@ -98,7 +95,8 @@ namespace ewmh_util {
} }
for (size_t n = 0; n < reply.desktop_viewport_len; n++) { for (size_t n = 0; n < reply.desktop_viewport_len; n++) {
viewports.emplace_back(position{static_cast<int16_t>(reply.desktop_viewport[n].x), static_cast<int16_t>(reply.desktop_viewport[n].y)}); viewports.emplace_back(position{
static_cast<int16_t>(reply.desktop_viewport[n].x), static_cast<int16_t>(reply.desktop_viewport[n].y)});
} }
return viewports; return viewports;