commit 8187bb7963145cfb27bcddd912a866506ee2fbc4
parent 4aff38909edae2c74ee4f773564ed4078c9c7b39
Author: ukai <ukai>
Date: Thu, 18 Jul 2002 14:31:07 +0000
indent
Diffstat:
8 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/matrix.h b/matrix.h
@@ -1,5 +1,4 @@
/*
-/*
* matrix.h, matrix.c: Liner equation solver using LU decomposition.
* $Id$
*
diff --git a/w3mimg/fb/fb.h b/w3mimg/fb/fb.h
@@ -2,12 +2,12 @@
#define fb_header
#include <linux/fb.h>
-int fb_open(void);
+int fb_open(void);
void fb_close(void);
void fb_pset(int x, int y, int r, int g, int b);
void fb_clear(void);
-int fb_width(void);
-int fb_height(void);
+int fb_width(void);
+int fb_height(void);
void fb_cmap_disp(void);
void fb_fscrn_disp(void);
void fb_vscrn_disp(void);
diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c
Binary files differ.
diff --git a/w3mimg/fb/fb_gdkpixbuf.h b/w3mimg/fb/fb_gdkpixbuf.h
@@ -4,12 +4,12 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
typedef struct {
- int width;
- int height;
- int rowstride;
- int alpha;
- GdkPixbuf *pixbuf;
- guchar *pixels;
+ int width;
+ int height;
+ int rowstride;
+ int alpha;
+ GdkPixbuf *pixbuf;
+ guchar *pixels;
} IMAGE;
#endif
diff --git a/w3mimg/fb/fb_img.h b/w3mimg/fb/fb_img.h
@@ -3,20 +3,21 @@
#include "config.h"
#if defined(USE_IMLIB2)
- #include "w3mimg/fb/fb_imlib2.h"
+#include "w3mimg/fb/fb_imlib2.h"
#elif defined(USE_GDKPIXBUF)
- #include "w3mimg/fb/fb_gdkpixbuf.h"
+#include "w3mimg/fb/fb_gdkpixbuf.h"
#else
#error no Imlib2 and GdkPixbuf support
#endif
IMAGE *fb_load_image(char *filename, int w, int h);
-int fb_draw_image(IMAGE *img, int x, int y, int sx, int sy, int width, int height);
-int fb_draw_image_simple(IMAGE *img, int x, int y);
-int fb_resize_image(IMAGE *img, int width, int height);
-void fb_free_image(IMAGE *img);
-void fb_set_bg(int r, int g, int b);
-IMAGE *fb_dup_image(IMAGE *img);
-int fb_rotate_image(IMAGE *img, int angle);
+int fb_draw_image(IMAGE * img, int x, int y, int sx, int sy, int width,
+ int height);
+int fb_draw_image_simple(IMAGE * img, int x, int y);
+int fb_resize_image(IMAGE * img, int width, int height);
+void fb_free_image(IMAGE * img);
+void fb_set_bg(int r, int g, int b);
+IMAGE *fb_dup_image(IMAGE * img);
+int fb_rotate_image(IMAGE * img, int angle);
#endif
diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
Binary files differ.
diff --git a/w3mimg/fb/fb_imlib2.h b/w3mimg/fb/fb_imlib2.h
@@ -5,10 +5,10 @@
#include <Imlib2.h>
typedef struct {
- int width;
- int height;
- Imlib_Image image;
- DATA32 *data;
+ int width;
+ int height;
+ Imlib_Image image;
+ DATA32 *data;
} IMAGE;
#endif
diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
@@ -253,7 +253,7 @@ w3mimg_x11open()
XWindowAttributes attr;
Window root, *children;
- 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));
@@ -268,10 +268,10 @@ w3mimg_x11open()
goto error;
}
if ((id = getenv("WINDOWID")) != NULL)
- xi->window = (Window)atoi(id);
+ xi->window = (Window) atoi(id);
else
XGetInputFocus(xi->display, &xi->window, &revert);
- if (! xi->window)
+ if (!xi->window)
exit(1);
XGetWindowAttributes(xi->display, xi->window, &attr);
@@ -281,12 +281,12 @@ w3mimg_x11open()
while (1) {
Window p_window;
- XQueryTree(xi->display, xi->window, &root, &xi->parent,
+ XQueryTree(xi->display, xi->window, &root, &xi->parent,
&children, &nchildren);
p_window = xi->window;
for (i = 0; i < nchildren; i++) {
XGetWindowAttributes(xi->display, children[i], &attr);
- if (attr.width > wop->width * 0.7 &&
+ if (attr.width > wop->width * 0.7 &&
attr.height > wop->height * 0.7) {
/* maybe text window */
wop->width = attr.width;
@@ -300,15 +300,14 @@ w3mimg_x11open()
wop->offset_x = OFFSET_X;
for (i = 0; i < nchildren; i++) {
XGetWindowAttributes(xi->display, children[i], &attr);
- if (attr.x <= 0 && attr.width < 30 &&
- attr.height > wop->height * 0.7) {
+ if (attr.x <= 0 && attr.width < 30 && attr.height > wop->height * 0.7) {
/* scrollbar of xterm/kterm ? */
wop->offset_x += attr.x + attr.width + attr.border_width * 2;
break;
}
}
wop->offset_y = OFFSET_Y;
-
+
wop->priv = xi;
wop->init = x11_init;
@@ -323,7 +322,7 @@ w3mimg_x11open()
wop->free_image = x11_free_image;
return wop;
-error:
+ error:
if (xi)
free(xi);
free(wop);