vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace consolepanel with elm_code. 

It may not have the nice cursor but it's quicker and scrolls correctly :)
This commit is contained in:
Andy Williams 2015-01-28 22:40:49 +00:00
parent 155c18c141
commit 3cd5ec7003
1 changed files with 64 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
src/bin/edi_consolepanel.c
View File

@ -17,7 +17,6 @@
#include "edi_private.h" #include "edi_private.h"
static Evas_Object *_console_box;
static const char *_current_dir = NULL; static const char *_current_dir = NULL;
static unsigned int _edi_strlen_current_dir; static unsigned int _edi_strlen_current_dir;
@ -25,22 +24,11 @@ static int _edi_test_count;
static int _edi_test_pass; static int _edi_test_pass;
static int _edi_test_fail; static int _edi_test_fail;
static Elm_Code *_edi_test_code; static Elm_Code *_edi_test_code, *_edi_console_code;
static void _edi_test_line_callback(const char *content); static void _edi_test_line_callback(const char *content);
static const char *_edi_consolepanel_icon_for_line(const char *line) static Eina_Bool
{ _edi_consolepanel_startswith_location(const char *line)
if (strstr(line, " error:") != NULL)
return "error";
if (strstr(line, " warning:") != NULL)
return "important";
if (strstr(line, " info:") != NULL || strstr(line, " note:") != NULL)
return "info";
return NULL;
}
static Eina_Bool _startswith_location(const char *line)
{ {
regex_t regex; regex_t regex;
int ret; int ret;
@ -52,16 +40,22 @@ static Eina_Bool _startswith_location(const char *line)
return ret; return ret;
} }
static void _edi_consolepanel_clicked_cb(void *data, Evas *e EINA_UNUSED, static char *
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _edi_consolepanel_extract_location(const char *line)
{ {
Edi_Path_Options *options; char *path;
const char *pos;
int file_len, length;
if (strstr(data, edi_project_get()) != data) pos = strstr(line, " ");
return; file_len = strlen(line) - strlen(pos);
options = edi_path_options_create(data); length = _edi_strlen_current_dir + file_len + 2;
edi_mainview_open(options); path = malloc(sizeof(char) * length);
snprintf(path, _edi_strlen_current_dir + 2, "%s/", _current_dir);
snprintf(path + _edi_strlen_current_dir + 1, file_len + 1, "%s", line);
return path;
} }
static void _edi_consolepanel_parse_directory(const char *line) static void _edi_consolepanel_parse_directory(const char *line)
@ -79,91 +73,47 @@ static void _edi_consolepanel_parse_directory(const char *line)
} }
} }
static void _edi_consolepanel_scroll_to_bottom() static Eina_Bool
_edi_consolepanel_clicked_cb(void *data, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{ {
Evas_Object *scroller; Edi_Path_Options *options;
Evas_Coord x, y, w, h; Elm_Code *code;
Elm_Code_Line *line;
const char *content;
char *path, *terminated;
int length;
scroller = elm_object_parent_widget_get(_console_box); code = (Elm_Code *)data;
evas_object_geometry_get(_console_box, &x, &y, &w, &h); line = (Elm_Code_Line *)event_info;
elm_scroller_region_show(scroller, x, h - 10, w, 10);
content = elm_code_file_line_content_get(code->file, line->number, &length);
terminated = malloc(sizeof(char) * (length + 1));
snprintf(terminated, length, content);
if (_edi_consolepanel_startswith_location(terminated))
{
path = _edi_consolepanel_extract_location(terminated);
if (strstr(path, edi_project_get()) == path)
{
options = edi_path_options_create(path);
edi_mainview_open(options);
}
}
free(terminated);
return EINA_TRUE;
} }
static void _edi_consolepanel_append_line_type(const char *line, Eina_Bool err) static void _edi_consolepanel_append_line_type(const char *line, Eina_Bool err)
{ {
Evas_Object *txt, *icon, *box; _edi_consolepanel_parse_directory(line);
char *buf, *path;
const char *pos, *file, *type = NULL, *cursor = NULL;
int length;
txt = elm_label_add(_console_box);
elm_code_file_line_append(_edi_console_code->file, line, strlen(line));
if (err) if (err)
evas_object_color_set(txt, 255, 63, 63, 255); elm_code_file_line_status_set(_edi_console_code->file, elm_code_file_lines_get(_edi_console_code->file),
else ELM_CODE_STATUS_TYPE_ERROR);
evas_object_color_set(txt, 255, 255, 255, 255);
if (_startswith_location(line))
{
cursor = ELM_CURSOR_HAND1;
elm_object_cursor_set(txt, cursor);
elm_object_cursor_theme_search_enabled_set(txt, EINA_TRUE);
pos = strstr(line, " ");
length = strlen(line) - strlen(pos);
file = eina_stringshare_add_length(line, length);
buf = malloc(sizeof(char) * (strlen(line) + 8));
snprintf(buf, strlen(line) + 8, "<b>%s</b>%s/n", file, pos);
elm_object_text_set(txt, buf);
length = _edi_strlen_current_dir + strlen(file) + 2;
path = malloc(sizeof(char) * length);
snprintf(path, length, "%s/%s\n", _current_dir, file);
evas_object_event_callback_add(txt, EVAS_CALLBACK_MOUSE_DOWN,
_edi_consolepanel_clicked_cb, eina_stringshare_add(path));
free(path);
free(buf);
}
else
{
_edi_consolepanel_parse_directory(line);
elm_object_text_set(txt, line);
}
evas_object_size_hint_weight_set(txt, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(txt, 0.0, EVAS_HINT_FILL);
evas_object_show(txt);
if (err)
type = _edi_consolepanel_icon_for_line(line);
icon = elm_icon_add(_console_box);
evas_object_size_hint_min_set(icon, 14, 14);
evas_object_size_hint_max_set(icon, 14, 14);
if (type)
{
elm_icon_standard_set(icon, type);
if (cursor)
{
elm_object_cursor_set(icon, cursor);
elm_object_cursor_theme_search_enabled_set(icon, EINA_TRUE);
}
}
evas_object_show(icon);
box = elm_box_add(_console_box);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_horizontal_set(box, EINA_TRUE);
elm_box_pack_end(box, icon);
elm_box_pack_end(box, txt);
evas_object_show(box);
elm_box_pack_end(_console_box, box);
_edi_consolepanel_scroll_to_bottom();
_edi_test_line_callback(line); _edi_test_line_callback(line);
} }
@ -180,7 +130,7 @@ void edi_consolepanel_append_error_line(const char *line)
void edi_consolepanel_clear() void edi_consolepanel_clear()
{ {
elm_box_clear(_console_box); elm_code_file_clear(_edi_console_code->file);
elm_code_file_clear(_edi_test_code->file); elm_code_file_clear(_edi_test_code->file);
_edi_test_count = 0; _edi_test_count = 0;
@ -313,21 +263,24 @@ static void _edi_test_line_callback(const char *content)
void edi_consolepanel_add(Evas_Object *parent) void edi_consolepanel_add(Evas_Object *parent)
{ {
Evas_Object *scroll, *vbx; Elm_Code *code;
Elm_Code_Widget *widget;
scroll = elm_scroller_add(parent); code = elm_code_create();
evas_object_size_hint_weight_set(scroll, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); _edi_console_code = code;
evas_object_size_hint_align_set(scroll, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(scroll);
vbx = elm_box_add(parent); widget = eo_add(ELM_CODE_WIDGET_CLASS, parent);
evas_object_size_hint_weight_set(vbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); eo_do(widget,
evas_object_show(vbx); elm_code_widget_code_set(code),
elm_object_content_set(scroll, vbx); elm_code_widget_font_size_set(_edi_cfg->font.size),
elm_code_widget_gravity_set(0.0, 1.0),
eo_event_callback_add(ELM_CODE_WIDGET_EVENT_LINE_CLICKED, _edi_consolepanel_clicked_cb, code));
_console_box = vbx; evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(widget);
elm_box_pack_end(parent, scroll); elm_box_pack_end(parent, widget);
ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _exe_data, NULL); ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _exe_data, NULL);
ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _exe_error, NULL); ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _exe_error, NULL);