HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename sci_cmd() to sci_send_command() to match the plugin API and

Browse Source 
fix the generated macro name.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3322 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-12-05 12:34:20 +00:00
parent 848f714ef1
commit 7994128e38
8 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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:

4
plugins/geanyfunctions.h
View File

@ -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 \

6
src/callbacks.c
View File

@ -896,7 +896,7 @@ void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data)
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 @@ on_menu_increase_indent1_activate (GtkMenuItem *menuitem,
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 @@ on_menu_decrease_indent1_activate (GtkMenuItem *menuitem,
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
{

2
src/editor.c
View File

@ -3940,7 +3940,7 @@ on_editor_scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer user_d
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;
}

20
src/keybindings.c
View File

@ -1388,10 +1388,10 @@ static void cb_func_clipboard(guint key_id)
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 @@ static void cb_func_goto_action(guint key_id)
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 @@ static void cb_func_editor_action(guint key_id)
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 @@ static void cb_func_editor_action(guint key_id)
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 @@ static void cb_func_editor_action(guint key_id)
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;

2
src/plugins.c
View File

@ -149,7 +149,7 @@ static ScintillaFuncs scintilla_funcs = {
static SciFuncs sci_funcs = {
&_scintilla_send_message_macro,
&sci_cmd,
&sci_send_command,
&sci_start_undo_action,
&sci_end_undo_action,
&sci_set_text,

2
src/sciwrappers.c
View File

@ -921,7 +921,7 @@ gboolean sci_get_readonly(ScintillaObject *sci)
* @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);
}

2
src/sciwrappers.h
View File

@ -153,7 +153,7 @@ gint sci_get_lexer (ScintillaObject * sci);
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);