billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=901807fc09cc1f9b45bbfe450d7abfeed60bfd04
commit 901807fc09cc1f9b45bbfe450d7abfeed60bfd04 Author: Boris Faure <[email protected]> Date: Tue Aug 19 22:48:00 2014 +0200 also remove debugwhite --- src/bin/termio.c | 48 +++--------------------------------------------- src/bin/termio.h | 1 - 2 files changed, 3 insertions(+), 46 deletions(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index bf8e348..d87b5ea 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -95,7 +95,6 @@ struct _Termio Eina_Bool bottom_right : 1; Eina_Bool top_left : 1; Eina_Bool reset_sel : 1; - Eina_Bool debugwhite : 1; }; #define INT_SWAP(_a, _b) do { \ @@ -364,15 +363,6 @@ termio_icon_name_get(Evas_Object *obj) } void -termio_debugwhite_set(Evas_Object *obj, Eina_Bool dbg) -{ - Termio *sd = evas_object_smart_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(sd); - sd->debugwhite = dbg; - _smart_apply(obj); -} - -void termio_media_mute_set(Evas_Object *obj, Eina_Bool mute) { Termio *sd = evas_object_smart_data_get(obj); @@ -3579,12 +3569,6 @@ _smart_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS evas_object_smart_callback_call(data, "options", NULL); return; } - if ((ev->button == 3) && shift) - { - termio_debugwhite_set(data, !sd->debugwhite); - DBG("debugwhite %i", sd->debugwhite); - return; - } if (!shift && !ctrl) if (_rep_mouse_down(sd, ev, cx, cy)) return; if (ev->button == 1) @@ -4279,41 +4263,15 @@ _smart_apply(Evas_Object *obj) (tc[x].fg_extended != fgext) || (tc[x].bg_extended != bgext) || (tc[x].underline != cells[x].att.underline) || - (tc[x].strikethrough != cells[x].att.strike) || - (sd->debugwhite)) + (tc[x].strikethrough != cells[x].att.strike)) { if (ch1 < 0) ch1 = x; ch2 = x; } tc[x].fg_extended = fgext; tc[x].bg_extended = bgext; - if (sd->debugwhite) - { - if (cells[x].att.newline) - tc[x].strikethrough = 1; - else - tc[x].strikethrough = 0; - if (cells[x].att.autowrapped) - tc[x].underline = 1; - else - tc[x].underline = 0; -// if (cells[x].att.tab) -// tc[x].underline = 1; -// else -// tc[x].underline = 0; - if ((cells[x].att.newline) || - (cells[x].att.autowrapped)) - { - fg = 8; - bg = 4; - codepoint = '!'; - } - } - else - { - tc[x].underline = cells[x].att.underline; - tc[x].strikethrough = cells[x].att.strike; - } + tc[x].underline = cells[x].att.underline; + tc[x].strikethrough = cells[x].att.strike; tc[x].fg = fg; tc[x].bg = bg; tc[x].codepoint = codepoint; diff --git a/src/bin/termio.h b/src/bin/termio.h index 6c69bca..f48b61f 100644 --- a/src/bin/termio.h +++ b/src/bin/termio.h @@ -35,7 +35,6 @@ Evas_Object *termio_textgrid_get(Evas_Object *obj); Evas_Object *termio_win_get(Evas_Object *obj); const char *termio_title_get(Evas_Object *obj); const char *termio_icon_name_get(Evas_Object *obj); -void termio_debugwhite_set(Evas_Object *obj, Eina_Bool dbg); void termio_media_mute_set(Evas_Object *obj, Eina_Bool mute); void termio_config_set(Evas_Object *obj, Config *config); Config *termio_config_get(const Evas_Object *obj); --
