This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efm2.
View the commit online.
commit 82720b65f035d0b1248e499b13da401004935c69
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Wed Jun 5 18:58:43 2024 +0100
formatting!
---
src/backends/default/fs.c | 22 +++---
src/backends/default/fs.h | 8 +--
src/backends/default/meta.c | 19 ++---
src/backends/default/meta.h | 14 ++--
src/backends/default/mv.c | 6 +-
src/backends/default/open.c | 96 ++++++++++++-------------
src/backends/default/status.c | 36 +++++-----
src/efm/bitmap.c | 4 +-
src/efm/bitmap.h | 13 ++--
src/efm/efm.c | 56 +++++++--------
src/efm/efm.h | 18 ++---
src/efm/efm_back_end.c | 49 ++++++-------
src/efm/efm_back_end.h | 4 +-
src/efm/efm_dnd.c | 12 ++--
src/efm/efm_graph.c | 36 +++++-----
src/efm/efm_icon.c | 2 +-
src/efm/efm_private.h | 14 ++--
src/efm/efm_tasks.c | 11 +--
src/efm/efm_util.c | 163 +++++++++++++++++++++---------------------
src/efm/efm_util.h | 44 +++++++-----
src/efm/main.c | 6 +-
src/efm/sort.c | 4 +-
src/shared/cmd.c | 35 +++++----
src/shared/esc.c | 1 -
src/shared/sha.c | 18 ++---
src/shared/status_mon.c | 43 +++++------
src/shared/status_mon.h | 2 +-
27 files changed, 365 insertions(+), 371 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 2da4b64..e098d64 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -86,9 +86,9 @@ fs_cp_file(const char *src, const char *dst, const char *op, struct stat src_st)
// and fall abck to read + write into userspace buffer otherwise. use the
// struct stat mode passed in for created file. return true if fully
// successful or false otherwise
- int fd_in, fd_ou;
- void *old_copy_buf = NULL;
- Eina_Bool res = EINA_TRUE;
+ int fd_in, fd_ou;
+ void *old_copy_buf = NULL;
+ Eina_Bool res = EINA_TRUE;
fd_in = open(src, O_RDONLY);
fd_ou = open(dst, O_WRONLY | O_CREAT, src_st.st_mode);
@@ -253,9 +253,9 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
if ((!src) || (!dst) || (strlen(src) < 1)) return EINA_FALSE;
- if ( rm && cp) op = "Move";
- else if (!rm && cp) op = "Copy";
- else if ( rm && !cp) op = "Delete";
+ if (rm && cp) op = "Move";
+ else if (!rm && cp) op = "Copy";
+ else if (rm && !cp) op = "Delete";
old_umask = umask(0);
if (lstat(src, &st) != 0)
@@ -300,7 +300,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
}
EINA_ITERATOR_FOREACH(it, s)
{
- const char *fs = ecore_file_file_get(s);
+ const char *fs = ecore_file_file_get(s);
if (buf)
{
@@ -310,8 +310,8 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
eina_strbuf_append(buf, dst);
eina_strbuf_append(buf, "/");
eina_strbuf_append(buf, fs);
- if (!fs_cp_rm(s, eina_strbuf_string_get(buf),
- report_err, cp, rm))
+ if (!fs_cp_rm(s, eina_strbuf_string_get(buf), report_err,
+ cp, rm))
res = EINA_FALSE;
}
}
@@ -434,8 +434,8 @@ err:
Eina_Bool
fs_mv(const char *src, const char *dst, Eina_Bool report_err)
{ // mv /path/to/src/filename /path/to/dst/filename
- Eina_Bool res = EINA_TRUE;
- int ret;
+ Eina_Bool res = EINA_TRUE;
+ int ret;
const char *op = "Move";
ret = rename(src, dst);
diff --git a/src/backends/default/fs.h b/src/backends/default/fs.h
index c60b212..cb50630 100644
--- a/src/backends/default/fs.h
+++ b/src/backends/default/fs.h
@@ -2,9 +2,9 @@
#define FS_H
#include <Eina.h>
-Eina_Bool fs_scan(const char *src);
-Eina_Bool fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err,
- Eina_Bool cp, Eina_Bool rm);
-Eina_Bool fs_mv(const char *src, const char *dst, Eina_Bool report_err);
+Eina_Bool fs_scan(const char *src);
+Eina_Bool fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err,
+ Eina_Bool cp, Eina_Bool rm);
+Eina_Bool fs_mv(const char *src, const char *dst, Eina_Bool report_err);
#endif
\ No newline at end of file
diff --git a/src/backends/default/meta.c b/src/backends/default/meta.c
index 46fddb9..eab9331 100644
--- a/src/backends/default/meta.c
+++ b/src/backends/default/meta.c
@@ -58,8 +58,8 @@ _meta_personal_overlay_file_path_get(const char *path, const char *extn)
eina_sha1((unsigned char *)path, strlen(path), dst);
sha1_str(dst, sha1);
- snprintf(buf, sizeof(buf), "%s/efm/meta/%c%c/%s.%s",
- _config_dir, sha1[0], sha1[1], sha1 + 2, extn);
+ snprintf(buf, sizeof(buf), "%s/efm/meta/%c%c/%s.%s", _config_dir, sha1[0],
+ sha1[1], sha1 + 2, extn);
return strdup(buf);
}
@@ -76,8 +76,8 @@ _meta_file_path_get(const char *path, const char *extn)
char buf[PATH_MAX];
if (!dir) return NULL;
- snprintf(buf, sizeof(buf), "%s/.efm/%s.%s",
- dir, ecore_file_file_get(path), extn);
+ snprintf(buf, sizeof(buf), "%s/.efm/%s.%s", dir, ecore_file_file_get(path),
+ extn);
free(dir);
return strdup(buf);
}
@@ -180,9 +180,9 @@ static void
_meta_file_write_queue(Meta_File *mf)
{ // tag the meta file as changed and queue some writes
if (_meta_flush_timer) ecore_timer_reset(_meta_flush_timer);
- else _meta_flush_timer = ecore_timer_add(META_WRITE_TIMEOUT,
- _cb_meta_flush_timer,
- NULL);
+ else
+ _meta_flush_timer
+ = ecore_timer_add(META_WRITE_TIMEOUT, _cb_meta_flush_timer, NULL);
if (!mf->changed)
{
_meta_writes = eina_list_append(_meta_writes, mf);
@@ -382,7 +382,7 @@ meta_path_prepare(const char *path)
{ // "path" is the path returned by meta_path_user_find() or meta_path_find()
Eina_Bool ret = EINA_FALSE;
char *dir = ecore_file_dir_get(path);
-
+
if (!dir) return ret;
if (ecore_file_is_dir(dir)) ret = EINA_TRUE;
else
@@ -418,7 +418,8 @@ meta_path_can_write(const char *path)
if ((st.st_uid == uid) && (st.st_mode & S_IWUSR))
{
snprintf(buf, sizeof(buf), "%s/.efm", dir);
- res = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+ res = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH
+ | S_IXOTH);
if (res == 0)
{ // we created the dir - remove it (if not empty) - might not need
rmdir(buf);
diff --git a/src/backends/default/meta.h b/src/backends/default/meta.h
index 90b574e..87dd91a 100644
--- a/src/backends/default/meta.h
+++ b/src/backends/default/meta.h
@@ -2,15 +2,15 @@
#define META_H
#include <Eina.h>
-void meta_init(const char *config_dir);
-void meta_shutdown(void);
+void meta_init(const char *config_dir);
+void meta_shutdown(void);
-void meta_set(const char *path, const char *meta, const char *data);
+void meta_set(const char *path, const char *meta, const char *data);
Eina_Stringshare *meta_get(const char *path, const char *meta);
-char *meta_path_find(const char *path, const char *extn);
-char *meta_path_user_find(const char *path, const char *extn);
-Eina_Bool meta_path_prepare(const char *path);
-Eina_Bool meta_path_can_write(const char *path);
+char *meta_path_find(const char *path, const char *extn);
+char *meta_path_user_find(const char *path, const char *extn);
+Eina_Bool meta_path_prepare(const char *path);
+Eina_Bool meta_path_can_write(const char *path);
#endif
\ No newline at end of file
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index e8287ec..e3733e5 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -38,7 +38,7 @@ file_set_add(Eina_List *files, const char *src, const char *dst)
fs->src = ""
fs->dst = eina_stringshare_add(dst);
if ((!fs->src) || (!fs->dst)) mem_abort();
- files = eina_list_append(files, fs);
+ files = eina_list_append(files, fs);
return files;
}
@@ -46,7 +46,7 @@ int
main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
{ // mv [src] [dstdir]
const char *fname, *home_dir;
- Eina_Strbuf *buf = NULL;
+ Eina_Strbuf *buf = NULL;
Eina_List *files = NULL, *l;
File_Set *fs;
size_t sz;
@@ -62,7 +62,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
{ // read stdin of key=val\n ... or end\n
if (!fgets(sbuf, sizeof(sbuf), stdin)) break;
sz = strlen(sbuf);
- if (sz < 1) break; // too small
+ if (sz < 1) break; // too small
if (sbuf[sz - 1] == '\n') sbuf[sz - 1] = '\0'; // remove \n if there
if (!strncmp(sbuf, "src="" 4))
{
diff --git a/src/backends/default/open.c b/src/backends/default/open.c
index 72685cd..1907df9 100644
--- a/src/backends/default/open.c
+++ b/src/backends/default/open.c
@@ -30,7 +30,7 @@ static const char *home_dir = NULL;
static Eina_Bool auto_exit = EINA_FALSE;
static int child_exes = 0;
-static Ecore_File_Monitor *mon = NULL;
+static Ecore_File_Monitor *mon = NULL;
static Eina_Bool can_write = EINA_FALSE;
typedef struct
@@ -57,7 +57,7 @@ typedef struct
Ecore_Exe *exe;
} Op;
-//static Eina_List *op_queue = NULL;
+// static Eina_List *op_queue = NULL;
static Eina_Bool
_cb_auto_exit_timer(void *data EINA_UNUSED)
@@ -74,8 +74,7 @@ _handle_exe_del(void)
child_exes--;
if (child_exes <= 0)
{
- if (auto_exit)
- ecore_timer_add(1.0, _cb_auto_exit_timer, NULL);
+ if (auto_exit) ecore_timer_add(1.0, _cb_auto_exit_timer, NULL);
}
}
}
@@ -88,7 +87,8 @@ _cb_auto_del_timer(void *data EINA_UNUSED)
}
static Eina_Bool
-_cb_exe_del(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event EINA_UNUSED)
+_cb_exe_del(void *data EINA_UNUSED, int ev_type EINA_UNUSED,
+ void *event EINA_UNUSED)
{
_handle_exe_del();
return ECORE_CALLBACK_DONE;
@@ -142,7 +142,7 @@ _sub_timer_free(Sub_Timer *st)
static Eina_Bool
_cb_sub_timer(void *data)
{
- Sub_Timer *st = data;
+ Sub_Timer *st = data;
Eina_Strbuf *buf = cmd_strbuf_new("timer");
cmd_strbuf_append(buf, "name", st->name);
@@ -156,7 +156,7 @@ _cb_sub_timer(void *data)
static void
_sub_del(Sub *sub)
{
- Sub_Timer *st;
+ Sub_Timer *st;
Eina_Strbuf *buf;
sub_queue = eina_list_remove(sub_queue, sub);
@@ -165,7 +165,7 @@ _sub_del(Sub *sub)
ecore_event_handler_del(sub->handler_exe_data);
EINA_LIST_FREE(sub->cmd_pending, buf) eina_strbuf_free(buf);
EINA_LIST_FREE(sub->timers, st) _sub_timer_free(st);
- free(sub);
+ free(sub);
}
static void
@@ -207,10 +207,7 @@ _sub_command(Sub *sub, const char *str)
if (backend)
{
Sub *sub2 = _sub_open(sub->path, backend);
- EINA_LIST_FREE(sub->cmd_pending, buf)
- {
- _sub_cmd_send(sub2, buf);
- }
+ EINA_LIST_FREE(sub->cmd_pending, buf) { _sub_cmd_send(sub2, buf); }
ecore_exe_kill(sub->exe);
_sub_del(sub);
}
@@ -232,11 +229,11 @@ _sub_command(Sub *sub, const char *str)
if (st)
{
- st->sub = sub;
- st->name = eina_stringshare_add(name);
- st->repeat = repeat ? EINA_TRUE : EINA_FALSE;
- st->delay = (double)atoi(delay) / 1000.0;
- st->timer = ecore_timer_add(st->delay, _cb_sub_timer, st);
+ st->sub = sub;
+ st->name = eina_stringshare_add(name);
+ st->repeat = repeat ? EINA_TRUE : EINA_FALSE;
+ st->delay = (double)atoi(delay) / 1000.0;
+ st->timer = ecore_timer_add(st->delay, _cb_sub_timer, st);
sub->timers = eina_list_append(sub->timers, st);
}
}
@@ -323,15 +320,15 @@ _sub_open(const char *path, const char *backend)
}
}
putenv("EFM_OPEN_AUTOEXIT=1");
- sub->handler_exe_del = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
- _cb_sub_exe_del, sub);
- sub->handler_exe_data = ecore_event_handler_add(ECORE_EXE_EVENT_DATA,
- _cb_sub_exe_data, sub);
- sub->exe = ecore_exe_pipe_run(eina_strbuf_string_get(buf),
- ECORE_EXE_PIPE_READ
- | ECORE_EXE_PIPE_READ_LINE_BUFFERED
- | ECORE_EXE_PIPE_WRITE,
- sub);
+ sub->handler_exe_del
+ = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _cb_sub_exe_del, sub);
+ sub->handler_exe_data
+ = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _cb_sub_exe_data, sub);
+ sub->exe
+ = ecore_exe_pipe_run(eina_strbuf_string_get(buf),
+ ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED
+ | ECORE_EXE_PIPE_WRITE,
+ sub);
child_exes++;
fprintf(stderr, "SUB %s\n", eina_strbuf_string_get(buf));
@@ -692,14 +689,14 @@ _file_add_mod_meta_append(const char *path, const char *meta, const char *key,
static Eina_Bool
_file_add_mod_info(Eina_Strbuf *strbuf, const char *path, Eina_Bool delay)
{ // add file metadata info on file add or modfiy
- char dst[PATH_MAX], buf[256], buf2[PATH_MAX], *icf;
- struct stat st;
- int mode;
- struct passwd *pw;
- struct group *gr;
- const char *mime, *ext, *icon;
- Efreet_Desktop *desktop;
- Eina_Bool have_label = EINA_FALSE;
+ char dst[PATH_MAX], buf[256], buf2[PATH_MAX], *icf;
+ struct stat st;
+ int mode;
+ struct passwd *pw;
+ struct group *gr;
+ const char *mime, *ext, *icon;
+ Efreet_Desktop *desktop;
+ Eina_Bool have_label = EINA_FALSE;
if (lstat(path, &st) != 0) return EINA_FALSE;
if ((st.st_mode & S_IFMT) == S_IFLNK)
@@ -1151,8 +1148,7 @@ _dir_del(const char *path)
mondir = ecore_file_monitor_path_get(mon);
if (!mondir) return;
realpath = ecore_file_realpath(mondir);
- if ((!strcmp(mondir, path)) ||
- ((realpath) && (!strcmp(realpath, path))))
+ if ((!strcmp(mondir, path)) || ((realpath) && (!strcmp(realpath, path))))
{
strbuf = cmd_strbuf_new("dir-del");
cmd_strbuf_print_consume(strbuf);
@@ -1182,12 +1178,9 @@ _backend_check(const char *backend)
if (!backend) return EINA_FALSE;
for (s = backend; *s; s++)
{
- if (!(((*s >= 'a') && (*s <= 'z')) ||
- ((*s >= 'A') && (*s <= 'Z')) ||
- ((*s >= '0') && (*s <= '9')) ||
- (*s >= '-') ||
- (*s >= '_') ||
- (*s >= '.')))
+ if (!(((*s >= 'a') && (*s <= 'z')) || ((*s >= 'A') && (*s <= 'Z'))
+ || ((*s >= '0') && (*s <= '9')) || (*s >= '-') || (*s >= '_')
+ || (*s >= '.')))
return EINA_FALSE;
}
return EINA_TRUE;
@@ -1222,7 +1215,7 @@ _monitor(const char *path)
strbuf = cmd_strbuf_new("backend-set");
cmd_strbuf_append(strbuf, "backend", backend);
cmd_strbuf_print_consume(strbuf);
- strbuf = NULL;
+ strbuf = NULL;
abort_list = EINA_TRUE;
}
}
@@ -1243,7 +1236,7 @@ _monitor(const char *path)
cmd_strbuf_print_consume(strbuf);
mon = ecore_file_monitor_add(path, _cb_mon, NULL);
- it = eina_file_direct_ls(path);
+ it = eina_file_direct_ls(path);
if (!it)
{
// XXX: error output
@@ -1260,7 +1253,7 @@ err:
static Eina_Bool
_path_in_mon_dir(const char *path)
{
- Eina_Bool res = EINA_FALSE;
+ Eina_Bool res = EINA_FALSE;
const char *mondir;
char *filedir = ecore_file_dir_get(path);
@@ -1269,7 +1262,7 @@ _path_in_mon_dir(const char *path)
mondir = ecore_file_monitor_path_get(mon);
if (!mondir) goto done;
if (!strcmp(mondir, filedir)) res = EINA_TRUE;
- done:
+done:
free(filedir);
return res;
}
@@ -1415,7 +1408,7 @@ do_handle_cmd(Cmd *c)
if (!strcmp(key, "path"))
{
char **plist, **p;
- int files = 0, dirs = 0;
+ int files = 0, dirs = 0;
plist = eina_str_split(data, "\n", -1);
for (p = plist; *p; p++)
@@ -1468,9 +1461,9 @@ do_handle_cmd(Cmd *c)
}
else if (!strcmp(c->command, "dnd-drop"))
{ // "over" key means dnd was on that dir
- const char *over = cmd_key_find(c, "over");
+ const char *over = cmd_key_find(c, "over");
const char *action = "" "action");
- Eina_List *files = NULL;
+ Eina_List *files = NULL;
const char *s;
KEY_WALK_BEGIN
@@ -1482,10 +1475,9 @@ do_handle_cmd(Cmd *c)
if (!_path_in_mon_dir(data))
files = eina_list_append(files, eina_stringshare_add(data));
}
- else
- files = eina_list_append(files, eina_stringshare_add(data));
+ else files = eina_list_append(files, eina_stringshare_add(data));
}
- }
+ }
KEY_WALK_END
if (files)
{
diff --git a/src/backends/default/status.c b/src/backends/default/status.c
index 08bf315..8f47633 100644
--- a/src/backends/default/status.c
+++ b/src/backends/default/status.c
@@ -68,23 +68,23 @@ typedef struct
char *str;
} Msg_Err;
-static unsigned long long op_count = 0;
-static unsigned long long op_pos = 0;
-static unsigned long long op_count_prev = 0;
-static unsigned long long op_pos_prev = 0;
-static Eina_Bool op_end = EINA_FALSE;
-static Eina_Bool op_end_prev = EINA_FALSE;
-static char *op_str = NULL;
-static int status_fd = -1;
-static char *status_file = NULL;
-static Eina_Thread status_thread;
-static Eina_Thread_Queue *status_thq = NULL;
+static unsigned long long op_count = 0;
+static unsigned long long op_pos = 0;
+static unsigned long long op_count_prev = 0;
+static unsigned long long op_pos_prev = 0;
+static Eina_Bool op_end = EINA_FALSE;
+static Eina_Bool op_end_prev = EINA_FALSE;
+static char *op_str = NULL;
+static int status_fd = -1;
+static char *status_file = NULL;
+static Eina_Thread status_thread;
+static Eina_Thread_Queue *status_thq = NULL;
static void
_fd_printf(int fd, const char *fmt, ...)
{
va_list args;
- char *str;
+ char *str;
size_t len;
va_start(args, fmt);
@@ -117,7 +117,7 @@ _status_flush(void)
static void *
_cb_status_thread(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
{
- Msg *msg;
+ Msg *msg;
void *ref;
for (;;)
@@ -170,8 +170,10 @@ _cb_status_thread(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
Msg_Err *msg2 = (Msg_Err *)msg;
// write this out immediately
_fd_printf(status_fd, "CMD error err=%s\n", msg2->str);
- if (msg2->src) _fd_printf(status_fd, "CMD error src="" msg2->src);
- if (msg2->dst) _fd_printf(status_fd, "CMD error dst=%s\n", msg2->dst);
+ if (msg2->src)
+ _fd_printf(status_fd, "CMD error src="" msg2->src);
+ if (msg2->dst)
+ _fd_printf(status_fd, "CMD error dst=%s\n", msg2->dst);
_fd_printf(status_fd, "CMD error-done\n");
free(msg2->src);
free(msg2->dst);
@@ -211,7 +213,7 @@ void
status_begin(void)
{
Eina_Bool ok;
- char buf[PATH_MAX];
+ char buf[PATH_MAX];
op_count = op_pos = 0;
eina_vpath_resolve_snprintf(buf, sizeof(buf), "(:usr.run:)/efm/ops");
@@ -258,7 +260,7 @@ status_dst(const char *dst)
msg = eina_thread_queue_send(status_thq, sizeof(Msg_Dst), &ref);
msg->type = MSG_DST;
- msg->dst = dst ? escape(dst) : NULL;
+ msg->dst = dst ? escape(dst) : NULL;
eina_thread_queue_send_done(status_thq, ref);
}
diff --git a/src/efm/bitmap.c b/src/efm/bitmap.c
index 2ece32d..28a9925 100644
--- a/src/efm/bitmap.c
+++ b/src/efm/bitmap.c
@@ -187,8 +187,8 @@ _bitmap_is_clear(unsigned int *bitmap, int szw, int szh EINA_UNUSED, int x,
}
void
-_bitmap_find_tl_to_br(unsigned int *bitmap, int maxw, int szw, int szh,
- int inw, int inh, int *x, int *y, int *w, int *h)
+_bitmap_find_tl_to_br(unsigned int *bitmap, int maxw, int szw, int szh, int inw,
+ int inh, int *x, int *y, int *w, int *h)
{
int xx, yy, ww, hh;
diff --git a/src/efm/bitmap.h b/src/efm/bitmap.h
index 96452b5..c2aba39 100644
--- a/src/efm/bitmap.h
+++ b/src/efm/bitmap.h
@@ -1,10 +1,13 @@
#ifndef BITMAP_H
#define BITMAP_H 1
-void _bitmap_free(unsigned int *bitmap);
-void _bitmap_clear(unsigned int *bitmap, int szw, int szh);
-unsigned int *_bitmap_resize(unsigned int *bitmap, int szw, int szh, int nszw, int nszh);
-void _bitmap_fill(unsigned int *bitmap, int szw, int szh EINA_UNUSED, int x, int y, int w, int h);
-void _bitmap_find_tl_to_br(unsigned int *bitmap, int maxw, int szw, int szh, int inw, int inh, int *x, int *y, int *w, int *h);
+void _bitmap_free(unsigned int *bitmap);
+void _bitmap_clear(unsigned int *bitmap, int szw, int szh);
+unsigned int *_bitmap_resize(unsigned int *bitmap, int szw, int szh, int nszw,
+ int nszh);
+void _bitmap_fill(unsigned int *bitmap, int szw, int szh EINA_UNUSED, int x,
+ int y, int w, int h);
+void _bitmap_find_tl_to_br(unsigned int *bitmap, int maxw, int szw, int szh,
+ int inw, int inh, int *x, int *y, int *w, int *h);
#endif
diff --git a/src/efm/efm.c b/src/efm/efm.c
index ca9c1a2..a39f59d 100644
--- a/src/efm/efm.c
+++ b/src/efm/efm.c
@@ -17,12 +17,12 @@
int _log_dom = -1;
-Eina_List *_efm_list = NULL;
-Eina_List *_pending_exe_dels = NULL;
+Eina_List *_efm_list = NULL;
+Eina_List *_pending_exe_dels = NULL;
-static Evas_Smart *_smart = NULL;
-static Evas_Smart_Class _sc = EVAS_SMART_CLASS_INIT_NULL;
-static Evas_Smart_Class _sc_parent = EVAS_SMART_CLASS_INIT_NULL;
+static Evas_Smart *_smart = NULL;
+static Evas_Smart_Class _sc = EVAS_SMART_CLASS_INIT_NULL;
+static Evas_Smart_Class _sc_parent = EVAS_SMART_CLASS_INIT_NULL;
#define ENTRY \
Smart_Data *sd = evas_object_smart_data_get(obj); \
@@ -192,7 +192,7 @@ _cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
if (sd->last_focused)
{
- Icon *icon = sd->last_focused;
+ Icon *icon = sd->last_focused;
Eina_Strbuf *strbuf = eina_strbuf_new();
if (!icon->selected) _icon_select(icon);
@@ -328,16 +328,16 @@ _cb_refocus(void *data)
sd->refocus_job = NULL;
if (sd->rename_icon) return;
-// printf("XXX: REFOCUS\n");
+ // printf("XXX: REFOCUS\n");
if (sd->focused)
{
-// printf("XXX: focus widget\n");
+ // printf("XXX: focus widget\n");
evas_object_focus_set(sd->o_clip, EINA_TRUE);
if (sd->key_control) _icon_focus_show(sd);
}
else
{
-// printf("XXX: unfocused widget\n");
+ // printf("XXX: unfocused widget\n");
_icon_focus_hide(sd);
// XXX: exit rename mode if on...
}
@@ -349,7 +349,7 @@ _cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
Smart_Data *sd = data;
-// printf("XXX: FOCUS OUT CLIP\n");
+ // printf("XXX: FOCUS OUT CLIP\n");
if (sd->refocus_job) ecore_job_del(sd->refocus_job);
sd->refocus_job = ecore_job_add(_cb_refocus, sd);
}
@@ -537,8 +537,8 @@ _reposition_detail_bars(Smart_Data *sd)
for (i = 0; i < 6; i++)
{
if (!sd->o_list_detail_swallow[i]) continue;
- evas_object_geometry_get(sd->o_list_detail_swallow[i], &x, NULL,
- &w, NULL);
+ evas_object_geometry_get(sd->o_list_detail_swallow[i], &x, NULL, &w,
+ NULL);
x -= sd->geom.x;
if (!sd->o_list_detail[i]) continue;
elm_grid_pack(sd->o_overlay_grid, sd->o_list_detail[i], x, 0, w, 100);
@@ -550,15 +550,15 @@ void
_redo_detail_sizes(Smart_Data *sd)
{
Evas_Object *o;
- char buf[128];
- int i;
+ char buf[128];
+ int i;
for (i = 0; i < 6; i++)
{
o = sd->o_list_detail_swallow[i];
snprintf(buf, sizeof(buf), "e.swallow.detail%i", i + 1);
- evas_object_size_hint_min_set
- (o, sd->config.detail_min_w[i] * _scale_get(sd), 0);
+ evas_object_size_hint_min_set(
+ o, sd->config.detail_min_w[i] * _scale_get(sd), 0);
edje_object_part_swallow(sd->o_list_detailed_dummy, buf, o);
}
_reposition_detail_bars(sd);
@@ -873,10 +873,10 @@ _smart_add(Evas_Object *obj)
static void
_smart_del(Evas_Object *obj)
{ // delete/free efm view
- Block *block;
- Icon *icon;
- Evas *e;
- int i;
+ Block *block;
+ Icon *icon;
+ Evas *e;
+ int i;
Smart_Data_Timer *st;
ENTRY;
@@ -1433,11 +1433,11 @@ _reset(Smart_Data *sd)
eina_strbuf_append(buf, "/open");
}
putenv(envbuf);
- sd->exe_open = ecore_exe_pipe_run(eina_strbuf_string_get(buf),
- ECORE_EXE_PIPE_READ |
- ECORE_EXE_PIPE_READ_LINE_BUFFERED |
- ECORE_EXE_PIPE_WRITE,
- NULL);
+ sd->exe_open
+ = ecore_exe_pipe_run(eina_strbuf_string_get(buf),
+ ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED
+ | ECORE_EXE_PIPE_WRITE,
+ NULL);
eina_strbuf_free(buf);
if (sd->config.path)
@@ -1456,7 +1456,7 @@ _cb_scroller_focus(void *data, Evas_Object *obj EINA_UNUSED,
{
Smart_Data *sd = data;
-// printf("XXX: FOCUS\n");
+ // printf("XXX: FOCUS\n");
sd->focused = EINA_TRUE;
evas_object_focus_set(sd->o_clip, EINA_TRUE);
}
@@ -1467,7 +1467,7 @@ _cb_scroller_unfocus(void *data, Evas_Object *obj EINA_UNUSED,
{
Smart_Data *sd = data;
-// printf("XXX: UNFOCUS\n");
+ // printf("XXX: UNFOCUS\n");
sd->focused = EINA_FALSE;
}
@@ -1803,7 +1803,7 @@ efm_path_parent(Evas_Object *obj)
if ((p) && (p != tmps))
{
*p = 0;
- p = strrchr(tmps, '/');
+ p = strrchr(tmps, '/');
if (p) p[1] = 0;
}
eina_stringshare_replace(&sd->config.path, tmps);
diff --git a/src/efm/efm.h b/src/efm/efm.h
index b821b8e..53b238a 100644
--- a/src/efm/efm.h
+++ b/src/efm/efm.h
@@ -15,21 +15,21 @@ typedef enum
typedef enum
{
- EFM_SORT_MODE_FLAGS = (0xffff << 16), // upper 16 bits for flags
+ EFM_SORT_MODE_FLAGS = (0xffff << 16), // upper 16 bits for flags
// flags - apper 16 bits
EFM_SORT_MODE_DIRS_FIRST = (1 << 16), // show dirs first then files
EFM_SORT_MODE_NOCASE = (1 << 17), // don't account for case in sort
EFM_SORT_MODE_LABEL_NOT_PATH = (1 << 18), // use label not filename
// mask for field
- EFM_SORT_MODE_MASK = 0xffff, // lower 16 bits is the sort field
+ EFM_SORT_MODE_MASK = 0xffff, // lower 16 bits is the sort field
// fields
- EFM_SORT_MODE_NAME = (0 << 0),
- EFM_SORT_MODE_SIZE = (1 << 0),
- EFM_SORT_MODE_DATE = (2 << 0),
- EFM_SORT_MODE_MIME = (3 << 0),
- EFM_SORT_MODE_USER = (4 << 0),
- EFM_SORT_MODE_GROUP = (5 << 0),
- EFM_SORT_MODE_PERMISSIONS = (6 << 0),
+ EFM_SORT_MODE_NAME = (0 << 0),
+ EFM_SORT_MODE_SIZE = (1 << 0),
+ EFM_SORT_MODE_DATE = (2 << 0),
+ EFM_SORT_MODE_MIME = (3 << 0),
+ EFM_SORT_MODE_USER = (4 << 0),
+ EFM_SORT_MODE_GROUP = (5 << 0),
+ EFM_SORT_MODE_PERMISSIONS = (6 << 0),
} Efm_Sort_Mode;
Evas_Object *efm_add(Evas_Object *parent);
diff --git a/src/efm/efm_back_end.c b/src/efm/efm_back_end.c
index c53cc89..6956b32 100644
--- a/src/efm/efm_back_end.c
+++ b/src/efm/efm_back_end.c
@@ -138,8 +138,8 @@ _process(Smart_Data_Thread *std, Ecore_Thread *th, Eina_List *batch)
batch_tmp = eina_list_append(batch_tmp, c);
c_tmp = c;
}
- else if ((!strcmp(c->command, c_tmp->command)) &&
- (!strcmp(c->command, "file-add")))
+ else if ((!strcmp(c->command, c_tmp->command))
+ && (!strcmp(c->command, "file-add")))
{
// works for file-add, file-del, file-mod
batch_tmp = eina_list_sorted_insert(batch_tmp, sort_cmd, c);
@@ -345,7 +345,7 @@ _icon_add_mod_props_get(Icon *icon, Cmd *c, const char *label)
eina_stringshare_replace(&(icon->info.label_selected), s);
s = cmd_key_find(c, "mime");
if (s) eina_stringshare_replace(&(icon->info.mime), s);
-// if (s) printf("XXXXX mime=%s\n", icon->info.mime);
+ // if (s) printf("XXXXX mime=%s\n", icon->info.mime);
s = cmd_key_find(c, "desktop-icon");
if (!s) s = cmd_key_find(c, "link-desktop-icon");
if (s) eina_stringshare_replace(&(icon->info.pre_lookup_icon), s);
@@ -391,7 +391,7 @@ _icon_add_mod_props_get(Icon *icon, Cmd *c, const char *label)
static Eina_Bool
_cb_smart_timer(void *data)
{
- Smart_Data_Timer *st = data;
+ Smart_Data_Timer *st = data;
Eina_Strbuf *buf = cmd_strbuf_new("timer");
cmd_strbuf_append(buf, "name", st->name);
@@ -448,8 +448,8 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
}
else if (!strcmp(c->command, "timer-add"))
{
- const char *name = cmd_key_find(c, "name");
- const char *delay = cmd_key_find(c, "delay");
+ const char *name = cmd_key_find(c, "name");
+ const char *delay = cmd_key_find(c, "delay");
const char *repeat = cmd_key_find(c, "repeat");
if (name && delay)
@@ -470,7 +470,7 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
}
else if (!strcmp(c->command, "timer-del"))
{
- const char *name = cmd_key_find(c, "name");
+ const char *name = cmd_key_find(c, "name");
Smart_Data_Timer *st;
Eina_List *l;
@@ -508,12 +508,10 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
{
Efm_View_Mode view_mode = sd->config.view_mode;
- if (!strcmp(mode, "icons"))
- view_mode = EFM_VIEW_MODE_ICONS;
+ if (!strcmp(mode, "icons")) view_mode = EFM_VIEW_MODE_ICONS;
else if (!strcmp(mode, "icons_custom"))
view_mode = EFM_VIEW_MODE_ICONS_CUSTOM;
- else if (!strcmp(mode, "list"))
- view_mode = EFM_VIEW_MODE_LIST;
+ else if (!strcmp(mode, "list")) view_mode = EFM_VIEW_MODE_LIST;
else if (!strcmp(mode, "list_detailed"))
view_mode = EFM_VIEW_MODE_LIST_DETAILED;
if (view_mode != sd->config.view_mode)
@@ -527,10 +525,9 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
evas_object_show(sd->o_list_detail[i]);
else evas_object_hide(sd->o_list_detail[i]);
}
- if (sd->header_change_job)
- ecore_job_del(sd->header_change_job);
+ if (sd->header_change_job) ecore_job_del(sd->header_change_job);
sd->header_change_job = ecore_job_add(_cb_header_change, sd);
- }
+ }
}
CMD_DONE;
}
@@ -545,13 +542,13 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
if ((colnum >= 0) && (colnum <= 6))
{
const char *label = cmd_key_find(c, "label");
- const char *size = cmd_key_find(c, "size");
+ const char *size = cmd_key_find(c, "size");
// XXX: support icon in future?
if (label)
{
- eina_stringshare_replace
- (&(sd->config.detail_heading[colnum]), label);
+ eina_stringshare_replace(
+ &(sd->config.detail_heading[colnum]), label);
if (sd->o_detail_header_item[colnum])
elm_object_text_set(sd->o_detail_header_item[colnum],
sd->config.detail_heading[colnum]);
@@ -576,7 +573,7 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
// below commands all send a path for a specific file
path = file = cmd_key_find(c, "path");
-// printf("XXXXX [%s] [%s]\n", c->command, file);
+ // printf("XXXXX [%s] [%s]\n", c->command, file);
if (file)
{
s = strrchr(file, '/');
@@ -726,7 +723,7 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
cmd_free(icon->cmd);
icon->cmd = c;
- found = EINA_TRUE;
+ found = EINA_TRUE;
break;
}
}
@@ -758,8 +755,8 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
_icon_free(icon);
found = EINA_TRUE;
break;
- }
- }
+ }
+ }
if (!il) il = sd->icons;
}
cmd_free(c);
@@ -767,7 +764,7 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
}
else if (!strcmp(c->command, "file-detail"))
{
- int n;
+ int n;
const char *theme_edj_file;
char **plist;
char bufdetail[16];
@@ -777,10 +774,10 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
for (found = EINA_FALSE, tries = 0; (!found) && (tries < 2); tries++)
{
for (n = 0; il; il = il->next, n++)
- {
+ {
icon = il->data;
if (!strcmp(file, icon->info.file))
- {
+ {
int i;
s = cmd_key_find(icon->cmd, "detail-format");
@@ -816,8 +813,8 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
}
found = EINA_TRUE;
break;
- }
- }
+ }
+ }
cmd_free(c);
c = NULL;
}
diff --git a/src/efm/efm_back_end.h b/src/efm/efm_back_end.h
index 9d697c5..3999ea6 100644
--- a/src/efm/efm_back_end.h
+++ b/src/efm/efm_back_end.h
@@ -3,11 +3,11 @@
#include <Elementary.h>
-void _size_message(Evas_Object *o, double v);
+void _size_message(Evas_Object *o, double v);
Eina_Bool _cb_exe_del(void *data, int ev_type EINA_UNUSED, void *event);
Eina_Bool _cb_exe_data(void *data, int ev_type EINA_UNUSED, void *event);
Eina_Bool _cb_exe_pending_timer(void *data);
-void _cb_thread_main(void *data, Ecore_Thread *th);
+void _cb_thread_main(void *data, Ecore_Thread *th);
void _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg);
void _cb_thread_done(void *data, Ecore_Thread *th EINA_UNUSED);
diff --git a/src/efm/efm_dnd.c b/src/efm/efm_dnd.c
index bafcd2d..55e6cb9 100644
--- a/src/efm/efm_dnd.c
+++ b/src/efm/efm_dnd.c
@@ -132,12 +132,12 @@ _cb_drop_pos(void *data, Evas_Object *o EINA_UNUSED, Evas_Coord x, Evas_Coord y,
static Eina_Bool
_cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data *ev)
{
- Smart_Data *sd = data;
- char **plist, **p, *esc, *tmp;
- Eina_List *dropicons, *l;
- Icon *icon;
- int delta_x = 0, delta_y = 0;
- Eina_Strbuf *buf = cmd_strbuf_new("dnd-drop");
+ Smart_Data *sd = data;
+ char **plist, **p, *esc, *tmp;
+ Eina_List *dropicons, *l;
+ Icon *icon;
+ int delta_x = 0, delta_y = 0;
+ Eina_Strbuf *buf = cmd_strbuf_new("dnd-drop");
switch (ev->action)
{
diff --git a/src/efm/efm_graph.c b/src/efm/efm_graph.c
index c3ba5e7..9afc2d2 100644
--- a/src/efm/efm_graph.c
+++ b/src/efm/efm_graph.c
@@ -12,12 +12,12 @@ struct _Smart_Data
int *vals;
Eina_Stringshare *colorspec;
- Evas_Object *o_smart; // the smart object container itself
+ Evas_Object *o_smart; // the smart object container itself
Evas_Object *o_base;
Evas_Object *o_grid;
Evas_Object **o_vals;
- Eina_Bool reset_vals : 1;
+ Eina_Bool reset_vals : 1;
};
static Evas_Smart *_smart = NULL;
@@ -41,7 +41,7 @@ _clear(Smart_Data *sd)
}
if (sd->vals) free(sd->vals);
sd->vals = NULL;
- sd->num = 0;
+ sd->num = 0;
}
// gui code
@@ -63,8 +63,8 @@ _smart_add(Evas_Object *obj)
sd->o_smart = obj;
sd->o_base = o = edje_object_add(e);
- grp = "e/fileman/default/graph/base";
- theme_edj_file = elm_theme_group_path_find(NULL, grp);
+ grp = "e/fileman/default/graph/base";
+ theme_edj_file = elm_theme_group_path_find(NULL, grp);
edje_object_file_set(o, theme_edj_file, grp);
evas_object_smart_member_add(o, sd->o_smart); // this is a member
evas_object_show(o);
@@ -130,16 +130,16 @@ static void
_smart_calculate(Evas_Object *obj)
{ // recalc position/size
ENTRY;
- int i;
- Evas *e;
- Evas_Object *o;
- const char *theme_edj_file, *grp;
- double v, range;
+ int i;
+ Evas *e;
+ Evas_Object *o;
+ const char *theme_edj_file, *grp;
+ double v, range;
Edje_Message_String msg;
e = evas_object_evas_get(obj);
- evas_object_geometry_set(sd->o_base,
- sd->geom.x, sd->geom.y, sd->geom.w, sd->geom.h);
+ evas_object_geometry_set(sd->o_base, sd->geom.x, sd->geom.y, sd->geom.w,
+ sd->geom.h);
grp = "e/fileman/default/graph/bar";
theme_edj_file = elm_theme_group_path_find(NULL, grp);
@@ -169,13 +169,11 @@ _smart_calculate(Evas_Object *obj)
if (sd->colorspec)
{
msg.str = (char *)sd->colorspec;
- edje_object_message_send(sd->o_vals[i],
- EDJE_MESSAGE_STRING, 1,
+ edje_object_message_send(sd->o_vals[i], EDJE_MESSAGE_STRING, 1,
&msg);
edje_object_message_signal_process(sd->o_vals[i]);
}
- edje_object_part_drag_value_set(sd->o_vals[i],
- "e.dragable.value",
+ edje_object_part_drag_value_set(sd->o_vals[i], "e.dragable.value",
0.0, v);
}
}
@@ -209,9 +207,9 @@ efm_graph_values_set(Evas_Object *obj, int num, int *vals, int min, int max)
_clear(sd);
sd->vals = malloc(num * sizeof(int));
if (!sd->vals) return;
- sd->num = num;
- sd->min = min;
- sd->max = max;
+ sd->num = num;
+ sd->min = min;
+ sd->max = max;
sd->reset_vals = EINA_TRUE;
memcpy(sd->vals, vals, num * sizeof(int));
evas_object_smart_changed(sd->o_smart);
diff --git a/src/efm/efm_icon.c b/src/efm/efm_icon.c
index a620983..8e18cb2 100644
--- a/src/efm/efm_icon.c
+++ b/src/efm/efm_icon.c
@@ -551,7 +551,7 @@ _smart_calculate(Evas_Object *obj)
geom.y = geom.y + ((geom.h - nh) / 2);
geom.w = nw;
geom.h = nw;
- }
+ }
if (sd->o_image)
evas_object_geometry_set(sd->o_image, geom.x, geom.y, geom.w, geom.h);
if (sd->o_image2)
diff --git a/src/efm/efm_private.h b/src/efm/efm_private.h
index 4dab44f..818bd31 100644
--- a/src/efm/efm_private.h
+++ b/src/efm/efm_private.h
@@ -4,7 +4,7 @@
#include <Elementary.h>
#include "efm_structs.h"
-#define INVALID -999999
+#define INVALID -999999
#define SCROLL_SEL_TIMER 0.2
#define SCROLL_DND_TIMER 0.2
#define BLOCK_MAX 64
@@ -12,9 +12,9 @@
#define DND_OVER_OPEN_TIMER 1.0
#define ICON_LONGPRESS_TIMER 1.0
-#define ENTRY \
- Smart_Data *sd = evas_object_smart_data_get(obj); \
- if (!sd) return
+#define ENTRY \
+ Smart_Data *sd = evas_object_smart_data_get(obj); \
+ if (!sd) return
void _listing_done(Smart_Data *sd);
void _cb_header_change(void *data);
@@ -22,9 +22,7 @@ void _reset(Smart_Data *sd);
void _redo_detail_sizes(Smart_Data *sd);
char *_sanitize_dir(const char *path);
-extern Eina_List *_efm_list;
-extern Eina_List *_pending_exe_dels;
-
+extern Eina_List *_efm_list;
+extern Eina_List *_pending_exe_dels;
#endif
-
diff --git a/src/efm/efm_tasks.c b/src/efm/efm_tasks.c
index 60c3bb9..8f00c6f 100644
--- a/src/efm/efm_tasks.c
+++ b/src/efm/efm_tasks.c
@@ -3,7 +3,7 @@
#include "status_mon.h"
static Evas_Object *tasks_box = NULL;
-static Eina_List *tasks = NULL;
+static Eina_List *tasks = NULL;
typedef struct
{
@@ -100,7 +100,7 @@ task_new(Task *t)
static void
_cb_status(void *data EINA_UNUSED, Status_Op *op, Cmd *cmd)
{
- Task *t;
+ Task *t;
const char *s, *s2;
t = task_find(op);
@@ -147,7 +147,7 @@ _cb_status(void *data EINA_UNUSED, Status_Op *op, Cmd *cmd)
{
unsigned long long pos, count;
- pos = atoll(s);
+ pos = atoll(s);
count = atoll(s2);
if ((pos > 0) && (count > 0))
@@ -168,7 +168,8 @@ _cb_status(void *data EINA_UNUSED, Status_Op *op, Cmd *cmd)
}
static void
-_cb_exit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_cb_exit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
elm_exit();
}
@@ -228,7 +229,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
status_mon_init();
status_mon_callback_add(_cb_status, NULL);
status_mon_begin();
-
+
elm_run();
status_mon_shutdown();
diff --git a/src/efm/efm_util.c b/src/efm/efm_util.c
index b5b82dd..71b60ef 100644
--- a/src/efm/efm_util.c
+++ b/src/efm/efm_util.c
@@ -788,7 +788,7 @@ _cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED,
}
else if (ev->flags == EVAS_BUTTON_DOUBLE_CLICK)
{ // double clicked
- Eina_Strbuf *buf = cmd_strbuf_new("file-run");
+ Eina_Strbuf *buf = cmd_strbuf_new("file-run");
Eina_Strbuf *strbuf = eina_strbuf_new();
printf("XXX: DBL\n");
@@ -796,7 +796,8 @@ _cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED,
{
_icon_path_cmd_strbuf_append(buf, "over", icon->sd, icon);
_selected_icons_uri_strbuf_append(icon->sd, strbuf);
- _uri_list_cmd_strbuf_append(buf, "path", eina_strbuf_string_get(strbuf));
+ _uri_list_cmd_strbuf_append(buf, "path",
+ eina_strbuf_string_get(strbuf));
cmd_strbuf_exe_consume(buf, icon->sd->exe_open);
eina_strbuf_free(strbuf);
}
@@ -819,9 +820,9 @@ _icon_select_update(Icon *icon)
_icon_file_set(icon, icon->info.icon_selected);
for (i = 0; i < 6; i++)
{
- if ((icon->o_list_detail_swallow2[i]) &&
- (evas_object_data_get(icon->o_list_detail_swallow2[i],
- "is_edje")))
+ if ((icon->o_list_detail_swallow2[i])
+ && (evas_object_data_get(icon->o_list_detail_swallow2[i],
+ "is_edje")))
edje_object_signal_emit(icon->o_list_detail_swallow2[i],
"e,state,selected", "e");
}
@@ -836,9 +837,9 @@ _icon_select_update(Icon *icon)
_icon_file_set(icon, icon->info.pre_lookup_icon);
for (i = 0; i < 6; i++)
{
- if ((icon->o_list_detail_swallow2[i]) &&
- (evas_object_data_get(icon->o_list_detail_swallow2[i],
- "is_edje")))
+ if ((icon->o_list_detail_swallow2[i])
+ && (evas_object_data_get(icon->o_list_detail_swallow2[i],
+ "is_edje")))
edje_object_signal_emit(icon->o_list_detail_swallow2[i],
"e,state,unselected", "e");
}
@@ -846,7 +847,6 @@ _icon_select_update(Icon *icon)
_icon_text_update(icon);
}
-
static Eina_Bool
_cb_dnd_over_open_timer(void *data)
@@ -1005,7 +1005,7 @@ _cb_icon_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
if (!dragged)
{
- Eina_Strbuf *buf = cmd_strbuf_new("file-clicked");
+ Eina_Strbuf *buf = cmd_strbuf_new("file-clicked");
printf("XXX: mouse clicked\n");
_icon_path_cmd_strbuf_append(buf, "path", icon->sd, icon);
@@ -1172,19 +1172,30 @@ static int
_icon_detail_size_display(unsigned long long size, char unit[8])
{
#define K 1024ULL
- unsigned long long sizetbl[] =
- {
- K, 0 , 0,
- K*K, (K) - 1, 10,
- K*K*K, (K*K) - 1, 20,
- K*K*K*K, (K*K*K) - 1, 30,
- K*K*K*K*K, (K*K*K*K) - 1, 40,
- K*K*K*K*K*K, (K*K*K*K*K) - 1, 50,
- K*K*K*K*K*K*K, (K*K*K*K*K*K) - 1, 60
- };
+ unsigned long long sizetbl[] = { K,
+ 0,
+ 0,
+ K * K,
+ (K)-1,
+ 10,
+ K * K * K,
+ (K * K) - 1,
+ 20,
+ K * K * K * K,
+ (K * K * K) - 1,
+ 30,
+ K * K * K * K * K,
+ (K * K * K * K) - 1,
+ 40,
+ K * K * K * K * K * K,
+ (K * K * K * K * K) - 1,
+ 50,
+ K * K * K * K * K * K * K,
+ (K * K * K * K * K * K) - 1,
+ 60 };
#undef K
char *sizes = "bKMGTPE"; /* "ZY" (Zetta, Yotta) not handled - beyond 64b */
- int i, i3;
+ int i, i3;
unit[0] = '?';
for (i = 0; i < 7; i++)
@@ -1221,8 +1232,8 @@ _icon_detail_rectangle_add(Icon *icon, Smart_Data *sd, Evas *e, int col,
icon->o_list_detail_swallow[col] = o = evas_object_rectangle_add(e);
evas_object_pass_events_set(o, EINA_TRUE);
evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_size_hint_min_set
- (o, sd->config.detail_min_w[col] * _scale_get(sd), 0);
+ evas_object_size_hint_min_set(
+ o, sd->config.detail_min_w[col] * _scale_get(sd), 0);
snprintf(buf, sizeof(buf), "e.swallow.detail%i", col + 1);
edje_object_part_swallow(icon->o_base, buf, o);
return o;
@@ -1232,21 +1243,20 @@ static Evas_Object *
_icon_detail_grid_add(Icon *icon, Smart_Data *sd, int col)
{
Evas_Object *o;
- char buf[128];
+ char buf[128];
icon->o_list_detail_swallow[col] = o = elm_grid_add(sd->o_scroller);
elm_grid_size_set(o, 1, 1);
- evas_object_size_hint_min_set
- (o, sd->config.detail_min_w[col] * _scale_get(sd), 0);
+ evas_object_size_hint_min_set(
+ o, sd->config.detail_min_w[col] * _scale_get(sd), 0);
snprintf(buf, sizeof(buf), "e.swallow.detail%i", col + 1);
edje_object_part_swallow(icon->o_base, buf, o);
return o;
}
static Evas_Object *
-_icon_detail_grid_sub_edje_add(Icon *icon, Evas *e,
- const char *theme_edj_file, int col,
- const char *group)
+_icon_detail_grid_sub_edje_add(Icon *icon, Evas *e, const char *theme_edj_file,
+ int col, const char *group)
{
Evas_Object *o;
@@ -1297,8 +1307,8 @@ static void
_cb_icon_detail_button_clicked(void *data, Evas_Object *o,
void *info EINA_UNUSED)
{
- Icon *icon = data;
- Eina_Strbuf *buf = cmd_strbuf_new("file-detail-clicked");
+ Icon *icon = data;
+ Eina_Strbuf *buf = cmd_strbuf_new("file-detail-clicked");
char detail[32];
int v;
@@ -1310,15 +1320,14 @@ _cb_icon_detail_button_clicked(void *data, Evas_Object *o,
}
static void
-_cb_icon_detail_segment_changed(void *data, Evas_Object *o,
- void *info)
+_cb_icon_detail_segment_changed(void *data, Evas_Object *o, void *info)
{
- Icon *icon = data;
- Eina_Strbuf *buf = cmd_strbuf_new("file-detail-select");
+ Icon *icon = data;
+ Eina_Strbuf *buf = cmd_strbuf_new("file-detail-select");
int v;
char detail[32];
- Elm_Object_Item *it = info;
- int n = (int)(unsigned long)elm_object_item_data_get(it);
+ Elm_Object_Item *it = info;
+ int n = (int)(unsigned long)elm_object_item_data_get(it);
_icon_path_cmd_strbuf_append(buf, "path", icon->sd, icon);
v = (int)(unsigned long)evas_object_data_get(o, "detail");
@@ -1330,15 +1339,14 @@ _cb_icon_detail_segment_changed(void *data, Evas_Object *o,
}
static void
-_cb_icon_detail_popdown_changed(void *data, Evas_Object *o,
- void *info)
+_cb_icon_detail_popdown_changed(void *data, Evas_Object *o, void *info)
{
- Icon *icon = data;
- Eina_Strbuf *buf = cmd_strbuf_new("file-detail-select");
+ Icon *icon = data;
+ Eina_Strbuf *buf = cmd_strbuf_new("file-detail-select");
int v;
char detail[32];
- Elm_Object_Item *it = info;
- int n = (int)(unsigned long)elm_object_item_data_get(it);
+ Elm_Object_Item *it = info;
+ int n = (int)(unsigned long)elm_object_item_data_get(it);
_icon_path_cmd_strbuf_append(buf, "path", icon->sd, icon);
v = (int)(unsigned long)evas_object_data_get(o, "detail");
@@ -1353,8 +1361,8 @@ static void
_cb_icon_detail_slider_changed(void *data, Evas_Object *o,
void *info EINA_UNUSED)
{
- Icon *icon = data;
- Eina_Strbuf *buf = cmd_strbuf_new("file-detail-change");
+ Icon *icon = data;
+ Eina_Strbuf *buf = cmd_strbuf_new("file-detail-change");
char detail[32];
int v;
double val, val2;
@@ -1383,7 +1391,7 @@ _cb_icon_detail_slider_changed(void *data, Evas_Object *o,
static void
_cb_icon_detail_slider_mouse_down(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
- void *event_info)
+ void *event_info)
{
Evas_Event_Mouse_Down *ev = event_info;
Icon *icon = data;
@@ -1394,8 +1402,7 @@ _cb_icon_detail_slider_mouse_down(void *data, Evas *e EINA_UNUSED,
static void
_icon_detail_icon_set(Evas_Object *o, const char *icon, const char *dir)
{
- if (!strncmp(icon, "std:", 4))
- elm_icon_standard_set(o, icon + 4);
+ if (!strncmp(icon, "std:", 4)) elm_icon_standard_set(o, icon + 4);
else
{
if (icon[0] == '/') efm_icon_file_set(o, icon);
@@ -1433,8 +1440,8 @@ _icon_detail_icon_add(Evas_Object *base, const char *icon)
static Eina_Bool
_icon_detail_bool_parse(const char *str)
{
- if ((!strcasecmp(str, "1")) || (!strcasecmp(str, "on")) ||
- (!strcasecmp(str, "true")) || (!strcasecmp(str, "yes")))
+ if ((!strcasecmp(str, "1")) || (!strcasecmp(str, "on"))
+ || (!strcasecmp(str, "true")) || (!strcasecmp(str, "yes")))
return EINA_TRUE;
return EINA_FALSE;
}
@@ -1458,7 +1465,7 @@ _icon_detail_size_update(Evas_Object *o, const char *detail)
plist = eina_str_split(detail, "/", 2);
if (!plist) return;
if (!(plist[0] && plist[1])) goto done;
- size = atoll(plist[0]);
+ size = atoll(plist[0]);
size_max = atoll(plist[1]);
if (size_max <= 0) size_max = 1;
sz = (double)size / (double)size_max;
@@ -1488,8 +1495,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
{
if (!icon->o_list_detail_swallow[col])
_icon_detail_rectangle_add(icon, sd, e, col, detail);
- else
- _icon_detail_text_set(icon, col, detail);
+ else _icon_detail_text_set(icon, col, detail);
}
else if (!strcmp(format, "size"))
{ // format: "13/28" = value/max_value
@@ -1561,8 +1567,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
}
else if (sscanf(detail, "noval,%i/%i", &val, &max) == 2)
{
- elm_progressbar_unit_format_function_set(o, _cb_progress_noval,
- NULL);
+ elm_progressbar_unit_format_function_set(o, _cb_progress_noval, NULL);
if (max < 1) max = 0;
}
if (val < 0) val = 0;
@@ -1611,8 +1616,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
_icon_detail_elm_object_prepare(o, col);
elm_table_pack(o2, o, 0, 0, 1, 1);
evas_object_smart_callback_add(o, "changed",
- _cb_icon_detail_check_changed,
- icon);
+ _cb_icon_detail_check_changed, icon);
evas_object_show(o2);
evas_object_show(o);
icon->o_list_detail_swallow3[col] = o;
@@ -1631,8 +1635,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
_icon_detail_elm_object_prepare(o, col);
elm_grid_pack(icon->o_list_detail_swallow[col], o, 0, 0, 1, 1);
evas_object_smart_callback_add(o, "clicked",
- _cb_icon_detail_button_clicked,
- icon);
+ _cb_icon_detail_button_clicked, icon);
evas_object_show(o);
icon->o_list_detail_swallow3[col] = o;
}
@@ -1668,8 +1671,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
_icon_detail_elm_object_prepare(o, col);
elm_grid_pack(icon->o_list_detail_swallow[col], o, 0, 0, 1, 1);
evas_object_smart_callback_add(o, "changed",
- _cb_icon_detail_segment_changed,
- icon);
+ _cb_icon_detail_segment_changed, icon);
icon->o_list_detail_swallow3[col] = o;
}
o = icon->o_list_detail_swallow3[col];
@@ -1709,12 +1711,12 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
}
else if (!strcmp(format, "popdown"))
{ // format: "Opt1,*Opt2" or "*Opt!icon,Opt2" = icon above, *= SELECTED
- char **plist, **p, *sep, *label, *icpath;
+ char **plist, **p, *sep, *label, *icpath;
Elm_Object_Item *it;
- Eina_Bool sel;
- Elm_Icon_Type ictype;
- char buf[PATH_MAX];
- int n;
+ Eina_Bool sel;
+ Elm_Icon_Type ictype;
+ char buf[PATH_MAX];
+ int n;
if (!icon->o_list_detail_swallow[col])
{ // only add if not there
@@ -1725,8 +1727,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
_icon_detail_elm_object_prepare(o, col);
elm_grid_pack(icon->o_list_detail_swallow[col], o, 0, 0, 1, 1);
evas_object_smart_callback_add(o, "selected",
- _cb_icon_detail_popdown_changed,
- icon);
+ _cb_icon_detail_popdown_changed, icon);
icon->o_list_detail_swallow3[col] = o;
}
o = icon->o_list_detail_swallow3[col];
@@ -1735,11 +1736,11 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
plist = eina_str_split(detail, ",", -1);
for (p = plist, n = 0; *p != NULL; p++, n++)
{
- sel = EINA_FALSE;
- o2 = NULL;
+ sel = EINA_FALSE;
+ o2 = NULL;
icpath = NULL;
ictype = ELM_ICON_NONE;
- sep = strchr(*p, '!');
+ sep = strchr(*p, '!');
if (sep)
{
*sep++ = 0;
@@ -1768,10 +1769,9 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
label++;
sel = EINA_TRUE;
}
- if (**p) it = elm_hoversel_item_add(o, label, icpath, ictype,
- NULL, NULL);
- else it = elm_hoversel_item_add(o, label, icpath, ictype,
- NULL, NULL);
+ if (**p)
+ it = elm_hoversel_item_add(o, label, icpath, ictype, NULL, NULL);
+ else it = elm_hoversel_item_add(o, label, icpath, ictype, NULL, NULL);
elm_object_item_data_set(it, (void *)(unsigned long)n);
if (sel) elm_object_text_set(o, label);
}
@@ -1781,8 +1781,8 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
}
else if (!strcmp(format, "slider"))
{ // format: "min/max/val" or "min/max/val/val2"
- char **plist;
- unsigned long long min, max, val, val2;
+ char **plist;
+ unsigned long long min, max, val, val2;
if (!icon->o_list_detail_swallow[col])
{ // only add if not there
@@ -1793,8 +1793,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
icon);
_icon_detail_elm_object_prepare(o, col);
evas_object_smart_callback_add(o, "changed",
- _cb_icon_detail_slider_changed,
- icon);
+ _cb_icon_detail_slider_changed, icon);
elm_grid_pack(icon->o_list_detail_swallow[col], o, 0, 0, 1, 1);
evas_object_show(o);
icon->o_list_detail_swallow3[col] = o;
@@ -1840,7 +1839,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
evas_object_show(o);
icon->o_list_detail_swallow3[col] = o;
}
- o = icon->o_list_detail_swallow3[col];
+ o = icon->o_list_detail_swallow3[col];
plist2 = eina_str_split(detail, "|", -1);
for (p2 = plist2; *p2; p2++)
{
@@ -1848,7 +1847,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
if (plist[0] && plist[1])
{
start = 0;
- cc = NULL;
+ cc = NULL;
if ((plist[0][0] == '#') || (plist[0][0] == 'c'))
{
start++;
@@ -1861,7 +1860,7 @@ _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
if (num > 0)
{
vals = malloc(num * sizeof(int));
- for (num = -1, p = plist + start; *p; p++)
+ for (num = -1, p = plist + start; *p; p++)
{
if (num >= 0) vals[num] = atoi(*p);
num++;
diff --git a/src/efm/efm_util.h b/src/efm/efm_util.h
index fc509b9..9b2e17f 100644
--- a/src/efm/efm_util.h
+++ b/src/efm/efm_util.h
@@ -15,22 +15,25 @@ typedef enum
EFM_FOCUS_DIR_PGUP
} Efm_Focus_Dir;
-char *_escape_parse(const char *str);
-Eina_Bool _selected_icons_uri_strbuf_append(Smart_Data *sd, Eina_Strbuf *strbuf);
-void _detail_realized_items_resize(Smart_Data *sd);
-double _scale_get(Smart_Data *sd);
+char *_escape_parse(const char *str);
+Eina_Bool _selected_icons_uri_strbuf_append(Smart_Data *sd,
+ Eina_Strbuf *strbuf);
+void _detail_realized_items_resize(Smart_Data *sd);
+double _scale_get(Smart_Data *sd);
Eina_List *_icons_path_find(const char *path);
-Eina_Bool _icon_focus_dir(Smart_Data *sd, Efm_Focus_Dir dir);
-void _icon_rename_end(Icon *icon);
-void _icon_path_cmd_strbuf_append(Eina_Strbuf *strbuf, const char *key, Smart_Data *sd, Icon *icon);
-void _uri_list_cmd_strbuf_append(Eina_Strbuf *strbuf, const char *key, const char *urilist);
-void _icon_over_off(Icon *icon);
-void _icon_over_on(Icon *icon);
-void _icon_select(Icon *icon);
-void _icon_unselect(Icon *icon);
-Eina_Bool _unselect_all(Smart_Data *sd);
-void _select_range(Icon *icon_from, Icon *icon_to);
-Icon *_icon_dup(Icon *icon);
+Eina_Bool _icon_focus_dir(Smart_Data *sd, Efm_Focus_Dir dir);
+void _icon_rename_end(Icon *icon);
+void _icon_path_cmd_strbuf_append(Eina_Strbuf *strbuf, const char *key,
+ Smart_Data *sd, Icon *icon);
+void _uri_list_cmd_strbuf_append(Eina_Strbuf *strbuf, const char *key,
+ const char *urilist);
+void _icon_over_off(Icon *icon);
+void _icon_over_on(Icon *icon);
+void _icon_select(Icon *icon);
+void _icon_unselect(Icon *icon);
+Eina_Bool _unselect_all(Smart_Data *sd);
+void _select_range(Icon *icon_from, Icon *icon_to);
+Icon *_icon_dup(Icon *icon);
void _icon_focus(Smart_Data *sd);
@@ -38,12 +41,15 @@ void _icon_focus_show(Smart_Data *sd);
void _icon_focus_hide(Smart_Data *sd);
void _icon_object_clear(Icon *icon);
-void _efm_focus_position(Smart_Data *sd);
+void _efm_focus_position(Smart_Data *sd);
Eina_Rectangle _efm_sel_rect_get(Smart_Data *sd);
-void _efm_sel_position(Smart_Data *sd);
+void _efm_sel_position(Smart_Data *sd);
-void _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e, const char *theme_edj_file, int col, const char *detail, const char *format);
-void _icon_object_add(Icon *icon, Smart_Data *sd, Evas *e, const char *theme_edj_file, Eina_Bool clip_set, int num);
+void _icon_detail_add(Icon *icon, Smart_Data *sd, Evas *e,
+ const char *theme_edj_file, int col, const char *detail,
+ const char *format);
+void _icon_object_add(Icon *icon, Smart_Data *sd, Evas *e,
+ const char *theme_edj_file, Eina_Bool clip_set, int num);
void _icon_free(Icon *icon);
void _block_free(Block *block);
void _cb_reblock(void *data);
diff --git a/src/efm/main.c b/src/efm/main.c
index c68d154..d4b1965 100644
--- a/src/efm/main.c
+++ b/src/efm/main.c
@@ -54,14 +54,14 @@ _cb_header_change(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
elm_box_pack_end(o_detail_header_box, o);
- evas_object_show(o);
- }
+ evas_object_show(o);
+ }
}
else
{
if (o_detail_header)
{
- evas_object_del(o_detail_header);
+ evas_object_del(o_detail_header);
o_detail_header = NULL;
}
}
diff --git a/src/efm/sort.c b/src/efm/sort.c
index 8b1b25f..27fd7a7 100644
--- a/src/efm/sort.c
+++ b/src/efm/sort.c
@@ -82,7 +82,7 @@ _sort_str_field(const Cmd *c1, const Cmd *c2,
{ // they are the same string! use pure filename path as it's unique
path1 = _str_path_name(c1);
path2 = _str_path_name(c2);
- res = cmpfn(path1, path2);
+ res = cmpfn(path1, path2);
if (!res) return strcmp(path1, path2);
return res;
}
@@ -139,7 +139,7 @@ _sort_label(const Cmd *c1, const Cmd *c2,
{ // they are the same string! use pure filename path as it's unique
path1 = _str_path_name(c1);
path2 = _str_path_name(c2);
- res = cmpfn(path1, path2);
+ res = cmpfn(path1, path2);
if (!res) return strcmp(path1, path2);
return res;
}
diff --git a/src/shared/cmd.c b/src/shared/cmd.c
index 1167594..62243a9 100644
--- a/src/shared/cmd.c
+++ b/src/shared/cmd.c
@@ -134,8 +134,8 @@ err:
Cmd *
cmd_modify(const Cmd *c, const char *key, const char *val)
{
- Cmd *c2;
- int i, dict_num = 0, sub = 0;
+ Cmd *c2;
+ int i, dict_num = 0, sub = 0;
Eina_Binbuf *binbuf;
if (!key) return cmd_dup(c);
@@ -158,29 +158,25 @@ cmd_modify(const Cmd *c, const char *key, const char *val)
{
if (val)
{
- c2->dict[i] = (void *)(unsigned long)
- eina_binbuf_length_get(binbuf);
- eina_binbuf_append_length(binbuf,
- (unsigned char *)key,
+ c2->dict[i]
+ = (void *)(unsigned long)eina_binbuf_length_get(binbuf);
+ eina_binbuf_append_length(binbuf, (unsigned char *)key,
strlen(key) + 1);
- c2->dict[i + 1] = (void *)(unsigned long)
- eina_binbuf_length_get(binbuf);
- eina_binbuf_append_length(binbuf,
- (unsigned char *)val,
+ c2->dict[i + 1]
+ = (void *)(unsigned long)eina_binbuf_length_get(binbuf);
+ eina_binbuf_append_length(binbuf, (unsigned char *)val,
strlen(val) + 1);
}
}
else
{
- c2->dict[i] = (void *)(unsigned long)
- eina_binbuf_length_get(binbuf);
- eina_binbuf_append_length(binbuf,
- (unsigned char *)c->dict[i],
+ c2->dict[i]
+ = (void *)(unsigned long)eina_binbuf_length_get(binbuf);
+ eina_binbuf_append_length(binbuf, (unsigned char *)c->dict[i],
strlen(c->dict[i]) + 1);
- c2->dict[i + 1] = (void *)(unsigned long)
- eina_binbuf_length_get(binbuf);
- eina_binbuf_append_length(binbuf,
- (unsigned char *)c->dict[i + 1],
+ c2->dict[i + 1]
+ = (void *)(unsigned long)eina_binbuf_length_get(binbuf);
+ eina_binbuf_append_length(binbuf, (unsigned char *)c->dict[i + 1],
strlen(c->dict[i + 1]) + 1);
}
}
@@ -188,7 +184,8 @@ cmd_modify(const Cmd *c, const char *key, const char *val)
if (!c2->buf) goto err;
c2->buf_size = eina_binbuf_length_get(binbuf);
eina_binbuf_free(binbuf);
- for (i = 0; c2->dict[i]; i++) c2->dict[i] = c2->buf + (unsigned long)c2->dict[i];
+ for (i = 0; c2->dict[i]; i++)
+ c2->dict[i] = c2->buf + (unsigned long)c2->dict[i];
}
c2->command = c2->buf;
return c2;
diff --git a/src/shared/esc.c b/src/shared/esc.c
index 27a8493..eba589a 100644
--- a/src/shared/esc.c
+++ b/src/shared/esc.c
@@ -3,7 +3,6 @@
#include "esc.h"
-
static inline int
_xtov(char x)
{
diff --git a/src/shared/sha.c b/src/shared/sha.c
index 04e04ae..d3ad054 100644
--- a/src/shared/sha.c
+++ b/src/shared/sha.c
@@ -11,16 +11,16 @@ sha1_stat(const struct stat *st, unsigned char dst[20])
char buf[128];
#ifdef STAT_NSEC
-# ifdef st_mtime
-# define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtim.tv_nsec)
-# define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctim.tv_nsec)
-# else
-# define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtimensec)
-# define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctimensec)
-# endif
+#ifdef st_mtime
+#define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtim.tv_nsec)
+#define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctim.tv_nsec)
#else
-# define STAT_NSEC_MTIME(st) (unsigned long long)(0)
-# define STAT_NSEC_CTIME(st) (unsigned long long)(0)
+#define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtimensec)
+#define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctimensec)
+#endif
+#else
+#define STAT_NSEC_MTIME(st) (unsigned long long)(0)
+#define STAT_NSEC_CTIME(st) (unsigned long long)(0)
#endif
snprintf(buf, sizeof(buf), "%llu %llu %llu %llu %llu %llu %llu %llu",
diff --git a/src/shared/status_mon.c b/src/shared/status_mon.c
index 33b342e..cebee95 100644
--- a/src/shared/status_mon.c
+++ b/src/shared/status_mon.c
@@ -15,21 +15,21 @@ struct _Status_Op
typedef struct
{
- Status_Mon_Callback cb;
- void *data;
- Eina_Bool delete_me : 1;
+ Status_Mon_Callback cb;
+ void *data;
+ Eina_Bool delete_me : 1;
} Status_Callback;
-static Ecore_File_Monitor *mon = NULL;
-static Eina_List *ops = NULL;
-static Eina_List *cbs = NULL;
+static Ecore_File_Monitor *mon = NULL;
+static Eina_List *ops = NULL;
+static Eina_List *cbs = NULL;
static int cbs_walk = 0;
-static int cbs_del = 0;
+static int cbs_del = 0;
static void
status_callback_clean(void)
{
- Eina_List *l, *ll;
+ Eina_List *l, *ll;
Status_Callback *sc;
if ((cbs_walk > 0) || (cbs_del <= 0)) return;
@@ -85,9 +85,9 @@ status_op_read(Status_Op *so)
// XXX: move this to a thread, although these status files SHOULD
// be in a ramdisk or cache and thus immediately readable without
// any blocking, so i can do this later as an optimmization if needed
- char buf[PATH_MAX + 256];
- Cmd *cmd;
- long pos;
+ char buf[PATH_MAX + 256];
+ Cmd *cmd;
+ long pos;
Eina_List *l;
Status_Callback *sc;
@@ -99,7 +99,7 @@ status_op_read(Status_Op *so)
if (sz < 1) continue;
buf[sz - 1] = 0; // nuke \n
- cmd = cmd_parse(buf);
+ cmd = cmd_parse(buf);
if (!cmd) continue;
cbs_walk++;
EINA_LIST_FOREACH(cbs, l, sc) sc->cb(sc->data, so, cmd);
@@ -113,7 +113,7 @@ static void
_file_add(const char *path)
{
Status_Op *so = status_op_find(path);
-
+
if (so) return; // it already exists - don't do anything
so = status_op_add(path);
if (so) status_op_read(so);
@@ -147,9 +147,9 @@ static void
_cb_mon(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED,
Ecore_File_Event event, const char *path)
{ // a efm ops dir event happened - deal with it
- if (event == ECORE_FILE_EVENT_CREATED_FILE) _file_add(path);
+ if (event == ECORE_FILE_EVENT_CREATED_FILE) _file_add(path);
else if (event == ECORE_FILE_EVENT_DELETED_FILE) _file_del(path);
- else if (event == ECORE_FILE_EVENT_MODIFIED) _file_mod(path);
+ else if (event == ECORE_FILE_EVENT_MODIFIED) _file_mod(path);
}
void
@@ -163,15 +163,15 @@ status_mon_callback_add(Status_Mon_Callback cb, void *data)
Status_Callback *sc = calloc(1, sizeof(Status_Callback));
if (!sc) return;
- sc->cb = cb;
+ sc->cb = cb;
sc->data = ""
- cbs = eina_list_append(cbs, sc);
+ cbs = eina_list_append(cbs, sc);
}
void
status_mon_callback_del(Status_Mon_Callback cb, void *data)
{
- Eina_List *l;
+ Eina_List *l;
Status_Callback *sc;
EINA_LIST_FOREACH(cbs, l, sc)
@@ -198,7 +198,7 @@ status_mon_begin(void)
{
Eina_Iterator *it;
Eina_File_Direct_Info *info;
- char buf[PATH_MAX];
+ char buf[PATH_MAX];
// where is the efm ops dir
eina_vpath_resolve_snprintf(buf, sizeof(buf), "(:usr.run:)/efm/ops");
@@ -206,7 +206,7 @@ status_mon_begin(void)
// monitor for file changes in the ops dir
mon = ecore_file_monitor_add(buf, _cb_mon, NULL);
// list what is there right now to begin with
- it = eina_file_direct_ls(buf);
+ it = eina_file_direct_ls(buf);
if (it)
{
EINA_ITERATOR_FOREACH(it, info) _file_add(info->path);
@@ -214,7 +214,8 @@ status_mon_begin(void)
}
}
-void status_mon_shutdown(void)
+void
+status_mon_shutdown(void)
{
if (mon) ecore_file_monitor_del(mon);
mon = NULL;
diff --git a/src/shared/status_mon.h b/src/shared/status_mon.h
index 9ec833b..b0e5328 100644
--- a/src/shared/status_mon.h
+++ b/src/shared/status_mon.h
@@ -6,7 +6,7 @@
typedef struct _Status_Op Status_Op;
-typedef void (*Status_Mon_Callback) (void *data, Status_Op *op, Cmd *cmd);
+typedef void (*Status_Mon_Callback)(void *data, Status_Op *op, Cmd *cmd);
void status_mon_init(void);
void status_mon_callback_add(Status_Mon_Callback cb, void *data);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
