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

Merge pull request #2243 from Xarthisius/pango_support 

Add missing MAX macros, ensure that i3 can be compiled without pango
This commit is contained in:
Michael Stapelberg 2016-03-30 08:47:56 +02:00
parent eb837cbd00 eb0a0a166f
commit 84c39a1103
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libi3.h
View File

@ -20,7 +20,7 @@
#if PANGO_SUPPORT #if PANGO_SUPPORT
#include <pango/pango.h> #include <pango/pango.h>
#endif #endif
#ifdef CAIRO_SUPPORT #if CAIRO_SUPPORT
#include <cairo/cairo-xcb.h> #include <cairo/cairo-xcb.h>
#endif #endif
@ -518,7 +518,7 @@ typedef struct placeholder_t {
*/ */
char *format_placeholders(char *format, placeholder_t *placeholders, int num); char *format_placeholders(char *format, placeholder_t *placeholders, int num);
#ifdef CAIRO_SUPPORT #if 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) \
@ -542,7 +542,7 @@ typedef struct surface_t {
int width; int width;
int height; int height;
#ifdef CAIRO_SUPPORT #if CAIRO_SUPPORT
/* A cairo surface representing the drawable. */ /* A cairo surface representing the drawable. */
cairo_surface_t *surface; cairo_surface_t *surface;

20
libi3/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 CAIRO_SUPPORT #if CAIRO_SUPPORT
#include <cairo/cairo-xcb.h> #include <cairo/cairo-xcb.h>
#endif #endif
@ -50,7 +50,7 @@ void draw_util_surface_init(xcb_connection_t *conn, surface_t *surface, xcb_draw
ELOG("Could not create graphical context. Error code: %d. Please report this bug.\n", error->error_code); ELOG("Could not create graphical context. Error code: %d. Please report this bug.\n", error->error_code);
} }
#ifdef CAIRO_SUPPORT #if CAIRO_SUPPORT
surface->surface = cairo_xcb_surface_create(conn, surface->id, surface->visual_type, width, height); surface->surface = cairo_xcb_surface_create(conn, surface->id, surface->visual_type, width, height);
surface->cr = cairo_create(surface->surface); surface->cr = cairo_create(surface->surface);
#endif #endif
@ -62,7 +62,7 @@ void draw_util_surface_init(xcb_connection_t *conn, surface_t *surface, xcb_draw
*/ */
void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) { void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) {
xcb_free_gc(conn, surface->gc); xcb_free_gc(conn, surface->gc);
#ifdef CAIRO_SUPPORT #if CAIRO_SUPPORT
cairo_surface_destroy(surface->surface); cairo_surface_destroy(surface->surface);
cairo_destroy(surface->cr); cairo_destroy(surface->cr);
@ -81,7 +81,7 @@ void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) {
void draw_util_surface_set_size(surface_t *surface, int width, int height) { void draw_util_surface_set_size(surface_t *surface, int width, int height) {
surface->width = width; surface->width = width;
surface->height = height; surface->height = height;
#ifdef CAIRO_SUPPORT #if CAIRO_SUPPORT
cairo_xcb_surface_set_size(surface->surface, width, height); cairo_xcb_surface_set_size(surface->surface, width, height);
#endif #endif
} }
@ -121,7 +121,7 @@ color_t draw_util_hex_to_color(const char *color) {
static void draw_util_set_source_color(xcb_connection_t *conn, surface_t *surface, color_t color) { static void draw_util_set_source_color(xcb_connection_t *conn, surface_t *surface, color_t color) {
RETURN_UNLESS_SURFACE_INITIALIZED(surface); RETURN_UNLESS_SURFACE_INITIALIZED(surface);
#ifdef CAIRO_SUPPORT #if CAIRO_SUPPORT
cairo_set_source_rgba(surface->cr, color.red, color.green, color.blue, color.alpha); cairo_set_source_rgba(surface->cr, color.red, color.green, color.blue, color.alpha);
#else #else
uint32_t colorpixel = color.colorpixel; uint32_t colorpixel = color.colorpixel;
@ -139,7 +139,7 @@ static void draw_util_set_source_color(xcb_connection_t *conn, surface_t *surfac
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) {
RETURN_UNLESS_SURFACE_INITIALIZED(surface); RETURN_UNLESS_SURFACE_INITIALIZED(surface);
#ifdef CAIRO_SUPPORT #if 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
@ -147,7 +147,7 @@ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_
set_font_colors(surface->gc, fg_color, bg_color); set_font_colors(surface->gc, fg_color, bg_color);
draw_text(text, surface->id, surface->gc, surface->visual_type, x, y, max_width); draw_text(text, surface->id, surface->gc, surface->visual_type, x, y, max_width);
#ifdef CAIRO_SUPPORT #if 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
@ -162,7 +162,7 @@ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_
void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t color, double x, double y, double w, double h) { void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t color, double x, double y, double w, double h) {
RETURN_UNLESS_SURFACE_INITIALIZED(surface); RETURN_UNLESS_SURFACE_INITIALIZED(surface);
#ifdef CAIRO_SUPPORT #if 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
@ -194,7 +194,7 @@ void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t col
void draw_util_clear_surface(xcb_connection_t *conn, surface_t *surface, color_t color) { void draw_util_clear_surface(xcb_connection_t *conn, surface_t *surface, color_t color) {
RETURN_UNLESS_SURFACE_INITIALIZED(surface); RETURN_UNLESS_SURFACE_INITIALIZED(surface);
#ifdef CAIRO_SUPPORT #if 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
@ -227,7 +227,7 @@ void draw_util_copy_surface(xcb_connection_t *conn, surface_t *src, surface_t *d
RETURN_UNLESS_SURFACE_INITIALIZED(src); RETURN_UNLESS_SURFACE_INITIALIZED(src);
RETURN_UNLESS_SURFACE_INITIALIZED(dest); RETURN_UNLESS_SURFACE_INITIALIZED(dest);
#ifdef CAIRO_SUPPORT #if 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

2
libi3/font.c
View File

@ -397,9 +397,11 @@ static void draw_text_xcb(const xcb_char2b_t *text, size_t text_len, xcb_drawabl
void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc, void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc,
xcb_visualtype_t *visual, int x, int y, int max_width) { xcb_visualtype_t *visual, int x, int y, int max_width) {
assert(savedFont != NULL); assert(savedFont != NULL);
#if PANGO_SUPPORT
if (visual == NULL) { if (visual == NULL) {
visual = root_visual_type; visual = root_visual_type;
} }
#endif
switch (savedFont->type) { switch (savedFont->type) {
case FONT_TYPE_NONE: case FONT_TYPE_NONE:

4
src/floating.c
View File

@ -11,6 +11,10 @@
*/ */
#include "all.h" #include "all.h"
#ifndef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#endif
/* /*
* Calculates sum of heights and sum of widths of all currently active outputs * Calculates sum of heights and sum of widths of all currently active outputs
* *

2
src/util.c
View File

@ -341,10 +341,12 @@ char *pango_escape_markup(char *input) {
if (!font_is_pango()) if (!font_is_pango())
return input; return input;
#if PANGO_SUPPORT
char *escaped = g_markup_escape_text(input, -1); char *escaped = g_markup_escape_text(input, -1);
FREE(input); FREE(input);
return escaped; return escaped;
#endif
} }
/* /*

4
src/x.c
View File

@ -12,6 +12,10 @@
*/ */
#include "all.h" #include "all.h"
#ifndef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#endif
xcb_window_t ewmh_window; xcb_window_t ewmh_window;
/* Stores the X11 window ID of the currently focused window */ /* Stores the X11 window ID of the currently focused window */