General Graphics Interface

Update of /cvsroot/ggi/ggi-core/libgalloc/include/ggi/internal
In directory usw-pr-cvs1:/tmp/cvs-serv14664/include/ggi/internal

Modified Files:
	galloc.h 
Log Message:

Please excuse the mess as we remodel the kitchen sink
One template down, two to go...



Index: galloc.h
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/include/ggi/internal/galloc.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** galloc.h	2001/10/27 05:02:23	1.20
--- galloc.h	2001/10/29 21:52:59	1.21
***************
*** 97,101 ****
  
  
! /* Typedef for template callback functions. */
  struct ggiGA_taghead;				/* needed for prototype. */
  typedef struct ggiGA_taghead *ggiGA_taghead_t;	/* needed for prototype. */
--- 97,104 ----
  
  
! /* Typedefs for template callback functions. */
! struct ggiGA_template_state {
! 	ggiGA_resource_handle firstmode;
! };
  struct ggiGA_taghead;				/* needed for prototype. */
  typedef struct ggiGA_taghead *ggiGA_taghead_t;	/* needed for prototype. */
***************
*** 107,111 ****
  				     ggiGA_taghead_t taghead,
  				     ggiGA_resource_handle has,
! 				     void **state,
  				     void **privstate);
  
--- 110,114 ----
  				     ggiGA_taghead_t taghead,
  				     ggiGA_resource_handle has,
! 				     struct ggiGA_template_state **state,
  				     void **privstate);
  
***************
*** 126,129 ****
--- 129,135 ----
  ggiGA_reslist_callback ggiGA_default_tank_uncheck;
  ggiGA_reslist_callback ggiGA_default_uncheck;
+ ggiGA_reslist_callback ggiGA_default_motor_set;
+ ggiGA_reslist_callback ggiGA_default_carb_set;
+ ggiGA_reslist_callback ggiGA_default_tank_set;
  ggiGA_reslist_callback ggiGA_default_set;
  ggiGA_reslist_callback ggiGA_default_unset;
***************
*** 186,189 ****
--- 192,201 ----
  	int tag2;
  	ggiGA_resource_handle left2, right2;
+ 	int flags;
+   /* Flag: if set, the resources must still be of the same type, so they can
+    * be shared in the superior tag group, but storage should not overlap
+    * among resources in this tag group.
+    */
+ #define GA_TAGHEAD_EXCLUSIVE	0x0001
  };

Update of /cvsroot/ggi/ggi-core/libgalloc/include/ggi
In directory usw-pr-cvs1:/tmp/cvs-serv14664/include/ggi

Modified Files:
	ga_prop.h ga_types.h 
Log Message:

Please excuse the mess as we remodel the kitchen sink
One template down, two to go...



Index: ga_prop.h
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/include/ggi/ga_prop.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** ga_prop.h	2001/09/16 05:00:57	1.23
--- ga_prop.h	2001/10/29 21:52:59	1.24
***************
*** 99,132 ****
  struct ggiGA_resource_props {
  
- 	/* Must support types of storage */
- 
- 	/* Brian: Please move this into the docs:
- 	 *
- 	 * >From user:
- 	 * storage_ok "I know how to use this type of storage,
- 	 *            so it OK to give it to me, I will find
- 	 *            it useful"
- 	 *
- 	 * storage_need "I need this type of storage, or I cannot use
- 	 *              what you give me at all, so if you cannot get it,
- 	 *              then you should just fail the resource"
- 	 *
- 	 * >From LibGalloc (successful resource):
- 	 * storage_ok    "This is the kind of storage that I managed to get.
- 	 *                It is OK to use the resource and assume that this
- 	 *                is the type of storage you did get."
- 	 *
- 	 * storage_need  <unchanged>
- 	 *
- 	 * >From LibGalloc (failed resource):
- 	 * storage_ok    "This is as close as I would have been able to get to
- 	 *                your request.  This much would have been OK."
- 	 *
- 	 * storage_need  "Things would have worked if you had only insisted on this
- 	 *                type of storage, instead of what you did insist on.  In
- 	 *                order to get requests approved, I need you to only use
- 	 *                these bits."
- 	 */
- 
  	enum ggiGA_storage_type storage_need;
  	enum ggiGA_storage_type storage_ok;
--- 99,102 ----

Index: ga_types.h
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/include/ggi/ga_types.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ga_types.h	2001/10/21 19:56:22	1.10
--- ga_types.h	2001/10/29 21:52:59	1.11
***************
*** 523,526 ****
--- 523,529 ----
    /* TANKS */
  
+   /* Renderer specific flags */
+   GA_FLAG_RENDERER_HW		= 0x00000020,	/* Accellerated */
+ 
  };	/* ggiGA_flags */

Update of /cvsroot/ggi/ggi-core/libgalloc/display/stubs
In directory usw-pr-cvs1:/tmp/cvs-serv14664/display/stubs

Modified Files:
	Makefile.am funcs.c haslist.c stubsgalloc.h 
Log Message:

Please excuse the mess as we remodel the kitchen sink
One template down, two to go...



Index: Makefile.am
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/display/stubs/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	2001/10/20 22:22:25	1.3
--- Makefile.am	2001/10/29 21:52:58	1.4
***************
*** 6,10 ****
  sublib_LTLIBRARIES = stubs_galloc.la
  
! stubs_galloc_la_SOURCES = init.c haslist.c funcs.c
  
  sublibdir = $(libdir)/$(ggi_subdir)/galloc/display
--- 6,10 ----
  sublib_LTLIBRARIES = stubs_galloc.la
  
! stubs_galloc_la_SOURCES = init.c funcs.c haslist.c
  
  sublibdir = $(libdir)/$(ggi_subdir)/galloc/display

Index: funcs.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/display/stubs/funcs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** funcs.c	2001/10/21 20:24:02	1.17
--- funcs.c	2001/10/29 21:52:58	1.18
***************
*** 57,213 ****
  /*-* API Implementation */
  
- 
- int GALLOC_Stubs_Check_callback(ggi_visual_t vis, ggiGA_resource_handle handle,
- 				ggiGA_resource_handle compound,
- 				ggiGA_resource_handle lastmode,
- 				void **checkstate)
- {
-   	ggiGA_resource_handle cap = NULL;
- 	int rc = GALLOC_EUNAVAILABLE;
-         int res_state;
- 	struct stubsgalloc_container_t *checkstate_t = NULL;
- 	struct ggiGA_mode frame, *frame_p;
- 
-         GALLOCDPRINT("%s:%s:%i: called\n", DEBUG_INFO );
- 
- 	/* This demonstrates how to hold state between callbacks. */
- 	if (handle == NULL) {
- 		LIB_ASSERT(compound == NULL);
- 		LIB_ASSERT(lastmode == NULL);
- 		if (checkstate[0] == NULL) {
- 			checkstate[0] = malloc(sizeof(struct stubsgalloc_container_t));
- 			if (checkstate[0] == NULL) {
- 				rc = GGI_ENOMEM;
- 				ggiGAFlagFailed(handle);
- 				return rc;
- 			}	/* if */
- 
- 			checkstate_t = checkstate[0];
- 			checkstate_t->state = 1;
- 		} else {
- 			free(checkstate[0]);
- 			checkstate[0] = NULL;
- 		}	/* if */
- 		return GALLOC_OK;
- 	}	/* if */
- 
- 	LIB_ASSERT(compound != NULL);
- 	LIB_ASSERT(handle != NULL);
- 
- 	/* We should never be called directly on a cap. */
- 	LIB_ASSERT(!ggiGAIsCap(handle));
- 
-         res_state = (handle->res_state & GA_STATE_REQUEST_MASK);
- 
- 	/* Resources which are already active have already been checked. */
-         if ((res_state & GA_STATE_NORESET) == GA_STATE_NORESET) {
-                 rc = GALLOC_OK;
-                 return rc;
-         }       /* if */
- 
- 
- 
- 	/* Temporary cheezy hacks to keep LibBuf working */
- 	switch (ggiGA_FULLTYPE(handle)) {
- 	case GA_RT_FRAME:
- 	  goto frame;
- 	case GA_RT_BUFFER_ZBUFFER:
- 	case GA_RT_BUFFER_ABUFFER:
- 	case GA_RT_RENDERER_DRAWOPS:
- 	case GA_RT_BOB_DONTCARE:
- 	  ggiGAFlagSuccess(handle);
- 	  return GALLOC_OK;
- 	default:
- 	  ggiGAFlagFailed(handle);
- 	  return GALLOC_EUNAVAILABLE;
- 	}	/* if */
- 
-  frame:
- 	LIB_ASSERT(handle->priv != NULL);
- 
- 	if (res_state & GA_STATE_NOCHANGE) {
- 
- 		memcpy(&frame, handle->priv, sizeof(frame));
- 		rc = ggiCheckMode(vis, &(frame.mode));
- 
- 		if (rc != GALLOC_OK) {
- 			ggiGAFlagFailed(handle);
- 			rc = GALLOC_EFAILED;
- 		}       /* if */
- 		return rc;
- 	}	/* if */
- 
- 	/* Is there a cap? */
- 	if (!ggiGAIsCap(handle->next)) {
- 
- 		/* No cap. */
- 		rc = ggiCheckMode(vis, ggiGAGetGGIMode(handle));
- 
- 		if (rc != GALLOC_OK) {
- 			/* modifications are allowed by ggiCheckMode(),
- 			 * because GA_STATE_NOCHANGED is NOT set.
- 			 */
- 			handle->res_state |= GA_STATE_MODIFIED; 
- 			rc = GALLOC_OK;
- 		}       /* if */
- 		return rc;
- 	}       /* if */
- 
- 	/* OK, since we are stubs and we have to work within the LibGGI
- 	   API functions, we can only hope that the target implements
- 	   ggiCheckMode correctly, which means it maximizes the mode. */
- 	cap = handle->next;
- 	memcpy(&frame, cap->priv, sizeof(frame));
- 	if (ggiCheckMode(vis, &(frame.mode)) == GGI_OK) {
- 		/* Lucky us. */ 
- 		rc = GALLOC_OK;
- 		goto finish;
- 	}	/* if */
- 	/* Now we try again, using the adjusted values that came back from
- 	   ggiCheckMode. */
- 	if (ggiCheckMode(vis, &(frame.mode)) == GGI_OK) {
- 		/* Lucky us. */ 
- 		rc = GALLOC_OK;
- 		goto finish;
- 	}	/* if */
- 	/* TODO: Now what to try?? */
- 
-  finish:
- 
- 	/* If any of these assertions fail for a target, we should
- 	   consider doing a better job above. */
- 	frame_p = (struct ggiGA_mode *)cap->priv;
- 	LIB_ASSERT(frame.mode.visible.x <= frame_p->mode.visible.x ||
- 		   frame_p->mode.visible.x == GGI_AUTO);
- 	LIB_ASSERT(frame.mode.visible.y <= frame_p->mode.visible.y ||
- 		   frame_p->mode.visible.y == GGI_AUTO);
- 	LIB_ASSERT(frame.mode.virt.x <= frame_p->mode.virt.x ||
- 		   frame_p->mode.virt.x == GGI_AUTO);
- 	LIB_ASSERT(frame.mode.virt.y <= frame_p->mode.virt.y ||
- 		   frame_p->mode.virt.y == GGI_AUTO);
- 	LIB_ASSERT(GT_DEPTH(frame.mode.graphtype) <= 
- 		   GT_DEPTH(frame_p->mode.graphtype) ||
- 		   frame_p->mode.graphtype == GT_AUTO);
- 	frame_p = (struct ggiGA_mode *)handle->priv;
- 	LIB_ASSERT(frame.mode.visible.x >= frame_p->mode.visible.x ||
- 		   frame_p->mode.visible.x == GGI_AUTO);
- 	LIB_ASSERT(frame.mode.visible.y >= frame_p->mode.visible.y ||
- 		   frame_p->mode.visible.y == GGI_AUTO);
- 	LIB_ASSERT(frame.mode.virt.x >= frame_p->mode.virt.x ||
- 		   frame_p->mode.virt.x == GGI_AUTO);
- 	LIB_ASSERT(frame.mode.virt.y >= frame_p->mode.virt.y ||
- 		   frame_p->mode.virt.y == GGI_AUTO);
- 	LIB_ASSERT(GT_DEPTH(frame.mode.graphtype) >= 
- 		   GT_DEPTH(frame_p->mode.graphtype) ||
- 		   frame_p->mode.graphtype == GT_AUTO);
- 
- 	if (res_state & GA_STATE_NOCHANGE) return rc;
- 	memcpy(handle->priv, &frame, sizeof(frame));
- 	handle->res_state |= GA_STATE_MODIFIED;
- 	return rc;
- }	/* GALLOC_Stubs_Check_callback */
- 
- 
- 
  int GALLOC_Stubs_Set_callback(ggi_visual_t vis,
  			      ggiGA_resource_handle handle,
--- 57,60 ----
***************
*** 222,225 ****
--- 69,75 ----
  	LIB_ASSERT(handle != NULL);
  
+ 	fprintf(stderr, "set args %p %p %p %p %p(%p)\n",vis, handle, compound,
+ 		lastmode, setstate, *setstate);
+ 
          GALLOCDPRINT("%s:%s:%i: called\n", DEBUG_INFO);
  
***************
*** 230,233 ****
--- 80,85 ----
  			*((int *)*setstate) = 1;
  			/* We set now for targets like xlib. */
+ 			rc = GALLOC_OK;
+ 			goto do_set;
  		} else {
  			/* This is the last callback. */
***************
*** 255,265 ****
  	}	/* if */
  
  	LIB_ASSERT(handle->priv != NULL);
  
  	LIB_ASSERT(ggiGA_TYPE(handle) == GA_RT_FRAME);
  
! 	if (!handle->res_state && GA_STATE_NORESET) {
  		frame_p = (struct ggiGA_mode *)handle->priv;
! 
  		rc = ggiSetMode(vis, &(frame_p->mode));
  	}
--- 107,118 ----
  	}	/* if */
  
+  do_set:
  	LIB_ASSERT(handle->priv != NULL);
  
  	LIB_ASSERT(ggiGA_TYPE(handle) == GA_RT_FRAME);
  
! 	if (!(handle->res_state & GA_STATE_NORESET)) {
  		frame_p = (struct ggiGA_mode *)handle->priv;
! 		fprintf(stderr, "calling ggiSetMode %p %p\n", handle, frame_p);
  		rc = ggiSetMode(vis, &(frame_p->mode));
  	}
***************
*** 408,417 ****
  		       ggiGA_resource_list *result)
  {
! 
! 	ggiGA_new_check_template(vis, request, result);
  	GALLOCDPRINT("GALLOC_Stubs_Check(%p,%p,%p) called\n", 
  		     vis, request, result);
! 	return ggiGACheck_template(vis, request, result, 
! 				   &GALLOC_Stubs_Check_callback);
  }	/* GALLOC_Stubs_Check */
  
--- 261,268 ----
  		       ggiGA_resource_list *result)
  {
! 	struct ggiGA_template_state state;
  	GALLOCDPRINT("GALLOC_Stubs_Check(%p,%p,%p) called\n", 
  		     vis, request, result);
! 	return ggiGA_new_check_template(vis, request, result, &state, NULL);
  }	/* GALLOC_Stubs_Check */
  

Index: haslist.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/display/stubs/haslist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** haslist.c	2001/10/26 01:27:43	1.2
--- haslist.c	2001/10/29 21:52:58	1.3
***************
*** 2,6 ****
  ******************************************************************************
  
!    LibGAlloc implementation for "stubs" target -- Master resource list.
    
     Copyright (c) 2001 Brian S. Julin		[bri@...]
--- 2,7 ----
  ******************************************************************************
  
!    LibGAlloc implementation for "stubs" target -- 
!    				Master resource list and associated callbacks
    
     Copyright (c) 2001 Brian S. Julin		[bri@...]
***************
*** 30,45 ****
  */
  
! #include <ggi/internal/galloc.h>
  
! static struct ggiGA_resource_props zcarb_props = {
    storage_ok:   GA_STORAGE_SWAP,
    storage_need: GA_STORAGE_REALRAM,
  };
  
! static struct ggiGA_resource zcarb_res = {
!   res_type: GA_RT_BUFFER_ZBUFFER | GA_RT_CARB,
!   res_state: GA_STATE_SEEABOVE | 1,
    next: NULL,
!   props: &zcarb_props,
  };
  
--- 31,60 ----
  */
  
! #include "stubsgalloc.h"
  
! static struct ggiGA_resource_props drawcarb_props = {
    storage_ok:   GA_STORAGE_SWAP,
    storage_need: GA_STORAGE_REALRAM,
+   sub: {
+     carb: {
+       can: {
+ 	rop:	ROP_ALPHA_AUX | ROP_Z,
+ 	math:   0xffffffff,  /* All math functions supported. */
+ 	adj:    0
+       },
+       must: {
+ 	rop:    ROP_AUX,     /* side-buffers only */
+ 	math:   0,           /* No math is mandatory. */
+ 	adj:    0
+       }
+     }
+   }
  };
  
! static struct ggiGA_resource drawcarb_res = {
!   res_type:	GA_RT_RENDERER_DRAWOPS | GA_RT_CARB,
!   res_state:	GA_STATE_SEEABOVE | 1,
    next: NULL,
!   props: &drawcarb_props,
  };
  
***************
*** 52,69 ****
    res_type: GA_RT_BUFFER_ZBUFFER,
    res_state: GA_STATE_SEEABOVE,
!   next: &zcarb_res,
    props: &zbuf_props,
! };
! 
! static struct ggiGA_resource_props alphacarb_props = {
!   storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_REALRAM,
! };
! 
! static struct ggiGA_resource alphacarb_res = {
!   res_type: GA_RT_BUFFER_ABUFFER | GA_RT_CARB,
!   res_state: GA_STATE_SEEABOVE | 1,
!   next: &zbuf_res,
!   props: &alphacarb_props,
  };
  
--- 67,74 ----
    res_type: GA_RT_BUFFER_ZBUFFER,
    res_state: GA_STATE_SEEABOVE,
!   next: &drawcarb_res,
    props: &zbuf_props,
!   cbflags1: GA_CB_CHECK | GA_CB_RECHECK | GA_CB_POSTCHECK,
!   cb1: &stubs_galloc_check_cladbuf
  };
  
***************
*** 76,84 ****
    res_type: GA_RT_BUFFER_ABUFFER,
    res_state: GA_STATE_SEEABOVE,
!   next: &alphacarb_res,
    props: &alphabuf_props,
  };
  
! static struct ggiGA_mode mode_priv = {
    mode: {
      frames:	GGI_AUTO,
--- 81,91 ----
    res_type: GA_RT_BUFFER_ABUFFER,
    res_state: GA_STATE_SEEABOVE,
!   next: &zbuf_res,
    props: &alphabuf_props,
+   cbflags1: GA_CB_CHECK | GA_CB_RECHECK | GA_CB_POSTCHECK,
+   cb1: &stubs_galloc_check_cladbuf
  };
  
! static struct ggiGA_mode frame_priv = {
    mode: {
      frames:	GGI_AUTO,
***************
*** 88,104 ****
      graphtype:	GT_AUTO,
      dpp:	{ GGI_AUTO, GGI_AUTO },
!   }
  };
  
  static struct ggiGA_resource frame_res = {
    res_type: GA_RT_FRAME,
!   priv: &mode_priv,
    priv_size: sizeof(struct ggiGA_mode),
!   next: &alphabuf_res
  };
  
  static struct ggiGA_resource_props drawops_motor_props = {
    sub: {
!     motor: {
        mul_min: {1, 1},
        mul_max: {1, 1},
--- 95,115 ----
      graphtype:	GT_AUTO,
      dpp:	{ GGI_AUTO, GGI_AUTO },
!   },
  };
  
  static struct ggiGA_resource frame_res = {
    res_type: GA_RT_FRAME,
!   priv: &frame_priv,
    priv_size: sizeof(struct ggiGA_mode),
!   next: &alphabuf_res,
!   cbflags1: GA_CB_PRECHECK | GA_CB_CHECK | GA_CB_UNCHECK | GA_CB_RECHECK,
!   cb1: stubs_galloc_check_mode,
!   cbflags2: GA_CB_SET | GA_CB_UNSET | GA_CB_RELEASE,
!   cb2: stubs_galloc_set_mode
  };
  
  static struct ggiGA_resource_props drawops_motor_props = {
    sub: {
!     motor: {	/* No scaling/pixeldoubling supported. */
        mul_min: {1, 1},
        mul_max: {1, 1},
***************
*** 111,115 ****
  static struct ggiGA_resource drawops_motor_res = {
    res_type: GA_RT_RENDERER_DRAWOPS | GA_RT_MOTOR,
!   res_state: 1,
    next: &frame_res,
    props: &drawops_motor_props
--- 122,126 ----
  static struct ggiGA_resource drawops_motor_res = {
    res_type: GA_RT_RENDERER_DRAWOPS | GA_RT_MOTOR,
!   res_state: 1,		/* Tag group 1 */
    next: &frame_res,
    props: &drawops_motor_props
***************
*** 117,118 ****
--- 128,320 ----
  
  ggiGA_resource_list stubs_haslist = &drawops_motor_res;
+ 
+ 
+ /******************************** callbacks *********************************/
+ 
+ int stubs_galloc_check_mode (ggi_visual_t vis,
+ 			     ggiGA_resource_list reslist,
+ 			     enum ggiGA_callback_command command,
+ 			     ggiGA_resource_handle res,
+ 			     ggiGA_resource_handle head,
+ 			     ggiGA_taghead_t taghead,
+ 			     ggiGA_resource_handle has,
+ 			     struct ggiGA_template_state **state,
+ 			     void **privstate) {
+ 	ggi_mode mode;
+ 	int rc;
+ 
+ 	fprintf(stderr, "stubs_galloc_check_mode called\n");
+ 
+ 	if (command == GA_CB_UNCHECK) goto uncheck;
+ 
+ 	if (command == GA_CB_PRECHECK) {
+ 	  /* TODO: basic comparison of res vs. has including caps. */
+ 	  return 0;
+ 	}
+ 
+ 	if (command == GA_CB_POSTCHECK) return 0;
+ 
+ 	/* check and recheck are the same for us. */
+ 
+ 	/* If we have a cap, try it first */
+ 	if (!ggiGAIsCap(res->next)) goto nocap;
+ 
+ 	memcpy(&mode, ggiGAGetGGIMode(res->next), sizeof(ggi_mode));
+ 	rc = ggiCheckMode(vis, &mode);
+ 
+         /* Now we try again, using the adjusted values that came 
+ 	 * back from ggiCheckMode. 
+ 	 */
+         if (rc != GALLOC_OK) rc = ggiCheckMode(vis, &mode);
+ 
+ 	if (rc == GALLOC_OK) {
+ 		ggi_mode *minmode;
+ 		/* The cap succeeded.  But did it get a mode above the 
+ 		 * minimum requirements in res?
+ 		 */
+ 		minmode = ggiGAGetGGIMode(res);
+ 		rc |= (minmode->visible.x > mode.visible.x);
+ 		rc |= (minmode->visible.y > mode.visible.y);
+ 		rc |= (minmode->virt.x > mode.virt.x);
+ 		rc |= (minmode->virt.y > mode.virt.y);
+ 		rc |= (GT_DEPTH(minmode->graphtype) > 
+ 		       GT_DEPTH(mode.graphtype));
+ 		rc |= (GT_SCHEME(minmode->graphtype) != 
+ 		       GT_SCHEME(mode.graphtype));
+ 		if (rc != GALLOC_OK) rc = GALLOC_EFAILED;
+                 return rc;
+         }       /* if */
+ 
+ 	if (rc == GALLOC_OK) goto done;
+ 
+  nocap:
+ 	/* cap failed, so let's try the original resource. */
+ 	memcpy(&mode, ggiGAGetGGIMode(res), sizeof(ggi_mode));
+         rc = ggiCheckMode(vis, &mode);
+ 
+ 	if (rc == GALLOC_OK) {
+ 		res->res_state |= GA_STATE_MODIFIED;
+ 		memcpy(ggiGAGetGGIMode(res), &mode, sizeof(ggi_mode));
+ 		if (!ggiGAIsCap(res->next)) return rc;
+ 		res->next->res_state |= GA_STATE_MODIFIED;
+ 		memcpy(ggiGAGetGGIMode(res->next), &mode, sizeof(ggi_mode));
+ 		return rc;
+ 	}
+ 	
+         /* Now we try again, using the adjusted values that came 
+ 	 * back from ggiCheckMode. 
+ 	 */
+ 	rc = ggiCheckMode(vis, &mode);
+ 	if (rc != GALLOC_OK) {
+ 		mode.visible.x = GGI_AUTO;
+ 		mode.visible.y = GGI_AUTO;
+ 		mode.virt.x = GGI_AUTO;
+ 		mode.virt.y = GGI_AUTO;
+ 		mode.graphtype = GT_AUTO;
+ 		rc = ggiCheckMode(vis, &mode);
+ 	}
+ 
+ 
+ 	if (rc == GALLOC_OK) {
+ 		ggi_mode *minmode, *maxmode;
+ 
+ 		/* We got something to succeed -- question is, what? */
+ 		minmode = ggiGAGetGGIMode(res);
+ 		rc |= (minmode->visible.x > mode.visible.x);
+ 		rc |= (minmode->visible.y > mode.visible.y);
+ 		rc |= (minmode->virt.x > mode.virt.x);
+ 		rc |= (minmode->virt.y > mode.virt.y);
+ 		rc |= (GT_DEPTH(minmode->graphtype) > 
+ 		       GT_DEPTH(mode.graphtype));
+ 		rc |= (GT_SCHEME(minmode->graphtype) != 
+ 		       GT_SCHEME(mode.graphtype));
+ 
+ 		if (!ggiGAIsCap(res->next)) goto done;
+ 		maxmode = ggiGAGetGGIMode(res->next);
+ 		rc |= (maxmode->visible.x < mode.visible.x);
+ 		rc |= (maxmode->visible.y < mode.visible.y);
+ 		rc |= (maxmode->virt.x < mode.virt.x);
+ 		rc |= (maxmode->virt.y < mode.virt.y);
+ 		rc |= (GT_DEPTH(maxmode->graphtype) <
+ 		       GT_DEPTH(mode.graphtype));
+ 	}
+ 
+  done:	  
+ 	res->res_state |= GA_STATE_MODIFIED;
+ 	memcpy(ggiGAGetGGIMode(res), &mode, sizeof(ggi_mode));
+ 	if (!ggiGAIsCap(res->next)) return rc;
+ 	res->next->res_state |= GA_STATE_MODIFIED;
+ 	memcpy(ggiGAGetGGIMode(res->next), &mode, sizeof(ggi_mode));
+ 	return rc;
+ 	
+ uncheck:
+ 	return 2;
+ }
+ 
+ 
+ int stubs_galloc_set_mode (ggi_visual_t vis,
+ 			   ggiGA_resource_list reslist,
+ 			   enum ggiGA_callback_command command,
+ 			   ggiGA_resource_handle res,
+ 			   ggiGA_resource_handle head,
+ 			   ggiGA_taghead_t taghead,
+ 			   ggiGA_resource_handle has,
+ 			   struct ggiGA_template_state **state,
+ 			   void **privstate) {
+ 	return ggiSetMode(vis, ggiGAGetGGIMode(res));
+ }
+ 
+ 
+ /* Check for buffers that clad the visual -- they match the 
+  * main mode, which is always their compound head right now, until
+  * we start supporting floaters.
+  */
+ int stubs_galloc_check_cladbuf (ggi_visual_t vis,
+ 				ggiGA_resource_list reslist,
+ 				enum ggiGA_callback_command command,
+ 				ggiGA_resource_handle res,
+ 				ggiGA_resource_handle head,
+ 				ggiGA_taghead_t taghead,
+ 				ggiGA_resource_handle has,
+ 				struct ggiGA_template_state **state,
+ 				void **privstate) {
+ 
+         int rc;
+         struct ggiGA_resource_props *res_p;
+ 	ggi_mode *mode;
+ 
+ 	/* We probably don't even need these asserts, remove later. */
+ 	LIB_ASSERT(ggiGA_TYPE(head) == GA_RT_FRAME);
+ 	LIB_ASSERT(head->priv != NULL);
+ 
+ 	/* For now, we should not be getting any rechecks. */
+         LIB_ASSERT (command != GA_CB_RECHECK);
+ 
+ 	/* Storage type checks were handled by precheck */
+ 
+ 	if (res == head) {
+ 		fprintf(stderr, "No support for floaters yet.\n");
+ 		goto fail;
+ 	}
+ 
+         res_p = res->props;
+ 
+         mode = ggiGAGetGGIMode(head);
+ 
+ 	if ((res_p->size.area.x != GGI_AUTO) &&
+ 	    (res_p->size.area.x != mode->virt.x)) goto fail;
+ 	if ((res_p->size.area.y != GGI_AUTO) &&
+ 	    (res_p->size.area.y != mode->virt.y)) goto fail;
+ 
+ 	res_p->size.area.x = mode->virt.x;
+ 	res_p->size.area.y = mode->virt.y;
+ 
+ 	if (command != GA_CB_POSTCHECK) goto nomark;
+ 
+ 	/* Here we would use the storage manager */
+ 
+  nomark:
+ 	return GALLOC_OK;
+  fail:
+ 	return GALLOC_EFAILED;
+ }

Index: stubsgalloc.h
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/display/stubs/stubsgalloc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** stubsgalloc.h	2001/10/20 22:22:25	1.6
--- stubsgalloc.h	2001/10/29 21:52:58	1.7
***************
*** 56,59 ****
--- 56,64 ----
  extern ggiGA_resource_list stubs_haslist;
  
+ 
+ ggiGA_reslist_callback stubs_galloc_check_mode;
+ ggiGA_reslist_callback stubs_galloc_check_cladbuf;
+ ggiGA_reslist_callback stubs_galloc_set_mode;
+ 
  struct stubsgalloc_container_t {
  	int state;

Update of /cvsroot/ggi/ggi-core/libgalloc/galloc
In directory usw-pr-cvs1:/tmp/cvs-serv14664/galloc

Modified Files:
	compound.c templates.c utils.c 
Log Message:

Please excuse the mess as we remodel the kitchen sink
One template down, two to go...



Index: compound.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/galloc/compound.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** compound.c	2001/10/21 20:24:02	1.4
--- compound.c	2001/10/29 21:52:58	1.5
***************
*** 192,197 ****
--- 192,211 ----
  	handle[0] = NULL;
  
+ 	if (!ggiGAHasAttachedSeeAboves(list, current)) {
+ 		ggiGA_resource_handle tmp;
+ 		tmp = current;
+ 		rc = ggiGAAddMutual(list, &tmp);
+ 		LIB_ASSERT(rc == GALLOC_OK);
+ 		if (rc != GALLOC_OK) return rc; /* limit damage. */
+ 		handle[0] = tmp;
+ 		tmp = tmp->next;
+ 		if (!ggiGAIsCap(tmp)) return 0;
+ 		rc = ggiGAAddMutual(list, &tmp);
+ 		LIB_ASSERT(rc == GALLOC_OK);
+ 		return rc;
+ 	}
  	while (ggiGAHasAttachedSeeAboves(list, current)) {
  		ggiGA_resource_handle tmp;
+ 
  		tmp = current;
  		rc = ggiGAAddMutual(list, &tmp);

Index: templates.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/galloc/templates.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** templates.c	2001/10/27 05:02:23	1.25
--- templates.c	2001/10/29 21:52:58	1.26
***************
*** 244,252 ****
  		memcpy(haslist, master, sizeof(struct ggiGA_resource));
  		haslist->master = master;
! 		haslist->props = res.props;
! 		haslist->priv = res.priv;
! 		haslist->left = res.left;
! 		haslist->right = res.right;
! 		haslist->next = res.next;
  
  		master = master->next;
--- 244,252 ----
[...1068 lines suppressed...]
  	if (rc != GALLOC_OK) {
+ 	  fprintf(stderr,"set turned to check by failure\n");
  		/* User forgot to check, so we behave like ggiGACheck. */
  		if (result != NULL) {
***************
*** 1269,1272 ****
--- 1431,1435 ----
  		}	/* if */
  
+ 		fprintf(stderr, "A) Calling callback on %p\n", lastmode);
  		rc = set(vis, current, compound, lastmode, &setstate);
  		LIB_ASSERT(rc == GALLOC_OK);
***************
*** 1336,1339 ****
--- 1499,1503 ----
  	lastmode = ggiGAHandle(reslist_tmp, reqlist_tmp, lastmode);
  	LIB_ASSERT(lastmode != NULL);
+ 	fprintf(stderr, "B) Calling callback on %p\n", lastmode);
  	rc = set(vis, lastmode, NULL, lastmode, &setstate);
  

Index: utils.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/galloc/utils.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** utils.c	2001/10/21 20:24:03	1.23
--- utils.c	2001/10/29 21:52:58	1.24
***************
*** 330,334 ****
  {
  	int rc = GALLOC_OK;
! 	ggiGA_resource_handle result;
  
  	if (ggiGAFind(list, handle[0]) != GALLOC_OK) {
--- 330,334 ----
  {
  	int rc = GALLOC_OK;
! 	ggiGA_resource_handle result = NULL;
  
  	if (ggiGAFind(list, handle[0]) != GALLOC_OK) {

Update of /cvsroot/ggi/lowlevel/libbuf/buf
In directory usw-pr-cvs1:/tmp/cvs-serv14363/buf

Modified Files:
	buf.c 
Log Message:


Index: buf.c
===================================================================
RCS file: /cvsroot/ggi/lowlevel/libbuf/buf/buf.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** buf.c	2001/09/23 04:39:48	1.17
--- buf.c	2001/10/29 21:51:49	1.18
***************
*** 48,52 ****
  }
  
! /* Checks to see if a GA_RT_RENDERER_DRAWOPS motor is already
   * in the compound, and returns it if found. 
   */
--- 48,52 ----
  }
  
! /* Checks to see if a GA_RT_RENDERER_DRAWOPS carb is already
   * in the compound, and returns it if found. 
   */
***************
*** 78,81 ****
--- 78,82 ----
  	ggiGA_resource_handle motor_h;
  	struct ggiGA_resource_props carb_p;
+ 	ggiGA_resource_handle tmp;
  
  	BUFDPRINT_CORE("ggiBufAdd(%p,%p,%x,%p,%x,%p,%p) called\n",
***************
*** 98,104 ****
  		}	/* if */
  	}	/* if */
  
- 	BUFDPRINT("Buffer resource wanted for the GA_RT_FRAME resource\n");
- 
  	motor_h = _ggiBufFindRendererMotor(*reqlist);
  	if (motor_h == NULL) {
--- 99,111 ----
  		}	/* if */
  	}	/* if */
+ 	else {
+ 		/* TODO: Find the last mode even if it is not in service. */
+ 		tothis = ggiGAFindLastMode(*reqlist, NULL);
+ 	}
+ 	if (tothis == NULL) {
+ 	  fprintf(stderr, "Nothing to attach to. (floaters unimplemented.)\n");
+ 	  return GALLOC_EFAILED;
+ 	}
  
  	motor_h = _ggiBufFindRendererMotor(*reqlist);
  	if (motor_h == NULL) {
***************
*** 115,121 ****
  	}	/* if */
  
- 
- 	BUFDPRINT("Filling out a carb from the wanted buffer flags.\n");
- 
  	ggiBufClearCarbProperties(&carb_p);
  	switch (fulltype) {
--- 122,125 ----
***************
*** 125,133 ****
  			return GALLOC_EFAILED;
  		}	/* if */
! 		carb_p.sub.carb.must.rop  = ROP_ALPHA_AUX;
  		carb_p.sub.carb.can.rop   = ROP_ALPHA_AUX;
! 		carb_p.sub.carb.must.math = flags & BUF2GA_ALPHA_BLEND_MASK;
! 		if (flags & BUF_BLEND_ALT) carb_p.sub.carb.must.math |= 
! 		    (flags & BUF2GA_ALPHA_BLEND_MASK) << BUF_ALTBLEND_SHIFT;
  		carb_p.sub.carb.can.math  = 
  		  (flags >> BUF_ALTBLEND_SHIFT) & BUF2GA_ALPHA_BLEND_MASK;
--- 129,135 ----
  			return GALLOC_EFAILED;
  		}	/* if */
! 		carb_p.sub.carb.must.rop  = 0;
  		carb_p.sub.carb.can.rop   = ROP_ALPHA_AUX;
! 		carb_p.sub.carb.must.math = 0;
  		carb_p.sub.carb.can.math  = 
  		  (flags >> BUF_ALTBLEND_SHIFT) & BUF2GA_ALPHA_BLEND_MASK;
***************
*** 141,149 ****
  			return GALLOC_EFAILED;
  		}	/* if */
! 		carb_p.sub.carb.must.rop  = ROP_Z;
  		carb_p.sub.carb.can.rop   = ROP_Z;
! 		carb_p.sub.carb.must.math = flags & BUF2GA_Z_MASK;
! 		if (flags & BUF_DISPOSE) 
! 		  carb_p.sub.carb.must.math |= GA_MATH_Z_DISPOSE;
  		carb_p.sub.carb.can.math = flags & BUF2GA_Z_MASK;
  		if (flags & (BUF_DISPOSE << GA_MATH_ALTSHIFT))
--- 143,149 ----
  			return GALLOC_EFAILED;
  		}	/* if */
! 		carb_p.sub.carb.must.rop  = 0;
  		carb_p.sub.carb.can.rop   = ROP_Z;
! 		carb_p.sub.carb.must.math = 0;
  		carb_p.sub.carb.can.math = flags & BUF2GA_Z_MASK;
  		if (flags & (BUF_DISPOSE << GA_MATH_ALTSHIFT))
***************
*** 155,185 ****
  	}	/* switch */
  
! 	if (tothis != NULL) {
! 		ggiGA_resource_handle tmp;
  
! 		BUFDPRINT("Appending to an existing compound.\n");
! 		tmp = ggiGAFindLastSeeabove(*reqlist, tothis);
! 		if (ggiGAIsCap(ggiGAGetNext(tmp))) tmp = ggiGAGetNext(tmp);
! #warning also need to AddMutual if compound is in-service
! 		if (ggiGAGetNext(tmp) != NULL) {
! 			ggiGAAddMutualCompound(*reqlist, &tothis);
! 		}	/* if */
! 		tmp = _ggiBufFindRendererCarb(tothis);
! 		if (tmp != NULL) {
! 		  /* TODO: merge our carb_p with that carb. */
! 		} else {
! 			rc = ggiGAAddSeeabove(reqlist, &carb_p, GA_RT_CARB | 
! 					      GA_RT_RENDERER_DRAWOPS, &tmp);
! 			rc = ggiGAAttach2MotorGroup(*reqlist, motor_h, tmp);
! 		}	/* if */
! 		rc = ggiGAAddSeeabove(reqlist, props, fulltype, handle);
  	} else {
! 		BUFDPRINT("Adding as a floater.\n");
! 		rc = ggiGAAdd(reqlist, props, fulltype, handle);
! 		LIB_ASSERT(rc == GALLOC_OK);
! 		rc = ggiGAAddSeeabove(reqlist, &carb_p, GA_RT_CARB | 
! 				      GA_RT_RENDERER_DRAWOPS, NULL);
! 		LIB_ASSERT(rc == GALLOC_OK);
  	}	/* if */
  	return rc;
  
--- 155,181 ----
  	}	/* switch */
  
! 	tmp = ggiGAFindLastSeeabove(*reqlist, tothis);
! 	if (ggiGAIsCap(ggiGAGetNext(tmp))) tmp = ggiGAGetNext(tmp);
  
! 	if (/* ggiGAIsActive(tothis) || */ (ggiGAGetNext(tmp) != NULL)) {
! 		rc = ggiGAAddMutualCompound(*reqlist, &tothis);
! 		if (rc != GALLOC_OK) {
! 			fprintf(stderr, "ggiGAAddMutualCompound failed.\n");
! 			return rc;
! 		}
! 	}	/* if */
! 	tmp = _ggiBufFindRendererCarb(tothis);
! 	if (tmp != NULL) {
! 	  ggiGAGetProperties(tmp)->sub.carb.can.math |= 
! 	    carb_p.sub.carb.can.math;
! 	  ggiGAGetProperties(tmp)->sub.carb.can.rop  |= 
! 	    carb_p.sub.carb.can.rop;
  	} else {
! 	  rc = ggiGAAddSeeabove(reqlist, &carb_p, GA_RT_CARB | 
! 				GA_RT_RENDERER_DRAWOPS, &tmp);
! 	  rc = ggiGAAttach2MotorGroup(*reqlist, motor_h, tmp);
  	}	/* if */
+ 	rc = ggiGAAddSeeabove(reqlist, props, fulltype, handle);
+ 
  	return rc;

Update of /cvsroot/ggi/ggi-libs/libgpf/pipe/auto
In directory usw-pr-cvs1:/tmp/cvs-serv6331/pipe/auto

Modified Files:
	funcs.c 
Log Message:
pipeline is now prepared to control data-transfer

Index: funcs.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/pipe/auto/funcs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** funcs.c	2001/10/26 10:19:16	1.4
--- funcs.c	2001/10/29 17:30:39	1.5
***************
*** 58,61 ****
--- 58,65 ----
  	priv = AUTO_PRIV(handle);
  
+ #if 0
+ 	handle->started = 1;
+ #endif
+ 
  	return GGI_OK;
  }	/* GPF_AUTO_startstream */
***************
*** 69,72 ****
--- 73,80 ----
  	priv = AUTO_PRIV(handle);
  
+ #if 0
+ 	handle->started = 0;
+ #endif
+ 
  	return GGI_OK;
  }	/* GPF_AUTO_stopstream */
***************
*** 80,83 ****
--- 88,103 ----
  	GPFDPRINT_PIPE("%s:%s:%i: called\n", DEBUG_INFO);
  	priv = AUTO_PRIV(handle);
+ 
+ 	if (gpfIsStopped(handle)) return GGI_OK;
+ 
+ #if 0
+ 	if (opio->type & GPF_DLTYPE_INPUT) {
+ 		return opio->opproto->read(handle, opio, priv->buf, priv->bufsize);
+ 	}	/* if */
+ 
+ 	if (opio->type & GPF_DLTYPE_OUTPUT) {
+ 		return opio->opproto->write(handle, opio, priv->buf, priv->bufsize);
+ 	}	/* if */
+ #endif
  
  	return GGI_OK;

Update of /cvsroot/ggi/ggi-libs/libgpf/io/ppm
In directory usw-pr-cvs1:/tmp/cvs-serv6331/io/ppm

Modified Files:
	funcs.c init.c ppm_gpf.h 
Log Message:
pipeline is now prepared to control data-transfer

Index: funcs.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/io/ppm/funcs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** funcs.c	2001/10/23 13:57:53	1.3
--- funcs.c	2001/10/29 17:30:39	1.4
***************
*** 228,233 ****
  
  
! int GPF_PPM_startstream(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio)
  {
  	struct ppmgpf_priv *priv;
--- 228,234 ----
  
  
! ssize_t GPF_PPM_read(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			void *buf, size_t size)
  {
  	struct ppmgpf_priv *priv;
***************
*** 236,247 ****
  	priv = PPM_PRIV(opio);
  
- 	handle->started = 1;
  
  	return GGI_OK;
! }	/* GPF_PPM_startstream */
  
  
! int GPF_PPM_stopstream(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio)
  {
  	struct ppmgpf_priv *priv;
--- 237,248 ----
  	priv = PPM_PRIV(opio);
  
  
  	return GGI_OK;
! }	/* GPF_PPM_read */
  
  
! ssize_t GPF_PPM_write(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			void *buf, size_t size)
  {
  	struct ppmgpf_priv *priv;
***************
*** 250,286 ****
  	priv = PPM_PRIV(opio);
  
- 	handle->started = 0;
  
  	return GGI_OK;
! }	/* GPF_PPM_stopstream */
! 
! 
! 
! 
! int GPF_PPM_donextstreamdatablock(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio)
! {
! 	struct ppmgpf_priv *priv;
! 
! 	GPFDPRINT_TARGET("%s:%s:%i: called\n", DEBUG_INFO);
! 	priv = PPM_PRIV(opio);
! 
! 
! 	if (gpfIsStopped(handle)) return GGI_OK;
! 
! 	if (opio->type & GPF_DLTYPE_INPUT) {
! 		return opio->opproto->read(handle, opio,
! 					priv->buf, priv->bufsize);
! 
! #warning evaluate buf-data
! 	}	/* if */
! 
! 	if (opio->type & GPF_DLTYPE_OUTPUT) {
! 		return opio->opproto->write(handle, opio,
! 					priv->buf, priv->bufsize);
! 
! #warning evaluate buf-data
! 	}	/* if */
! 
! 	return GGI_ENODEVICE;
! }	/* GPF_PPM_donextstreamdatablock */
--- 251,255 ----
  	priv = PPM_PRIV(opio);
  
  
  	return GGI_OK;
! }	/* GPF_PPM_write */

Index: init.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/io/ppm/init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** init.c	2001/10/22 16:18:45	1.2
--- init.c	2001/10/29 17:30:39	1.3
***************
*** 148,155 ****
  		opio->getnumimages = GPF_PPM_getnumimages;
  
! 		opio->startstream = GPF_PPM_startstream;
! 		opio->stopstream = GPF_PPM_stopstream;
! 
! 		opio->donextstreamdatablock = GPF_PPM_donextstreamdatablock;
  		opio->doio = GPF_PPM_doio;
  
--- 148,153 ----
  		opio->getnumimages = GPF_PPM_getnumimages;
  
! 		opio->read = GPF_PPM_read;
! 		opio->write = GPF_PPM_write;
  		opio->doio = GPF_PPM_doio;
  

Index: ppm_gpf.h
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/io/ppm/ppm_gpf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ppm_gpf.h	2001/10/22 16:18:45	1.2
--- ppm_gpf.h	2001/10/29 17:30:39	1.3
***************
*** 43,50 ****
  GPFio_getnumimages		GPF_PPM_getnumimages;
  
! GPFio_startstream		GPF_PPM_startstream;
! GPFio_stopstream		GPF_PPM_stopstream;
! 
! GPFio_DoNextStreamDataBlock	GPF_PPM_donextstreamdatablock;
  
  GPFio_doio			GPF_PPM_doio;
--- 43,48 ----
  GPFio_getnumimages		GPF_PPM_getnumimages;
  
! GPFio_read			GPF_PPM_read;
! GPFio_write			GPF_PPM_write;
  
  GPFio_doio			GPF_PPM_doio;

Update of /cvsroot/ggi/ggi-libs/libgpf/io/libggi
In directory usw-pr-cvs1:/tmp/cvs-serv6331/io/libggi

Modified Files:
	funcs.c init.c libggi_gpf.h 
Log Message:
pipeline is now prepared to control data-transfer

Index: funcs.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/io/libggi/funcs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** funcs.c	2001/10/21 13:48:03	1.8
--- funcs.c	2001/10/29 17:30:39	1.9
***************
*** 113,118 ****
  
  
! int GPF_LIBGGI_startstream(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio)
  {
  	struct libggigpf_priv *priv;
--- 113,119 ----
  
  
! ssize_t GPF_LIBGGI_read(gpf_handle_t handle,
!                         struct gpf_handle_opio_t *opio,
!                         void *buf, size_t size)
  {
  	struct libggigpf_priv *priv;
***************
*** 121,132 ****
  	priv = LIBGGI_PRIV(opio);
  
- 	handle->started = 1;
  
  	return GGI_OK;
! }	/* GPF_LIBGGI_startstream */
  
  
! int GPF_LIBGGI_stopstream(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio)
  {
  	struct libggigpf_priv *priv;
--- 122,133 ----
  	priv = LIBGGI_PRIV(opio);
  
  
  	return GGI_OK;
! }	/* GPF_LIBGGI_read */
  
  
! ssize_t GPF_LIBGGI_write(gpf_handle_t handle,
!                         struct gpf_handle_opio_t *opio,
!                         void *buf, size_t size)
  {
  	struct libggigpf_priv *priv;
***************
*** 135,165 ****
  	priv = LIBGGI_PRIV(opio);
  
- 	handle->started = 0;
  
  	return GGI_OK;
! }	/* GPF_LIBGGI_stopstream */
! 
! 
! 
! 
! int GPF_LIBGGI_donextstreamdatablock(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio)
! {
! 	struct libggigpf_priv *priv;
! 
! 	GPFDPRINT_TARGET("%s:%s:%i: called\n", DEBUG_INFO);
! 	priv = LIBGGI_PRIV(opio);
! 
! 
! 	if (gpfIsStopped(handle)) return GGI_OK;
! 
! 	if (opio->type & GPF_DLTYPE_INPUT) {
! 		return opio->opproto->read(handle, opio, priv->buf, priv->bufsize);
! 	}	/* if */
! 
! 	if (opio->type & GPF_DLTYPE_OUTPUT) {
! 		return opio->opproto->write(handle, opio, priv->buf, priv->bufsize);
! 	}	/* if */
! 
! 	return GGI_ENODEVICE;
! }	/* GPF_LIBGGI_donextstreamdatablock */
--- 136,140 ----
  	priv = LIBGGI_PRIV(opio);
  
  
  	return GGI_OK;
! }	/* GPF_LIBGGI_write */

Index: init.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/io/libggi/init.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** init.c	2001/10/21 13:48:03	1.14
--- init.c	2001/10/29 17:30:39	1.15
***************
*** 185,192 ****
  		opio->getnumimages = GPF_LIBGGI_getnumimages;
  
! 		opio->startstream = GPF_LIBGGI_startstream;
! 		opio->stopstream = GPF_LIBGGI_stopstream;
! 
! 		opio->donextstreamdatablock = GPF_LIBGGI_donextstreamdatablock;
  		opio->doio = GPF_LIBGGI_doio;
  
--- 185,190 ----
  		opio->getnumimages = GPF_LIBGGI_getnumimages;
  
! 		opio->read = GPF_LIBGGI_read;
! 		opio->write = GPF_LIBGGI_write;
  		opio->doio = GPF_LIBGGI_doio;
  

Index: libggi_gpf.h
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/io/libggi/libggi_gpf.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** libggi_gpf.h	2001/10/20 19:12:43	1.11
--- libggi_gpf.h	2001/10/29 17:30:39	1.12
***************
*** 43,50 ****
  GPFio_getnumimages		GPF_LIBGGI_getnumimages;
  
! GPFio_startstream		GPF_LIBGGI_startstream;
! GPFio_stopstream		GPF_LIBGGI_stopstream;
! 
! GPFio_DoNextStreamDataBlock	GPF_LIBGGI_donextstreamdatablock;
  
  GPFio_doio			GPF_LIBGGI_doio;
--- 43,48 ----
  GPFio_getnumimages		GPF_LIBGGI_getnumimages;
  
! GPFio_read			GPF_LIBGGI_read;
! GPFio_write			GPF_LIBGGI_write;
  
  GPFio_doio			GPF_LIBGGI_doio;

Update of /cvsroot/ggi/ggi-libs/libgpf/include/ggi/internal
In directory usw-pr-cvs1:/tmp/cvs-serv6331/include/ggi/internal

Modified Files:
	gpf.h 
Log Message:
pipeline is now prepared to control data-transfer

Index: gpf.h
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/include/ggi/internal/gpf.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** gpf.h	2001/10/28 16:44:07	1.22
--- gpf.h	2001/10/29 17:30:39	1.23
***************
*** 114,124 ****
  				int *num_images);
  
! typedef int (GPFio_startstream)(gpf_handle_t handle,
! 				struct gpf_handle_opio_t *opio);
! typedef int (GPFio_stopstream)(gpf_handle_t handle,
! 				struct gpf_handle_opio_t *opio);
! 
! typedef int (GPFio_DoNextStreamDataBlock)(gpf_handle_t handle,
! 				struct gpf_handle_opio_t *opio);
  
  
--- 114,123 ----
  				int *num_images);
  
! typedef ssize_t (GPFio_read)(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			void *buf, size_t size);
! typedef ssize_t (GPFio_write)(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			void *buf, size_t size);
  
  
***************
*** 159,167 ****
  	GPFio_getselectedimage		*getselectedimage;
  	GPFio_getnumimages		*getnumimages;
- 
- 	GPFio_startstream		*startstream;
- 	GPFio_stopstream		*stopstream;
  
! 	GPFio_DoNextStreamDataBlock	*donextstreamdatablock;
  
  
--- 158,164 ----
  	GPFio_getselectedimage		*getselectedimage;
  	GPFio_getnumimages		*getnumimages;
  
! 	GPFio_read			*read;
! 	GPFio_write			*write;

Update of /cvsroot/ggi/ggi-libs/libgpf/gpf
In directory usw-pr-cvs1:/tmp/cvs-serv6331/gpf

Modified Files:
	internal.c 
Log Message:
pipeline is now prepared to control data-transfer

Index: internal.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/gpf/internal.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** internal.c	2001/10/29 17:12:52	1.26
--- internal.c	2001/10/29 17:30:39	1.27
***************
*** 129,135 ****
  	io->selectimage = (void *)_default_error;
  	io->getselectedimage = (void *)_default_error;
! 	io->startstream = (void *)_default_error;
! 	io->stopstream = (void *)_default_error;
! 	io->donextstreamdatablock = (void *)_default_error;
  
  	io->doio = (void *)_default_error;
--- 129,134 ----
  	io->selectimage = (void *)_default_error;
  	io->getselectedimage = (void *)_default_error;
! 	io->read = (void *)_default_error;
! 	io->write = (void *)_default_error;
  
  	io->doio = (void *)_default_error;

Update of /cvsroot/ggi/ggi-libs/libgpf/gpf
In directory usw-pr-cvs1:/tmp/cvs-serv884

Modified Files:
	internal.c 
Log Message:
small bugfix

Index: internal.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/gpf/internal.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** internal.c	2001/10/28 16:44:07	1.25
--- internal.c	2001/10/29 17:12:52	1.26
***************
*** 248,255 ****
  			return GGI_OK;
  		} else {
! 			goto alloc_input_buffer;
  		}	/* if */
  
  	} else {
  		/* Ask input target for a buffer address to read from.
  		 */
--- 248,258 ----
  			return GGI_OK;
  		} else {
! 			goto query_input_target4buffer;
  		}	/* if */
  
  	} else {
+ 
+ query_input_target4buffer:
+ 
  		/* Ask input target for a buffer address to read from.
  		 */

Update of /cvsroot/ggi/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv7601

Modified Files:
	tail.php 
Log Message:
More validation fixes

Index: tail.php
===================================================================
RCS file: /cvsroot/ggi/html/include/tail.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tail.php	2001/10/29 09:27:18	1.4
--- tail.php	2001/10/29 09:30:29	1.5
***************
*** 1,3 ****
! <p style="text-align: right;"><a href="http://sourceforge.net/projects/ggi"><img border="0" width="88" src="http://sourceforge.net/sflogo.php?group_id=16307" height="31" alt="Sourceforge" /></a>&nbsp;<a href="http://ibiblio.org"><img border="0" width="88" src="http://www.ibiblio.org/images/ibiblio_logo1.gif" height="31" alt="ibiblio"i /></a>&nbsp;<a href="http://www.w3.org"><img src="http://www.w3.org/Icons/valid-xhtml10" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /><img src="http://jigsaw.w3.org/css-validator/images/vcss.gif"  border="0"  alt="Valid CSS!" height="31" width="88" /></a><br /><a href="mailto:webmaster@... class="webmaster">webmaster@...>
  </body>
  </html>
--- 1,3 ----
! <p style="text-align: right;"><a href="http://sourceforge.net/projects/ggi"><img border="0" width="88" src="http://sourceforge.net/sflogo.php?group_id=16307" height="31" alt="Sourceforge" /></a>&nbsp;<a href="http://ibiblio.org"><img border="0" width="88" src="http://www.ibiblio.org/images/ibiblio_logo1.gif" height="31" alt="ibiblio" /></a>&nbsp;<a href="http://www.w3.org"><img src="http://www.w3.org/Icons/valid-xhtml10" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /><img src="http://jigsaw.w3.org/css-validator/images/vcss.gif"  border="0"  alt="Valid CSS!" height="31" width="88" /></a><br /><a href="mailto:webmaster@... class="webmaster">webmaster@...>
  </body>
  </html>

Update of /cvsroot/ggi/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv6688/include

Modified Files:
	tail.php 
Log Message:
XHtml validation

Index: tail.php
===================================================================
RCS file: /cvsroot/ggi/html/include/tail.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** tail.php	2001/08/13 14:23:44	1.3
--- tail.php	2001/10/29 09:27:18	1.4
***************
*** 1,3 ****
! <p style="text-align: right;"><a href="http://sourceforge.net/projects/ggi"><img border="0" width="88" src="http://sourceforge.net/sflogo.php?group_id=16307&type=1" height="31" alt="Sourceforge"></a>&nbsp;<a href="http://ibiblio.org"><img border="0" width="88" src="http://www.ibiblio.org/images/ibiblio_logo1.gif" height="31" alt="ibiblio"></a>&nbsp;<a href="http://www.w3.org"><img src="http://www.w3.org/Icons/valid-xhtml10" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /><img src="http://jigsaw.w3.org/css-validator/images/vcss.gif"  border="0"  alt="Valid CSS!" height="31" width="88" /></a><br /><a href="mailto:webmaster@... class="webmaster">webmaster@...>
  </body>
  </html>
--- 1,3 ----
! <p style="text-align: right;"><a href="http://sourceforge.net/projects/ggi"><img border="0" width="88" src="http://sourceforge.net/sflogo.php?group_id=16307" height="31" alt="Sourceforge" /></a>&nbsp;<a href="http://ibiblio.org"><img border="0" width="88" src="http://www.ibiblio.org/images/ibiblio_logo1.gif" height="31" alt="ibiblio"i /></a>&nbsp;<a href="http://www.w3.org"><img src="http://www.w3.org/Icons/valid-xhtml10" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /><img src="http://jigsaw.w3.org/css-validator/images/vcss.gif"  border="0"  alt="Valid CSS!" height="31" width="88" /></a><br /><a href="mailto:webmaster@... class="webmaster">webmaster@...>
  </body>
  </html>

Update of /cvsroot/ggi/ggi-libs/libgpf/gpf
In directory usw-pr-cvs1:/tmp/cvs-serv17259/gpf

Modified Files:
	internal.c 
Log Message:
implemented _gpfEstablishPipe()

Index: internal.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/gpf/internal.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** internal.c	2001/10/26 10:22:57	1.24
--- internal.c	2001/10/28 16:44:07	1.25
***************
*** 96,100 ****
  /*
  ******************************************************************************
!  Creation and destruction of visuals
  ******************************************************************************
  */
--- 96,100 ----
  /*
  ******************************************************************************
! 	op-structs initialisation
  ******************************************************************************
  */
***************
*** 176,179 ****
--- 176,185 ----
  
  
+ /*
+ ******************************************************************************
+ 	static functions
+ ******************************************************************************
+ */
+ 
  /* Make sure str contains a valid variable name. Kill everything but
   * [a-zA-Z0-9].
***************
*** 190,193 ****
--- 196,397 ----
  
  
+ static int _gpfEstablishPipe(gpf_handle_t handle)
+ {
+ 	struct gpf_handle_pipe_t *pipe = NULL;
+ 	int rc = GGI_OK;
+ 	int i;
+ 
+ 	GPFDPRINT_CORE("%s:%s:%i: called\n", DEBUG_INFO);
+ 
+ 	LIB_ASSERT(handle != NULL);
+ 	LIB_ASSERT(handle->opio_input != NULL);
+ 	LIB_ASSERT(handle->opio_output != NULL);
+ 
+ 	pipe = handle->pipe;
+ 
+ 	pipe->buf_input = NULL;
+ 	pipe->buf_input_size = 0;
+ 	pipe->input_flags = 0;
+ 
+ 	pipe->buf_output = NULL;
+ 	pipe->buf_output_size = 0;
+ 	pipe->output_flags = 0;
+ 
+ 	/* Ask output target for a buffer address to write to.
+ 	 */
+ 	pipe->buf_output = handle->opio_output->pipe_query(handle,
+ 				handle->opio_output,
+ 				&pipe->buf_output_size,
+ 				&pipe->output_flags);
+ 
+ 	if (pipe->buf_output != NULL) {
+ 		/* we got a buffer address from the
+ 		 * output target
+ 		 *
+ 		 * So we check, if the input target accepts the address.
+ 		 */
+ 		rc = handle->opio_input->pipe_check(handle,
+ 				handle->opio_input,
+ 				&pipe->buf_output,
+ 				pipe->buf_output_size,
+ 				&pipe->input_flags);
+ 
+ 		if (rc == GGI_OK) {
+ 			/* Input accepts buffer address
+ 			 * This is the ideomatic way!
+ 			 */
+ 
+ 			pipe->buf_input = pipe->buf_output;
+ 			pipe->buf_input_size = pipe->buf_output_size;
+ 			pipe->input_flags = pipe->output_flags;
+ 
+ 			return GGI_OK;
+ 		} else {
+ 			goto alloc_input_buffer;
+ 		}	/* if */
+ 
+ 	} else {
+ 		/* Ask input target for a buffer address to read from.
+ 		 */
+ 		pipe->buf_input = handle->opio_input->pipe_query(handle,
+ 				handle->opio_input,
+ 				&pipe->buf_input_size,
+ 				&pipe->input_flags);
+ 
+ 		if (pipe->buf_input != NULL) {
+ 			/* we got a buffer address from the
+ 			 * output target
+ 			 *
+ 			 * So we check, if the output target
+ 			 * accepts the address.
+ 			 */
+ 			rc = handle->opio_output->pipe_check(handle,
+ 					handle->opio_output,
+ 					&pipe->buf_input,
+ 					pipe->buf_input_size,
+ 					&pipe->output_flags);
+ 			if (rc == GGI_OK) {
+ 				/* Input accepts buffer address
+ 				 */
+ 
+ 				pipe->buf_output = pipe->buf_input;
+ 				pipe->buf_output_size = pipe->buf_input_size;
+ 				pipe->output_flags = pipe->input_flags;
+ 
+ 				return GGI_OK;
+ 			} else {
+ 				goto alloc_output_buffer;
+ 			}	/* if */
+ 		} else {
+ 			goto alloc_input_buffer;
+ 		}	/* if */
+ 	}	/* if */
+ 
+ 
+ alloc_input_buffer:
+ 
+ 	/* we make three attempts before failing
+ 	 */
+ 	for (i = 0; i < 3; i++) {
+ 		LIB_ASSERT(pipe->buf_input_size > 0);
+ 		pipe->buf_input = calloc(1, pipe->buf_input_size);
+ 		if (!pipe->buf_input) {
+ 			/* not enough memory */
+ 			if (pipe->input_flags & GPF_PIPE_BUFSIZE_MAYSMALLER) {
+ 				pipe->buf_input_size--;
+ 				continue;
+ 			} else {
+ 				/* fail */
+ 				return GGI_ENOMEM;
+ 			}	/* if */
+ 		}	/* if */
+ 
+ 		rc = handle->opio_input->pipe_check(handle,
+ 				handle->opio_input,
+ 				&pipe->buf_input,
+ 				pipe->buf_input_size,
+ 				&pipe->input_flags);
+ 
+ 		if (rc == GGI_OK) {
+ 			/* success */
+ 			break;
+ 		}	/* if */
+ 
+ 		rc = GGI_ENOMEM;
+ 	}	/* for */
+ 
+ 	if (rc != GGI_OK) {
+ 		return rc;
+ 	}	/* if */	
+ 
+ 	if (pipe->buf_output != NULL) {
+ 		return GGI_OK;
+ 	}	/* if */
+ 
+ 	rc = handle->opio_output->pipe_check(handle,
+ 			handle->opio_output,
+ 			&pipe->buf_input,
+ 			pipe->buf_input_size,
+ 			&pipe->output_flags);
+ 
+ 	if (rc == GGI_OK) {
+ 		pipe->buf_output = pipe->buf_input;
+ 		pipe->buf_output_size = pipe->buf_input_size;
+ 		return GGI_OK;
+ 	}	/* if */
+ 
+ 
+ 
+ alloc_output_buffer:
+ 
+ 	/* we make three attempts before failing
+ 	 */
+ 	for (i = 0; i < 3; i++) {
+ 		LIB_ASSERT(pipe->buf_output_size > 0);
+ 		pipe->buf_output = calloc(1, pipe->buf_output_size);
+ 		if (!pipe->buf_output) {
+ 			/* not enough memory */
+ 			if (pipe->output_flags & GPF_PIPE_BUFSIZE_MAYSMALLER) {
+ 				pipe->buf_output_size--;
+ 				continue;
+ 			} else {
+ 				/* fail */
+ 				return GGI_ENOMEM;
+ 			}	/* if */
+ 		}	/* if */
+ 
+ 		rc = handle->opio_input->pipe_check(handle,
+ 				handle->opio_output,
+ 				&pipe->buf_output,
+ 				pipe->buf_output_size,
+ 				&pipe->output_flags);
+ 
+ 		if (rc == GGI_OK) {
+ 			/* success */
+ 			break;
+ 		}	/* if */
+ 
+ 		rc = GGI_ENOMEM;
+ 	}	/* for */
+ 
+ 	return rc;
+ }	/* _gpfEstablishPipe */
+ 
+ 
+ static int _gpfDestroyPipe(gpf_handle_t handle)
+ {
+ 	return GGI_OK;
+ }	/* _gpfDestroyPipe */
+ 
+ 
+ 
+ 
+ 
+ /*
+ ******************************************************************************
+ 	Creation and destruction of handles
+ ******************************************************************************
+ */
+ 
  int _gpfOpenTarget(gpf_handle_t hnd, const char *target,
  		const char *argf, va_list ap, int type)
***************
*** 457,463 ****
--- 661,675 ----
  	}	/* if */
  
+ 	rc = _gpfEstablishPipe(hnd);
+ 	if (rc != GGI_OK) {
+ 		goto err2;
+ 	}	/* if */
+ 
+ 
  	LIB_ASSERT(hnd->pipe != NULL);
  	return GGI_OK;
  
+ err2:
+ 	_gpfDestroyPipe(hnd);
  err1:
  	free(pipe);

Update of /cvsroot/ggi/ggi-libs/libgpf/include/ggi/internal
In directory usw-pr-cvs1:/tmp/cvs-serv17259/include/ggi/internal

Modified Files:
	gpf.h 
Log Message:
implemented _gpfEstablishPipe()

Index: gpf.h
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/include/ggi/internal/gpf.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** gpf.h	2001/10/26 10:19:16	1.21
--- gpf.h	2001/10/28 16:44:07	1.22
***************
*** 200,203 ****
--- 200,212 ----
  	gpf_dlhandle_l	*dlhandle;
  
+ 	void *buf_input;
+ 	size_t buf_input_size;
+ 	int input_flags;
+ 
+ 	void *buf_output;
+ 	size_t buf_output_size;
+ 	int output_flags;
+ 
+ 
  	GPFpipe_check			*pipe_check;
  	GPFpipe_create			*pipe_create;

Update of /cvsroot/ggi/ggi-core/libgalloc/galloc
In directory usw-pr-cvs1:/tmp/cvs-serv7878/galloc

Modified Files:
	templates.c 
Log Message:

More galloc brains to mystify and confuse the coding public.



Index: templates.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/galloc/templates.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** templates.c	2001/10/26 01:27:43	1.24
--- templates.c	2001/10/27 05:02:23	1.25
***************
*** 284,287 ****
--- 284,314 ----
  
  
+ /* Finds the taghead of res, (but only if it occurs before res 
+  * in the list).  Returns NULL when nothing found.
+  */
+ static inline ggiGA_taghead_t find_taghead(ggiGA_resource_list list,
+ 					   ggiGA_resource_handle this) {
+ 	ggiGA_resource_handle tmp2;
+ 	ggiGA_taghead_t taghead;
+ 
+ 	if (!ggiGA_TAG(this)) return NULL;
+ 
+ 	tmp2 = list;
+ 	taghead = NULL;
+ 
+ 	while (tmp2 != this) {
+ 		if (ggiGA_FULLTYPE(tmp2) != GA_RT_RESLIST_TAGHEAD) 
+ 		  goto skip;
+ 		taghead = (ggiGA_taghead_t)tmp2;
+ 		if (ggiGA_TAG(this) == taghead->tag2) break;
+ 		taghead = NULL;
+ 	skip: 
+ 		tmp2 = tmp2->next;
+ 	}
+ 	return taghead;
+ }
+ 
+ #define find_compound(list,res) ggiGAFindCompoundHead(list, res)
+ 
  /* This function checks to see if has in haslist, which is a proposed 
   * master resource for res in reslist, would place res in the "correct"
***************
*** 293,297 ****
  			 ggiGA_resource_list haslist,
  			 ggiGA_resource_handle has) {
!   return 0;
  }
  
--- 320,427 ----
  			 ggiGA_resource_list haslist,
  			 ggiGA_resource_handle has) {
! 	ggiGA_resource_handle has_tmp, req_tmp;
! 
! 	/* All resources before req (e.g. resources which
! 	 * have already been checked) in req's compound 
! 	 * must have masters in the same compound that 
! 	 * has belongs to in the haslist.
! 	 *
! 	 * Since resources prior to this have succeeded
! 	 * this test already, it is only necessary to 
! 	 * do the following check:
! 	 */
! 	req_tmp = find_compound(reqlist, req);
! 	has_tmp = find_compound(haslist, has);
! 	if ((req_tmp != req) &&
! 	    (find_compound(haslist, req_tmp->master) != has_tmp)) return -1;
! 
! 	/* All resources before and including req which are in 
! 	 * req's ring must have masters in the same ring that 
! 	 * has belongs to in the haslist.
! 	 *
! 	 * Since resources prior to this have succeeded
! 	 * this test already, it is only necessary to 
! 	 * check one such resource.  But first we must find
! 	 * one (one which is not the tag group head of the ring.)
! 	 */
! 	req_tmp = req;
! 	do {
! 		/* Simply traverse through the tag group head of the ring. */
! 		if (ggiGA_TAG(req_tmp) != ggiGA_TAG(req)) {
! 		  LIB_ASSERT(ggiGA_FULLTYPE(req_tmp) == GA_RT_RESLIST_TAGHEAD);
! 			req_tmp = ((ggiGA_taghead_t)req_tmp)->right2;
! 			continue;
! 		}	/* if */
! 		req_tmp = req_tmp->right;
! 		if (!ggiGAIsFailed(req_tmp)) break;
! 	} while (req_tmp != req);
! 	if (req_tmp == req) goto alone;
! 	has_tmp = has;
! 	do {
! 		if (req_tmp->master == has_tmp) break; 
! 		/* Simply traverse through the tag group heads of the ring. */
! 		if (ggiGA_TAG(has_tmp) != ggiGA_TAG(has)) {
! 		  LIB_ASSERT(ggiGA_FULLTYPE(has_tmp) == GA_RT_RESLIST_TAGHEAD);
! 			has_tmp = ((ggiGA_taghead_t)has_tmp)->right2;
! 			continue;
! 		}	/* if */
! 		has_tmp = has_tmp->right;
! 	} while (has_tmp != has);
! 	if (req_tmp->master != has_tmp) return -1;
! 
! 	/* If the req's left pointer is pointing out if its ring, 
! 	 * we check to make sure that the ring it is hooked to 
! 	 * contains resources which have masters which are in the 
! 	 * same ring that has's left pointer is hooked to.
! 	 */
!  alone:
! 	req_tmp = req->left;
! 	do {
! 		if (req_tmp == req) return GALLOC_OK; /* ring is 2-way */
! 		/* Simply traverse through tag group head of the ring. */
! 		if (ggiGA_TAG(req_tmp) != ggiGA_TAG(req)) {
! 		  LIB_ASSERT(ggiGA_FULLTYPE(req_tmp) == GA_RT_RESLIST_TAGHEAD);
! 			req_tmp = ((ggiGA_taghead_t)req_tmp)->right2;
! 			continue;
! 		}	/* if */
! 		req_tmp = req_tmp->right;
! 	} while (req_tmp != req->left);
! 	/* Find a pointer in the ring that has already been checked */
! 	if (!ggiGAIsFailed(req->left)) goto skip;
! 	req_tmp = req->left;
! 	do {
! 		if (!ggiGAIsFailed(req_tmp)) break;
! 		/* Simply traverse through tag group head of the ring. */
! 		if (ggiGA_TAG(req_tmp) != ggiGA_TAG(req)) {
! 		  LIB_ASSERT(ggiGA_FULLTYPE(req_tmp) == GA_RT_RESLIST_TAGHEAD);
! 			req_tmp = ((ggiGA_taghead_t)req_tmp)->right2;
! 			continue;
! 		}	/* if */
! 		req_tmp = req_tmp->right;
! 	} while (req_tmp != req->left);
! 	/* If there are no successful resources in that ring, we will
! 	 * give the resource the benefit of the doubt.
! 	 *
! 	 * Right now this case is not handled elsewhere in the code, 
! 	 * so we complain. 
! 	 */
! 	LIB_ASSERT(req_tmp != req->left);
! 	if (req_tmp == req->left) return GALLOC_OK;
!  skip:
! 	/* Finally, we look for its master in the haslist */
! 	has_tmp = has;
! 	do {
! 		if (req_tmp->master == has_tmp) break; 
! 		/* Simply traverse through the tag group heads of the ring. */
! 		if (ggiGA_TAG(has_tmp) != ggiGA_TAG(has)) {
! 		  LIB_ASSERT(ggiGA_FULLTYPE(has_tmp) == GA_RT_RESLIST_TAGHEAD);
! 			has_tmp = ((ggiGA_taghead_t)has_tmp)->right2;
! 			continue;
! 		}	/* if */
! 		has_tmp = has_tmp->right;
! 	} while (has_tmp != has);
! 	if (req_tmp->master != has_tmp) return -1;
! 	
! 	return GALLOC_OK;
  }
  
***************
*** 301,305 ****
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_resource_handle taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
--- 431,435 ----
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_taghead_t taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
***************
*** 390,393 ****
--- 520,525 ----
  	reset_haslist(vis, haslist);
  	while (tmp1 != NULL) {
+ 		ggiGA_taghead_t taghead = NULL;
+ 		ggiGA_resource_handle compound = NULL;
  		if (need_reset > 1) {
  			reset_reqlist(request, reqlist);
***************
*** 396,410 ****
  			tmp2 = reqlist;
  			while (tmp2 != tmp1) {
  				rc = do_callback(vis, reqlist, GA_CB_PRECHECK,
! 						  tmp1, NULL, NULL,
! 						  tmp2, &state, &privstate);
  				LIB_ASSERT(rc == GALLOC_OK);
  				rc = do_callback(vis, reqlist, GA_CB_CHECK,
! 						  tmp1, NULL, NULL,
! 						  tmp2, &state, &privstate); 
  				LIB_ASSERT(rc == GALLOC_OK);
  				rc = do_callback(vis, reqlist, GA_CB_POSTCHECK,
! 						 tmp1, NULL, NULL,
! 						 tmp2, &state, &privstate);
  				LIB_ASSERT(rc == GALLOC_OK);
  			}
--- 528,547 ----
  			tmp2 = reqlist;
  			while (tmp2 != tmp1) {
+ 				taghead = find_taghead(reqlist, tmp2);
+ 				compound = find_compound(reqlist, tmp2);
  				rc = do_callback(vis, reqlist, GA_CB_PRECHECK,
! 						  tmp2, compound, taghead,
! 						  tmp2->master, 
! 						 &state, &privstate);
  				LIB_ASSERT(rc == GALLOC_OK);
  				rc = do_callback(vis, reqlist, GA_CB_CHECK,
! 						  tmp2, compound, taghead,
! 						  tmp2->master, 
! 						 &state, &privstate); 
  				LIB_ASSERT(rc == GALLOC_OK);
  				rc = do_callback(vis, reqlist, GA_CB_POSTCHECK,
! 						 tmp2, compound, taghead,
! 						 tmp2->master, 
! 						 &state, &privstate);
  				LIB_ASSERT(rc == GALLOC_OK);
  			}
***************
*** 414,433 ****
  			tmp2 = reqlist;
  			while (tmp2 != tmp1) {
  				rc = do_callback(vis, reqlist, GA_CB_RECHECK,
! 						 tmp1, NULL, NULL,
! 						 tmp2, &state, &privstate);
  				LIB_ASSERT(rc == GALLOC_OK);
  			}
  			need_reset = 0;
  		}
  		tmp2 = (tmp1->master == NULL) ? haslist : tmp1->master->next;
  		while (tmp2 != NULL) {
  			fprintf(stderr, "matching %p to %p\n", tmp1, tmp2);
  			if (do_callback(vis, reqlist, GA_CB_MATCH,
! 					tmp1, NULL, NULL,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
  			if (do_callback(vis, reqlist, GA_CB_PRECHECK,
! 					tmp1, NULL, NULL,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
--- 551,575 ----
  			tmp2 = reqlist;
  			while (tmp2 != tmp1) {
+ 				taghead = find_taghead(reqlist, tmp2);
+ 				compound = find_compound(reqlist, tmp2);
  				rc = do_callback(vis, reqlist, GA_CB_RECHECK,
! 						 tmp2, compound, taghead,
! 						 tmp2->master, 
! 						 &state, &privstate);
  				LIB_ASSERT(rc == GALLOC_OK);
  			}
  			need_reset = 0;
  		}
+ 		taghead = find_taghead(reqlist, tmp1);
+ 		compound = find_compound(reqlist, tmp1);
  		tmp2 = (tmp1->master == NULL) ? haslist : tmp1->master->next;
  		while (tmp2 != NULL) {
  			fprintf(stderr, "matching %p to %p\n", tmp1, tmp2);
  			if (do_callback(vis, reqlist, GA_CB_MATCH,
! 					tmp1, compound, taghead,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
  			if (do_callback(vis, reqlist, GA_CB_PRECHECK,
! 					tmp1, compound, taghead,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
***************
*** 435,443 ****
  				goto nexthas;
  			if (do_callback(vis, reqlist, GA_CB_CHECK,
! 					tmp1, NULL, NULL,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
  		        if (do_callback(vis, reqlist, GA_CB_POSTCHECK,
! 					tmp1, NULL, NULL,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
--- 577,585 ----
  				goto nexthas;
  			if (do_callback(vis, reqlist, GA_CB_CHECK,
! 					tmp1, compound, taghead,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
  		        if (do_callback(vis, reqlist, GA_CB_POSTCHECK,
! 					tmp1, compound, taghead,
  					tmp2, &state, &privstate)) 
  				goto nexthas;
***************
*** 456,459 ****
--- 598,603 ----
  			tmp1 = tmp2;
  			if (tmp2 != NULL) {
+ 				taghead = find_taghead(reqlist, tmp1);
+ 				compound = find_compound(reqlist, tmp1);
  				tmp2 = tmp2->next;
  				while (tmp2 != NULL) {
***************
*** 463,467 ****
  				need_reset = do_callback(vis, reqlist, 
  							 GA_CB_UNCHECK,
! 							 tmp1, NULL, NULL,
  							 tmp1->master, 
  							 &state, &privstate);
--- 607,612 ----
  				need_reset = do_callback(vis, reqlist, 
  							 GA_CB_UNCHECK,
! 							 tmp1, compound, 
! 							 taghead,
  							 tmp1->master, 
  							 &state, &privstate);
***************
*** 487,491 ****
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_resource_handle taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
--- 632,636 ----
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_taghead_t taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
***************
*** 522,526 ****
  			ggiGA_resource_handle res,
  			ggiGA_resource_handle head,
! 			ggiGA_resource_handle taghead,
  			ggiGA_resource_handle has,
  			void **state,
--- 667,671 ----
  			ggiGA_resource_handle res,
  			ggiGA_resource_handle head,
! 			ggiGA_taghead_t taghead,
  			ggiGA_resource_handle has,
  			void **state,
***************
*** 558,562 ****
  			       ggiGA_resource_handle res,
  			       ggiGA_resource_handle head,
! 			       ggiGA_resource_handle taghead,
  			       ggiGA_resource_handle has,
  			       void **state,
--- 703,707 ----
  			       ggiGA_resource_handle res,
  			       ggiGA_resource_handle head,
! 			       ggiGA_taghead_t taghead,
  			       ggiGA_resource_handle has,
  			       void **state,
***************
*** 570,574 ****
  			     ggiGA_resource_handle res,
  			     ggiGA_resource_handle head,
! 			     ggiGA_resource_handle taghead,
  			     ggiGA_resource_handle has,
  			     void **state,
--- 715,719 ----
  			     ggiGA_resource_handle res,
  			     ggiGA_resource_handle head,
! 			     ggiGA_taghead_t taghead,
  			     ggiGA_resource_handle has,
  			     void **state,
***************
*** 582,586 ****
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_resource_handle taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
--- 727,731 ----
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_taghead_t taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
***************
*** 594,598 ****
  			 ggiGA_resource_handle res,
  			 ggiGA_resource_handle head,
! 			 ggiGA_resource_handle taghead,
  			 ggiGA_resource_handle has,
  			 void **state,
--- 739,743 ----
  			 ggiGA_resource_handle res,
  			 ggiGA_resource_handle head,
! 			 ggiGA_taghead_t taghead,
  			 ggiGA_resource_handle has,
  			 void **state,
***************
*** 649,653 ****
  			       ggiGA_resource_handle res,
  			       ggiGA_resource_handle head,
! 			       ggiGA_resource_handle taghead,
  			       ggiGA_resource_handle has,
  			       void **state,
--- 794,798 ----
  			       ggiGA_resource_handle res,
  			       ggiGA_resource_handle head,
! 			       ggiGA_taghead_t taghead,
  			       ggiGA_resource_handle has,
  			       void **state,
***************
*** 674,678 ****
  			     ggiGA_resource_handle res,
  			     ggiGA_resource_handle head,
! 			     ggiGA_resource_handle taghead,
  			     ggiGA_resource_handle has,
  			     void **state,
--- 819,823 ----
  			     ggiGA_resource_handle res,
  			     ggiGA_resource_handle head,
! 			     ggiGA_taghead_t taghead,
  			     ggiGA_resource_handle has,
  			     void **state,
***************
*** 699,703 ****
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_resource_handle taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
--- 844,848 ----
  			      ggiGA_resource_handle res,
  			      ggiGA_resource_handle head,
! 			      ggiGA_taghead_t taghead,
  			      ggiGA_resource_handle has,
  			      void **state,
***************
*** 732,736 ****
  			 ggiGA_resource_handle res,
  			 ggiGA_resource_handle head,
! 			 ggiGA_resource_handle taghead,
  			 ggiGA_resource_handle has,
  			 void **state,
--- 877,881 ----
  			 ggiGA_resource_handle res,
  			 ggiGA_resource_handle head,
! 			 ggiGA_taghead_t taghead,
  			 ggiGA_resource_handle has,
  			 void **state,
***************
*** 763,767 ****
  				 ggiGA_resource_handle res,
  				 ggiGA_resource_handle head,
! 				 ggiGA_resource_handle taghead,
  				 ggiGA_resource_handle has,
  				 void **state,
--- 908,912 ----
  				 ggiGA_resource_handle res,
  				 ggiGA_resource_handle head,
! 				 ggiGA_taghead_t taghead,
  				 ggiGA_resource_handle has,
  				 void **state,
***************
*** 775,779 ****
  			       ggiGA_resource_handle res,
  			       ggiGA_resource_handle head,
! 			       ggiGA_resource_handle taghead,
  			       ggiGA_resource_handle has,
  			       void **state,
--- 920,924 ----
  			       ggiGA_resource_handle res,
  			       ggiGA_resource_handle head,
! 			       ggiGA_taghead_t taghead,
  			       ggiGA_resource_handle has,
  			       void **state,
***************
*** 787,791 ****
  				ggiGA_resource_handle res,
  				ggiGA_resource_handle head,
! 				ggiGA_resource_handle taghead,
  				ggiGA_resource_handle has,
  				void **state,
--- 932,936 ----
  				ggiGA_resource_handle res,
  				ggiGA_resource_handle head,
! 				ggiGA_taghead_t taghead,
  				ggiGA_resource_handle has,
  				void **state,
***************
*** 799,803 ****
  			   ggiGA_resource_handle res,
  			   ggiGA_resource_handle head,
! 			   ggiGA_resource_handle taghead,
  			   ggiGA_resource_handle has,
  			   void **state,
--- 944,948 ----
  			   ggiGA_resource_handle res,
  			   ggiGA_resource_handle head,
! 			   ggiGA_taghead_t taghead,
  			   ggiGA_resource_handle has,
  			   void **state,
***************
*** 838,842 ****
  		      ggiGA_resource_handle res,
  		      ggiGA_resource_handle head,
! 		      ggiGA_resource_handle taghead,
  		      ggiGA_resource_handle has,
  		      void **state,
--- 983,987 ----
  		      ggiGA_resource_handle res,
  		      ggiGA_resource_handle head,
! 		      ggiGA_taghead_t taghead,
  		      ggiGA_resource_handle has,
  		      void **state,
***************
*** 854,858 ****
  			ggiGA_resource_handle res,
  			ggiGA_resource_handle head,
! 			ggiGA_resource_handle taghead,
  			ggiGA_resource_handle has,
  			void **state,
--- 999,1003 ----
  			ggiGA_resource_handle res,
  			ggiGA_resource_handle head,
! 			ggiGA_taghead_t taghead,
  			ggiGA_resource_handle has,
  			void **state,
***************
*** 870,874 ****
  			  ggiGA_resource_handle res,
  			  ggiGA_resource_handle head,
! 			  ggiGA_resource_handle taghead,
  			  ggiGA_resource_handle has,
  			  void **state,
--- 1015,1019 ----
  			  ggiGA_resource_handle res,
  			  ggiGA_resource_handle head,
! 			  ggiGA_taghead_t taghead,
  			  ggiGA_resource_handle has,
  			  void **state,

Update of /cvsroot/ggi/ggi-core/libgalloc/include/ggi/internal
In directory usw-pr-cvs1:/tmp/cvs-serv7878/include/ggi/internal

Modified Files:
	galloc.h 
Log Message:

More galloc brains to mystify and confuse the coding public.



Index: galloc.h
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/include/ggi/internal/galloc.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** galloc.h	2001/10/21 23:19:30	1.19
--- galloc.h	2001/10/27 05:02:23	1.20
***************
*** 96,100 ****
--- 96,103 ----
  };
  
+ 
  /* Typedef for template callback functions. */
+ struct ggiGA_taghead;				/* needed for prototype. */
+ typedef struct ggiGA_taghead *ggiGA_taghead_t;	/* needed for prototype. */
  typedef int (ggiGA_reslist_callback)(ggi_visual_t vis,
  				     ggiGA_resource_list reslist,
***************
*** 102,106 ****
  				     ggiGA_resource_handle res,
  				     ggiGA_resource_handle head,
! 				     ggiGA_resource_handle taghead,
  				     ggiGA_resource_handle has,
  				     void **state,
--- 105,109 ----
  				     ggiGA_resource_handle res,
  				     ggiGA_resource_handle head,
! 				     ggiGA_taghead_t taghead,
  				     ggiGA_resource_handle has,
  				     void **state,
***************
*** 179,187 ****
   * always alloc sizeof(struct ggiGA_resource).
   */
! typedef struct ggiGA_taghead {
  	GA_RESOURCE_COMMON_MEMBERS;
  	int tag2;
  	ggiGA_resource_handle left2, right2;
! } *ggiGA_taghead_t;
  
  
--- 182,190 ----
   * always alloc sizeof(struct ggiGA_resource).
   */
! struct ggiGA_taghead {
  	GA_RESOURCE_COMMON_MEMBERS;
  	int tag2;
  	ggiGA_resource_handle left2, right2;
! };

Update of /cvsroot/ggi/html/sgmldoc/book
In directory usw-pr-cvs1:/tmp/cvs-serv22290

Modified Files:
	chapter-installation.sgml 
Log Message:
More on installation 

Index: chapter-installation.sgml
===================================================================
RCS file: /cvsroot/ggi/html/sgmldoc/book/chapter-installation.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** chapter-installation.sgml	2001/10/19 16:19:29	1.3
--- chapter-installation.sgml	2001/10/26 11:16:15	1.4
***************
*** 4,17 ****
  <sect1><title>Getting GGI</title>
  
! <para>All the information about latest releases can be found on the
! GGI Project website.
  </para>
  
! <para>The normal user is advised to get the stable release.
  </para>
  
! <para>Third party developers are encouraged to try the development
! releases (or even the CVS sources) and notify the GGI team of any bugs,
! or suggest improvements, etc.
  </para>
  
--- 4,20 ----
  <sect1><title>Getting GGI</title>
  
! <para>
!    All the information about latest releases can be found on the
!    GGI Project website.
  </para>
  
! <para>
!    The normal user is advised to get the stable release.
  </para>
  
! <para>
!    Third party developers are encouraged to try the development
!    releases (or even the CVS sources) and notify the GGI team of any bugs,
!    or suggest improvements, etc.
  </para>
  
***************
*** 22,38 ****
  <sect2><title>Core libraries and extension</title>
  
! <para>What to get actually depends of what you intend to do with GGI.
! Strictly speaking, you'll need at least LibGII to claim that you're using
! GGI. However, chances are that you also want LibGGI. Moreover, the LibGAlloc
! extension has become a part of the Standard GGI Base. It is therefore
! strongly advised to install all of these libraries.
  </para>
  
! <para>All other packages are optional, but some might be needed by a
! particular program.  A lot of programs need LibGGIMISC, for example. 
! Keep in mind that the highlevel family extensions internaly rely on 
! lowlevel ones, which provide common functionality found in modern hardware. 
! So installing the lowlevel extensions is a good idea. But then again 
! it's up to you.
  </para>
  
--- 25,44 ----
  <sect2><title>Core libraries and extension</title>
  
! <para>
!    What to get actually depends of what you intend to do with
!    GGI. Strictly speaking, you'll need at least LibGII to claim that
!    you're using GGI. However, chances are that you also want
!    LibGGI. Moreover, the LibGAlloc extension has become a part of the
!    Standard GGI Base. It is therefore strongly advised to install all
!    of these libraries.
  </para>
  
! <para>
!    All other packages are optional, but some might be needed by a
!    particular program.  A lot of programs need LibGGIMISC, for
!    example. Keep in mind that the highlevel family extensions
!    internaly rely on lowlevel ones, which provide common functionality
!    found in modern hardware. So installing the lowlevel extensions is
!    a good idea. But then again it's up to you.
  </para>
  
***************
*** 41,54 ****
  <sect2><title>Targets</title>
  
! <para>Whereas the source packages include the code for all available targets,
! binary packages provide only the core libraries. Thus, you only need
! to download and install the target you actually need. E.g. a
! <trademark>MS-Windows</trademark> user only needs the
! <trademark>DirectX</trademark> libraries and desn't bother with the 
! X11 target.
  </para>
  
! <para>Anyway, unless you're very short on disk space, having more libraries
! than needed won't hurt, so don't hesitate to get additional targets.
  </para>
  
--- 47,63 ----
  <sect2><title>Targets</title>
  
! <para>
!    Whereas the source packages include the code for all available targets,
!    binary packages provide only the core libraries. Thus, you only need
!    to download and install the target you actually need. E.g. a
!    <trademark>MS-Windows</trademark> user only needs the
!    <trademark>DirectX</trademark> libraries and doesn't care much
!    about the X11 target.
  </para>
  
! <para>
!    Anyway, unless you're very short on disk space, having more
!    libraries than needed won't hurt, so don't hesitate to get
!    additional targets.
  </para>
  
***************
*** 59,73 ****
  <sect1><title>Building from sources</title>
  
! <para>Basically, the following ancestral incantation should work fine
! for most people:</para>
  <screen>
  $ ./configure; make; make install
  </screen>
  <para>
! Nonetheless, reading the README and
! INSTALL files for each package is more than recommended.
  </para>
  
! <para>The correct order to build the packages is:</para>
  <orderedlist numeration="arabic">
  <listitem><para>LibGII</para></listitem>
--- 68,104 ----
  <sect1><title>Building from sources</title>
  
! <para>
!    Reading the <filename>README</filename> and
!    <filename>INSTALL</filename> files for each package is more than
!    recommended. But for those in a hurry, the following ancestral
!    incantation should work fine for most people:
! </para>
! 
  <screen>
  $ ./configure; make; make install
  </screen>
+ 
  <para>
!    In case you don't have root access on your machine, you can
!    specify a prefix instead of the default 
!    <filename class="directory">/usr/local/</filename>.
  </para>
+ 
+ <screen>
+ $ ./configure --prefix=&lt;absolute path, you have WRITE-access to&gt;
+ $ make
+ $ make install
+ </screen>
  
! <para>
!    Don't forget to had the
!    <filename class="directory">&lt;chosen prefix&gt;/lib</filename>
!    directory to your <envvar>LD_LIBRARY_PATH</envvar> environment variable.
! </para>
! 
! <para>
!    The correct order to build the packages is:
! </para>
! 
  <orderedlist numeration="arabic">
  <listitem><para>LibGII</para></listitem>
***************
*** 79,84 ****
  </orderedlist>
  
  </sect1>
  
  </chapter>
- 
--- 110,124 ----
  </orderedlist>
  
+ <para>
+    If you got the source from CVS, you'll have to generate a
+    <filename>configure.sh</filename> first. You'll need the autoconf
+    and automake tools for this.
+ </para>
+ 
+ <screen>
+ $ ./autogen.sh
+ </screen>
+ 
  </sect1>
  
  </chapter>

Update of /cvsroot/ggi/ggi-libs/libgpf/gpf
In directory usw-pr-cvs1:/tmp/cvs-serv23890/gpf

Modified Files:
	internal.c 
Log Message:
prepared the infra-structure for creating a complete pipeline

Index: internal.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/gpf/internal.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** internal.c	2001/10/25 16:28:15	1.23
--- internal.c	2001/10/26 10:22:57	1.24
***************
*** 143,146 ****
--- 143,162 ----
  
  
+ static void *_gpf_init_pipe(struct gpf_handle_pipe_t *pipe)
+ {
+ 	pipe->head.dlhandle = NULL;
+ 	pipe->head.dummy = NULL;
+ 
+ 	pipe->startstream = (void *)_default_error;
+ 	pipe->stopstream = (void *)_default_error;
+ 	pipe->donextstreamdatablock = (void *)_default_error;
+ 
+ 	pipe->pipe_check = (void *)_default_error;
+ 	pipe->pipe_create = (void *)_default_error;
+ 
+ 	return &(pipe->head);
+ }	/* _gpf_init_pipe */
+ 
+ 
  static void _gpf_init_allops(gpf_handle_t hnd, int initall)
  {
***************
*** 151,154 ****
--- 167,173 ----
  		_gpf_init_opio(hnd->opio_output);
  		hnd->opio_output->head.version = GPF_VERSION_HANDLE_OPIO;
+ 
+ 		_gpf_init_pipe(hnd->pipe);
+ 		hnd->pipe->head.version = GPF_VERSION_HANDLE_PIPE;
  	}	/* if */
  }	/* _gpf_init_allops */

Update of /cvsroot/ggi/ggi-libs/libgpf/pipe/auto
In directory usw-pr-cvs1:/tmp/cvs-serv21540/pipe/auto

Modified Files:
	auto_gpf.h funcs.c init.c 
Log Message:
prepared the infra-structure for creating a complete pipeline

Index: auto_gpf.h
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/pipe/auto/auto_gpf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auto_gpf.h	2001/10/23 15:14:48	1.2
--- auto_gpf.h	2001/10/26 10:19:16	1.3
***************
*** 41,46 ****
  GPFpipe_DoNextStreamDataBlock	GPF_AUTO_donextstreamdatablock;
  
! GPFpipe_io_query		GPF_AUTO_io_query;
! GPFpipe_io_check		GPF_AUTO_io_check;
  
  
--- 41,46 ----
  GPFpipe_DoNextStreamDataBlock	GPF_AUTO_donextstreamdatablock;
  
! GPFpipe_check			GPF_AUTO_check;
! GPFpipe_create			GPF_AUTO_create;
  
  

Index: funcs.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/pipe/auto/funcs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** funcs.c	2001/10/25 16:28:15	1.3
--- funcs.c	2001/10/26 10:19:16	1.4
***************
*** 29,35 ****
  
  
! void *GPF_AUTO_io_query(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			size_t *size, int *flags)
  {
  	struct autogpf_priv *priv;
--- 29,33 ----
  
  
! int GPF_AUTO_check(gpf_handle_t handle)
  {
  	struct autogpf_priv *priv;
***************
*** 39,49 ****
  
  	return NULL;
! }	/* GPF_AUTO_io_query */
  
  
! int GPF_AUTO_io_check(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			const void *buf, size_t size,
! 			int *flags)
  {
  	struct autogpf_priv *priv;
--- 37,44 ----
  
  	return NULL;
! }	/* GPF_AUTO_check */
  
  
! int GPF_AUTO_create(gpf_handle_t handle)
  {
  	struct autogpf_priv *priv;
***************
*** 53,57 ****
  
  	return GGI_OK;
! }	/* GPF_AUTO_io_check */
  
  
--- 48,52 ----
  
  	return GGI_OK;
! }	/* GPF_AUTO_create */
  
  

Index: init.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/pipe/auto/init.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** init.c	2001/10/25 16:28:15	1.3
--- init.c	2001/10/26 10:19:16	1.4
***************
*** 48,53 ****
  	memset(priv, 0, sizeof(struct autogpf_priv));
  
! 	hnd->pipe->pipe_query = GPF_AUTO_io_query;
! 	hnd->pipe->pipe_check = GPF_AUTO_io_check;
  
  	hnd->pipe->startstream = GPF_AUTO_startstream;
--- 48,53 ----
  	memset(priv, 0, sizeof(struct autogpf_priv));
  
! 	hnd->pipe->pipe_check = GPF_AUTO_check;
! 	hnd->pipe->pipe_create = GPF_AUTO_create;
  
  	hnd->pipe->startstream = GPF_AUTO_startstream;

Update of /cvsroot/ggi/ggi-libs/libgpf/include/ggi/internal
In directory usw-pr-cvs1:/tmp/cvs-serv21540/include/ggi/internal

Modified Files:
	gpf.h 
Log Message:
prepared the infra-structure for creating a complete pipeline

Index: gpf.h
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/include/ggi/internal/gpf.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** gpf.h	2001/10/23 15:07:14	1.20
--- gpf.h	2001/10/26 10:19:16	1.21
***************
*** 183,195 ****
  
  /* communication with the conversion module */
! typedef void *(GPFpipe_io_query)(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			size_t *size, int *flags);
! 
! typedef int (GPFpipe_io_check)(gpf_handle_t handle,
! 			struct gpf_handle_opio_t *opio,
! 			const void *buf, size_t size,
! 			int *flags);
  
  typedef int (GPFpipe_startstream)(gpf_handle_t handle);
  typedef int (GPFpipe_stopstream)(gpf_handle_t handle);
--- 183,190 ----
  
  /* communication with the conversion module */
! typedef int (GPFpipe_check)(gpf_handle_t handle);
! typedef int (GPFpipe_create)(gpf_handle_t handle);
  
+ 
  typedef int (GPFpipe_startstream)(gpf_handle_t handle);
  typedef int (GPFpipe_stopstream)(gpf_handle_t handle);
***************
*** 205,210 ****
  	gpf_dlhandle_l	*dlhandle;
  
! 	GPFpipe_io_query		*pipe_query;
! 	GPFpipe_io_check		*pipe_check;
  
  	GPFpipe_startstream		*startstream;
--- 200,205 ----
  	gpf_dlhandle_l	*dlhandle;
  
! 	GPFpipe_check			*pipe_check;
! 	GPFpipe_create			*pipe_create;
  
  	GPFpipe_startstream		*startstream;

Update of /cvsroot/ggi/ggi-libs/libgpf/demos
In directory usw-pr-cvs1:/tmp/cvs-serv10281/demos

Modified Files:
	gpftest.c 
Log Message:
refactored data-streaming stubs function to give the control to the pipe

Index: gpftest.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/demos/gpftest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** gpftest.c	2001/10/23 15:07:13	1.4
--- gpftest.c	2001/10/26 09:59:25	1.5
***************
*** 57,60 ****
--- 57,62 ----
  
  	while (!gpfIsStopped(handle)) {
+ 		gpfDoNextStreamDataBlock(handle, NULL);
+ 
  		/* do nothing currently */
  		break;

Update of /cvsroot/ggi/ggi-libs/libgpf/gpf
In directory usw-pr-cvs1:/tmp/cvs-serv10281/gpf

Modified Files:
	stubs.c 
Log Message:
refactored data-streaming stubs function to give the control to the pipe

Index: stubs.c
===================================================================
RCS file: /cvsroot/ggi/ggi-libs/libgpf/gpf/stubs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stubs.c	2001/10/23 15:07:13	1.4
--- stubs.c	2001/10/26 09:59:26	1.5
***************
*** 57,65 ****
  int gpfStartStream(gpf_handle_t handle)
  {
- 	return handle->opio_input->startstream(handle,
- 					handle->opio_input);
- #if 0
  	return handle->pipe->startstream(handle);
- #endif
  }	/* gpfStartStream */
  
--- 57,61 ----
***************
*** 67,76 ****
  int gpfStopStream(gpf_handle_t handle)
  {
- 	return handle->opio_input->stopstream(handle,
- 					handle->opio_input);
- 
- #if 0
  	return handle->pipe->stopstream(handle);
- #endif
  }	/* gpfStopStream */
  
--- 63,67 ----
***************
*** 78,86 ****
  int gpfDoNextStreamDataBlock(gpf_handle_t handle, gpfIndicatorCallback cbI)
  {
- 	return handle->opio_input->donextstreamdatablock(handle,
- 					handle->opio_input);
- #if 0
  	return handle->pipe->donextstreamdatablock(handle, cbI);
- #endif
  }	/* gpfDoNextStreamDataBlock */
  
--- 69,73 ----

Update of /cvsroot/ggi/ggi-core/libgalloc/galloc
In directory usw-pr-cvs1:/tmp/cvs-serv9251/galloc

Modified Files:
	templates.c 
Log Message:

Ponder, ye mortals                                            :-P



Index: templates.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/galloc/templates.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** templates.c	2001/10/21 23:19:30	1.23
--- templates.c	2001/10/26 01:27:43	1.24
***************
*** 2,6 ****
  ******************************************************************************
  
!    LibGalloc: Templates for use by simpler extensions.
  
     Copyright (C) 2001 Christoph Egger   [Christoph_Egger@...]
--- 2,6 ----
  ******************************************************************************
  
!    LibGAlloc: Templates for use by simpler extensions.
  
     Copyright (C) 2001 Christoph Egger   [Christoph_Egger@...]
***************
*** 221,224 ****
--- 221,299 ----
  
  
+ 
+ /* When we need to "start from the top" we copy the master haslist
+  * back into a *pre-existing* copy of the haslist, without altering
+  * the parsed list structure and keeping the pointers to the master
+  * resources.
+  */
+ static inline void reset_haslist(ggi_visual_t vis, 
+ 				 ggiGA_resource_list haslist) {
+ 	/* Internal, error checking not needed here. */
+ 	struct ggiGA_resource res;
+ 	ggiGA_resource_handle master;
+ 
+ 	master = GA_HASLIST(vis);
+ 	while (master) {
+ 		memcpy(&res, haslist, sizeof(struct ggiGA_resource));
+ 		if (haslist->props != NULL)
+ 			memcpy(haslist->props, master->props, 
+ 			       sizeof(struct ggiGA_resource_props));
+ 		if (haslist->priv != NULL)
+ 			memcpy(haslist->priv, master->priv, 
+ 			       haslist->priv_size);
+ 		memcpy(haslist, master, sizeof(struct ggiGA_resource));
+ 		haslist->master = master;
+ 		haslist->props = res.props;
+ 		haslist->priv = res.priv;
+ 		haslist->left = res.left;
+ 		haslist->right = res.right;
+ 		haslist->next = res.next;
+ 
+ 		master = master->next;
+ 		haslist = haslist->next;
+ 	}	/* while */
+ }
+ 
+ /* Approximately as above, for the reslist */
+ static inline void reset_reqlist(ggiGA_resource_list origreq, 
+ 				 ggiGA_resource_list reqlist) {
+ 	/* Internal, error checking not needed here. */
+ 	struct ggiGA_resource res;
+ 
+ 	while (origreq) {
+ 		memcpy(&res, reqlist, sizeof(struct ggiGA_resource));
+ 		if (reqlist->props != NULL)
+ 			memcpy(reqlist->props, origreq->props, 
+ 			       sizeof(struct ggiGA_resource_props));
+ 		if (reqlist->priv != NULL)
+ 			memcpy(reqlist->priv, origreq->priv, 
+ 			       reqlist->priv_size);
+ 		memcpy(reqlist, origreq, sizeof(struct ggiGA_resource));
+ 		reqlist->master = res.master;
+ 		reqlist->props = res.props;
+ 		reqlist->priv = res.priv;
+ 		reqlist->left = res.left;
+ 		reqlist->right = res.right;
+ 		reqlist->next = res.next;
+ 		reqlist->res_state |= GA_STATE_FAILED;
+ 
+ 		origreq = origreq->next;
+ 		reqlist = reqlist->next;
+ 	}	/* while */
+ }
+ 
+ 
+ /* This function checks to see if has in haslist, which is a proposed 
+  * master resource for res in reslist, would place res in the "correct"
+  * haslist tag group/compound as determined by resources which res 
+  * is attached to.  The rules defining "correct" are a bit complex:
+  */
+ static inline int do_fit(ggiGA_resource_list reqlist,
+ 			 ggiGA_resource_handle req,
+ 			 ggiGA_resource_list haslist,
+ 			 ggiGA_resource_handle has) {
+   return 0;
+ }
+ 
  static inline int do_callback(ggi_visual_t vis,
  			      ggiGA_resource_list reslist,
***************
*** 229,250 ****
  			      ggiGA_resource_handle has,
  			      void **state,
! 			      void **privstate) 
! {
! 	ggiGA_reslist_callback *cb;
! 	cb = NULL;
! 	if (res->cbflags1 & command) cb = res->cb1;
! 	else if (res->cbflags2 & command) cb = res->cb2;
! 	else {
! 		int i = 0;
! 		do {
! 			if ((command >> i) & 1) break;
! 		} while (++i < 32);
! 		if (i >= 32) return GGI_EARGINVAL;
! 		cb = LIBGGI_GALLOCEXT(vis)->default_callbacks[i];
! 	}
! 	if (cb == NULL) return GGI_EARGINVAL;
! 	return cb(vis, reslist, command, res, head, taghead, has,
! 		  state, privstate);
! }
  
  
--- 304,308 ----
  			      ggiGA_resource_handle has,
  			      void **state,
! 			      void **privstate);
  
  
***************
*** 253,259 ****
--- 311,321 ----
  {
  	ggiGA_resource_list haslist = NULL;
+ 	ggiGA_resource_list reqlist = NULL;
  	ggiGA_resource_handle tmp1 = NULL;
  	ggiGA_resource_handle tmp2 = NULL;
+ 	int need_reset = 0;
  	void *checkstate = NULL;
+ 	void *state = NULL;
+ 	void *privstate = NULL;
  
  	int rc = GALLOC_OK;
***************
*** 294,313 ****
  	}	/* if */
  
  	rc = ggiGACopyList(GA_HASLIST(vis), &haslist);
  	LIB_ASSERT(rc == GALLOC_OK);
  	if (rc != GALLOC_OK) return rc;
  
! 	/* Make a copy of the haslist, with links back to the master copy. */
! 	tmp1 = GA_HASLIST(vis);
! 	tmp2 = haslist;
! 	while (tmp1) {
! 		tmp2->master = tmp1;
  		tmp1 = tmp1->next;
- 		tmp2 = tmp2->next;
  	}	/* while */
! 
! 	ggiGA_basic_parse_list(haslist);
! 
! 	ggiGA_basic_parse_list(request);
  
  	do {
--- 356,377 ----
  	}	/* if */
  
+ 	/* Make a copy of the haslist, with links back to the master copy. */
  	rc = ggiGACopyList(GA_HASLIST(vis), &haslist);
  	LIB_ASSERT(rc == GALLOC_OK);
  	if (rc != GALLOC_OK) return rc;
+ 	ggiGA_basic_parse_list(haslist);
+ 	reset_haslist(vis, haslist);
  
! 	/* Make a copy of the request, with cleared master links. */
! 	rc = ggiGACopyList(request, &reqlist);
! 	LIB_ASSERT(rc == GALLOC_OK);
! 	if (rc != GALLOC_OK) return rc;
! 	ggiGA_basic_parse_list(reqlist);
! 	tmp1 = reqlist;
! 	while (tmp1 != NULL) {
! 		tmp1->master = NULL;
  		tmp1 = tmp1->next;
  	}	/* while */
! 	reset_reqlist(request, reqlist);
  
  	do {
***************
*** 317,329 ****
  	  free(foo);
  	  foo = NULL;
! 	  ggiGAanprintf(vis, request, 9000, "", &foo); 
! 	  fprintf(stderr, "request = \n%s\n", foo);
  	  free(foo);
  	} while (0);
  
  	return rc;
  }
  
  
  /* Default functions for callbacks implementing lowest common denominator */
  
--- 381,514 ----
  	  free(foo);
  	  foo = NULL;
! 	  ggiGAanprintf(vis, reqlist, 9000, "", &foo); 
! 	  fprintf(stderr, "reqlist = \n%s\n", foo);
  	  free(foo);
  	} while (0);
  
+ 	tmp1 = reqlist;
+ 	reset_reqlist(request, reqlist);  
+ 	reset_haslist(vis, haslist);
+ 	while (tmp1 != NULL) {
+ 		if (need_reset > 1) {
+ 			reset_reqlist(request, reqlist);
+ 			reset_haslist(vis, haslist);
+ 			/* TODO: reset the state/privstate ... */
+ 			tmp2 = reqlist;
+ 			while (tmp2 != tmp1) {
+ 				rc = do_callback(vis, reqlist, GA_CB_PRECHECK,
+ 						  tmp1, NULL, NULL,
+ 						  tmp2, &state, &privstate);
+ 				LIB_ASSERT(rc == GALLOC_OK);
+ 				rc = do_callback(vis, reqlist, GA_CB_CHECK,
+ 						  tmp1, NULL, NULL,
+ 						  tmp2, &state, &privstate); 
+ 				LIB_ASSERT(rc == GALLOC_OK);
+ 				rc = do_callback(vis, reqlist, GA_CB_POSTCHECK,
+ 						 tmp1, NULL, NULL,
+ 						 tmp2, &state, &privstate);
+ 				LIB_ASSERT(rc == GALLOC_OK);
+ 			}
+ 			need_reset = 0;
+ 		}
+ 		if (need_reset) {
+ 			tmp2 = reqlist;
+ 			while (tmp2 != tmp1) {
+ 				rc = do_callback(vis, reqlist, GA_CB_RECHECK,
+ 						 tmp1, NULL, NULL,
+ 						 tmp2, &state, &privstate);
+ 				LIB_ASSERT(rc == GALLOC_OK);
+ 			}
+ 			need_reset = 0;
+ 		}
+ 		tmp2 = (tmp1->master == NULL) ? haslist : tmp1->master->next;
+ 		while (tmp2 != NULL) {
+ 			fprintf(stderr, "matching %p to %p\n", tmp1, tmp2);
+ 			if (do_callback(vis, reqlist, GA_CB_MATCH,
+ 					tmp1, NULL, NULL,
+ 					tmp2, &state, &privstate)) 
+ 				goto nexthas;
+ 			if (do_callback(vis, reqlist, GA_CB_PRECHECK,
+ 					tmp1, NULL, NULL,
+ 					tmp2, &state, &privstate)) 
+ 				goto nexthas;
+ 			if (do_fit(reqlist, tmp1, haslist, tmp2))
+ 				goto nexthas;
+ 			if (do_callback(vis, reqlist, GA_CB_CHECK,
+ 					tmp1, NULL, NULL,
+ 					tmp2, &state, &privstate)) 
+ 				goto nexthas;
+ 		        if (do_callback(vis, reqlist, GA_CB_POSTCHECK,
+ 					tmp1, NULL, NULL,
+ 					tmp2, &state, &privstate)) 
+ 				goto nexthas;
+ 			tmp1->master = tmp2;
+ 			break;
+ 		nexthas:
+ 			tmp2 = tmp2->next;
+ 		}	/* while */
+ 		if (tmp2 == NULL) { /* No match */
+ 			if (tmp1 != reqlist) {
+ 				tmp1->master = NULL;
+ 				tmp2 = reqlist;
+ 				while (tmp2->next != tmp1) tmp2 = tmp2->next;
+ 			}	/* if */
+ 			fprintf(stderr, "rolling back to %p\n", tmp2);
+ 			tmp1 = tmp2;
+ 			if (tmp2 != NULL) {
+ 				tmp2 = tmp2->next;
+ 				while (tmp2 != NULL) {
+ 					tmp2->master = NULL;
+ 					tmp2 = tmp2->next;
+ 				}	/* while */
+ 				need_reset = do_callback(vis, reqlist, 
+ 							 GA_CB_UNCHECK,
+ 							 tmp1, NULL, NULL,
+ 							 tmp1->master, 
+ 							 &state, &privstate);
+ 			}	/* if */
+ 		}	/* if */
+ 		else { tmp1 = tmp1->next; }
+ 	}	/* while */
+ 
+ 	do {
+ 	  char *foo = NULL;
+ 	  ggiGAanprintf(vis, reqlist, 9000, "", &foo); 
+ 	  fprintf(stderr, "reqlist = \n%s\n", foo);
+ 	  free(foo);
+ 	} while (0);
+ 
  	return rc;
  }
  
  
+ static inline int do_callback(ggi_visual_t vis,
+ 			      ggiGA_resource_list reslist,
+ 			      enum ggiGA_callback_command command,
+ 			      ggiGA_resource_handle res,
+ 			      ggiGA_resource_handle head,
+ 			      ggiGA_resource_handle taghead,
+ 			      ggiGA_resource_handle has,
+ 			      void **state,
+ 			      void **privstate) 
+ {
+ 	ggiGA_reslist_callback *cb;
+ 	cb = NULL;
+ 	if (res->cbflags1 & command) cb = res->cb1;
+ 	else if (res->cbflags2 & command) cb = res->cb2;
+ 	else {
+ 		int i = 0;
+ 		do {
+ 			if ((command >> i) & 1) break;
+ 		} while (++i < 32);
+ 		if (i >= 32) return GGI_EARGINVAL;
+ 		cb = LIBGGI_GALLOCEXT(vis)->default_callbacks[i];
+ 	}
+ 	if (cb == NULL) return GGI_EARGINVAL;
+ 	return cb(vis, reslist, command, res, head, taghead, has,
+ 		  state, privstate);
+ }
+ 
+ 
+ 
  /* Default functions for callbacks implementing lowest common denominator */
  
***************
*** 444,451 ****
   *
   * The recheck callback re-marks regions as used after
!  * they have been temporarily "unchecked" by the uncheck callback.
   *
   * These three callbacks will often share the same actual callback 
   * function, as they do here.
   */
  int ggiGA_default_motor_check (ggi_visual_t vis,
--- 629,646 ----
   *
   * The recheck callback re-marks regions as used after
!  * they have been temporarily "unchecked" by the uncheck callback,
!  * or if the whole list is being rechecked from the top to
!  * roll back to a previous state.  In the former case, the resource
!  * will be marked as failed.
   *
   * These three callbacks will often share the same actual callback 
   * function, as they do here.
+  *
+  * It is known that the resource has passed precheck, and it has
+  * passed the do_fit function before these callbacks are called.
+  * 
+  * NOTE: In-service resources *will* be passed to these callbacks, 
+  * so they should be anticipated (and they can be told apart by
+  * the GA_STATE_NORESET state flag).
   */
  int ggiGA_default_motor_check (ggi_visual_t vis,
***************
*** 460,463 ****
--- 655,659 ----
  
          if (command != GA_CB_PRECHECK) goto skip;
+ 	fprintf(stderr, "default precheck %p\n", res);
   	/* Precheck-only section */
   skip:
***************
*** 467,470 ****
--- 663,667 ----
  	if (command == GA_CB_RECHECK) goto mark;
  	/* Calculation of size, verification of availability */
+ 	fprintf(stderr, "default (re)check %p\n", res);
   mark:
  	/* Allocation */
***************
*** 481,485 ****
--- 678,684 ----
  			     void **state,
  			     void **privstate) {
+ 
          if (command != GA_CB_PRECHECK) goto skip;
+ 	fprintf(stderr, "default precheck %p\n", res);
   	/* Precheck-only section */
   skip:
***************
*** 489,492 ****
--- 688,692 ----
  	if (command == GA_CB_RECHECK) goto mark;
  	/* Calculation of size, verification of availability */
+ 	fprintf(stderr, "default (re)check %p\n", res);
   mark:
  	/* Allocation */
***************
*** 506,512 ****
--- 706,714 ----
          if (command != GA_CB_PRECHECK) goto skip;
   	/* Precheck-only section */
+ 	fprintf(stderr, "default precheck %p\n", res);
   skip:
  	/* Common section */
  	if (command == GA_CB_PRECHECK) return 0;
+ 	fprintf(stderr, "default (re)check %p\n", res);
  	/* Preparation for allocation */
  	if (command == GA_CB_RECHECK) goto mark;
***************
*** 517,520 ****
--- 719,730 ----
  }
  
+ /* The uncheck callback removes any pre-allocation of storage that
+  * the given resource caused.  It should return 0 if the state of
+  * the target is not disturbed by doing so, 1 if the state must be
+  * restored by calling the recheck callback on all resources in the
+  * list, and 2 if all state hould be wiped clean and the 
+  * precheck/check/postcheck callbacks should be called on all 
+  * resources again.
+  */ 
  int ggiGA_default_check (ggi_visual_t vis,
  			 ggiGA_resource_list reslist,
***************
*** 526,529 ****
--- 736,740 ----
  			 void **state,
  			 void **privstate) {
+ 
  	if (ggiGA_FULLTYPE(res) == GA_RT_RESLIST_TAGHEAD) {
  	  fprintf(stderr, "Tag group heads not yet implemented\n");
***************
*** 592,595 ****
--- 803,809 ----
  			   void **state,
  			   void **privstate) {
+ 
+ 	fprintf(stderr, "default uncheck %p\n", res);
+ 
  	if (ggiGA_FULLTYPE(res) == GA_RT_RESLIST_TAGHEAD) {
  	  fprintf(stderr, "Tag group heads not yet implemented\n");
***************
*** 615,619 ****
  
  /* The set function cements the allocation of resources, and
!  * may alter global hardware state.
   */
  int ggiGA_default_set(ggi_visual_t vis,
--- 829,835 ----
  
  /* The set function cements the allocation of resources, and
!  * may alter global hardware state (that is, state which affects
!  * the basic hardware layout scheme of resources but is not specific
!  * to a certain resource.)
   */
  int ggiGA_default_set(ggi_visual_t vis,

Update of /cvsroot/ggi/ggi-core/libgalloc/display/stubs
In directory usw-pr-cvs1:/tmp/cvs-serv9251/display/stubs

Modified Files:
	haslist.c 
Log Message:

Ponder, ye mortals                                            :-P



Index: haslist.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libgalloc/display/stubs/haslist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** haslist.c	2001/10/20 22:22:25	1.1
--- haslist.c	2001/10/26 01:27:43	1.2
***************
*** 34,38 ****
  static struct ggiGA_resource_props zcarb_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_SWAP,
  };
  
--- 34,38 ----
  static struct ggiGA_resource_props zcarb_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_REALRAM,
  };
  
***************
*** 46,50 ****
  static struct ggiGA_resource_props zbuf_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_SWAP,
  };
  
--- 46,50 ----
  static struct ggiGA_resource_props zbuf_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_REALRAM,
  };
  
***************
*** 58,62 ****
  static struct ggiGA_resource_props alphacarb_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_SWAP,
  };
  
--- 58,62 ----
  static struct ggiGA_resource_props alphacarb_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_REALRAM,
  };
  
***************
*** 70,74 ****
  static struct ggiGA_resource_props alphabuf_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_SWAP,
  };
  
--- 70,74 ----
  static struct ggiGA_resource_props alphabuf_props = {
    storage_ok:   GA_STORAGE_SWAP,
!   storage_need: GA_STORAGE_REALRAM,
  };
  
***************
*** 107,112 ****
      }
    },
-   storage_ok:   GA_STORAGE_VRAM | GA_STORAGE_SWAP,
-   storage_need: GA_STORAGE_VRAM | GA_STORAGE_SWAP,
  };
  
--- 107,110 ----