[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.2-20111231-14-g58af332)
The branch, master has been updated
via 58af3327f4fbca32597f7081cc84453fdf4c8dee (commit)
via 80845206868cb5d5b70357a5ca23f8da07151fc2 (commit)
from c15feccddc359d1ac3e62ed3b2182c7cc3aa938a (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/x_event.c | 25 +++++++------------------
libgeda/src/scheme_init.c | 3 ++-
2 files changed, 9 insertions(+), 19 deletions(-)
=================
Commit Messages
=================
commit 58af3327f4fbca32597f7081cc84453fdf4c8dee
Author: Nathan Schulte <nmschulte@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Fix bug with inverted (control key) selection.
Fixes a regression caused by commit 7f88749446b6. The previous commit
made it so that making a selection with the control key pressed no
longer inverts the selection state of the objects selected, but
instead starts a new selection.
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Closes-bug: lp-721445
:100644 100644 54b5a71... 1932e02... M gschem/src/x_event.c
commit 80845206868cb5d5b70357a5ca23f8da07151fc2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Correct prototype of edascm_init_impl().
Fixes bug introduced in commit 5cdf4de59028.
:100644 100644 b4288a0... 10a8d5d... M libgeda/src/scheme_init.c
=========
Changes
=========
commit 58af3327f4fbca32597f7081cc84453fdf4c8dee
Author: Nathan Schulte <nmschulte@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Fix bug with inverted (control key) selection.
Fixes a regression caused by commit 7f88749446b6. The previous commit
made it so that making a selection with the control key pressed no
longer inverts the selection state of the objects selected, but
instead starts a new selection.
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
Closes-bug: lp-721445
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 54b5a71..1932e02 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -731,7 +731,6 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
int w_x, w_y;
int unsnapped_wx, unsnapped_wy;
int skip_event=0;
- int do_move;
GdkEvent *test_event;
g_return_val_if_fail ((w_current != NULL), 0);
@@ -809,24 +808,14 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
break;
case(STARTSELECT):
- /* Don't move anything if the shift key is pressed, that means
- * the user definately wants to drag out a selection box.
+ /* If the shift or control keys are pressed, that means the user definately wants to drag out a
+ * selection box. Otherwise, if there is not a selected object under the cursor, look for one
+ * that could be selected and start moving it.
*/
- do_move = 0;
- if (!w_current->SHIFTKEY) {
- /* If there is a selected object under the cursor, start moving it.
- * If we don't find anything selected, look for an object we could
- * select to start moving it.
- */
- if (o_find_selected_object (w_current, w_current->first_wx, w_current->first_wy) ||
- (o_find_object (w_current,
- w_current->first_wx, w_current->first_wy, TRUE) &&
- o_select_selected (w_current)))
- do_move = 1;
- }
-
- if (!do_move) {
- /* Drag out a selection box */
+ if (w_current->SHIFTKEY || w_current->CONTROLKEY
+ || (!o_find_selected_object(w_current, w_current->first_wx, w_current->first_wy)
+ && (!o_find_object(w_current, w_current->first_wx, w_current->first_wy, TRUE)
+ || !o_select_selected(w_current)))) {
if (o_select_box_start(w_current, unsnapped_wx, unsnapped_wy)) {
w_current->event_state = SBOX;
w_current->inside_action = 1;
commit 80845206868cb5d5b70357a5ca23f8da07151fc2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Correct prototype of edascm_init_impl().
Fixes bug introduced in commit 5cdf4de59028.
diff --git a/libgeda/src/scheme_init.c b/libgeda/src/scheme_init.c
index b4288a0..10a8d5d 100644
--- a/libgeda/src/scheme_init.c
+++ b/libgeda/src/scheme_init.c
@@ -35,7 +35,7 @@ SCM_GLOBAL_SYMBOL (edascm_object_state_sym, "object-state");
* \par Function Description
* Called by edascm_init() with current thread in Guile mode.
*/
-static void
+static void *
edascm_init_impl (void *data)
{
#include "scheme_init.x"
@@ -48,6 +48,7 @@ edascm_init_impl (void *data)
edascm_init_attrib ();
edascm_init_os ();
edascm_init_deprecated ();
+ return NULL;
}
/*! \brief Initialise the Scheme API.
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs