aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--w3mimg/fb/fb_gdkpixbuf.c44
-rw-r--r--w3mimg/fb/fb_imlib2.c5
-rw-r--r--w3mimg/fb/fb_w3mimg.c56
-rw-r--r--w3mimg/w3mimg.h4
-rw-r--r--w3mimg/x11/x11_w3mimg.c5
5 files changed, 59 insertions, 55 deletions
diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c
index 99c8971..45fabd7 100644
--- a/w3mimg/fb/fb_gdkpixbuf.c
+++ b/w3mimg/fb/fb_gdkpixbuf.c
@@ -1,4 +1,4 @@
-/* $Id: fb_gdkpixbuf.c,v 1.7 2002/07/29 15:25:37 ukai Exp $ */
+/* $Id: fb_gdkpixbuf.c,v 1.8 2002/09/09 14:00:18 ukai Exp $ */
/**************************************************************************
fb_gdkpixbuf.c 0.3 Copyright (C) 2002, hito
**************************************************************************/
@@ -8,13 +8,13 @@
#include "fb_img.h"
static void draw(FB_IMAGE * img, int bg, int x, int y, int w, int h,
- GdkPixbuf * pixbuf);
+ GdkPixbuf * pixbuf);
static GdkPixbuf *resize_image(GdkPixbuf * pixbuf, int width, int height);
int
-get_image_size(char *filename, int *w, int *h)
+get_image_size(char *filename, int *w, int *h)
{
- GdkPixbufAnimation * animation;
+ GdkPixbufAnimation *animation;
if (filename == NULL)
return 1;
animation = gdk_pixbuf_animation_new_from_file(filename);
@@ -26,13 +26,14 @@ get_image_size(char *filename, int *w, int *h)
return 0;
}
-FB_IMAGE ** fb_image_load(char *filename, int w, int h)
+FB_IMAGE **
+fb_image_load(char *filename, int w, int h)
{
- GdkPixbufAnimation * animation;
- GList * frames;
+ GdkPixbufAnimation *animation;
+ GList *frames;
double ratio_w, ratio_h;
int n, i, fw, fh;
- FB_IMAGE ** fb_frame;
+ FB_IMAGE **fb_frame;
GdkPixbufFrameAction action = GDK_PIXBUF_FRAME_REVERT;
if (filename == NULL)
return NULL;
@@ -47,7 +48,8 @@ FB_IMAGE ** fb_image_load(char *filename, int w, int h)
w = fw;
h = fh;
ratio_w = ratio_h = 1;
- } else {
+ }
+ else {
ratio_w = 1.0 * w / fw;
ratio_h = 1.0 * h / fh;
}
@@ -55,8 +57,8 @@ FB_IMAGE ** fb_image_load(char *filename, int w, int h)
if (fb_frame == NULL)
goto END;
for (i = 0; i < n; i++) {
- GdkPixbufFrame * frame;
- GdkPixbuf * org_pixbuf, *pixbuf;
+ GdkPixbufFrame *frame;
+ GdkPixbuf *org_pixbuf, *pixbuf;
int width, height, ofstx, ofsty;
frame = (GdkPixbufFrame *) g_list_nth_data(frames, i);
org_pixbuf = gdk_pixbuf_frame_get_pixbuf(frame);
@@ -66,7 +68,8 @@ FB_IMAGE ** fb_image_load(char *filename, int w, int h)
height = gdk_pixbuf_get_height(org_pixbuf);
if (ofstx == 0 && ofsty == 0 && width == fw && height == fh) {
pixbuf = resize_image(org_pixbuf, w, h);
- } else {
+ }
+ else {
pixbuf =
resize_image(org_pixbuf, width * ratio_w, height * ratio_h);
ofstx *= ratio_w;
@@ -81,9 +84,9 @@ FB_IMAGE ** fb_image_load(char *filename, int w, int h)
fb_image_copy(fb_frame[i], fb_frame[i - 1]);
break;
case GDK_PIXBUF_FRAME_DISPOSE:
- if(bg_r != 0 || bg_g != 0 || bg_b != 0){
- fb_image_fill(fb_frame[i], bg_r, bg_g, bg_b);
- }
+ if (bg_r != 0 || bg_g != 0 || bg_b != 0) {
+ fb_image_fill(fb_frame[i], bg_r, bg_g, bg_b);
+ }
break;
case GDK_PIXBUF_FRAME_REVERT:
fb_image_copy(fb_frame[i], fb_frame[0]);
@@ -102,10 +105,10 @@ FB_IMAGE ** fb_image_load(char *filename, int w, int h)
return fb_frame;
}
static void
-draw(FB_IMAGE * img, int bg, int x, int y, int w, int h, GdkPixbuf * pixbuf)
+draw(FB_IMAGE * img, int bg, int x, int y, int w, int h, GdkPixbuf * pixbuf)
{
int i, j, r, g, b, offset, bpp, rowstride;
- guchar * pixels;
+ guchar *pixels;
gboolean alpha;
if (img == NULL || pixbuf == NULL)
return;
@@ -122,7 +125,8 @@ draw(FB_IMAGE * img, int bg, int x, int y, int w, int h, GdkPixbuf * pixbuf)
if (alpha && pixels[offset + 3] == 0) {
if (bg)
fb_image_pset(img, i + x, j + y, bg_r, bg_g, bg_b);
- } else {
+ }
+ else {
fb_image_pset(img, i + x, j + y, r, g, b);
}
}
@@ -130,9 +134,9 @@ draw(FB_IMAGE * img, int bg, int x, int y, int w, int h, GdkPixbuf * pixbuf)
return;
}
static GdkPixbuf *
-resize_image(GdkPixbuf * pixbuf, int width, int height)
+resize_image(GdkPixbuf * pixbuf, int width, int height)
{
- GdkPixbuf * resized_pixbuf;
+ GdkPixbuf *resized_pixbuf;
int w, h;
if (pixbuf == NULL)
return NULL;
diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
index a8371ff..49a17a5 100644
--- a/w3mimg/fb/fb_imlib2.c
+++ b/w3mimg/fb/fb_imlib2.c
@@ -1,4 +1,4 @@
-/* $Id: fb_imlib2.c,v 1.7 2002/07/29 15:25:37 ukai Exp $ */
+/* $Id: fb_imlib2.c,v 1.8 2002/09/09 14:00:42 ukai Exp $ */
/**************************************************************************
fb_imlib2.c 0.3 Copyright (C) 2002, hito
**************************************************************************/
@@ -89,7 +89,8 @@ draw(FB_IMAGE * img, Imlib_Image image)
if (a == 0) {
fb_image_pset(img, i, j, bg_r, bg_g, bg_b);
- } else {
+ }
+ else {
fb_image_pset(img, i, j, r, g, b);
}
}
diff --git a/w3mimg/fb/fb_w3mimg.c b/w3mimg/fb/fb_w3mimg.c
index 6810888..f521d3e 100644
--- a/w3mimg/fb/fb_w3mimg.c
+++ b/w3mimg/fb/fb_w3mimg.c
@@ -1,4 +1,4 @@
-/* $Id: fb_w3mimg.c,v 1.3 2002/07/29 15:25:37 ukai Exp $ */
+/* $Id: fb_w3mimg.c,v 1.4 2002/09/09 14:00:49 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -8,7 +8,7 @@
#include "w3mimg/w3mimg.h"
static int
-w3mfb_init(w3mimg_op *self)
+w3mfb_init(w3mimg_op * self)
{
if (self == NULL)
return 0;
@@ -16,7 +16,7 @@ w3mfb_init(w3mimg_op *self)
}
static int
-w3mfb_finish(w3mimg_op *self)
+w3mfb_finish(w3mimg_op * self)
{
if (self == NULL)
return 0;
@@ -24,7 +24,7 @@ w3mfb_finish(w3mimg_op *self)
}
static int
-w3mfb_active(w3mimg_op *self)
+w3mfb_active(w3mimg_op * self)
{
if (self == NULL)
return 0;
@@ -32,7 +32,7 @@ w3mfb_active(w3mimg_op *self)
}
static void
-w3mfb_set_background(w3mimg_op *self, char *background)
+w3mfb_set_background(w3mimg_op * self, char *background)
{
if (self == NULL)
return;
@@ -44,19 +44,19 @@ w3mfb_set_background(w3mimg_op *self, char *background)
}
static void
-w3mfb_sync(w3mimg_op *self)
+w3mfb_sync(w3mimg_op * self)
{
return;
}
static void
-w3mfb_close(w3mimg_op *self)
+w3mfb_close(w3mimg_op * self)
{
fb_close();
}
static int
-w3mfb_load_image(w3mimg_op *self, W3MImage *img, char *fname, int w, int h)
+w3mfb_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
{
FB_IMAGE **im;
@@ -72,9 +72,8 @@ w3mfb_load_image(w3mimg_op *self, W3MImage *img, char *fname, int w, int h)
}
static int
-w3mfb_show_image(w3mimg_op *self, W3MImage *img, int sx, int sy,
- int sw, int sh,
- int x, int y)
+w3mfb_show_image(w3mimg_op * self, W3MImage * img, int sx, int sy,
+ int sw, int sh, int x, int y)
{
int i;
FB_IMAGE **frame;
@@ -83,32 +82,31 @@ w3mfb_show_image(w3mimg_op *self, W3MImage *img, int sx, int sy,
if (self == NULL)
return 0;
- frame = (FB_IMAGE **)img->pixmap;
+ frame = (FB_IMAGE **) img->pixmap;
i = frame[0]->id;
fb_image_draw(frame[i],
x + self->offset_x, y + self->offset_y,
- sx, sy,
- (sw ? sw : img->width), (sh ? sh : img->height));
- if(frame[0]->num > 1){
- if(frame[1]->id > WAIT_CNT){
- frame[1]->id = 0;
- if(i < frame[0]->num - 1)
- frame[0]->id = i + 1;
- else
- frame[0]->id = 0;
- }
- frame[1]->id += 1;
+ sx, sy, (sw ? sw : img->width), (sh ? sh : img->height));
+ if (frame[0]->num > 1) {
+ if (frame[1]->id > WAIT_CNT) {
+ frame[1]->id = 0;
+ if (i < frame[0]->num - 1)
+ frame[0]->id = i + 1;
+ else
+ frame[0]->id = 0;
+ }
+ frame[1]->id += 1;
}
return 1;
}
static void
-w3mfb_free_image(w3mimg_op *self, W3MImage *img)
+w3mfb_free_image(w3mimg_op * self, W3MImage * img)
{
if (self == NULL)
return;
if (img && img->pixmap) {
- fb_frame_free((FB_IMAGE **)img->pixmap);
+ fb_frame_free((FB_IMAGE **) img->pixmap);
img->pixmap = NULL;
img->width = 0;
img->height = 0;
@@ -116,7 +114,7 @@ w3mfb_free_image(w3mimg_op *self, W3MImage *img)
}
static int
-w3mfb_get_image_size(w3mimg_op *self, W3MImage *img,
+w3mfb_get_image_size(w3mimg_op * self, W3MImage * img,
char *fname, int *w, int *h)
{
int i;
@@ -133,7 +131,7 @@ w3mimg_op *
w3mimg_fbopen()
{
w3mimg_op *wop = NULL;
- wop = (w3mimg_op *)malloc(sizeof(w3mimg_op));
+ wop = (w3mimg_op *) malloc(sizeof(w3mimg_op));
if (wop == NULL)
return NULL;
memset(wop, 0, sizeof(w3mimg_op));
@@ -143,7 +141,7 @@ w3mimg_fbopen()
wop->width = fb_width();
wop->height = fb_height();
-
+
wop->init = w3mfb_init;
wop->finish = w3mfb_finish;
wop->active = w3mfb_active;
@@ -157,7 +155,7 @@ w3mimg_fbopen()
wop->get_image_size = w3mfb_get_image_size;
return wop;
-error:
+ error:
free(wop);
return NULL;
}
diff --git a/w3mimg/w3mimg.h b/w3mimg/w3mimg.h
index 4c8f404..639d41c 100644
--- a/w3mimg/w3mimg.h
+++ b/w3mimg/w3mimg.h
@@ -1,4 +1,4 @@
-/* $Id: w3mimg.h,v 1.4 2002/07/22 16:17:32 ukai Exp $ */
+/* $Id: w3mimg.h,v 1.5 2002/09/09 13:59:24 ukai Exp $ */
#include "config.h"
#ifdef USE_W3MIMG_FB
@@ -29,7 +29,7 @@ typedef struct _w3mimg_op {
int (*show_image) (struct _w3mimg_op * self, W3MImage * img,
int sx, int sy, int sw, int sh, int x, int y);
void (*free_image) (struct _w3mimg_op * self, W3MImage * img);
- int (*get_image_size) (struct _w3mimg_op * self, W3MImage * img,
+ int (*get_image_size) (struct _w3mimg_op * self, W3MImage * img,
char *fname, int *w, int *h);
} w3mimg_op;
diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
index b4fe867..d36de0d 100644
--- a/w3mimg/x11/x11_w3mimg.c
+++ b/w3mimg/x11/x11_w3mimg.c
@@ -1,4 +1,4 @@
-/* $Id: x11_w3mimg.c,v 1.5 2002/07/22 16:17:32 ukai Exp $ */
+/* $Id: x11_w3mimg.c,v 1.6 2002/09/09 13:59:09 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -195,7 +195,8 @@ x11_free_image(w3mimg_op * self, W3MImage * img)
}
static int
-x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w, int *h)
+x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w,
+ int *h)
{
struct x11_info *xi;
ImlibImage *im;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 15:08:11 +0000