gEDA-cvs: pcb.git: branch: master updated (39ca0bda4ffc59f592d48b64c866ed6a856ed356)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  39ca0bda4ffc59f592d48b64c866ed6a856ed356 (commit)
      from  93cc05a2b4b7689d56bc69f86fff7ef62e003e11 (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        |    6 +++---
 src/hid/gtk/gtkhid-gl.c         |    4 ++--
 src/hid/gtk/gtkhid-main.c       |    6 +++---
 src/hid/gtk/gui-output-events.c |    2 +-
 src/hid/gtk/gui.h               |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)


=================
 Commit Messages
=================

commit 39ca0bda4ffc59f592d48b64c866ed6a856ed356
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gtk: Rename {x,y}_crosshair to crosshair_{x,y}
    
    (Just because!)

:100644 100644 48d9fc2... 5da8000... M	src/hid/gtk/gtkhid-gdk.c
:100644 100644 419d229... 044d7c5... M	src/hid/gtk/gtkhid-gl.c
:100644 100644 6a8d904... a3c3d29... M	src/hid/gtk/gtkhid-main.c
:100644 100644 1f9a31a... abf8f53... M	src/hid/gtk/gui-output-events.c
:100644 100644 31ee636... 1253511... M	src/hid/gtk/gui.h

=========
 Changes
=========

commit 39ca0bda4ffc59f592d48b64c866ed6a856ed356
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gtk: Rename {x,y}_crosshair to crosshair_{x,y}
    
    (Just because!)

diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 48d9fc2..5da8000 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -1005,7 +1005,7 @@ show_crosshair (gboolean paint_new_location)
   static GdkGC *xor_gc;
   static GdkColor cross_color;
 
-  if (gport->x_crosshair < 0 || ghidgui->creating || !gport->has_entered)
+  if (gport->crosshair_x < 0 || ghidgui->creating || !gport->has_entered)
     return;
 
   if (!xor_gc)
@@ -1018,8 +1018,8 @@ show_crosshair (gboolean paint_new_location)
       /* FIXME: when CrossColor changed from config */
       ghid_map_color_string (Settings.CrossColor, &cross_color);
     }
-  x = DRAW_X (gport->x_crosshair);
-  y = DRAW_Y (gport->y_crosshair);
+  x = DRAW_X (gport->crosshair_x);
+  y = DRAW_Y (gport->crosshair_y);
 
   gdk_gc_set_foreground (xor_gc, &cross_color);
 
diff --git a/src/hid/gtk/gtkhid-gl.c b/src/hid/gtk/gtkhid-gl.c
index 419d229..044d7c5 100644
--- a/src/hid/gtk/gtkhid-gl.c
+++ b/src/hid/gtk/gtkhid-gl.c
@@ -746,8 +746,8 @@ ghid_show_crosshair (gboolean paint_new_location)
       /* FIXME: when CrossColor changed from config */
       ghid_map_color_string (Settings.CrossColor, &cross_color);
     }
-  x = gport->x_crosshair;
-  y = gport->y_crosshair;
+  x = gport->crosshair_x;
+  y = gport->crosshair_y;
   z = 0;
 
   glEnable (GL_COLOR_LOGIC_OP);
diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 6a8d904..a3c3d29 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -345,11 +345,11 @@ ghid_mod1_is_pressed ()
 void
 ghid_set_crosshair (int x, int y, int action)
 {
-  if (gport->x_crosshair != x || gport->y_crosshair != y)
+  if (gport->crosshair_x != x || gport->crosshair_y != y)
     {
       ghid_set_cursor_position_labels ();
-      gport->x_crosshair = x;
-      gport->y_crosshair = y;
+      gport->crosshair_x = x;
+      gport->crosshair_y = y;
 
       /*
        * FIXME - does this trigger the idle_proc stuff?  It is in the
diff --git a/src/hid/gtk/gui-output-events.c b/src/hid/gtk/gui-output-events.c
index 1f9a31a..abf8f53 100644
--- a/src/hid/gtk/gui-output-events.c
+++ b/src/hid/gtk/gui-output-events.c
@@ -592,7 +592,7 @@ static gboolean check_object_tooltips (GHidPort *out)
   char *description;
 
   /* check if there are any pins or pads at that position */
-  description = describe_location (out->x_crosshair, out->y_crosshair);
+  description = describe_location (out->crosshair_x, out->crosshair_y);
 
   if (description == NULL)
     return FALSE;
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 31ee636..1253511 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -179,7 +179,7 @@ typedef struct
   gint view_x0,			/* Viewport in PCB coordinates */
     view_y0, view_width, view_height, view_x, view_y;
 
-  gint x_crosshair, y_crosshair;
+  gint crosshair_x, crosshair_y;
 }
 GHidPort;
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs