godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add status_ctx struct to use status sequences everywhere by using context

Browse Source
This commit is contained in:
Martin Duquesnoy
2012-01-22 20:11:01 +01:00
parent 9d462ac71e
commit feaa413951
5 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/draw.h
View File

@@ -37,21 +37,24 @@ draw_rect(Drawable d, struct geo *g, Color bg)
#ifdef HAVE_IMLIB2
/*
* Draw image on drawable with g geo
* Require that the image was loaded with draw_image_load()
*/
static inline void
draw_image(Drawable d, struct geo *g, char *path)
draw_image(Drawable d, struct geo *g)
{
Imlib_Image image = imlib_load_image(path);
imlib_context_set_drawable(d);
imlib_context_set_image(image);
imlib_render_image_on_drawable_at_size(g->x, g->y, g->w, g->h);
imlib_free_image();
}
/*
* Load image, set it in imlib context, and return
* width & height as argument 2 & 3
*/
static inline void
draw_image_get_size(char *path, int *w, int *h)
draw_image_load(char *path, int *w, int *h)
{
Imlib_Image image = imlib_load_image(path);
@@ -59,8 +62,6 @@ draw_image_get_size(char *path, int *w, int *h)
*w = imlib_image_get_width();
*h = imlib_image_get_height();
imlib_free_image();
}
#endif /* HAVE_IMLIB2 */

15
src/infobar.c
View File

@@ -14,6 +14,7 @@
static void infobar_elem_tag_init(struct element *e);
static void infobar_elem_tag_update(struct element *e);
static void infobar_elem_status_init(struct element *e);
static void infobar_elem_status_update(struct element *e);
const struct elem_funcs
{
@@ -23,7 +24,7 @@ const struct elem_funcs
} elem_funcs[] =
{
{ 't', infobar_elem_tag_init, infobar_elem_tag_update },
{ 's', infobar_elem_status_init, status_manage },
{ 's', infobar_elem_status_init, infobar_elem_status_update },
/* { 'l', infobar_elem_layout_init, infobar_elem_layout_update },
{ 'S', infobar_elem_selbar_init, infobar_elem_selbar_update },
@@ -126,8 +127,16 @@ infobar_elem_status_init(struct element *e)
SLIST_INSERT_HEAD(&e->bars, b, enext);
e->infobar->statusctx = status_new_ctx(b, e->infobar->theme);
e->infobar->screen->elemupdate |= FLAGINT(ElemStatus);
e->infobar->status = strdup("wmfs2");
e->infobar->statusctx.status = strdup("wmfs2");
}
static void
infobar_elem_status_update(struct element *e)
{
status_manage(&e->infobar->statusctx);
}
#define ELEM_INIT(a) \
@@ -264,8 +273,6 @@ infobar_new(struct screen *s, char *name, struct theme *theme, enum barpos pos,
/* struct elements */
infobar_elem_init(i);
SLIST_INIT(&i->statushead);
/* Render, only if pos is Top or Bottom */
if(!map)
return i;

112
src/status.c
View File

@@ -12,7 +12,7 @@
#include <string.h>
static struct status_seq*
struct status_seq*
status_new_seq(char type, int narg, int minarg, char *args[], int *shift)
{
struct status_seq *sq = xcalloc(1, sizeof(struct status_seq));
@@ -34,12 +34,21 @@ status_new_seq(char type, int narg, int minarg, char *args[], int *shift)
return sq;
}
struct status_ctx
status_new_ctx(struct barwin *b, struct theme *t)
{
struct status_ctx ctx = { .barwin = b, .theme = t };
SLIST_INIT(&ctx.statushead);
return ctx;
}
/* Parse mousebind sequence next normal sequence: \<seq>[](button;func;cmd) */
static char*
status_parse_mouse(struct status_seq *sq, struct element *e, char *str)
status_parse_mouse(struct status_seq *sq, struct status_ctx *ctx, char *str)
{
struct mousebind *m;
struct barwin *b = SLIST_FIRST(&e->bars);
char *end, *arg[3] = { NULL };
int i;
@@ -55,7 +64,7 @@ status_parse_mouse(struct status_seq *sq, struct element *e, char *str)
m->func = uicb_name_func(arg[1]);
m->cmd = (i > 1 ? xstrdup(arg[2]) : NULL);
SLIST_INSERT_HEAD(&b->mousebinds, m, next);
SLIST_INSERT_HEAD(&ctx->barwin->mousebinds, m, next);
SLIST_INSERT_HEAD(&sq->mousebinds, m, snext);
return end + 1;
@@ -68,11 +77,11 @@ status_parse_mouse(struct status_seq *sq, struct element *e, char *str)
continue; \
}
static void
status_parse(struct element *e)
status_parse(struct status_ctx *ctx)
{
struct status_seq *sq, *prev = NULL;
int i, shift = 0;
char *dstr = xstrdup(e->infobar->status), *sauv = dstr;
char *dstr = xstrdup(ctx->status), *sauv = dstr;
char type, *p, *end, *arg[6] = { NULL };
for(; *dstr; ++dstr)
@@ -133,14 +142,14 @@ status_parse(struct element *e)
#endif /* HAVE_IMLIB2 */
}
SLIST_INSERT_TAIL(&e->infobar->statushead, sq, next, prev);
SLIST_INSERT_TAIL(&ctx->statushead, sq, next, prev);
/*
* Optional mousebind sequence(s) \<seq>[](button;func;cmd)
* Parse it while there is a mousebind sequence.
*/
dstr = ++end;
while((*(dstr = status_parse_mouse(sq, e, dstr)) == '('));
while((*(dstr = status_parse_mouse(sq, ctx, dstr)) == '('));
prev = sq;
}
@@ -148,40 +157,39 @@ status_parse(struct element *e)
free(sauv);
}
#define STATUS_ALIGN(align) \
if(align == Left) \
{ \
sq->geo.x = left; \
left += sq->geo.w; \
} \
else if(align == Right) \
{ \
sq->geo.x = e->geo.w - right - sq->geo.w; \
right += sq->geo.w; \
#define STATUS_ALIGN(align) \
if(align == Left) \
{ \
sq->geo.x = left; \
left += sq->geo.w; \
} \
else if(align == Right) \
{ \
sq->geo.x = ctx->barwin->geo.w - right - sq->geo.w; \
right += sq->geo.w; \
}
static void
status_apply_list(struct element *e)
status_apply_list(struct status_ctx *ctx)
{
struct status_seq *sq;
struct barwin *b = SLIST_FIRST(&e->bars);
struct mousebind *m;
int left = 0, right = 0, w, h;
SLIST_FOREACH(sq, &e->infobar->statushead, next)
SLIST_FOREACH(sq, &ctx->statushead, next)
{
switch(sq->type)
{
/* Text */
case 's':
sq->geo.w = draw_textw(e->infobar->theme, sq->str);
sq->geo.h = e->infobar->theme->font.height;
sq->geo.w = draw_textw(ctx->theme, sq->str);
sq->geo.h = ctx->theme->font.height;
if(sq->align != NoAlign)
sq->geo.y = TEXTY(e->infobar->theme, e->geo.h);
sq->geo.y = TEXTY(ctx->theme, ctx->barwin->geo.h);
STATUS_ALIGN(sq->align);
draw_text(b->dr, e->infobar->theme, sq->geo.x, sq->geo.y, sq->color, sq->str);
draw_text(ctx->barwin->dr, ctx->theme, sq->geo.x, sq->geo.y, sq->color, sq->str);
if(!SLIST_EMPTY(&sq->mousebinds))
SLIST_FOREACH(m, &sq->mousebinds, snext)
@@ -195,11 +203,11 @@ status_apply_list(struct element *e)
/* Rectangle */
case 'R':
if(sq->align != NoAlign)
sq->geo.y = (e->geo.h >> 1) - (sq->geo.h >> 1);
sq->geo.y = (ctx->barwin->geo.h >> 1) - (sq->geo.h >> 1);
STATUS_ALIGN(sq->align);
draw_rect(b->dr, &sq->geo, sq->color);
draw_rect(ctx->barwin->dr, &sq->geo, sq->color);
if(!SLIST_EMPTY(&sq->mousebinds))
SLIST_FOREACH(m, &sq->mousebinds, snext)
@@ -210,7 +218,7 @@ status_apply_list(struct element *e)
/* Image */
#ifdef HAVE_IMLIB2
case 'i':
draw_image_get_size(sq->str, &w, &h);
draw_image_load(sq->str, &w, &h);
if(sq->geo.w <= 0)
sq->geo.w = w;
@@ -218,11 +226,11 @@ status_apply_list(struct element *e)
sq->geo.h = h;
if(sq->align != NoAlign)
sq->geo.y = (e->geo.h >> 1) - (sq->geo.h >> 1);
sq->geo.y = (ctx->barwin->geo.h >> 1) - (sq->geo.h >> 1);
STATUS_ALIGN(sq->align);
draw_image(b->dr, &sq->geo, sq->str);
draw_image(ctx->barwin->dr, &sq->geo);
if(!SLIST_EMPTY(&sq->mousebinds))
SLIST_FOREACH(m, &sq->mousebinds, snext)
@@ -237,57 +245,53 @@ status_apply_list(struct element *e)
/* Render current statustext of an element */
void
status_render(struct element *e)
status_render(struct status_ctx *ctx)
{
struct barwin *b = SLIST_FIRST(&e->bars);
if(!e->infobar->status)
if(!ctx->status)
return;
barwin_refresh_color(b);
barwin_refresh_color(ctx->barwin);
/* Use simple text instead sequence if no sequence found */
if(SLIST_EMPTY(&e->infobar->statushead))
if(SLIST_EMPTY(&ctx->statushead))
{
int l = draw_textw(e->infobar->theme, e->infobar->status);
draw_text(b->dr, e->infobar->theme, e->geo.w - l,
TEXTY(e->infobar->theme, e->geo.h), b->fg, e->infobar->status);
int l = draw_textw(ctx->theme, ctx->status);
draw_text(ctx->barwin->dr, ctx->theme, ctx->barwin->geo.w - l,
TEXTY(ctx->theme, ctx->barwin->geo.h), ctx->barwin->fg, ctx->status);
}
else
status_apply_list(e);
status_apply_list(ctx);
barwin_refresh(b);
barwin_refresh(ctx->barwin);
}
/* Parse and render statustext */
void
status_manage(struct element *e)
status_manage(struct status_ctx *ctx)
{
struct status_seq *sq;
struct mousebind *m;
struct barwin *b = SLIST_FIRST(&e->bars);
/*
* Flush previous linked list of status sequences
* and mousebind of status barwin
*/
while(!SLIST_EMPTY(&e->infobar->statushead))
while(!SLIST_EMPTY(&ctx->statushead))
{
sq = SLIST_FIRST(&e->infobar->statushead);
SLIST_REMOVE_HEAD(&e->infobar->statushead, next);
sq = SLIST_FIRST(&ctx->statushead);
SLIST_REMOVE_HEAD(&ctx->statushead, next);
free(sq->str);
free(sq);
}
while(!SLIST_EMPTY(&b->mousebinds))
while(!SLIST_EMPTY(&ctx->barwin->mousebinds))
{
m = SLIST_FIRST(&b->mousebinds);
SLIST_REMOVE_HEAD(&b->mousebinds, next);
m = SLIST_FIRST(&ctx->barwin->mousebinds);
SLIST_REMOVE_HEAD(&ctx->barwin->mousebinds, next);
free((void*)m->cmd);
free(m);
}
status_parse(e);
status_render(e);
status_parse(ctx);
status_render(ctx);
}
/* Syntax: "<infobar name> <status string>" */
@@ -310,8 +314,8 @@ uicb_status(Uicb cmd)
SLIST_FOREACH(ib, &s->infobars, next)
if(!strcmp(cmd, ib->name))
{
free(ib->status);
ib->status = xstrdup(p);
free(ib->statusctx.status);
ib->statusctx.status = xstrdup(p);
infobar_elem_screen_update(s, ElemStatus);
}
}

5
src/status.h
View File

@@ -8,8 +8,9 @@
#include "wmfs.h"
void status_render(struct element *e);
void status_manage(struct element *e);
struct status_ctx status_new_ctx(struct barwin *b, struct theme *t);
void status_render(struct status_ctx *ctx);
void status_manage(struct status_ctx *ctx);
void uicb_status(Uicb cmd);
#endif /* STATUS_H */

10
src/wmfs.h
View File

@@ -107,6 +107,14 @@ struct status_seq
SLIST_ENTRY(status_seq) next;
};
struct status_ctx
{
struct barwin *barwin;
struct theme *theme;
char *status;
SLIST_HEAD(, status_seq) statushead;
};
struct element
{
struct geo geo;
@@ -125,12 +133,12 @@ struct infobar
struct geo geo;
struct screen *screen;
struct theme *theme;
struct status_ctx statusctx;
enum barpos pos;
char *elemorder;
char *name;
char *status;
TAILQ_HEAD(esub, element) elements;
SLIST_HEAD(, status_seq) statushead;
SLIST_ENTRY(infobar) next;
};