Use Xft for font loading and text drawing

This commit is contained in:
Bert Münnich
2016-08-06 15:27:58 +02:00
parent aabc2bddbd
commit c280129cef
8 changed files with 56 additions and 98 deletions

View File

@ -21,6 +21,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xft/Xft.h>
#include "types.h"
@ -59,9 +60,9 @@ typedef struct {
Window xwin;
win_env_t env;
unsigned long bgcol;
unsigned long fscol;
unsigned long selcol;
XftColor bgcol;
XftColor fscol;
XftColor selcol;
int x;
int y;
@ -81,8 +82,8 @@ typedef struct {
unsigned int h;
win_bar_t l;
win_bar_t r;
unsigned long bgcol;
unsigned long fgcol;
XftColor bgcol;
XftColor fgcol;
} bar;
} win_t;
@ -101,7 +102,7 @@ void win_clear(win_t*);
void win_draw(win_t*);
void win_draw_rect(win_t*, int, int, int, int, bool, int, unsigned long);
int win_textwidth(const char*, unsigned int, bool);
int win_textwidth(const win_env_t*, const char*, unsigned int, bool);
void win_set_title(win_t*, const char*);
void win_set_cursor(win_t*, cursor_t);