Passage en Zinc

1 files changed, 107 insertions, 107 deletions

diff --git a/generic/Icon.c b/generic/Icon.c
index b5f4de0..d92c0b1 100644
--- a/generic/Icon.c
+++ b/generic/Icon.c
@@ -50,55 +50,55 @@ typedef struct _IconItemStruct {
   ItemStruct	header;
 
   /* Public data */
-  RadarPoint	pos;
+  ZnPoint	pos;
   char		*image_name;
-  RadarAnchor	anchor;
-  RadarAnchor	connection_anchor;
+  ZnAnchor	anchor;
+  ZnAnchor	connection_anchor;
   Pixmap	mask;	/* Used only if the image is *NOT* specified */
-  RadarColor	color;	/* Used with the mask */
+  ZnColor	color;	/* Used with the mask */
   
   /* Private data */
-  RadarPoint	pos_dev;
-  RadarImage	image;
+  ZnPoint	pos_dev;
+  ZnImage	image;
 } IconItemStruct, *IconItem;
 
 
-static RadarAttrConfig	icon_attrs[] = {
-  { RADAR_CONFIG_ANCHOR, "-anchor", NULL,
-    Tk_Offset(IconItemStruct, anchor), 0, RADAR_COORDS_FLAG, False },
-  { RADAR_CONFIG_COLOR, "-color", NULL,
-    Tk_Offset(IconItemStruct, color), 0, RADAR_DRAW_FLAG, False },
-  { RADAR_CONFIG_BOOL, "-composerotation", NULL,
+static ZnAttrConfig	icon_attrs[] = {
+  { ZN_CONFIG_ANCHOR, "-anchor", NULL,
+    Tk_Offset(IconItemStruct, anchor), 0, ZN_COORDS_FLAG, False },
+  { ZN_CONFIG_COLOR, "-color", NULL,
+    Tk_Offset(IconItemStruct, color), 0, ZN_DRAW_FLAG, False },
+  { ZN_CONFIG_BOOL, "-composerotation", NULL,
     Tk_Offset(IconItemStruct, header.flags), COMPOSE_ROTATION_BIT,
-    RADAR_COORDS_FLAG, False },
-  { RADAR_CONFIG_BOOL, "-composescale", NULL,
+    ZN_COORDS_FLAG, False },
+  { ZN_CONFIG_BOOL, "-composescale", NULL,
     Tk_Offset(IconItemStruct, header.flags), COMPOSE_SCALE_BIT,
-    RADAR_COORDS_FLAG, False },
-  { RADAR_CONFIG_ITEM, "-connecteditem", NULL,
+    ZN_COORDS_FLAG, False },
+  { ZN_CONFIG_ITEM, "-connecteditem", NULL,
     Tk_Offset(IconItemStruct, header.connected_item), 0,
-    RADAR_COORDS_FLAG|RADAR_ITEM_FLAG, False },
-  { RADAR_CONFIG_ANCHOR, "-connectionanchor", NULL,
-    Tk_Offset(IconItemStruct, connection_anchor), 0, RADAR_COORDS_FLAG, False },
-  { RADAR_CONFIG_IMAGE, "-image", NULL,
+    ZN_COORDS_FLAG|ZN_ITEM_FLAG, False },
+  { ZN_CONFIG_ANCHOR, "-connectionanchor", NULL,
+    Tk_Offset(IconItemStruct, connection_anchor), 0, ZN_COORDS_FLAG, False },
+  { ZN_CONFIG_IMAGE, "-image", NULL,
     Tk_Offset(IconItemStruct, image_name), 0,
-    RADAR_COORDS_FLAG|RADAR_IMAGE_FLAG, False },
-  { RADAR_CONFIG_PATTERN, "-mask", NULL,
-    Tk_Offset(IconItemStruct, mask), 0, RADAR_DRAW_FLAG|RADAR_REPICK_FLAG, False },
-  { RADAR_CONFIG_POINT, "-position", NULL, Tk_Offset(IconItemStruct, pos), 0,
-    RADAR_COORDS_FLAG, False},
-  { RADAR_CONFIG_PRI, "-priority", NULL,
+    ZN_COORDS_FLAG|ZN_IMAGE_FLAG, False },
+  { ZN_CONFIG_PATTERN, "-mask", NULL,
+    Tk_Offset(IconItemStruct, mask), 0, ZN_DRAW_FLAG|ZN_REPICK_FLAG, False },
+  { ZN_CONFIG_POINT, "-position", NULL, Tk_Offset(IconItemStruct, pos), 0,
+    ZN_COORDS_FLAG, False},
+  { ZN_CONFIG_PRI, "-priority", NULL,
     Tk_Offset(IconItemStruct, header.priority), 0,
-    RADAR_DRAW_FLAG|RADAR_REPICK_FLAG, False },
-  { RADAR_CONFIG_BOOL, "-sensitive", NULL,
+    ZN_DRAW_FLAG|ZN_REPICK_FLAG, False },
+  { ZN_CONFIG_BOOL, "-sensitive", NULL,
     Tk_Offset(IconItemStruct, header.flags), SENSITIVE_BIT,
-    RADAR_REPICK_FLAG, False },
-  { RADAR_CONFIG_TAGS, "-tags", NULL,
+    ZN_REPICK_FLAG, False },
+  { ZN_CONFIG_TAGS, "-tags", NULL,
     Tk_Offset(IconItemStruct, header.tags), 0, 0, False },
-  { RADAR_CONFIG_BOOL, "-visible", NULL,
+  { ZN_CONFIG_BOOL, "-visible", NULL,
     Tk_Offset(IconItemStruct, header.flags), VISIBLE_BIT,
-    RADAR_DRAW_FLAG|RADAR_REPICK_FLAG|RADAR_VIS_FLAG, False },
+    ZN_DRAW_FLAG|ZN_REPICK_FLAG|ZN_VIS_FLAG, False },
   
-  { RADAR_CONFIG_END, NULL, NULL, 0, 0, 0 }
+  { ZN_CONFIG_END, NULL, NULL, 0, 0, 0 }
 };
 
 
@@ -121,7 +121,7 @@ IconImageChange(ClientData	client_data,
   IconItem	icon = (IconItem) client_data;
 
   InvalidateImage(icon->image);
-  ITEM.Invalidate((Item) icon, RADAR_COORDS_FLAG);
+  ITEM.Invalidate((Item) icon, ZN_COORDS_FLAG);
 }
 
 
@@ -149,13 +149,13 @@ Init(Item	item,
 
   icon->pos.x = icon->pos.y = 0.0;
   icon->image_name = "";
-  icon->image = RadarUnspecifiedImage;
-  icon->anchor = RadarAnchorNW;
-  icon->connection_anchor = RadarAnchorSW;
-  icon->mask = RadarUnspecifiedPattern;
-  icon->color = RadarGetColorByValue(wi->win, wi->fore_color);
+  icon->image = ZnUnspecifiedImage;
+  icon->anchor = ZnAnchorNW;
+  icon->connection_anchor = ZnAnchorSW;
+  icon->mask = ZnUnspecifiedPattern;
+  icon->color = ZnGetColorByValue(wi->win, wi->fore_color);
 
-  return RADAR_OK;
+  return ZN_OK;
 }
 
 
@@ -174,17 +174,17 @@ Clone(Item	item)
   char		*text;
   
   if (strlen(icon->image_name) != 0) {
-    text = RadarMalloc((strlen(icon->image_name) + 1) * sizeof(char));
+    text = ZnMalloc((strlen(icon->image_name) + 1) * sizeof(char));
     strcpy(text, icon->image_name);
     icon->image_name = text;
     icon->image = Tk_GetImage(wi->interp, wi->win, icon->image_name,
 			      IconImageChange, (ClientData) icon);
   }
-  if (icon->mask != RadarUnspecifiedPattern) {
+  if (icon->mask != ZnUnspecifiedPattern) {
     icon->mask = Tk_GetBitmap(wi->interp, wi->win,
 			      Tk_NameOfBitmap(wi->dpy, icon->mask));
   }
-  icon->color = RadarGetColorByValue(wi->win, icon->color);
+  icon->color = ZnGetColorByValue(wi->win, icon->color);
 }
 
 
@@ -202,17 +202,17 @@ Destroy(Item	item)
   IconItem	icon = (IconItem) item;
 
   if (strlen(icon->image_name) != 0) {
-    RadarFree(icon->image_name);
+    ZnFree(icon->image_name);
   }
-  if (icon->image != RadarUnspecifiedImage) {
+  if (icon->image != ZnUnspecifiedImage) {
     Tk_FreeImage(icon->image);
-    icon->image = RadarUnspecifiedImage;
+    icon->image = ZnUnspecifiedImage;
   }
-  if (icon->mask != RadarUnspecifiedPattern) {
+  if (icon->mask != ZnUnspecifiedPattern) {
     Tk_FreeBitmap(wi->dpy, icon->mask);
-    icon->mask = RadarUnspecifiedPattern;    
+    icon->mask = ZnUnspecifiedPattern;    
   }
-  RadarFreeColor(icon->color);
+  ZnFreeColor(icon->color);
 }
 
 
@@ -226,7 +226,7 @@ Destroy(Item	item)
 static int
 Configure(Item		item,
 	  int		argc,
-	  RadarAttrList	argv,
+	  ZnAttrList	argv,
 	  int		*flags)
 {
   IconItem	icon = (IconItem) item;
@@ -234,16 +234,16 @@ Configure(Item		item,
   Item		old_connected;
 
   old_connected = item->connected_item;
-  if (ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags) == RADAR_ERROR) {
-    return RADAR_ERROR;
+  if (ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags) == ZN_ERROR) {
+    return ZN_ERROR;
   }  
 
-  if (ISSET(*flags, RADAR_ITEM_FLAG)) {
+  if (ISSET(*flags, ZN_ITEM_FLAG)) {
     /*
      * If the new connected item is not appropriate back up
      * to the old one.
      */
-    if ((item->connected_item == RADAR_NO_ITEM) ||
+    if ((item->connected_item == ZN_NO_ITEM) ||
 	(item->connected_item->class->has_anchors &&
 	 (item->parent == item->connected_item->parent))) {
       ITEM.UpdateItemDependency(item, old_connected);
@@ -253,7 +253,7 @@ Configure(Item		item,
     }
   }  
 
-  if (ISSET(*flags, RADAR_IMAGE_FLAG)) {
+  if (ISSET(*flags, ZN_IMAGE_FLAG)) {
     Tk_Image	image;
 
     if (strcmp(icon->image_name, "") != 0) {
@@ -264,19 +264,19 @@ Configure(Item		item,
 	 * The name will not be in sync with the image in
 	 * this case.
 	 */
-	return RADAR_ERROR;
+	return ZN_ERROR;
       }
     }
     else {
-      image = RadarUnspecifiedImage;
+      image = ZnUnspecifiedImage;
     }
-    if (icon->image != RadarUnspecifiedImage) {
+    if (icon->image != ZnUnspecifiedImage) {
       Tk_FreeImage(icon->image);
     }
     icon->image = image;
   }
 
-  return RADAR_OK;
+  return ZN_OK;
 }
 
 
@@ -290,13 +290,13 @@ Configure(Item		item,
 static int
 Query(Item		item,
       int		argc,
-      RadarAttrList	argv)
+      ZnAttrList	argv)
 {
-  if (ITEM_P.QueryAttribute((char *) item, -1, argv[0]) == RADAR_ERROR) {
-    return RADAR_ERROR;
+  if (ITEM_P.QueryAttribute((char *) item, -1, argv[0]) == ZN_ERROR) {
+    return ZN_ERROR;
   }  
 
-  return RADAR_OK;
+  return ZN_OK;
 }
 
 
@@ -309,11 +309,11 @@ Query(Item		item,
  */
 static void
 ComputeCoordinates(Item		item,
-		   RadarBool	force)
+		   ZnBool	force)
 {
   WidgetInfo	*wi = item->wi;
   IconItem	icon = (IconItem) item;
-  RadarDim	width, height;
+  ZnDim		width, height;
   int		w, h;
   
   ResetBBox(&item->item_bounding_box);
@@ -321,12 +321,12 @@ ComputeCoordinates(Item		item,
   /*
    * If there is no image and no mask then nothing to show.
    */
-  if (icon->image == RadarUnspecifiedImage &&
-      icon->mask == RadarUnspecifiedPattern) {
+  if (icon->image == ZnUnspecifiedImage &&
+      icon->mask == ZnUnspecifiedPattern) {
     return;
   }
     
-  if (icon->image != RadarUnspecifiedImage) {
+  if (icon->image != ZnUnspecifiedImage) {
     Tk_SizeOfImage(icon->image, &w, &h);
   }
   else {
@@ -339,13 +339,13 @@ ComputeCoordinates(Item		item,
    * The connected item support anchors, this is checked by
    * configure.
    */
-  if (item->connected_item != RADAR_NO_ITEM) {
+  if (item->connected_item != ZN_NO_ITEM) {
     item->connected_item->class->GetAnchor(item->connected_item,
 					   icon->connection_anchor,
 					   &icon->pos_dev);
   }
   else {
-    RadarTransformPoint(wi->current_transfo, &icon->pos, &icon->pos_dev);
+    ZnTransformPoint(wi->current_transfo, &icon->pos, &icon->pos_dev);
   }
   
   Anchor2Origin(&icon->pos_dev, width, height, icon->anchor,
@@ -379,11 +379,11 @@ ComputeCoordinates(Item		item,
  **********************************************************************************
  */
 static int
-ToArea(Item		item,
-       RadarBBox	*area,
-       Tk_Uid		tag_uid,
-       int		enclosed,
-       RadarBool	report)
+ToArea(Item	item,
+       ZnBBox	*area,
+       Tk_Uid	tag_uid,
+       int	enclosed,
+       ZnBool	report)
 {
   /*  IconItem	icon = (IconItem) item;*/
 
@@ -408,7 +408,7 @@ Draw(Item	item)
   ImageBits	*im_bits;
   Pixmap	pmap, mask_pmap;
   
-  if (icon->image != RadarUnspecifiedImage) {
+  if (icon->image != ZnUnspecifiedImage) {
     if (wi->current_clip) {
       if (wi->current_clip->simple) {
 	Tk_RedrawImage(icon->image,
@@ -430,7 +430,7 @@ Draw(Item	item)
 	 */
 	im_bits = GetImageBits(wi->win, icon->image);
 	pmap = GetImagePixmap(wi->win, icon->image);
-	if (im_bits->mask == RadarUnspecifiedPattern) {
+	if (im_bits->mask == ZnUnspecifiedPattern) {
 	  XCopyArea(wi->dpy, pmap, wi->draw_buffer, wi->gc,
 		    item->item_bounding_box.orig.x-icon->pos_dev.x,
 		    item->item_bounding_box.orig.y-icon->pos_dev.y,
@@ -444,7 +444,7 @@ Draw(Item	item)
 	  /*
 	   * Build of the mask
 	   */
-	  mask_pmap = XCreatePixmap(wi->dpy, RadarWindowId(wi->win),
+	  mask_pmap = XCreatePixmap(wi->dpy, ZnWindowId(wi->win),
 				    im_bits->width, im_bits->height, 1);
 	  gc = XCreateGC(wi->dpy, mask_pmap, 0, NULL);
 	  XFillRectangle(wi->dpy, mask_pmap, gc, 0, 0, im_bits->width, im_bits->height);
@@ -489,12 +489,12 @@ Draw(Item	item)
 		     item->item_bounding_box.orig.y);
     }
   }
-  else if (icon->mask != RadarUnspecifiedPattern) {
+  else if (icon->mask != ZnUnspecifiedPattern) {
     values.fill_style = FillStippled;
     values.stipple = icon->mask;
     values.ts_x_origin = icon->pos_dev.x;
     values.ts_y_origin = icon->pos_dev.y;
-    values.foreground = RadarPixel(icon->color);
+    values.foreground = ZnPixel(icon->color);
     gc_mask |= GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin | GCForeground;
     XChangeGC(wi->dpy, wi->gc, gc_mask, &values);
     XFillRectangle(wi->dpy, wi->draw_buffer, wi->gc,
@@ -513,12 +513,12 @@ Draw(Item	item)
  *
  **********************************************************************************
  */
-static RadarBool
+static ZnBool
 IsSensitive(Item	item,
 	    int		item_part)
 {
   return (ISSET(item->flags, SENSITIVE_BIT) &&
-	  item->parent->class->IsSensitive(item->parent, RADAR_NO_PART));
+	  item->parent->class->IsSensitive(item->parent, ZN_NO_PART));
 }
 
 
@@ -531,7 +531,7 @@ IsSensitive(Item	item,
  */
 static double
 Pick(Item	item,
-     RadarPoint	*p,
+     ZnPoint	*p,
      Item	start_item,
      int	aperture,
      Item	*a_item,
@@ -557,12 +557,12 @@ Pick(Item	item,
   if (dist <= 0.0) {    
     XImage	*bitmap=NULL;
     ImageBits	*im_bits;
-    RadarPoint	dp;
+    ZnPoint	dp;
     
     dist = 0.0;
     dp.x = p->x - item->item_bounding_box.orig.x;
     dp.y = p->y - item->item_bounding_box.orig.y;    
-    if (icon->image != RadarUnspecifiedImage) {
+    if (icon->image != ZnUnspecifiedImage) {
       Tk_SizeOfImage(icon->image, &width, &height);
       if (dp.x >= width || dp.y >= height) {
 	dist = off_dist;
@@ -571,7 +571,7 @@ Pick(Item	item,
       im_bits = GetImageBits(wi->win, icon->image);
       bitmap = im_bits->mask;
     }
-    else if (icon->mask != RadarUnspecifiedPattern) {
+    else if (icon->mask != ZnUnspecifiedPattern) {
       Tk_SizeOfBitmap(wi->dpy, icon->mask, &width, &height);
       if (dp.x >= width || dp.y >= height) {
 	dist = off_dist;
@@ -579,7 +579,7 @@ Pick(Item	item,
       }
       bitmap = GetBitmapMask(wi->dpy, icon->mask);
     }
-    if (bitmap != RadarUnspecifiedPattern) {
+    if (bitmap != ZnUnspecifiedPattern) {
       /*printf("dpx=%g, dpy=%g, width=%d, height=%d, pixel=%ld\n", dp.x, dp.y,
 	width, height, XGetPixel(bitmap, (int) dp.x, (int) dp.y));*/
       if (! XGetPixel(bitmap, (int) dp.x, (int) dp.y)) {
@@ -620,13 +620,13 @@ PostScript(Item			item,
  */
 static void
 GetAnchor(Item		item,
-	  RadarAnchor	anchor,
-	  RadarPoint	*p)
+	  ZnAnchor	anchor,
+	  ZnPoint	*p)
 {
   IconItem	icon = (IconItem) item;
   
-  if ((icon->image != RadarUnspecifiedImage) ||
-      (icon->mask != RadarUnspecifiedPattern)) {
+  if ((icon->image != ZnUnspecifiedImage) ||
+      (icon->mask != ZnUnspecifiedPattern)) {
     Origin2Anchor(&icon->pos_dev,
 		  item->item_bounding_box.corner.x-item->item_bounding_box.orig.x,
 		  item->item_bounding_box.corner.y-item->item_bounding_box.orig.y,
@@ -646,13 +646,13 @@ GetAnchor(Item		item,
  *
  **********************************************************************************
  */
-static RadarBool
-GetClipVertices(Item		item,
-		RadarPoint	**points,
-		int		*num_points)
+static ZnBool
+GetClipVertices(Item	item,
+		ZnPoint	**points,
+		int	*num_points)
 {
-  RadarListAssertSize(item->wi->work_pts, 2);
-  *points = (RadarPoint *) RadarListArray(item->wi->work_pts);
+  ZnListAssertSize(item->wi->work_pts, 2);
+  *points = (ZnPoint *) ZnListArray(item->wi->work_pts);
   *num_points = 2;
   (*points)[0] = item->item_bounding_box.orig;
   (*points)[1] = item->item_bounding_box.corner;
@@ -672,33 +672,33 @@ GetClipVertices(Item		item,
  **********************************************************************************
  */
 static int
-Coords(Item		item,
-       int		index,
-       int		cmd,
-       RadarPoint	**pts,
-       int		*num_pts)
+Coords(Item	item,
+       int	index,
+       int	cmd,
+       ZnPoint	**pts,
+       int	*num_pts)
 {
   IconItem	icon = (IconItem) item;
   
   if ((cmd == COORDS_ADD) || (cmd == COORDS_ADD_LAST) || (cmd == COORDS_REMOVE)) {
     Tcl_AppendResult(item->wi->interp,
 		     " icons can't add or remove vertices", NULL);
-    return RADAR_ERROR;
+    return ZN_ERROR;
   }
   else if ((cmd == COORDS_REPLACE) || (cmd == COORDS_REPLACE_ALL)) {
     if (*num_pts == 0) {
       Tcl_AppendResult(item->wi->interp,
 		       " coords command need 1 point on icons", NULL);
-      return RADAR_ERROR;
+      return ZN_ERROR;
     }
     icon->pos = (*pts)[0];
-    ITEM.Invalidate(item, RADAR_COORDS_FLAG);
+    ITEM.Invalidate(item, ZN_COORDS_FLAG);
   }
   else if ((cmd == COORDS_READ) || (cmd == COORDS_READ_ALL)) {
     *num_pts = 1;
     *pts = &icon->pos;
   }
-  return RADAR_OK;
+  return ZN_OK;
 }
 
 
@@ -733,4 +733,4 @@ static ItemClassStruct ICON_ITEM_CLASS = {
   PostScript
 };
 
-RadarItemClassId RadarIcon = (RadarItemClassId) &ICON_ITEM_CLASS;
+ZnItemClassId ZnIcon = (ZnItemClassId) &ICON_ITEM_CLASS;