nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove leftover cairo variables in x.c

Browse Source 
Clean-up x.c from cairo items that were left over after the move to
draw.c.
This commit is contained in:
Nikos Tsipinakis 2018-03-06 19:47:48 +02:00
parent 466f95eb91
commit 5895593d0b
1 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/x11/x.c
View File

@ -12,11 +12,6 @@
#include <glib-object.h> #include <glib-object.h>
#include <locale.h> #include <locale.h>
#include <math.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 <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -41,25 +36,6 @@
xctx_t xctx; xctx_t xctx;
bool dunst_grab_errored = false; 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; static bool fullscreen_last = false;
/* FIXME refactor setup teardown handlers into one setup and one teardown */ /* 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_handle_click(XEvent ev);
static void x_win_setup(void); 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) cairo_surface_t *x_create_cairo_surface(void)
{ {
return cairo_xlib_surface_create(xctx.dpy, return cairo_xlib_surface_create(xctx.dpy,
@ -347,9 +313,6 @@ static void x_handle_click(XEvent ev)
void x_free(void) void x_free(void)
{ {
cairo_surface_destroy(cairo_ctx.surface);
cairo_destroy(cairo_ctx.context);
if (xctx.dpy) if (xctx.dpy)
XCloseDisplay(xctx.dpy); XCloseDisplay(xctx.dpy);
} }
@ -429,7 +392,6 @@ void x_setup(void)
init_screens(); init_screens();
x_win_setup(); x_win_setup();
x_cairo_setup();
x_shortcut_grab(&settings.history_ks); x_shortcut_grab(&settings.history_ks);
} }