umgeher/herbe
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Finish multiline support

Browse source
This commit is contained in:
Samuel Dudik 2020-08-01 21:00:20 +02:00
parent ed9d201bce
commit 7161997b6f
3 changed files with 58 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

117
herbe.c
View file

@ -4,46 +4,12 @@
#include <stdlib.h>
#include <signal.h>
#include <unistd.h>
#include <math.h>
#include "config.h"
Display *display;
Window window;
int get_eol(char *body, XftFont *font)
{
int body_len = strlen(body);
XGlyphInfo info;
XftTextExtentsUtf8(display, font, body, body_len, &info);
int max_text_width = width - 2 * padding;
if (info.width < max_text_width)
return body_len;
int eol = max_text_width / font->max_advance_width;
info.width = 0;
while (info.width < max_text_width)
{
eol++;
XftTextExtentsUtf8(display, font, body, eol, &info);
}
return --eol;
// if (body[eol] == ' ')
// return --eol;
// while (body[eol] != ' ')
// {
// eol--;
// }
// return ++eol;
}
void expire()
{
XEvent event;
@ -77,8 +43,8 @@ int main(int argc, char *argv[])
Visual *visual = DefaultVisual(display, screen);
Colormap colormap = DefaultColormap(display, screen);
int window_width = DisplayWidth(display, screen);
int window_height = DisplayHeight(display, screen);
int screen_width = DisplayWidth(display, screen);
int screen_height = DisplayHeight(display, screen);
XftColor color;
@ -91,31 +57,66 @@ int main(int argc, char *argv[])
XftFont *font = XftFontOpenName(display, screen, font_pattern);
int max_text_width = width - 2 * padding;
int eols_size = 5;
int *eols = malloc(eols_size * sizeof(int));
eols[0] = 0;
int remainder = strlen(body);
int num_of_lines = 1;
while (1)
{
XGlyphInfo info;
info.width = 0;
int eol = max_text_width / font->max_advance_width;
while (info.width < max_text_width)
{
eol++;
XftTextExtentsUtf8(display, font, body, eol, &info);
}
--eol;
if (eol >= remainder)
{
if (eols_size < num_of_lines + 1)
{
eols_size += 5;
eols = realloc(eols, eols_size * sizeof(int));
}
eols[num_of_lines] = eols[num_of_lines - 1] + remainder;
num_of_lines++;
break;
}
remainder -= eol;
if (eols_size < num_of_lines + 1)
{
eols_size += 5;
eols = realloc(eols, eols_size * sizeof(int));
}
eols[num_of_lines] = eols[num_of_lines - 1] + eol;
num_of_lines++;
}
unsigned int x = pos_x;
unsigned int y = pos_y;
unsigned int height = font->ascent - font->descent + padding * 2;
unsigned int text_height = font->ascent - font->descent;
unsigned int height = (num_of_lines - 2) * line_spacing + (num_of_lines - 1) * text_height + 2 * padding;
switch (corner)
{
case BOTTOM_RIGHT:
y = window_height - height - border_size * 2 - pos_y;
y = screen_height - height - border_size * 2 - pos_y;
case TOP_RIGHT:
x = window_width - width - border_size * 2 - pos_x;
x = screen_width - width - border_size * 2 - pos_x;
break;
case BOTTOM_LEFT:
y = window_height - height - border_size * 2 - pos_y;
y = screen_height - height - border_size * 2 - pos_y;
}
XGlyphInfo info;
XftTextExtentsUtf8(display, font, body, strlen(body), &info);
int num_of_lines = ceil((float)info.width / (width - 2 * padding));
window = XCreateWindow(
display, RootWindow(display, screen), x,
y, width, (num_of_lines - 1) * 5 + num_of_lines * (font->ascent - font->descent) + 2 * padding, border_size,
DefaultDepth(display, screen), CopyFromParent,
visual,
CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes);
window = XCreateWindow(display, RootWindow(display, screen), x, y, width, height, border_size, DefaultDepth(display, screen), CopyFromParent, visual,
CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes);
XftDraw *draw = XftDrawCreate(display, window, visual, colormap);
XftColorAllocName(display, visual, colormap, font_color, &color);
@ -124,14 +125,6 @@ int main(int argc, char *argv[])
XMapWindow(display, window);
int eols[num_of_lines + 1];
eols[0] = 0;
for (int i = 1; i < num_of_lines + 1; i++)
{
eols[i] = eols[i - 1] + get_eol(body + eols[i - 1], font);
}
XEvent event;
while (1)
@ -141,16 +134,14 @@ int main(int argc, char *argv[])
if (event.type == Expose)
{
XClearWindow(display, window);
for (int i = 1; i < num_of_lines + 1; i++)
{
XftDrawStringUtf8(draw, &color, font, padding, 5 * (i - 1) + (font->ascent - font->descent) * i + padding, body + eols[i - 1], eols[i] - eols[i - 1]);
}
for (int i = 1; i < num_of_lines; i++)
XftDrawStringUtf8(draw, &color, font, padding, line_spacing * (i - 1) + text_height * i + padding, body + eols[i - 1], eols[i] - eols[i - 1]);
}
if (event.type == ButtonPress)
break;
}
free(eols);
XftDrawDestroy(draw);
XftColorFree(display, visual, colormap, &color);
XftFontClose(display, font);