aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-07-07 15:49:03 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-07-07 15:49:03 +0000
commit851c96514ff7e6ccb0c97f797c5e7bae3ab19799 (patch)
tree808cc4a7ef5eb25d71c357079934da72b12195c3
parent[w3m-dev 03929] clear image (diff)
downloadw3m-851c96514ff7e6ccb0c97f797c5e7bae3ab19799.tar.gz
w3m-851c96514ff7e6ccb0c97f797c5e7bae3ab19799.zip
fix indent
-rw-r--r--image.c4
-rw-r--r--w3mimg/fb/fb.c6
-rw-r--r--w3mimgdisplay.c42
3 files changed, 27 insertions, 25 deletions
diff --git a/image.c b/image.c
index aee940b..f799b14 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.35 2003/07/07 15:48:16 ukai Exp $ */
+/* $Id: image.c,v 1.36 2003/07/07 15:49:03 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -228,7 +228,7 @@ clearImage()
for (j = 0; j < n_terminal_image; j++) {
i = &terminal_image[j];
if (!(i->cache->loaded & IMG_FLAG_LOADED &&
- i->width > 0 && i->height > 0))
+ i->width > 0 && i->height > 0))
continue;
sprintf(buf, "6;%d;%d;%d;%d\n", i->x, i->y, i->width, i->height);
fputs(buf, Imgdisplay_wf);
diff --git a/w3mimg/fb/fb.c b/w3mimg/fb/fb.c
index 954525a..029d130 100644
--- a/w3mimg/fb/fb.c
+++ b/w3mimg/fb/fb.c
@@ -1,4 +1,4 @@
-/* $Id: fb.c,v 1.10 2003/07/07 15:48:17 ukai Exp $ */
+/* $Id: fb.c,v 1.11 2003/07/07 15:49:39 ukai Exp $ */
/**************************************************************************
fb.c 0.3 Copyright (C) 2002, hito
**************************************************************************/
@@ -380,8 +380,8 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b)
offset_fb = fscinfo.line_length * y + pixel_size * x;
bg = ((r >> (CHAR_BIT - vscinfo.red.length)) << vscinfo.red.offset) +
- ((g >> (CHAR_BIT - vscinfo.green.length)) << vscinfo.green.offset) +
- ((b >> (CHAR_BIT - vscinfo.blue.length)) << vscinfo.blue.offset);
+ ((g >> (CHAR_BIT - vscinfo.green.length)) << vscinfo.green.offset) +
+ ((b >> (CHAR_BIT - vscinfo.blue.length)) << vscinfo.blue.offset);
for (i = 0; i < h; i++) {
memcpy(buf + offset_fb, bg, pixel_size * w);
offset_fb += fscinfo.line_length;
diff --git a/w3mimgdisplay.c b/w3mimgdisplay.c
index 6ec24cc..67f0305 100644
--- a/w3mimgdisplay.c
+++ b/w3mimgdisplay.c
@@ -1,4 +1,4 @@
-/* $Id: w3mimgdisplay.c,v 1.14 2003/07/07 15:48:16 ukai Exp $ */
+/* $Id: w3mimgdisplay.c,v 1.15 2003/07/07 15:49:03 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -61,7 +61,7 @@ main(int argc, char **argv)
w_op->max_anim = maxAnim;
if (defined_test) {
- printf("%d %d\n", w_op->width - w_op->offset_x,
+ printf("%d %d\n", w_op->width - w_op->offset_x,
w_op->height - w_op->offset_y);
exit(0);
}
@@ -98,21 +98,21 @@ main(int argc, char **argv)
* +--+--+--+--+ .......+--+--+
*
* args is separeted by ';'
- * op args
- * 0; params draw image
- * 1; params redraw image
- * 2; -none- terminate drawing
- * 3; -none- sync drawing
- * 4; -none- nop, sync communication
- * response '\n'
- * 5; path get size of image,
- * response "<width> <height>\n"
- * 6; params(6) clear image
+ * op args
+ * 0; params draw image
+ * 1; params redraw image
+ * 2; -none- terminate drawing
+ * 3; -none- sync drawing
+ * 4; -none- nop, sync communication
+ * response '\n'
+ * 5; path get size of image,
+ * response "<width> <height>\n"
+ * 6; params(6) clear image
*
* params
- * <n>;<x>;<y>;<w>;<h>;<sx>;<sy>;<sw>;<sh>;<path>
+ * <n>;<x>;<y>;<w>;<h>;<sx>;<sy>;<sw>;<sh>;<path>
* params(6)
- * <x>;<y>;<w>;<h>
+ * <x>;<y>;<w>;<h>
*
*/
switch (buf[0]) {
@@ -139,11 +139,13 @@ main(int argc, char **argv)
if (w_op->get_image_size(w_op, &img, &buf[2], &w, &h)) {
fprintf(stdout, "%d %d\n", w, h);
fflush(stdout);
- } else {
+ }
+ else {
fprintf(stdout, "\n");
fflush(stdout);
}
- } else {
+ }
+ else {
fprintf(stdout, "\n");
fflush(stdout);
}
@@ -253,7 +255,7 @@ DrawImage(char *buf, int redraw)
if (n < 0 || n >= MAX_IMAGE)
return;
if (redraw) {
- if (! w_op->active(w_op) || n >= maxImage || !imageBuf[n].pixmap)
+ if (!w_op->active(w_op) || n >= maxImage || !imageBuf[n].pixmap)
return;
goto draw_image;
}
@@ -267,7 +269,7 @@ DrawImage(char *buf, int redraw)
else if (n >= maxImage)
maxImage = n + 1;
imageBuf = (W3MImage *) realloc((void *)imageBuf,
- sizeof(W3MImage) * maxImage);
+ sizeof(W3MImage) * maxImage);
for (; i < maxImage; i++)
imageBuf[i].pixmap = NULL;
}
@@ -277,11 +279,11 @@ DrawImage(char *buf, int redraw)
}
if (w_op->load_image(w_op, &imageBuf[n], p, w, h) == 0)
- imageBuf[n].pixmap = NULL;
+ imageBuf[n].pixmap = NULL;
draw_image:
if (imageBuf[n].pixmap)
- w_op->show_image(w_op, &imageBuf[n], sx, sy, sw, sh, x, y);
+ w_op->show_image(w_op, &imageBuf[n], sx, sy, sw, sh, x, y);
}
void