From 5895593d0bac6861854bbe5e155b0b37590f5067 Mon Sep 17 00:00:00 2001
From: Nikos Tsipinakis <nikos@tsipinakis.com>
Date: Tue, 6 Mar 2018 19:47:48 +0200
Subject: [PATCH] Remove leftover cairo variables in x.c

Clean-up x.c from cairo items that were left over after the move to
draw.c.
---
 src/x11/x.c | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/src/x11/x.c b/src/x11/x.c
index c5a5353..1c5fb5a 100644
--- a/src/x11/x.c
+++ b/src/x11/x.c
@@ -12,11 +12,6 @@
 #include <glib-object.h>
 #include <locale.h>
 #include <math.h>
-#include <pango/pango-attributes.h>
-#include <pango/pango-font.h>
-#include <pango/pango-layout.h>
-#include <pango/pango-types.h>
-#include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,25 +36,6 @@
 xctx_t xctx;
 bool dunst_grab_errored = false;
 
-typedef struct _cairo_ctx {
-        cairo_status_t status;
-        cairo_surface_t *surface;
-        cairo_t *context;
-        PangoFontDescription *desc;
-} cairo_ctx_t;
-
-typedef struct _colored_layout {
-        PangoLayout *l;
-        color_t fg;
-        color_t bg;
-        color_t frame;
-        char *text;
-        PangoAttrList *attr;
-        cairo_surface_t *icon;
-        notification *n;
-} colored_layout;
-
-cairo_ctx_t cairo_ctx;
 static bool fullscreen_last = false;
 
 /* FIXME refactor setup teardown handlers into one setup and one teardown */
@@ -69,16 +45,6 @@ static void setopacity(Window win, unsigned long opacity);
 static void x_handle_click(XEvent ev);
 static void x_win_setup(void);
 
-static void x_cairo_setup(void)
-{
-        cairo_ctx.surface = cairo_xlib_surface_create(xctx.dpy,
-                        xctx.win, DefaultVisual(xctx.dpy, 0), WIDTH, HEIGHT);
-
-        cairo_ctx.context = cairo_create(cairo_ctx.surface);
-
-        cairo_ctx.desc = pango_font_description_from_string(settings.font);
-}
-
 cairo_surface_t *x_create_cairo_surface(void)
 {
         return cairo_xlib_surface_create(xctx.dpy,
@@ -347,9 +313,6 @@ static void x_handle_click(XEvent ev)
 
 void x_free(void)
 {
-        cairo_surface_destroy(cairo_ctx.surface);
-        cairo_destroy(cairo_ctx.context);
-
         if (xctx.dpy)
                 XCloseDisplay(xctx.dpy);
 }
@@ -429,7 +392,6 @@ void x_setup(void)
 
         init_screens();
         x_win_setup();
-        x_cairo_setup();
         x_shortcut_grab(&settings.history_ks);
 }