raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4df9246db0893fc4e4d0c3c0663e300987c2a329
commit 4df9246db0893fc4e4d0c3c0663e300987c2a329 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri May 16 16:46:51 2014 +0900 fix indenting --- src/bin/col.c | 13 +++++++------ src/bin/miniview.c | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/bin/col.c b/src/bin/col.c index c4975a5..4c7cc5a 100644 --- a/src/bin/col.c +++ b/src/bin/col.c @@ -388,7 +388,7 @@ colors_term_init(Evas_Object *textgrid, Evas_Object *bg, Config *config) char buf[32]; Color *color; - for (c = 0; c < 4 * 12; c++) + for (c = 0; c < (4 * 12); c++) { n = c + (24 * (c / 24)); color = &colors[c / 24][(c % 24) / 12][c % 12]; @@ -466,26 +466,27 @@ colors_standard_get(int set, int col, unsigned char *r, unsigned char *g, unsign } /* if pos >= 256, it's in the 256 colors set */ -unsigned int color_get(unsigned int pos) +unsigned int +color_get(unsigned int pos) { Color *c; if (pos >= 256) { pos -= 256; - if (pos >= sizeof(colors256)/sizeof(Color)) + if (pos >= (sizeof(colors256) / sizeof(Color))) { ERR("AAAAAA"); - return 0; + return 0; } c = &colors256[pos]; } else { - if (pos >= sizeof(colors)/sizeof(Color)) + if (pos >= (sizeof(colors) / sizeof(Color))) { ERR("AAAAAA"); - return 0; + return 0; } c = ((Color *)colors) + pos; } diff --git a/src/bin/miniview.c b/src/bin/miniview.c index 3dd2e7b..2a92923 100644 --- a/src/bin/miniview.c +++ b/src/bin/miniview.c @@ -92,24 +92,24 @@ _draw_cell(const Termpty *ty, unsigned int *pixel, const Termcell *cell) } if ((cell->att.fgintense) && (!fgext)) fg += 48; if ((cell->att.bgintense) && (!bgext)) bg += 48; - if (cell->att.inverse ^ inv) - { - int t; - t = fgext; fgext = bgext; bgext = t; - t = fg; fg = bg; bg = t; - } +// if (cell->att.inverse ^ inv) +// { +// int t; +// t = fgext; fgext = bgext; bgext = t; +// t = fg; fg = bg; bg = t; +// } if ((cell->att.bold) && (!fgext)) fg += 12; if ((cell->att.faint) && (!fgext)) fg += 24; - if (bgext) *pixel = color_get(bg + 256); - else if (bg && ((bg % 12) != COL_INVIS)) *pixel = color_get(bg); + if (bgext) {*pixel = color_get(bg + 256);printf("a-%c:%08x\n", cell->codepoint, *pixel);} + else if (bg && ((bg % 12) != COL_INVIS)) {*pixel = color_get(bg);printf("b-%c:%08x\n", cell->codepoint, *pixel);} else if (!isspace(cell->codepoint)) { - if (fgext) *pixel = color_get(fg + 256); - else *pixel = color_get(fg); + if (fgext) {*pixel = color_get(fg + 256);printf("c-%c:%08x\n", cell->codepoint, *pixel);} + else {*pixel = color_get(fg);printf("d-%c:%08x\n", cell->codepoint, *pixel);} } else - *pixel = 0; + {*pixel = 0;printf("z\n");} } static void --
