SF.net SVN: geany: [1398] trunk

[ntrel at users.sourceforge.net]

Revision: 1398
          http://svn.sourceforge.net/geany/?rev=1398&view=rev
Author:   ntrel
Date:     2007-03-15 06:14:04 -0700 (Thu, 15 Mar 2007)

Log Message:
-----------
Add Toggle Marker keybinding (Ctrl-M).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/keybindings.c
    trunk/src/keybindings.h
    trunk/src/sci_cb.c
    trunk/src/sciwrappers.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-03-15 12:52:16 UTC (rev 1397)
+++ trunk/ChangeLog	2007-03-15 13:14:04 UTC (rev 1398)
@@ -5,6 +5,9 @@
    Add Goto Previous/Next Marker keybindings (Ctrl-, and Ctrl-.).
    Make sci_marker_next() and sci_marker_previous() return marker line
    number.
+ * src/keybindings.c, src/keybindings.h, src/sciwrappers.c,
+   src/sci_cb.c:
+   Add Toggle Marker keybinding (Ctrl-M).
 
 
 2007-03-14  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2007-03-15 12:52:16 UTC (rev 1397)
+++ trunk/src/keybindings.c	2007-03-15 13:14:04 UTC (rev 1398)
@@ -239,6 +239,9 @@
 	keys[GEANY_KEYS_EDIT_GOTOMATCHINGBRACE] = fill(cb_func_edit,
 		GDK_less, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_gotomatchingbrace",
 		_("Goto matching brace"));
+	keys[GEANY_KEYS_EDIT_TOGGLEMARKER] = fill(cb_func_edit,
+		GDK_m, GDK_CONTROL_MASK, "edit_togglemarker",
+		_("Toggle marker"));
 	keys[GEANY_KEYS_EDIT_GOTONEXTMARKER] = fill(cb_func_edit,
 		GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker",
 		_("Goto next marker"));
@@ -868,6 +871,13 @@
 		case GEANY_KEYS_EDIT_GOTOMATCHINGBRACE:
 			goto_matching_brace(idx);
 			break;
+		case GEANY_KEYS_EDIT_TOGGLEMARKER:
+		{
+			gboolean set = sci_is_marker_set_at_line(doc_list[idx].sci, cur_line, 1);
+
+			sci_set_marker_at_line(doc_list[idx].sci, cur_line, ! set, 1);
+			break;
+		}
 		case GEANY_KEYS_EDIT_GOTONEXTMARKER:
 		{
 			gint mline = sci_marker_next(doc_list[idx].sci, cur_line + 1, 1 << 1, TRUE);

Modified: trunk/src/keybindings.h
===================================================================
--- trunk/src/keybindings.h	2007-03-15 12:52:16 UTC (rev 1397)
+++ trunk/src/keybindings.h	2007-03-15 13:14:04 UTC (rev 1398)
@@ -105,6 +105,7 @@
 	GEANY_KEYS_EDIT_SENDTOCMD2,
 	GEANY_KEYS_EDIT_SENDTOCMD3,
 	GEANY_KEYS_EDIT_GOTOMATCHINGBRACE,
+	GEANY_KEYS_EDIT_TOGGLEMARKER,
 	GEANY_KEYS_EDIT_GOTONEXTMARKER,
 	GEANY_KEYS_EDIT_GOTOPREVIOUSMARKER,
 	GEANY_KEYS_EDIT_AUTOCOMPLETE,

Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c	2007-03-15 12:52:16 UTC (rev 1397)
+++ trunk/src/sci_cb.c	2007-03-15 13:14:04 UTC (rev 1398)
@@ -135,8 +135,10 @@
 			if (nt->margin == 1)
 			{
 				gint line = sci_get_line_from_position(sci, nt->position);
+				gboolean set = sci_is_marker_set_at_line(sci, line, 1);
+
 				//sci_marker_delete_all(doc_list[idx].sci, 1);
-				sci_set_marker_at_line(sci, line, sci_is_marker_set_at_line(sci, line, 1), 1);
+				sci_set_marker_at_line(sci, line, ! set, 1);	// toggle the marker
 			}
 			// left click on the folding margin to toggle folding state of current line
 			else if (nt->margin == 2 && app->pref_editor_folding)

Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c	2007-03-15 12:52:16 UTC (rev 1397)
+++ trunk/src/sciwrappers.c	2007-03-15 13:14:04 UTC (rev 1398)
@@ -326,8 +326,8 @@
 {
 	gint state;
 
-	state = SSM( sci, SCI_MARKERGET, line, marker );
-	return(!(state & (1 << marker)));
+	state = SSM( sci, SCI_MARKERGET, line, 0 );
+	return (state & (1 << marker));
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.