nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset 69de5817fdc9

master
Yevgen Muntyan 2017-05-25 12:49:02 -07:00
parent 85380579c8
commit b8a85e221d
21 changed files with 24 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/CMakeLists.txt
View File

@ -112,16 +112,16 @@ SET(source_files
../moo/mooedit/mootextbtree.c
../moo/mooedit/mootextbtree.h
../moo/mooedit/mootextbuffer.c
../moo/mooedit/native/mootextfind.c
../moo/mooedit/native/mootextfind.h
../moo/mooedit/mootextfind.c
../moo/mooedit/mootextfind.h
../moo/mooedit/mootextiter.h
../moo/mooedit/native/mootextprint.c
../moo/mooedit/native/mootextprint.h
../moo/mooedit/native/mootextprint-private.h
../moo/mooedit/mootextprint.c
../moo/mooedit/mootextprint.h
../moo/mooedit/mootextprint-private.h
../moo/mooedit/mootext-private.h
../moo/mooedit/native/mootextsearch.c
../moo/mooedit/native/mootextsearch.h
../moo/mooedit/native/mootextsearch-private.h
../moo/mooedit/mootextsearch.c
../moo/mooedit/mootextsearch.h
../moo/mooedit/mootextsearch-private.h
../moo/mooedit/native/mootextstylescheme.c
../moo/mooedit/native/mootextstylescheme.h
../moo/mooedit/mootextview.c

2
moo/mooapp/mooapp.cpp
View File

@ -1403,9 +1403,7 @@ moo_app_create_prefs_dialog (MooApp *app)
moo_prefs_dialog_append_page (dialog, moo_edit_prefs_page_new_1 (moo_app_get_editor (app)));
moo_prefs_dialog_append_page (dialog, moo_edit_prefs_page_new_2 (moo_app_get_editor (app)));
moo_prefs_dialog_append_page (dialog, moo_edit_prefs_page_new_3 (moo_app_get_editor (app)));
#ifndef MOO_USE_SCI
moo_prefs_dialog_append_page (dialog, moo_edit_prefs_page_new_4 (moo_app_get_editor (app)));
#endif
moo_prefs_dialog_append_page (dialog, moo_edit_prefs_page_new_5 (moo_app_get_editor (app)));
moo_plugin_attach_prefs (GTK_WIDGET (dialog));

16
moo/mooedit/mooedit.cmake
View File

@ -11,14 +11,6 @@ SET(mooedit_gtksourceview_sources
mooedit/native/moolangmgr.h
mooedit/native/mootextstylescheme.c
mooedit/native/mootextstylescheme.h
mooedit/native/mootextprint-private.h
mooedit/native/mootextprint.c
mooedit/native/mootextprint.h
mooedit/native/mootextsearch-private.h
mooedit/native/mootextsearch.c
mooedit/native/mootextsearch.h
mooedit/native/mootextfind.c
mooedit/native/mootextfind.h
)
SET(mooedit_sci_sources
@ -97,7 +89,15 @@ SET(mooedit_sources
mooedit/mootextbtree.h
mooedit/mootextbuffer.c
mooedit/mootextbuffer.h
mooedit/mootextfind.c
mooedit/mootextfind.h
mooedit/mootextiter.h
mooedit/mootextprint-private.h
mooedit/mootextprint.c
mooedit/mootextprint.h
mooedit/mootextsearch-private.h
mooedit/mootextsearch.c
mooedit/mootextsearch.h
mooedit/mootextview-input.c
mooedit/mootextview-private.h
mooedit/mootextview.c

4
moo/mooedit/mooedit.cpp
View File

@ -1863,7 +1863,7 @@ block_uncomment (GtkTextBuffer *buffer,
}
//**
/**
* moo_edit_comment_selection:
**/
void
@ -1922,7 +1922,7 @@ moo_edit_comment_selection (MooEdit *edit)
}
//**
/**
* moo_edit_uncomment_selection:
**/
void

2
moo/mooedit/mooedit.h
View File

@ -117,10 +117,8 @@ gboolean moo_edit_save_copy (MooEdit *edi
GError **error);
gboolean moo_edit_close (MooEdit *edit);
#ifndef MOO_USE_SCI
void moo_edit_comment_selection (MooEdit *edit);
void moo_edit_uncomment_selection (MooEdit *edit);
#endif
G_END_DECLS

1
moo/mooedit/mooeditor.cpp
View File

@ -32,7 +32,6 @@
#include "mooedit/mooedithistoryitem.h"
#include "mooedit/mooedit-ui.h"
#include "mooedit/medit-ui.h"
#include "mooedit/mootextiter.h"
#include "mooutils/moomenuaction.h"
#include "marshals.h"
#include "mooutils/mooutils-cpp.h"

2
moo/mooedit/mooeditprefs.h
View File

@ -26,9 +26,7 @@ G_BEGIN_DECLS
GtkWidget *moo_edit_prefs_page_new_1 (MooEditor *editor);
GtkWidget *moo_edit_prefs_page_new_2 (MooEditor *editor);
GtkWidget *moo_edit_prefs_page_new_3 (MooEditor *editor);
#ifndef MOO_USE_SCI
GtkWidget *moo_edit_prefs_page_new_4 (MooEditor *editor);
#endif
GtkWidget *moo_edit_prefs_page_new_5 (MooEditor *editor);
/* defined in mooeditprefs.c */

5
moo/mooedit/mooeditwindow.cpp
View File

@ -36,7 +36,6 @@
#include "mooedit/mooeditprefs.h"
#include "mooedit/mooplugin.h"
#include "mooedit/mooeditaction.h"
#include "mooedit/mootextiter.h"
#ifndef MOO_USE_SCI
#include "mooedit/native/mooeditbookmark.h"
#endif
@ -61,10 +60,8 @@
#include <string>
#include <unordered_set>
#ifndef MOO_USE_SCI
#define ENABLE_PRINTING
#include "mooedit/native/mootextprint.h"
#endif // !MOO_USE_SCI
#include "mooedit/mootextprint.h"
#define ACTIVE_DOC moo_edit_window_get_active_doc
#define ACTIVE_VIEW moo_edit_window_get_active_view

2
moo/mooedit/mootext-private.h
View File

@ -49,12 +49,10 @@ void _moo_line_mark_set_fold (MooLineMark *mark,
MooFold *fold);
MooFold *_moo_line_mark_get_fold (MooLineMark *mark);
#ifndef MOO_USE_SCI
void _moo_text_buffer_update_highlight (MooTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end,
gboolean synchronous);
#endif // !MOO_USE_SCI
gpointer _moo_text_buffer_get_undo_stack (MooTextBuffer *buffer);
gboolean _moo_text_buffer_is_bracket_tag (MooTextBuffer *buffer,
GtkTextTag *tag);

4
moo/mooedit/native/mootextfind.c → moo/mooedit/mootextfind.c
View File

@ -16,9 +16,7 @@
#include "mooedit/mootextfind.h"
#include "mooedit/mootextview.h"
#include "mooedit/mooeditdialogs.h"
#ifndef MOO_USE_SCI
#include "mooedit/native/mootextsearch-private.h"
#endif
#include "mooedit/mootextsearch-private.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mooedit-enums.h"
#include "mooutils/moohistorycombo.h"

0
moo/mooedit/native/mootextfind.h → moo/mooedit/mootextfind.h
View File

0
moo/mooedit/native/mootextprint-private.h → moo/mooedit/mootextprint-private.h
View File

0
moo/mooedit/native/mootextprint.c → moo/mooedit/mootextprint.c
View File

0
moo/mooedit/native/mootextprint.h → moo/mooedit/mootextprint.h
View File

0
moo/mooedit/native/mootextsearch-private.h → moo/mooedit/mootextsearch-private.h
View File

0
moo/mooedit/native/mootextsearch.c → moo/mooedit/mootextsearch.c
View File

0
moo/mooedit/native/mootextsearch.h → moo/mooedit/mootextsearch.h
View File

2
moo/mooedit/mootextview-input.c
View File

@ -1057,7 +1057,6 @@ _moo_text_view_extend_selection (MooTextView *view,
{
int ch_class;
#ifndef MOO_USE_SCI
if (!order && view->priv->dnd.double_click_selects_brackets)
{
GtkTextIter rstart = *start;
@ -1088,7 +1087,6 @@ _moo_text_view_extend_selection (MooTextView *view,
}
}
}
#endif // !MOO_USE_SCI
if (order > 0)
{

4
moo/mooedit/mootextview-private.h
View File

@ -17,9 +17,7 @@
#define MOO_TEXT_VIEW_PRIVATE_H
#include "mooedit/mootextview.h"
#ifndef MOO_USE_SCI
#include "mooedit/native/mootextsearch.h"
#endif
#include "mooedit/mootextsearch.h"
#include "mooutils/moohistorylist.h"
#include <gtk/gtk.h>

33
moo/mooedit/mootextview.c
View File

@ -21,15 +21,14 @@
#include "mooedit/mootextview-private.h"
#include "mooedit/mootextview.h"
#include "mooedit/mootextbuffer.h"
#include "mooedit/mootextfind.h"
#include "mooedit/mootext-private.h"
#include "mooedit/mooeditprefs.h"
#ifndef MOO_USE_SCI
#include "mooedit/native/mootextfind.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditwindow.h"
#include "mooedit/mooedit.h"
#include "mooedit/mootextiter.h"
#include "marshals.h"
#include "mooutils/mooutils-misc.h"
#include "mooutils/mooundo.h"
@ -129,11 +128,9 @@ static void find_interactive (MooTextView *view);
static void replace_interactive (MooTextView *view);
static void find_next_interactive (MooTextView *view);
static void find_prev_interactive (MooTextView *view);
#ifndef MOO_USE_SCI
static void goto_line_interactive (MooTextView *view);
static gboolean start_quick_search (MooTextView *view);
static void moo_text_view_stop_quick_search (MooTextView *view);
#endif
static void insert_text_cb (MooTextView *view,
GtkTextIter *iter,
@ -208,9 +205,7 @@ enum {
CURSOR_MOVED,
CHAR_INSERTED,
LINE_MARK_CLICKED,
#ifndef MOO_USE_SCI
START_QUICK_SEARCH,
#endif
UNDO,
REDO,
LAST_SIGNAL
@ -250,10 +245,8 @@ enum {
PROP_SHOW_LINE_NUMBERS,
PROP_SHOW_LINE_MARKS,
PROP_ENABLE_FOLDING,
#ifndef MOO_USE_SCI
PROP_ENABLE_QUICK_SEARCH,
PROP_QUICK_SEARCH_FLAGS,
#endif
PROP_QUICK_SEARCH_FLAGS
};
@ -302,14 +295,12 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
text_view_class->populate_popup = moo_text_view_populate_popup;
klass->extend_selection = _moo_text_view_extend_selection;
#ifndef MOO_USE_SCI
klass->find_word_at_cursor = find_word_at_cursor;
klass->find_interactive = find_interactive;
klass->find_next_interactive = find_next_interactive;
klass->find_prev_interactive = find_prev_interactive;
klass->replace_interactive = replace_interactive;
klass->goto_line_interactive = goto_line_interactive;
#endif // !MOO_USE_SCI
klass->char_inserted = moo_text_view_char_inserted;
#ifndef MOO_USE_SCI
klass->apply_style_scheme = moo_text_view_apply_style_scheme;
@ -495,7 +486,6 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
FALSE,
(GParamFlags) G_PARAM_READWRITE));
#ifndef MOO_USE_SCI
g_object_class_install_property (gobject_class,
PROP_ENABLE_QUICK_SEARCH,
g_param_spec_boolean ("enable-quick-search",
@ -512,7 +502,6 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
MOO_TYPE_TEXT_SEARCH_FLAGS,
MOO_TEXT_SEARCH_CASELESS,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_CONSTRUCT)));
#endif // !MOO_USE_SCI
g_object_class_install_property (gobject_class,
PROP_AUTO_INDENT,
@ -568,7 +557,6 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
_moo_marshal_VOID__VOID,
G_TYPE_NONE, 0);
#ifndef MOO_USE_SCI
signals[FIND_WORD_AT_CURSOR] =
g_signal_new ("find-word-at-cursor",
G_OBJECT_CLASS_TYPE (klass),
@ -623,7 +611,6 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
NULL, NULL,
_moo_marshal_VOID__VOID,
G_TYPE_NONE, 0);
#endif // !MOO_USE_SCI
signals[CHAR_INSERTED] =
g_signal_new ("char-inserted",
@ -655,7 +642,6 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
G_TYPE_BOOLEAN, 1,
G_TYPE_INT);
#ifndef MOO_USE_SCI
signals[START_QUICK_SEARCH] =
_moo_signal_new_cb ("start-quick-search",
G_OBJECT_CLASS_TYPE (klass),
@ -664,7 +650,6 @@ static void moo_text_view_class_init (MooTextViewClass *klass)
NULL, NULL,
_moo_marshal_BOOL__VOID,
G_TYPE_BOOLEAN, 0);
#endif
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_z, MOO_ACCEL_CTRL_MASK,
@ -930,8 +915,6 @@ msg_to_statusbar (const char *message,
}
#ifndef MOO_USE_SCI
static void
find_word_at_cursor (MooTextView *view,
gboolean forward)
@ -974,8 +957,6 @@ goto_line_interactive (MooTextView *view)
moo_text_view_run_goto_line (GTK_TEXT_VIEW (view));
}
#endif // !MOO_USE_SCI
/**
* moo_text_view_set_font_from_string: (moo.private 1)
@ -1199,7 +1180,6 @@ moo_text_view_set_property (GObject *object,
set_enable_folding (view, g_value_get_boolean (value));
break;
#ifndef MOO_USE_SCI
case PROP_ENABLE_QUICK_SEARCH:
view->priv->qs.enable = g_value_get_boolean (value) != 0;
g_object_notify (object, "enable-quick-search");
@ -1209,7 +1189,6 @@ moo_text_view_set_property (GObject *object,
view->priv->qs.flags = g_value_get_flags (value);
g_object_notify (object, "quick-search-flags");
break;
#endif // !MOO_USE_SCI
case PROP_AUTO_INDENT:
view->priv->enter_indents = g_value_get_boolean (value);
@ -1313,14 +1292,12 @@ moo_text_view_get_property (GObject *object,
case PROP_ENABLE_FOLDING:
g_value_set_boolean (value, view->priv->enable_folding);
break;
#ifndef MOO_USE_SCI
case PROP_ENABLE_QUICK_SEARCH:
g_value_set_boolean (value, view->priv->qs.enable);
break;
case PROP_QUICK_SEARCH_FLAGS:
g_value_set_flags (value, view->priv->qs.flags);
break;
#endif // !MOO_USE_SCI
case PROP_AUTO_INDENT:
g_value_set_boolean (value, view->priv->enter_indents != 0);
break;
@ -2471,7 +2448,6 @@ moo_text_view_expose (GtkWidget *widget,
else if (event->window == text_window)
draw_marks_background (view, event);
#ifndef MOO_USE_SCI
if (event->window == text_window)
{
GdkRectangle visible_rect;
@ -2484,7 +2460,6 @@ moo_text_view_expose (GtkWidget *widget,
_moo_text_buffer_update_highlight (get_moo_buffer (view), &start, &end, FALSE);
}
#endif // !MOO_USE_SCI
handled = GTK_WIDGET_CLASS(moo_text_view_parent_class)->expose_event (widget, event);
@ -3819,8 +3794,6 @@ moo_text_view_remove (GtkContainer *container,
}
#ifndef MOO_USE_SCI
/***************************************************************************/
/* Search
*/
@ -4159,5 +4132,3 @@ start_quick_search (MooTextView *view)
return FALSE;
}
}
#endif // !MOO_USE_SCI

4
moo/mooedit/mootextview.h
View File

@ -20,8 +20,8 @@
#ifndef MOO_USE_SCI
#include "mooedit/native/moolangmgr.h"
#include <mooedit/native/mootextstylescheme.h>
#include <mooedit/native/mootextsearch.h>
#endif // !MOO_USE_SCI
#include <mooedit/mootextsearch.h>
#include <mooedit/mooedit-enums.h>
G_BEGIN_DECLS
@ -57,7 +57,6 @@ struct MooTextViewClass
gboolean (* line_mark_clicked) (MooTextView *view,
int line);
#ifndef MOO_USE_SCI
/* these are made signals for convenience */
void (* find_interactive) (MooTextView *view);
void (* replace_interactive) (MooTextView *view);
@ -66,7 +65,6 @@ struct MooTextViewClass
void (* goto_line_interactive) (MooTextView *view);
void (* find_word_at_cursor) (MooTextView *view,
gboolean forward);
#endif // !MOO_USE_SCI
/* methods */
/* adjusts start and end so that selection bound goes to start