nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename I3BAR_CAIRO to CAIRO_SUPPORT.

This commit is contained in:
Ingo Bürk 2015-11-07 14:28:45 -05:00
parent f836e4c771
commit 38fcaf3fa8
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -142,7 +142,7 @@ PANGO_CFLAGS := $(call cflags_for_lib, cairo)
PANGO_CFLAGS += $(call cflags_for_lib, pangocairo) PANGO_CFLAGS += $(call cflags_for_lib, pangocairo)
I3_CPPFLAGS += -DPANGO_SUPPORT=1 I3_CPPFLAGS += -DPANGO_SUPPORT=1
ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.14.4 cairo 2>/dev/null && echo 1),1) ifeq ($(shell $(PKG_CONFIG) --atleast-version=1.14.4 cairo 2>/dev/null && echo 1),1)
I3_CPPFLAGS += -DI3BAR_CAIRO=1 I3_CPPFLAGS += -DCAIRO_SUPPORT=1
endif endif
PANGO_LIBS := $(call ldflags_for_lib, cairo) PANGO_LIBS := $(call ldflags_for_lib, cairo)
PANGO_LIBS += $(call ldflags_for_lib, pangocairo) PANGO_LIBS += $(call ldflags_for_lib, pangocairo)

6
i3bar/include/draw_util.h
View File

@ -8,11 +8,11 @@
*/ */
#pragma once #pragma once
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
#include <cairo/cairo-xcb.h> #include <cairo/cairo-xcb.h>
#endif #endif
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
/* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989 /* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
* and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */ * and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
#define CAIRO_SURFACE_FLUSH(surface) \ #define CAIRO_SURFACE_FLUSH(surface) \
@ -44,7 +44,7 @@ typedef struct surface_t {
int width; int width;
int height; int height;
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
/* A cairo surface representing the drawable. */ /* A cairo surface representing the drawable. */
cairo_surface_t *surface; cairo_surface_t *surface;

18
i3bar/src/draw_util.c
View File

@ -11,7 +11,7 @@
#include <string.h> #include <string.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xcb_aux.h> #include <xcb/xcb_aux.h>
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
#include <cairo/cairo-xcb.h> #include <cairo/cairo-xcb.h>
#endif #endif
@ -38,7 +38,7 @@ void draw_util_surface_init(surface_t *surface, xcb_drawable_t drawable, int wid
if (xcb_request_failed(gc_cookie, "Could not create graphical context")) if (xcb_request_failed(gc_cookie, "Could not create graphical context"))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
surface->surface = cairo_xcb_surface_create(xcb_connection, surface->id, visual_type, width, height); surface->surface = cairo_xcb_surface_create(xcb_connection, surface->id, visual_type, width, height);
surface->cr = cairo_create(surface->surface); surface->cr = cairo_create(surface->surface);
#endif #endif
@ -50,7 +50,7 @@ void draw_util_surface_init(surface_t *surface, xcb_drawable_t drawable, int wid
*/ */
void draw_util_surface_free(surface_t *surface) { void draw_util_surface_free(surface_t *surface) {
xcb_free_gc(xcb_connection, surface->gc); xcb_free_gc(xcb_connection, surface->gc);
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
cairo_surface_destroy(surface->surface); cairo_surface_destroy(surface->surface);
cairo_destroy(surface->cr); cairo_destroy(surface->cr);
#endif #endif
@ -79,7 +79,7 @@ color_t draw_util_hex_to_color(const char *color) {
* *
*/ */
static void draw_util_set_source_color(surface_t *surface, color_t color) { static void draw_util_set_source_color(surface_t *surface, color_t color) {
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
cairo_set_source_rgb(surface->cr, color.red, color.green, color.blue); cairo_set_source_rgb(surface->cr, color.red, color.green, color.blue);
#else #else
uint32_t colorpixel = color.colorpixel; uint32_t colorpixel = color.colorpixel;
@ -95,7 +95,7 @@ static void draw_util_set_source_color(surface_t *surface, color_t color) {
* *
*/ */
void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width) { void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width) {
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
/* Flush any changes before we draw the text as this might use XCB directly. */ /* Flush any changes before we draw the text as this might use XCB directly. */
CAIRO_SURFACE_FLUSH(surface->surface); CAIRO_SURFACE_FLUSH(surface->surface);
#endif #endif
@ -103,7 +103,7 @@ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_
set_font_colors(surface->gc, fg_color.colorpixel, bg_color.colorpixel); set_font_colors(surface->gc, fg_color.colorpixel, bg_color.colorpixel);
draw_text(text, surface->id, surface->gc, visual_type, x, y, max_width); draw_text(text, surface->id, surface->gc, visual_type, x, y, max_width);
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
/* Notify cairo that we (possibly) used another way to draw on the surface. */ /* Notify cairo that we (possibly) used another way to draw on the surface. */
cairo_surface_mark_dirty(surface->surface); cairo_surface_mark_dirty(surface->surface);
#endif #endif
@ -116,7 +116,7 @@ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_
* *
*/ */
void draw_util_rectangle(surface_t *surface, color_t color, double x, double y, double w, double h) { void draw_util_rectangle(surface_t *surface, color_t color, double x, double y, double w, double h) {
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
cairo_save(surface->cr); cairo_save(surface->cr);
/* Using the SOURCE operator will copy both color and alpha information directly /* Using the SOURCE operator will copy both color and alpha information directly
@ -146,7 +146,7 @@ void draw_util_rectangle(surface_t *surface, color_t color, double x, double y,
* *
*/ */
void draw_util_clear_surface(surface_t *surface, color_t color) { void draw_util_clear_surface(surface_t *surface, color_t color) {
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
cairo_save(surface->cr); cairo_save(surface->cr);
/* Using the SOURCE operator will copy both color and alpha information directly /* Using the SOURCE operator will copy both color and alpha information directly
@ -176,7 +176,7 @@ void draw_util_clear_surface(surface_t *surface, color_t color) {
*/ */
void draw_util_copy_surface(surface_t *src, surface_t *dest, double src_x, double src_y, void draw_util_copy_surface(surface_t *src, surface_t *dest, double src_x, double src_y,
double dest_x, double dest_y, double width, double height) { double dest_x, double dest_y, double width, double height) {
#ifdef I3BAR_CAIRO #ifdef CAIRO_SUPPORT
cairo_save(dest->cr); cairo_save(dest->cr);
/* Using the SOURCE operator will copy both color and alpha information directly /* Using the SOURCE operator will copy both color and alpha information directly