storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix indent

Browse Source
This commit is contained in:
Fumitoshi UKAI
2003-04-03 16:36:33 +00:00
parent fdb83cd002
commit 4fadb14e79
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
w3mimg/fb/fb_gdkpixbuf.c
View File

@@ -1,4 +1,4 @@
/* $Id: fb_gdkpixbuf.c,v 1.13 2003/04/03 16:35:45 ukai Exp $ */ /* $Id: fb_gdkpixbuf.c,v 1.14 2003/04/03 16:36:33 ukai Exp $ */
/************************************************************************** /**************************************************************************
fb_gdkpixbuf.c 0.3 Copyright (C) 2002, hito fb_gdkpixbuf.c 0.3 Copyright (C) 2002, hito
**************************************************************************/ **************************************************************************/
@@ -27,9 +27,9 @@ get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
int tmp; int tmp;
frame = (GdkPixbufFrame *) g_list_nth_data(frames, i); frame = (GdkPixbufFrame *) g_list_nth_data(frames, i);
tmp = gdk_pixbuf_frame_get_delay_time(frame); tmp = gdk_pixbuf_frame_get_delay_time(frame);
if (tmp > d) if (tmp > d)
d = tmp; d = tmp;
pixbuf = gdk_pixbuf_frame_get_pixbuf(frame); pixbuf = gdk_pixbuf_frame_get_pixbuf(frame);
iw = gdk_pixbuf_frame_get_x_offset(frame) iw = gdk_pixbuf_frame_get_x_offset(frame)
+ gdk_pixbuf_get_width(pixbuf); + gdk_pixbuf_get_width(pixbuf);
@@ -41,7 +41,7 @@ get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
*h = ih; *h = ih;
} }
if (delay) if (delay)
*delay = d; *delay = d;
} }
int int
@@ -76,10 +76,11 @@ fb_image_load(char *filename, int w, int h, int max_anim)
get_animation_size(animation, &fw, &fh, &delay); get_animation_size(animation, &fw, &fh, &delay);
frame_num = n = gdk_pixbuf_animation_get_num_frames(animation); frame_num = n = gdk_pixbuf_animation_get_num_frames(animation);
if (delay <= 0) if (delay <= 0)
max_anim = -1; max_anim = -1;
if (max_anim < 0) { if (max_anim < 0) {
frame_num = (-max_anim > n) ? n : -max_anim; frame_num = (-max_anim > n) ? n : -max_anim;
} else if (max_anim > 0) { }
else if (max_anim > 0) {
frame_num = n = (max_anim > n) ? n : max_anim; frame_num = n = (max_anim > n) ? n : max_anim;
} }
if (w < 1 || h < 1) { if (w < 1 || h < 1) {
@@ -93,7 +94,7 @@ fb_image_load(char *filename, int w, int h, int max_anim)
} }
fb_frame = fb_frame_new(w, h, frame_num); fb_frame = fb_frame_new(w, h, frame_num);
if (bg_r != 0 || bg_g != 0 || bg_b != 0) { if (bg_r != 0 || bg_g != 0 || bg_b != 0) {
fb_image_fill(fb_frame[0], bg_r, bg_g, bg_b); fb_image_fill(fb_frame[0], bg_r, bg_g, bg_b);
} }
if (fb_frame == NULL) if (fb_frame == NULL)
goto END; goto END;
@@ -103,8 +104,9 @@ fb_image_load(char *filename, int w, int h, int max_anim)
int width, height, ofstx, ofsty; int width, height, ofstx, ofsty;
if (max_anim < 0) { if (max_anim < 0) {
i = (j - n + frame_num > 0)? (j - n + frame_num): 0; i = (j - n + frame_num > 0) ? (j - n + frame_num) : 0;
} else { }
else {
i = j; i = j;
} }
frame = (GdkPixbufFrame *) g_list_nth_data(frames, j); frame = (GdkPixbufFrame *) g_list_nth_data(frames, j);
@@ -127,7 +129,7 @@ fb_image_load(char *filename, int w, int h, int max_anim)
if (j > 0) { if (j > 0) {
switch (action) { switch (action) {
case GDK_PIXBUF_FRAME_RETAIN: case GDK_PIXBUF_FRAME_RETAIN:
if (i > 0) if (i > 0)
fb_image_copy(fb_frame[i], fb_frame[i - 1]); fb_image_copy(fb_frame[i], fb_frame[i - 1]);
break; break;
case GDK_PIXBUF_FRAME_DISPOSE: case GDK_PIXBUF_FRAME_DISPOSE:
@@ -136,16 +138,16 @@ fb_image_load(char *filename, int w, int h, int max_anim)
} }
break; break;
case GDK_PIXBUF_FRAME_REVERT: case GDK_PIXBUF_FRAME_REVERT:
if (i > 0) if (i > 0)
fb_image_copy(fb_frame[i], fb_frame[0]); fb_image_copy(fb_frame[i], fb_frame[0]);
break; break;
default: default:
if (i > 0) if (i > 0)
fb_image_copy(fb_frame[i], fb_frame[0]); fb_image_copy(fb_frame[i], fb_frame[0]);
} }
} }
action = gdk_pixbuf_frame_get_action(frame); action = gdk_pixbuf_frame_get_action(frame);
fb_frame[i]->delay = gdk_pixbuf_frame_get_delay_time(frame); fb_frame[i]->delay = gdk_pixbuf_frame_get_delay_time(frame);
draw(fb_frame[i], !i, ofstx, ofsty, width, height, pixbuf); draw(fb_frame[i], !i, ofstx, ofsty, width, height, pixbuf);
if (org_pixbuf != pixbuf) if (org_pixbuf != pixbuf)
gdk_pixbuf_finalize(pixbuf); gdk_pixbuf_finalize(pixbuf);

20
w3mimg/x11/x11_w3mimg.c
View File

@@ -1,4 +1,4 @@
/* $Id: x11_w3mimg.c,v 1.19 2003/04/03 16:35:49 ukai Exp $ */ /* $Id: x11_w3mimg.c,v 1.20 2003/04/03 16:36:54 ukai Exp $ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
@@ -58,9 +58,9 @@ get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
int tmp; int tmp;
frame = (GdkPixbufFrame *) g_list_nth_data(frames, i); frame = (GdkPixbufFrame *) g_list_nth_data(frames, i);
tmp = gdk_pixbuf_frame_get_delay_time(frame); tmp = gdk_pixbuf_frame_get_delay_time(frame);
if (tmp > d) if (tmp > d)
d = tmp; d = tmp;
pixbuf = gdk_pixbuf_frame_get_pixbuf(frame); pixbuf = gdk_pixbuf_frame_get_pixbuf(frame);
iw = gdk_pixbuf_frame_get_x_offset(frame) iw = gdk_pixbuf_frame_get_x_offset(frame)
+ gdk_pixbuf_get_width(pixbuf); + gdk_pixbuf_get_width(pixbuf);
@@ -72,7 +72,7 @@ get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
*h = ih; *h = ih;
} }
if (delay) if (delay)
*delay = d; *delay = d;
} }
#endif #endif
@@ -331,11 +331,12 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
get_animation_size(animation, &iw, &ih, &delay); get_animation_size(animation, &iw, &ih, &delay);
if (delay <= 0) if (delay <= 0)
max_anim = -1; max_anim = -1;
if (max_anim < 0) { if (max_anim < 0) {
frame_num = (-max_anim > n) ? n : -max_anim; frame_num = (-max_anim > n) ? n : -max_anim;
} else if (max_anim > 0) { }
else if (max_anim > 0) {
frame_num = n = (max_anim > n) ? n : max_anim; frame_num = n = (max_anim > n) ? n : max_anim;
} }
@@ -359,8 +360,9 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
int width, height, ofstx, ofsty; int width, height, ofstx, ofsty;
if (max_anim < 0) { if (max_anim < 0) {
i = (j - n + frame_num > 0)? (j - n + frame_num): 0; i = (j - n + frame_num > 0) ? (j - n + frame_num) : 0;
} else { }
else {
i = j; i = j;
} }
frame = (GdkPixbufFrame *) g_list_nth_data(frames, j); frame = (GdkPixbufFrame *) g_list_nth_data(frames, j);