update def browser on cursor move

jcupitt · jcupitt · commit 6fe1c6f9432c · 2012-10-15T21:42:56.000+01:00
the def browser in the program window updates as you move the cursor
about in the edit area
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@ started 7.31 3/9/12
 - better definition of to_group (thanks MvGulik)
 - better defintion of scan, renamed as scanl
 - don't clear def browser filter on text buffer ::changed in program window
+- update filter on cursor move
 
 started 7.30.1  7/8/12
 - update rectangle select (thanks Joe)
diff --git a/TODO b/TODO
@@ -1,10 +1,7 @@
 
 - new foldr1 def ... look for problems!
 
-- definition browser could update on cursor move?
-
-  eg. mouse click on contains_Group, or move cursor into contains_Group with
-  kb, rhs changes to display contains_Group
+- breadcrumb trail for prog window, so you can get back to where you were?
 
 - im_invertlut() as a menu item
 
diff --git a/src/program.c b/src/program.c
@@ -846,57 +846,6 @@ is_ident( int ch )
 	return( FALSE );
 }
 
-static void
-program_text_changed( GtkTextBuffer *buffer, Program *program )
-{
-	gboolean editable = !program->kit || !program->kit->pseudo;
-
-	if( !program->dirty ) {
-		program->dirty = TRUE;
-		program_refresh( program );
-	}
-
-	if( program->rpane_open && 
-		editable ) {
-		/* Fetch characters left of the cursor while we have stuff
-		 * that could be an identifier.
-		 */
-		GtkTextIter start;
-		GtkTextIter end;
-		char *line;
-		char *p;
-
-		/* Set iter at cursor.
-		 */
-		gtk_text_buffer_get_iter_at_mark( buffer,
-			&end, gtk_text_buffer_get_insert( buffer ) );
-
-		/* Point an iter at the start of this line.
-		 */
-		gtk_text_buffer_get_iter_at_line_index( buffer,
-			&start, gtk_text_iter_get_line( &end ), 0 ); 
-
-		line = gtk_text_buffer_get_text( buffer, &start, &end, FALSE );
-
-		/* Search back from the end of the string for the start of the
-		 * identifier.
-		 */
-		for( p = line + strlen( line ) - 1; 
-			p >= line && is_ident( *p ); 
-			p-- )
-			;
-
-		/* Don't update the filter for empty strings. This happens 
-		 * when the user clicks between tools, not when they type
-		 * stuff.
-		 */
-		if( strcmp( p + 1, "" ) != 0 )
-			defbrowser_set_filter( program->defbrowser, p + 1 );
-
-		g_free( line );
-	}
-}
-
 static void 
 program_text_cursor_position( GtkTextBuffer *buffer, GParamSpec *pspec, 
 	Program *program )
@@ -912,20 +861,33 @@ program_text_cursor_position( GtkTextBuffer *buffer, GParamSpec *pspec,
 		GtkTextIter cursor;
 		GtkTextIter end;
 		char *line;
-		char *p;
+		char *p, *q, *r;
 
 		/* Get iters for start / cursor / end of line.
 		 */
 		gtk_text_buffer_get_iter_at_mark( buffer,
 			&cursor, gtk_text_buffer_get_insert( buffer ) );
 		gtk_text_buffer_get_iter_at_line_index( buffer,
-			&start, gtk_text_iter_get_line( &end ), 0 ); 
+			&start, gtk_text_iter_get_line( &cursor ), 0 ); 
 		gtk_text_buffer_get_iter_at_line_index( buffer,
-			&end, gtk_text_iter_get_line( &end ), -1 ); 
+			&end, gtk_text_iter_get_line( &cursor ), 0 ); 
+		gtk_text_iter_forward_to_line_end( &end );
 
 		line = gtk_text_buffer_get_text( buffer, &start, &end, FALSE );
+		p = line + gtk_text_iter_get_line_index( &cursor );
+
+		/* Search back from the cursor for the first non-identifier
+		 * char.
+		 */
+		for( q = p - 1; q >= line && is_ident( *q ); q-- )
+			;
+		q += 1;
+		for( r = p; r < line + strlen( line ) && is_ident( *r ); r++ )
+			;
+		*r= '\0';
 
-		printf( "line = <%s>\n", line ); 
+		if( strlen( q ) > 1 )
+			defbrowser_set_filter( program->defbrowser, q );
 
 		g_free( line );
 	}
@@ -942,16 +904,12 @@ program_set_text( Program *program, const char *text, gboolean editable )
 		/* Stop ::changed from firing, we don't want it to update the
 		 * def browser filter.
 		 */
-		g_signal_handlers_block_by_func( text_buffer,
-			G_CALLBACK( program_text_changed ), program );
 		g_signal_handlers_block_by_func( text_buffer,
 			G_CALLBACK( program_text_cursor_position ), program );
 
 		text_view_set_text( text_view, text, editable );
 		program->text_hash = text_hash;
 
-		g_signal_handlers_unblock_by_func( text_buffer,
-			G_CALLBACK( program_text_changed ), program );
 		g_signal_handlers_unblock_by_func( text_buffer,
 			G_CALLBACK( program_text_cursor_position ), program );
 	}
@@ -2396,10 +2354,6 @@ program_build( Program *program, GtkWidget *vbox )
 	gtk_widget_show( swin );
 
 	program->text = program_text_new();
-        g_signal_connect( 
-		gtk_text_view_get_buffer( GTK_TEXT_VIEW( program->text ) ),
-		"changed",
-                G_CALLBACK( program_text_changed ), program );
 	g_signal_connect(
 		gtk_text_view_get_buffer( GTK_TEXT_VIEW( program->text ) ),
 		"notify::cursor-position",
