From 55a5c5d89684431ad2065e97eb2549f49b33184d Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Tue, 11 Oct 2016 13:10:25 +0200 Subject: [PATCH] fix: Pass xcb_params_t by value --- include/components/bar.hpp | 4 ++-- include/components/x11/fontmanager.hpp | 4 ++-- include/components/x11/window.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/components/bar.hpp b/include/components/bar.hpp index 8b9fdfcb..9ac227ca 100644 --- a/include/components/bar.hpp +++ b/include/components/bar.hpp @@ -308,7 +308,7 @@ class bar : public xpp::event::sink { XCB_AUX_ADD_PARAM(&mask, ¶ms, graphics_exposures, 0); xutils::pack_values(mask, ¶ms, value_list); m_gcontexts.emplace(gc(i), gcontext{m_connection, m_connection.generate_id()}); - m_connection.create_gc_checked(m_gcontexts.at(gc(i)), m_pixmap, mask, &value_list); + m_connection.create_gc_checked(m_gcontexts.at(gc(i)), m_pixmap, mask, value_list); } } @@ -689,7 +689,7 @@ class bar : public xpp::event::sink { "bar: color_change(%i, %s -> %s)", static_cast(gc_), color_.hex(), color_.rgb()); const uint32_t value_list[32]{color_.value()}; - m_connection.change_gc(m_gcontexts.at(gc_), XCB_GC_FOREGROUND, &value_list); + m_connection.change_gc(m_gcontexts.at(gc_), XCB_GC_FOREGROUND, value_list); if (gc_ == gc::FG) m_fontmanager->allocate_color(color_); diff --git a/include/components/x11/fontmanager.hpp b/include/components/x11/fontmanager.hpp index 79d67238..17e586e6 100644 --- a/include/components/x11/fontmanager.hpp +++ b/include/components/x11/fontmanager.hpp @@ -183,8 +183,8 @@ class fontmanager { } // }}} void set_gcontext_font(gcontext& gc, xcb_font_t font) { // {{{ - const uint32_t values[]{font}; - m_connection.change_gc(gc, XCB_GC_FONT, &values); + const uint32_t values[1]{font}; + m_connection.change_gc(gc, XCB_GC_FONT, values); } // }}} protected: diff --git a/include/components/x11/window.hpp b/include/components/x11/window.hpp index ed2f9fae..99ac7ff8 100644 --- a/include/components/x11/window.hpp +++ b/include/components/x11/window.hpp @@ -26,7 +26,7 @@ class window : public xpp::window { uint32_t value_list[16]; xutils::pack_values(mask, params, value_list); connection().create_window_checked(depth, operator*(), screen->root, x, y, w, h, 0, - XCB_WINDOW_CLASS_INPUT_OUTPUT, visual->visual_id, mask, &value_list); + XCB_WINDOW_CLASS_INPUT_OUTPUT, visual->visual_id, mask, value_list); return *this; }