diff options
Diffstat (limited to 'generic/Item.c')
| -rw-r--r-- | generic/Item.c | 1272 |
1 files changed, 636 insertions, 636 deletions
diff --git a/generic/Item.c b/generic/Item.c index 5a7b92f..54a0d42 100644 --- a/generic/Item.c +++ b/generic/Item.c @@ -42,7 +42,7 @@ #include "MapInfo.h" #include "Image.h" #include "Color.h" -#include "tkRadar.h" +#include "tkZinc.h" static const char rcsid[] = "$Id$"; @@ -56,8 +56,8 @@ static const char compile_id[]="$Compile: " __FILE__ " " __DATE__ " " __TIME__ " #define CACHE_OK 16 -static RadarList item_classes = NULL; -static RadarList item_stack = NULL; +static ZnList item_classes = NULL; +static ZnList item_stack = NULL; /* @@ -65,25 +65,25 @@ static RadarList item_stack = NULL; */ typedef struct _FieldStruct { /* Public data */ - RadarColor color; - RadarColor back_color; - RadarColor border_color; + ZnColor color; + ZnColor back_color; + ZnColor border_color; Pixmap fill_pattern; char *text; char *image_name; char *tile_name; - RadarFont font; + ZnFont font; unsigned char flags; Border border_edges; - RadarJustify alignment; + ZnJustify alignment; ReliefStyle relief; int relief_thickness; AutoAlign auto_alignment; /* Private data */ - RadarImage image; - RadarImage tile; - RadarColorGradient gradient; + ZnImage image; + ZnImage tile; + ZnColorGradient gradient; short orig_x; short orig_y; short corner_x; @@ -94,48 +94,48 @@ typedef struct _FieldStruct { /* * The -text, -image, -border, -relief, -visible and - * -filled attributes set the RADAR_COORDS_FLAG to update + * -filled attributes set the ZN_COORDS_FLAG to update * the leader that might protude if not clipped by the text. */ -RadarAttrConfig field_attrs[] = { - { RADAR_CONFIG_JUSTIFY, "-alignment", NULL, - Tk_Offset(FieldStruct, alignment), 0, RADAR_DRAW_FLAG, False }, - { RADAR_CONFIG_AUTO_JUSTIFY, "-autoalignment", NULL, - Tk_Offset(FieldStruct, auto_alignment), 0, RADAR_DRAW_FLAG, False }, - { RADAR_CONFIG_COLOR, "-backcolor", NULL, +ZnAttrConfig field_attrs[] = { + { ZN_CONFIG_JUSTIFY, "-alignment", NULL, + Tk_Offset(FieldStruct, alignment), 0, ZN_DRAW_FLAG, False }, + { ZN_CONFIG_AUTO_JUSTIFY, "-autoalignment", NULL, + Tk_Offset(FieldStruct, auto_alignment), 0, ZN_DRAW_FLAG, False }, + { ZN_CONFIG_COLOR, "-backcolor", NULL, Tk_Offset(FieldStruct, back_color), 0, - RADAR_DRAW_FLAG|RADAR_BORDER_FLAG, False }, - { RADAR_CONFIG_BORDER, "-border", NULL, - Tk_Offset(FieldStruct, border_edges), 0, RADAR_COORDS_FLAG, False }, - { RADAR_CONFIG_COLOR, "-bordercolor", NULL, - Tk_Offset(FieldStruct, border_color), 0, RADAR_DRAW_FLAG, False }, - { RADAR_CONFIG_COLOR, "-color", NULL, - Tk_Offset(FieldStruct, color), 0, RADAR_DRAW_FLAG, False }, - { RADAR_CONFIG_BOOL, "-filled", NULL, - Tk_Offset(FieldStruct, flags), FILLED_BIT, RADAR_COORDS_FLAG, False }, - { RADAR_CONFIG_PATTERN, "-fillpattern", NULL, - Tk_Offset(FieldStruct, fill_pattern), 0, RADAR_DRAW_FLAG, False }, - { RADAR_CONFIG_FONT, "-font", NULL, - Tk_Offset(FieldStruct, font), 0, RADAR_DRAW_FLAG|RADAR_CLFC_FLAG, False }, - { RADAR_CONFIG_IMAGE, "-image", NULL, + ZN_DRAW_FLAG|ZN_BORDER_FLAG, False }, + { ZN_CONFIG_BORDER, "-border", NULL, + Tk_Offset(FieldStruct, border_edges), 0, ZN_COORDS_FLAG, False }, + { ZN_CONFIG_COLOR, "-bordercolor", NULL, + Tk_Offset(FieldStruct, border_color), 0, ZN_DRAW_FLAG, False }, + { ZN_CONFIG_COLOR, "-color", NULL, + Tk_Offset(FieldStruct, color), 0, ZN_DRAW_FLAG, False }, + { ZN_CONFIG_BOOL, "-filled", NULL, + Tk_Offset(FieldStruct, flags), FILLED_BIT, ZN_COORDS_FLAG, False }, + { ZN_CONFIG_PATTERN, "-fillpattern", NULL, + Tk_Offset(FieldStruct, fill_pattern), 0, ZN_DRAW_FLAG, False }, + { ZN_CONFIG_FONT, "-font", NULL, + Tk_Offset(FieldStruct, font), 0, ZN_DRAW_FLAG|ZN_CLFC_FLAG, False }, + { ZN_CONFIG_IMAGE, "-image", NULL, Tk_Offset(FieldStruct, image_name), 0, - RADAR_COORDS_FLAG|RADAR_IMAGE_FLAG|RADAR_CLFC_FLAG, False }, - { RADAR_CONFIG_RELIEF, "-relief", NULL, - Tk_Offset(FieldStruct, relief), 0, RADAR_COORDS_FLAG, False }, - { RADAR_CONFIG_DIM, "-reliefthickness", NULL, - Tk_Offset(FieldStruct, relief_thickness), 0, RADAR_DRAW_FLAG, False }, - { RADAR_CONFIG_BOOL, "-sensitive", NULL, - Tk_Offset(FieldStruct, flags), FIELD_SENSITIVE_BIT, RADAR_REPICK_FLAG, False }, - { RADAR_CONFIG_TEXT, "-text", NULL, - Tk_Offset(FieldStruct, text), 0, RADAR_COORDS_FLAG, False }, - { RADAR_CONFIG_IMAGE, "-tile", NULL, + ZN_COORDS_FLAG|ZN_IMAGE_FLAG|ZN_CLFC_FLAG, False }, + { ZN_CONFIG_RELIEF, "-relief", NULL, + Tk_Offset(FieldStruct, relief), 0, ZN_COORDS_FLAG, False }, + { ZN_CONFIG_DIM, "-reliefthickness", NULL, + Tk_Offset(FieldStruct, relief_thickness), 0, ZN_DRAW_FLAG, False }, + { ZN_CONFIG_BOOL, "-sensitive", NULL, + Tk_Offset(FieldStruct, flags), FIELD_SENSITIVE_BIT, ZN_REPICK_FLAG, False }, + { ZN_CONFIG_TEXT, "-text", NULL, + Tk_Offset(FieldStruct, text), 0, ZN_COORDS_FLAG, False }, + { ZN_CONFIG_IMAGE, "-tile", NULL, Tk_Offset(FieldStruct, tile_name), 0, - RADAR_COORDS_FLAG|RADAR_TILE_FLAG|RADAR_CLFC_FLAG, False }, - { RADAR_CONFIG_BOOL, "-visible", NULL, + ZN_COORDS_FLAG|ZN_TILE_FLAG|ZN_CLFC_FLAG, False }, + { ZN_CONFIG_BOOL, "-visible", NULL, Tk_Offset(FieldStruct, flags), FIELD_VISIBLE_BIT, - RADAR_COORDS_FLAG|RADAR_CLFC_FLAG, False }, /* Keep RADAR_COORDS_FLAG here */ + ZN_COORDS_FLAG|ZN_CLFC_FLAG, False }, /* Keep ZN_COORDS_FLAG here */ - { RADAR_CONFIG_END, NULL, NULL, 0, 0, 0 } + { ZN_CONFIG_END, NULL, NULL, 0, 0, 0 } }; /* @@ -184,13 +184,13 @@ static char *attribute_type_strings[] = { * ********************************************************************************** */ -static void Damage(WidgetInfo *wi, RadarBBox *damage); +static void Damage(WidgetInfo *wi, ZnBBox *damage); static void Invalidate(Item item, int reason); static int ConfigureField(FieldSet field_set, unsigned int field, - int argc, RadarAttrList argv, int *flags); + int argc, ZnAttrList argv, int *flags); static int QueryField(FieldSet field_set, unsigned int field, - int argc, RadarAttrList argv); -static Arg AttributeToString(WidgetInfo *wi, char *record, RadarAttrConfig *desc, + int argc, ZnAttrList argv); +static Arg AttributeToString(WidgetInfo *wi, char *record, ZnAttrConfig *desc, char *buffer, Tcl_FreeProc **free_proc); static void FieldImageChange(ClientData client_data, int x, int y, int width, int height, int image_width, int image_height); @@ -206,13 +206,13 @@ static void FieldTileChange(ClientData client_data, int x, int y, int width, ********************************************************************************** */ static void -InitAttrDesc(RadarAttrConfig *attr_desc) +InitAttrDesc(ZnAttrConfig *attr_desc) { if (!attr_desc) { return; } - while (attr_desc->type != RADAR_CONFIG_END) { + while (attr_desc->type != ZN_CONFIG_END) { attr_desc->uid = Tk_GetUid(attr_desc->name); attr_desc++; } @@ -232,18 +232,18 @@ AttributesInfo(Item item, int argc, Arg *args) { - WidgetInfo *wi = item->wi; - char *record; - RadarAttrConfig *desc; - Tk_Uid attr_uid = NULL; + WidgetInfo *wi = item->wi; + char *record; + ZnAttrConfig *desc; + Tk_Uid attr_uid = NULL; #ifndef PTK - Arg entries[5]; + Arg entries[5]; #else - Arg *entries; + Arg *entries; #endif - Arg result; - char buffer[256]; - Tcl_FreeProc *free_proc; + Arg result; + char buffer[256]; + Tcl_FreeProc *free_proc; if (field < 0) { record = (char *) item; @@ -254,12 +254,12 @@ AttributesInfo(Item item, if (!item->class->has_fields) { Tcl_AppendResult(wi->interp, "item class \"", item->class->name, "\" doesn't support fields", NULL); - return RADAR_ERROR; + return ZN_ERROR; } field_set = item->class->GetFieldSet(item); if (field >= field_set->num_fields) { Tcl_AppendResult(wi->interp, "invalid field index \"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } record = (char *) &field_set->fields[field]; desc = field_attrs; @@ -269,10 +269,10 @@ AttributesInfo(Item item, attr_uid = Tk_GetUid(LangString(args[0])); while (True) { - if (desc->type == RADAR_CONFIG_END) { + if (desc->type == ZN_CONFIG_END) { Tcl_AppendResult(wi->interp, "unknown attribute \"", LangString(args[0]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } else if (attr_uid == desc->uid) { break; @@ -294,7 +294,7 @@ AttributesInfo(Item item, result = Tcl_Merge(5, entries); #ifndef PTK if (free_proc == TCL_DYNAMIC) { - RadarFree(entries[4]); + ZnFree(entries[4]); } Tcl_SetResult(wi->interp, result, TCL_DYNAMIC); #else @@ -303,7 +303,7 @@ AttributesInfo(Item item, #endif } else { - while (desc->type != RADAR_CONFIG_END) { + while (desc->type != ZN_CONFIG_END) { #ifdef PTK entries = LangAllocVec(5); LangSetInt(&entries[2], desc->read_only ? 1 : 0); @@ -317,10 +317,10 @@ AttributesInfo(Item item, result = Tcl_Merge(5, entries); #ifndef PTK if (free_proc == TCL_DYNAMIC) { - RadarFree(entries[4]); + ZnFree(entries[4]); } Tcl_AppendElement(wi->interp, result); - RadarFree(result); + ZnFree(result); #else LangFreeVec(5, entries); Tcl_AppendArg(wi->interp, result); @@ -347,14 +347,14 @@ ConfigureAttributes(char *record, Arg *args, int *flags) { - WidgetInfo *wi; - Item item = NULL; - int i; - Tk_Uid attr_uid; - RadarAttrConfig *desc; - RadarPtr valp; - RadarAttrConfig *attr_desc; - FieldSet field_set = NULL; + WidgetInfo *wi; + Item item = NULL; + int i; + Tk_Uid attr_uid; + ZnAttrConfig *desc; + ZnPtr valp; + ZnAttrConfig *attr_desc; + FieldSet field_set = NULL; if (field < 0) { @@ -367,7 +367,7 @@ ConfigureAttributes(char *record, wi = field_set->wi; if (field >= field_set->num_fields) { Tcl_AppendResult(wi->interp, "invalid field index \"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } record = (char *) &field_set->fields[field]; /*printf("record <0x%X>, field %d\n", record, field);*/ @@ -379,51 +379,51 @@ ConfigureAttributes(char *record, desc = attr_desc; while (True) { - if (desc->type == RADAR_CONFIG_END) { + if (desc->type == ZN_CONFIG_END) { /*printf("ERROR: record <0x%X>\n", record);*/ Tcl_AppendResult(wi->interp, "unknown attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } else if (attr_uid == desc->uid) { if (desc->read_only) { Tcl_AppendResult(wi->interp, "attribute \"", LangString(args[i]), "\" can only be read", NULL); - return RADAR_ERROR; + return ZN_ERROR; } valp = record + desc->offset; /*printf("record <0x%X>, valp <0x%X>, offset %d\n", record, valp, desc->offset);*/ switch (desc->type) { - case RADAR_CONFIG_COLOR: + case ZN_CONFIG_COLOR: { XColor *color; Tk_Uid new_name = Tk_GetUid(LangString(args[i+1])); char *name = NULL; if (*((XColor **) valp)) { - name = RadarNameOfColor(*((XColor **) valp)); + name = ZnNameOfColor(*((XColor **) valp)); } if (name != new_name) { - color = RadarGetColor(wi->interp, wi->win, new_name); + color = ZnGetColor(wi->interp, wi->win, new_name); if (!color) { Tcl_AppendResult(wi->interp, " color expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (*((XColor **) valp)) { - RadarFreeColor(*((XColor **) valp)); + ZnFreeColor(*((XColor **) valp)); } *((XColor **) valp) = color; *flags |= desc->flags; } break; } - case RADAR_CONFIG_BOOL: + case ZN_CONFIG_BOOL: { int b; - if (Tcl_GetBoolean(wi->interp, args[i+1], &b) != RADAR_OK) { + if (Tcl_GetBoolean(wi->interp, args[i+1], &b) != ZN_OK) { Tcl_AppendResult(wi->interp, " boolean expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (b ^ (ISSET(*((char *) valp), desc->bool_bit) != 0)) { ASSIGN(*((char *) valp), desc->bool_bit, b); @@ -431,11 +431,11 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_PATTERN: + case ZN_CONFIG_PATTERN: { - Pixmap pattern = RadarUnspecifiedPattern; + Pixmap pattern = ZnUnspecifiedPattern; char *name = ""; - if (*((Pixmap *) valp) != RadarUnspecifiedPattern) { + if (*((Pixmap *) valp) != ZnUnspecifiedPattern) { name = Tk_NameOfBitmap(wi->dpy, *((Pixmap *) valp)); } if (strcmp(name, LangString(args[i+1])) != 0) { @@ -444,10 +444,10 @@ ConfigureAttributes(char *record, if (pattern == None) { Tcl_AppendResult(wi->interp, " pattern expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } } - if (*((Pixmap *) valp) != RadarUnspecifiedPattern) { + if (*((Pixmap *) valp) != ZnUnspecifiedPattern) { Tk_FreeBitmap(wi->dpy, *((Pixmap *) valp)); } *((Pixmap *) valp) = pattern; @@ -455,19 +455,19 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_PATTERNS: + case ZN_CONFIG_PATTERNS: { - RadarList new_pat_list = NULL; - Pixmap *pats; - int num_pats, result, j; - Arg *elems; + ZnList new_pat_list = NULL; + Pixmap *pats; + int num_pats, result, j; + Arg *elems; #ifdef PTK LangFreeProc *freeProc = NULL; #endif if (strlen(LangString(args[i+1])) != 0) { result = Lang_SplitList(wi->interp, args[i+1], &num_pats, &elems, &freeProc); - if (result == RADAR_ERROR) { + if (result == ZN_ERROR) { Tcl_AppendResult(wi->interp, " pattern list expected for attribute \"", LangString(args[i]), "\"", NULL); @@ -476,12 +476,12 @@ ConfigureAttributes(char *record, (*freeProc)(num_pats, elems); } #endif - return RADAR_ERROR; + return ZN_ERROR; } if (num_pats) { - new_pat_list = RadarListNew(num_pats, sizeof(Pixmap)); - RadarListAssertSize(new_pat_list, num_pats); - pats = (Pixmap *) RadarListArray(new_pat_list); + new_pat_list = ZnListNew(num_pats, sizeof(Pixmap)); + ZnListAssertSize(new_pat_list, num_pats); + pats = (Pixmap *) ZnListArray(new_pat_list); for (j = 0; j < num_pats; j++) { if (strlen(LangString(elems[j])) != 0) { pats[j] = Tk_GetBitmap(wi->interp, wi->win, @@ -490,55 +490,55 @@ ConfigureAttributes(char *record, Tcl_AppendResult(wi->interp, " unknown pattern \"", LangString(elems[j]), "\" in pattern list", NULL); - RadarListFree(new_pat_list); + ZnListFree(new_pat_list); #ifndef PTK - RadarFree(elems); + ZnFree(elems); #else if (freeProc) { (*freeProc)(num_pats, elems); } #endif - return RADAR_ERROR; + return ZN_ERROR; } } else { - pats[j] = RadarUnspecifiedPattern; + pats[j] = ZnUnspecifiedPattern; } } } - RadarFree(elems); + ZnFree(elems); } - if (*((RadarList *) valp)) { - num_pats = RadarListSize(*((RadarList *) valp)); - pats = (Pixmap *) RadarListArray(*((RadarList *) valp)); + if (*((ZnList *) valp)) { + num_pats = ZnListSize(*((ZnList *) valp)); + pats = (Pixmap *) ZnListArray(*((ZnList *) valp)); for (j = 0; j < num_pats; j++) { - if (pats[j] != RadarUnspecifiedPattern) { + if (pats[j] != ZnUnspecifiedPattern) { Tk_FreeBitmap(wi->dpy, pats[j]); } } - RadarListFree(*((RadarList *) valp)); - *((RadarList *) valp) = new_pat_list; + ZnListFree(*((ZnList *) valp)); + *((ZnList *) valp) = new_pat_list; *flags |= desc->flags; } else { if (new_pat_list) { - *((RadarList *) valp) = new_pat_list; + *((ZnList *) valp) = new_pat_list; *flags |= desc->flags; } } break; } - case RADAR_CONFIG_TAGS: + case ZN_CONFIG_TAGS: { - int num_tags, result, j; - Arg *elems; + int num_tags, result, j; + Arg *elems; #ifdef PTK LangFreeProc *freeProc = NULL; #endif if (strlen(LangString(args[i+1])) != 0) { result = Lang_SplitList(wi->interp, args[i+1], &num_tags, &elems, &freeProc); - if (result == RADAR_ERROR) { + if (result == ZN_ERROR) { Tcl_AppendResult(wi->interp, " tag list expected for attribute \"", LangString(args[i]), "\"", NULL); @@ -547,9 +547,9 @@ ConfigureAttributes(char *record, (*freeProc)(num_tags, elems); } #endif - return RADAR_ERROR; + return ZN_ERROR; } - if (*((RadarList *) valp)) { + if (*((ZnList *) valp)) { ITEM.FreeTags(item); *flags |= desc->flags; } @@ -560,7 +560,7 @@ ConfigureAttributes(char *record, *flags |= desc->flags; } #ifndef PTK - RadarFree(elems); + ZnFree(elems); #else if (freeProc) { (*freeProc)(num_tags, elems); @@ -569,25 +569,25 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_TEXT: - case RADAR_CONFIG_MAP_INFO: - case RADAR_CONFIG_IMAGE: + case ZN_CONFIG_TEXT: + case ZN_CONFIG_MAP_INFO: + case ZN_CONFIG_IMAGE: { char *text = ""; if (strcmp(LangString(args[i+1]), *((char **) valp)) != 0) { if (strlen(LangString(args[i+1])) != 0) { - text = (char *) RadarMalloc(strlen(LangString(args[i+1]))+1); + text = (char *) ZnMalloc(strlen(LangString(args[i+1]))+1); strcpy(text, LangString(args[i+1])); } if (strlen(*((char **) valp)) != 0) { - RadarFree(*((char **) valp)); + ZnFree(*((char **) valp)); } *((char **) valp) = text; *flags |= desc->flags; } break; } - case RADAR_CONFIG_FONT: + case ZN_CONFIG_FONT: { Tk_Font font; char *name = ""; @@ -599,7 +599,7 @@ ConfigureAttributes(char *record, if (!font) { Tcl_AppendResult(wi->interp, " font expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (*((Tk_Font *) valp)) { Tk_FreeFont(*((Tk_Font *) valp)); @@ -609,17 +609,17 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_BORDER: + case ZN_CONFIG_BORDER: { Border border = NO_BORDER; - int j, len, largc, result; - Arg *largv; + int j, len, largc, result; + Arg *largv; #ifdef PTK LangFreeProc *freeProc = NULL; #endif result = Lang_SplitList(wi->interp, args[i+1], &largc, &largv, &freeProc); - if (result == RADAR_ERROR) { + if (result == ZN_ERROR) { border_error: Tcl_AppendResult(wi->interp, " border expected for attribute \"", LangString(args[i]), "\"", NULL); @@ -628,7 +628,7 @@ ConfigureAttributes(char *record, (*freeProc)(largc, largv); } #endif - return RADAR_ERROR; + return ZN_ERROR; } len = strlen(LangString(args[i+1])); for (j = 0; j < largc; j++) { @@ -658,13 +658,13 @@ ConfigureAttributes(char *record, } else { #ifndef PTK - RadarFree(largv); + ZnFree(largv); #endif goto border_error; } } #ifndef PTK - RadarFree(largv); + ZnFree(largv); #else if (largv != NULL && freeProc) { (*freeProc)(largc, largv); @@ -676,7 +676,7 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_LINE_SHAPE: + case ZN_CONFIG_LINE_SHAPE: { LineShape line_shape; int len; @@ -705,7 +705,7 @@ ConfigureAttributes(char *record, else { Tcl_AppendResult(wi->interp, " line shape expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (line_shape != *((LineShape *) valp)) { *((LineShape *) valp) = line_shape; @@ -713,7 +713,7 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_LINE_STYLE: + case ZN_CONFIG_LINE_STYLE: { LineStyle line_style; int len; @@ -729,7 +729,7 @@ ConfigureAttributes(char *record, else { Tcl_AppendResult(wi->interp, " line style expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (line_style != *((LineStyle *) valp)) { *((LineStyle *) valp) = line_style; @@ -737,14 +737,14 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_LINE_END: + case ZN_CONFIG_LINE_END: { LineEnd line_end = NULL; char *ptr = LangString(args[i+1]); if (strlen(ptr) != 0) { line_end = LineEndCreate(wi->interp, LangString(args[i+1])); if (line_end == NULL) { - return RADAR_ERROR; + return ZN_ERROR; } } if (*((LineEnd *) valp) != NULL) { @@ -760,13 +760,13 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_RELIEF: + case ZN_CONFIG_RELIEF: { int relief; - if (Tk_GetRelief(wi->interp, LangString(args[i+1]), &relief) == RADAR_ERROR) { + if (Tk_GetRelief(wi->interp, LangString(args[i+1]), &relief) == ZN_ERROR) { Tcl_AppendResult(wi->interp, " relief expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (relief != *((ReliefStyle *) valp)) { /*printf("valp <0x%X>, flags <0x%X>, relief %d\n", valp, flags, relief);*/ @@ -775,13 +775,13 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_JOIN_STYLE: + case ZN_CONFIG_JOIN_STYLE: { int join; - if (Tk_GetJoinStyle(wi->interp, LangString(args[i+1]), &join) == RADAR_ERROR) { + if (Tk_GetJoinStyle(wi->interp, LangString(args[i+1]), &join) == ZN_ERROR) { Tcl_AppendResult(wi->interp, " join expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (join != *((int *) valp)) { *((int *) valp) = join; @@ -789,13 +789,13 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_CAP_STYLE: + case ZN_CONFIG_CAP_STYLE: { int cap; - if (Tk_GetCapStyle(wi->interp, LangString(args[i+1]), &cap) == RADAR_ERROR) { + if (Tk_GetCapStyle(wi->interp, LangString(args[i+1]), &cap) == ZN_ERROR) { Tcl_AppendResult(wi->interp, " cap expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (cap != *((int *) valp)) { *((int *) valp) = cap; @@ -803,17 +803,17 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_POINT: + case ZN_CONFIG_POINT: { - RadarPoint point; - int largc, result; - Arg *largv; + ZnPoint point; + int largc, result; + Arg *largv; #ifdef PTK - LangFreeProc *freeProc = NULL; + LangFreeProc *freeProc = NULL; #endif result = Lang_SplitList(wi->interp, args[i+1], &largc, &largv, &freeProc); - if (result == RADAR_ERROR || largc != 2) { + if (result == ZN_ERROR || largc != 2) { point_error: #ifdef PTK if (largv != NULL && freeProc) { @@ -822,40 +822,40 @@ ConfigureAttributes(char *record, #endif Tcl_AppendResult(wi->interp, " position expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } - if ((Tcl_GetDouble(wi->interp, largv[0], &point.x) == RADAR_ERROR) || - (Tcl_GetDouble(wi->interp, largv[1], &point.y) == RADAR_ERROR)) { + if ((Tcl_GetDouble(wi->interp, largv[0], &point.x) == ZN_ERROR) || + (Tcl_GetDouble(wi->interp, largv[1], &point.y) == ZN_ERROR)) { #ifndef PTK - RadarFree(largv); + ZnFree(largv); #endif goto point_error; } #ifndef PTK - RadarFree(largv); + ZnFree(largv); #else if (largv != NULL && freeProc) { (*freeProc)(largc, largv); } #endif - if ((point.x != ((RadarPoint *) valp)->x) || - (point.y != ((RadarPoint *) valp)->y)) { - *((RadarPoint *) valp) = point; + if ((point.x != ((ZnPoint *) valp)->x) || + (point.y != ((ZnPoint *) valp)->y)) { + *((ZnPoint *) valp) = point; *flags |= desc->flags; } break; } - case RADAR_CONFIG_RECT: + case ZN_CONFIG_RECT: { - RadarRect rect; - int largc, result; - Arg *largv; + ZnRect rect; + int largc, result; + Arg *largv; #ifdef PTK LangFreeProc *freeProc = NULL; #endif result = Lang_SplitList(wi->interp, args[i+1], &largc, &largv, &freeProc); - if (result == RADAR_ERROR || largc != 4) { + if (result == ZN_ERROR || largc != 4) { rect_error: #ifdef PTK if (largv != NULL && freeProc) { @@ -864,40 +864,40 @@ ConfigureAttributes(char *record, #endif Tcl_AppendResult(wi->interp, " rectangle expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } - if ((Tcl_GetDouble(wi->interp, largv[0], &rect.x) == RADAR_ERROR) || - (Tcl_GetDouble(wi->interp, largv[1], &rect.y) == RADAR_ERROR) || - (Tcl_GetDouble(wi->interp, largv[2], &rect.w) == RADAR_ERROR) || - (Tcl_GetDouble(wi->interp, largv[3], &rect.h) == RADAR_ERROR)) { + if ((Tcl_GetDouble(wi->interp, largv[0], &rect.x) == ZN_ERROR) || + (Tcl_GetDouble(wi->interp, largv[1], &rect.y) == ZN_ERROR) || + (Tcl_GetDouble(wi->interp, largv[2], &rect.w) == ZN_ERROR) || + (Tcl_GetDouble(wi->interp, largv[3], &rect.h) == ZN_ERROR)) { #ifndef PTK - RadarFree(largv); + ZnFree(largv); #endif goto rect_error; } #ifndef PTK - RadarFree(largv); + ZnFree(largv); #else if (largv != NULL && freeProc) { (*freeProc)(largc, largv); } #endif - if ((rect.x != ((RadarRect *) valp)->x) && - (rect.y != ((RadarRect *) valp)->y) && - (rect.w != ((RadarRect *) valp)->w) && - (rect.h != ((RadarRect *) valp)->h)) { - *((RadarRect *) valp) = rect; + if ((rect.x != ((ZnRect *) valp)->x) && + (rect.y != ((ZnRect *) valp)->y) && + (rect.w != ((ZnRect *) valp)->w) && + (rect.h != ((ZnRect *) valp)->h)) { + *((ZnRect *) valp) = rect; *flags |= desc->flags; } break; } - case RADAR_CONFIG_DIM: + case ZN_CONFIG_DIM: { int size; - if (Tk_GetPixels(wi->interp, wi->win, LangString(args[i+1]), &size) == RADAR_ERROR) { + if (Tk_GetPixels(wi->interp, wi->win, LangString(args[i+1]), &size) == ZN_ERROR) { Tcl_AppendResult(wi->interp, " dimension expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (size != *((int *) valp)) { *((int *) valp) = size; @@ -905,25 +905,25 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_PRI: + case ZN_CONFIG_PRI: { int pri; - if (Tcl_GetInt(wi->interp, args[i+1], &pri) == RADAR_ERROR) { - return RADAR_ERROR; + if (Tcl_GetInt(wi->interp, args[i+1], &pri) == ZN_ERROR) { + return ZN_ERROR; } if (pri < 0) { Tcl_AppendResult(wi->interp, " priority must be a positive integer \"", LangString(args[i+1]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if (pri != *((int *) valp)) { *((int *) valp) = pri; - ITEM.UpdateItemPriority((Item) record, RADAR_NO_ITEM, True); + ITEM.UpdateItemPriority((Item) record, ZN_NO_ITEM, True); *flags |= desc->flags; } break; } - case RADAR_CONFIG_ITEM: + case ZN_CONFIG_ITEM: /* * Can be an item id or a tag. In this last case * consider only the first item (unspecified order) @@ -933,12 +933,12 @@ ConfigureAttributes(char *record, Item item2; int num; if (strlen(LangString(args[i+1])) == 0) { - item2 = RADAR_NO_ITEM; + item2 = ZN_NO_ITEM; } else { - num = RadarItemsWithTagOrId(wi, LangString(args[i+1]), &item2, NULL); + num = ZnItemsWithTagOrId(wi, LangString(args[i+1]), &item2, NULL); if (num == 0) { - return RADAR_ERROR; + return ZN_ERROR; } } if (item2 != *((Item *) valp)) { @@ -947,26 +947,26 @@ ConfigureAttributes(char *record, } } break; - case RADAR_CONFIG_INT: - case RADAR_CONFIG_UINT: - case RADAR_CONFIG_ANGLE: + case ZN_CONFIG_INT: + case ZN_CONFIG_UINT: + case ZN_CONFIG_ANGLE: { int integer; - if (Tcl_GetInt(wi->interp, args[i+1], &integer) == RADAR_ERROR) { - return RADAR_ERROR; + if (Tcl_GetInt(wi->interp, args[i+1], &integer) == ZN_ERROR) { + return ZN_ERROR; } - if (desc->type == RADAR_CONFIG_ANGLE) { + if (desc->type == ZN_CONFIG_ANGLE) { if ((integer < 0) || (integer > 360)) { Tcl_AppendResult(wi->interp, " angle must be between 0 and 360 \"", LangString(args[i+1]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } } - else if (desc->type == RADAR_CONFIG_UINT) { + else if (desc->type == ZN_CONFIG_UINT) { if (integer < 0) { Tcl_AppendResult(wi->interp, " positive integer expected for \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } } if (integer != *((int *) valp)) { @@ -975,35 +975,35 @@ ConfigureAttributes(char *record, } break; } - case RADAR_CONFIG_JUSTIFY: + case ZN_CONFIG_JUSTIFY: { Tk_Justify justify; - if (Tk_GetJustify(wi->interp, LangString(args[i+1]), &justify) == RADAR_ERROR) { + if (Tk_GetJustify(wi->interp, LangString(args[i+1]), &justify) == ZN_ERROR) { Tcl_AppendResult(wi->interp, " justify expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } - if (justify != *((RadarJustify *) valp)) { - *((RadarJustify *) valp) = justify; + if (justify != *((ZnJustify *) valp)) { + *((ZnJustify *) valp) = justify; *flags |= desc->flags; } break; } - case RADAR_CONFIG_ANCHOR: + case ZN_CONFIG_ANCHOR: { Tk_Anchor anchor; - if (Tk_GetAnchor(wi->interp, LangString(args[i+1]), &anchor) == RADAR_ERROR) { + if (Tk_GetAnchor(wi->interp, LangString(args[i+1]), &anchor) == ZN_ERROR) { Tcl_AppendResult(wi->interp, " anchor expected for attribute \"", LangString(args[i]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } - if (anchor != *((RadarAnchor *) valp)) { - *((RadarAnchor *) valp) = anchor; + if (anchor != *((ZnAnchor *) valp)) { + *((ZnAnchor *) valp) = anchor; *flags |= desc->flags; } break; } - case RADAR_CONFIG_LABEL_FORMAT: + case ZN_CONFIG_LABEL_FORMAT: { LabelFormat frmt = NULL; char *ptr = LangString(args[i+1]); @@ -1015,7 +1015,7 @@ ConfigureAttributes(char *record, frmt = LabelFormatCreate(wi->interp, ptr, item->class->GetFieldSet(item)->num_fields); if (frmt == NULL) { - return RADAR_ERROR; + return ZN_ERROR; } } @@ -1033,7 +1033,7 @@ ConfigureAttributes(char *record, break; } - case RADAR_CONFIG_AUTO_JUSTIFY: + case ZN_CONFIG_AUTO_JUSTIFY: { AutoAlign aa; int j; @@ -1046,27 +1046,27 @@ ConfigureAttributes(char *record, switch(LangString(args[i+1])[j]) { case 'l': case 'L': - aa.align[j] = RadarJustifyLeft; + aa.align[j] = ZnJustifyLeft; break; case 'c': case 'C': - aa.align[j] = RadarJustifyCenter; + aa.align[j] = ZnJustifyCenter; break; case 'r': case 'R': - aa.align[j] = RadarJustifyRight; + aa.align[j] = ZnJustifyRight; break; default: Tcl_AppendResult(wi->interp, "invalid auto justify specifcation \"", LangString(args[i+1]), "\" should be - or a triple of lcr", NULL); - return RADAR_ERROR; + return ZN_ERROR; } } } else { Tcl_AppendResult(wi->interp, "invalid auto alignment specification \"", LangString(args[i+1]), "\" should be - or a triple of lcr", NULL); - return RADAR_ERROR; + return ZN_ERROR; } if ((aa.automatic != ((AutoAlign *) valp)->automatic) || (aa.align[0] != ((AutoAlign *) valp)->align[0]) || @@ -1078,7 +1078,7 @@ ConfigureAttributes(char *record, break; } - case RADAR_CONFIG_LEADER_ANCHORS: + case ZN_CONFIG_LEADER_ANCHORS: /* * Format is: lChar leftLeaderAnchor [ lChar rightLeaderAnchor] * @@ -1111,7 +1111,7 @@ ConfigureAttributes(char *record, la_error: Tcl_AppendResult(wi->interp, " incorrect leader anchors \"", LangString(args[i+1]), "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } anchors[anchor_index+1] = -1; break; @@ -1142,7 +1142,7 @@ ConfigureAttributes(char *record, * If empty, pick the default (center of the bounding box). */ if (anchor_index != 0) { - lanch = (LeaderAnchors ) RadarMalloc(sizeof(LeaderAnchorsStruct)); + lanch = (LeaderAnchors ) ZnMalloc(sizeof(LeaderAnchorsStruct)); lanch->left_x = anchors[0]; lanch->left_y = anchors[1]; if (anchor_index == 2) { @@ -1155,7 +1155,7 @@ ConfigureAttributes(char *record, } } if (*((LeaderAnchors *) valp) != NULL) { - RadarFree(*((LeaderAnchors *) valp)); + ZnFree(*((LeaderAnchors *) valp)); *((LeaderAnchors *) valp) = lanch; *flags |= desc->flags; } @@ -1175,7 +1175,7 @@ ConfigureAttributes(char *record, } } } - return RADAR_OK; + return ZN_OK; } @@ -1194,7 +1194,7 @@ ConfigureAttributes(char *record, static Arg AttributeToString(WidgetInfo *wi, char *record, - RadarAttrConfig *desc, + ZnAttrConfig *desc, char *buffer, Tcl_FreeProc **free_proc) { @@ -1209,36 +1209,36 @@ AttributeToString(WidgetInfo *wi, *free_proc = TCL_STATIC; switch (desc->type) { - case RADAR_CONFIG_COLOR: + case ZN_CONFIG_COLOR: LangSetString(&result, ""); if (*((XColor **) valp)) { - LangSetString(&result, RadarNameOfColor(*((XColor **) valp))); + LangSetString(&result, ZnNameOfColor(*((XColor **) valp))); } break; - case RADAR_CONFIG_BOOL: + case ZN_CONFIG_BOOL: #ifndef PTK result = ISSET(*((char *) valp), desc->bool_bit) ? "1" : "0"; #else LangSetInt(&result, ISSET(*((char *) valp), desc->bool_bit) ? 1 : 0); #endif break; - case RADAR_CONFIG_PATTERN: + case ZN_CONFIG_PATTERN: LangSetString(&result, ""); if (*((Pixmap *) valp)) { LangSetString(&result, Tk_NameOfBitmap(wi->dpy, *((Pixmap *) valp))); } break; - case RADAR_CONFIG_PATTERNS: + case ZN_CONFIG_PATTERNS: { int num_pats, i; Pixmap *pats; - if (*((RadarList *) valp)) { - pats = (Pixmap *) RadarListArray(*((RadarList *) valp)); - num_pats = RadarListSize(*((RadarList *) valp)); + if (*((ZnList *) valp)) { + pats = (Pixmap *) ZnListArray(*((ZnList *) valp)); + num_pats = ZnListSize(*((ZnList *) valp)); #ifndef PTK if (num_pats > NUM_ELEMS) { - el_ptr = (char **) RadarMalloc(num_pats*sizeof(char *)); + el_ptr = (char **) ZnMalloc(num_pats*sizeof(char *)); } else { el_ptr = elems; @@ -1247,7 +1247,7 @@ AttributeToString(WidgetInfo *wi, el_ptr = LangAllocVec(num_pats); #endif for (i = 0; i < num_pats; i++) { - if (pats[i] != RadarUnspecifiedPattern) { + if (pats[i] != ZnUnspecifiedPattern) { LangSetString(&el_ptr[i], Tk_NameOfBitmap(wi->dpy, pats[i])); } else { @@ -1258,7 +1258,7 @@ AttributeToString(WidgetInfo *wi, *free_proc = TCL_DYNAMIC; #ifndef PTK if (el_ptr != elems) { - RadarFree(el_ptr); + ZnFree(el_ptr); } #else LangFreeVec(num_pats, el_ptr); @@ -1269,17 +1269,17 @@ AttributeToString(WidgetInfo *wi, } break; } - case RADAR_CONFIG_TAGS: + case ZN_CONFIG_TAGS: { int num_tags, i; Tk_Uid *tags; - if (*((RadarList *) valp)) { - tags = (Tk_Uid *) RadarListArray(*((RadarList *) valp)); - num_tags = RadarListSize(*((RadarList *) valp)); + if (*((ZnList *) valp)) { + tags = (Tk_Uid *) ZnListArray(*((ZnList *) valp)); + num_tags = ZnListSize(*((ZnList *) valp)); #ifndef PTK if (num_tags > NUM_ELEMS) { - el_ptr = (char **) RadarMalloc(num_tags*sizeof(char *)); + el_ptr = (char **) ZnMalloc(num_tags*sizeof(char *)); } else { el_ptr = elems; @@ -1294,7 +1294,7 @@ AttributeToString(WidgetInfo *wi, *free_proc = TCL_DYNAMIC; #ifndef PTK if (el_ptr != elems) { - RadarFree(el_ptr); + ZnFree(el_ptr); } #else LangFreeVec(num_tags, el_ptr); @@ -1305,18 +1305,18 @@ AttributeToString(WidgetInfo *wi, } break; } - case RADAR_CONFIG_TEXT: - case RADAR_CONFIG_MAP_INFO: - case RADAR_CONFIG_IMAGE: + case ZN_CONFIG_TEXT: + case ZN_CONFIG_MAP_INFO: + case ZN_CONFIG_IMAGE: LangSetString(&result, *((char **) valp)); break; - case RADAR_CONFIG_FONT: + case ZN_CONFIG_FONT: LangSetString(&result, ""); if (*((Tk_Font *) valp)) { LangSetString(&result, Tk_NameOfFont(*((Tk_Font *) valp))); } break; - case RADAR_CONFIG_BORDER: + case ZN_CONFIG_BORDER: { Border border = *((Border *) valp); if (border == NO_BORDER) { @@ -1366,7 +1366,7 @@ AttributeToString(WidgetInfo *wi, LangSetString(&result, buffer); } break; - case RADAR_CONFIG_LINE_SHAPE: + case ZN_CONFIG_LINE_SHAPE: { LineShape line_shape = *((LineShape *) valp); switch (line_shape) { @@ -1394,7 +1394,7 @@ AttributeToString(WidgetInfo *wi, } break; } - case RADAR_CONFIG_LINE_STYLE: + case ZN_CONFIG_LINE_STYLE: { LineStyle line_style = *((LineStyle *) valp); switch (line_style) { @@ -1413,7 +1413,7 @@ AttributeToString(WidgetInfo *wi, } break; } - case RADAR_CONFIG_LINE_END: + case ZN_CONFIG_LINE_END: { LineEnd line_end = *((LineEnd *) valp); @@ -1425,51 +1425,51 @@ AttributeToString(WidgetInfo *wi, } break; } - case RADAR_CONFIG_RELIEF: + case ZN_CONFIG_RELIEF: LangSetString(&result , Tk_NameOfRelief(*((ReliefStyle *) valp))); break; - case RADAR_CONFIG_JOIN_STYLE: + case ZN_CONFIG_JOIN_STYLE: LangSetString(&result , Tk_NameOfJoinStyle(*((int *) valp))); break; - case RADAR_CONFIG_CAP_STYLE: + case ZN_CONFIG_CAP_STYLE: LangSetString(&result , Tk_NameOfCapStyle(*((int *) valp))); break; - case RADAR_CONFIG_POINT: + case ZN_CONFIG_POINT: { #ifndef PTK *free_proc = TCL_VOLATILE; - sprintf(buffer, "%g %g", ((RadarPoint *) valp)->x, ((RadarPoint *) valp)->y); + sprintf(buffer, "%g %g", ((ZnPoint *) valp)->x, ((ZnPoint *) valp)->y); result = buffer; #else Arg *list = LangAllocVec(2); - LangSetInt(&list[0], ((RadarPoint *) valp)->x); - LangSetInt(&list[1], ((RadarPoint *) valp)->y); + LangSetInt(&list[0], ((ZnPoint *) valp)->x); + LangSetInt(&list[1], ((ZnPoint *) valp)->y); result = Tcl_Merge(2, list); LangFreeVec(2, list); #endif break; } - case RADAR_CONFIG_RECT: + case ZN_CONFIG_RECT: { #ifndef PTK *free_proc = TCL_VOLATILE; sprintf(buffer, "%g %g %g %g", - ((RadarRect *) valp)->x, ((RadarRect *) valp)->y, - ((RadarRect *) valp)->w, ((RadarRect *) valp)->h); + ((ZnRect *) valp)->x, ((ZnRect *) valp)->y, + ((ZnRect *) valp)->w, ((ZnRect *) valp)->h); result = buffer; #else Arg *list = LangAllocVec(4); - LangSetInt(&list[0], ((RadarRect *) valp)->x); - LangSetInt(&list[1], ((RadarRect *) valp)->x); - LangSetInt(&list[2], ((RadarRect *) valp)->w); - LangSetInt(&list[3], ((RadarRect *) valp)->h); + LangSetInt(&list[0], ((ZnRect *) valp)->x); + LangSetInt(&list[1], ((ZnRect *) valp)->x); + LangSetInt(&list[2], ((ZnRect *) valp)->w); + LangSetInt(&list[3], ((ZnRect *) valp)->h); result = Tcl_Merge(4, list); LangFreeVec(4, list); #endif break; } - case RADAR_CONFIG_ITEM: - if (*((Item *) valp) == RADAR_NO_ITEM) { + case ZN_CONFIG_ITEM: + if (*((Item *) valp) == ZN_NO_ITEM) { LangSetString(&result, ""); } else { @@ -1478,25 +1478,25 @@ AttributeToString(WidgetInfo *wi, LangSetString(&result, buffer); } break; - case RADAR_CONFIG_INT: - case RADAR_CONFIG_UINT: - case RADAR_CONFIG_DIM: - case RADAR_CONFIG_PRI: - case RADAR_CONFIG_ANGLE: + case ZN_CONFIG_INT: + case ZN_CONFIG_UINT: + case ZN_CONFIG_DIM: + case ZN_CONFIG_PRI: + case ZN_CONFIG_ANGLE: *free_proc = TCL_VOLATILE; sprintf(buffer, "%d", *((int *) valp)); LangSetString(&result, buffer); break; - case RADAR_CONFIG_JUSTIFY: + case ZN_CONFIG_JUSTIFY: { - Tk_Justify justify = *((RadarJustify *) valp); + Tk_Justify justify = *((ZnJustify *) valp); LangSetString(&result, Tk_NameOfJustify(justify)); break; } - case RADAR_CONFIG_ANCHOR: + case ZN_CONFIG_ANCHOR: LangSetString(&result, Tk_NameOfAnchor(*((Tk_Anchor *) valp))); break; - case RADAR_CONFIG_LABEL_FORMAT: + case ZN_CONFIG_LABEL_FORMAT: { LabelFormat frmt = *((LabelFormat *) valp); @@ -1508,10 +1508,10 @@ AttributeToString(WidgetInfo *wi, } break; } - case RADAR_CONFIG_AUTO_JUSTIFY: + case ZN_CONFIG_AUTO_JUSTIFY: { AutoAlign *aa = (AutoAlign *) valp; - int i; + int i; if (aa->automatic == False) { LangSetString(&result, "-"); } @@ -1520,13 +1520,13 @@ AttributeToString(WidgetInfo *wi, buffer[0] = 0; for (i = 0; i < 3; i++) { switch (aa->align[i]) { - case RadarJustifyLeft: + case ZnJustifyLeft: strcat(buffer, "l"); break; - case RadarJustifyCenter: + case ZnJustifyCenter: strcat(buffer, "c"); break; - case RadarJustifyRight: + case ZnJustifyRight: strcat(buffer, "r"); break; } @@ -1536,7 +1536,7 @@ AttributeToString(WidgetInfo *wi, } break; - case RADAR_CONFIG_LEADER_ANCHORS: + case ZN_CONFIG_LEADER_ANCHORS: { LeaderAnchors lanch = (LeaderAnchors) valp; char *ptr = buffer; @@ -1575,13 +1575,13 @@ QueryAttribute(char *record, int field, /* 0< means item itself. */ Arg attr_name) { - WidgetInfo *wi; - Item item; - Tk_Uid attr_uid = Tk_GetUid(LangString(attr_name)); - Arg result = NULL; - Tcl_FreeProc *free_proc; - char buffer[256]; - RadarAttrConfig *desc; + WidgetInfo *wi; + Item item; + Tk_Uid attr_uid = Tk_GetUid(LangString(attr_name)); + Arg result = NULL; + Tcl_FreeProc *free_proc; + char buffer[256]; + ZnAttrConfig *desc; if (field < 0) { item = (Item) record; @@ -1593,17 +1593,17 @@ QueryAttribute(char *record, wi = field_set->wi; if (field >= field_set->num_fields) { Tcl_AppendResult(wi->interp, "invalid field index \"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } record = (char *) &field_set->fields[field]; desc = field_attrs; } while (True) { - if (desc->type == RADAR_CONFIG_END) { + if (desc->type == ZN_CONFIG_END) { Tcl_AppendResult(wi->interp, "unknown attribute \"", attr_uid, "\"", NULL); - return RADAR_ERROR; + return ZN_ERROR; } else if (attr_uid == desc->uid) { result = AttributeToString(wi, record, desc, buffer, &free_proc); @@ -1618,7 +1618,7 @@ QueryAttribute(char *record, desc++; } } - return RADAR_OK; + return ZN_OK; } @@ -1629,7 +1629,7 @@ QueryAttribute(char *record, * ********************************************************************************** */ -static RadarList +static ZnList ItemClassList() { return item_classes; @@ -1648,8 +1648,8 @@ LookupItemClass(char *class_name) ItemClass *class; int i, num_classes; - class = (ItemClass *) RadarListArray(item_classes); - num_classes = RadarListSize(item_classes); + class = (ItemClass *) ZnListArray(item_classes); + num_classes = ZnListSize(item_classes); for (i = 0; i < num_classes; i++) { if (strcasecmp((class[i])->name, class_name) == 0) { return class[i]; @@ -1670,7 +1670,7 @@ static void AddItemClass(ItemClass class) { if (!LookupItemClass(class->name)) { - RadarListAdd(item_classes, &class, RadarListTail); + ZnListAdd(item_classes, &class, ZnListTail); InitAttrDesc(class->attr_desc); } } @@ -1688,19 +1688,19 @@ GlobalModuleInit() { /* First check if static part already inited */ if (item_classes == NULL) { - item_classes = RadarListNew(16, sizeof(ItemClass)); - AddItemClass(RadarTrack); - AddItemClass(RadarWayPoint); - AddItemClass(RadarMap); - AddItemClass(RadarReticle); - AddItemClass(RadarTabular); - AddItemClass(RadarRectangle); - AddItemClass(RadarArc); - AddItemClass(RadarCurve); - AddItemClass(RadarGroup); - AddItemClass(RadarIcon); - AddItemClass(RadarText); - /*AddItemClass(RadarMosaic);*/ + item_classes = ZnListNew(16, sizeof(ItemClass)); + AddItemClass(ZnTrack); + AddItemClass(ZnWayPoint); + AddItemClass(ZnMap); + AddItemClass(ZnReticle); + AddItemClass(ZnTabular); + AddItemClass(ZnRectangle); + AddItemClass(ZnArc); + AddItemClass(ZnCurve); + AddItemClass(ZnGroup); + AddItemClass(ZnIcon); + AddItemClass(ZnText); + /*AddItemClass(ZnMosaic);*/ InitAttrDesc(field_attrs); } } @@ -1715,13 +1715,13 @@ GlobalModuleInit() ********************************************************************************** */ static void -ComputeFieldAttachment(FieldSet field_set, - int field, - RadarBBox *field_bbox) +ComputeFieldAttachment(FieldSet field_set, + int field, + ZnBBox *field_bbox) { - RadarBBox ref_bbox; - RadarDim real_width, real_height; + ZnBBox ref_bbox; + ZnDim real_width, real_height; int ref_field, num_fields; char x_attach, y_attach, x_dim, y_dim; short width_spec, height_spec; @@ -1731,8 +1731,8 @@ ComputeFieldAttachment(FieldSet field_set, field_ptr = &field_set->fields[field]; if (ISSET(field_ptr->flags, CACHE_OK)) { - field_bbox->orig.x = (RadarPos) field_ptr->orig_x; - field_bbox->orig.y = (RadarPos) field_ptr->orig_y; + field_bbox->orig.x = (ZnPos) field_ptr->orig_x; + field_bbox->orig.y = (ZnPos) field_ptr->orig_y; field_bbox->corner.x = field_ptr->corner_x; field_bbox->corner.y = field_ptr->corner_y; return; @@ -1747,7 +1747,7 @@ ComputeFieldAttachment(FieldSet field_set, * First try to compute the field size which may be a factor * of the field content (but not a factor of other fields). */ - if ((field_ptr->image != RadarUnspecifiedImage) && + if ((field_ptr->image != ZnUnspecifiedImage) && ((x_dim == LF_DIM_ICON) || (y_dim == LF_DIM_ICON) || (x_dim == LF_DIM_AUTO) || (y_dim == LF_DIM_AUTO))) { Tk_SizeOfImage(field_ptr->image, &icon_width, &icon_height); @@ -1755,30 +1755,30 @@ ComputeFieldAttachment(FieldSet field_set, switch (x_dim) { case LF_DIM_FONT: - real_width = (RadarDim) (width_spec*RadarTextWidth(field_ptr->font, "N", 1)/100); + real_width = (ZnDim) (width_spec*ZnTextWidth(field_ptr->font, "N", 1)/100); break; case LF_DIM_ICON: - real_width = (RadarDim) (width_spec*icon_width/100); + real_width = (ZnDim) (width_spec*icon_width/100); break; case LF_DIM_AUTO: { int len = strlen(field_ptr->text); - RadarDim text_width; + ZnDim text_width; real_width = 0.0; - if (field_ptr->image != RadarUnspecifiedImage) { - real_width = (RadarDim) icon_width; + if (field_ptr->image != ZnUnspecifiedImage) { + real_width = (ZnDim) icon_width; } if (len) { - text_width = (RadarDim) RadarTextWidth(field_ptr->font, field_ptr->text, len); + text_width = (ZnDim) ZnTextWidth(field_ptr->font, field_ptr->text, len); real_width = text_width < real_width ? real_width : text_width; } - real_width += (RadarDim) width_spec; + real_width += (ZnDim) width_spec; break; } case LF_DIM_PIXEL: default: - real_width = (RadarDim) width_spec; + real_width = (ZnDim) width_spec; break; } /*printf("field %d, width = %g\n", field, real_width);*/ @@ -1787,31 +1787,31 @@ ComputeFieldAttachment(FieldSet field_set, case LF_DIM_FONT: { Tk_GetFontMetrics(field_ptr->font, &fm); - real_height = (RadarDim) (height_spec*(fm.ascent + fm.descent)/100); + real_height = (ZnDim) (height_spec*(fm.ascent + fm.descent)/100); break; } case LF_DIM_ICON: - real_height = (RadarDim) (height_spec*icon_height/100); + real_height = (ZnDim) (height_spec*icon_height/100); break; case LF_DIM_AUTO: { - RadarDim text_height; + ZnDim text_height; real_height = 0.0; - if (field_ptr->image != RadarUnspecifiedImage) { - real_height = (RadarDim) icon_height; + if (field_ptr->image != ZnUnspecifiedImage) { + real_height = (ZnDim) icon_height; } if (strlen(field_ptr->text)) { Tk_GetFontMetrics(field_ptr->font, &fm); - text_height = (RadarDim) (fm.ascent + fm.descent); + text_height = (ZnDim) (fm.ascent + fm.descent); real_height = text_height < real_height ? real_height : text_height; } - real_height += (RadarDim) height_spec; + real_height += (ZnDim) height_spec; break; } case LF_DIM_PIXEL: default: - real_height = (RadarDim) height_spec; + real_height = (ZnDim) height_spec; break; } /*printf("field %d, height = %g\n", field, real_height);*/ @@ -1833,14 +1833,14 @@ ComputeFieldAttachment(FieldSet field_set, * Do the x axis. */ if (x_attach == LF_ATTACH_PIXEL) { - field_bbox->orig.x = (RadarPos) x_spec; + field_bbox->orig.x = (ZnPos) x_spec; field_bbox->corner.x = field_bbox->orig.x + real_width; } else { ref_field = x_spec; field_bbox->orig.x = field_bbox->corner.x = 0; if ((ref_field < 0) || (ref_field >= num_fields)) { - RadarWarning ("Attached (x) to an inexistant field geometry"); + ZnWarning ("Attached (x) to an inexistant field geometry"); } else { ComputeFieldAttachment(field_set, ref_field, &ref_bbox); @@ -1885,14 +1885,14 @@ ComputeFieldAttachment(FieldSet field_set, * Then the y axis. */ if (y_attach == LF_ATTACH_PIXEL) { - field_bbox->orig.y = (RadarPos) y_spec; + field_bbox->orig.y = (ZnPos) y_spec; field_bbox->corner.y = field_bbox->orig.y + real_height; } else { ref_field = y_spec; field_bbox->orig.y = field_bbox->corner.y = 0; if ((ref_field < 0) || (ref_field >= num_fields)) { - RadarWarning ("Attached (y) to an inexistant field geometry"); + ZnWarning ("Attached (y) to an inexistant field geometry"); } else { ComputeFieldAttachment(field_set, ref_field, &ref_bbox); @@ -1956,7 +1956,7 @@ ClearFieldCache(FieldSet field_set, int field) { int i, num_fields; - RadarBool clear_bbox; + ZnBool clear_bbox; int x_spec, y_spec; char x_attach, y_attach, x_dim, y_dim; short width_spec, height_spec; @@ -2021,13 +2021,13 @@ ClearFieldCache(FieldSet field_set, */ void GetLabelBBox(FieldSet field_set, - RadarDim *w, - RadarDim *h) + ZnDim *w, + ZnDim *h) { - RadarBBox bbox, tmp_bbox; + ZnBBox bbox, tmp_bbox; LabelFormat lf; int i, num_fields; - RadarDim clip_w, clip_h; + ZnDim clip_w, clip_h; if ((field_set->label_width >= 0.0) && (field_set->label_height >= 0.0)) { *w = field_set->label_width; @@ -2081,7 +2081,7 @@ GetLabelBBox(FieldSet field_set, static void GetFieldBBox(FieldSet field_set, unsigned int index, - RadarBBox *field_bbox) + ZnBBox *field_bbox) { if (field_set->label_format) { ComputeFieldAttachment(field_set, index, field_bbox); @@ -2109,28 +2109,28 @@ GetFieldBBox(FieldSet field_set, */ static void ComputeFieldTextLocation(Field field_ptr, - RadarBBox *bbox, - RadarPoint *pos, - RadarBBox *text_bbox) + ZnBBox *bbox, + ZnPoint *pos, + ZnBBox *text_bbox) { - RadarBool relief_thickness; - RadarDim w, h; + ZnBool relief_thickness; + ZnDim w, h; Tk_FontMetrics fm; relief_thickness = (field_ptr->relief != RELIEF_FLAT && field_ptr->relief_thickness > 1) ? field_ptr->relief_thickness : 0; Tk_GetFontMetrics(field_ptr->font, &fm); - w = RadarTextWidth(field_ptr->font, field_ptr->text, strlen(field_ptr->text)); + w = ZnTextWidth(field_ptr->font, field_ptr->text, strlen(field_ptr->text)); h = fm.ascent + fm.descent; text_bbox->orig.y = (bbox->orig.y + bbox->corner.y - h) / 2; text_bbox->corner.y = text_bbox->orig.y + h; pos->y = text_bbox->orig.y + fm.ascent; switch (field_ptr->alignment) { - case RadarJustifyLeft: + case ZnJustifyLeft: text_bbox->orig.x = bbox->orig.x + 1 + relief_thickness; break; - case RadarJustifyRight: + case ZnJustifyRight: text_bbox->orig.x = bbox->corner.x - w - 1 - relief_thickness; break; default: @@ -2152,16 +2152,16 @@ ComputeFieldTextLocation(Field field_ptr, ********************************************************************************** */ static void -LeaderToLabel(FieldSet field_set, - RadarPoint *start, - RadarPoint *end) +LeaderToLabel(FieldSet field_set, + ZnPoint *start, + ZnPoint *end) { int b_num; - RadarPoint delta, inf, sup; - RadarPos xt=0, yu=0, yw=0, xv=0; + ZnPoint delta, inf, sup; + ZnPos xt=0, yu=0, yw=0, xv=0; Field field_ptr; int i; - RadarBBox field_bbox; + ZnBBox field_bbox; /* Intersection points : */ /* T |xt / delta_y U |x1 V |y1 W |yw / delta_x */ @@ -2186,7 +2186,7 @@ LeaderToLabel(FieldSet field_set, ISCLEAR(field_ptr->flags, FILLED_BIT) && (field_ptr->border_edges == NO_BORDER) && (field_ptr->relief == RELIEF_FLAT) && - (field_ptr->image == RadarUnspecifiedImage))) { + (field_ptr->image == ZnUnspecifiedImage))) { continue; } @@ -2204,12 +2204,12 @@ LeaderToLabel(FieldSet field_set, if (*field_ptr->text && ISCLEAR(field_ptr->flags, FILLED_BIT) && (field_ptr->border_edges == NO_BORDER) && (field_ptr->relief == RELIEF_FLAT) && - (field_ptr->image == RadarUnspecifiedImage)) { - RadarBBox text_bbox; - RadarPoint text_pos; /* dummy */ - int space_width; - int scan_forw, scan_back; - space_width = RadarTextWidth(field_ptr->font, " ", 1); + (field_ptr->image == ZnUnspecifiedImage)) { + ZnBBox text_bbox; + ZnPoint text_pos; /* dummy */ + int space_width; + int scan_forw, scan_back; + space_width = ZnTextWidth(field_ptr->font, " ", 1); ComputeFieldTextLocation(field_ptr, &field_bbox, &text_pos, &text_bbox); /* @@ -2338,9 +2338,9 @@ InsertDependentItem(Item item) return; } if (!group->dependents) { - group->dependents = RadarListNew(2, sizeof(Item)); + group->dependents = ZnListNew(2, sizeof(Item)); } - RadarListAdd(group->dependents, &item, RadarListTail); + ZnListAdd(group->dependents, &item, ZnListTail); } @@ -2366,11 +2366,11 @@ ExtractDependentItem(Item item) if (!group || !group->dependents) { return; } - index = RadarListDo(group->dependents, item, CmpItem); + index = ZnListDo(group->dependents, item, CmpItem); if (index >= 0) { - RadarListDelete(group->dependents, index); - if (RadarListSize(group->dependents) == 0) { - RadarListFree(group->dependents); + ZnListDelete(group->dependents, index); + if (ZnListSize(group->dependents) == 0) { + ZnListFree(group->dependents); group->dependents = NULL; } } @@ -2390,11 +2390,11 @@ static void UpdateItemDependency(Item item, Item old_connection) { - if (old_connection == RADAR_NO_ITEM) { + if (old_connection == ZN_NO_ITEM) { /* Add a connection */ InsertDependentItem(item); } - else if (item->connected_item == RADAR_NO_ITEM) { + else if (item->connected_item == ZN_NO_ITEM) { /* Remove a connection */ ExtractDependentItem(item); } @@ -2427,19 +2427,19 @@ DisconnectDependentItems(Item item) if (!group || !group->dependents) { return; } - deps = (Item *) RadarListArray(group->dependents); - num_deps = RadarListSize(group->dependents); + deps = (Item *) ZnListArray(group->dependents); + num_deps = ZnListSize(group->dependents); for (i = num_deps-1; i >= 0; i--) { current_item = deps[i]; if (current_item->connected_item == item) { - current_item->connected_item = RADAR_NO_ITEM; - RadarListDelete(group->dependents, i); - Invalidate(current_item, RADAR_COORDS_FLAG); + current_item->connected_item = ZN_NO_ITEM; + ZnListDelete(group->dependents, i); + Invalidate(current_item, ZN_COORDS_FLAG); } } - if (RadarListSize(group->dependents) == 0) { - RadarListFree(group->dependents); + if (ZnListSize(group->dependents) == 0) { + ZnListFree(group->dependents); group->dependents = NULL; } } @@ -2452,7 +2452,7 @@ DisconnectDependentItems(Item item) * * Insert an item in the display list according to its priority. * It is inserted in front of items of lower or same priority. If - * mark_item is not RADAR_NO_ITEM the insertion is done relative + * mark_item is not ZN_NO_ITEM the insertion is done relative * to this item, before it if 'before' is True, after it otherwise. * mark_item must be in the group 'group'. * @@ -2462,7 +2462,7 @@ static void InsertItem(Item item, Item grp, Item mark_item, - RadarBool before) + ZnBool before) { WidgetInfo *wi = item->wi; GroupItem group = (GroupItem) grp; @@ -2473,19 +2473,19 @@ InsertItem(Item item, item->parent = (Item) group; if (mark_item && (mark_item->parent != (Item) group)) { - mark_item = RADAR_NO_ITEM; + mark_item = ZN_NO_ITEM; } /* * Empty list, add the first item. */ - if (group->head == RADAR_NO_ITEM) { + if (group->head == ZN_NO_ITEM) { group->head = item; group->tail = item; - item->previous = item->next = RADAR_NO_ITEM; + item->previous = item->next = ZN_NO_ITEM; return; } - if (mark_item != RADAR_NO_ITEM) { + if (mark_item != ZN_NO_ITEM) { /* * Better leave here, mark_item will not * have the links set right. @@ -2501,20 +2501,20 @@ InsertItem(Item item, } else { mark_item = group->head; - while ((mark_item != RADAR_NO_ITEM) && + while ((mark_item != ZN_NO_ITEM) && (mark_item->priority > item->priority)) { mark_item = mark_item->next; } before = True; } - if (before && (mark_item != RADAR_NO_ITEM)) { + if (before && (mark_item != ZN_NO_ITEM)) { /* * Insert before mark. */ item->next = mark_item; item->previous = mark_item->previous; - if (mark_item->previous == RADAR_NO_ITEM) { + if (mark_item->previous == ZN_NO_ITEM) { group->head = item; } else { @@ -2526,9 +2526,9 @@ InsertItem(Item item, /* * Insert after mark either because 'before' is False * and mark_item valid or because the right place is at - * the end of the list and mark_item is RADAR_NO_ITEM. + * the end of the list and mark_item is ZN_NO_ITEM. */ - if (mark_item == RADAR_NO_ITEM) { + if (mark_item == ZN_NO_ITEM) { group->tail->next = item; item->previous = group->tail; group->tail = item; @@ -2536,7 +2536,7 @@ InsertItem(Item item, else { item->previous = mark_item; item->next = mark_item->next; - if (item->next == RADAR_NO_ITEM) { + if (item->next == ZN_NO_ITEM) { group->tail = item; } else { @@ -2565,22 +2565,22 @@ ExtractItem(Item item) } group = (GroupItem) item->parent; - if (item->previous != RADAR_NO_ITEM) { + if (item->previous != ZN_NO_ITEM) { item->previous->next = item->next; } else { group->head = item->next; } - if (item->next != RADAR_NO_ITEM) { + if (item->next != ZN_NO_ITEM) { item->next->previous = item->previous; } else { group->tail = item->previous; } - item->previous = RADAR_NO_ITEM; - item->next = RADAR_NO_ITEM; + item->previous = ZN_NO_ITEM; + item->next = ZN_NO_ITEM; item->parent = NULL; } @@ -2597,13 +2597,13 @@ ExtractItem(Item item) static void UpdateItemPriority(Item item, Item mark_item, - RadarBool before) + ZnBool before) { Item parent = item->parent; ExtractItem(item); InsertItem(item, parent, mark_item, before); - Invalidate(item, RADAR_DRAW_FLAG); + Invalidate(item, ZN_DRAW_FLAG); SET(item->wi->events_flags, INTERNAL_NEED_REPICK); } @@ -2665,20 +2665,20 @@ AddTag(Item item, int new_entry, num, i; char **ptr; Tcl_HashEntry *entry; - RadarList item_list; + ZnList item_list; /* * No tags yet. */ if (!item->tags) { - item->tags = RadarListNew(1, sizeof(char *)); + item->tags = ZnListNew(1, sizeof(char *)); } else { /* * If the tag is already there, that's done. */ - ptr = (char **) RadarListArray(item->tags); - num = RadarListSize(item->tags); + ptr = (char **) ZnListArray(item->tags); + num = ZnListSize(item->tags); for (i = 0; i < num; i++) { if (ptr[i] == tag) { return; @@ -2688,16 +2688,16 @@ AddTag(Item item, /* * Add it. */ - RadarListAdd(item->tags, &tag, RadarListTail); + ZnListAdd(item->tags, &tag, ZnListTail); entry = Tcl_CreateHashEntry(item->wi->tag_table, tag, &new_entry); if (new_entry) { - item_list = RadarListNew(1, sizeof(Item)); + item_list = ZnListNew(1, sizeof(Item)); Tcl_SetHashValue(entry, item_list); } else { - item_list = (RadarList) Tcl_GetHashValue(entry); + item_list = (ZnList) Tcl_GetHashValue(entry); } - RadarListAdd(item_list, &item, RadarListTail); + ZnListAdd(item_list, &item, ZnListTail); } /* @@ -2715,7 +2715,7 @@ RemoveTag(Item item, char **ptr; Item *item_ptr; Tcl_HashEntry *entry; - RadarList item_list; + ZnList item_list; if (!item->tags) { return; @@ -2723,24 +2723,24 @@ RemoveTag(Item item, /* * look up the tag in the list. */ - ptr = (char **) RadarListArray(item->tags); - num = RadarListSize(item->tags); + ptr = (char **) ZnListArray(item->tags); + num = ZnListSize(item->tags); for (indx = 0; indx < num; indx++) { if (ptr[indx] == tag) { /* The tag list is not freed when empty to avoid * overhead when using tags intensively. */ - RadarListDelete(item->tags, indx); + ZnListDelete(item->tags, indx); entry = Tcl_FindHashEntry(item->wi->tag_table, tag); if (entry) { /* Should not fail */ - item_list = (RadarList) Tcl_GetHashValue(entry); - num = RadarListSize(item_list); - item_ptr = (Item *) RadarListArray(item_list); + item_list = (ZnList) Tcl_GetHashValue(entry); + num = ZnListSize(item_list); + item_ptr = (Item *) ZnListArray(item_list); for (indx = 0; indx < num; indx++) { if (item_ptr[indx] == item) { /* Should not fail to get here */ - RadarListDelete(item_list, indx); - if (RadarListSize(item_list) == 0) { - RadarListFree(item_list); + ZnListDelete(item_list, indx); + if (ZnListSize(item_list) == 0) { + ZnListFree(item_list); Tcl_DeleteHashEntry(entry); } } @@ -2765,32 +2765,32 @@ FreeTags(Item item) char **ts; Item *item_ptr; Tcl_HashEntry *entry; - RadarList item_list; + ZnList item_list; if (!item->tags) { return; } - num = RadarListSize(item->tags); - ts = (char **) RadarListArray(item->tags); + num = ZnListSize(item->tags); + ts = (char **) ZnListArray(item->tags); for (i = 0; i < num; i++) { entry = Tcl_FindHashEntry(item->wi->tag_table, ts[i]); if (entry) { /* Should not fail */ - item_list = (RadarList) Tcl_GetHashValue(entry); - item_ptr = (Item *) RadarListArray(item_list); - num_items = RadarListSize(item_list); + item_list = (ZnList) Tcl_GetHashValue(entry); + item_ptr = (Item *) ZnListArray(item_list); + num_items = ZnListSize(item_list); for (j = 0; j < num_items; j++) { if (item_ptr[j] == item) { /* Should not fail to get here */ - RadarListDelete(item_list, j); - if (RadarListSize(item_list) == 0) { - RadarListFree(item_list); + ZnListDelete(item_list, j); + if (ZnListSize(item_list) == 0) { + ZnListFree(item_list); Tcl_DeleteHashEntry(entry); } } } } } - RadarListFree(item->tags); + ZnListFree(item->tags); item->tags = NULL; } @@ -2814,28 +2814,28 @@ CreateItem(WidgetInfo *wi, int *argc, Arg **args) { - Item item; + Item item; - item = (Item) RadarMalloc(item_class->item_size); + item = (Item) ZnMalloc(item_class->item_size); /* Initialize common state */ item->class = item_class; item->wi = wi; item->parent = NULL; - item->previous = RADAR_NO_ITEM; - item->next = RADAR_NO_ITEM; + item->previous = ZN_NO_ITEM; + item->next = ZN_NO_ITEM; CLEAR(item->flags, UPDATE_DEPENDENT_BIT); item->inv_flags = 0; item->transfo = NULL; item->parent = NULL; - item->connected_item = RADAR_NO_ITEM; + item->connected_item = ZN_NO_ITEM; ResetBBox(&item->item_bounding_box); /* Init item specific attributes */ - if (item_class->Init(item, argc, args) == RADAR_ERROR) { - RadarFree(item); - return RADAR_NO_ITEM; + if (item_class->Init(item, argc, args) == ZN_ERROR) { + ZnFree(item); + return ZN_NO_ITEM; } SetId(item); item->tags = NULL; @@ -2863,30 +2863,30 @@ CloneItem(Item model) int i, num_tags; if (!model->parent) { - return RADAR_NO_ITEM; + return ZN_NO_ITEM; } - item = (Item) RadarMalloc(model->class->item_size); + item = (Item) ZnMalloc(model->class->item_size); memcpy(item, model, model->class->item_size); - item->previous = RADAR_NO_ITEM; - item->next = RADAR_NO_ITEM; - item->connected_item = RADAR_NO_ITEM; + item->previous = ZN_NO_ITEM; + item->next = ZN_NO_ITEM; + item->connected_item = ZN_NO_ITEM; CLEAR(item->flags, UPDATE_DEPENDENT_BIT); item->inv_flags = 0; SetId(item); if (model->tags) { item->tags = NULL; - tags = (Tk_Uid *) RadarListArray(model->tags); - num_tags = RadarListSize(model->tags); + tags = (Tk_Uid *) ZnListArray(model->tags); + num_tags = ZnListSize(model->tags); for (i = num_tags-1; i >= 0; i--, tags++) { AddTag(item, *tags); } } if (item->transfo) { - item->transfo = RadarTransfoDuplicate(item->transfo); + item->transfo = ZnTransfoDuplicate(item->transfo); } /* Call item's clone duplicate not shared resources */ @@ -2908,32 +2908,32 @@ static int ConfigureItem(Item item, int field, int argc, - RadarAttrList argv, - RadarBool init) + ZnAttrList argv, + ZnBool init) { WidgetInfo *wi = item->wi; int flags; - RadarBool previous_visible = init ? False : ISSET(item->flags, VISIBLE_BIT); + ZnBool previous_visible = init ? False : ISSET(item->flags, VISIBLE_BIT); flags = 0; - ASSIGN(flags, RADAR_COORDS_FLAG, init); + ASSIGN(flags, ZN_COORDS_FLAG, init); if (argv) { if (field < 0){ - if (item->class->Configure(item, argc, argv, &flags) == RADAR_ERROR) { - return RADAR_ERROR; + if (item->class->Configure(item, argc, argv, &flags) == ZN_ERROR) { + return ZN_ERROR; } - if (item->class->has_fields && ISSET(flags, RADAR_CLFC_FLAG)) { + if (item->class->has_fields && ISSET(flags, ZN_CLFC_FLAG)) { ClearFieldCache(item->class->GetFieldSet(item), -1); } } else if (item->class->has_fields) { FieldSet field_set = item->class->GetFieldSet(item); - if (ConfigureField(field_set, field, argc, argv, &flags) == RADAR_ERROR) { - return RADAR_ERROR; + if (ConfigureField(field_set, field, argc, argv, &flags) == ZN_ERROR) { + return ZN_ERROR; } } else { - return RADAR_ERROR; + return ZN_ERROR; } } @@ -2943,12 +2943,12 @@ ConfigureItem(Item item, * just turned out. */ Damage(wi, &item->item_bounding_box); - RadarNeedRedisplay(wi); + ZnNeedRedisplay(wi); } Invalidate(item, flags); - return RADAR_OK; + return ZN_OK; } @@ -2963,7 +2963,7 @@ static int QueryItem(Item item, int field, int argc, - RadarAttrList argv) + ZnAttrList argv) { if (field < 0) { return item->class->Query(item, argc, argv); @@ -2973,7 +2973,7 @@ QueryItem(Item item, return QueryField(field_set, field, argc, argv); } - return RADAR_ERROR; + return ZN_ERROR; } @@ -2986,11 +2986,11 @@ QueryItem(Item item, ********************************************************************************** */ static void -ComposeItemTransform(Item item, - RadarTransfo *current_t, - RadarTransfo *new_t) +ComposeItemTransform(Item item, + ZnTransfo *current_t, + ZnTransfo *new_t) { - RadarBool full; + ZnBool full; full = (ISSET(item->flags, COMPOSE_SCALE_BIT) && ISSET(item->flags, COMPOSE_ROTATION_BIT)); @@ -3003,33 +3003,33 @@ ComposeItemTransform(Item item, /* * Full concatenation. */ - /*printf("Item transfo for item: 0x%X;", item); RadarPrintTransfo(item->transfo);*/ - RadarTransfoCompose(new_t, item->transfo, current_t); + /*printf("Item transfo for item: 0x%X;", item); ZnPrintTransfo(item->transfo);*/ + ZnTransfoCompose(new_t, item->transfo, current_t); } else { - RadarPoint scale, trans, local_scale, local_trans; - RadarReal local_rot, rot; - RadarTransfo t, t2; + ZnPoint scale, trans, local_scale, local_trans; + ZnReal local_rot, rot; + ZnTransfo t, t2; /* * Need to decompose the local transform in translation, * rotation and scale. */ - RadarTransfoSetIdentity(&t); - RadarTransfoSetIdentity(new_t); - RadarTransfoDecompose(item->transfo, &local_scale, &local_trans, &local_rot, NULL); - RadarTranslate(&t, local_trans.x, local_trans.y); - RadarTransfoCompose(&t2, &t, current_t); - RadarTransfoDecompose(&t2, &scale, &trans, &rot, NULL); + ZnTransfoSetIdentity(&t); + ZnTransfoSetIdentity(new_t); + ZnTransfoDecompose(item->transfo, &local_scale, &local_trans, &local_rot, NULL); + ZnTranslate(&t, local_trans.x, local_trans.y); + ZnTransfoCompose(&t2, &t, current_t); + ZnTransfoDecompose(&t2, &scale, &trans, &rot, NULL); if (ISSET(item->flags, COMPOSE_SCALE_BIT)) { - RadarScale(new_t, scale.x, scale.y); + ZnScale(new_t, scale.x, scale.y); } if (ISSET(item->flags, COMPOSE_ROTATION_BIT)) { - RadarRotateRad(new_t, rot); + ZnRotateRad(new_t, rot); } - RadarScale(new_t, local_scale.x, local_scale.y); - RadarRotateRad(new_t, local_rot); - RadarTranslate(new_t, trans.x, trans.y); + ZnScale(new_t, local_scale.x, local_scale.y); + ZnRotateRad(new_t, local_rot); + ZnTranslate(new_t, trans.x, trans.y); } } @@ -3043,30 +3043,30 @@ ComposeItemTransform(Item item, ********************************************************************************** */ static void -GetTransform(Item item, - RadarTransfo *t) +GetTransform(Item item, + ZnTransfo *t) { Item *items; int i; - RadarTransfo t_tmp, *t1, *t2, *swap; + ZnTransfo t_tmp, *t1, *t2, *swap; if (item_stack == NULL) { - item_stack = RadarListNew(16, sizeof(Item)); + item_stack = ZnListNew(16, sizeof(Item)); } else { - RadarListEmpty(item_stack); + ZnListEmpty(item_stack); } - while (item != RADAR_NO_ITEM) { - RadarListAdd(item_stack, &item, RadarListTail); + while (item != ZN_NO_ITEM) { + ZnListAdd(item_stack, &item, ZnListTail); item = item->parent; } - RadarTransfoSetIdentity(t); + ZnTransfoSetIdentity(t); t1 = t; t2 = &t_tmp; - items = (Item *) RadarListArray(item_stack); - for (i = RadarListSize(item_stack)-1; i >= 0; i--) { + items = (Item *) ZnListArray(item_stack); + for (i = ZnListSize(item_stack)-1; i >= 0; i--) { ComposeItemTransform(items[i], t1, t2); swap = t2; t2 = t1; @@ -3089,9 +3089,9 @@ GetTransform(Item item, static void ResetTransformStack(WidgetInfo *wi) { - RadarListAssertSize(wi->transfo_stack, 1); - wi->current_transfo = (RadarTransfo *) RadarListAt(wi->transfo_stack, 0); - RadarTransfoSetIdentity(wi->current_transfo); + ZnListAssertSize(wi->transfo_stack, 1); + wi->current_transfo = (ZnTransfo *) ZnListAt(wi->transfo_stack, 0); + ZnTransfoSetIdentity(wi->current_transfo); } @@ -3106,16 +3106,16 @@ static void ResetClipStack(WidgetInfo *wi) { int i; - ClipState *clips = (ClipState *) RadarListArray(wi->clip_stack); + ClipState *clips = (ClipState *) ZnListArray(wi->clip_stack); /* * Should not happen, clip stack should be * empty when this function is called. */ - for (i = RadarListSize(wi->clip_stack)-1; i >= 0; i--) { + for (i = ZnListSize(wi->clip_stack)-1; i >= 0; i--) { XDestroyRegion(clips[i].region); } - RadarListEmpty(wi->clip_stack); + ZnListEmpty(wi->clip_stack); wi->current_clip = NULL; } @@ -3131,17 +3131,17 @@ static void Invalidate(Item item, int reason) { - if (ISSET(item->inv_flags, RADAR_TRANSFO_FLAG)) { + if (ISSET(item->inv_flags, ZN_TRANSFO_FLAG)) { return; } - if (ISSET(reason, RADAR_COORDS_FLAG) || - ISSET(reason, RADAR_TRANSFO_FLAG)) { + if (ISSET(reason, ZN_COORDS_FLAG) || + ISSET(reason, ZN_TRANSFO_FLAG)) { Item parent = item->parent; while ((parent != NULL) && - ISCLEAR(parent->inv_flags, RADAR_COORDS_FLAG) && - ISCLEAR(parent->inv_flags, RADAR_TRANSFO_FLAG)) { - SET(parent->inv_flags, RADAR_COORDS_FLAG); + ISCLEAR(parent->inv_flags, ZN_COORDS_FLAG) && + ISCLEAR(parent->inv_flags, ZN_TRANSFO_FLAG)) { + SET(parent->inv_flags, ZN_COORDS_FLAG); /*printf("invalidate coords for parent %d\n", parent->id);*/ parent = parent->parent; } @@ -3152,15 +3152,15 @@ Invalidate(Item item, */ item->inv_flags |= reason; /*printf("invalidate %s for item %d, flags %s\n", - ISSET(reason, RADAR_TRANSFO_FLAG)?"TRANSFO":"COORDS", item->id, - ISSET(item->inv_flags, RADAR_TRANSFO_FLAG)?"TRANSFO":"COORDS");*/ - RadarNeedRedisplay(item->wi); + ISSET(reason, ZN_TRANSFO_FLAG)?"TRANSFO":"COORDS", item->id, + ISSET(item->inv_flags, ZN_TRANSFO_FLAG)?"TRANSFO":"COORDS");*/ + ZnNeedRedisplay(item->wi); } - else if (ISSET(reason, RADAR_DRAW_FLAG)) { + else if (ISSET(reason, ZN_DRAW_FLAG)) { if (ISSET(item->flags, VISIBLE_BIT)) { /*printf("invalidate graphics for item %d\n", item->id);*/ Damage(item->wi, &item->item_bounding_box); - RadarNeedRedisplay(item->wi); + ZnNeedRedisplay(item->wi); } } } @@ -3181,13 +3181,13 @@ InvalidateItems(Item group, { Item item; - if (group->class != RadarGroup) { + if (group->class != ZnGroup) { return; } item = ((GroupItem) group)->head; - while (item != RADAR_NO_ITEM) { + while (item != ZN_NO_ITEM) { if (item->class == item_class) { - Invalidate(item, RADAR_COORDS_FLAG); + Invalidate(item, ZN_COORDS_FLAG); } item = item->next; } @@ -3212,73 +3212,73 @@ static void ResetTransfo(Item item) { if (item->transfo) { - RadarFree(item->transfo); + ZnFree(item->transfo); item->transfo = NULL; } - Invalidate(item, RADAR_TRANSFO_FLAG); + Invalidate(item, ZN_TRANSFO_FLAG); } static void SetTransfo(Item item, - RadarTransfo *t) + ZnTransfo *t) { if (item->transfo) { - RadarFree(item->transfo); + ZnFree(item->transfo); } - if (!t || RadarTransfoIsIdentity(t)) { + if (!t || ZnTransfoIsIdentity(t)) { item->transfo = NULL; } else { - item->transfo = RadarTransfoDuplicate(t); + item->transfo = ZnTransfoDuplicate(t); } - Invalidate(item, RADAR_TRANSFO_FLAG); + Invalidate(item, ZN_TRANSFO_FLAG); } static void TranslateItem(Item item, - RadarReal dx, - RadarReal dy) + ZnReal dx, + ZnReal dy) { if (!item->transfo) { - item->transfo = RadarTransfoNew(); + item->transfo = ZnTransfoNew(); } - RadarTranslate(item->transfo, dx, dy); - Invalidate(item, RADAR_TRANSFO_FLAG); + ZnTranslate(item->transfo, dx, dy); + Invalidate(item, ZN_TRANSFO_FLAG); } static void ScaleItem(Item item, - RadarReal sx, - RadarReal sy) + ZnReal sx, + ZnReal sy) { if (!item->transfo) { - item->transfo = RadarTransfoNew(); + item->transfo = ZnTransfoNew(); } - RadarScale(item->transfo, sx, sy); - Invalidate(item, RADAR_TRANSFO_FLAG); + ZnScale(item->transfo, sx, sy); + Invalidate(item, ZN_TRANSFO_FLAG); } static void RotateItem(Item item, - RadarReal angle, - RadarPoint *p) + ZnReal angle, + ZnPoint *p) { if (!item->transfo) { - item->transfo = RadarTransfoNew(); + item->transfo = ZnTransfoNew(); } if (p) { - RadarTranslate(item->transfo, -p->x, -p->y); + ZnTranslate(item->transfo, -p->x, -p->y); } - RadarRotateRad(item->transfo, angle); + ZnRotateRad(item->transfo, angle); if (p) { - RadarTranslate(item->transfo, p->x, p->y); + ZnTranslate(item->transfo, p->x, p->y); } - Invalidate(item, RADAR_TRANSFO_FLAG); + Invalidate(item, ZN_TRANSFO_FLAG); } @@ -3302,13 +3302,13 @@ RemoveItem(Item item) /* damage bounding boxes */ if (ISSET(item->flags, VISIBLE_BIT)) { Damage(wi, &item->item_bounding_box); - RadarNeedRedisplay(wi); + ZnNeedRedisplay(wi); } /* * Tell that we need to repick */ - if (item->class != RadarGroup) { + if (item->class != ZnGroup) { SET(wi->events_flags, INTERNAL_NEED_REPICK); } @@ -3328,8 +3328,8 @@ RemoveItem(Item item) * Remove me as a clip item. */ if (group->clip == item) { - group->clip = RADAR_NO_ITEM; - Invalidate((Item) group, RADAR_COORDS_FLAG); + group->clip = ZN_NO_ITEM; + Invalidate((Item) group, ZN_COORDS_FLAG); } } } @@ -3356,12 +3356,12 @@ DestroyItem(Item item) * Update state variables to prevent dangling pointers. */ if (wi->current_item == item) { - wi->current_item = RADAR_NO_ITEM; - wi->current_part = RADAR_NO_PART; + wi->current_item = ZN_NO_ITEM; + wi->current_part = ZN_NO_PART; } if (wi->new_item == item) { - wi->new_item = RADAR_NO_ITEM; - wi->new_part = RADAR_NO_PART; + wi->new_item = ZN_NO_ITEM; + wi->new_part = ZN_NO_PART; } /* @@ -3372,7 +3372,7 @@ DestroyItem(Item item) * Free the transform if any. */ if (item->transfo) { - RadarFree(item->transfo); + ZnFree(item->transfo); } /* * Remove the item from the item table and free @@ -3383,7 +3383,7 @@ DestroyItem(Item item) /* * Free the item own memory */ - RadarFree(item); + ZnFree(item); } @@ -3405,13 +3405,13 @@ FieldImageChange(ClientData client_data, { Field field = (Field) client_data; int i; - RadarBBox bbox; + ZnBBox bbox; - if (field->image != RadarUnspecifiedImage) { + if (field->image != ZnUnspecifiedImage) { i = (((char *) field) - ((char *) field->field_set->fields)) / sizeof(FieldStruct); GetFieldBBox(field->field_set, i, &bbox); Damage(field->field_set->wi, &bbox); - RadarNeedRedisplay(field->field_set->wi); + ZnNeedRedisplay(field->field_set->wi); ClearFieldCache(field->field_set, i); } } @@ -3435,14 +3435,14 @@ FieldTileChange(ClientData client_data, { Field field = (Field) client_data; int i; - RadarBBox bbox; + ZnBBox bbox; - if (field->tile != RadarUnspecifiedImage) { + if (field->tile != ZnUnspecifiedImage) { i = (((char *) field) - ((char *) field->field_set->fields)) / sizeof(FieldStruct); InvalidateImage(field->tile); GetFieldBBox(field->field_set, i, &bbox); Damage(field->field_set->wi, &bbox); - RadarNeedRedisplay(field->field_set->wi); + ZnNeedRedisplay(field->field_set->wi); } } @@ -3473,28 +3473,28 @@ InitFields(FieldSet field_set) return; } num_fields = field_set->num_fields; - field_set->fields = (Field) RadarMalloc(num_fields*sizeof(FieldStruct)); + field_set->fields = (Field) ZnMalloc(num_fields*sizeof(FieldStruct)); for (i = 0; i < num_fields; i++){ field = &field_set->fields[i]; field->field_set = field_set; - field->color = RadarGetColorByValue(wi->win, wi->fore_color); - field->back_color = RadarGetColorByValue(wi->win, wi->back_color); - field->border_color = RadarGetColorByValue(wi->win, wi->fore_color); + field->color = ZnGetColorByValue(wi->win, wi->fore_color); + field->back_color = ZnGetColorByValue(wi->win, wi->back_color); + field->border_color = ZnGetColorByValue(wi->win, wi->fore_color); SET(field->flags, FIELD_VISIBLE_BIT); SET(field->flags, FIELD_SENSITIVE_BIT); CLEAR(field->flags, FILLED_BIT); CLEAR(field->flags, CACHE_OK); - field->fill_pattern = RadarUnspecifiedPattern; + field->fill_pattern = ZnUnspecifiedPattern; field->text = ""; - field->image = RadarUnspecifiedImage; + field->image = ZnUnspecifiedImage; field->image_name = ""; - field->tile = RadarUnspecifiedImage; + field->tile = ZnUnspecifiedImage; field->tile_name = ""; field->font = Tk_GetFont(wi->interp, wi->win, Tk_NameOfFont(wi->font)); field->border_edges = NO_BORDER; - field->alignment = RadarJustifyLeft; + field->alignment = ZnJustifyLeft; field->auto_alignment.automatic = False; field->relief = RELIEF_FLAT; @@ -3530,41 +3530,41 @@ CloneFields(FieldSet field_set) if (!num_fields) { return; } - fields_ret = (Field) RadarMalloc(num_fields*sizeof(FieldStruct)); + fields_ret = (Field) ZnMalloc(num_fields*sizeof(FieldStruct)); memcpy(fields_ret, field_set->fields, num_fields*sizeof(FieldStruct)); field_set->fields = fields_ret; for (i = 0; i < num_fields; i++) { field = &fields_ret[i]; if (field->gradient) { - field->gradient = RadarGetColorGradientByValue(field->gradient); + field->gradient = ZnGetColorGradientByValue(field->gradient); } if (strlen(field->image_name) != 0) { - text = RadarMalloc((strlen(field->image_name) + 1) * sizeof(char)); + text = ZnMalloc((strlen(field->image_name) + 1) * sizeof(char)); strcpy(text, field->image_name); field->image_name = text; field->image = Tk_GetImage(wi->interp, wi->win, field->image_name, FieldImageChange, (ClientData) field); } if (strlen(field->tile_name) != 0) { - text = RadarMalloc((strlen(field->tile_name) + 1) * sizeof(char)); + text = ZnMalloc((strlen(field->tile_name) + 1) * sizeof(char)); strcpy(text, field->tile_name); field->tile_name = text; field->tile = Tk_GetImage(wi->interp, wi->win, field->tile_name, FieldTileChange, (ClientData) field); } - if (field->fill_pattern != RadarUnspecifiedPattern) { + if (field->fill_pattern != ZnUnspecifiedPattern) { field->fill_pattern = Tk_GetBitmap(wi->interp, wi->win, Tk_NameOfBitmap(wi->dpy, field->fill_pattern)); } field->font = Tk_GetFont(wi->interp, wi->win, Tk_NameOfFont(field->font)); - field->color = RadarGetColorByValue(wi->win, field->color); - field->back_color = RadarGetColorByValue(wi->win, field->back_color); - field->border_color = RadarGetColorByValue(wi->win, field->border_color); + field->color = ZnGetColorByValue(wi->win, field->color); + field->back_color = ZnGetColorByValue(wi->win, field->back_color); + field->border_color = ZnGetColorByValue(wi->win, field->border_color); if (strlen(field->text) != 0) { - text = (char *) RadarMalloc((strlen(field->text) + 1) * sizeof(char)); + text = (char *) ZnMalloc((strlen(field->text) + 1) * sizeof(char)); strcpy(text, field->text); field->text = text; } @@ -3583,42 +3583,42 @@ static int ConfigureField(FieldSet field_set, unsigned int field, int argc, - RadarAttrList argv, + ZnAttrList argv, int *flags) { int i; Field field_ptr; - RadarBBox bbox; + ZnBBox bbox; WidgetInfo *wi = field_set->wi; if (field >= field_set->num_fields) { - return RADAR_ERROR; + return ZN_ERROR; } field_ptr = &field_set->fields[field]; - if (ConfigureAttributes((char *) field_set, field, argc, argv, flags) == RADAR_ERROR) { - return RADAR_ERROR; + if (ConfigureAttributes((char *) field_set, field, argc, argv, flags) == ZN_ERROR) { + return ZN_ERROR; } - if (ISSET(*flags, RADAR_REPICK_FLAG)) { + if (ISSET(*flags, ZN_REPICK_FLAG)) { SET(wi->events_flags, INTERNAL_NEED_REPICK); } - if (ISSET(*flags, RADAR_CLFC_FLAG)) { + if (ISSET(*flags, ZN_CLFC_FLAG)) { ClearFieldCache(field_set, field); } if (field_ptr->gradient && - (ISSET(*flags, RADAR_BORDER_FLAG) || (field_ptr->relief == RELIEF_FLAT))) { - RadarFreeColorGradient(field_ptr->gradient); + (ISSET(*flags, ZN_BORDER_FLAG) || (field_ptr->relief == RELIEF_FLAT))) { + ZnFreeColorGradient(field_ptr->gradient); field_ptr->gradient = NULL; } if ((field_ptr->relief != RELIEF_FLAT) && !field_ptr->gradient) { - field_ptr->gradient = RadarGetReliefGradient(wi->interp, wi->win, - RadarNameOfColor(field_ptr->back_color)); + field_ptr->gradient = ZnGetReliefGradient(wi->interp, wi->win, + ZnNameOfColor(field_ptr->back_color)); } - if (ISSET(*flags, RADAR_IMAGE_FLAG)) { + if (ISSET(*flags, ZN_IMAGE_FLAG)) { Tk_Image image; if (strcmp(field_ptr->image_name, "") != 0) { @@ -3629,32 +3629,32 @@ ConfigureField(FieldSet field_set, * 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 (field_ptr->image != RadarUnspecifiedImage) { + if (field_ptr->image != ZnUnspecifiedImage) { Tk_FreeImage(field_ptr->image); } field_ptr->image = image; } - if (ISSET(*flags, RADAR_TILE_FLAG)) { + if (ISSET(*flags, ZN_TILE_FLAG)) { Tk_Image tile; if (strcmp(field_ptr->tile_name, "") != 0) { tile = Tk_GetImage(wi->interp, wi->win, field_ptr->tile_name, FieldTileChange, (ClientData) field_ptr); if (tile == NULL) { - return RADAR_ERROR; + return ZN_ERROR; } } else { - tile = RadarUnspecifiedImage; + tile = ZnUnspecifiedImage; } - if (field_ptr->tile != RadarUnspecifiedImage) { + if (field_ptr->tile != ZnUnspecifiedImage) { Tk_FreeImage(field_ptr->tile); } field_ptr->tile = tile; @@ -3664,8 +3664,8 @@ ConfigureField(FieldSet field_set, * This is done here to limit the redraw to the area of the * modified fields. */ - if (ISCLEAR(*flags, RADAR_COORDS_FLAG) && - field_set->label_format && ISSET(*flags, RADAR_DRAW_FLAG)) { + if (ISCLEAR(*flags, ZN_COORDS_FLAG) && + field_set->label_format && ISSET(*flags, ZN_DRAW_FLAG)) { for (i = 0; i < LabelFormatNumFields(field_set->label_format); i++) { if (i == field) { GetFieldBBox(field_set, i, &bbox); @@ -3675,7 +3675,7 @@ ConfigureField(FieldSet field_set, } } - return RADAR_OK; + return ZN_OK; } @@ -3690,20 +3690,20 @@ static int QueryField(FieldSet field_set, unsigned int field, int argc, - RadarAttrList argv) + ZnAttrList argv) { Field field_ptr; if (field >= field_set->num_fields) { - return RADAR_ERROR; + return ZN_ERROR; } field_ptr = &field_set->fields[field]; - if (QueryAttribute((char *) field_set, field, argv[0]) == RADAR_ERROR) { - return RADAR_ERROR; + if (QueryAttribute((char *) field_set, field, argv[0]) == ZN_ERROR) { + return ZN_ERROR; } - return RADAR_OK; + return ZN_OK; } @@ -3730,37 +3730,37 @@ FreeFields(FieldSet field_set) field = &field_set->fields[i]; if (strlen(field->text) != 0) { - RadarFree(field->text); + ZnFree(field->text); } if (field->gradient) { - RadarFreeColorGradient(field->gradient); + ZnFreeColorGradient(field->gradient); } if (strlen(field->image_name) != 0) { - RadarFree(field->image_name); + ZnFree(field->image_name); } - if (field->image != RadarUnspecifiedImage) { + if (field->image != ZnUnspecifiedImage) { Tk_FreeImage(field->image); - field->image = RadarUnspecifiedImage; + field->image = ZnUnspecifiedImage; } if (strlen(field->tile_name) != 0) { - RadarFree(field->tile_name); + ZnFree(field->tile_name); } - if (field->tile != RadarUnspecifiedImage) { + if (field->tile != ZnUnspecifiedImage) { Tk_FreeImage(field->tile); - field->tile = RadarUnspecifiedImage; + field->tile = ZnUnspecifiedImage; } - if (field->fill_pattern != RadarUnspecifiedPattern) { + if (field->fill_pattern != ZnUnspecifiedPattern) { Tk_FreeBitmap(wi->dpy, field->fill_pattern); - field->fill_pattern = RadarUnspecifiedPattern; + field->fill_pattern = ZnUnspecifiedPattern; } /*printf("freeing a font\n");*/ Tk_FreeFont(field->font); - RadarFreeColor(field->color); - RadarFreeColor(field->back_color); - RadarFreeColor(field->border_color); + ZnFreeColor(field->color); + ZnFreeColor(field->back_color); + ZnFreeColor(field->border_color); } if (num_fields) { - RadarFree(field_set->fields); + ZnFree(field_set->fields); } } @@ -3776,10 +3776,10 @@ FreeFields(FieldSet field_set) */ static void ComputeFieldImageLocation(Field field_ptr, - RadarBBox *bbox, - RadarBBox *pm_bbox) + ZnBBox *bbox, + ZnBBox *pm_bbox) { - RadarBool relief_thickness; + ZnBool relief_thickness; int width, height; Tk_SizeOfImage(field_ptr->image, &width, &height); @@ -3789,10 +3789,10 @@ ComputeFieldImageLocation(Field field_ptr, field_ptr->relief_thickness > 1) ? field_ptr->relief_thickness : 0; switch (field_ptr->alignment) { - case RadarJustifyLeft: + case ZnJustifyLeft: pm_bbox->orig.x = bbox->orig.x + 1 + relief_thickness; break; - case RadarJustifyRight: + case ZnJustifyRight: pm_bbox->orig.x = bbox->corner.x - width - 1 - relief_thickness; break; default: @@ -3818,14 +3818,14 @@ DrawFields(FieldSet field_set) int j, num; Field field_ptr; XGCValues values; - RadarBBox label_clip_box, clip_bbox, bbox, *global_clip_box; - RadarBBox text_bbox, clip_text_bbox; + ZnBBox label_clip_box, clip_bbox, bbox, *global_clip_box; + ZnBBox text_bbox, clip_text_bbox; XRectangle r; Region reg, reg2; - RadarPoint text_pos; - RadarBBox pm_bbox, clip_pm_bbox; - RadarBool restore = False; - RadarDim lwidth, lheight; + ZnPoint text_pos; + ZnBBox pm_bbox, clip_pm_bbox; + ZnBool restore = False; + ZnDim lwidth, lheight; if (field_set->label_format && LabelFormatNumFields(field_set->label_format)) { bbox.orig = field_set->label_pos; @@ -3866,7 +3866,7 @@ DrawFields(FieldSet field_set) IntersectBBox(&clip_bbox, &text_bbox, &clip_text_bbox); - if (field_ptr->image != RadarUnspecifiedImage) { + if (field_ptr->image != ZnUnspecifiedImage) { ComputeFieldImageLocation(field_ptr, &bbox, &pm_bbox); } else { @@ -3920,9 +3920,9 @@ DrawFields(FieldSet field_set) * Draw the background. */ if (ISSET(field_ptr->flags, FILLED_BIT)) { - values.foreground = RadarPixel(field_ptr->back_color); + values.foreground = ZnPixel(field_ptr->back_color); - if (field_ptr->tile != RadarUnspecifiedImage) { /* Fill tiled */ + if (field_ptr->tile != ZnUnspecifiedImage) { /* Fill tiled */ Pixmap pmap = GetImagePixmap(wi->win, field_ptr->tile); values.fill_style = FillTiled; values.tile = pmap; @@ -3932,7 +3932,7 @@ DrawFields(FieldSet field_set) GCTileStipXOrigin|GCTileStipYOrigin|GCFillStyle|GCTile, &values); } - else if (field_ptr->fill_pattern != RadarUnspecifiedPattern) { /* Fill stippled */ + else if (field_ptr->fill_pattern != ZnUnspecifiedPattern) { /* Fill stippled */ values.fill_style = FillStippled; values.stipple = field_ptr->fill_pattern; values.ts_x_origin = (int) bbox.orig.x; @@ -3959,7 +3959,7 @@ DrawFields(FieldSet field_set) /* * Draw the image. */ - if (field_ptr->image != RadarUnspecifiedImage) { + if (field_ptr->image != ZnUnspecifiedImage) { Tk_RedrawImage(field_ptr->image, clip_pm_bbox.orig.x-pm_bbox.orig.x, clip_pm_bbox.orig.y-pm_bbox.orig.y, @@ -3974,9 +3974,9 @@ DrawFields(FieldSet field_set) * Draw the text. */ if (field_ptr->text && strlen(field_ptr->text)) { - values.foreground = RadarPixel(field_ptr->color); + values.foreground = ZnPixel(field_ptr->color); values.fill_style = FillSolid; - values.font = RadarFontId(field_ptr->font); + values.font = ZnFontId(field_ptr->font); XChangeGC(wi->dpy, wi->gc, GCForeground | GCFillStyle | GCFont, &values); Tk_DrawChars(wi->dpy, wi->draw_buffer, wi->gc, field_ptr->font, field_ptr->text, strlen(field_ptr->text), @@ -3998,7 +3998,7 @@ DrawFields(FieldSet field_set) * Draw the border line. */ if (field_ptr->border_edges != NO_BORDER) { - values.foreground = RadarPixel(field_ptr->border_color); + values.foreground = ZnPixel(field_ptr->border_color); values.line_width = 0; values.line_style = LineSolid; values.fill_style = FillSolid; @@ -4054,7 +4054,7 @@ DrawFields(FieldSet field_set) * ********************************************************************************** */ -static RadarBool +static ZnBool IsFieldSensitive(FieldSet field_set, int part) { @@ -4083,11 +4083,11 @@ IsFieldSensitive(FieldSet field_set, */ static double FieldsPick(FieldSet field_set, - RadarPoint *p, + ZnPoint *p, int *part) { Field field_ptr; - RadarBBox bbox; + ZnBBox bbox; int i, best_field = 0; double new_dist, dist = 1e40; @@ -4131,13 +4131,13 @@ FieldsPick(FieldSet field_set, */ static int FieldsToArea(FieldSet field_set, - RadarBBox *area) + ZnBBox *area) { Field field_ptr; - RadarBBox bbox; + ZnBBox bbox; int inside = -1; int i; - RadarBool first_done = False; + ZnBool first_done = False; for (i = LabelFormatNumFields(field_set->label_format)-1; i >= 0; i--) { field_ptr = &field_set->fields[i]; @@ -4198,7 +4198,7 @@ SetFieldsAutoAlign(Item item, static void Damage(WidgetInfo *wi, - RadarBBox *damage) + ZnBBox *damage) { if ((damage == NULL) || IsEmptyBBox(damage)) { return; @@ -4240,8 +4240,8 @@ Damage(WidgetInfo *wi, static void Update(WidgetInfo *wi) { - if (ISSET(wi->top_group->inv_flags, RADAR_COORDS_FLAG) || - ISSET(wi->top_group->inv_flags, RADAR_TRANSFO_FLAG)) { + if (ISSET(wi->top_group->inv_flags, ZN_COORDS_FLAG) || + ISSET(wi->top_group->inv_flags, ZN_TRANSFO_FLAG)) { wi->top_group->class->ComputeCoordinates(wi->top_group, False); } } @@ -4271,8 +4271,8 @@ Repair(WidgetInfo *wi) /*StartChrono(int_draw_time);*/ #endif /* Fill the background */ - if (wi->tile == RadarUnspecifiedImage) { - values.foreground = RadarPixel(wi->back_color); + if (wi->tile == ZnUnspecifiedImage) { + values.foreground = ZnPixel(wi->back_color); values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCFillStyle|GCForeground, &values); } |