[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (7283474c1d57a21bb6444c3e9f0b440f2d07cb18)
The branch, master has been updated
via 7283474c1d57a21bb6444c3e9f0b440f2d07cb18 (commit)
via b2f14020c01015a1eb9fa2d35f0783ae756fc269 (commit)
via e0f0bb85a4652a294b5897c072c92fd661827291 (commit)
via fa9249d625fbf66ae1276e6def5f0c38de47b9fe (commit)
from 4d239d983d96a13fcd48b837c5178af145ecca0c (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
=========
src/hid/gtk/gtkhid-gdk.c | 19 ++++---------------
src/hid/gtk/gtkhid-main.c | 4 ++--
src/hid/gtk/gui-output-events.c | 18 +-----------------
src/hid/gtk/gui.h | 3 ---
4 files changed, 7 insertions(+), 37 deletions(-)
=================
Commit Messages
=================
commit 7283474c1d57a21bb6444c3e9f0b440f2d07cb18
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Make ghid_show_crosshair() local to the GDK implementation
:100644 100644 b583325... cfbef00... M src/hid/gtk/gtkhid-gdk.c
:100644 100644 8b86396... 8a52b5a... M src/hid/gtk/gui.h
commit b2f14020c01015a1eb9fa2d35f0783ae756fc269
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Invalidate the crosshair rather than drawing it immediately
:100644 100644 0df478d... 6cb6e56... M src/hid/gtk/gtkhid-main.c
commit e0f0bb85a4652a294b5897c072c92fd661827291
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Revert "hid/gtk: Add hooks to tell the render when we start/stop drawing"
This reverts commit 332cb8ddc1cc032ac29c7d2b9a0051ccc228b6da.
Since crosshair updates are now handled by notifications to the GUI,
this isn't required for the forthcoming PCB+GL support.
:100644 100644 bd6e035... b583325... M src/hid/gtk/gtkhid-gdk.c
:100644 100644 d3678b7... d969dd2... M src/hid/gtk/gui-output-events.c
:100644 100644 cfb9708... 8b86396... M src/hid/gtk/gui.h
commit fa9249d625fbf66ae1276e6def5f0c38de47b9fe
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Avoid extra crosshair and attached object redraws
The crosshair movement is handled by a notify_crosshair_change() call
in ghid_note_event_location().
:100644 100644 a0e8eb3... d3678b7... M src/hid/gtk/gui-output-events.c
=========
Changes
=========
commit 7283474c1d57a21bb6444c3e9f0b440f2d07cb18
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Make ghid_show_crosshair() local to the GDK implementation
diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index b583325..cfbef00 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -958,8 +958,8 @@ draw_crosshair (GdkGC *xor_gc, gint x, gint y)
#define VCW 16
#define VCD 8
-void
-ghid_show_crosshair (gboolean paint_new_location)
+static void
+show_crosshair (gboolean paint_new_location)
{
gint x, y;
static gint x_prev = -1, y_prev = -1;
@@ -1067,7 +1067,7 @@ ghid_screen_update (void)
gdk_draw_drawable (gport->drawing_area->window, priv->bg_gc, gport->pixmap,
0, 0, 0, 0, gport->width, gport->height);
- ghid_show_crosshair (TRUE);
+ show_crosshair (TRUE);
}
gboolean
@@ -1080,7 +1080,7 @@ ghid_drawing_area_expose_cb (GtkWidget *widget,
gdk_draw_drawable (widget->window, priv->bg_gc, port->pixmap,
ev->area.x, ev->area.y, ev->area.x, ev->area.y,
ev->area.width, ev->area.height);
- ghid_show_crosshair (TRUE);
+ show_crosshair (TRUE);
return FALSE;
}
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 8b86396..8a52b5a 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -492,7 +492,6 @@ void ghid_invalidate_lr (int left, int right, int top, int bottom);
void ghid_invalidate_all ();
void ghid_notify_crosshair_change (bool changes_complete);
void ghid_notify_mark_change (bool changes_complete);
-void ghid_show_crosshair (gboolean show);
void ghid_init_renderer (int *, char ***, GHidPort *);
void ghid_init_drawing_widget (GtkWidget *widget, GHidPort *);
void ghid_drawing_area_configure_hook (GHidPort *port);
commit b2f14020c01015a1eb9fa2d35f0783ae756fc269
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Invalidate the crosshair rather than drawing it immediately
diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 0df478d..6cb6e56 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -1893,9 +1893,9 @@ PanAction (int argc, char **argv, int x, int y)
}
else if (x == on_x && y == on_y)
{
- ghid_show_crosshair (FALSE);
+ notify_crosshair_change (false);
ghidgui->auto_pan_on = !ghidgui->auto_pan_on;
- ghid_show_crosshair (TRUE);
+ notify_crosshair_change (true);
}
return 0;
commit e0f0bb85a4652a294b5897c072c92fd661827291
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Revert "hid/gtk: Add hooks to tell the render when we start/stop drawing"
This reverts commit 332cb8ddc1cc032ac29c7d2b9a0051ccc228b6da.
Since crosshair updates are now handled by notifications to the GUI,
this isn't required for the forthcoming PCB+GL support.
diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index bd6e035..b583325 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -1060,17 +1060,6 @@ ghid_drawing_area_configure_hook (GHidPort *port)
}
}
-gboolean
-ghid_start_drawing (GHidPort *port)
-{
- return TRUE;
-}
-
-void
-ghid_end_drawing (GHidPort *port)
-{
-}
-
void
ghid_screen_update (void)
{
diff --git a/src/hid/gtk/gui-output-events.c b/src/hid/gtk/gui-output-events.c
index d3678b7..d969dd2 100644
--- a/src/hid/gtk/gui-output-events.c
+++ b/src/hid/gtk/gui-output-events.c
@@ -646,13 +646,8 @@ ghid_port_window_motion_cb (GtkWidget * widget,
gdouble dx, dy;
static gint x_prev = -1, y_prev = -1;
-
gdk_event_request_motions (ev);
- if (!ghid_start_drawing (out))
- return FALSE;
-
-
if (out->panning)
{
dx = gport->zoom * (x_prev - ev->x);
@@ -670,7 +665,6 @@ ghid_port_window_motion_cb (GtkWidget * widget,
queue_tooltip_update (out);
#endif
- ghid_end_drawing (out);
return FALSE;
}
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index cfb9708..8b86396 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -496,8 +496,6 @@ void ghid_show_crosshair (gboolean show);
void ghid_init_renderer (int *, char ***, GHidPort *);
void ghid_init_drawing_widget (GtkWidget *widget, GHidPort *);
void ghid_drawing_area_configure_hook (GHidPort *port);
-gboolean ghid_start_drawing (GHidPort *port);
-void ghid_end_drawing (GHidPort *port);
void ghid_screen_update (void);
gboolean ghid_drawing_area_expose_cb (GtkWidget *, GdkEventExpose *,
GHidPort *);
commit fa9249d625fbf66ae1276e6def5f0c38de47b9fe
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Avoid extra crosshair and attached object redraws
The crosshair movement is handled by a notify_crosshair_change() call
in ghid_note_event_location().
diff --git a/src/hid/gtk/gui-output-events.c b/src/hid/gtk/gui-output-events.c
index a0e8eb3..d3678b7 100644
--- a/src/hid/gtk/gui-output-events.c
+++ b/src/hid/gtk/gui-output-events.c
@@ -335,8 +335,6 @@ ghid_port_key_press_cb (GtkWidget * drawing_area,
state = (GdkModifierType) (kev->state);
mk = ghid_modifier_keys_state (&state);
- ghid_show_crosshair (FALSE);
-
handled = TRUE; /* Start off assuming we handle it */
switch (ksym)
{
@@ -440,7 +438,6 @@ ghid_port_button_press_cb (GtkWidget * drawing_area,
ghid_note_event_location (ev);
state = (GdkModifierType) (ev->state);
mk = ghid_modifier_keys_state (&state);
- ghid_show_crosshair (FALSE);
do_mouse_action(ev->button, mk);
@@ -648,7 +645,6 @@ ghid_port_window_motion_cb (GtkWidget * widget,
{
gdouble dx, dy;
static gint x_prev = -1, y_prev = -1;
- gboolean moved;
gdk_event_request_motions (ev);
@@ -668,17 +664,12 @@ ghid_port_window_motion_cb (GtkWidget * widget,
return FALSE;
}
x_prev = y_prev = -1;
- moved = ghid_note_event_location ((GdkEventButton *)ev);
+ ghid_note_event_location ((GdkEventButton *)ev);
#if ENABLE_TOOLTIPS
queue_tooltip_update (out);
#endif
- ghid_show_crosshair (FALSE);
- ghid_show_crosshair (TRUE);
- if (moved && have_crosshair_attachments ())
- ghid_draw_area_update (gport, NULL);
-
ghid_end_drawing (out);
return FALSE;
}
@@ -804,7 +795,6 @@ ghid_port_window_leave_cb (GtkWidget * widget,
}
}
- ghid_show_crosshair (FALSE);
out->has_entered = FALSE;
ghid_screen_update ();
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs