From 7296d27a04068d84d9e683b0b5dccfc4059f97a9 Mon Sep 17 00:00:00 2001 From: lecoanet Date: Mon, 16 Jun 2003 14:44:53 +0000 Subject: Use of ZnGetGradientPixel in X. --- generic/Field.c | 10 +++++----- generic/Group.c | 2 +- generic/Icon.c | 2 +- generic/Map.c | 2 +- generic/Reticle.c | 6 +++--- generic/Text.c | 6 +++--- generic/Track.c | 14 +++++++------- generic/Triangles.c | 6 ++---- 8 files changed, 23 insertions(+), 25 deletions(-) diff --git a/generic/Field.c b/generic/Field.c index 472d895..2c69fd8 100644 --- a/generic/Field.c +++ b/generic/Field.c @@ -1793,7 +1793,7 @@ DrawField(ZnWInfo *wi, * Draw the background. */ if (ISSET(fptr->flags, FILLED_BIT)) { - values.foreground = ZnPixel(ZnGetGradientColor(fptr->fill_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(fptr->fill_color, 0.0); if (fptr->tile != ZnUnspecifiedImage) { if (!ZnImageIsBitmap(fptr->tile)) { /* Fill tiled */ @@ -1880,7 +1880,7 @@ DrawField(ZnWInfo *wi, num_bytes = strlen(fptr->text); if (num_bytes) { if (sel_start >= 0) { - values.foreground = ZnPixel(ZnGetGradientColor(ti->sel_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(ti->sel_color, 0.0); values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCForeground|GCFillStyle, &values); XFillRectangle(wi->dpy, wi->draw_buffer, wi->gc, @@ -1889,7 +1889,7 @@ DrawField(ZnWInfo *wi, (unsigned int) (sel_stop-sel_start), (unsigned int) (text_bbox->corner.y-text_bbox->orig.y)); } - values.foreground = ZnPixel(ZnGetGradientColor(fptr->color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(fptr->color, 0.0); values.fill_style = FillSolid; values.font = Tk_FontId(fptr->font); XChangeGC(wi->dpy, wi->gc, GCForeground | GCFillStyle | GCFont, &values); @@ -1900,7 +1900,7 @@ DrawField(ZnWInfo *wi, } if (cursor >= 0) { values.line_width = ti->insert_width; - values.foreground = ZnPixel(ZnGetGradientColor(ti->insert_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(ti->insert_color, 0.0); values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCForeground|GCLineWidth|GCFillStyle, &values); xs = (int) text_bbox->orig.x + cursor; @@ -1921,7 +1921,7 @@ DrawField(ZnWInfo *wi, * Draw the border line. */ if (fptr->border_edges != ZN_NO_BORDER) { - values.foreground = ZnPixel(ZnGetGradientColor(fptr->border_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(fptr->border_color, 0.0); values.line_width = 0; values.line_style = LineSolid; values.fill_style = FillSolid; diff --git a/generic/Group.c b/generic/Group.c index a8cea20..a208c7a 100644 --- a/generic/Group.c +++ b/generic/Group.c @@ -986,7 +986,7 @@ Draw(ZnItem item) current_item->class->Draw(current_item); if (wi->draw_bboxes) { XGCValues values; - values.foreground = ZnPixel(ZnGetGradientColor(wi->bbox_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(wi->bbox_color, 0.0); values.fill_style = FillSolid; values.line_width = 1; values.line_style = (current_item->class==ZnGroup)?LineOnOffDash:LineSolid; diff --git a/generic/Icon.c b/generic/Icon.c index a1bd7a1..c243311 100644 --- a/generic/Icon.c +++ b/generic/Icon.c @@ -450,7 +450,7 @@ Draw(ZnItem item) values.stipple = pixmap; values.ts_x_origin = (int) icon->dev->x; values.ts_y_origin = (int) icon->dev->y; - values.foreground = ZnPixel(ZnGetGradientColor(icon->color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(icon->color, 0.0); gc_mask |= GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin | GCForeground; XChangeGC(wi->dpy, wi->gc, gc_mask, &values); XFillRectangle(wi->dpy, wi->draw_buffer, wi->gc, diff --git a/generic/Map.c b/generic/Map.c index 9d77b59..5cdaa78 100644 --- a/generic/Map.c +++ b/generic/Map.c @@ -1019,7 +1019,7 @@ Draw(ZnItem item) map_info = map->map_info; - values.foreground = ZnPixel(ZnGetGradientColor(map->color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(map->color, 0.0); if (map->filled) { if (ZnListSize(map->vectors) || ZnListSize(map->arcs)) { diff --git a/generic/Reticle.c b/generic/Reticle.c index 4855499..8fe4c83 100644 --- a/generic/Reticle.c +++ b/generic/Reticle.c @@ -349,7 +349,7 @@ Draw(ZnItem item) while (radius <= radius_max_dev) { ZnSetLineStyle(wi, reticle->line_style); - values.foreground = ZnPixel(ZnGetGradientColor(reticle->line_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(reticle->line_color, 0.0); values.line_width = 0; values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCForeground | GCLineWidth | GCFillStyle, &values); @@ -374,7 +374,7 @@ Draw(ZnItem item) (reticle->dev.y >= wi->damaged_area.orig.y - radius) && (reticle->dev.y <= wi->damaged_area.corner.y + radius)) { ZnSetLineStyle(wi, reticle->bright_line_style); - values.foreground = ZnPixel(ZnGetGradientColor(reticle->bright_line_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(reticle->bright_line_color, 0.0); values.line_width = 0; values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCForeground | GCLineWidth | GCFillStyle, &values); @@ -448,7 +448,7 @@ Render(ZnItem item) (reticle->num_circles - 1) * reticle->step_size_dev); } - genarc = ZnGetCirclePoints(3, ZN_CIRCLE_FINEST, 0.0, 2*M_PI, &num_p, NULL); + genarc = ZnGetCirclePoints(3, ZN_CIRCLE_FINER, 0.0, 2*M_PI, &num_p, NULL); glLineWidth(1.0); while (radius <= radius_max_dev) { ZnSetLineStyle(wi, reticle->line_style); diff --git a/generic/Text.c b/generic/Text.c index 8f1e138..e2b83f2 100644 --- a/generic/Text.c +++ b/generic/Text.c @@ -749,7 +749,7 @@ Draw(ZnItem item) if ((ti->sel_item == item) && (sel_first_line >= 0)) { int x, y; - values.foreground = ZnPixel(ZnGetGradientColor(ti->sel_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(ti->sel_color, 0.0); values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCFillStyle | GCForeground, &values); @@ -791,7 +791,7 @@ Draw(ZnItem item) values.fill_style = FillSolid; values.line_width = ti->insert_width; - values.foreground = ZnPixel(ZnGetGradientColor(ti->insert_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(ti->insert_color, 0.0); XChangeGC(wi->dpy, wi->gc, GCForeground|GCFillStyle|GCLineWidth, &values); xs = (int)(text->pos_dev.x + lines[cursor_line].text_origin.x + cursor_offset); @@ -803,7 +803,7 @@ Draw(ZnItem item) * Setup the gc to render the text and draw it. */ values.font = Tk_FontId(text->font); - values.foreground = ZnPixel(ZnGetGradientColor(text->color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(text->color, 0.0); gc_mask = GCFont | GCForeground; if (text->fill_pattern != ZnUnspecifiedImage) { values.fill_style = FillStippled; diff --git a/generic/Track.c b/generic/Track.c index 7a7e045..a6a3cf3 100644 --- a/generic/Track.c +++ b/generic/Track.c @@ -1103,7 +1103,7 @@ Draw(ZnItem item) /* Draw the marker */ if (track->marker_size_dev != 0) { ZnSetLineStyle(wi, track->marker_style); - values.foreground = ZnPixel(ZnGetGradientColor(track->marker_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(track->marker_color, 0.0); values.line_width = 0; if (ISSET(track->flags, MARKER_FILLED_BIT)) { if (track->marker_fill_pattern == ZnUnspecifiedImage) { @@ -1147,7 +1147,7 @@ Draw(ZnItem item) pts[0] = track->dev; pts[1] = ((TrackItem) item->connected_item)->dev; ZnDrawLineShape(wi, pts, 2, track->connection_style, - ZnGetGradientColor(track->connection_color, 0.0, NULL), + ZnGetGradientPixel(track->connection_color, 0.0), track->connection_width, ZN_LINE_STRAIGHT); } @@ -1155,7 +1155,7 @@ Draw(ZnItem item) * Draw the speed vector. */ if ((item->class == ZnTrack) && (track->speed_vector_width > 0)) { - values.foreground = ZnPixel(ZnGetGradientColor(track->speed_vector_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(track->speed_vector_color, 0.0); values.line_width = (int) (track->speed_vector_width > 1 ? track->speed_vector_width : 0); values.line_style = LineSolid; values.fill_style = FillSolid; @@ -1180,7 +1180,7 @@ Draw(ZnItem item) points = (ZnPoint *) ZnListArray(track->leader_points); num_points = ZnListSize(track->leader_points); ZnDrawLineShape(wi, points, num_points, track->leader_style, - ZnGetGradientColor(track->leader_color, 0.0, NULL), + ZnGetGradientPixel(track->leader_color, 0.0), track->leader_width, track->leader_shape); if (track->leader_first_end != NULL) { ZnGetLineEnd(&points[0], &points[1], track->leader_width, @@ -1212,7 +1212,7 @@ Draw(ZnItem item) * Draw the history, current pos excepted. */ if ((item->class == ZnTrack) && track->history) { - values.foreground = ZnPixel(ZnGetGradientColor(track->history_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(track->history_color, 0.0); values.fill_style = FillSolid; XChangeGC(wi->dpy, wi->gc, GCForeground|GCFillStyle, &values); if (ISCLEAR(track->flags, FILLED_HISTORY_BIT)) { @@ -1227,7 +1227,7 @@ Draw(ZnItem item) for (i = 0, nb_hist = 0; i < num_acc_pos; i++) { if (ISSET(track->flags, LAST_AS_FIRST_BIT) && (i == visible_history_size)) { - values.foreground = ZnPixel(ZnGetGradientColor(track->symbol_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(track->symbol_color, 0.0); XChangeGC(wi->dpy, wi->gc, GCForeground, &values); } side_size--; @@ -1274,7 +1274,7 @@ Draw(ZnItem item) if (track->symbol != ZnUnspecifiedImage) { x = ((int) track->dev.x) - (width+1)/2; y = ((int) track->dev.y) - (height+1)/2; - values.foreground = ZnPixel(ZnGetGradientColor(track->symbol_color, 0.0, NULL)); + values.foreground = ZnGetGradientPixel(track->symbol_color, 0.0); values.fill_style = FillStippled; values.stipple = ZnImagePixmap(track->symbol); values.ts_x_origin = x; diff --git a/generic/Triangles.c b/generic/Triangles.c index 84b5cbf..0c89410 100644 --- a/generic/Triangles.c +++ b/generic/Triangles.c @@ -419,8 +419,7 @@ Draw(ZnItem item) } for (i = 0; i < num_points-2; i++, xpoints++) { if (i <= last_color_index) { - XSetForeground(wi->dpy, wi->gc, - ZnPixel(ZnGetGradientColor(grads[i], 0.0, NULL))); + XSetForeground(wi->dpy, wi->gc, ZnGetGradientPixel(grads[i], 0.0)); } XFillPolygon(wi->dpy, wi->draw_buffer, wi->gc, xpoints, 3, Convex, CoordModeOrigin); @@ -438,8 +437,7 @@ Draw(ZnItem item) points += 3; for (i = 0; i < num_points-2; i++, points++) { if (i <= last_color_index) { - XSetForeground(wi->dpy, wi->gc, - ZnPixel(ZnGetGradientColor(grads[i], 0.0, NULL))); + XSetForeground(wi->dpy, wi->gc, ZnGetGradientPixel(grads[i], 0.0)); } XFillPolygon(wi->dpy, wi->draw_buffer, wi->gc, tri, 3, Convex, CoordModeOrigin); -- cgit v1.1