[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-379-gec14a2d)
The branch, master has been updated
via ec14a2d9b48696417e3122793a71170b833de9c2 (commit)
from 2a768bee990afdb7e73a7f9c01aa0be372fd59ea (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/src/gschem_toplevel.c | 1 -
gschem/src/o_basic.c | 23 -----------------------
gschem/src/x_basic.c | 20 ++++++++------------
3 files changed, 8 insertions(+), 36 deletions(-)
=================
Commit Messages
=================
commit ec14a2d9b48696417e3122793a71170b833de9c2
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 14 03:50:24 2008 +0000
gschem: Remove un-needed GSCHEM_TOPLEVEL flag "inside_redraw"
A check of where this was tested revealed that the code-paths where a
test was present should not be hit from inside a redraw operation.
:100644 100644 e14f848... d504bb2... M gschem/src/gschem_toplevel.c
:100644 100644 c12ef78... a98687e... M gschem/src/o_basic.c
:100644 100644 b595f33... 1ede713... M gschem/src/x_basic.c
=========
Changes
=========
commit ec14a2d9b48696417e3122793a71170b833de9c2
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 14 03:50:24 2008 +0000
gschem: Remove un-needed GSCHEM_TOPLEVEL flag "inside_redraw"
A check of where this was tested revealed that the code-paths where a
test was present should not be hit from inside a redraw operation.
diff --git a/gschem/src/gschem_toplevel.c b/gschem/src/gschem_toplevel.c
index e14f848..d504bb2 100644
--- a/gschem/src/gschem_toplevel.c
+++ b/gschem/src/gschem_toplevel.c
@@ -133,7 +133,6 @@ GSCHEM_TOPLEVEL *gschem_toplevel_new ()
w_current->min_zoom = 0;
w_current->max_zoom = 8;
w_current->text_alignment = 0;
- w_current->inside_redraw = 0;
w_current->drawbounding_action_mode = FREE;
w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
w_current->CONTROLKEY = 0;
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index c12ef78..a98687e 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -97,7 +97,6 @@ void o_redraw (GSCHEM_TOPLEVEL *w_current, GList *object_list, gboolean draw_sel
GList *iter;
int redraw_state = toplevel->DONT_REDRAW;
- w_current->inside_redraw = 1;
iter = object_list;
while (iter != NULL) {
o_current = (OBJECT *)iter->data;
@@ -111,7 +110,6 @@ void o_redraw (GSCHEM_TOPLEVEL *w_current, GList *object_list, gboolean draw_sel
iter = g_list_next (iter);
}
- w_current->inside_redraw = 0;
toplevel->DONT_REDRAW = redraw_state;
o_invalidate_glist (w_current, object_list);
@@ -136,9 +134,7 @@ void o_redraw_single(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
return;
if (o_current->draw_func != NULL && o_current->type != OBJ_HEAD) {
- w_current->inside_redraw = 1;
(*o_current->draw_func)(w_current, o_current);
- w_current->inside_redraw = 0;
}
o_invalidate (w_current, o_current);
@@ -154,10 +150,6 @@ void o_draw_list(GSCHEM_TOPLEVEL *w_current, GList* list)
OBJECT* o_current;
GList *l_current;
- if (w_current->inside_redraw) {
- return;
- }
-
l_current = list;
while (l_current != NULL) {
@@ -181,9 +173,6 @@ void o_draw_selected(GSCHEM_TOPLEVEL *w_current)
TOPLEVEL *toplevel = w_current->toplevel;
GList* s_current;
OBJECT* o_current;
- if (w_current->inside_redraw) {
- return;
- }
s_current = geda_list_get_glist( toplevel->page_current->selection_list );
while (s_current != NULL) {
@@ -210,10 +199,6 @@ void o_erase_selected(GSCHEM_TOPLEVEL *w_current)
GList *iter;
OBJECT* o_current;
- if (w_current->inside_redraw) {
- return;
- }
-
list = iter = geda_list_get_glist( toplevel->page_current->selection_list );
while (iter != NULL) {
o_current = iter->data;
@@ -248,10 +233,6 @@ void o_erase_single(GSCHEM_TOPLEVEL *w_current, OBJECT *object)
TOPLEVEL *toplevel = w_current->toplevel;
OBJECT *o_current;
- if (w_current->inside_redraw) {
- return;
- }
-
o_current = object;
toplevel->override_color = toplevel->background_color;
@@ -276,10 +257,6 @@ void o_erase_list(GSCHEM_TOPLEVEL *w_current, GList* list)
OBJECT *o_current;
GList *iter;
- if (w_current->inside_redraw) {
- return;
- }
-
iter = list;
while (iter != NULL) {
o_current = iter->data;
diff --git a/gschem/src/x_basic.c b/gschem/src/x_basic.c
index b595f33..1ede713 100644
--- a/gschem/src/x_basic.c
+++ b/gschem/src/x_basic.c
@@ -36,21 +36,17 @@
void x_repaint_background(GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
- if (!w_current->inside_redraw) {
- gdk_gc_set_foreground(
- w_current->gc,
- x_get_color(toplevel->background_color));
- 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);
+ gdk_gc_set_foreground (w_current->gc,
+ x_get_color (toplevel->background_color));
- x_grid_draw(w_current);
-
- }
+ 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);
}
/*! \todo Finish function documentation!!!
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs