w3m

commit 261f0b92147b16b9e4f26f3a0ed5b9b358857989
parent 8f4637ce1c6c38497ed74e87c34f6e2cba8c8927
Author: ukai <ukai>
Date:   Mon,  9 Sep 2002 13:59:09 +0000

fix indent

Diffstat:
M
w3mimg/fb/fb_gdkpixbuf.c
 | 
42
+++++++++++++++++++++++-------------------
M
w3mimg/fb/fb_imlib2.c
 | 
3
++-
M
w3mimg/fb/fb_w3mimg.c
 | 
54
++++++++++++++++++++++++++----------------------------
M
w3mimg/w3mimg.h
 | 
2
+-
M
w3mimg/x11/x11_w3mimg.c
 | 
3
++-

5 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;