[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (43060601683a1f87396981db9444fdc29b020f01)
The branch, master has been updated
via 43060601683a1f87396981db9444fdc29b020f01 (commit)
via 58a94b5d9a8c76415bf16b6498d408de72a3871c (commit)
from 8821800c59ee77797ecadbc89ea90f2dd521a437 (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 | 10 +++
src/hid/gtk/gtkhid-gl.c | 10 +++
src/hid/gtk/gtkhid-main.c | 166 ++++++++++++++++++---------------------------
src/hid/gtk/gui.h | 1 +
4 files changed, 87 insertions(+), 100 deletions(-)
=================
Commit Messages
=================
commit 43060601683a1f87396981db9444fdc29b020f01
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Re-write some routines with the new ghid_pcb_to_event_coords API.
Cleans up ghid_set_crosshair() and Center() in gtkhid-main.c
:100644 100644 83df23f... ed28ca1... M src/hid/gtk/gtkhid-main.c
commit 58a94b5d9a8c76415bf16b6498d408de72a3871c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Add API to convert pcb units into drawing widget coordinates.
:100644 100644 5118612... e9b5b3e... M src/hid/gtk/gtkhid-gdk.c
:100644 100644 a910946... 5c554fa... M src/hid/gtk/gtkhid-gl.c
:100644 100644 d17cca2... c52fb65... M src/hid/gtk/gui.h
=========
Changes
=========
commit 43060601683a1f87396981db9444fdc29b020f01
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Re-write some routines with the new ghid_pcb_to_event_coords API.
Cleans up ghid_set_crosshair() and Center() in gtkhid-main.c
diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 83df23f..ed28ca1 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -286,95 +286,75 @@ ghid_mod1_is_pressed ()
void
ghid_set_crosshair (int x, int y, int action)
{
+ GdkDisplay *display;
+ GdkScreen *screen;
+ int offset_x, offset_y;
+ int widget_x, widget_y;
+ int pointer_x, pointer_y;
+ Coord pcb_x, pcb_y;
+
if (gport->crosshair_x != x || gport->crosshair_y != y)
{
ghid_set_cursor_position_labels ();
gport->crosshair_x = x;
gport->crosshair_y = y;
- /*
- * FIXME - does this trigger the idle_proc stuff? It is in the
+ /* FIXME - does this trigger the idle_proc stuff? It is in the
* lesstif HID. Maybe something is needed here?
*
* need_idle_proc ();
*/
-
}
- /*
- * Pan the viewport so that the crosshair (which is in a fixed
- * location relative to the board) lands where the pointer
- * is. What happens is the crosshair is moved on the board
- * (see above) and then we move the board here to line it up
- * again. We do this by figuring out where the pointer is
- * in board coordinates and we know where the crosshair is
- * in board coordinates. Then we know how far to pan.
+ if (action != HID_SC_PAN_VIEWPORT &&
+ action != HID_SC_WARP_POINTER)
+ return;
+
+ /* Find out where the drawing area is on the screen. gdk_display_get_pointer
+ * and gdk_display_warp_pointer work relative to the whole display, whilst
+ * our coordinates are relative to the drawing area origin.
*/
- if (action == HID_SC_PAN_VIEWPORT)
- {
- GdkDisplay *display;
- gint pos_x, pos_y, xofs, yofs;
-
- display = gdk_display_get_default ();
-
- /* figure out where the pointer is relative to the display */
- gdk_display_get_pointer (display, NULL, &pos_x, &pos_y, NULL);
-
- /*
- * Figure out where the drawing area is on the screen so we can
- * figure out where the pointer is relative to the viewport.
- */
- gdk_window_get_origin (gport->drawing_area->window, &xofs, &yofs);
-
- pos_x -= xofs;
- pos_y -= yofs;
+ gdk_window_get_origin (gport->drawing_area->window, &offset_x, &offset_y);
+ display = gdk_display_get_default ();
- /*
- * pointer is at
- * px = gport->view_x0 + pos_x * gport->zoom
- * py = gport->view_y0 + pos_y * gport->zoom
- *
- * cross hair is at
- * x
- * y
- *
- * we need to shift x0 by (x - px) and y0 by (y - py)
- * x0 = x0 + x - (x0 + pos_x * zoom)
- * = x - pos_x*zoom
+ switch (action) {
+ case HID_SC_PAN_VIEWPORT:
+ /* Pan the board in the viewport so that the crosshair (who's location
+ * relative on the board was set above) lands where the pointer is.
+ * We pass the request to pan a particular point on the board to a
+ * given widget coordinate of the viewport into the rendering code
*/
- if (ghid_flip_x)
- gport->view_x0 = x - (gport->view_width - pos_x * gport->zoom);
- else
- gport->view_x0 = x - pos_x * gport->zoom;
+ /* Find out where the pointer is relative to the display */
+ gdk_display_get_pointer (display, NULL, &pointer_x, &pointer_y, NULL);
- if (ghid_flip_y)
- gport->view_y0 = y - (gport->view_height - pos_y * gport->zoom);
- else
- gport->view_y0 = y - pos_y * gport->zoom;
+ widget_x = pointer_x - offset_x;
+ widget_y = pointer_y - offset_y;
- ghid_pan_fixup();
+ ghid_event_to_pcb_coords (widget_x, widget_y, &pcb_x, &pcb_y);
- action = HID_SC_WARP_POINTER;
- }
+ gport->view_x0 = MAX (0, SIDE_X (pcb_x) - widget_x * gport->zoom);
+ gport->view_y0 = MAX (0, SIDE_Y (pcb_y) - widget_y * gport->zoom);
- if (action == HID_SC_WARP_POINTER)
- {
- gint xofs, yofs;
- GdkDisplay *display;
- GdkScreen *screen;
+ ghid_pan_fixup ();
+
+ /* Just in case we couldn't pan the board the whole way,
+ * we warp the pointer to where the crosshair DID land.
+ */
+ /* Fall through */
- display = gdk_display_get_default ();
+ case HID_SC_WARP_POINTER:
screen = gdk_display_get_default_screen (display);
- /*
- * Figure out where the drawing area is on the screen because
- * gdk_display_warp_pointer will warp relative to the whole display
- * but the value we've been given is relative to your drawing area
- */
- gdk_window_get_origin (gport->drawing_area->window, &xofs, &yofs);
- gdk_display_warp_pointer (display, screen, xofs + Vx (x), yofs + Vy (y));
- }
+ ghid_pcb_to_event_coords (x, y, &widget_x, &widget_y);
+
+ pointer_x = offset_x + widget_x;
+ pointer_y = offset_y + widget_y;
+
+ gdk_display_warp_pointer (display, screen, pointer_x, pointer_y);
+
+ break;
+ }
}
typedef struct
@@ -1619,55 +1599,41 @@ currently within the window already.
%end-doc */
static int
-Center(int argc, char **argv, int x, int y)
+Center(int argc, char **argv, int pcb_x, int pcb_y)
{
- int x0, y0, w2, h2;
GdkDisplay *display;
GdkScreen *screen;
- int xofs, yofs;
+ int offset_x, offset_y;
+ int widget_x, widget_y;
+ int pointer_x, pointer_y;
if (argc != 0)
AFAIL (center);
- x = GRIDFIT_X (SIDE_X (x), PCB->Grid);
- y = GRIDFIT_Y (SIDE_Y (y), PCB->Grid);
+ /* Aim to put the given x, y PCB coordinates in the center of the widget */
+ widget_x = gport->width / 2;
+ widget_y = gport->height / 2;
- w2 = gport->view_width / 2;
- h2 = gport->view_height / 2;
- x0 = x - w2;
- y0 = y - h2;
-
- if (x0 < 0)
- {
- x0 = 0;
- x = x0 + w2;
- }
+ gport->view_x0 = MAX (0, SIDE_X (pcb_x) - widget_x * gport->zoom);
+ gport->view_y0 = MAX (0, SIDE_Y (pcb_y) - widget_y * gport->zoom);
- if (y0 < 0)
- {
- y0 = 0;
- y = y0 + h2;
- }
+ ghid_pan_fixup ();
- gport->view_x0 = x0;
- gport->view_y0 = y0;
+ /* Now move the mouse pointer to the place where the board location
+ * actually ended up.
+ *
+ * XXX: Should only do this if we confirm we are inside our window?
+ */
- ghid_pan_fixup ();
+ ghid_pcb_to_event_coords (pcb_x, pcb_y, &widget_x, &widget_y);
+ gdk_window_get_origin (gport->drawing_area->window, &offset_x, &offset_y);
- /* Move the pointer to the center of the window, but only if it's
- currently within the window already. Watch out for edges,
- though. */
+ pointer_x = offset_x + widget_x;
+ pointer_y = offset_y + widget_y;
display = gdk_display_get_default ();
screen = gdk_display_get_default_screen (display);
-
- /*
- * Figure out where the drawing area is on the screen because
- * gdk_display_warp_pointer will warp relative to the whole display
- * but the value we've been given is relative to your drawing area
- */
- gdk_window_get_origin (gport->drawing_area->window, &xofs, &yofs);
- gdk_display_warp_pointer (display, screen, xofs + Vx (x), yofs + Vy (y));
+ gdk_display_warp_pointer (display, screen, pointer_x, pointer_y);
return 0;
}
commit 58a94b5d9a8c76415bf16b6498d408de72a3871c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Add API to convert pcb units into drawing widget coordinates.
diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 5118612..e9b5b3e 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -1340,6 +1340,16 @@ ghid_event_to_pcb_coords (int event_x, int event_y, Coord *pcb_x, Coord *pcb_y)
return true;
}
+bool
+ghid_pcb_to_event_coords (Coord pcb_x, Coord pcb_y, int *event_x, int *event_y)
+{
+ *event_x = DRAW_X (pcb_x);
+ *event_y = DRAW_Y (pcb_y);
+
+ return true;
+}
+
+
#define LEAD_USER_WIDTH 0.2 /* millimeters */
#define LEAD_USER_PERIOD (1000 / 5) /* 5fps (in ms) */
#define LEAD_USER_VELOCITY 3. /* millimeters per second */
diff --git a/src/hid/gtk/gtkhid-gl.c b/src/hid/gtk/gtkhid-gl.c
index a910946..5c554fa 100644
--- a/src/hid/gtk/gtkhid-gl.c
+++ b/src/hid/gtk/gtkhid-gl.c
@@ -1306,6 +1306,16 @@ ghid_event_to_pcb_coords (int event_x, int event_y, Coord *pcb_x, Coord *pcb_y)
return true;
}
+bool
+ghid_pcb_to_event_coords (Coord pcb_x, Coord pcb_y, int *event_x, int *event_y)
+{
+ *event_x = DRAW_X (pcb_x);
+ *event_y = DRAW_Y (pcb_y);
+
+ return true;
+}
+
+
#define LEAD_USER_WIDTH 0.2 /* millimeters */
#define LEAD_USER_PERIOD (1000 / 20) /* 20fps (in ms) */
#define LEAD_USER_VELOCITY 3. /* millimeters per second */
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index d17cca2..c52fb65 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -504,6 +504,7 @@ HID *ghid_request_debug_draw (void);
void ghid_flush_debug_draw (void);
void ghid_finish_debug_draw (void);
bool ghid_event_to_pcb_coords (int event_x, int event_y, Coord *pcb_x, Coord *pcb_y);
+bool ghid_pcb_to_event_coords (Coord pcb_x, Coord pcb_y, int *event_x, int *event_y);
void ghid_lead_user_to_location (Coord x, Coord y);
void ghid_cancel_lead_user (void);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs