it* My version of sent Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/sent-sdk.git URL:git://git.codevoid.de/sent-sdk.git codevoid.de 70 1Log /git/sent-sdk/log.gph codevoid.de 70 1Files /git/sent-sdk/files.gph codevoid.de 70 1Refs /git/sent-sdk/refs.gph codevoid.de 70 1README /git/sent-sdk/file/README.md.gph codevoid.de 70 1LICENSE /git/sent-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 96e1607e78244f8ae85785938b66938e9586c4fb /git/sent-sdk/commit/96e1607e78244f8ae85785938b66938e9586c4fb.gph codevoid.de 70 1parent 036d77fffed4ba88346438d88c0d369578a9a604 /git/sent-sdk/commit/036d77fffed4ba88346438d88c0d369578a9a604.gph codevoid.de 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de codevoid.de 70 iDate: Fri, 1 May 2015 21:34:52 +0200 Err codevoid.de 70 i Err codevoid.de 70 ittypedef image struct Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M sent.c | 32 ++++++++++++++++---------------- Err codevoid.de 70 i Err codevoid.de 70 i1 file changed, 16 insertions(+), 16 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/sent.c b/sent.c /git/sent-sdk/file/sent.c.gph codevoid.de 70 it@@ -31,7 +31,7 @@ typedef enum { Err codevoid.de 70 i DRAWN = 4 Err codevoid.de 70 i } imgstate; Err codevoid.de 70 i Err codevoid.de 70 i-struct image { Err codevoid.de 70 i+typedef struct { Err codevoid.de 70 i unsigned char *buf; Err codevoid.de 70 i unsigned int bufwidth, bufheight; Err codevoid.de 70 i imgstate state; Err codevoid.de 70 it@@ -40,11 +40,11 @@ struct image { Err codevoid.de 70 i png_structp png_ptr; Err codevoid.de 70 i png_infop info_ptr; Err codevoid.de 70 i int numpasses; Err codevoid.de 70 i-}; Err codevoid.de 70 i+} Image; Err codevoid.de 70 i Err codevoid.de 70 i typedef struct { Err codevoid.de 70 i char *text; Err codevoid.de 70 i- struct image *img; Err codevoid.de 70 i+ Image *img; Err codevoid.de 70 i } Slide; Err codevoid.de 70 i Err codevoid.de 70 i /* Purely graphic info */ Err codevoid.de 70 it@@ -78,11 +78,11 @@ typedef struct { Err codevoid.de 70 i const Arg arg; Err codevoid.de 70 i } Shortcut; Err codevoid.de 70 i Err codevoid.de 70 i-static struct image *pngopen(char *filename); Err codevoid.de 70 i-static int pngread(struct image *img); Err codevoid.de 70 i-static int pngprepare(struct image *img); Err codevoid.de 70 i-static void pngscale(struct image *img); Err codevoid.de 70 i-static void pngdraw(struct image *img); Err codevoid.de 70 i+static Image *pngopen(char *filename); Err codevoid.de 70 i+static int pngread(Image *img); Err codevoid.de 70 i+static int pngprepare(Image *img); Err codevoid.de 70 i+static void pngscale(Image *img); Err codevoid.de 70 i+static void pngdraw(Image *img); Err codevoid.de 70 i Err codevoid.de 70 i static void getfontsize(char *str, unsigned int *width, unsigned int *height); Err codevoid.de 70 i static void cleanup(); Err codevoid.de 70 it@@ -126,11 +126,11 @@ static void (*handler[LASTEvent])(XEvent *) = { Err codevoid.de 70 i [KeyPress] = kpress, Err codevoid.de 70 i }; Err codevoid.de 70 i Err codevoid.de 70 i-struct image *pngopen(char *filename) Err codevoid.de 70 i+Image *pngopen(char *filename) Err codevoid.de 70 i { Err codevoid.de 70 i FILE *f; Err codevoid.de 70 i unsigned char buf[8]; Err codevoid.de 70 i- struct image *img; Err codevoid.de 70 i+ Image *img; Err codevoid.de 70 i Err codevoid.de 70 i if (!(f = fopen(filename, "rb"))) { Err codevoid.de 70 i eprintf("could not open file %s:", filename); Err codevoid.de 70 it@@ -140,7 +140,7 @@ struct image *pngopen(char *filename) Err codevoid.de 70 i if (fread(buf, 1, 8, f) != 8 || png_sig_cmp(buf, 1, 8)) Err codevoid.de 70 i return NULL; Err codevoid.de 70 i Err codevoid.de 70 i- img = malloc(sizeof(struct image)); Err codevoid.de 70 i+ img = malloc(sizeof(Image)); Err codevoid.de 70 i if (!(img->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, Err codevoid.de 70 i NULL, NULL))) { Err codevoid.de 70 i free(img); Err codevoid.de 70 it@@ -167,7 +167,7 @@ struct image *pngopen(char *filename) Err codevoid.de 70 i return img; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-int pngread(struct image *img) Err codevoid.de 70 i+int pngread(Image *img) Err codevoid.de 70 i { Err codevoid.de 70 i unsigned int y; Err codevoid.de 70 i png_bytepp row_pointers; Err codevoid.de 70 it@@ -232,7 +232,7 @@ int pngread(struct image *img) Err codevoid.de 70 i return 1; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-int pngprepare(struct image *img) Err codevoid.de 70 i+int pngprepare(Image *img) Err codevoid.de 70 i { Err codevoid.de 70 i int depth = DefaultDepth(xw.dpy, xw.scr); Err codevoid.de 70 i int width = xw.uw; Err codevoid.de 70 it@@ -274,7 +274,7 @@ int pngprepare(struct image *img) Err codevoid.de 70 i return 1; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-void pngscale(struct image *img) Err codevoid.de 70 i+void pngscale(Image *img) Err codevoid.de 70 i { Err codevoid.de 70 i unsigned int x, y; Err codevoid.de 70 i unsigned int width = img->ximg->width; Err codevoid.de 70 it@@ -299,7 +299,7 @@ void pngscale(struct image *img) Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-void pngdraw(struct image *img) Err codevoid.de 70 i+void pngdraw(Image *img) Err codevoid.de 70 i { Err codevoid.de 70 i int xoffset = (xw.w - img->ximg->width) / 2; Err codevoid.de 70 i int yoffset = (xw.h - img->ximg->height) / 2; Err codevoid.de 70 it@@ -463,7 +463,7 @@ void usage() Err codevoid.de 70 i void xdraw() Err codevoid.de 70 i { Err codevoid.de 70 i unsigned int height, width; Err codevoid.de 70 i- struct image *im = slides[idx].img; Err codevoid.de 70 i+ Image *im = slides[idx].img; Err codevoid.de 70 i Err codevoid.de 70 i getfontsize(slides[idx].text, &width, &height); Err codevoid.de 70 i XClearWindow(xw.dpy, xw.win); Err codevoid.de 70 .