diff options
| author | Thomas White <taw@physics.org> | 2018-03-12 19:55:39 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-03-12 19:55:39 +0100 |
| commit | 8164766c66c8d9149a7741e5625aef9d9fdac854 (patch) | |
| tree | 5bc07c96024509ddf91728126f79977a53c16d81 /src/frame.c | |
| parent | c7a86a47001baca65c87d0f060f9a57af8537cf2 (diff) | |
Add rscblocks for image and callback paragraphs
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index 7099209..9792746 100644 --- a/src/frame.c +++ b/src/frame.c @@ -59,6 +59,7 @@ struct _paragraph /* For anything other than PARA_TYPE_TEXT * (for text paragraphs, these things are in the runs) */ SCBlock *scblock; + SCBlock *rscblock; /* For PARA_TYPE_IMAGE */ char *filename; @@ -472,7 +473,7 @@ Paragraph *insert_paragraph(struct frame *fr, int pos) } -void add_callback_para(struct frame *fr, SCBlock *bl, +void add_callback_para(struct frame *fr, SCBlock *bl, SCBlock *rbl, double w, double h, SCCallbackDrawFunc draw_func, SCCallbackClickFunc click_func, void *bvp, @@ -488,6 +489,7 @@ void add_callback_para(struct frame *fr, SCBlock *bl, pnew->type = PARA_TYPE_CALLBACK; pnew->scblock = bl; + pnew->rscblock = rbl; pnew->cb_w = w; pnew->cb_h = h; pnew->draw_func = draw_func; @@ -499,7 +501,8 @@ void add_callback_para(struct frame *fr, SCBlock *bl, } -void add_image_para(struct frame *fr, SCBlock *scblock, const char *filename, +void add_image_para(struct frame *fr, SCBlock *scblock, SCBlock *rscblock, + const char *filename, ImageStore *is, double w, double h, int editable) { Paragraph *pnew; @@ -524,6 +527,7 @@ void add_image_para(struct frame *fr, SCBlock *scblock, const char *filename, pnew->type = PARA_TYPE_IMAGE; pnew->scblock = scblock; + pnew->rscblock = rscblock; pnew->filename = strdup(filename); pnew->image_w = w; pnew->image_h = h; @@ -1776,6 +1780,12 @@ SCBlock *para_scblock(Paragraph *para) } +SCBlock *para_rscblock(Paragraph *para) +{ + return para->rscblock; +} + + enum para_type para_type(Paragraph *para) { return para->type; |