import partial giblib source into feh, do not link with giblib (c7d0afa8) · Commits · derf / feh

config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,4 +71,4 @@ endif
		CFLAGS += -DPREFIX=\"${PREFIX}\" \
		-DPACKAGE=\"${PACKAGE}\" -DVERSION=\"${VERSION}\"

		LDLIBS += -lm -lpng -lX11 -lImlib2 -lgiblib
		LDLIBS += -lm -lpng -lX11 -lImlib2

src/gib_hash.c

0 → 100644

+144 −0

Original line number	Diff line number	Diff line
		/* gib_hash.c

		Copyright (C) 1999,2000 Paul Duncan.

		Permission is hereby granted, free of charge, to any person obtaining a copy
		of this software and associated documentation files (the "Software"), to
		deal in the Software without restriction, including without limitation the
		rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
		sell copies of the Software, and to permit persons to whom the Software is
		furnished to do so, subject to the following conditions:

		The above copyright notice and this permission notice shall be included in
		all copies of the Software and its documentation and acknowledgment shall be
		given in the documentation and software packages that this Software was
		used.

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
		IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

		*/

		#include "gib_hash.h"
		#include "gib_utils.h"

		gib_hash_node gib_hash_node_new(char key, void *data)
		{
		gib_hash_node *node = malloc(sizeof(gib_hash_node));
		node->key = strdup(key);
		GIB_LIST(node)->data = data;
		GIB_LIST(node)->next = NULL;
		GIB_LIST(node)->prev = NULL;
		return node;

		}

		void gib_hash_node_free(gib_hash_node *node)
		{
		free(node->key);
		free(node);
		return;
		}

		void gib_hash_node_free_and_data(gib_hash_node *node)
		{
		free(node->list.data);
		gib_hash_node_free(node);
		return;
		}

		gib_hash *gib_hash_new()
		{
		gib_hash *hash = malloc(sizeof(gib_hash));
		hash->base = gib_hash_node_new("__gib_hash_new",NULL);
		return hash;
		}

		void gib_hash_free(gib_hash *hash)
		{
		/* free hash keys as it's not taken care of by gib_list_free */
		gib_list *i;
		for (i = GIB_LIST(hash->base); i; i = i->next)
		free(GIB_HASH_NODE(i)->key);

		gib_list_free(GIB_LIST(hash->base));
		free(hash);
		return;
		}

		void gib_hash_free_and_data(gib_hash *hash)
		{
		/* free hash keys as it's not taken care of by gib_list_free */
		gib_list *i;
		for (i = GIB_LIST(hash->base); i; i = i->next)
		free(GIB_HASH_NODE(i)->key);

		gib_list_free_and_data(GIB_LIST(hash->base));
		free(hash);
		return;
		}

		static unsigned char gib_hash_find_callback(gib_list list, void data)
		{
		gib_hash_node *node = GIB_HASH_NODE(list);
		char key = (char) data;

		/* strncasecmp causes simliar keys like key1 and key11 clobber eachother */
		return !strcasecmp(node->key, key);
		}

		void gib_hash_set(gib_hash hash, char key, void *data)
		{
		gib_list *l;
		gib_hash_node *n;

		n = GIB_HASH_NODE(gib_list_find(GIB_LIST(hash->base),
		gib_hash_find_callback,
		key));
		if (n) {
		GIB_LIST(n)->data = data;
		} else {
		/* not using gib_list_add_end here as that would nest the
		data one level, doing manual insert instead */
		n = gib_hash_node_new(key,data);
		l = gib_list_last(GIB_LIST(hash->base));

		GIB_LIST(n)->next = NULL;
		GIB_LIST(n)->prev = l;

		if (l)
		l->next = GIB_LIST(n);
		}
		}

		void gib_hash_get(gib_hash hash, char *key)
		{
		gib_list *n = gib_list_find(GIB_LIST(hash->base),gib_hash_find_callback,key);
		return n?n->data:NULL;
		}

		void gib_hash_remove(gib_hash hash, char key)
		{
		gib_list *n = gib_list_find(GIB_LIST(hash->base), gib_hash_find_callback, key);
		if (n) {
		gib_list_unlink(GIB_LIST(hash->base), n);
		gib_hash_node_free(GIB_HASH_NODE(n->data));
		}

		return;
		}

		void gib_hash_foreach(gib_hash hash, void (foreach_cb)(gib_hash_node node, void data), void *data)
		{
		gib_hash_node i, next;
		for (i=hash->base; i; i=next) {
		next = GIB_HASH_NODE(GIB_LIST(i)->next);
		foreach_cb(i,data);
		}
		return;
		}

src/gib_hash.h

0 → 100644

+72 −0

Original line number	Diff line number	Diff line

		/* gib_hash.h

		Copyright (C) 1999,2000 Paul Duncan.

		Permission is hereby granted, free of charge, to any person obtaining a copy
		of this software and associated documentation files (the "Software"), to
		deal in the Software without restriction, including without limitation the
		rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
		sell copies of the Software, and to permit persons to whom the Software is
		furnished to do so, subject to the following conditions:

		The above copyright notice and this permission notice shall be included in
		all copies of the Software and its documentation and acknowledgment shall be
		given in the documentation and software packages that this Software was
		used.

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
		IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

		*/

		#ifndef GIB_HASH_H
		#define GIB_HASH_H

		#include "gib_list.h"

		#define GIB_HASH(a) ((gib_hash*)a)
		#define GIB_HASH_NODE(a) ((gib_hash_node*)a)

		typedef struct __gib_hash gib_hash;
		typedef struct __gib_hash_node gib_hash_node;

		struct __gib_hash
		{
		gib_hash_node *base;
		};

		struct __gib_hash_node
		{
		gib_list list;
		char *key;
		};

		#ifdef __cplusplus
		extern "C"
		{
		#endif

		gib_hash_node gib_hash_node_new(char key, void *data);
		void gib_hash_node_free(gib_hash_node *node);
		void gib_hash_node_free_and_data(gib_hash_node *node);

		gib_hash *gib_hash_new();
		void gib_hash_free(gib_hash *hash);
		void gib_hash_free_and_data(gib_hash *hash);

		void gib_hash_set(gib_hash hash, char key, void *data);
		void gib_hash_get(gib_hash hash, char *key);
		void gib_hash_remove(gib_hash hash, char key);

		void gib_hash_foreach(gib_hash hash, void (foreach_cb)(gib_hash_node node, void data), void *data);

		#ifdef __cplusplus
		}
		#endif

		#endif /* GIB_HASH_H */

src/gib_imlib.c

0 → 100644

+697 −0

File added.

Preview size limit exceeded, changes collapsed.

src/gib_imlib.h

0 → 100644

+180 −0

Original line number	Diff line number	Diff line
		/* gib_imlib.h

		Copyright (C) 1999,2000 Tom Gilbert.

		Permission is hereby granted, free of charge, to any person obtaining a copy
		of this software and associated documentation files (the "Software"), to
		deal in the Software without restriction, including without limitation the
		rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
		sell copies of the Software, and to permit persons to whom the Software is
		furnished to do so, subject to the following conditions:

		The above copyright notice and this permission notice shall be included in
		all copies of the Software and its documentation and acknowledgment shall be
		given in the documentation and software packages that this Software was
		used.

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
		IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

		*/

		#ifndef GIB_IMLIB_H
		#define GIB_IMLIB_H

		#include <stdio.h>
		#include <stdlib.h>
		#include <X11/Xlib.h>
		#include <Imlib2.h>
		#include <stdarg.h>
		#include <ctype.h>
		#include "gib_style.h"

		#define GIBCLIP(x, y, w, h, xx, yy, ww, hh) \
		{ \
		if ((yy) > y) { h -= (yy) - y; y = (yy); } \
		if ((yy) + hh < y + h) { h -= y + h - ((yy) + (hh)); } \
		if ((xx) > x) { w -= (xx) - x; x = (xx); } \
		if ((xx) + (ww) < x + w) { w -= x + w - ((xx) + (ww)); } \
		}

		#ifdef __cplusplus
		extern "C"
		{
		#endif

		int gib_imlib_load_image(Imlib_Image * im, char *filename);
		int gib_imlib_image_get_width(Imlib_Image im);
		int gib_imlib_image_get_height(Imlib_Image im);
		int gib_imlib_image_has_alpha(Imlib_Image im);
		const char *gib_imlib_image_get_filename(Imlib_Image im);
		void gib_imlib_free_image_and_decache(Imlib_Image im);
		void gib_imlib_render_image_on_drawable(Drawable d, Imlib_Image im, int x,
		int y, char dither, char blend,

		char alias);
		void gib_imlib_render_image_on_drawable_with_rotation(Drawable d,
		Imlib_Image im, int x,
		int y, double angle,

		char dither, char blend,
		char alias);
		void gib_imlib_render_image_part_on_drawable_at_size(Drawable d,
		Imlib_Image im, int sx,
		int sy, int sw, int sh,
		int dx, int dy, int dw,
		int dh, char dither,

		char blend, char alias);
		void gib_imlib_render_image_part_on_drawable_at_size_with_rotation(Drawable d,
		Imlib_Image

		im, int sx,
		int sy,
		int sw,
		int sh,
		int dx,
		int dy,
		int dw,
		int dh,
		double
		angle,
		char
		dither,
		char blend,
		char
		alias);
		void gib_imlib_image_fill_rectangle(Imlib_Image im, int x, int y, int w,
		int h, int r, int g, int b, int a);
		void gib_imlib_text_draw(Imlib_Image im, Imlib_Font fn, gib_style * s, int x,
		int y, char *text, Imlib_Text_Direction dir, int r,
		int g, int b, int a);
		void gib_imlib_get_text_size(Imlib_Font fn, char text, gib_style s, int *w,
		int *h, Imlib_Text_Direction dir);
		Imlib_Image gib_imlib_clone_image(Imlib_Image im);
		char *gib_imlib_image_format(Imlib_Image im);
		char *gib_imlib_list_fonts(int num);
		void gib_imlib_render_image_on_drawable_at_size(Drawable d, Imlib_Image im,
		int x, int y, int w, int h,
		char dither, char blend,

		char alias);
		void gib_imlib_render_image_on_drawable_at_size_with_rotation(Drawable d,
		Imlib_Image im,
		int x, int y,

		int w, int h,
		double angle,
		char dither,
		char blend,
		char alias);
		void gib_imlib_blend_image_onto_image(Imlib_Image dest_image,
		Imlib_Image source_image,
		char merge_alpha, int sx, int sy,
		int sw, int sh, int dx, int dy, int dw,
		int dh, char dither, char blend,

		char alias);
		void gib_imlib_blend_image_onto_image_with_rotation(Imlib_Image dest_image,
		Imlib_Image source_image,
		char merge_alpha, int sx,
		int sy, int sw, int sh,
		int dx, int dy, int dw,
		int dh, double angle,

		char dither, char blend,
		char alias);
		Imlib_Image gib_imlib_create_cropped_scaled_image(Imlib_Image im, int sx,
		int sy, int sw, int sh,
		int dw, int dh, char alias);
		void gib_imlib_apply_color_modifier_to_rectangle(Imlib_Image im, int x, int y,
		int w, int h, DATA8 * rtab,
		DATA8 * gtab, DATA8 * btab,
		DATA8 * atab);
		void gib_imlib_image_set_has_alpha(Imlib_Image im, int alpha);
		void gib_imlib_save_image(Imlib_Image im, char *file);
		void gib_imlib_save_image_with_error_return(Imlib_Image im, char *file,
		Imlib_Load_Error * error_return);
		void gib_imlib_free_font(Imlib_Font fn);
		void gib_imlib_free_image(Imlib_Image im);
		void gib_imlib_image_draw_line(Imlib_Image im, int x1, int y1, int x2, int y2,
		char make_updates, int r, int g, int b, int a);
		void gib_imlib_image_set_has_alpha(Imlib_Image im, int alpha);
		void gib_imlib_free_font(Imlib_Font fn);
		Imlib_Image gib_imlib_create_rotated_image(Imlib_Image im, double angle);
		void gib_imlib_image_tile(Imlib_Image im);
		void gib_imlib_image_blur(Imlib_Image im, int radius);
		void gib_imlib_image_sharpen(Imlib_Image im, int radius);
		void gib_imlib_image_draw_rectangle(Imlib_Image im, int x, int y, int w,
		int h, int r, int g, int b, int a);
		void gib_imlib_line_clip_and_draw(Imlib_Image dest, int x0, int y0, int x1,
		int y1, int cx, int cy, int cw, int ch,
		int r, int g, int b, int a);
		void gib_imlib_image_fill_polygon(Imlib_Image im, ImlibPolygon poly, int r,
		int g, int b, int a, unsigned char alias,
		int cx, int cy, int cw, int ch);
		void gib_imlib_image_draw_polygon(Imlib_Image im, ImlibPolygon poly, int r,
		int g, int b, int a, unsigned char closed,
		unsigned char alias, int cx, int cy, int cw,

		int ch);
		Imlib_Image gib_imlib_create_image_from_drawable(Drawable d, Pixmap mask,
		int x, int y, int width,

		int height,
		char need_to_grab_x);
		void gib_imlib_parse_color(char col, int r, int g, int b, int *a);
		void gib_imlib_parse_fontpath(char *path);
		Imlib_Font gib_imlib_load_font(char *name);
		void gib_imlib_image_orientate(Imlib_Image im, int orientation);

		#ifdef __cplusplus
		}
		#endif


		#endif

Admin message