diff options
| author | lecoanet | 2003-04-16 09:49:22 +0000 |
|---|---|---|
| committer | lecoanet | 2003-04-16 09:49:22 +0000 |
| commit | 3261805fee19e346b4d1f84b23816daa1628764a (patch) | |
| tree | 63ca1d7e4b0a3d9ae49cc0888e58033c3ef3fe22 /generic/Image.h | |
| parent | eed2656db0adae2c234c3d74af0913746ed5c444 (diff) | |
| download | tkzinc-3261805fee19e346b4d1f84b23816daa1628764a.zip tkzinc-3261805fee19e346b4d1f84b23816daa1628764a.tar.gz tkzinc-3261805fee19e346b4d1f84b23816daa1628764a.tar.bz2 tkzinc-3261805fee19e346b4d1f84b23816daa1628764a.tar.xz | |
Update from the Windows port and general cleanup/restructure
Diffstat (limited to 'generic/Image.h')
| -rw-r--r-- | generic/Image.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/generic/Image.h b/generic/Image.h index 21b625d..0a3a82a 100644 --- a/generic/Image.h +++ b/generic/Image.h @@ -30,13 +30,9 @@ #ifndef _Image_h #define _Image_h -#ifdef GLX -#include <GL/gl.h> -#endif - #include "Types.h" -struct _WidgetInfo; +struct _ZnWInfo; typedef void *ZnImage; @@ -45,31 +41,29 @@ typedef void *ZnImage; (((bits)[(y)*(stride)+((x)>>3)]<<((x)&7))&0x80) ZnImage -ZnGetImage(struct _WidgetInfo *wi, Tk_Uid image_name); +ZnGetImage(struct _ZnWInfo *wi, Tk_Uid image_name); ZnImage ZnGetImageByValue(ZnImage image); ZnImage -ZnGetBitmap(struct _WidgetInfo *wi, Tk_Uid bitmap_name); +ZnGetBitmap(struct _ZnWInfo *wi, Tk_Uid bitmap_name); void ZnFreeImage(ZnImage image); char * ZnNameOfImage(ZnImage image); void ZnSizeOfImage(ZnImage image, int *width, int *height); -char * -ZnImagePattern(ZnImage image, int *stride); -XImage * -ZnImageMask(ZnImage image); +Pixmap +ZnImagePixmap(ZnImage image); ZnBool ZnImageIsBitmap(ZnImage image); -Pixmap -ZnImagePixmap(ZnImage image, Pixmap *mask_pmap); -#ifdef GLX +char * +ZnImageMask(ZnImage image, int *stride); +TkRegion +ZnImageRegion(ZnImage image); +#ifdef GL GLuint ZnImageTex(ZnImage image, ZnReal *t, ZnReal *s); -#endif -#ifdef GLX typedef struct _ZnTexGlyphVertexInfo { GLfloat t0[2]; GLshort v0[2]; @@ -86,13 +80,13 @@ typedef struct _ZnTexGlyphVertexInfo { typedef void *ZnTexFontInfo; ZnTexFontInfo -ZnGetTexFont(struct _WidgetInfo *wi, ZnFont font); +ZnGetTexFont(struct _ZnWInfo *wi, Tk_Font font); void ZnFreeTexFont(ZnTexFontInfo tfi); ZnBool -ZnCharInTexFont(ZnTexFontInfo tfi, int c); +ZnCharInTexFont(ZnTexFontInfo tfi, unsigned int c); ZnTexGVI * -ZnTexFontGVI(ZnTexFontInfo tfi, int c); +ZnTexFontGVI(ZnTexFontInfo tfi, unsigned int c); GLuint ZnTexFontTex(ZnTexFontInfo tfi); #endif |