missing xcb_icccm_get_wm_hints_reply #define for __OpenBSD__

[spectrwm.git] / spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index 91a342d..95f2600 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -124,6 +124,7 @@ static const char   *buildstr = SPECTRWM_VERSION;
 #if defined(__OpenBSD__)
 #define xcb_icccm_wm_hints_t                   xcb_wm_hints_t
 #define xcb_icccm_get_wm_hints                 xcb_get_wm_hints
+#define xcb_icccm_get_wm_hints_reply           xcb_get_wm_hints_reply
 #define XCB_ICCCM_WM_HINT_X_URGENCY            XCB_WM_HINT_X_URGENCY
 #define XCB_ICCCM_WM_STATE_ICONIC              XCB_WM_STATE_ICONIC
 #define XCB_ICCCM_WM_STATE_WITHDRAWN           XCB_WM_STATE_WITHDRAWN
@@ -7306,8 +7307,8 @@ scan_xrandr(int i)
 #endif /* SWM_XRR_HAS_CRTC */
        struct swm_region       *r;
        int                     num_screens;
-       xcb_randr_get_screen_resources_cookie_t src;
-       xcb_randr_get_screen_resources_reply_t  *srr;
+       xcb_randr_get_screen_resources_current_cookie_t src;
+       xcb_randr_get_screen_resources_current_reply_t  *srr;
        xcb_randr_get_crtc_info_cookie_t        cic;
        xcb_randr_get_crtc_info_reply_t         *cir = NULL;
        xcb_randr_crtc_t        *crtc;
@@ -7328,8 +7329,10 @@ scan_xrandr(int i)
        /* map virtual screens onto physical screens */
 #ifdef SWM_XRR_HAS_CRTC
        if (xrandr_support) {
-               src = xcb_randr_get_screen_resources(conn, screens[i].root);
-               srr = xcb_randr_get_screen_resources_reply(conn, src, NULL);
+               src = xcb_randr_get_screen_resources_current(conn,
+                       screens[i].root);
+               srr = xcb_randr_get_screen_resources_current_reply(conn, src,
+                       NULL);
                if (srr == NULL)
                        new_region(&screens[i], 0, 0,
                            DisplayWidth(display, i),
@@ -7337,7 +7340,7 @@ scan_xrandr(int i)
                else
                        ncrtc = srr->num_crtcs;
                for (c = 0; c < ncrtc; c++) {
-                       crtc = xcb_randr_get_screen_resources_crtcs(srr);
+                       crtc = xcb_randr_get_screen_resources_current_crtcs(srr);
                        cic = xcb_randr_get_crtc_info(conn, crtc[c],
                                XCB_CURRENT_TIME);
                        cir = xcb_randr_get_crtc_info_reply(conn, cic, NULL);