billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=26e91924d9e9b6f4a7f10d573106a791463f18f2
commit 26e91924d9e9b6f4a7f10d573106a791463f18f2
Author: Boris Faure <bill...@gmail.com>
Date: Wed Jun 24 22:48:39 2020 +0200
Get rid of trailing whitespaces
Summary: Remove trailing whitespaces
Reviewers: billiob
Reviewed By: billiob
Differential Revision: https://phab.enlightenment.org/D12025
---
src/bin/ipc.c | 8 ++++----
src/bin/md5.c | 2 +-
src/bin/miniview.c | 10 +++++-----
src/bin/options_themepv.c | 36 ++++++++++++++++++------------------
src/bin/termpty.c | 16 ++++++++--------
src/bin/termptygfx.c | 6 +++---
src/bin/theme.c | 2 +-
7 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/bin/ipc.c b/src/bin/ipc.c
index e45d934..110532d 100644
--- a/src/bin/ipc.c
+++ b/src/bin/ipc.c
@@ -20,7 +20,7 @@ _ipc_cb_client_data(void *_data EINA_UNUSED,
void *event)
{
Ecore_Ipc_Event_Client_Data *e = event;
-
+
if (ecore_ipc_client_server_get(e->client) != ipc)
return ECORE_CALLBACK_PASS_ON;
if ((e->major == TY_IPC_MAJOR) &&
@@ -28,7 +28,7 @@ _ipc_cb_client_data(void *_data EINA_UNUSED,
(e->data) && (e->size > 0))
{
Ipc_Instance *inst;
-
+
inst = eet_data_descriptor_decode(new_inst_edd, e->data, e->size);
if (inst)
{
@@ -62,8 +62,8 @@ _ipc_hash_get(void)
if (!xdg_seat) xdg_seat = "@unknown@";
xdg_vt = getenv("XDG_VTNR");
if (!xdg_vt) xdg_vt = "!unknown!";
- snprintf(buf, sizeof(buf), "%s.%s.%s.%s.%s.%s",
- disp, session, xdg_session,
+ snprintf(buf, sizeof(buf), "%s.%s.%s.%s.%s.%s",
+ disp, session, xdg_session,
xdg_id, xdg_seat, xdg_vt);
memcpy(hash, "terminology-", 12);
memset(hash+12, 'x', 32);
diff --git a/src/bin/md5.c b/src/bin/md5.c
index 12e65bc..a219d40 100644
--- a/src/bin/md5.c
+++ b/src/bin/md5.c
@@ -105,7 +105,7 @@ void MD5Update(MD5_CTX *ctx, unsigned char const *buf,
unsigned len)
}
/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
* 1 0* (64-bit count of bits processed, MSB-first)
*/
void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
diff --git a/src/bin/miniview.c b/src/bin/miniview.c
index 4ac49d1..7af6060 100644
--- a/src/bin/miniview.c
+++ b/src/bin/miniview.c
@@ -115,7 +115,7 @@ _draw_cell(const Termpty *ty, unsigned int *pixel, const
Termcell *cell, unsigne
}
if ((cell->att.bold) && (!fgext)) fg += 12;
if ((cell->att.faint) && (!fgext)) fg += 24;
-
+
if (bgext) *pixel = colors[bg + 256];
else if (bg && ((bg % 12) != COL_INVIS)) *pixel = colors[bg];
else if ((codepoint > 32) && (codepoint < 0x00110000))
@@ -425,14 +425,14 @@ _do_configure(Evas_Object *obj)
mv->img_h = oh;
mv->rows = oh / font_h;
mv->cols = ow / font_w;
-
+
if ((mv->rows == 0) || (mv->cols == 0)) return;
-
+
mv->screen.size = (double) mv->rows / (double) mv->img_h;
edje_object_part_drag_size_set(mv->base, "miniview_screen", 1.0,
mv->screen.size);
w = (mv->cols * font_w) / font_h;
-
+
evas_object_resize(mv->base, w, mv->img_h);
evas_object_move(mv->base, ox + ow - w, oy);
}
@@ -495,7 +495,7 @@ miniview_colors_get(Miniview *mv, unsigned int *colors)
{
Evas_Object *tg = termio_textgrid_get(mv->termio);
int r, g, b, a, c;
-
+
for (c = 0; c < 256; c++)
{
evas_object_textgrid_palette_get
diff --git a/src/bin/options_themepv.c b/src/bin/options_themepv.c
index 58618a1..7a2cccc 100644
--- a/src/bin/options_themepv.c
+++ b/src/bin/options_themepv.c
@@ -17,7 +17,7 @@ _row_set(Evas_Object *o, int y, const char *txt)
int x, tw, th;
const char *s;
int fg, bg;
-
+
evas_object_textgrid_size_get(o, &tw, &th);
if (y >= th) return;
tc = evas_object_textgrid_cellrow_get(o, y);
@@ -27,7 +27,7 @@ _row_set(Evas_Object *o, int y, const char *txt)
for (s = txt, x = 0; x < tw; x++)
{
unsigned int codepoint = ' ';
-
+
if ((s) && (*s == 0))
{
s = NULL;
@@ -83,7 +83,7 @@ _cb_resize(void *_data EINA_UNUSED,
Evas_Object *cursor = evas_object_data_get(grid, "cursor");
Evas_Object *selection = evas_object_data_get(grid, "selection");
Evas_Coord w, h, ww, hh;
-
+
evas_object_geometry_get(grid, NULL, NULL, &w, &h);
evas_object_textgrid_cell_size_get(textgrid, &ww, &hh);
elm_grid_size_set(grid, w, h);
@@ -124,9 +124,9 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
edje_object_part_text_set(oe, "terminology.tabmissed.label", "2");
elm_grid_pack(obase, o, 0, 0, w, h);
evas_object_show(o);
-
+
oo = o;
-
+
// create a bg and swallow into core frame
o = elm_layout_add(parent);
oe = elm_layout_edje_get(o);
@@ -139,7 +139,7 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
edje_object_signal_emit(oe, "focus,in", "terminology");
evas_object_show(o);
elm_layout_content_set(oo, "terminology.content", o);
-
+
oo = o;
// create a grid proportional layout to hold selection, textgrid and cursor
@@ -148,9 +148,9 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
elm_grid_size_set(o, 100, 100);
evas_object_show(o);
elm_layout_content_set(oo, "terminology.content", o);
-
+
oo = o;
-
+
// create a texgrid and swallow pack into grid
o = evas_object_textgrid_add(evas);
colors_term_init(o, obg, config);
@@ -158,7 +158,7 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
if (config->font.bitmap)
{
char buf[PATH_MAX];
-
+
snprintf(buf, sizeof(buf), "%s/fonts/%s",
elm_app_data_dir_get(), config->font.name);
evas_object_textgrid_font_set(o, buf, config->font.size);
@@ -166,7 +166,7 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
else
evas_object_textgrid_font_set(o, config->font.name, config->font.size);
evas_object_textgrid_size_set(o, 80, 24);
-
+
evas_object_textgrid_cell_size_get(o, &ww, &hh);
if (ww < 1) ww = 1;
if (hh < 1) hh = 1;
@@ -174,21 +174,21 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
// cmds:
// \x01 = set fg
// \x02 = set bg
- //
+ //
// cols:
- //
+ //
// \x01 = def
// \x02 = black
// \x03 = red
// ...
// \x09 = white
- //
+ //
// \x11 = def BRIGHT
// \x12 = black BRIGHT
// \x13 = red BRIGHT
// ...
// \x19 = white BRIGHT
-
+
#define F(_x) "\x01"_x
#define B(_x) "\x01"_x
#define X "\x01\x01\x02\x10"
@@ -198,11 +198,11 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
_row_set(o, 3, F("\x12")"black"X" "F("\x13")"red"X" "F("\x14")"green"X"
"F("\x15")"yellow");
_row_set(o, 4, F("\x16")"blue"X" "F("\x17")"magenta"X" "F("\x18")"cyan"X"
"F("\x19")"white");
for (y = 5; y < 24; y++) _row_set(o, y, "");
-
+
evas_object_show(o);
evas_object_data_set(oo, "textgrid", o);
elm_grid_pack(oo, o, 0, 0, 100, 100);
-
+
// create a cursor and put it in the grid
o = elm_layout_add(parent);
oe = elm_layout_edje_get(o);
@@ -212,7 +212,7 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
evas_object_show(o);
evas_object_data_set(oo, "cursor", o);
elm_grid_pack(oo, o, 0, 0, 10, 10);
-
+
// create a selection and put it in the grid
o = edje_object_add(evas);
oe = o;
@@ -223,7 +223,7 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
evas_object_show(o);
evas_object_data_set(oo, "selection", o);
elm_grid_pack(oo, o, 0, 0, 10, 10);
-
+
evas_object_size_hint_min_set(obase, w, h);
return obase;
}
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 841ae47..5d0ec45 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -1474,7 +1474,7 @@ termpty_block_new(Termpty *ty, int w, int h, const char
*path, const char *link)
{
Termblock *tb;
int id;
-
+
id = ty->block.curid;
if (!ty->block.blocks)
ty->block.blocks = eina_hash_int32_new((Eina_Free_Cb)termpty_block_free);
@@ -1507,12 +1507,12 @@ termpty_block_insert(Termpty *ty, int ch, Termblock
*blk)
// bit 9-17 = x (9b 0->511)
// bit 18-30 = id (13b 0->8191)
// bit 31 = 1
- //
+ //
// fg/bg = 8+8bit unused. (use for extra id bits? so 16 + 13 == 29bit?)
- //
+ //
// cp = (1 << 31) | ((id 0x1fff) << 18) | ((x & 0x1ff) << 9) | (y & 0x1ff);
Termexp *ex;
-
+
ex = calloc(1, sizeof(Termexp));
if (!ex) return;
ex->ch = ch;
@@ -1527,7 +1527,7 @@ int
termpty_block_id_get(const Termcell *cell, int *x, int *y)
{
int id;
-
+
if (!(cell->codepoint & 0x80000000)) return -1;
id = (cell->codepoint >> 18) & 0x1fff;
*x = (cell->codepoint >> 9) & 0x1ff;
@@ -1556,7 +1556,7 @@ Termblock *
termpty_block_chid_get(const Termpty *ty, const char *chid)
{
Termblock *tb;
-
+
tb = eina_hash_find(ty->block.chid_map, chid);
return tb;
}
@@ -1570,7 +1570,7 @@ termpty_handle_block_codepoint_overwrite_heavy(Termpty
*ty, int oldc, int newc)
if (oldc & 0x80000000) ido = (oldc >> 18) & 0x1fff;
if (newc & 0x80000000) idn = (newc >> 18) & 0x1fff;
if (((oldc & 0x80000000) && (newc & 0x80000000)) && (idn == ido)) return;
-
+
if (oldc & 0x80000000)
{
tb = termpty_block_get(ty, ido);
@@ -1583,7 +1583,7 @@ termpty_handle_block_codepoint_overwrite_heavy(Termpty
*ty, int oldc, int newc)
eina_hash_del(ty->block.blocks, &ido, tb);
}
}
-
+
if (newc & 0x80000000)
{
tb = termpty_block_get(ty, idn);
diff --git a/src/bin/termptygfx.c b/src/bin/termptygfx.c
index 055a47c..03d86a2 100644
--- a/src/bin/termptygfx.c
+++ b/src/bin/termptygfx.c
@@ -19,13 +19,13 @@ static const unsigned short vt100_to_unicode[62] =
// ? ? v->0 v->1 v->2 v->3 v->4
// ]= ^= _=SPC `=DIAMN a=HSMED b=HT c=FF
0, 0, 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c,
-// v->5 v->6 v->7 v->8 v->9 v->a v->b
+// v->5 v->6 v->7 v->8 v->9 v->a v->b
// d=CR e=LF f=DEGRE g=PLSMN h=NL i=VT j=SL-BR
0x240d, 0x240a, 0x00b0, 0x00b1, 0x2424, 0x240b, 0x2518,
-// v->c v->d v->e v->f v->10 v->11 v->12
+// v->c v->d v->e v->f v->10 v->11 v->12
// k=SL-TR l=SL-TL m=SL-BL n=SL-+ o=SL-T1 p=SL-T2 q=SL-HZ
0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, 0x23bb, 0x2500,
-// v->13 v->14 v->15 v->16 v->17 v->18 v->19
+// v->13 v->14 v->15 v->16 v->17 v->18 v->19
// r=SL-T4 s=SL-T5 t=SL-VR u=SL-VL v=SL-HU w=Sl-HD x=SL-VT
0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, 0x2502,
// v->1a v->1b b->1c v->1d v->1e/a3 v->1f
diff --git a/src/bin/theme.c b/src/bin/theme.c
index 582ac4f..4bbb8d4 100644
--- a/src/bin/theme.c
+++ b/src/bin/theme.c
@@ -140,7 +140,7 @@ theme_reload_cb(void *_data EINA_UNUSED,
{
void (*func) (void *d);
void *func_data;
-
+
theme_reload(obj);
func = evas_object_data_get(obj, "theme_reload_func");
func_data = evas_object_data_get(obj, "theme_reload_func_data");
--
