nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Likely fix for #693

Browse source
This commit is contained in:
o9000 2018-01-19 21:19:18 +00:00
parent 28b1174c0f
commit 25dd623618
1 changed files with 56 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/util/common.c
View file

@ -924,17 +924,17 @@ void clear_pixmap(Pixmap p, int x, int y, int w, int h)
XRenderFreePicture(server.display, pict); XRenderFreePicture(server.display, pict);
} }
void get_text_size2(const PangoFontDescription *font, void get_text_size(const PangoFontDescription *font,
int *height, int *height,
int *width, int *width,
int available_height, int available_height,
int available_width, int available_width,
const char *text, const char *text,
int text_len, int text_len,
PangoWrapMode wrap, PangoWrapMode wrap,
PangoEllipsizeMode ellipsis, PangoEllipsizeMode ellipsis,
gboolean markup, gboolean markup,
double scale) double scale)
{ {
PangoRectangle rect_ink, rect; PangoRectangle rect_ink, rect;
@ -963,6 +963,7 @@ void get_text_size2(const PangoFontDescription *font,
pango_layout_get_pixel_extents(layout, &rect_ink, &rect); pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
*height = rect.height; *height = rect.height;
*width = rect.width; *width = rect.width;
// fprintf(stderr, "tint2: dimension : %d - %d\n", rect_ink.height, rect.height); // fprintf(stderr, "tint2: dimension : %d - %d\n", rect_ink.height, rect.height);
g_object_unref(layout); g_object_unref(layout);
@ -972,6 +973,50 @@ void get_text_size2(const PangoFontDescription *font,
XFreePixmap(server.display, pmap); XFreePixmap(server.display, pmap);
} }
void get_text_size2(const PangoFontDescription *font,
int *height,
int *width,
int available_height,
int available_width,
const char *text,
int text_len,
PangoWrapMode wrap,
PangoEllipsizeMode ellipsis,
gboolean markup,
double scale)
{
get_text_size(font, height, width, available_height, available_width, text, text_len, wrap, ellipsis, markup, scale);
// We do multiple passes, because pango sucks
int actual_height, actual_width, overflow = 0;
while (true) {
get_text_size(font, &actual_height, &actual_width, *height, *width, text, text_len, wrap, ellipsis, markup, scale);
if (actual_height <= *height)
break;
if (*width >= available_width + 50)
break;
overflow = 1;
fprintf(stderr, "tint2: text overflows, recomputing: available %dx%d, computed %dx%d, actual %dx%d\n",
available_width,
available_height,
*width,
*height,
actual_width,
actual_height);
(*width)++;
}
if (overflow) {
*height = actual_height;
fprintf(stderr, "tint2: text final size computed as: available %dx%d, computed %dx%d, actual %dx%d\n",
available_width,
available_height,
*width,
*height,
actual_width,
actual_height);
}
}
#if !GLIB_CHECK_VERSION(2, 34, 0) #if !GLIB_CHECK_VERSION(2, 34, 0)
GList *g_list_copy_deep(GList *list, GCopyFunc func, gpointer user_data) GList *g_list_copy_deep(GList *list, GCopyFunc func, gpointer user_data)
{ {