qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-23 01:14:04 +02:00
Code

eeshow/gui/over.c (overlay_set_related, _all): support related AoIs

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-19 03:32:41 -03:00
parent 49fe8518a5
commit dbf09a8dba
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eeshow/gui/over.c
View File

@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <assert.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
@ -47,6 +48,7 @@ struct overlay {
void *user; void *user;
struct aoi *aoi; struct aoi *aoi;
const struct overlay *related;
struct overlay *next, *prev; struct overlay *next, *prev;
}; };
@ -167,8 +169,13 @@ fprintf(stderr, "%u(%d) %u %.60s\n", ty, ink_rect.y / PANGO_SCALE, ink_h, over->
if (over->aoi) if (over->aoi)
aoi_update(over->aoi, &aoi_cfg); aoi_update(over->aoi, &aoi_cfg);
else else {
over->aoi = aoi_add(over->aois, &aoi_cfg); over->aoi = aoi_add(over->aois, &aoi_cfg);
if (over->related) {
assert(over->related->aoi);
aoi_set_related(over->aoi, over->related->aoi);
}
}
} }
return h; return h;
@ -318,6 +325,7 @@ struct overlay *overlay_add(struct overlay **overlays, struct aoi **aois,
over->click = click; over->click = click;
over->user = user; over->user = user;
over->aoi = NULL; over->aoi = NULL;
over->related = NULL;
prev = NULL; prev = NULL;
for (anchor = overlays; *anchor; anchor = &(*anchor)->next) for (anchor = overlays; *anchor; anchor = &(*anchor)->next)
@ -356,6 +364,31 @@ void overlay_text(struct overlay *over, const char *fmt, ...)
} }
/* ----- Nesting ----------------------------------------------------------- */
void overlay_set_related(struct overlay *over, struct overlay *related)
{
/*
* Relatedness is a property that only matters to AoIs, but we have to
* defer propagating it because we only know our AoI after drawing the
* overlay.
*/
assert(!over->related);
over->related = related;
}
void overlay_set_related_all(struct overlay *overlays, struct overlay *related)
{
struct overlay *over;
for (over = overlays; over; over = over->next)
overlay_set_related(over, related);
}
/* ----- Removal ----------------------------------------------------------- */ /* ----- Removal ----------------------------------------------------------- */

3
eeshow/gui/over.h
View File

@ -60,6 +60,9 @@ void overlay_text_raw(struct overlay *over, const char *s);
void overlay_text(struct overlay *over, const char *fmt, ...); void overlay_text(struct overlay *over, const char *fmt, ...);
void overlay_style(struct overlay *over, const struct overlay_style *style); void overlay_style(struct overlay *over, const struct overlay_style *style);
void overlay_set_related(struct overlay *over, struct overlay *related);
void overlay_set_related_all(struct overlay *overlays, struct overlay *related);
void overlay_remove(struct overlay **overlays, struct overlay *over); void overlay_remove(struct overlay **overlays, struct overlay *over);
void overlay_remove_all(struct overlay **overlays); void overlay_remove_all(struct overlay **overlays);