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 73ddc5bf6d18267cf38a55a308504a456eaa5ae9
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Wed Feb 21 18:25:03 2024 +0000
code polishing as i move on...
---
src/efm/efm.c | 68 +++++++++++++++++++++++++----------------------------------
1 file changed, 29 insertions(+), 39 deletions(-)
diff --git a/src/efm/efm.c b/src/efm/efm.c
index 9c7868a..ca9c1a2 100644
--- a/src/efm/efm.c
+++ b/src/efm/efm.c
@@ -209,7 +209,6 @@ _cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
eina_strbuf_free(strbuf);
}
- // XXX: handle "open" of all selected files/icons (double-click)
handled = EINA_TRUE;
}
}
@@ -243,7 +242,7 @@ _cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
handled = _unselect_all(sd);
}
- // hmm - should we handle this?
+ // XXX: hmm - should we handle this?
// else if (!strcmp(ev->key, "Backspace"))
// {
// }
@@ -263,7 +262,6 @@ _cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
eina_strbuf_free(strbuf);
}
- // XXX: delete file
handled = EINA_TRUE;
}
else if (!strcmp(ev->key, "Home"))
@@ -286,41 +284,33 @@ _cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
handled = EINA_TRUE;
}
}
- else if (!strcmp(ev->key, "c"))
+ else if ((!strcmp(ev->key, "c"))
+ && (evas_key_modifier_is_set(ev->modifiers, "Control")))
{
- if (evas_key_modifier_is_set(ev->modifiers, "Control"))
- {
- sd->cnp_have = EINA_TRUE;
- sd->cnp_cut = EINA_FALSE;
- _cnp_copy_files(sd);
- handled = EINA_TRUE;
- }
+ sd->cnp_have = EINA_TRUE;
+ sd->cnp_cut = EINA_FALSE;
+ _cnp_copy_files(sd);
+ handled = EINA_TRUE;
}
- else if (!strcmp(ev->key, "x"))
+ else if ((!strcmp(ev->key, "x"))
+ && (evas_key_modifier_is_set(ev->modifiers, "Control")))
{
- if (evas_key_modifier_is_set(ev->modifiers, "Control"))
- {
- sd->cnp_have = EINA_TRUE;
- sd->cnp_cut = EINA_TRUE;
- _cnp_copy_files(sd);
- handled = EINA_TRUE;
- }
+ sd->cnp_have = EINA_TRUE;
+ sd->cnp_cut = EINA_TRUE;
+ _cnp_copy_files(sd);
+ handled = EINA_TRUE;
}
- else if (!strcmp(ev->key, "v"))
+ else if ((!strcmp(ev->key, "v"))
+ && (evas_key_modifier_is_set(ev->modifiers, "Control")))
{
- if (evas_key_modifier_is_set(ev->modifiers, "Control"))
- {
- _cnp_paste_files(sd);
- handled = EINA_TRUE;
- }
+ _cnp_paste_files(sd);
+ handled = EINA_TRUE;
}
- else if (!strcmp(ev->key, "Insert"))
+ else if ((!strcmp(ev->key, "Insert"))
+ && (evas_key_modifier_is_set(ev->modifiers, "Shift")))
{
- if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
- {
- _cnp_paste_files(sd);
- handled = EINA_TRUE;
- }
+ _cnp_paste_files(sd);
+ handled = EINA_TRUE;
}
// flag on hold if we use the event - otherwise pass it on
if (handled)
@@ -1443,16 +1433,16 @@ _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_NOT_LEADER | ECORE_EXE_TERM_WITH_PARENT | 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)
{
- printf("O [ %s ]\n", sd->config.path);
+ printf("XXX: OPEN [ %s ]\n", sd->config.path);
_listing_do(sd);
buf = cmd_strbuf_new("dir-set");
cmd_strbuf_append(buf, "path", sd->config.path);
@@ -1466,7 +1456,7 @@ _cb_scroller_focus(void *data, Evas_Object *obj EINA_UNUSED,
{
Smart_Data *sd = data;
- printf("FOCUS\n");
+// printf("XXX: FOCUS\n");
sd->focused = EINA_TRUE;
evas_object_focus_set(sd->o_clip, EINA_TRUE);
}
@@ -1477,7 +1467,7 @@ _cb_scroller_unfocus(void *data, Evas_Object *obj EINA_UNUSED,
{
Smart_Data *sd = data;
- printf("UNFOCUS\n");
+// printf("XXX: UNFOCUS\n");
sd->focused = EINA_FALSE;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
