From 4cf18aed40f425257463ed2066affbaf8d407027 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 4 Apr 2015 18:17:01 +0100 Subject: [PATCH] elm_code: refactor widget to seperate space. Keeping the private files for elm_code cleaner --- legacy/elm_code/src/bin/elm_code_test_main.c | 1 - legacy/elm_code/src/lib/Elm_Code.h | 6 +-- legacy/elm_code/src/lib/Makefile.am | 19 ++++----- legacy/elm_code/src/lib/elm_code_private.h | 34 +--------------- .../src/lib/{ => widget}/elm_code_widget.c | 1 + .../src/lib/{ => widget}/elm_code_widget.eo | 0 .../src/lib/widget/elm_code_widget_private.h | 39 +++++++++++++++++++ .../{ => widget}/elm_code_widget_selection.c | 2 +- .../{ => widget}/elm_code_widget_selection.h | 0 .../lib/{ => widget}/elm_code_widget_text.c | 2 +- .../lib/{ => widget}/elm_code_widget_text.h | 0 .../{ => widget}/elm_code_widget_tooltip.c | 2 +- legacy/elm_code/src/tests/Makefile.am | 4 +- .../tests/{ => widget}/elm_code_test_widget.c | 2 +- .../elm_code_test_widget_selection.c | 2 +- 15 files changed, 61 insertions(+), 53 deletions(-) rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget.c (99%) rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget.eo (100%) create mode 100644 legacy/elm_code/src/lib/widget/elm_code_widget_private.h rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget_selection.c (99%) rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget_selection.h (100%) rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget_text.c (95%) rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget_text.h (100%) rename legacy/elm_code/src/lib/{ => widget}/elm_code_widget_tooltip.c (96%) rename legacy/elm_code/src/tests/{ => widget}/elm_code_test_widget.c (98%) rename legacy/elm_code/src/tests/{ => widget}/elm_code_test_widget_selection.c (99%) diff --git a/legacy/elm_code/src/bin/elm_code_test_main.c b/legacy/elm_code/src/bin/elm_code_test_main.c index 416ae79303..1522cbcf76 100644 --- a/legacy/elm_code/src/bin/elm_code_test_main.c +++ b/legacy/elm_code/src/bin/elm_code_test_main.c @@ -14,7 +14,6 @@ #include #include -#include "elm_code_widget.eo.h" #include "elm_code_test_private.h" diff --git a/legacy/elm_code/src/lib/Elm_Code.h b/legacy/elm_code/src/lib/Elm_Code.h index 332cb95893..0df6bfff77 100644 --- a/legacy/elm_code/src/lib/Elm_Code.h +++ b/legacy/elm_code/src/lib/Elm_Code.h @@ -38,9 +38,9 @@ #include "elm_code_text.h" #include "elm_code_file.h" #include "elm_code_parse.h" -#include "elm_code_widget.eo.h" -#include "elm_code_widget_text.h" -#include "elm_code_widget_selection.h" +#include "widget/elm_code_widget.eo.h" +#include "widget/elm_code_widget_text.h" +#include "widget/elm_code_widget_selection.h" #include "elm_code_diff_widget.h" #ifdef __cplusplus diff --git a/legacy/elm_code/src/lib/Makefile.am b/legacy/elm_code/src/lib/Makefile.am index 0bd1a4ebf8..e849f65bec 100644 --- a/legacy/elm_code/src/lib/Makefile.am +++ b/legacy/elm_code/src/lib/Makefile.am @@ -23,9 +23,9 @@ elm_code_line.h \ elm_code_text.h \ elm_code_file.h \ elm_code_parse.h \ -elm_code_widget.eo.h \ -elm_code_widget_text.h \ -elm_code_widget_selection.h \ +widget/elm_code_widget.eo.h \ +widget/elm_code_widget_text.h \ +widget/elm_code_widget_selection.h \ elm_code_diff_widget.h \ Elm_Code.h includesdir = $(includedir)/edi-@VMAJ@ @@ -35,19 +35,20 @@ elm_code_line.c \ elm_code_text.c \ elm_code_file.c \ elm_code_parse.c \ -elm_code_widget_text.c \ -elm_code_widget_tooltip.c \ -elm_code_widget_selection.c \ -elm_code_widget.c \ +widget/elm_code_widget_text.c \ +widget/elm_code_widget_tooltip.c \ +widget/elm_code_widget_selection.c \ +widget/elm_code_widget.c \ elm_code_diff_widget.c \ elm_code.c \ -elm_code_private.h +elm_code_private.h \ +elm_code_widget_private.h libelm_code_la_LIBADD = @EFL_LIBS@ -lm libelm_code_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@ elm_code_eolian_files = \ -elm_code_widget.eo +widget/elm_code_widget.eo elm_code_eolian_c = $(elm_code_eolian_files:%.eo=%.eo.c) elm_code_eolian_h = $(elm_code_eolian_files:%.eo=%.eo.h) diff --git a/legacy/elm_code/src/lib/elm_code_private.h b/legacy/elm_code/src/lib/elm_code_private.h index 57dae7c746..fed2ff4134 100644 --- a/legacy/elm_code/src/lib/elm_code_private.h +++ b/legacy/elm_code/src/lib/elm_code_private.h @@ -24,35 +24,6 @@ extern int _elm_code_lib_log_dom; #endif #define DBG(...) EINA_LOG_DOM_DBG(_elm_code_lib_log_dom, __VA_ARGS__) -#endif - -/** - * Structure holding the info about a selected region. - */ -typedef struct -{ - unsigned int start_line, end_line; - unsigned int start_col, end_col; -} Elm_Code_Widget_Selection_Data; - -typedef struct -{ - Elm_Code *code; - Evas_Object *grid, *scroller; - - Evas_Font_Size font_size; - double gravity_x, gravity_y; - - unsigned int cursor_line, cursor_col; - Eina_Bool editable, focussed; - Eina_Bool show_line_numbers; - unsigned int line_width_marker, tabstop; - Eina_Bool show_whitespace; - - Elm_Code_Widget_Selection_Data *selection; - Evas_Object *tooltip; -} Elm_Code_Widget_Data; - /* Private parser callbacks */ void _elm_code_parse_setup(); @@ -61,8 +32,5 @@ void _elm_code_parse_line(Elm_Code *code, Elm_Code_Line *line); void _elm_code_parse_file(Elm_Code *code, Elm_Code_File *file); -/* Private widget methods */ -void _elm_code_widget_tooltip_text_set(Evas_Object *widget, const char *text); - -void _elm_code_widget_tooltip_add(Evas_Object *widget); +#endif diff --git a/legacy/elm_code/src/lib/elm_code_widget.c b/legacy/elm_code/src/lib/widget/elm_code_widget.c similarity index 99% rename from legacy/elm_code/src/lib/elm_code_widget.c rename to legacy/elm_code/src/lib/widget/elm_code_widget.c index a7c6a00691..b664516a88 100644 --- a/legacy/elm_code/src/lib/elm_code_widget.c +++ b/legacy/elm_code/src/lib/widget/elm_code_widget.c @@ -4,6 +4,7 @@ #include "Elm_Code.h" #include "elm_code_private.h" +#include "elm_code_widget_private.h" typedef enum { ELM_CODE_WIDGET_COLOR_GUTTER_BG = ELM_CODE_TOKEN_TYPE_COUNT, diff --git a/legacy/elm_code/src/lib/elm_code_widget.eo b/legacy/elm_code/src/lib/widget/elm_code_widget.eo similarity index 100% rename from legacy/elm_code/src/lib/elm_code_widget.eo rename to legacy/elm_code/src/lib/widget/elm_code_widget.eo diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_private.h b/legacy/elm_code/src/lib/widget/elm_code_widget_private.h new file mode 100644 index 0000000000..0f758c7409 --- /dev/null +++ b/legacy/elm_code/src/lib/widget/elm_code_widget_private.h @@ -0,0 +1,39 @@ +#ifndef ELM_CODE_WIDGET_PRIVATE_H +# define ELM_CODE_WIDGET_PRIVATE_H + +/** + * Structure holding the info about a selected region. + */ +typedef struct +{ + unsigned int start_line, end_line; + unsigned int start_col, end_col; +} Elm_Code_Widget_Selection_Data; + +typedef struct +{ + Elm_Code *code; + Evas_Object *grid, *scroller; + + Evas_Font_Size font_size; + double gravity_x, gravity_y; + + unsigned int cursor_line, cursor_col; + Eina_Bool editable, focussed; + Eina_Bool show_line_numbers; + unsigned int line_width_marker, tabstop; + Eina_Bool show_whitespace; + + Elm_Code_Widget_Selection_Data *selection; + Evas_Object *tooltip; +} Elm_Code_Widget_Data; + +/* Private widget methods */ + +void _elm_code_widget_tooltip_text_set(Evas_Object *widget, const char *text); + +void _elm_code_widget_tooltip_add(Evas_Object *widget); + + + +#endif diff --git a/legacy/elm_code/src/lib/elm_code_widget_selection.c b/legacy/elm_code/src/lib/widget/elm_code_widget_selection.c similarity index 99% rename from legacy/elm_code/src/lib/elm_code_widget_selection.c rename to legacy/elm_code/src/lib/widget/elm_code_widget_selection.c index 0b5d9dae0f..a7a5c018c5 100644 --- a/legacy/elm_code/src/lib/elm_code_widget_selection.c +++ b/legacy/elm_code/src/lib/widget/elm_code_widget_selection.c @@ -4,7 +4,7 @@ #include "Elm_Code.h" -#include "elm_code_private.h" +#include "elm_code_widget_private.h" static Elm_Code_Widget_Selection_Data * _elm_code_widget_selection_new() diff --git a/legacy/elm_code/src/lib/elm_code_widget_selection.h b/legacy/elm_code/src/lib/widget/elm_code_widget_selection.h similarity index 100% rename from legacy/elm_code/src/lib/elm_code_widget_selection.h rename to legacy/elm_code/src/lib/widget/elm_code_widget_selection.h diff --git a/legacy/elm_code/src/lib/elm_code_widget_text.c b/legacy/elm_code/src/lib/widget/elm_code_widget_text.c similarity index 95% rename from legacy/elm_code/src/lib/elm_code_widget_text.c rename to legacy/elm_code/src/lib/widget/elm_code_widget_text.c index e96b5d1cbe..c50ebce51c 100644 --- a/legacy/elm_code/src/lib/elm_code_widget_text.c +++ b/legacy/elm_code/src/lib/widget/elm_code_widget_text.c @@ -4,7 +4,7 @@ #include "Elm_Code.h" -#include "elm_code_private.h" +#include "elm_code_widget_private.h" EAPI int elm_code_widget_text_line_number_width_get(Elm_Code_Widget *widget) diff --git a/legacy/elm_code/src/lib/elm_code_widget_text.h b/legacy/elm_code/src/lib/widget/elm_code_widget_text.h similarity index 100% rename from legacy/elm_code/src/lib/elm_code_widget_text.h rename to legacy/elm_code/src/lib/widget/elm_code_widget_text.h diff --git a/legacy/elm_code/src/lib/elm_code_widget_tooltip.c b/legacy/elm_code/src/lib/widget/elm_code_widget_tooltip.c similarity index 96% rename from legacy/elm_code/src/lib/elm_code_widget_tooltip.c rename to legacy/elm_code/src/lib/widget/elm_code_widget_tooltip.c index 18bee520e1..f08c18ec7f 100644 --- a/legacy/elm_code/src/lib/elm_code_widget_tooltip.c +++ b/legacy/elm_code/src/lib/widget/elm_code_widget_tooltip.c @@ -4,7 +4,7 @@ #include "Elm_Code.h" -#include "elm_code_private.h" +#include "elm_code_widget_private.h" void _elm_code_widget_tooltip_text_set(Evas_Object *widget, const char *text) diff --git a/legacy/elm_code/src/tests/Makefile.am b/legacy/elm_code/src/tests/Makefile.am index 131aa1e448..8e74bc0b8b 100644 --- a/legacy/elm_code/src/tests/Makefile.am +++ b/legacy/elm_code/src/tests/Makefile.am @@ -11,8 +11,8 @@ elm_code_file_test_memory.c \ elm_code_test_basic.c \ elm_code_test_parse.c \ elm_code_test_text.c \ -elm_code_test_widget.c \ -elm_code_test_widget_selection.c \ +widget/elm_code_test_widget.c \ +widget/elm_code_test_widget_selection.c \ elm_code_suite.c elm_code_suite_CPPFLAGS = -I$(top_builddir)/elm_code/src/lib/ \ diff --git a/legacy/elm_code/src/tests/elm_code_test_widget.c b/legacy/elm_code/src/tests/widget/elm_code_test_widget.c similarity index 98% rename from legacy/elm_code/src/tests/elm_code_test_widget.c rename to legacy/elm_code/src/tests/widget/elm_code_test_widget.c index 6311dc23c7..54c102c397 100644 --- a/legacy/elm_code/src/tests/elm_code_test_widget.c +++ b/legacy/elm_code/src/tests/widget/elm_code_test_widget.c @@ -4,7 +4,7 @@ #include "elm_code_suite.h" -#include "elm_code_widget.c" +#include "widget/elm_code_widget.c" static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type, int id) { diff --git a/legacy/elm_code/src/tests/elm_code_test_widget_selection.c b/legacy/elm_code/src/tests/widget/elm_code_test_widget_selection.c similarity index 99% rename from legacy/elm_code/src/tests/elm_code_test_widget_selection.c rename to legacy/elm_code/src/tests/widget/elm_code_test_widget_selection.c index db0a60fa4e..3463c455a7 100644 --- a/legacy/elm_code/src/tests/elm_code_test_widget_selection.c +++ b/legacy/elm_code/src/tests/widget/elm_code_test_widget_selection.c @@ -4,7 +4,7 @@ #include "elm_code_suite.h" -#include "elm_code_widget_selection.h" +#include "widget/elm_code_widget_selection.h" START_TEST (elm_code_test_widget_selection_set) {