[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-375-ga8ae469)
The branch, master has been updated
via a8ae46996fe78d138e83a99744e7ade0036399bc (commit)
from 7b663063f659aac854f844bda40160f697f7c3ef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/include/gschem_struct.h | 2 +-
gschem/src/a_zoom.c | 4 +-
gschem/src/gschem_toplevel.c | 2 +-
gschem/src/o_arc.c | 27 +++++-----
gschem/src/o_basic.c | 8 ++--
gschem/src/o_box.c | 34 ++++++------
gschem/src/o_bus.c | 19 +++----
gschem/src/o_circle.c | 44 ++++++++--------
gschem/src/o_cue.c | 117 ++++++++++++++++++++--------------------
gschem/src/o_grips.c | 4 +-
gschem/src/o_line.c | 11 ++--
gschem/src/o_net.c | 60 ++++++++++-----------
gschem/src/o_path.c | 24 ++++----
gschem/src/o_picture.c | 52 +++++++++---------
gschem/src/o_pin.c | 12 ++---
gschem/src/o_select.c | 6 +-
gschem/src/o_text.c | 70 ++++++++++++------------
gschem/src/x_basic.c | 8 ++--
gschem/src/x_event.c | 14 +++---
gschem/src/x_grid.c | 29 +++++-----
gschem/src/x_image.c | 16 +++---
gschem/src/x_preview.c | 18 +++---
gschem/src/x_window.c | 12 ++--
23 files changed, 291 insertions(+), 302 deletions(-)
=================
Commit Messages
=================
commit a8ae46996fe78d138e83a99744e7ade0036399bc
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Fri Dec 12 21:01:45 2008 +0000
Rename GSCHEM_TOPLEVEL member "backingstore" to "drawable"
:100644 100644 55d620f... cf61370... M gschem/include/gschem_struct.h
:100644 100644 2d94a7d... eed2be1... M gschem/src/a_zoom.c
:100644 100644 30540e6... e14f848... M gschem/src/gschem_toplevel.c
:100644 100644 992fb57... d67f2c2... M gschem/src/o_arc.c
:100644 100644 4a4fdcd... c12ef78... M gschem/src/o_basic.c
:100644 100644 1852f63... 6e3f421... M gschem/src/o_box.c
:100644 100644 5d7283b... 1a988c3... M gschem/src/o_bus.c
:100644 100644 da22f49... 2b311aa... M gschem/src/o_circle.c
:100644 100644 f78ca45... 891265a... M gschem/src/o_cue.c
:100644 100644 6714598... 79a2469... M gschem/src/o_grips.c
:100644 100644 9f5b103... 1741116... M gschem/src/o_line.c
:100644 100644 e5824c1... 455b700... M gschem/src/o_net.c
:100644 100644 540cb58... aed412d... M gschem/src/o_path.c
:100644 100644 c52bbf3... 674c438... M gschem/src/o_picture.c
:100644 100644 7012863... 7372e71... M gschem/src/o_pin.c
:100644 100644 2d72df1... 49db0bc... M gschem/src/o_select.c
:100644 100644 64e65ae... e2dcff8... M gschem/src/o_text.c
:100644 100644 59c6861... b595f33... M gschem/src/x_basic.c
:100644 100644 f7ed9c9... 3b74bd6... M gschem/src/x_event.c
:100644 100644 fa9e3fb... 2fd441c... M gschem/src/x_grid.c
:100644 100644 4b18a01... e274ff4... M gschem/src/x_image.c
:100644 100644 3b09c61... 2218293... M gschem/src/x_preview.c
:100644 100644 04ac14a... 1904f20... M gschem/src/x_window.c
=========
Changes
=========
commit a8ae46996fe78d138e83a99744e7ade0036399bc
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Fri Dec 12 21:01:45 2008 +0000
Rename GSCHEM_TOPLEVEL member "backingstore" to "drawable"
diff --git a/gschem/include/gschem_struct.h b/gschem/include/gschem_struct.h
index 55d620f..cf61370 100644
--- a/gschem/include/gschem_struct.h
+++ b/gschem/include/gschem_struct.h
@@ -81,7 +81,7 @@ struct st_gschem_toplevel {
/* Drawing surfaces */
/* ---------------- */
GdkWindow *window; /* drawing_area's X drawable */
- GdkPixmap *backingstore; /* backingstore pixmap */
+ GdkPixmap *drawable; /* drawable to paint onto */
int win_width, win_height; /* Actual size of window (?) */
/* ------------- */
diff --git a/gschem/src/a_zoom.c b/gschem/src/a_zoom.c
index 2d94a7d..eed2be1 100644
--- a/gschem/src/a_zoom.c
+++ b/gschem/src/a_zoom.c
@@ -298,8 +298,8 @@ void a_zoom_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_foreground(w_current->xor_gc,
x_get_darkcolor(w_current->zoom_box_color));
- gdk_draw_rectangle(w_current->backingstore, w_current->xor_gc, FALSE,
- box_left, box_top, box_width, box_height);
+ gdk_draw_rectangle (w_current->drawable, w_current->xor_gc, FALSE,
+ box_left, box_top, box_width, box_height);
o_invalidate_rect(w_current, box_left,
box_top,
box_left + box_width,
diff --git a/gschem/src/gschem_toplevel.c b/gschem/src/gschem_toplevel.c
index 30540e6..e14f848 100644
--- a/gschem/src/gschem_toplevel.c
+++ b/gschem/src/gschem_toplevel.c
@@ -99,7 +99,7 @@ GSCHEM_TOPLEVEL *gschem_toplevel_new ()
/* Drawing surfaces */
/* ---------------- */
w_current->window = NULL;
- w_current->backingstore = NULL;
+ w_current->drawable = NULL;
w_current->win_width = 0;
w_current->win_height = 0;
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index 992fb57..d67f2c2 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -166,10 +166,10 @@ void o_arc_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
if((length == 0) || (space == 0))
draw_func = o_arc_draw_solid;
- (*draw_func)(w_current->backingstore, w_current->gc, color,
- arc_end,
- x, y, radius, start_angle, end_angle,
- arc_width, length, space);
+ (*draw_func) (w_current->drawable, w_current->gc, color,
+ arc_end,
+ x, y, radius, start_angle, end_angle,
+ arc_width, length, space);
if (o_current->draw_grips && w_current->draw_grips == TRUE) {
@@ -845,9 +845,9 @@ void o_arc_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
gdk_gc_set_foreground(w_current->outline_xor_gc,
x_get_darkcolor(color));
/* better to set the line attributes here ? */
- gdk_draw_arc(w_current->backingstore, w_current->outline_xor_gc, FALSE,
- x, y, width, height,
- start_angle * 64, end_angle * 64);
+ gdk_draw_arc (w_current->drawable, w_current->outline_xor_gc, FALSE,
+ x, y, width, height,
+ start_angle * 64, end_angle * 64);
/* backing store? not appropriate here */
@@ -1071,18 +1071,17 @@ void o_arc_rubberarc_xor(GSCHEM_TOPLEVEL *w_current)
GDK_JOIN_MITER);
/* draw the arc from the w_current variables */
- gdk_draw_arc(w_current->backingstore, w_current->xor_gc, FALSE,
- cx - radius, cy - radius,
- radius * 2, radius * 2,
- w_current->second_wx * 64,
- w_current->second_wy * 64);
+ gdk_draw_arc (w_current->drawable, w_current->xor_gc, FALSE,
+ cx - radius, cy - radius,
+ radius * 2, radius * 2,
+ w_current->second_wx * 64,
+ w_current->second_wy * 64);
/* draw the radius segment from the w_current variables */
rad_angle = ((double) w_current->second_wx) * M_PI / 180;
x1 = cx + radius*cos(rad_angle);
y1 = cy - radius*sin(rad_angle);
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- cx, cy, x1, y1);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc, cx, cy, x1, y1);
/* FIXME: This isn't a tight bounding box for now, but the code
* to compute a better bounds it complex, and might wait
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 4a4fdcd..c12ef78 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -366,10 +366,10 @@ void o_drawbounding(GSCHEM_TOPLEVEL *w_current, GList *o_glist,
/* XOR draw with the appropriate mode */
if (w_current->last_drawb_mode == BOUNDINGBOX) {
gdk_gc_set_foreground(w_current->bounding_xor_gc, color);
- gdk_draw_rectangle(w_current->backingstore,
- w_current->bounding_xor_gc, FALSE,
- s_left, s_bottom,
- s_right - s_left, s_top - s_bottom);
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->bounding_xor_gc, FALSE,
+ s_left, s_bottom,
+ s_right - s_left, s_top - s_bottom);
} else {
o_glist_draw_xor (w_current, diff_x, diff_y, o_glist);
}
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index 1852f63..6e3f421 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -187,12 +187,12 @@ void o_box_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
WORLDtoSCREEN( toplevel, o_current->box->lower_x, o_current->box->lower_y,
&s_lower_x, &s_lower_y );
- (*draw_func)(w_current->backingstore, w_current->gc, color, box_end,
- FALSE,
- s_upper_x, s_upper_y,
- abs(s_lower_x - s_upper_x),
- abs(s_lower_y - s_upper_y),
- line_width, length, space);
+ (*draw_func) (w_current->drawable, w_current->gc, color, box_end,
+ FALSE,
+ s_upper_x, s_upper_y,
+ abs(s_lower_x - s_upper_x),
+ abs(s_lower_y - s_upper_y),
+ line_width, length, space);
/*
* The values needed for the fill operation are taken from the
@@ -266,9 +266,9 @@ void o_box_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
fill_func = o_box_fill_fill;
}
- (*fill_func)(w_current->backingstore, w_current->gc, color,
- w_current, o_current->box,
- fill_width, angle1, pitch1, angle2, pitch2);
+ (*fill_func) (w_current->drawable, w_current->gc, color,
+ w_current, o_current->box,
+ fill_width, angle1, pitch1, angle2, pitch2);
if ((o_current->draw_grips == TRUE) && (w_current->draw_grips == TRUE)) {
if (!o_current->selected) {
@@ -744,12 +744,12 @@ void o_box_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
gdk_gc_set_foreground(w_current->outline_xor_gc,
x_get_darkcolor(color));
- gdk_draw_rectangle(w_current->backingstore,
- w_current->outline_xor_gc, FALSE,
- screen_x1,
- screen_y1,
- abs(screen_x2 - screen_x1),
- abs(screen_y2 - screen_y1));
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->outline_xor_gc, FALSE,
+ screen_x1,
+ screen_y1,
+ abs(screen_x2 - screen_x1),
+ abs(screen_y2 - screen_y1));
}
/*! \brief Start process to input a new box.
@@ -928,8 +928,8 @@ void o_box_rubberbox_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_line_attributes(w_current->xor_gc, 0,
GDK_LINE_SOLID, GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
- gdk_draw_rectangle(w_current->backingstore, w_current->xor_gc,
- FALSE, box_left, box_top, box_width, box_height);
+ gdk_draw_rectangle (w_current->drawable, w_current->xor_gc,
+ FALSE, box_left, box_top, box_width, box_height);
o_invalidate_rect(w_current, box_left, box_top,
box_left + box_width, box_top + box_height);
}
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 5d7283b..1a988c3 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -70,13 +70,11 @@ void o_bus_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
if (toplevel->override_color != -1 ) {
gdk_gc_set_foreground(w_current->gc,
x_get_color(toplevel->override_color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->gc, x1, y1, x2, y2);
} else {
gdk_gc_set_foreground(w_current->gc,
x_get_color(o_current->color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->gc, x1, y1, x2, y2);
}
/* yes zero is right for the width -> use hardware lines */
@@ -138,9 +136,9 @@ void o_bus_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
WORLDtoSCREEN(toplevel, o_current->line->x[0] + dx, o_current->line->y[0] + dy, &sx[0], &sy[0] );
WORLDtoSCREEN(toplevel, o_current->line->x[1] + dx, o_current->line->y[1] + dy, &sx[1], &sy[1] );
-
- gdk_draw_line(w_current->backingstore, w_current->outline_xor_gc,
- sx[0], sy[0], sx[1], sy[1]);
+
+ gdk_draw_line (w_current->drawable, w_current->outline_xor_gc,
+ sx[0], sy[0], sx[1], sy[1]);
/* backing store ? not approriate here */
@@ -195,8 +193,8 @@ void o_bus_draw_xor_single(GSCHEM_TOPLEVEL *w_current,
WORLDtoSCREEN(toplevel, o_current->line->x[0] + dx1, o_current->line->y[0] + dy1, &sx[0], &sy[0]);
WORLDtoSCREEN(toplevel, o_current->line->x[1] + dx2, o_current->line->y[1] + dy2, &sx[1], &sy[1]);
- gdk_draw_line(w_current->backingstore, w_current->outline_xor_gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->outline_xor_gc,
+ sx[0], sy[0], sx[1], sy[1]);
o_invalidate_rect(w_current,
sx[0], sy[0], sx[1], sy[1]);
}
@@ -356,8 +354,7 @@ void o_bus_rubberbus_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_foreground(w_current->xor_gc,
x_get_darkcolor(w_current->select_color));
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc, x1, y1, x2, y2);
o_invalidate_rect(w_current,
min(x1, x2) - size/2, min(y1, y2) - size/2,
max(x1, x2) + size/2, max(y1, y2) + size/2);
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index da22f49..2b311aa 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -173,12 +173,12 @@ void o_circle_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
WORLDtoSCREEN( toplevel, o_current->circle->center_x, o_current->circle->center_y,
&s_x, &s_y );
- (*draw_func)(w_current->backingstore, w_current->gc, color,
- circle_end,
- s_x, s_y,
- radius,
- 0, FULL_CIRCLE / 64,
- circle_width, length, space);
+ (*draw_func) (w_current->drawable, w_current->gc, color,
+ circle_end,
+ s_x, s_y,
+ radius,
+ 0, FULL_CIRCLE / 64,
+ circle_width, length, space);
/*
* The values needed for the fill operation are taken from the
@@ -251,9 +251,9 @@ void o_circle_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
fill_func = o_circle_fill_fill;
}
- (*fill_func)(w_current->backingstore, w_current->gc, color,
- w_current, o_current->circle,
- fill_width, angle1, pitch1, angle2, pitch2);
+ (*fill_func) (w_current->drawable, w_current->gc, color,
+ w_current, o_current->circle,
+ fill_width, angle1, pitch1, angle2, pitch2);
#if DEBUG
printf("drawing circle\n");
@@ -505,16 +505,16 @@ void o_circle_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_cur
o_current->circle->center_x - o_current->circle->radius + dx,
o_current->circle->center_y + o_current->circle->radius + dy,
&x, &y );
-
+
/* To draw be sure to setup width height */
gdk_gc_set_foreground(w_current->outline_xor_gc,
- x_get_darkcolor(color));
- gdk_draw_arc(w_current->backingstore, w_current->outline_xor_gc,
- FALSE,
- x, y,
- 2 * radius, 2 * radius,
- 0, FULL_CIRCLE);
-
+ x_get_darkcolor(color));
+ gdk_draw_arc (w_current->drawable, w_current->outline_xor_gc,
+ FALSE,
+ x, y,
+ 2 * radius, 2 * radius,
+ 0, FULL_CIRCLE);
+
/* backing store ? not appropriate here */
}
@@ -665,11 +665,11 @@ void o_circle_rubbercircle_xor(GSCHEM_TOPLEVEL *w_current)
/* draw the circle from the w_current variables */
gdk_gc_set_foreground(w_current->xor_gc,
x_get_darkcolor(w_current->select_color));
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- cx, cy, cx + radius, cy);
- gdk_draw_arc(w_current->backingstore, w_current->xor_gc, FALSE,
- cx - radius, cy - radius, 2 * radius, 2* radius,
- 0, FULL_CIRCLE);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc,
+ cx, cy, cx + radius, cy);
+ gdk_draw_arc (w_current->drawable, w_current->xor_gc, FALSE,
+ cx - radius, cy - radius, 2 * radius, 2* radius,
+ 0, FULL_CIRCLE);
o_invalidate_rect(w_current,
cx - radius, cy - radius,
cx + radius, cy + radius);
diff --git a/gschem/src/o_cue.c b/gschem/src/o_cue.c
index f78ca45..891265a 100644
--- a/gschem/src/o_cue.c
+++ b/gschem/src/o_cue.c
@@ -168,12 +168,12 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
if (count < 1) { /* Didn't find anything connected there */
if (toplevel->DONT_REDRAW == 0) {
o_cue_set_color(w_current, toplevel->net_endpoint_color);
- gdk_draw_rectangle(w_current->backingstore,
- w_current->gc, TRUE,
- screen_x - size,
- screen_y - size,
- x2size,
- x2size);
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->gc, TRUE,
+ screen_x - size,
+ screen_y - size,
+ x2size,
+ x2size);
o_invalidate_rect(w_current, screen_x - size, screen_y - size,
screen_x + size, screen_y + size);
}
@@ -189,11 +189,11 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
x2size = 2 * size;
if (toplevel->DONT_REDRAW == 0) {
o_cue_set_color(w_current, toplevel->junction_color);
- gdk_draw_arc(w_current->backingstore,
- w_current->gc, TRUE,
- screen_x - size,
- screen_y - size,
- x2size, x2size, 0, FULL_CIRCLE);
+ gdk_draw_arc (w_current->drawable,
+ w_current->gc, TRUE,
+ screen_x - size,
+ screen_y - size,
+ x2size, x2size, 0, FULL_CIRCLE);
o_invalidate_rect(w_current, screen_x - size, screen_y - size,
screen_x + size, screen_y + size);
}
@@ -214,31 +214,31 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
/* No need to invalidate the PIN end CUE, as the
* whole pin region is already invalidated. */
- if (toplevel->DONT_REDRAW == 0) {
- o_cue_set_color(w_current, toplevel->net_endpoint_color);
- if (object->line->y[whichone] == object->line->y[otherone]) {
- /* horizontal line */
- if (object->line->x[whichone] <= object->line->x[otherone]) {
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x, screen_y, screen_x + size, screen_y);
- } else {
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x, screen_y, screen_x - size, screen_y);
- }
- } else if (object->line->x[0] == object->line->x[1]) {
- /* vertical line */
- if (object->line->y[whichone] <= object->line->y[otherone]) {
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x, screen_y, screen_x, screen_y - size);
- } else {
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x, screen_y, screen_x, screen_y + size);
- }
- } else {
- /* angled line */
- /* not supporting rendering of que for angled pin for now. hack */
- }
- }
+ if (toplevel->DONT_REDRAW == 0) {
+ o_cue_set_color(w_current, toplevel->net_endpoint_color);
+ if (object->line->y[whichone] == object->line->y[otherone]) {
+ /* horizontal line */
+ if (object->line->x[whichone] <= object->line->x[otherone]) {
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x, screen_y, screen_x + size, screen_y);
+ } else {
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x, screen_y, screen_x - size, screen_y);
+ }
+ } else if (object->line->x[0] == object->line->x[1]) {
+ /* vertical line */
+ if (object->line->y[whichone] <= object->line->y[otherone]) {
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x, screen_y, screen_x, screen_y - size);
+ } else {
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x, screen_y, screen_x, screen_y + size);
+ }
+ } else {
+ /* angled line */
+ /* not supporting rendering of que for angled pin for now. hack */
+ }
+ }
if (toplevel->pin_style == THICK ) {
gdk_gc_set_line_attributes(w_current->gc, 0,
@@ -262,11 +262,11 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
if (toplevel->DONT_REDRAW == 0) {
o_cue_set_color(w_current, toplevel->junction_color);
- gdk_draw_arc(w_current->backingstore,
- w_current->gc, TRUE,
- screen_x - size,
- screen_y - size,
- x2size, x2size, 0, FULL_CIRCLE);
+ gdk_draw_arc (w_current->drawable,
+ w_current->gc, TRUE,
+ screen_x - size,
+ screen_y - size,
+ x2size, x2size, 0, FULL_CIRCLE);
o_invalidate_rect(w_current, screen_x - size, screen_y - size,
screen_x + size, screen_y + size);
}
@@ -304,12 +304,12 @@ void o_cue_erase_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whicho
WORLDtoSCREEN(toplevel, x, y, &screen_x, &screen_y);
if (toplevel->DONT_REDRAW == 0) {
- gdk_draw_rectangle(w_current->backingstore,
- w_current->gc, TRUE,
- screen_x - size,
- screen_y - size,
- x2size,
- x2size);
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->gc, TRUE,
+ screen_x - size,
+ screen_y - size,
+ x2size,
+ x2size);
o_invalidate_rect(w_current, screen_x - size, screen_y - size,
screen_x + size, screen_y + size);
}
@@ -346,9 +346,9 @@ void o_cue_draw_lowlevel_midpoints(GSCHEM_TOPLEVEL *w_current, OBJECT *object)
x = conn->x;
y = conn->y;
-
+
WORLDtoSCREEN(toplevel, x, y, &screen_x, &screen_y);
-
+
/* draw circle */
if (conn->other_object &&
( (object->type == OBJ_BUS &&
@@ -361,18 +361,17 @@ void o_cue_draw_lowlevel_midpoints(GSCHEM_TOPLEVEL *w_current, OBJECT *object)
}
x2size = size * 2;
- if (toplevel->DONT_REDRAW == 0) {
- gdk_draw_arc(w_current->backingstore,
- w_current->gc, TRUE,
- screen_x - size,
- screen_y - size,
- x2size, x2size, 0, FULL_CIRCLE);
- o_invalidate_rect(w_current, screen_x - size, screen_y - size,
- screen_x + size, screen_y + size);
- }
+ if (toplevel->DONT_REDRAW == 0) {
+ gdk_draw_arc (w_current->drawable,
+ w_current->gc, TRUE,
+ screen_x - size,
+ screen_y - size,
+ x2size, x2size, 0, FULL_CIRCLE);
+ o_invalidate_rect (w_current, screen_x - size, screen_y - size,
+ screen_x + size, screen_y + size);
+ }
break;
}
-
cl_current = g_list_next(cl_current);
}
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 6714598..79a2469 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -1773,8 +1773,8 @@ void o_grips_draw(GSCHEM_TOPLEVEL *w_current, int x, int y)
*/
if (toplevel->DONT_REDRAW == 0) {
/* draw the grip in backingstore */
- gdk_draw_rectangle(w_current->backingstore, w_current->gc, FALSE,
- x - size, y - size, x2size, x2size);
+ gdk_draw_rectangle (w_current->drawable, w_current->gc, FALSE,
+ x - size, y - size, x2size, x2size);
o_invalidate_rect(w_current, x - size, y - size, x + size, y + size);
}
}
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 9f5b103..1741116 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -157,8 +157,8 @@ void o_line_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
if((length == 0) || (space == 0))
draw_func = o_line_draw_solid;
- (*draw_func)(w_current->backingstore, w_current->gc, color, line_end,
- x1, y1, x2, y2, line_width, length, space);
+ (*draw_func) (w_current->drawable, w_current->gc, color, line_end,
+ x1, y1, x2, y2, line_width, length, space);
/* reset line width and reset back to default */
gdk_gc_set_line_attributes(w_current->gc, 0, GDK_LINE_SOLID,
@@ -733,8 +733,8 @@ void o_line_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curre
WORLDtoSCREEN(toplevel, o_current->line->x[0] + dx, o_current->line->y[0] + dy, &sx[0], &sy[0]);
WORLDtoSCREEN(toplevel, o_current->line->x[1] + dx, o_current->line->y[1] + dy, &sx[1], &sy[1]);
- gdk_draw_line(w_current->backingstore, w_current->outline_xor_gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->outline_xor_gc,
+ sx[0], sy[0], sx[1], sy[1]);
}
/*! \brief Start process to input a new line.
@@ -892,8 +892,7 @@ void o_line_rubberline_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_line_attributes(w_current->xor_gc, 0,
GDK_LINE_SOLID, GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc, x1, y1, x2, y2);
o_invalidate_rect(w_current, x1, y1, x2, y2);
}
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index e5824c1..455b700 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -121,20 +121,18 @@ void o_net_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
gdk_gc_set_foreground(w_current->gc,
x_get_color(toplevel->override_color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->gc, x1, y1, x2, y2);
} else {
gdk_gc_set_foreground(w_current->gc,
x_get_color(o_current->color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->gc, x1, y1, x2, y2);
#if NET_DEBUG
/* temp debug only */
font = gdk_fontset_load ("10x20");
tempstring = g_strdup_printf("%s", o_current->name);
- gdk_draw_text (w_current->backingstore,
+ gdk_draw_text (w_current->drawable,
font,
w_current->gc,
x1+20, y1+20,
@@ -211,8 +209,8 @@ void o_net_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
WORLDtoSCREEN(toplevel, o_current->line->x[0] + dx, o_current->line->y[0] + dy, &sx[0], &sy[0]);
WORLDtoSCREEN(toplevel, o_current->line->x[1] + dx, o_current->line->y[1] + dy, &sx[1], &sy[1]);
- gdk_draw_line(w_current->backingstore, w_current->outline_xor_gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->outline_xor_gc,
+ sx[0], sy[0], sx[1], sy[1]);
if (toplevel->net_style == THICK ) {
gdk_gc_set_line_attributes(w_current->outline_xor_gc, 0,
@@ -265,8 +263,8 @@ void o_net_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int which
WORLDtoSCREEN( toplevel, o_current->line->x[0] + dx1, o_current->line->y[0] + dy1, &sx[0], &sy[0] );
WORLDtoSCREEN( toplevel, o_current->line->x[1] + dx2, o_current->line->y[1] + dy2, &sx[1], &sy[1] );
- gdk_draw_line(w_current->backingstore, w_current->outline_xor_gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->outline_xor_gc,
+ sx[0], sy[0], sx[1], sy[1]);
o_invalidate_rect(w_current,
sx[0], sy[0], sx[1], sy[1]);
@@ -743,8 +741,8 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
WORLDtoSCREEN( toplevel, new_net->line->x[1], new_net->line->y[1], &sx[1], &sy[1] );
gdk_gc_set_foreground(w_current->gc, x_get_color(color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ sx[0], sy[0], sx[1], sy[1]);
o_invalidate_rect(w_current, sx[0], sy[0], sx[1], sy[1]);
if (toplevel->net_style == THICK) {
@@ -806,8 +804,8 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
WORLDtoSCREEN( toplevel, new_net->line->x[1], new_net->line->y[1], &sx[1], &sy[1] );
gdk_gc_set_foreground(w_current->gc, x_get_color(color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ sx[0], sy[0], sx[1], sy[1]);
o_invalidate_rect(w_current, sx[0], sy[0], sx[1], sy[1]);
if (toplevel->net_style == THICK) {
@@ -942,11 +940,11 @@ void o_net_drawrubber(GSCHEM_TOPLEVEL *w_current)
w_current->magnetic_visible = 1;
w_current->inside_action = 1;
magnetic_halfsize = max(4*size, MAGNETIC_HALFSIZE);
- gdk_draw_arc(w_current->backingstore, w_current->xor_gc, FALSE,
- magnetic_x - magnetic_halfsize,
- magnetic_y - magnetic_halfsize,
- 2*magnetic_halfsize, 2*magnetic_halfsize,
- 0, FULL_CIRCLE);
+ gdk_draw_arc (w_current->drawable, w_current->xor_gc, FALSE,
+ magnetic_x - magnetic_halfsize,
+ magnetic_y - magnetic_halfsize,
+ 2 * magnetic_halfsize, 2 * magnetic_halfsize,
+ 0, FULL_CIRCLE);
o_invalidate_rect(w_current,
magnetic_x - magnetic_halfsize - size/2,
magnetic_y - magnetic_halfsize - size/2,
@@ -956,8 +954,8 @@ void o_net_drawrubber(GSCHEM_TOPLEVEL *w_current)
}
/* draw primary line */
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- first_x, first_y, second_x, second_y);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc,
+ first_x, first_y, second_x, second_y);
o_invalidate_rect(w_current,
min(first_x, second_x) - size/2,
min(first_y, second_y) - size/2,
@@ -965,8 +963,8 @@ void o_net_drawrubber(GSCHEM_TOPLEVEL *w_current)
max(first_y, second_y) + size/2);
/* Draw secondary line */
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- second_x, second_y, third_x, third_y);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc,
+ second_x, second_y, third_x, third_y);
o_invalidate_rect(w_current,
min(second_x, third_x) - size/2,
min(second_y, third_y) - size/2,
@@ -1020,11 +1018,11 @@ void o_net_eraserubber(GSCHEM_TOPLEVEL *w_current)
if (w_current->magnetic_visible) {
w_current->magnetic_visible = 0;
magnetic_halfsize = max(4*size, MAGNETIC_HALFSIZE);
- gdk_draw_arc(w_current->backingstore, w_current->xor_gc, FALSE,
- magnetic_x - magnetic_halfsize,
- magnetic_y - magnetic_halfsize,
- 2*magnetic_halfsize, 2*magnetic_halfsize,
- 0, FULL_CIRCLE);
+ gdk_draw_arc (w_current->drawable, w_current->xor_gc, FALSE,
+ magnetic_x - magnetic_halfsize,
+ magnetic_y - magnetic_halfsize,
+ 2 * magnetic_halfsize, 2 * magnetic_halfsize,
+ 0, FULL_CIRCLE);
o_invalidate_rect(w_current,
magnetic_x - magnetic_halfsize - size/2,
magnetic_y - magnetic_halfsize - size/2,
@@ -1033,8 +1031,8 @@ void o_net_eraserubber(GSCHEM_TOPLEVEL *w_current)
}
/* Erase primary primary rubber net line */
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- first_x, first_y, second_x, second_y);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc,
+ first_x, first_y, second_x, second_y);
o_invalidate_rect(w_current,
min(first_x, second_x) - size/2,
min(first_y, second_y) - size/2,
@@ -1042,8 +1040,8 @@ void o_net_eraserubber(GSCHEM_TOPLEVEL *w_current)
max(first_y, second_y) + size/2);
/* Erase secondary rubber net line */
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- second_x, second_y, third_x, third_y);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc,
+ second_x, second_y, third_x, third_y);
o_invalidate_rect(w_current,
min(second_x, third_x) - size/2,
min(second_y, third_y) - size/2,
diff --git a/gschem/src/o_path.c b/gschem/src/o_path.c
index 540cb58..aed412d 100644
--- a/gschem/src/o_path.c
+++ b/gschem/src/o_path.c
@@ -191,11 +191,11 @@ void o_path_draw_solid(GdkDrawable *w, GdkGC *gc, GdkColor *color,
if (path->sections[path->num_sections - 1].code == PATH_END) {
/* Closed path */
- gdk_draw_polygon (w_current->backingstore, w_current->gc,
+ gdk_draw_polygon (w_current->drawable, w_current->gc,
FALSE, points, num_points);
} else {
/* Open path */
- gdk_draw_lines (w_current->backingstore, w_current->gc,
+ gdk_draw_lines (w_current->drawable, w_current->gc,
points, num_points);
}
@@ -361,8 +361,8 @@ static void o_path_fill_fill (GdkDrawable *w, GdkGC *gc, GdkColor *color,
return;
}
- gdk_draw_polygon(w_current->backingstore, w_current->gc,
- TRUE, points, num_points);
+ gdk_draw_polygon (w_current->drawable, w_current->gc,
+ TRUE, points, num_points);
g_free (points);
}
@@ -545,7 +545,7 @@ void o_path_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
if((length == 0) || (space == 0))
draw_func = o_path_draw_solid;
- (*draw_func) (w_current->backingstore, w_current->gc, color, w_current,
+ (*draw_func) (w_current->drawable, w_current->gc, color, w_current,
o_current->path, path_end, line_width, length, space);
@@ -615,7 +615,7 @@ void o_path_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
fill_func = o_path_fill_fill;
}
- (*fill_func) (w_current->backingstore, w_current->gc, color,
+ (*fill_func) (w_current->drawable, w_current->gc, color,
w_current, path, fill_width, angle1, pitch1, angle2, pitch2);
if (o_current->draw_grips && w_current->draw_grips == TRUE) {
@@ -683,10 +683,10 @@ void o_path_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curre
/* Stroke only, no fill for XOR */
if (path->sections[path->num_sections - 1].code == PATH_END)
- gdk_draw_polygon (w_current->backingstore, w_current->xor_gc,
+ gdk_draw_polygon (w_current->drawable, w_current->xor_gc,
FALSE, points, num_points);
else
- gdk_draw_lines (w_current->backingstore, w_current->xor_gc,
+ gdk_draw_lines (w_current->drawable, w_current->xor_gc,
points, num_points);
g_free (points);
@@ -797,10 +797,10 @@ void o_path_rubberpath_xor(GSCHEM_TOPLEVEL *w_current)
/* Stroke only, no fill for rubberbanding */
if (path->sections[path->num_sections - 1].code == PATH_END)
- gdk_draw_polygon (w_current->backingstore, w_current->xor_gc,
+ gdk_draw_polygon (w_current->drawable, w_current->xor_gc,
FALSE, points, num_points);
else
- gdk_draw_lines (w_current->backingstore, w_current->xor_gc,
+ gdk_draw_lines (w_current->drawable, w_current->xor_gc,
points, num_points);
find_points_bounds (points, num_points, &left, &top, &right, &bottom);
@@ -858,9 +858,9 @@ static void o_path_xor_control_lines (GSCHEM_TOPLEVEL *w_current,
case PATH_CURVETO:
/* Two control point grips */
WORLDtoSCREEN (toplevel, section->x1, section->y1, &x, &y);
- gdk_draw_line (w_current->backingstore, gc, last_x, last_y, x, y);
+ gdk_draw_line (w_current->drawable, gc, last_x, last_y, x, y);
WORLDtoSCREEN (toplevel, section->x2, section->y2, &x, &y);
- gdk_draw_line (w_current->backingstore, gc, next_x, next_y, x, y);
+ gdk_draw_line (w_current->drawable, gc, next_x, next_y, x, y);
/* Fall through */
case PATH_MOVETO:
case PATH_MOVETO_OPEN:
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index c52bbf3..674c438 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -290,8 +290,8 @@ void o_picture_rubberbox_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_line_attributes(w_current->xor_gc, 0,
GDK_LINE_SOLID, GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
- gdk_draw_rectangle(w_current->backingstore, w_current->xor_gc,
- FALSE, left, top, width, height);
+ gdk_draw_rectangle (w_current->drawable, w_current->xor_gc,
+ FALSE, left, top, width, height);
o_invalidate_rect(w_current,
left, top, left + width, top + height);
}
@@ -387,21 +387,21 @@ void o_picture_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
}
if (toplevel->DONT_REDRAW == 0) {
- gdk_draw_pixbuf(w_current->backingstore, w_current->gc,
- o_current->picture->displayed_picture,
- 0, 0, s_upper_x, s_upper_y,
- -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
+ gdk_draw_pixbuf (w_current->drawable, w_current->gc,
+ o_current->picture->displayed_picture,
+ 0, 0, s_upper_x, s_upper_y,
+ -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
}
}
else {
if (toplevel->DONT_REDRAW == 0) {
/* Erase the picture, drawing a rectangle with the background color */
- gdk_gc_set_foreground(w_current->gc,
- x_get_color(toplevel->background_color));
- gdk_draw_rectangle(w_current->backingstore, w_current->gc, TRUE,
- s_upper_x, s_upper_y,
- abs(s_lower_x -s_upper_x),
- abs(s_lower_y - s_upper_y));
+ gdk_gc_set_foreground(w_current->gc,
+ x_get_color(toplevel->background_color));
+ gdk_draw_rectangle (w_current->drawable, w_current->gc, TRUE,
+ s_upper_x, s_upper_y,
+ abs(s_lower_x -s_upper_x),
+ abs(s_lower_y - s_upper_y));
}
}
@@ -460,10 +460,10 @@ void o_picture_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
o_grips_draw(w_current, s_lower_x, s_lower_y);
/* Box surrounding the picture */
- gdk_draw_rectangle(w_current->backingstore, w_current->gc, FALSE,
- s_upper_x, s_upper_y,
- abs(s_upper_x - s_lower_x),
- abs(s_upper_y - s_lower_y));
+ gdk_draw_rectangle (w_current->drawable, w_current->gc, FALSE,
+ s_upper_x, s_upper_y,
+ abs(s_upper_x - s_lower_x),
+ abs(s_upper_y - s_lower_y));
}
/*! \brief Erase grip marks from box.
@@ -503,10 +503,10 @@ void o_picture_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
o_grips_erase(w_current, s_lower_x, s_lower_y);
/* Box surrounding the picture */
- gdk_draw_rectangle(w_current->backingstore, w_current->gc, FALSE,
- s_upper_x, s_upper_y,
- abs(s_upper_x - s_lower_x),
- abs(s_upper_y - s_lower_y));
+ gdk_draw_rectangle (w_current->drawable, w_current->gc, FALSE,
+ s_upper_x, s_upper_y,
+ abs(s_upper_x - s_lower_x),
+ abs(s_upper_y - s_lower_y));
}
@@ -552,12 +552,12 @@ void o_picture_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_cu
gdk_gc_set_foreground(w_current->outline_xor_gc,
x_get_darkcolor(color));
- gdk_draw_rectangle(w_current->backingstore,
- w_current->outline_xor_gc, FALSE,
- screen_x1,
- screen_y1,
- abs(screen_x2 - screen_x1),
- abs(screen_y2 - screen_y1));
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->outline_xor_gc, FALSE,
+ screen_x1,
+ screen_y1,
+ abs(screen_x2 - screen_x1),
+ abs(screen_y2 - screen_y1));
}
/*! \brief Replace all selected pictures with a new picture
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 7012863..7372e71 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -64,14 +64,12 @@ void o_pin_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
gdk_gc_set_foreground(w_current->gc,
x_get_color(toplevel->override_color));
if (toplevel->DONT_REDRAW == 0) {
- gdk_draw_line(w_current->backingstore, w_current->gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->gc, x1, y1, x2, y2);
}
} else {
if (toplevel->DONT_REDRAW == 0) {
gdk_gc_set_foreground(w_current->gc, x_get_color(o_current->color));
- gdk_draw_line(w_current->backingstore, w_current->gc,
- x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->gc, x1, y1, x2, y2);
}
}
@@ -137,8 +135,8 @@ void o_pin_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
WORLDtoSCREEN(toplevel, o_current->line->x[0] + dx, o_current->line->y[0] + dy, &sx[0], &sy[0]);
WORLDtoSCREEN(toplevel, o_current->line->x[1] + dx, o_current->line->y[1] + dy, &sx[1], &sy[1]);
- gdk_draw_line(w_current->backingstore, w_current->xor_gc,
- sx[0], sy[0], sx[1], sy[1]);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc,
+ sx[0], sy[0], sx[1], sy[1]);
if (toplevel->pin_style == THICK ) {
gdk_gc_set_line_attributes(w_current->xor_gc, 0,
@@ -286,7 +284,7 @@ void o_pin_rubberpin_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_foreground(w_current->xor_gc,
x_get_darkcolor(w_current->select_color));
- gdk_draw_line(w_current->backingstore, w_current->xor_gc, x1, y1, x2, y2);
+ gdk_draw_line (w_current->drawable, w_current->xor_gc, x1, y1, x2, y2);
o_invalidate_rect(w_current,
min(x1, x2) - size/2, min(y1, y2) - size/2,
max(x1, x2) + size/2, max(y1, y2) + size/2);
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index 2d72df1..49db0bc 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -310,9 +310,9 @@ void o_select_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current)
gdk_gc_set_foreground(w_current->xor_gc,
x_get_darkcolor(w_current->select_color));
- gdk_draw_rectangle(w_current->backingstore, w_current->xor_gc,
- FALSE,
- box_left, box_top, box_width, box_height);
+ gdk_draw_rectangle (w_current->drawable, w_current->xor_gc,
+ FALSE,
+ box_left, box_top, box_width, box_height);
o_invalidate_rect(w_current,
box_left, box_top,
box_left + box_width, box_top + box_height);
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index 64e65ae..e2dcff8 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -96,13 +96,13 @@ void o_text_draw_rectangle(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
gdk_gc_set_foreground(w_current->gc, color);
if (toplevel->DONT_REDRAW == 0) {
- gdk_draw_rectangle( w_current->backingstore,
+ gdk_draw_rectangle (w_current->drawable,
w_current->gc,
FALSE,
- left,
+ left,
top,
right - left,
- bottom - top );
+ bottom - top);
}
}
@@ -147,25 +147,25 @@ void o_text_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
screen_x1 += offset;
screen_y1 += offset;
if (toplevel->DONT_REDRAW == 0) {
- /* Top part of the I */
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x1,
- screen_y1,
- screen_x1+small_dist,
- screen_y1);
- /* Middle part of the I */
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x1+small_dist/2,
- screen_y1,
- screen_x1+small_dist/2,
- screen_y1+small_dist);
- /* Bottom part of the I */
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x1,
- screen_y1+small_dist,
- screen_x1+small_dist,
- screen_y1+small_dist);
- }
+ /* Top part of the I */
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x1,
+ screen_y1,
+ screen_x1+small_dist,
+ screen_y1);
+ /* Middle part of the I */
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x1+small_dist/2,
+ screen_y1,
+ screen_x1+small_dist/2,
+ screen_y1+small_dist);
+ /* Bottom part of the I */
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x1,
+ screen_y1+small_dist,
+ screen_x1+small_dist,
+ screen_y1+small_dist);
+ }
}
} else {
@@ -201,17 +201,17 @@ void o_text_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
}
if (toplevel->DONT_REDRAW == 0) {
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x1-small_dist,
- screen_y1+small_dist,
- screen_x1+small_dist,
- screen_y1-small_dist);
-
- gdk_draw_line(w_current->backingstore, w_current->gc,
- screen_x1+small_dist,
- screen_y1+small_dist,
- screen_x1-small_dist,
- screen_y1-small_dist);
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x1-small_dist,
+ screen_y1+small_dist,
+ screen_x1+small_dist,
+ screen_y1-small_dist);
+
+ gdk_draw_line (w_current->drawable, w_current->gc,
+ screen_x1+small_dist,
+ screen_y1+small_dist,
+ screen_x1-small_dist,
+ screen_y1-small_dist);
}
}
@@ -252,13 +252,13 @@ void o_text_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curre
gdk_gc_set_foreground(w_current->outline_xor_gc,
x_get_darkcolor(color));
- gdk_draw_rectangle( w_current->backingstore,
+ gdk_draw_rectangle (w_current->drawable,
w_current->outline_xor_gc,
FALSE,
left,
top,
right - left,
- bottom - top );
+ bottom - top);
}
}
diff --git a/gschem/src/x_basic.c b/gschem/src/x_basic.c
index 59c6861..b595f33 100644
--- a/gschem/src/x_basic.c
+++ b/gschem/src/x_basic.c
@@ -41,10 +41,10 @@ void x_repaint_background(GSCHEM_TOPLEVEL *w_current)
w_current->gc,
x_get_color(toplevel->background_color));
- gdk_draw_rectangle(w_current->backingstore,
- w_current->gc, TRUE, 0, 0,
- w_current->win_width,
- w_current->win_height);
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->gc, TRUE, 0, 0,
+ w_current->win_width,
+ w_current->win_height);
o_invalidate_all (w_current);
x_grid_draw(w_current);
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index f7ed9c9..3b74bd6 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -59,7 +59,7 @@ gint x_event_expose(GtkWidget *widget, GdkEventExpose *event,
gdk_draw_pixmap(widget->window,
widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
- w_current->backingstore,
+ w_current->drawable,
event->area.x, event->area.y,
event->area.x, event->area.y,
event->area.width, event->area.height);
@@ -937,13 +937,13 @@ x_event_configure (GtkWidget *widget,
}
/* update the backingstore of toplevel */
- if (w_current->backingstore != NULL) {
- gdk_pixmap_unref (w_current->backingstore);
+ if (w_current->drawable != NULL) {
+ gdk_pixmap_unref (w_current->drawable);
}
- w_current->backingstore = gdk_pixmap_new (widget->window,
- new_win_width,
- new_win_height,
- -1);
+ w_current->drawable = gdk_pixmap_new (widget->window,
+ new_win_width,
+ new_win_height,
+ -1);
/* update the GSCHEM_TOPLEVEL with new size of drawing area */
w_current->win_width = toplevel->width = new_win_width;
w_current->win_height = toplevel->height = new_win_height;
diff --git a/gschem/src/x_grid.c b/gschem/src/x_grid.c
index fa9e3fb..2fd441c 100644
--- a/gschem/src/x_grid.c
+++ b/gschem/src/x_grid.c
@@ -120,18 +120,17 @@ void x_grid_draw(GSCHEM_TOPLEVEL *w_current)
/* get out of loop if more than 1000 points */
if (count == 5000) {
- gdk_draw_points(
- w_current->backingstore,
- w_current->gc, points, count);
+ gdk_draw_points (w_current->drawable,
+ w_current->gc, points, count);
count=0;
}
}
else
{
- gdk_draw_arc(w_current->backingstore, w_current->gc,
- TRUE, x, y,
- w_current->grid_dot_size,
- w_current->grid_dot_size, 0, FULL_CIRCLE);
+ gdk_draw_arc (w_current->drawable, w_current->gc,
+ TRUE, x, y,
+ w_current->grid_dot_size,
+ w_current->grid_dot_size, 0, FULL_CIRCLE);
}
}
}
@@ -139,8 +138,8 @@ void x_grid_draw(GSCHEM_TOPLEVEL *w_current)
/* now draw all the points in one step */
if(count != 0) {
- gdk_draw_points(w_current->backingstore,
- w_current->gc, points, count);
+ gdk_draw_points (w_current->drawable,
+ w_current->gc, points, count);
}
#if DEBUG
@@ -186,17 +185,17 @@ void x_draw_tiles(GSCHEM_TOPLEVEL *w_current)
printf("x, y: %d %d\n", screen_x, screen_y);
printf("w x h: %d %d\n", width, height);
#endif
- gdk_draw_rectangle(w_current->backingstore,
- w_current->gc,
- FALSE, screen_x, screen_y,
- width, height);
+ gdk_draw_rectangle (w_current->drawable,
+ w_current->gc,
+ FALSE, screen_x, screen_y,
+ width, height);
tempstring = g_strdup_printf("%d %d", i, j);
- gdk_draw_text (w_current->backingstore,
+ gdk_draw_text (w_current->drawable,
font,
w_current->gc,
- screen_x+10, screen_y+10,
+ screen_x+10, screen_y+10,
tempstring,
strlen(tempstring));
g_free(tempstring);
diff --git a/gschem/src/x_image.c b/gschem/src/x_image.c
index 4b18a01..e274ff4 100644
--- a/gschem/src/x_image.c
+++ b/gschem/src/x_image.c
@@ -655,8 +655,8 @@ GdkPixbuf *x_image_get_pixbuf (GSCHEM_TOPLEVEL *w_current)
size_x = new_w_current.image_width;
size_y = new_w_current.image_height;
- new_w_current.window = gdk_pixmap_new(w_current->window, size_x, size_y, -1);
- new_w_current.backingstore = gdk_pixmap_new(w_current->window, size_x, size_y, -1);
+ new_w_current.window = gdk_pixmap_new (w_current->window, size_x, size_y, -1);
+ new_w_current.drawable = gdk_pixmap_new (w_current->window, size_x, size_y, -1);
new_w_current.grid = 0;
new_w_current.text_origin_marker = FALSE;
@@ -717,10 +717,10 @@ GdkPixbuf *x_image_get_pixbuf (GSCHEM_TOPLEVEL *w_current)
o_redraw_all (&new_w_current);
/* Get the pixbuf */
- pixbuf=gdk_pixbuf_get_from_drawable(NULL,new_w_current.backingstore, NULL,
- origin_x, origin_y, 0, 0,
- right-origin_x,
- bottom-origin_y);
+ pixbuf = gdk_pixbuf_get_from_drawable (NULL,new_w_current.drawable, NULL,
+ origin_x, origin_y, 0, 0,
+ right-origin_x,
+ bottom-origin_y);
if (toplevel.image_color == FALSE)
{
@@ -730,8 +730,8 @@ GdkPixbuf *x_image_get_pixbuf (GSCHEM_TOPLEVEL *w_current)
if (new_w_current.window != NULL) {
g_object_unref(new_w_current.window);
}
- if (new_w_current.backingstore != NULL) {
- g_object_unref(new_w_current.backingstore);
+ if (new_w_current.drawable != NULL) {
+ g_object_unref (new_w_current.drawable);
}
return(pixbuf);
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index 3b09c61..2218293 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -88,7 +88,7 @@ preview_callback_realize (GtkWidget *widget,
preview_w_current->win_width = preview_toplevel->width;
preview_w_current->win_height = preview_toplevel->height;
- preview_w_current->backingstore = gdk_pixmap_new (
+ preview_w_current->drawable = gdk_pixmap_new (
preview_w_current->window,
preview_w_current->drawing_area->allocation.width,
preview_w_current->drawing_area->allocation.height, -1);
@@ -127,12 +127,12 @@ preview_callback_expose (GtkWidget *widget,
Preview *preview = PREVIEW (widget);
GSCHEM_TOPLEVEL *preview_w_current = preview->preview_w_current;
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
- preview_w_current->backingstore,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ gdk_draw_pixmap (widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ preview_w_current->drawable,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
return FALSE;
}
@@ -482,8 +482,8 @@ preview_dispose (GObject *self)
if (preview_w_current != NULL) {
preview_w_current->drawing_area = NULL;
- if (preview_w_current->backingstore) {
- gdk_pixmap_unref (preview_w_current->backingstore);
+ if (preview_w_current->drawable) {
+ gdk_pixmap_unref (preview_w_current->drawable);
}
x_window_free_gc (preview_w_current);
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 04ac14a..1904f20 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -578,10 +578,10 @@ void x_window_create_main(GSCHEM_TOPLEVEL *w_current)
w_current->window = w_current->drawing_area->window;
- w_current->backingstore = gdk_pixmap_new(w_current->window,
- w_current->drawing_area->allocation.width,
- w_current->drawing_area->allocation.height,
- -1);
+ w_current->drawable = gdk_pixmap_new (w_current->window,
+ w_current->drawing_area->allocation.width,
+ w_current->drawing_area->allocation.height,
+ -1);
x_window_setup_gc(w_current);
}
@@ -678,8 +678,8 @@ void x_window_close(GSCHEM_TOPLEVEL *w_current)
o_buffer_free (w_current);
}
- if (w_current->backingstore) {
- gdk_pixmap_unref(w_current->backingstore);
+ if (w_current->drawable) {
+ gdk_pixmap_unref (w_current->drawable);
}
x_window_free_gc(w_current);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs