Subject: Agar: r7652 - trunk/gui - msg#00045

Author: vedge
Date: 2008-09-17 06:40:33 -0300 (Wed, 17 Sep 2008)
New Revision: 7652

Modified:
trunk/gui/AG_Pixmap.3
trunk/gui/pixmap.c
trunk/gui/pixmap.h
Log:
- fix documented prototypes for PixmapReplaceSurface(), etc.
- provide PixmapReplaceCurrentSurface(), etc. variants.


Modified: trunk/gui/AG_Pixmap.3
===================================================================
--- trunk/gui/AG_Pixmap.3 2008-09-17 03:07:21 UTC (rev 7651)
+++ trunk/gui/AG_Pixmap.3 2008-09-17 09:40:33 UTC (rev 7652)
@@ -69,12 +69,6 @@
.Ft "AG_Pixmap *"
.Fn AG_PixmapFromSurfaceScaled "AG_Widget *parent" "Uint flags" "AG_Surface
*src" "int width" "int height"
.Pp
-.Ft "AG_Pixmap *"
-.Fn AG_PixmapFromBMP "AG_Widget *parent" "Uint flags" "const char *path"
-.Pp
-.Ft "AG_Pixmap *"
-.Fn AG_PixmapFromXCF "AG_Widget *parent" "Uint flags" "const char *path"
-.Pp
.nr nS 0
The
.Fn AG_PixmapNew
@@ -106,12 +100,6 @@
that will be freed automatically along with the widget instance.
.Fn AG_PixmapFromSurfaceScaled
uses a rescaled copy of the given surface.
-.Pp
-Use
-.Fn AG_PixmapFromBMP
-to load the image from a Windows Bitmap file, or
-.Fn AG_PixmapFromXCF
-to load from a Gimp XCF file.
.Sh CHANGING SURFACES
.nr nS 1
.Ft "int"
@@ -127,15 +115,24 @@
.Fn AG_PixmapSetSurface "AG_Pixmap *pixmap" "int surface_name"
.Pp
.Ft "void"
-.Fn AG_PixmapReplaceSurface "AG_Pixmap *pixmap" "int surface_name"
+.Fn AG_PixmapReplaceSurface "AG_Pixmap *pixmap" "int surface_name" "AG_Surface
*surfaceNew"
.Pp
.Ft "void"
-.Fn AG_PixmapReplaceSurfaceScaled "AG_Pixmap *pixmap" "int surface_name" "Uint
width" "Uint height"
+.Fn AG_PixmapReplaceCurrentSurface "AG_Pixmap *pixmap" "AG_Surface *surfaceNew"
.Pp
.Ft "void"
-.Fn AG_PixmapUpdateSurface "AG_Pixmap *pixmap"
+.Fn AG_PixmapReplaceSurfaceScaled "AG_Pixmap *pixmap" "int surface_name"
"AG_Surface *surfaceNew" "Uint width" "Uint height"
.Pp
.Ft "void"
+.Fn AG_PixmapReplaceCurrentSurfaceScaled "AG_Pixmap *pixmap" "AG_Surface
*surfaceNew" "Uint width" "Uint height"
+.Pp
+.Ft "void"
+.Fn AG_PixmapUpdateSurface "AG_Pixmap *pixmap" "int surface_name"
+.Pp
+.Ft "void"
+.Fn AG_PixmapUpdateCurrentSurface "AG_Pixmap *pixmap"
+.Pp
+.Ft "void"
.Fn AG_PixmapSetCoords "AG_Pixmap *pixmap" "int s" "int t"
.Pp
.nr nS 0
@@ -161,11 +158,18 @@
If you need to modify the contents of a previously mapped surface, it is
necessary to call
.Fn AG_PixmapUpdateSurface
-when you're done.
+afterwards.
It has no effect in direct video mode, but it causes the texture to be
re-uploaded to the graphics hardware in OpenGL mode.
.Pp
The
+.Fn AG_PixmapReplaceCurrentSurface ,
+.Fn AG_PixmapReplaceCurrentSurfaceScaled
+and
+.Fn AG_PixmapUpdateCurrentSurface
+variants operate on the currently selected (visible) surface.
+.Pp
+The
.Fn AG_PixmapSetCoords
function changes the source coordinates of the active surface.
The default is [0,0].

Modified: trunk/gui/pixmap.c
===================================================================
--- trunk/gui/pixmap.c 2008-09-17 03:07:21 UTC (rev 7651)
+++ trunk/gui/pixmap.c 2008-09-17 09:40:33 UTC (rev 7652)
@@ -127,44 +127,6 @@
return (px);
}

-#if 0
-AG_Pixmap *
-AG_PixmapFromXCF(void *parent, Uint flags, const char *path)
-{
- AG_Object tmpObj;
- AG_Pixmap *px;
- AG_Surface *su;
- AG_DataSource *ds;
- Uint i;
-
- if ((ds = AG_OpenFile(path, "rb")) == NULL) {
- AG_TextMsg(AG_MSG_ERROR, "%s: %s", path, AG_GetError());
- return (NULL);
- }
-
- /* XXX hack */
- AG_ObjectInit(&tmpObj, &agObjectClass);
- tmpObj.gfx = AG_GfxNew(&tmpObj);
- if (AG_XCFLoad(ds, 0, tmpObj.gfx) == -1)
- goto fail;
-
- px = Malloc(sizeof(AG_Pixmap));
- AG_ObjectInit(px, &agPixmapClass);
- px->flags |= flags;
- AG_ObjectAttach(parent, px);
- for (i = 0; i < tmpObj.gfx->nsprites; i++) {
- AG_WidgetMapSurface(px, AG_DupSurface(AG_SPRITE(&tmpObj,i).su));
- }
- AG_CloseFile(ds);
- AG_ObjectDestroy(&tmpObj);
- return (px);
-fail:
- AG_CloseFile(ds);
- AG_ObjectDestroy(&tmpObj);
- return (NULL);
-}
-#endif
-
/*
* Map an existing surface. Returned surface ID is valid as long as pixmap
* is locked.
@@ -235,9 +197,10 @@
return (name);
}

-/* Replace the current surface with a scaled version of a surface. */
+/* Replace the specified surface with a scaled version of another surface. */
void
-AG_PixmapReplaceSurfaceScaled(AG_Pixmap *px, AG_Surface *su, Uint w, Uint h)
+AG_PixmapReplaceSurfaceScaled(AG_Pixmap *px, int surface_name, AG_Surface *su,
+ Uint w, Uint h)
{
AG_Surface *scaled = NULL;

@@ -245,7 +208,7 @@
AG_FatalError(NULL);
}
AG_ObjectLock(px);
- AG_WidgetReplaceSurface(px, px->n, scaled);
+ AG_WidgetReplaceSurface(px, surface_name, scaled);
AG_ObjectUnlock(px);
}


Modified: trunk/gui/pixmap.h
===================================================================
--- trunk/gui/pixmap.h 2008-09-17 03:07:21 UTC (rev 7651)
+++ trunk/gui/pixmap.h 2008-09-17 09:40:33 UTC (rev 7652)
@@ -28,19 +28,24 @@
AG_Pixmap *AG_PixmapFromSurfaceCopy(void *, Uint, AG_Surface *);
AG_Pixmap *AG_PixmapFromSurfaceScaled(void *, Uint, AG_Surface *, Uint, Uint);
AG_Pixmap *AG_PixmapFromBMP(void *, Uint, const char *);
-#if 0
-AG_Pixmap *AG_PixmapFromXCF(void *, Uint, const char *);
-#endif

int AG_PixmapAddSurface(AG_Pixmap *, AG_Surface *);
int AG_PixmapAddSurfaceFromBMP(AG_Pixmap *, const char *);
int AG_PixmapAddSurfaceCopy(AG_Pixmap *, AG_Surface *);
int AG_PixmapAddSurfaceScaled(AG_Pixmap *, AG_Surface *, Uint, Uint);
-void AG_PixmapReplaceSurfaceScaled(AG_Pixmap *, AG_Surface *, Uint,
+#define AG_PixmapReplaceSurface(px,name,su) \
+ AG_WidgetReplaceSurface((px),(name),(su))
+#define AG_PixmapUpdateSurface(px,name) \
+ AG_WidgetUpdateSurface((px),(name))
+void AG_PixmapReplaceSurfaceScaled(AG_Pixmap *, int, AG_Surface *, Uint,
Uint);

-#define AG_PixmapReplaceSurface(px,su) AG_WidgetReplaceSurface((px),(px)->n,su)
-#define AG_PixmapUpdateSurface(px) AG_WidgetUpdateSurface((px),(px)->n)
+#define AG_PixmapReplaceCurrentSurface(px,su) \
+ AG_PixmapReplaceSurface((px),(px)->n,(su))
+#define AG_PixmapReplaceCurrentSurfaceScaled(px,su,w,h) \
+ AG_PixmapReplaceSurfaceScaled((px),(px)->n,(su),(w),(h))
+#define AG_PixmapUpdateCurrentSurface(px) \
+ AG_PixmapUpdateSurface((px),(px)->n)

static __inline__ int
AG_PixmapSetSurface(AG_Pixmap *px, int name)