Add missing MAX macros, ensure that i3 can be compiled without pango

This commit is contained in:
Kacper Kowalik (Xarthisius) 2016-03-07 19:40:02 -06:00 committed by Kacper Kowalik
parent d68387bf5d
commit 301320585e
4 changed files with 12 additions and 0 deletions

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,
xcb_visualtype_t *visual, int x, int y, int max_width) {
assert(savedFont != NULL);
#if PANGO_SUPPORT
if (visual == NULL) {
visual = root_visual_type;
}
#endif
switch (savedFont->type) {
case FONT_TYPE_NONE:

View File

@ -11,6 +11,10 @@
*/
#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
*

View File

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

View File

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