gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-177-g1bf087e)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  1bf087eac8287e5d835be9961e82bb6a523a2c75 (commit)
      from  d1b632e03de0610209e24d8c72ccb37beb3c4aa3 (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/i_callbacks.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)


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

commit 1bf087eac8287e5d835be9961e82bb6a523a2c75
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Revert "gschem: Make the user click the first point when adding nets or buses"
    
    This reverts commit 2197952617d42ccbe2355747ef48668c63ece30b.
    
    It turns out this behaviour was unpopular, and until I (or someone) has
    time to make the behaviour configurable, it is better to revert this.
    
    Perhaps we may be able to come up with another way of allowing magnetic
    net mode for the start-point of a net, whilst retaining the immediate
    action of the shortcut key.
    
    (Revert tweaked a little to avoid re-adding whitespace errors)

:100644 100644 f8db1bb... 6a1e216... M	gschem/src/i_callbacks.c

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

commit 1bf087eac8287e5d835be9961e82bb6a523a2c75
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Revert "gschem: Make the user click the first point when adding nets or buses"
    
    This reverts commit 2197952617d42ccbe2355747ef48668c63ece30b.
    
    It turns out this behaviour was unpopular, and until I (or someone) has
    time to make the behaviour configurable, it is better to revert this.
    
    Perhaps we may be able to come up with another way of allowing magnetic
    net mode for the start-point of a net, whilst retaining the immediate
    action of the shortcut key.
    
    (Revert tweaked a little to avoid re-adding whitespace errors)

diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index f8db1bb..6a1e216 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -2414,9 +2414,13 @@ DEFINE_I_CALLBACK(add_net)
 DEFINE_I_CALLBACK(add_net_hotkey)
 {
   GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL*) data;
+  gint wx, wy;
 
   exit_if_null(w_current);
 
+  if (!x_event_get_pointer_position(w_current, TRUE, &wx, &wy))
+    return;
+
   o_redraw_cleanstates(w_current);	
   o_invalidate_rubber (w_current);
   o_net_reset(w_current);
@@ -2426,6 +2430,9 @@ DEFINE_I_CALLBACK(add_net_hotkey)
   i_set_state(w_current, STARTDRAWNET);
   i_update_toolbar(w_current);
 
+  o_net_start(w_current, wx, wy);
+
+  w_current->event_state=DRAWNET;
   w_current->inside_action = 1;
 }
 
@@ -2479,9 +2486,13 @@ DEFINE_I_CALLBACK(add_bus)
 DEFINE_I_CALLBACK(add_bus_hotkey)
 {
   GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL*) data;
+  gint wx, wy;
 
   exit_if_null(w_current);
 
+  if (!x_event_get_pointer_position(w_current, TRUE, &wx, &wy))
+    return;
+
   o_redraw_cleanstates(w_current);	
   o_invalidate_rubber (w_current);
 
@@ -2490,6 +2501,9 @@ DEFINE_I_CALLBACK(add_bus_hotkey)
   i_set_state(w_current, STARTDRAWBUS);
   i_update_toolbar(w_current);
 
+  o_bus_start(w_current, wx, wy);
+
+  w_current->event_state=DRAWBUS;
   w_current->inside_action = 1;
 }
 




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