SF.net SVN: geany:[2964] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Wed Sep 17 18:02:56 UTC 2008


Revision: 2964
          http://geany.svn.sourceforge.net/geany/?rev=2964&view=rev
Author:   eht16
Date:     2008-09-17 18:02:55 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
API changes:
Rename sci_can_copy() into sci_has_selection().
Rename sci_find_bracematch() into sci_find_matching_brace().

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/editor.c
    trunk/src/keybindings.c
    trunk/src/plugindata.h
    trunk/src/plugins.c
    trunk/src/sciwrappers.c
    trunk/src/sciwrappers.h
    trunk/src/tools.c
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/ChangeLog	2008-09-17 18:02:55 UTC (rev 2964)
@@ -3,6 +3,12 @@
  * data/filetypes.css, src/highlighting.c:
    Add missing 'directive' style to filetype CSS
    (patch from Jason Oster, #2114697, thanks).
+ * src/callbacks.c, src/editor.c, src/keybindings.c, src/plugindata.h,
+   src/plugins.c, src/sciwrappers.c, src/sciwrappers.h, src/tools.c,
+   src/ui_utils.c:
+   API changes:
+   Rename sci_can_copy() into sci_has_selection().
+   Rename sci_find_bracematch() into sci_find_matching_brace().
 
 
 2008-09-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/callbacks.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -857,7 +857,7 @@
 		return;
 
 	sci = doc->editor->sci;
-	if (! sci_can_copy(sci))
+	if (! sci_has_selection(sci))
 	{
 		keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_WORD);
 		keep_sel = FALSE;
@@ -1006,7 +1006,7 @@
 	if (doc == NULL)
 		return;
 
-	if (sci_can_copy(doc->editor->sci))
+	if (sci_has_selection(doc->editor->sci))
 	{	/* take selected text if there is a selection */
 		search_text = g_malloc(sci_get_selected_text_length(doc->editor->sci) + 1);
 		sci_get_selected_text(doc->editor->sci, search_text);
@@ -1929,7 +1929,7 @@
 	if (doc == NULL)
 		return;
 
-	if (sci_can_copy(doc->editor->sci))
+	if (sci_has_selection(doc->editor->sci))
 	{	/* take selected text if there is a selection */
 		word = g_malloc(sci_get_selected_text_length(doc->editor->sci) + 1);
 		sci_get_selected_text(doc->editor->sci, word);

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/editor.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -3357,7 +3357,7 @@
 {
 	g_return_if_fail(doc != NULL);
 
-	if (sci_can_copy(doc->editor->sci))
+	if (sci_has_selection(doc->editor->sci))
 	{
 		gint start = sci_get_selection_start(doc->editor->sci);
 		const gchar *replacement = colour;

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/keybindings.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -1355,7 +1355,7 @@
 	if (! utils_isbrace(sci_get_char_at(doc->editor->sci, pos), TRUE))
 		pos--; /* set pos to the brace */
 
-	new_pos = sci_find_bracematch(doc->editor->sci, pos);
+	new_pos = sci_find_matching_brace(doc->editor->sci, pos);
 	if (new_pos != -1)
 	{	/* set the cursor at the brace */
 		sci_set_current_position(doc->editor->sci, new_pos, FALSE);
@@ -1480,7 +1480,7 @@
 		editor_select_lines(sci, FALSE);
 		sci_selection_duplicate(sci);
 	}
-	else if (sci_can_copy(sci))
+	else if (sci_has_selection(sci))
 		sci_selection_duplicate(sci);
 	else
 		sci_line_duplicate(sci);

Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/plugindata.h	2008-09-17 18:02:55 UTC (rev 2964)
@@ -41,7 +41,7 @@
 enum {
 	/** The Application Programming Interface (API) version, incremented
 	 * whenever any plugin data types are modified or appended to. */
-	GEANY_API_VERSION = 92,
+	GEANY_API_VERSION = 93,
 
 	/** The Application Binary Interface (ABI) version, incremented whenever
 	 * existing fields in the plugin data types have to be changed or reordered. */
@@ -269,11 +269,11 @@
 	gboolean (*get_line_is_visible) (struct _ScintillaObject* sci, gint line);
 	void	(*ensure_line_is_visible) (struct _ScintillaObject* sci, gint line);
 	void	(*scroll_caret) (struct _ScintillaObject* sci);
-	gint	(*find_bracematch) (struct _ScintillaObject* sci, gint pos);
+	gint	(*find_matching_brace) (struct _ScintillaObject* sci, gint pos);
 	gint	(*get_style_at) (struct _ScintillaObject *sci, gint position);
 	gchar	(*get_char_at) (struct _ScintillaObject *sci, gint pos);
 	gint	(*get_current_line) (struct _ScintillaObject *sci);
-	gboolean (*can_copy) (struct _ScintillaObject *sci);
+	gboolean (*has_selection) (struct _ScintillaObject *sci);
 	gint	(*get_tab_width) (struct _ScintillaObject *sci);
 }
 ScintillaFuncs;
@@ -472,6 +472,10 @@
 #define DOC_IDX_VALID(doc_idx) \
 	((doc_idx) >= 0 && (guint)(doc_idx) < documents_array->len && documents[doc_idx]->is_valid)
 
+
+#define find_bracematch(x, y) find_matching_brace((x), (y))
+#define can_copy(x) has_selection((x))
+
 #endif	/* GEANY_DISABLE_DEPRECATED */
 
 #endif

Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/plugins.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -149,11 +149,11 @@
 	&sci_get_line_is_visible,
 	&sci_ensure_line_is_visible,
 	&sci_scroll_caret,
-	&sci_find_bracematch,
+	&sci_find_matching_brace,
 	&sci_get_style_at,
 	&sci_get_char_at,
 	&sci_get_current_line,
-	&sci_can_copy,
+	&sci_has_selection,
 	&sci_get_tab_width
 };
 

Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/sciwrappers.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -761,11 +761,10 @@
 }
 
 
-/* TODO: rename to has_selection. */
 /** Check if there's a selection.
  * @param sci Scintilla widget.
  * @return Whether a selection is present. */
-gboolean sci_can_copy(ScintillaObject *sci)
+gboolean sci_has_selection(ScintillaObject *sci)
 {
 	if (SSM(sci, SCI_GETSELECTIONEND,0,0) - SSM(sci, SCI_GETSELECTIONSTART,0,0))
 		return TRUE;
@@ -1030,8 +1029,7 @@
  * @param sci Scintilla widget.
  * @param pos Position.
  * @return Matching brace position. */
-/* TODO: rename _matching_brace */
-gint sci_find_bracematch(ScintillaObject *sci, gint pos)
+gint sci_find_matching_brace(ScintillaObject *sci, gint pos)
 {
 	return SSM(sci, SCI_BRACEMATCH, pos, 0);
 }

Modified: trunk/src/sciwrappers.h
===================================================================
--- trunk/src/sciwrappers.h	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/sciwrappers.h	2008-09-17 18:02:55 UTC (rev 2964)
@@ -37,7 +37,7 @@
 void				sci_add_text_buffer			(ScintillaObject* sci,  const gchar* text, gint	len);
 gboolean			sci_can_redo				(ScintillaObject* sci);
 gboolean			sci_can_undo				(ScintillaObject* sci);
-gboolean			sci_can_copy				(ScintillaObject* sci);
+gboolean			sci_has_selection			(ScintillaObject* sci);
 void 				sci_undo					(ScintillaObject* sci);
 void 				sci_redo					(ScintillaObject* sci);
 void 				sci_empty_undo_buffer		(ScintillaObject* sci);
@@ -166,7 +166,7 @@
 void				sci_set_line_indentation	(ScintillaObject * sci, gint line, gint indent);
 int					sci_get_line_indentation	(ScintillaObject * sci, gint line);
 void				sci_set_autoc_max_height	(ScintillaObject * sci, gint val);
-gint				sci_find_bracematch			(ScintillaObject * sci, gint pos);
+gint				sci_find_matching_brace		(ScintillaObject * sci, gint pos);
 
 gint				sci_get_overtype			(ScintillaObject * sci);
 void				sci_set_tab_indents			(ScintillaObject * sci, gboolean set);

Modified: trunk/src/tools.c
===================================================================
--- trunk/src/tools.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/tools.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -238,7 +238,7 @@
 
 	g_return_if_fail(doc != NULL && command != NULL);
 
-	if (! sci_can_copy(doc->editor->sci))
+	if (! sci_has_selection(doc->editor->sci))
 		return;
 
 	argv = g_strsplit(command, " ", -1);
@@ -403,7 +403,7 @@
 	if (doc == NULL)
 		return;
 
-	enable = sci_can_copy(doc->editor->sci) && (ui_prefs.custom_commands != NULL);
+	enable = sci_has_selection(doc->editor->sci) && (ui_prefs.custom_commands != NULL);
 
 	children = gtk_container_get_children(GTK_CONTAINER(user_data));
 	len = g_list_length(children);
@@ -615,7 +615,7 @@
 	vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog));
 	gtk_widget_set_name(dialog, "GeanyDialog");
 
-	if (sci_can_copy(doc->editor->sci))
+	if (sci_has_selection(doc->editor->sci))
 	{
 		text = g_malloc0(sci_get_selected_text_length(doc->editor->sci) + 1);
 		sci_get_selected_text(doc->editor->sci, text);

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2008-09-17 18:01:09 UTC (rev 2963)
+++ trunk/src/ui_utils.c	2008-09-17 18:02:55 UTC (rev 2964)
@@ -340,7 +340,7 @@
 	if (doc == NULL)
 		enable = FALSE;
 	else
-		enable = sci_can_copy(doc->editor->sci);
+		enable = sci_has_selection(doc->editor->sci);
 
 	for (i = 0; i < G_N_ELEMENTS(widgets.popup_copy_items); i++)
 		gtk_widget_set_sensitive(widgets.popup_copy_items[i], enable);
@@ -363,7 +363,7 @@
 	GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window));
 
 	if (IS_SCINTILLA(focusw))
-		enable = (doc == NULL) ? FALSE : sci_can_copy(doc->editor->sci);
+		enable = (doc == NULL) ? FALSE : sci_has_selection(doc->editor->sci);
 	else
 	if (GTK_IS_EDITABLE(focusw))
 		enable = gtk_editable_get_selection_bounds(GTK_EDITABLE(focusw), NULL, NULL);


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



More information about the Commits mailing list