aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainwindow.c25
-rw-r--r--src/render.c47
-rw-r--r--src/render.h3
-rw-r--r--src/wrap.c38
-rw-r--r--tests/render_test.c2
-rw-r--r--tests/render_test_sc1.c2
6 files changed, 81 insertions, 36 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 52cd23b..d159e7c 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -48,13 +48,16 @@ void rerender_slide(struct presentation *p)
free_render_buffers(s);
s->rendered_thumb = render_slide(s, s->parent->thumb_slide_width,
- p->slide_width, p->slide_height, p->is);
+ p->slide_width, p->slide_height, p->is,
+ ISZ_THUMBNAIL);
s->rendered_edit = render_slide(s, s->parent->edit_slide_width,
- p->slide_width, p->slide_height, p->is);
+ p->slide_width, p->slide_height, p->is,
+ ISZ_EDITOR);
s->rendered_proj = render_slide(s, s->parent->proj_slide_width,
- p->slide_width, p->slide_height, p->is);
+ p->slide_width, p->slide_height, p->is,
+ ISZ_SLIDESHOW);
}
@@ -66,13 +69,13 @@ static void render_edit_and_proj(struct presentation *p)
if ( s->rendered_edit == NULL ) {
s->rendered_edit = render_slide(s, s->parent->edit_slide_width,
p->slide_width, p->slide_height,
- p->is);
+ p->is, ISZ_EDITOR);
}
if ( s->rendered_proj == NULL ) {
s->rendered_proj = render_slide(s, s->parent->proj_slide_width,
p->slide_width, p->slide_height,
- p->is);
+ p->is, ISZ_SLIDESHOW);
}
}
@@ -1372,23 +1375,25 @@ static void dnd_receive(GtkWidget *widget, GdkDragContext *drag_context,
struct frame *fr;
char *sc;
size_t len;
+ int w, h;
gtk_drag_finish(drag_context, TRUE, FALSE, time);
chomp(filename);
- len = strlen(filename)+10;
+ w = p->drag_corner_x - p->start_corner_x;
+ h = p->drag_corner_y - p->start_corner_y;
+
+ len = strlen(filename)+64;
sc = malloc(len);
if ( sc == NULL ) {
free(filename);
fprintf(stderr, "Failed to allocate SC\n");
return;
}
- snprintf(sc, len, "\\image{%s}", filename);
+ snprintf(sc, len, "\\image[%ix%i]{%s}", w, h, filename);
fr = create_frame(p, p->start_corner_x,
- p->start_corner_y,
- p->drag_corner_x - p->start_corner_x,
- p->drag_corner_y - p->start_corner_y);
+ p->start_corner_y, w, h);
fr->sc = sc;
fr->sc_len = len;
show_hierarchy(p->cur_edit_slide->top, "");
diff --git a/src/render.c b/src/render.c
index 2aea8ec..fc60a9c 100644
--- a/src/render.c
+++ b/src/render.c
@@ -60,32 +60,37 @@ static void render_glyph_box(cairo_t *cr, struct wrap_box *box)
-static void render_image_box(cairo_t *cr, struct wrap_box *box, ImageStore *is)
+static void render_image_box(cairo_t *cr, struct wrap_box *box, ImageStore *is,
+ enum is_size isz, double scale)
{
GdkPixbuf *pixbuf;
int w;
double ascd;
+ cairo_save(cr);
+
ascd = pango_units_to_double(box->ascent);
cairo_new_path(cr);
- cairo_rectangle(cr, 0.0, -ascd,
- pango_units_to_double(box->width),
- pango_units_to_double(box->height));
+ cairo_scale(cr, 1.0/scale, 1.0/scale);
+ cairo_rectangle(cr, 0.0, -scale*ascd,
+ scale*pango_units_to_double(box->width),
+ scale*pango_units_to_double(box->height));
- w = lrint(pango_units_to_double(box->width));
- pixbuf = lookup_image(is, box->filename, w, ISZ_EDITOR);
- //show_imagestore(is);
+ w = lrint(pango_units_to_double(scale*box->width));
+ pixbuf = lookup_image(is, box->filename, w, isz);
+ show_imagestore(is);
if ( pixbuf == NULL ) {
cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 1.0);
fprintf(stderr, "Failed to load '%s' at size %i\n",
box->filename, w);
} else {
- gdk_cairo_set_source_pixbuf(cr, pixbuf, 0.0, -ascd);
+ gdk_cairo_set_source_pixbuf(cr, pixbuf, 0.0, -scale*ascd);
}
cairo_fill(cr);
+ cairo_restore(cr);
}
@@ -109,7 +114,8 @@ static void draw_outline(cairo_t *cr, struct wrap_box *box)
}
-static void render_boxes(struct wrap_line *line, cairo_t *cr, ImageStore *is)
+static void render_boxes(struct wrap_line *line, cairo_t *cr, ImageStore *is,
+ enum is_size isz, double scale)
{
int j;
double x_pos = 0.0;
@@ -131,7 +137,7 @@ static void render_boxes(struct wrap_line *line, cairo_t *cr, ImageStore *is)
break;
case WRAP_BOX_IMAGE :
- render_image_box(cr, box, is);
+ render_image_box(cr, box, is, isz, scale);
break;
case WRAP_BOX_NOTHING :
@@ -175,7 +181,8 @@ static void draw_underfull_marker(cairo_t *cr, struct frame *fr, int i)
}
-static void render_lines(struct frame *fr, cairo_t *cr, ImageStore *is)
+static void render_lines(struct frame *fr, cairo_t *cr, ImageStore *is,
+ enum is_size isz, double scale)
{
int i;
double y_pos = 0.0;
@@ -201,7 +208,7 @@ static void render_lines(struct frame *fr, cairo_t *cr, ImageStore *is)
cairo_save(cr);
cairo_translate(cr, 0.0,
pango_units_to_double(fr->lines[i].ascent));
- render_boxes(&fr->lines[i], cr, is);
+ render_boxes(&fr->lines[i], cr, is, isz, scale);
cairo_restore(cr);
if ( fr->lines[i].overfull ) {
@@ -257,7 +264,8 @@ static void do_background(cairo_t *cr, struct frame *fr)
/* Render Level 1 Storycode (no subframes) */
-static int render_sc(struct frame *fr, double scale, ImageStore *is)
+static int render_sc(struct frame *fr, double scale, ImageStore *is,
+ enum is_size isz)
{
int i;
cairo_t *cr;
@@ -304,7 +312,7 @@ static int render_sc(struct frame *fr, double scale, ImageStore *is)
/* Actually render the lines */
cairo_translate(cr, fr->lop.pad_l, fr->lop.pad_t);
- render_lines(fr, cr, is);
+ render_lines(fr, cr, is, isz, scale);
/* Tidy up */
cairo_font_options_destroy(fopts);
@@ -315,7 +323,8 @@ static int render_sc(struct frame *fr, double scale, ImageStore *is)
}
-static int render_frame(struct frame *fr, double scale, ImageStore *is)
+static int render_frame(struct frame *fr, double scale, ImageStore *is,
+ enum is_size isz)
{
int i;
@@ -362,14 +371,14 @@ static int render_frame(struct frame *fr, double scale, ImageStore *is)
/* Rounding to get bitmap size */
ch->pix_w = ch->w*scale;
ch->pix_h = ch->h*scale;
- render_frame(ch, scale, is);
+ render_frame(ch, scale, is, isz);
ch->x = ch->lop.x + fr->lop.pad_l + ch->lop.margin_l;
ch->y = ch->lop.y + fr->lop.pad_t + ch->lop.margin_t;
}
- render_sc(fr, scale, is);
+ render_sc(fr, scale, is, isz);
return 0;
}
@@ -477,7 +486,7 @@ static void composite_slide(struct slide *s, cairo_t *cr, double scale)
* Render the entire slide.
*/
cairo_surface_t *render_slide(struct slide *s, int w, double ww, double hh,
- ImageStore *is)
+ ImageStore *is, enum is_size isz)
{
cairo_surface_t *surf;
cairo_t *cr;
@@ -499,7 +508,7 @@ cairo_surface_t *render_slide(struct slide *s, int w, double ww, double hh,
s->top->h = hh;
s->top->pix_w = w;
s->top->pix_h = h;
- render_frame(s->top, scale, is);
+ render_frame(s->top, scale, is, isz);
surf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
diff --git a/src/render.h b/src/render.h
index 1fe5041..7bdeb8a 100644
--- a/src/render.h
+++ b/src/render.h
@@ -31,7 +31,8 @@
#include "imagestore.h"
extern cairo_surface_t *render_slide(struct slide *s, int w,
- double ww, double hh, ImageStore *is);
+ double ww, double hh, ImageStore *is,
+ enum is_size isz);
extern void free_render_buffers(struct slide *s);
extern void free_render_buffers_except_thumb(struct slide *s);
diff --git a/src/wrap.c b/src/wrap.c
index 1b7766d..02cf916 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -483,6 +483,34 @@ static void pop_font(struct sc_font *stack, int *n_fonts, int *max_fonts)
}
+static int get_size(const char *a, int *wp, int *hp)
+{
+ char *x;
+ char *ws;
+ char *hs;
+
+ x = index(a, 'x');
+ if ( x == NULL ) goto invalid;
+
+ if ( rindex(a, 'x') != x ) goto invalid;
+
+ ws = strndup(a, x-a);
+ hs = strdup(x+1);
+
+ *wp = strtoul(ws, NULL, 10);
+ *hp = strtoul(hs, NULL, 10);
+
+ free(ws);
+ free(hs);
+
+ return 0;
+
+invalid:
+ fprintf(stderr, "Invalid dimensions '%s'\n", a);
+ return 1;
+}
+
+
static void run_sc(const char *sc, struct sc_font *fonts, int *n_fonts,
int *max_fonts, PangoContext *pc, struct wrap_line *boxes,
PangoLanguage *lang)
@@ -518,10 +546,12 @@ static void run_sc(const char *sc, struct sc_font *fonts, int *n_fonts,
boxes, lang);
pop_font(fonts, n_fonts, max_fonts);
} else if ( (strcmp(b->name, "image")==0)
- && (b->contents != NULL) ) {
- /* FIXME: Proper w/h from SC */
- add_image_box(boxes, b->contents, b->offset,
- 100.0, 100.0);
+ && (b->contents != NULL) && (b->options != NULL) ) {
+ int w, h;
+ if ( get_size(b->options, &w, &h) == 0 ) {
+ add_image_box(boxes, b->contents, b->offset,
+ w, h);
+ }
}
}
diff --git a/tests/render_test.c b/tests/render_test.c
index 3e50a4c..15b6838 100644
--- a/tests/render_test.c
+++ b/tests/render_test.c
@@ -59,7 +59,7 @@ static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data)
cairo_fill(cr);
if ( s->rendered_edit != NULL ) cairo_surface_destroy(s->rendered_edit);
- s->rendered_edit = render_slide(s, w, w, h, NULL);
+ s->rendered_edit = render_slide(s, w, w, h, NULL, ISZ_EDITOR);
cairo_rectangle(cr, 0.0, 0.0, w, h);
cairo_set_source_surface(cr, s->rendered_edit, 0.0, 0.0);
cairo_fill(cr);
diff --git a/tests/render_test_sc1.c b/tests/render_test_sc1.c
index 337ca1b..e720476 100644
--- a/tests/render_test_sc1.c
+++ b/tests/render_test_sc1.c
@@ -56,7 +56,7 @@ static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data)
cairo_fill(cr);
if ( s->rendered_edit != NULL ) cairo_surface_destroy(s->rendered_edit);
- s->rendered_edit = render_slide(s, w, w, h, NULL);
+ s->rendered_edit = render_slide(s, w, w, h, NULL, ISZ_EDITOR);
cairo_rectangle(cr, 0.0, 0.0, w, h);
cairo_set_source_surface(cr, s->rendered_edit, 0.0, 0.0);
cairo_fill(cr);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 07:57:22 +0000