SF.net SVN: geany:[3322] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Fri Dec 5 12:34:21 UTC 2008
Revision: 3322
http://geany.svn.sourceforge.net/geany/?rev=3322&view=rev
Author: ntrel
Date: 2008-12-05 12:34:20 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
Rename sci_cmd() to sci_send_command() to match the plugin API and
fix the generated macro name.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/geanyfunctions.h
trunk/src/callbacks.c
trunk/src/editor.c
trunk/src/keybindings.c
trunk/src/plugins.c
trunk/src/sciwrappers.c
trunk/src/sciwrappers.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/ChangeLog 2008-12-05 12:34:20 UTC (rev 3322)
@@ -1,3 +1,12 @@
+2008-12-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c, src/sciwrappers.c, src/sciwrappers.h,
+ src/callbacks.c, src/plugins.c, src/editor.c,
+ plugins/geanyfunctions.h:
+ Rename sci_cmd() to sci_send_command() to match the plugin API and
+ fix the generated macro name.
+
+
2008-12-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/support.c, src/support.h:
Modified: trunk/plugins/geanyfunctions.h
===================================================================
--- trunk/plugins/geanyfunctions.h 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/plugins/geanyfunctions.h 2008-12-05 12:34:20 UTC (rev 3322)
@@ -56,8 +56,8 @@
geany_functions->p_scintilla->send_message
#define scintilla_new \
geany_functions->p_scintilla->new
-#define sci_cmd \
- geany_functions->p_sci->cmd
+#define sci_send_command \
+ geany_functions->p_sci->send_command
#define sci_start_undo_action \
geany_functions->p_sci->start_undo_action
#define sci_end_undo_action \
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/src/callbacks.c 2008-12-05 12:34:20 UTC (rev 3322)
@@ -896,7 +896,7 @@
sci_set_selection_start(sci, sci_get_current_position(sci) - text_len + 1);
}
else
- sci_cmd(sci, cmd);
+ sci_send_command(sci, cmd);
g_free(text);
@@ -1712,7 +1712,7 @@
if (sci_get_lines_selected(doc->editor->sci) > 1)
{
- sci_cmd(doc->editor->sci, SCI_TAB);
+ sci_send_command(doc->editor->sci, SCI_TAB);
}
else
{
@@ -1731,7 +1731,7 @@
if (sci_get_lines_selected(doc->editor->sci) > 1)
{
- sci_cmd(doc->editor->sci, SCI_BACKTAB);
+ sci_send_command(doc->editor->sci, SCI_BACKTAB);
}
else
{
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/src/editor.c 2008-12-05 12:34:20 UTC (rev 3322)
@@ -3940,7 +3940,7 @@
if (event->state & GDK_MOD1_MASK)
{
GeanyEditor *editor = user_data;
- sci_cmd(editor->sci, (event->direction == GDK_SCROLL_DOWN) ? SCI_PAGEDOWN : SCI_PAGEUP);
+ sci_send_command(editor->sci, (event->direction == GDK_SCROLL_DOWN) ? SCI_PAGEDOWN : SCI_PAGEUP);
return TRUE;
}
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/src/keybindings.c 2008-12-05 12:34:20 UTC (rev 3322)
@@ -1388,10 +1388,10 @@
on_paste1_activate(NULL, NULL);
break;
case GEANY_KEYS_CLIPBOARD_COPYLINE:
- sci_cmd(doc->editor->sci, SCI_LINECOPY);
+ sci_send_command(doc->editor->sci, SCI_LINECOPY);
break;
case GEANY_KEYS_CLIPBOARD_CUTLINE:
- sci_cmd(doc->editor->sci, SCI_LINECUT);
+ sci_send_command(doc->editor->sci, SCI_LINECUT);
break;
}
}
@@ -1469,16 +1469,16 @@
switch (key_id)
{
case GEANY_KEYS_GOTO_LINESTART:
- sci_cmd(doc->editor->sci, editor_prefs.smart_home_key ? SCI_VCHOME : SCI_HOME);
+ sci_send_command(doc->editor->sci, editor_prefs.smart_home_key ? SCI_VCHOME : SCI_HOME);
break;
case GEANY_KEYS_GOTO_LINEEND:
- sci_cmd(doc->editor->sci, SCI_LINEEND);
+ sci_send_command(doc->editor->sci, SCI_LINEEND);
break;
case GEANY_KEYS_GOTO_PREVWORDSTART:
- sci_cmd(doc->editor->sci, SCI_WORDPARTLEFT);
+ sci_send_command(doc->editor->sci, SCI_WORDPARTLEFT);
break;
case GEANY_KEYS_GOTO_NEXTWORDSTART:
- sci_cmd(doc->editor->sci, SCI_WORDPARTRIGHT);
+ sci_send_command(doc->editor->sci, SCI_WORDPARTRIGHT);
break;
}
}
@@ -1527,10 +1527,10 @@
editor_scroll_to_line(doc->editor, -1, 0.5F);
break;
case GEANY_KEYS_EDITOR_SCROLLLINEUP:
- sci_cmd(doc->editor->sci, SCI_LINESCROLLUP);
+ sci_send_command(doc->editor->sci, SCI_LINESCROLLUP);
break;
case GEANY_KEYS_EDITOR_SCROLLLINEDOWN:
- sci_cmd(doc->editor->sci, SCI_LINESCROLLDOWN);
+ sci_send_command(doc->editor->sci, SCI_LINESCROLLDOWN);
break;
case GEANY_KEYS_EDITOR_DUPLICATELINE:
duplicate_lines(doc->editor);
@@ -1539,7 +1539,7 @@
delete_lines(doc->editor);
break;
case GEANY_KEYS_EDITOR_TRANSPOSELINE:
- sci_cmd(doc->editor->sci, SCI_LINETRANSPOSE);
+ sci_send_command(doc->editor->sci, SCI_LINETRANSPOSE);
break;
case GEANY_KEYS_EDITOR_AUTOCOMPLETE:
editor_start_auto_complete(doc->editor, sci_get_current_position(doc->editor->sci), TRUE);
@@ -1566,7 +1566,7 @@
sci_add_text(doc->editor->sci, " ");
break;
case GDK_Tab:
- sci_cmd(doc->editor->sci, SCI_TAB);
+ sci_send_command(doc->editor->sci, SCI_TAB);
break;
default:
break;
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/src/plugins.c 2008-12-05 12:34:20 UTC (rev 3322)
@@ -149,7 +149,7 @@
static SciFuncs sci_funcs = {
&_scintilla_send_message_macro,
- &sci_cmd,
+ &sci_send_command,
&sci_start_undo_action,
&sci_end_undo_action,
&sci_set_text,
Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/src/sciwrappers.c 2008-12-05 12:34:20 UTC (rev 3322)
@@ -921,7 +921,7 @@
* @param sci The Scintilla @c GtkWidget.
* @param cmd @c SCI_COMMAND.
* @see http://scintilla.org for the documentation. */
-void sci_cmd(ScintillaObject * sci, gint cmd)
+void sci_send_command(ScintillaObject * sci, gint cmd)
{
SSM(sci, cmd, 0, 0);
}
Modified: trunk/src/sciwrappers.h
===================================================================
--- trunk/src/sciwrappers.h 2008-12-05 12:11:32 UTC (rev 3321)
+++ trunk/src/sciwrappers.h 2008-12-05 12:34:20 UTC (rev 3322)
@@ -153,7 +153,7 @@
void sci_set_readonly (ScintillaObject * sci, gboolean readonly);
gboolean sci_get_readonly (ScintillaObject * sci);
gint sci_get_zoom (ScintillaObject * sci);
-void sci_cmd (ScintillaObject * sci, gint cmd);
+void sci_send_command (ScintillaObject * sci, gint cmd);
gint sci_get_current_line (ScintillaObject * sci);
gint sci_get_lines_selected (ScintillaObject * sci);
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