[EGIT] [efl] 01/02: eina - fix build problem introduced by fixes from vincent
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 95701baae753cb13deab9def226fc440f6862614
Author: Carsten Haitzler
AuthorDate: Thu Jun 6 18:30:25 2024 +0100
eina - fix build problem introduced by fixes from vincent
just introduced. fixed.
---
src/lib/eina/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 4ab37d2112..707f88ee10 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -371,17 +371,17 @@ eina_ext_deps += [iconv]
execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
-iconv_c_args = ''
+eina_c_args = [package_c_args, '-DEINA_BUILD']
if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
if iconv.found()
- iconv_c_args = '-DWINICONV_CONST='
+ eina_c_args = '-DWINICONV_CONST='
endif
endif
eina_lib = library('eina', eina_src,
- c_args : [package_c_args, '-DEINA_BUILD', iconv_c_args],
+ c_args : eina_c_args,
include_directories : config_dir,
dependencies: eina_ext_deps + [eina_deps, evil],
install: true,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 02/02: eina - fix build problem on Windows introduced by fixes from raster
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit a29471fe279200619a28237cb8b0d0cc47dbf6f5
Author: Vincent Torri
AuthorDate: Thu Jun 6 22:02:59 2024 +0200
eina - fix build problem on Windows introduced by fixes from raster
---
src/lib/eina/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 707f88ee10..5b8cdc 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -376,7 +376,7 @@ if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
if iconv.found()
- eina_c_args = '-DWINICONV_CONST='
+ eina_c_args += '-DWINICONV_CONST='
endif
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: eina - fix build problem on Windows introduced by fixes from raster
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit a29471fe279200619a28237cb8b0d0cc47dbf6f5
Author: Vincent Torri
AuthorDate: Thu Jun 6 22:02:59 2024 +0200
eina - fix build problem on Windows introduced by fixes from raster
---
src/lib/eina/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 707f88ee10..5b8cdc 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -376,7 +376,7 @@ if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
if iconv.found()
- eina_c_args = '-DWINICONV_CONST='
+ eina_c_args += '-DWINICONV_CONST='
endif
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: eina - fix build problem introduced by fixes from vincent
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 95701baae753cb13deab9def226fc440f6862614
Author: Carsten Haitzler
AuthorDate: Thu Jun 6 18:30:25 2024 +0100
eina - fix build problem introduced by fixes from vincent
just introduced. fixed.
---
src/lib/eina/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 4ab37d2112..707f88ee10 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -371,17 +371,17 @@ eina_ext_deps += [iconv]
execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
-iconv_c_args = ''
+eina_c_args = [package_c_args, '-DEINA_BUILD']
if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
if iconv.found()
- iconv_c_args = '-DWINICONV_CONST='
+ eina_c_args = '-DWINICONV_CONST='
endif
endif
eina_lib = library('eina', eina_src,
- c_args : [package_c_args, '-DEINA_BUILD', iconv_c_args],
+ c_args : eina_c_args,
include_directories : config_dir,
dependencies: eina_ext_deps + [eina_deps, evil],
install: true,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: comment typo, efm tasks nicer ui, less printfs
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 009f046b734fe12aa7807c35db04f0f7e7e626a5
Author: Carsten Haitzler (Rasterman)
AuthorDate: Thu Jun 6 11:54:22 2024 +0100
comment typo, efm tasks nicer ui, less printfs
---
src/backends/default/open.c | 2 +-
src/efm/efm_tasks.c | 23 +++
src/shared/status_mon.c | 1 -
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/backends/default/open.c b/src/backends/default/open.c
index 1907df9..cc74001 100644
--- a/src/backends/default/open.c
+++ b/src/backends/default/open.c
@@ -558,7 +558,7 @@ _file_thumb_handle(Eina_Strbuf *strbuf, const char *path, const char *mime,
}
eet_close(ef);
if (!ok)
-{ // thumb stat data doesn'yt match file state data
+{ // thumb stat data doesn't match file state data
free(thumb);
thumb = NULL;
}
diff --git a/src/efm/efm_tasks.c b/src/efm/efm_tasks.c
index 8f00c6f..81f56af 100644
--- a/src/efm/efm_tasks.c
+++ b/src/efm/efm_tasks.c
@@ -8,7 +8,7 @@ static Eina_List *tasks = NULL;
typedef struct
{
Status_Op *op;
- Evas_Object *o_base, *o_progress, *o_label, *o_label_dst, *o_label_str;
+ Evas_Object *o_base, *o_progress, *o_label_dst, *o_label_str;
} Task;
static Task *
@@ -55,22 +55,21 @@ task_del(Task *t)
static void
task_new(Task *t)
{
- Evas_Object *o, *bx;
+ Evas_Object *o, *fr, *bx;
+
+ fr = o = elm_frame_add(tasks_box);
+ evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ elm_box_pack_end(tasks_box, o);
+ evas_object_show(o);
+ t->o_base = o;
bx = o = elm_box_add(tasks_box);
evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
elm_box_horizontal_set(o, EINA_FALSE);
- elm_box_pack_end(tasks_box, o);
+ elm_object_content_set(fr, o);
evas_object_show(o);
- t->o_base = o;
-
- o = elm_label_add(tasks_box);
- evas_object_size_hint_fill_set(o, 0, EVAS_HINT_FILL);
- evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
- elm_box_pack_end(bx, o);
- evas_object_show(o);
- t->o_label = o;
o = elm_label_add(tasks_box);
evas_object_size_hint_fill_set(o, 0, EVAS_HINT_FILL);
@@ -121,7 +120,7 @@ _cb_status(void *data EINA_UNUSED, Status_Op *op, Cmd *cmd)
s = cmd_key_find(cmd, "op");
if (s)
{
- if (!strcmp(s, "mv")) elm_object_text_set(t->o_label, "Move");
+ if (!strcmp(s, "mv")) elm_object_text_set(t->o_base, "Move");
}
}
else if (!strcmp(cmd->command, "dst"))
diff --git a/src/shared/status_mon.c b/src/shared/status_mon.c
index cebee95..3dfd994 100644
--- a/src/shared/status_mon.c
+++ b/src/shared/status_mon.c
@@ -53,7 +53,6 @@ status_op_add(const char *path)
so->path = eina_stringshare_add(path);
so->file = fopen(so->path, "r");
ops = eina_list_append(ops, so);
- printf(" NEW %p\n", so->file);
return so;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 03/06: efl_ui_textbox: fix sd->scroller=null error
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 24a908bf498f8d56ed7c7902d57831a4355a9f9c
Author: dimmus
AuthorDate: Mon Jun 3 18:47:01 2024 +0500
efl_ui_textbox: fix sd->scroller=null error
Can be called by efl_ui_widget_scroll_hold_{pop, push} from another widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set() invocation with undefined sd->scroller here as the result. So, check if sd->scroll is true to avoid this.
The same for *_freeze_set.
---
src/lib/elementary/efl_ui_textbox.c | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index b58b3a2c08..79055ecad7 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -3349,8 +3349,15 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_hold_get(const Eo *obj EINA_UNUSED, Efl
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_hold_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool hold)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ /* Can be called by efl_ui_widget_scroll_hold_{pop, push} from another
+* widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set()
+* invocation with undefined sd->scroller here as the result.
+* So, check if sd->scroll is true to avoid this. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ }
}
EOLIAN static Eina_Bool
@@ -3363,8 +3370,12 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_freeze_get(const Eo *obj EINA_UNUSED, E
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_freeze_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool freeze)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ /* The same as for hold_set. See comments above. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ }
}
EOLIAN static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 04/06: Exactness: fix signature compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 8f9c29187b8d1d0030ef024115d23214086c34ce
Author: Vincent Torri
AuthorDate: Sat Jun 1 08:21:19 2024 +0200
Exactness: fix signature compilation error with gcc 14
---
src/bin/exactness/common.c | 4
src/bin/exactness/player.c | 5 +
src/bin/exactness/recorder.c | 5 +
3 files changed, 14 insertions(+)
diff --git a/src/bin/exactness/common.c b/src/bin/exactness/common.c
index d62d8fd519..4ca28fa8f4 100644
--- a/src/bin/exactness/common.c
+++ b/src/bin/exactness/common.c
@@ -4,6 +4,10 @@
#include "common.h"
+#ifdef _WIN32
+# include /* setenv */
+#endif
+
Eina_Bool
ex_is_original_app(void)
{
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index 419a236018..796c385d47 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -23,6 +23,11 @@
# endif
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index 6936521d7a..f161100cbc 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -16,6 +16,11 @@
# include
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 06/06: Eina: fix constness compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 1cd130ac096bd2148d4c0f6e54864413284e0963
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:42:19 2024 +0200
Eina: fix constness compilation error with gcc 14
---
src/lib/eina/meson.build | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index a8f9cf82b7..4ab37d2112 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -371,13 +371,17 @@ eina_ext_deps += [iconv]
execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
+iconv_c_args = ''
if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
+ if iconv.found()
+ iconv_c_args = '-DWINICONV_CONST='
+ endif
endif
eina_lib = library('eina', eina_src,
- c_args : [package_c_args, '-DEINA_BUILD'],
+ c_args : [package_c_args, '-DEINA_BUILD', iconv_c_args],
include_directories : config_dir,
dependencies: eina_ext_deps + [eina_deps, evil],
install: true,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/06: efl_ui_slider: fix the error when scrolling.
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit c6b6f4d4646a92a3ecb8497c7825f8e42e33e2a9
Author: dimmus
AuthorDate: Tue Aug 15 18:11:47 2023 +0500
efl_ui_slider: fix the error when scrolling.
When we use efl_ui_textbox and efl_ui_slider simultaneously, the slider invokes the general widget's scrolling hold and freeze behavior, which calls of the textbox's scrolling functions with an obvious error: sd->scroller = NULL. So switch off that in the slider and don't notice any lack of functionality.
Saved sd->freeze as a flag for future use.
Test: elementary_test -to Efl.Ui.Slider (before and after).
---
src/lib/elementary/efl_ui_slider.c | 38 ++
1 file changed, 2 insertions(+), 36 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 041316de68..dede87ce9d 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -179,7 +179,6 @@ _drag_start(void *data,
elm_object_focus_set(data, EINA_TRUE);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
_drag_value_fetch(data);
- elm_widget_scroll_freeze_push(data);
}
static void
@@ -190,7 +189,6 @@ _drag_stop(void *data,
{
_drag_value_fetch(data);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
- elm_widget_scroll_freeze_pop(data);
}
static void
@@ -505,10 +503,7 @@ _spacer_move_cb(void *data,
if (d > (_elm_config->thumbscroll_threshold - 1))
{
if (!sd->frozen)
- {
- elm_widget_scroll_freeze_push(data);
- sd->frozen = EINA_TRUE;
- }
+ sd->frozen = EINA_TRUE;
ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
}
@@ -519,10 +514,7 @@ _spacer_move_cb(void *data,
efl_event_callback_call
(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
- {
- elm_widget_scroll_freeze_pop(data);
- sd->frozen = EINA_FALSE;
- }
+sd->frozen = EINA_FALSE;
return;
}
if (_is_horizontal(sd->dir))
@@ -560,28 +552,7 @@ _spacer_up_cb(void *data,
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
- {
-elm_widget_scroll_freeze_pop(data);
sd->frozen = EINA_FALSE;
- }
-}
-
-static void
-_mouse_in_cb(void *data EINA_UNUSED,
- Evas *e EINA_UNUSED,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- efl_ui_widget_scroll_hold_push(obj);
-}
-
-static void
-_mouse_out_cb(void *data EINA_UNUSED,
- Evas *e EINA_UNUSED,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- efl_ui_widget_scroll_hold_pop(obj);
}
static char *
@@ -657,11 +628,6 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
(priv->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add
(priv->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
- evas_object_event_callback_add
- (obj, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, obj);
- evas_object_event_callback_add
- (obj, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, obj);
-
efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 05/06: Add Angle library detection on Windows
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit f4349553072e7e5cfc14371b5183ef0927eabf67
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:56:48 2024 +0200
Add Angle library detection on Windows
---
src/lib/evas/meson.build | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 5bb4c753e3..03bc02aa95 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -209,8 +209,30 @@ endif
if get_option('opengl') != 'none'
if get_option('opengl') == 'es-egl'
config_h.set('GL_GLES', '1')
-gl_deps += dependency('glesv2')
-gl_deps += dependency('egl')
+# Angle library does not provide .pc files
+if sys_windows
+ glesv2_dep = cc.find_library(
+'GLESv2',
+has_headers: 'GLES2/gl2.h'
+ )
+ if glesv2_dep.found()
+gl_deps += glesv2_dep
+ else
+error('GLES 2.0 library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+ egl_dep = cc.find_library(
+'EGL',
+has_headers: 'EGL/egl.h'
+ )
+ if egl_dep.found()
+gl_deps += egl_dep
+ else
+error('EGL library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+else
+ gl_deps += dependency('glesv2')
+ gl_deps += dependency('egl')
+endif
else
gl_deps += dependency('gl')
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 02/06: efl_ui_slider: revert previous changes
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 09571f18b9f89906d148ca37765b923d80dcbdf3
Author: dimmus
AuthorDate: Mon Jun 3 17:59:40 2024 +0500
efl_ui_slider: revert previous changes
---
src/lib/elementary/efl_ui_slider.c | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index dede87ce9d..041316de68 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -179,6 +179,7 @@ _drag_start(void *data,
elm_object_focus_set(data, EINA_TRUE);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
_drag_value_fetch(data);
+ elm_widget_scroll_freeze_push(data);
}
static void
@@ -189,6 +190,7 @@ _drag_stop(void *data,
{
_drag_value_fetch(data);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+ elm_widget_scroll_freeze_pop(data);
}
static void
@@ -503,7 +505,10 @@ _spacer_move_cb(void *data,
if (d > (_elm_config->thumbscroll_threshold - 1))
{
if (!sd->frozen)
- sd->frozen = EINA_TRUE;
+ {
+ elm_widget_scroll_freeze_push(data);
+ sd->frozen = EINA_TRUE;
+ }
ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
}
@@ -514,7 +519,10 @@ _spacer_move_cb(void *data,
efl_event_callback_call
(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
-sd->frozen = EINA_FALSE;
+ {
+ elm_widget_scroll_freeze_pop(data);
+ sd->frozen = EINA_FALSE;
+ }
return;
}
if (_is_horizontal(sd->dir))
@@ -552,7 +560,28 @@ _spacer_up_cb(void *data,
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
+ {
+elm_widget_scroll_freeze_pop(data);
sd->frozen = EINA_FALSE;
+ }
+}
+
+static void
+_mouse_in_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_push(obj);
+}
+
+static void
+_mouse_out_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_pop(obj);
}
static char *
@@ -628,6 +657,11 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
(priv->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add
(priv->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, obj);
+
efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: formatting!
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)
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, ) != 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_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);
[EGIT] [efl] 01/01: Eina: fix constness compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 1cd130ac096bd2148d4c0f6e54864413284e0963
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:42:19 2024 +0200
Eina: fix constness compilation error with gcc 14
---
src/lib/eina/meson.build | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index a8f9cf82b7..4ab37d2112 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -371,13 +371,17 @@ eina_ext_deps += [iconv]
execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
+iconv_c_args = ''
if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
+ if iconv.found()
+ iconv_c_args = '-DWINICONV_CONST='
+ endif
endif
eina_lib = library('eina', eina_src,
- c_args : [package_c_args, '-DEINA_BUILD'],
+ c_args : [package_c_args, '-DEINA_BUILD', iconv_c_args],
include_directories : config_dir,
dependencies: eina_ext_deps + [eina_deps, evil],
install: true,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Add Angle library detection on Windows
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit f4349553072e7e5cfc14371b5183ef0927eabf67
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:56:48 2024 +0200
Add Angle library detection on Windows
---
src/lib/evas/meson.build | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 5bb4c753e3..03bc02aa95 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -209,8 +209,30 @@ endif
if get_option('opengl') != 'none'
if get_option('opengl') == 'es-egl'
config_h.set('GL_GLES', '1')
-gl_deps += dependency('glesv2')
-gl_deps += dependency('egl')
+# Angle library does not provide .pc files
+if sys_windows
+ glesv2_dep = cc.find_library(
+'GLESv2',
+has_headers: 'GLES2/gl2.h'
+ )
+ if glesv2_dep.found()
+gl_deps += glesv2_dep
+ else
+error('GLES 2.0 library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+ egl_dep = cc.find_library(
+'EGL',
+has_headers: 'EGL/egl.h'
+ )
+ if egl_dep.found()
+gl_deps += egl_dep
+ else
+error('EGL library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+else
+ gl_deps += dependency('glesv2')
+ gl_deps += dependency('egl')
+endif
else
gl_deps += dependency('gl')
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Exactness: fix signature compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 8f9c29187b8d1d0030ef024115d23214086c34ce
Author: Vincent Torri
AuthorDate: Sat Jun 1 08:21:19 2024 +0200
Exactness: fix signature compilation error with gcc 14
---
src/bin/exactness/common.c | 4
src/bin/exactness/player.c | 5 +
src/bin/exactness/recorder.c | 5 +
3 files changed, 14 insertions(+)
diff --git a/src/bin/exactness/common.c b/src/bin/exactness/common.c
index d62d8fd519..4ca28fa8f4 100644
--- a/src/bin/exactness/common.c
+++ b/src/bin/exactness/common.c
@@ -4,6 +4,10 @@
#include "common.h"
+#ifdef _WIN32
+# include /* setenv */
+#endif
+
Eina_Bool
ex_is_original_app(void)
{
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index 419a236018..796c385d47 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -23,6 +23,11 @@
# endif
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index 6936521d7a..f161100cbc 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -16,6 +16,11 @@
# include
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [enlightenment] 12/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 52118683104628b4777c02b50a33f3eb98b20a84 Author: usergreen AuthorDate: Sun Feb 18 04:32:51 2024 -0800 Update Japanese translation --- po/ja.po | 431 --- 1 file changed, 216 insertions(+), 215 deletions(-) diff --git a/po/ja.po b/po/ja.po index fabe55595..4ff43ecc4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4090,7 +4090,7 @@ msgstr "Enlightenment で メッセージシステムを設定できません。 #: src/bin/e_main.c:956 #, fuzzy msgid "Enlightenment cannot set up its grab input handling system.\n" -msgstr "Enlightenment でg rab 入力処理システムを設定できません。" +msgstr "Enlightenment で grab 入力処理システムを設定できません。" #: src/bin/e_main.c:965 src/bin/e_main.c:1107 #, fuzzy @@ -4488,12 +4488,12 @@ msgstr "このシェルフを削除しようとしています。本 #: src/bin/e_shelf.c:2268 msgid "A shelf with that name and id already exists!" -msgstr "" +msgstr "その名前と ID を持つシェルフはすでに存在します！" #: src/bin/e_shelf.c:2288 #, fuzzy msgid "Rename Shelf" -msgstr "ファイル名を変更する" +msgstr "シェリフの名前を変更する" #: src/bin/e_shelf.c:2362 src/modules/conf_shelves/e_int_config_shelf.c:145 #: src/modules/ibar/e_mod_config.c:118 src/modules/ibar/e_mod_main.c:491 @@ -4522,9 +4522,9 @@ msgid "" "want to finish the logoutanyway without closing theseapplications " "first?Auto logout in %d seconds." msgstr "" -"ログアウトに時間がかかり過ぎています.閉じられないアプリケーションがあるた" -"めです.このアプリケーションを無視して、とにかくログアウトを完了させます" -"か.自動ログアウトまであと %d 秒." +"ログアウトに時間がかかり過ぎています.一部のアプリケーションは終了を拒否しています。" +"これらのアプリケーションを閉じずに、とにかくログアウトを完了させますか？" +"自動ログアウトまであと %d 秒です。" #: src/bin/e_sys.c:953 msgid "Logout problems" @@ -4532,7 +4532,7 @@ msgstr "ログアウトに問題があります" #: src/bin/e_sys.c:956 msgid "Logout now" -msgstr "ただちにログアウトする" +msgstr "すぐログアウトする" #: src/bin/e_sys.c:958 msgid "Wait longer" @@ -4540,11 +4540,11 @@ msgstr "待機する" #: src/bin/e_sys.c:960 msgid "Cancel Logout" -msgstr "ログアウトを取り消す" +msgstr "ログアウトの取り消し" #: src/bin/e_sys.c:1040 msgid "Enlightenment is busy with another request" -msgstr "Enlightenment は現在他の処理で手一杯です." +msgstr "Enlightenment は現在他の処理で手一杯です。" #: src/bin/e_sys.c:1045 #, fuzzy @@ -4552,7 +4552,7 @@ msgid "" "Logging out.You cannot perform other system actionsonce a logout " "has begun." msgstr "" -"ログアウト中です.ログアウト処理が始まったら他のシステム処理はできません." +"ログアウト中です。ログアウト処理が始まると他のシステム処理はできません。" #: src/bin/e_sys.c:1052 #, fuzzy @@ -4560,15 +4560,14 @@ msgid "" "Powering off.You cannot perform any other system actionsonce a " "shutdown has been started." msgstr "" -"シャットダウン中です.シャットダウン処理が始まったら他のシステム処理はでき" -"ません." +"シャットダウン中です。シャットダウンが始まると他のシステム処理はできません。" #: src/bin/e_sys.c:1058 #, fuzzy msgid "" "Resetting.You cannot perform any other system actionsonce a reboot " "has begun." -msgstr "再起動中です.再起動処理が始まったら他のシステム処理はできません." +msgstr "再起動中です。再起動処理が始まると他のシステム処理はできません。" #: src/bin/e_sys.c:1064 #, fuzzy @@ -4576,8 +4575,8 @@ msgid "" "Suspending.You cannot perform any other system actionsuntil " "suspend is complete." msgstr "" -"冬眠。 これが完了するまであなたが他のシステム·アクション·を実行するこ" -"とはできません。" +"サスペンド中です。サスペンドが完了しないと他のシステム·アクションを" +"実行することはできません。" #: src/bin/e_sys.c:1070 #, fuzzy @@ -4585,12 +4584,12 @@ msgid "" "Hibernating.You cannot perform any other system actionsuntil " "hibernation is complete." msgstr "" -"冬眠。 これが完了するまであなたが他のシステム·アクション·を実行するこ" -"とはできません。" +"ハイバネート中です。ハイバネートが完了しないと他のシステム·アクションを" +"実行することはできません。" #: src/bin/e_sys.c:1076 msgid "EEK! This should not happen" -msgstr "ありゃりゃ, これはまずいよ" +msgstr "あれれ、これはまずいですよ" #: src/bin/e_system.c:35 src/bin/e_system.c:40 src/bin/e_system.c:45 #: src/bin/e_system.c:50 src/bin/e_system.c:55 src/bin/e_system.c:60 @@ -4600,7 +4599,7 @@ msgstr "ありゃりゃ, これはまずいよ" #: src/bin/e_system.c:111 #, fuzzy msgid "Error in Enlightenment System Service" -msgstr "Enlightenment 起動時にロックする" +msgstr "Enlightenment のシステムサービス・エラー" #: src/bin/e_system.c:36 #, fuzzy @@ -4727,7 +4726,7 @@ msgstr "テーマに設定する" #: src/bin/e_toolbar.c:128 #, fuzzy msgid "EFM Toolbar" -msgstr "ツールバーを表示する" +msgstr "EFM ツールバー" #: src/bin/e_update.c:72 msgid "Bother me later" @@ -4752,7 +4751,7 @@ msgstr "" #: src/bin/e_utils.c:134 msgid "Cannot exit - immortal windows." -msgstr "終了できません. 不死身のウィンドウです." +msgstr "終了できない ー 不滅のウィンドウです。" #: src/bin/e_utils.c:135 #, fuzzy @@ -4761,9 +4760,8 @@ msgid "" "meansthat Enlightenment will not allow itself to exit until these " "windows havebeen closed or have the lifespan lock removed." msgstr "" -"寿命がロックされて不死身のままになっているウィンドウが存在します.当該ウィ" -"ンドウを閉じるか寿命のロックを解除するまで Enlightenment は終了できませ" -"ん." +"一部のウィンドウは、ロックが有効なままで残っています。つまり、これらのウィンドウを" +"閉じるか、ロックが解除されるまで、Enlightenment が終了できないことを意味します。" #: src/bin/e_utils.c:553 #, fuzzy, c-format @@ -4773,22 +4771,22 @@ msgstr "%'.0f B" #: src/bin/e_utils.c:557 #, fuzzy, c-format msgid "%'.0f KiB" -msgstr "%'.0f B" +msgstr "%'.0f KiB" #: src/bin/e_utils.c:561 #, c-format msgid "%'.1f MiB" -msgstr ""
[EGIT] [enlightenment] 15/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 7149929a7dba03383073683c332e1a1d8ba7b2bd Author: usergreen AuthorDate: Mon Feb 19 22:52:40 2024 -0800 Update Japanese translation --- po/ja.po | 280 +++ 1 file changed, 138 insertions(+), 142 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7edfbe2cd..82dbfd55c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10062,7 +10062,7 @@ msgstr "プレゼンテーションモード" #: src/modules/notification/e_mod_main.c:111 msgid "Error during notification server initialization" -msgstr "" +msgstr "通知サーバ初期化中にエラーが発生しました" #: src/modules/notification/e_mod_main.c:112 #, fuzzy @@ -10070,8 +10070,8 @@ msgid "" "Ensure there's no other module acting as a server and that D-Bus is " "correctly installed and running" msgstr "" -"DBusの初期化に失敗しました！\r\n" -"dbusが正しくインストールされて動作しているか確認してください。" +"サーバとして動作する他のモジュールがなく、また、D-Bus が" +"正しくインストールされ動作しているかを確認してください。" #: src/modules/packagekit/e_mod_config.c:72 #, fuzzy @@ -10083,50 +10083,50 @@ msgstr "内容を更新する" #: src/modules/packagekit/e_mod_config.c:87 #, fuzzy msgid "Hourly" -msgstr "1 時間" +msgstr "1 時間毎" #: src/modules/packagekit/e_mod_config.c:80 #: src/modules/packagekit/e_mod_config.c:88 msgid "Daily" -msgstr "" +msgstr "毎日" #: src/modules/packagekit/e_mod_config.c:82 #: src/modules/packagekit/e_mod_config.c:89 msgid "Weekly" -msgstr "" +msgstr "毎週" #: src/modules/packagekit/e_mod_config.c:99 msgid "Package list" -msgstr "" +msgstr "パッケージリスト" #: src/modules/packagekit/e_mod_config.c:103 #: src/modules/packagekit/e_mod_config.c:109 #, fuzzy msgid "Compact (package name)" -msgstr "ツールバーを表示する" +msgstr "コンパクト（パッケージ名）" #: src/modules/packagekit/e_mod_config.c:105 #: src/modules/packagekit/e_mod_config.c:110 msgid "Extended (name and description)" -msgstr "" +msgstr "拡張表示（名前と説明）" #: src/modules/packagekit/e_mod_config.c:120 #, fuzzy msgid "Package Manager" -msgstr "ファイルマネージャ" +msgstr "パッケージマネージャ" #: src/modules/packagekit/e_mod_main.c:122 #, fuzzy msgid "System Updates" -msgstr "システムの壁紙" +msgstr "システム更新" #: src/modules/packagekit/e_mod_packagekit.c:81 msgid "Low priority update" -msgstr "" +msgstr "優先度の低い更新" #: src/modules/packagekit/e_mod_packagekit.c:83 msgid "Enhancement update" -msgstr "" +msgstr "機能強化の更新" #: src/modules/packagekit/e_mod_packagekit.c:85 #, fuzzy @@ -10135,68 +10135,68 @@ msgstr "普通(体裁よい)" #: src/modules/packagekit/e_mod_packagekit.c:87 msgid "Bugfix update" -msgstr "" +msgstr "不具合修正" #: src/modules/packagekit/e_mod_packagekit.c:89 msgid "High priority update" -msgstr "" +msgstr "優先度の高い更新" #: src/modules/packagekit/e_mod_packagekit.c:91 msgid "Security update" -msgstr "" +msgstr "セキュリティ更新" #: src/modules/packagekit/e_mod_packagekit.c:171 #, fuzzy, c-format msgid "Unknown PackageKit" -msgstr "ツールバーを表示する" +msgstr "不明な PackageKit" #: src/modules/packagekit/e_mod_packagekit.c:239 #, fuzzy msgid "No information available" -msgstr "情報無し" +msgstr "利用可能な情報無し" #: src/modules/packagekit/e_mod_packagekit.c:271 #, fuzzy, c-format msgid "Operation in progress" -msgstr "ログアウト中" +msgstr "稼働中" #: src/modules/packagekit/e_mod_packagekit.c:273 #, fuzzy, c-format msgid "One update available" msgid_plural "%d updates available" -msgstr[0] "利用可能" -msgstr[1] "利用可能" +msgstr[0] "1 個の更新が利用可能" +msgstr[1] "%d 個の更新が利用可能" #: src/modules/packagekit/e_mod_packagekit.c:275 #, c-format msgid "Your system is updated" -msgstr "" +msgstr "システムは最新状態です" #: src/modules/packagekit/e_mod_packagekit.c:283 msgid "Please wait" -msgstr "" +msgstr "しばらくお待ちください" #: src/modules/packagekit/e_mod_packagekit.c:288 #, fuzzy msgid "Nothing to do" -msgstr "無し" +msgstr "更新はありません" #: src/modules/packagekit/e_mod_packagekit.c:294 #, fuzzy msgid "Install updates" -msgstr "空きスペースまで広げる" +msgstr "更新をインストールする" #: src/modules/packagekit/e_mod_packagekit.c:299 #, fuzzy, c-format msgid "Install update" msgid_plural "Install %d updates" -msgstr[0] "普通(体裁よい)" -msgstr[1] "普通(体裁よい)" +msgstr[0] "更新をインストール" +msgstr[1] "%d 更新をインストール" #: src/modules/packagekit/e_mod_packagekit.c:578 #, fuzzy msgid "Manage packages" -msgstr "ファイルマネージャ" +msgstr "パッケージを管理する" #: src/modules/pager/e_mod_config.c:74 msgid "Pager Settings" @@ -10209,7 +10209,7 @@ msgstr "マウスホイールでデスクトップを切替える" #: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:185 #, fuzzy msgid "Always show desktop names" -msgstr "デスクトップ名を表示する" +msgstr "常にデスクトップ名を表示する" #: src/modules/pager/e_mod_config.c:136 src/modules/pager/e_mod_config.c:216 msgid "Show popup on desktop change" @@ -10221,7 +10221,7 @@ msgstr "緊急ウィンドウにはポップアップを表示" #: src/modules/pager/e_mod_config.c:190 msgid "Select and Slide button" -msgstr "選択 / スライド" +msgstr "選択 / スライドボタン" #: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:200 #:
[EGIT] [enlightenment] 09/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 4c68d97b7a969bd499508b07d9cbde2e65878aff Author: usergreen AuthorDate: Sat Feb 10 23:12:43 2024 -0800 Update Japanese translation --- po/ja.po | 410 +++ 1 file changed, 205 insertions(+), 205 deletions(-) diff --git a/po/ja.po b/po/ja.po index 61b4555b0..0f460a870 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3423,7 +3423,7 @@ msgstr "効果:" #: src/bin/e_int_config_comp_match.c:352 #, fuzzy msgid "Edit E_Comp_Match" -msgstr "アイコン編集" +msgstr "" #: src/bin/e_int_config_comp_match.c:404 #, fuzzy @@ -3434,26 +3434,26 @@ msgstr "名前" #: src/modules/conf_applications/e_int_config_defapps.c:335 #, fuzzy msgid "Types" -msgstr "タイプ:" +msgstr "タイプ" #: src/bin/e_int_config_comp_match.c:466 #: src/modules/conf_randr/e_int_config_randr2.c:1046 #, fuzzy msgid "On" -msgstr "開く" +msgstr "" #: src/bin/e_int_config_comp_match.c:468 #: src/modules/everything/evry_config.c:493 msgid "Off" -msgstr "無効" +msgstr "オフ" #: src/bin/e_int_config_comp_match.c:511 msgid "ARGB" -msgstr "" +msgstr "ARGB" #: src/bin/e_int_config_comp_match.c:547 msgid "Flags" -msgstr "" +msgstr "フラッグ" #: src/bin/e_int_config_comp_match.c:551 src/bin/e_int_shelf_config.c:226 #: src/modules/conf_theme/e_int_config_fonts.c:704 @@ -3463,7 +3463,7 @@ msgstr "スタイル" #: src/bin/e_int_config_comp_match.c:577 #, fuzzy msgid "Effect" -msgstr "アイドルの影響" +msgstr "効果" #: src/bin/e_int_config_comp_match.c:741 src/bin/e_widget_config_list.c:80 #: src/modules/conf_applications/e_int_config_apps.c:348 @@ -3518,7 +3518,7 @@ msgstr "ポップアップ" #: src/bin/e_int_config_comp_match.c:774 msgid "Overrides" -msgstr "" +msgstr "上書き" #: src/bin/e_int_config_comp_match.c:778 #: src/modules/conf_menus/e_int_config_menus.c:279 @@ -3529,12 +3529,12 @@ msgstr "メニュー" #: src/bin/e_int_config_comp_match.c:782 #, fuzzy msgid "Objects" -msgstr "オブジェクト:" +msgstr "オブジェクト" #: src/bin/e_int_config_comp_match.c:945 #, fuzzy msgid "Composite Match Settings" -msgstr "位置" +msgstr "" #: src/bin/e_int_config_modules.c:51 msgid "Utilities" @@ -3551,7 +3551,7 @@ msgstr "ファイル" #: src/bin/e_int_config_modules.c:55 src/modules/everything/e_mod_main.c:56 #: src/modules/quickaccess/e_mod_main.c:48 msgid "Launcher" -msgstr "ランチャー" +msgstr "ランチャ" #: src/bin/e_int_config_modules.c:56 #: src/modules/conf_applications/e_int_config_defapps.c:330 @@ -3577,24 +3577,24 @@ msgstr "アンロード" #: src/bin/e_int_config_modules.c:348 src/bin/e_int_config_modules.c:602 msgid "No modules selected." -msgstr "モジュールが選択されていません" +msgstr "モジュールが選択されていません。" #: src/bin/e_int_config_modules.c:600 msgid "More than one module selected." -msgstr "複数のモジュールが選択されています" +msgstr "複数のモジュールが選択されています。" #: src/bin/e_int_gadcon_config.c:703 #, fuzzy msgid "Loaded Gadgets" -msgstr "ガジェットを追加する" +msgstr "ロードされたガジェット" #: src/bin/e_int_gadcon_config.c:723 msgid "Available Gadgets" -msgstr "使えるガジェット" +msgstr "利用可能なガジェット" #: src/bin/e_int_gadcon_config.c:785 msgid "Shelf Contents" -msgstr "シェルフの中身の設定" +msgstr "シェルフのコンテンツ" #: src/bin/e_int_gadcon_config.c:791 msgid "Toolbar Contents" @@ -3602,7 +3602,7 @@ msgstr "ツールバーの内容" #: src/bin/e_intl.c:356 msgid "Input Method Error" -msgstr "インプットメソッドエラー" +msgstr "入力メソッドエラー" #: src/bin/e_intl.c:357 #, fuzzy @@ -3611,9 +3611,9 @@ msgid "" "your inputmethod configuration is correct andthat your " "configuration'sexecutable is in your PATH" msgstr "" -"インプットメソッドの起動時にエラーが発生しました.インプットメソッドの" -"設定が正しいこと, および実行可能ファイルが PATH にあることを確認して下さ" -"い." +"入力メソッドの起動時にエラーが発生しました。入力メソッドの" +"設定が正しいことか、さらに、実行可能ファイルが PATH にあるのかを" +"確認してください。" #: src/bin/e_int_menus.c:144 src/modules/mixer/backend.c:1265 #: src/modules/syscon/e_int_config_syscon.c:153 @@ -3641,7 +3641,7 @@ msgstr "アプリケーション" #: src/bin/e_int_menus.c:204 #, fuzzy msgid "Blanking Block" -msgstr "ブランキング" +msgstr "ブランキング・ブロック" #: src/bin/e_int_menus.c:212 src/bin/e_int_menus.c:1596 #: src/modules/conf_window_manipulation/e_mod_main.c:17 @@ -3665,7 +3665,7 @@ msgstr "このテーマについて" #: src/bin/e_int_menus.c:261 msgid "Report Bug" -msgstr "" +msgstr "不具合の報告" #: src/bin/e_int_menus.c:352 msgid "Virtual" @@ -3680,16 +3680,16 @@ msgstr "シェルフ" #: src/bin/e_int_menus.c:365 src/modules/gadman/e_mod_main.c:180 #, fuzzy msgid "Change Wallpaper" -msgstr "壁紙の交換" +msgstr "壁紙の変更" #: src/bin/e_int_menus.c:373 msgid "Show/Hide All Windows" -msgstr "全ウィンドウを一度に隠す／表示する" +msgstr "すべてのウィンドウを表示／非表示する" #: src/bin/e_int_menus.c:980 #, fuzzy msgid "No applications" -msgstr "アプリケーションを並べ替える" +msgstr "アプリケーションなし" #: src/bin/e_int_menus.c:1214 msgid "Set Virtual Desktops" @@ -3703,13 +3703,13 @@ msgstr "ウインドウ無し" #: src/bin/e_int_menus.c:1711 src/bin/e_int_menus.c:1805 #, fuzzy msgid "Untitled window" -msgstr "他のウィンドウ" +msgstr "タイトル無しのウィンドウ" #:
[EGIT] [enlightenment] 14/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit ea1769fffccf723e6b6992df9f634e16b79543b4 Author: usergreen AuthorDate: Mon Feb 19 20:14:59 2024 -0800 Update Japanese translation --- po/ja.po | 290 +++ 1 file changed, 144 insertions(+), 146 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1dde7..7edfbe2cd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8600,10 +8600,12 @@ msgid "" "This module wants to execute an external application EConnMan that does not " "exist.Please install EConnMan application." msgstr "" +"このモジュールは、存在しない外部アプリケーション EConnMan を実行しようとしています。" +"EConnMan アプリケーションをインストールしてください。" #: src/modules/connman/e_mod_main.c:285 msgid "Wifi On" -msgstr "" +msgstr "WiFi オン" # #: src/modules/connman/e_mod_main.c:295 @@ -8618,7 +8620,7 @@ msgstr "マウスポインタの設定" #: src/modules/cpufreq/e_mod_config.c:82 src/modules/cpufreq/e_mod_main.c:276 msgid "Restore CPU Power Policy" -msgstr "CPU パワーポリシーを復帰する" +msgstr "CPU 電源ポリシーの復元" #: src/modules/cpufreq/e_mod_config.c:85 src/modules/cpufreq/e_mod_main.c:316 msgid "Automatic powersaving" @@ -8652,16 +8654,16 @@ msgstr "超低速(256 ticks ごと)" #: src/modules/cpufreq/e_mod_config.c:104 #, fuzzy msgid "Minimum Power State" -msgstr "マウスの設定" +msgstr "最小電力状態" #: src/modules/cpufreq/e_mod_config.c:110 #, fuzzy msgid "Maximum Power State" -msgstr "マウスの設定" +msgstr "最大電力状態" #: src/modules/cpufreq/e_mod_main.c:150 msgid "Cpufreq" -msgstr "Cpufreq" +msgstr "CPU 周波数" #: src/modules/cpufreq/e_mod_main.c:251 msgid "Manual" @@ -8670,12 +8672,12 @@ msgstr "手動" #: src/modules/cpufreq/e_mod_main.c:255 src/modules/cpufreq/e_mod_main.c:293 #, fuzzy msgid "Lower Power Automatic" -msgstr "低消費電力自動" +msgstr "自動低消費電力" #: src/modules/cpufreq/e_mod_main.c:257 src/modules/cpufreq/e_mod_main.c:295 #, fuzzy msgid "Automatic Interactive" -msgstr "自動的にヒンティングする" +msgstr "自動インタラクティブ" #: src/modules/cpufreq/e_mod_main.c:259 src/modules/cpufreq/e_mod_main.c:297 msgid "Minimum Speed" @@ -8701,7 +8703,7 @@ msgstr "更新間隔" #: src/modules/cpufreq/e_mod_main.c:412 msgid "Set CPU Power Policy" -msgstr "CPU パワーポリシーを設定する" +msgstr "CPU 電源ポリシーを設定する" #: src/modules/cpufreq/e_mod_main.c:419 msgid "Set CPU Speed" @@ -8714,19 +8716,18 @@ msgstr "省電力時の動作" #: src/modules/cpufreq/e_mod_main.c:431 #, fuzzy msgid "Power State Min" -msgstr "マウスの設定" +msgstr "最小電力状態" #: src/modules/cpufreq/e_mod_main.c:437 msgid "Power State Max" -msgstr "" +msgstr "最大電力状態" #: src/modules/cpufreq/e_mod_main.c:549 #, fuzzy msgid "" "There was an error trying to modify CPUfrequency control parameters." msgstr "" -"エラーが起きました.このモジュールの setfreq ユーティリティで CPU 周波数ガ" -"バナーを設定しようとしています." +"CPUの周波数制御パラメータを変更しようとしたところ、エラーが発生しました。" #: src/modules/cpufreq/e_mod_main.c:615 #, fuzzy @@ -8735,40 +8736,40 @@ msgid "" "be missingKernel modules or features, or your CPUsimply does not " "support this feature." msgstr "" -"このカーネルでは CPU 周波数がまったく設定できません.カーネルのモジュール" -"や機能で必要なものが欠けているかもしれません.または, その機能がサポートさ" -"れていない CPU を使っているだけかもしれません." +"お使いのカーネルでは CPU 周波数がまったく設定できません。カーネルのモジュール" +"や機能で必要なものが欠けているかもしれません。あるいは、その機能をサポートしていない" +" CPU を使っているのかもしれません。" #: src/modules/cpufreq/e_mod_main.c:1565 #, fuzzy msgid "CPU Frequency" -msgstr "緊急" +msgstr "CPU 周波数" #: src/modules/everything/e_mod_main.c:47 #: src/modules/everything/evry_plugin.c:179 msgid "Everything Launcher" -msgstr "Everythingランチャー" +msgstr "Everything ランチャ" #: src/modules/everything/e_mod_main.c:48 #, fuzzy msgid "Show Everything Launcher" -msgstr "すべてランチャーを表示する" +msgstr "Everything ランチャを表示する" #: src/modules/everything/e_mod_main.c:59 msgid "Everything Configuration" -msgstr "Everythingの設定" +msgstr "Everything の設定" #: src/modules/everything/e_mod_main.c:397 msgid "Everything Module" -msgstr "Everythingモジュール" +msgstr "Everything モジュール" #: src/modules/everything/e_mod_main.c:576 msgid "Run Everything" -msgstr "Everything起動" +msgstr "Everything の起動" #: src/modules/everything/evry_config.c:78 msgid "Everything Settings" -msgstr "Everythingの設定" +msgstr "Everything の設定" #: src/modules/everything/evry_config.c:362 msgid "Available Plugins" @@ -8788,7 +8789,7 @@ msgstr "有効" #: src/modules/everything/evry_config.c:389 msgid "Show in \"All\"" -msgstr "\"ALL\"に表示する" +msgstr "\"ALL\" に表示する" #: src/modules/everything/evry_config.c:395 msgid "Show in top-level" @@ -8796,15 +8797,15 @@ msgstr "トップレベルに表示する" #: src/modules/everything/evry_config.c:401 msgid "Minimum characters for search" -msgstr "検索最小文字数" +msgstr "検索可能な最小文字数" #: src/modules/everything/evry_config.c:410 msgid "Plugin Trigger" -msgstr "プラグイントリガー" +msgstr "プラグイン・トリガ" #: src/modules/everything/evry_config.c:415 msgid "Search only when triggered" -msgstr "トリガーがかかったときのみ検索" +msgstr "トリガがかかったときのみ検索" #: src/modules/everything/evry_config.c:422 msgid "Plugin
[EGIT] [enlightenment] 04/16: Updated Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit c0604bfd15ff1cd7fb8fae919cd09997aa7b641c Author: usergreen AuthorDate: Fri Feb 9 17:48:57 2024 -0800 Updated Japanese translation --- po/ja.po | 96 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/po/ja.po b/po/ja.po index 58a510b93..6d720835a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -47,7 +47,7 @@ msgid "" "enlightenment.org" msgstr "" "Copyright 2000-2023, Enlightenment 開発チーム-">私たちがこのソフトの執筆を楽しんでいるのと同じように、あなたがこのソフトを" +">私たちがこのソフトウウェアを楽しんで作っているのと同じように、みなさんもこのソフトウェアを" "使って楽しんでくださることを願っています。私たちと連絡を取りたい場合は、" http://www.""enlightenment.org を訪れてください。" @@ -78,12 +78,12 @@ msgid "" "sure you want to kill this window?" msgstr "" "%s を強制終了しようとしています.\n" -"このウィンドウにある未保存のデータはすべて消失します.\n" +"警告. このウィンドウにある未保存のデータはすべて消失します!\n" "このウィンドウを強制終了しますか？" #: src/bin/e_actions.c:364 msgid "Are you sure you want to kill this window?" -msgstr "本当にこのウィンドウを強制終了しますか" +msgstr "本当にこのウィンドウを強制終了しますか?" #: src/bin/e_actions.c:367 src/bin/e_actions.c:3536 #: src/bin/e_int_client_menu.c:854 @@ -111,7 +111,7 @@ msgstr "終了" #: src/bin/e_actions.c:2268 #, fuzzy msgid "Are you sure you want to exit Enlightenment?" -msgstr "本当に終了しますか" +msgstr "本当に Enlightenment を終了しますか？" #: src/bin/e_actions.c:2270 src/bin/e_actions.c:2345 src/bin/e_actions.c:2405 #: src/bin/e_actions.c:2462 src/bin/e_actions.c:2524 src/bin/e_actions.c:2626 @@ -128,7 +128,7 @@ msgstr "ログアウト" #: src/bin/e_actions.c:2343 #, fuzzy msgid "Are you sure you want to logout?" -msgstr "本当にログアウトしますか" +msgstr "本当にログアウトしますか？" #: src/bin/e_actions.c:2401 msgid "Power off" @@ -137,7 +137,7 @@ msgstr "電源断" #: src/bin/e_actions.c:2403 #, fuzzy msgid "Are you sure you want to power off your computer?" -msgstr "本当にログアウトしますか" +msgstr "本当にログアウトしますか？" #: src/bin/e_actions.c:2459 src/bin/e_actions.c:4011 msgid "Reboot" @@ -146,7 +146,7 @@ msgstr "再起動" #: src/bin/e_actions.c:2460 #, fuzzy msgid "Are you sure you want to reboot your computer?" -msgstr "本当に再起動しますか" +msgstr "本当に再起動しますか？" #: src/bin/e_actions.c:2521 src/bin/e_actions.c:4019 msgid "Suspend" @@ -155,12 +155,12 @@ msgstr "サスペンド" #: src/bin/e_actions.c:2522 #, fuzzy msgid "Are you sure you want to suspend your computer?" -msgstr "本当にログアウトしますか" +msgstr "本当にログアウトしますか？" #: src/bin/e_actions.c:2623 src/bin/e_actions.c:4027 #: src/modules/conf_bindings/e_int_config_acpibindings.c:379 msgid "Hibernate" -msgstr "休止状態" +msgstr "ハイバネート" #: src/bin/e_actions.c:2624 #, fuzzy @@ -180,7 +180,7 @@ msgstr "無効なパラメータ: %s" #: src/bin/e_actions.c:3408 #, fuzzy msgid "Mouse Remapping" -msgstr "マウスの設定" +msgstr "マウスの再設定" #: src/bin/e_actions.c:3409 #, fuzzy @@ -246,16 +246,16 @@ msgstr "ウィンドウ: 状態" #: src/bin/e_actions.c:3541 msgid "Sticky Mode Toggle" -msgstr "常時表示モード反転" +msgstr "スティッキーモードの切り替え" #: src/bin/e_actions.c:3545 #, fuzzy msgid "Sticky Mode Enable" -msgstr "常時表示モード反転" +msgstr "スティッキーモードを有効化" #: src/bin/e_actions.c:3550 msgid "Iconic Mode Toggle" -msgstr "アイコンモード反転" +msgstr "アイコンモードの切り替え" #: src/bin/e_actions.c:3554 #, fuzzy @@ -264,7 +264,7 @@ msgstr "アイコンモードの有効化" #: src/bin/e_actions.c:3559 msgid "Fullscreen Mode Toggle" -msgstr "全画面モード反転" +msgstr "全画面モードの切り替え" #: src/bin/e_actions.c:3563 #, fuzzy @@ -316,29 +316,29 @@ msgstr "最大化モード \"空きまで" #: src/bin/e_actions.c:3595 msgid "Shade Up Mode Toggle" -msgstr "上方シェード反転" +msgstr "上方シェードモードの切り替え" #: src/bin/e_actions.c:3597 msgid "Shade Down Mode Toggle" -msgstr "下方シェード反転" +msgstr "下方シェードモードの切り替え" #: src/bin/e_actions.c:3599 msgid "Shade Left Mode Toggle" -msgstr "左方シェード反転" +msgstr "左方シェードモードの切り替え" #: src/bin/e_actions.c:3601 msgid "Shade Right Mode Toggle" -msgstr "右方シェード反転" +msgstr "右方シェードモードの切り替え" #: src/bin/e_actions.c:3603 msgid "Shade Mode Toggle" -msgstr "シェード状態反転" +msgstr "シェードモードの切り替え" # #: src/bin/e_actions.c:3607 #, fuzzy msgid "Set Shaded State" -msgstr "シェード状態" +msgstr "シェード状態の設定" #: src/bin/e_actions.c:3608 msgid "syntax: \"(0|1) (up|down|left|right)\"" @@ -346,21 +346,21 @@ msgstr "" #: src/bin/e_actions.c:3612 msgid "Toggle Borderless State" -msgstr "ボーダー無し状態反転" +msgstr "ボーダ無し状態の切り替え" #: src/bin/e_actions.c:3617 #, fuzzy msgid "Set Border" -msgstr "ボーダー" +msgstr "ボーダ" #: src/bin/e_actions.c:3623 #, fuzzy msgid "Cycle between Borders" -msgstr "ボーダーの間でサイクル" +msgstr "ボーダ間の繰り返し" #: src/bin/e_actions.c:3629 msgid "Toggle Pinned State" -msgstr "位置固定状態反転" +msgstr "ピン止め定状態の切り替え" # #: src/bin/e_actions.c:3634 src/bin/e_actions.c:3636 src/bin/e_actions.c:3638 @@ -410,7 +410,7 @@ msgstr "デスクトップの反転を指定する" #: src/bin/e_actions.c:3648 #, fuzzy msgid "Flip To Previous Desktop" -msgstr "前のデスクトップへ戻る" +msgstr "以前のデスクトップへ戻る" #: src/bin/e_actions.c:3653 msgid "Show The Desktop" @@ -427,7 +427,7 @@ msgstr
[EGIT] [enlightenment] 05/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 903c58d9ab59954b52c8aea815aa0d2d2dffaea4 Author: usergreen AuthorDate: Sat Feb 10 02:02:44 2024 -0800 Update Japanese translation --- po/ja.po | 88 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6d720835a..1600f77d9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -49,7 +49,7 @@ msgstr "" "Copyright 2000-2023, Enlightenment 開発チーム私たちがこのソフトウウェアを楽しんで作っているのと同じように、みなさんもこのソフトウェアを" "使って楽しんでくださることを願っています。私たちと連絡を取りたい場合は、" -http://www.""enlightenment.org を訪れてください。" +"http://www.enlightenment.org を訪れてください。" #: src/bin/e_about.c:69 msgid "The Team" @@ -77,7 +77,7 @@ msgid "" "this windowwhich has not yet been saved will be lost!Are you " "sure you want to kill this window?" msgstr "" -"%s を強制終了しようとしています.\n" +"%s を強制終了しようとしています。\n" "警告. このウィンドウにある未保存のデータはすべて消失します!\n" "このウィンドウを強制終了しますか？" @@ -583,11 +583,11 @@ msgstr "ウィンドウ: ウィンドウリスト" #: src/bin/e_actions.c:3772 #, fuzzy msgid "Jump to window..." -msgstr "選択されたウィンドウがあるデスクトップへ移動する" +msgstr "ウィンドウへ移動..." #: src/bin/e_actions.c:3776 -msgid "ウィンドへ移動... またはスタート..." -msgstr "" +msgid "Jump to window... or start..." +msgstr "ウィンドへ移動... またはスタート..." #: src/bin/e_actions.c:3781 src/bin/e_actions.c:3783 src/bin/e_actions.c:3785 #: src/bin/e_actions.c:3791 src/bin/e_actions.c:3793 src/bin/e_actions.c:3795 @@ -1057,12 +1057,12 @@ msgstr "タイトル" #: src/bin/e_comp_wl.c:2992 #, fuzzy, c-format msgid "Enlightenment cannot initialize Wayland client connection.\n" -msgstr "Enlightenment は Wayland クライアント接続を初期化できません.\n" +msgstr "Enlightenment は Wayland クライアント接続を初期化できません。\n" #: src/bin/e_comp_wl.c:3007 #, fuzzy, c-format msgid "Enlightenment cannot create a Wayland Compositor.\n" -msgstr "Enlightenment は Wayland コンポジタの作成ができません." +msgstr "Enlightenment は Wayland コンポジタを作成できません。" #: src/bin/e_comp_x.c:652 #, fuzzy @@ -1076,6 +1076,9 @@ msgid "" "to software engine.You will need an OpenGL 2.0 (or OpenGL ES 2.0) " "capableGPU to use OpenGL with compositing." msgstr "" +"ディスプレイドライバが OpenGL、GLSL シェーダをサポートしていないか、Evas または" +" Ecore-Evas 用の OpenGL エンジンがコンパイルまたはインストールされていません。" +" ソフトウェア エンジンにフォールバックします。" #: src/bin/e_comp_x.c:5865 msgid "Lock Failed" @@ -1087,24 +1090,26 @@ msgid "" "Locking the desktop failed because some applicationhas grabbed either " "the keyboard or the mouse or bothand their grab is unable to be broken." msgstr "" -"キーボードかマウス, またはその両方を掴んで離さないアプリケーションがあるため," -"デスクトップをロックできませんでした." +"キーボードかマウス、またはその両方を掴んで離さないアプリケーションがあり、" +"それを解除できないので、デスクトップのロックに失敗しました。" #: src/bin/e_comp_x.c:5884 msgid "Another compositor is already running on your display server." -msgstr "" +msgstr "別のコンポジタがすでにディスプレイサーバーで実行されています。" #: src/bin/e_comp_x.c:5909 msgid "" "Your display server does not support the compositor overlay window.\n" "This is needed for Enlightenment to function." msgstr "" +"ディスプレイサーバがコンポジタオーバレイ・ウィンドウをサポートしていません。\n" +"これは Enlightenment が機能するのに必要です。" # #: src/bin/e_comp_x.c:6050 #, fuzzy, c-format msgid "Enlightenment cannot initialize X Connection...\n" -msgstr "Enlightenment でファイルマネージャが初期化できません.\n" +msgstr "Enlightenment でファイルマネージャを初期化できません...\n" #: src/bin/e_comp_x.c:6065 msgid "" @@ -1112,23 +1117,28 @@ msgid "" "without XComposite support. Note that for composite support you will also " "need XRender and XFixes support in X11 and Ecore." msgstr "" +"お使いのディスプレイサーバが XComposite をサポートしていないか、Ecore-X が XComposite の" +"サポートなしでビルドされています。コンポジットをサポートするには、X11 と Ecore で " +"XRender と XFixes のサポートも必要です。" #: src/bin/e_comp_x.c:6074 msgid "" "Your display server does not support XDamage or Ecore was built without " "XDamage support." msgstr "" +"ディスプレイサーバが XDamage をサポートしていないか、Ecore が XDamage の" +"サポートなしでビルドされています。" # #: src/bin/e_comp_x.c:6180 #, fuzzy msgid "Enlightenment cannot initialize the XSettings system.\n" -msgstr "Enlightenment でサムネイル処理システムが初期化できません.\n" +msgstr "Enlightenment は XSettings システムを初期化できません。\n" #: src/bin/e_comp_x_randr.c:453 #, fuzzy msgid "Screen setup Error" -msgstr "マウントエラー" +msgstr "画面の設定エラー" #: src/bin/e_comp_x_randr.c:454 msgid "" @@ -1136,6 +1146,9 @@ msgid "" "have. This shouldbe fixed by going to:Settings -> Screen -> " "Screen SetupAnd configure at least one screen to be on." msgstr "" +"あなたからの出力より判断すると、オンに設定されている画面がないようです。" +"これは 設定 -> スクリーン -> スクリーン設定 で、少なくとも1つのスクリーンを" +"オンに設定してください。" #: src/bin/e_comp_x_randr.c:462 src/bin/e_config_dialog.c:274 #: src/bin/e_desktop_editor.c:907 src/bin/e_desktop_editor.c:971 @@ -1158,11 +1171,11 @@ msgstr "了解" #: src/bin/e_config.c:201 msgid "The EET file handle is bad." -msgstr "EETファイルハンドルがおかしいです" +msgstr "EET ファイルハンドルがおかしいです。" #: src/bin/e_config.c:204 msgid "The file data is empty." -msgstr "ファイルデータが空です" +msgstr "ファイルデータが空です。" #: src/bin/e_config.c:207
[EGIT] [enlightenment] 08/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 8d985b8f6ac9365c90af64eb1c7fd1156459fbd5 Author: usergreen AuthorDate: Sat Feb 10 19:20:37 2024 -0800 Update Japanese translation --- po/ja.po | 311 --- 1 file changed, 157 insertions(+), 154 deletions(-) diff --git a/po/ja.po b/po/ja.po index 94ccae760..61b4555b0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2173,12 +2173,12 @@ msgstr "画像を選択" #: src/bin/e_gadcon.c:1458 #, fuzzy msgid "Gadget error" -msgstr "ガジェット・エラー" +msgstr "ガジェットのエラー" #: src/bin/e_gadcon.c:1458 #, c-format msgid "%s does not support disabling autoscrolling" -msgstr "" +msgstr "%s は自動スクロールの無効化をサポートしていません" #: src/bin/e_gadcon.c:1734 src/bin/e_int_client_menu.c:145 msgid "Move to" @@ -2186,7 +2186,7 @@ msgstr "移動先" #: src/bin/e_gadcon.c:1802 msgid "Automatically scroll contents" -msgstr "自動的にスクロールする" +msgstr "コンテンツを自動的にスクロールする" #: src/bin/e_gadcon.c:1815 src/modules/gadman/e_mod_gadman.c:1076 msgid "Plain" @@ -2209,16 +2209,16 @@ msgstr "削除" #: src/bin/e_gadcon.c:2586 #, fuzzy msgid "Stop moving" -msgstr "編集を終了する" +msgstr "移動停止" #: src/bin/e_gadcon.c:3229 msgid "Insufficient gadcon support" -msgstr "" +msgstr "gadcon のサポートが不十分" #: src/bin/e_gadcon.c:3230 #, c-format msgid "Module %s needs to support %s" -msgstr "" +msgstr "モジュール %s は %s をサポートする必要があります" #: src/bin/e_grab_dialog.c:3 #, fuzzy @@ -2226,8 +2226,8 @@ msgid "" "Please press a key combination.Press Escape to " "abort." msgstr "" -"キーシーケンスを押してください.または Escape を押" -"して終了して下さい." +"キーの組み合わせを押してください。または Escape を押" +"すと中止します。" #: src/bin/e_grab_dialog.c:5 #, fuzzy @@ -2236,27 +2236,27 @@ msgid "" ">or roll a wheel to assign mouse binding.Press Escape to abort." msgstr "" -"修飾キーを押しながら, マウスボタンを押すかホイールを回して,マウスバイン" -"ディングを割り当てて下さい.または Escape キー を押し" -"て終了して下さい." +"任意の修飾キーを押しながら任意のマウスボタンを押すか、あるいはホイールを回してマウスバイン" +"ディングを割り当ててください。Escape キー を押す" +"と中止します。" #: src/bin/e_grab_dialog.c:117 #, fuzzy msgid "Mouse Binding Combination" -msgstr "マウスバインドの設定" +msgstr "マウス・バインディングの組み合わせ" #: src/bin/e_grab_dialog.c:124 #, fuzzy msgid "Key Binding Combination" -msgstr "キーバインドの設定" +msgstr "キー・バインディングの組み合わせ" #: src/bin/e_hints.c:186 msgid "" "A previous instance of Enlightenment is still active\n" "on this screen. Aborting startup.\n" msgstr "" -"このスクリーンにはEnlightenmentの前回のインスタンスがまだ残っています.\n" -"起動を中止します.\n" +"この画面には、前回の Enlightenment インスタンスが\n" +"まだ残っています。起動を中止します。\n" #: src/bin/e_import_config_dialog.c:94 msgid "Picture Import Error" @@ -2266,19 +2266,19 @@ msgstr "画像のインポートエラー" #, fuzzy msgid "" "Enlightenment was unable to import the picturedue to conversion errors." -msgstr "画像の変換でエラーが発生したため画像が取り込めませんでした." +msgstr "画像変換でエラーが発生したので、画像を取り込めませんでした。" #: src/bin/e_import_config_dialog.c:175 src/bin/e_import_config_dialog.c:185 #: src/bin/e_import_dialog.c:73 src/bin/e_import_dialog.c:83 #, fuzzy msgid "Import Error" -msgstr "テーマのインポートエラー" +msgstr "インポートのエラー" #: src/bin/e_import_config_dialog.c:176 src/bin/e_import_dialog.c:74 #, fuzzy msgid "Enlightenment was unable to import the imagedue to a copy error." msgstr "" -"コピーでエラーが発生したため Enlightenment でテーマが取り込めませんでした." +"コピーでエラーが発生したので、Enlightenment でテーマをインポートできませんでした。" #: src/bin/e_import_config_dialog.c:186 src/bin/e_import_dialog.c:84 #, fuzzy @@ -2286,22 +2286,22 @@ msgid "" "Enlightenment was unable to import the image.Are you sure this is " "a valid image?" msgstr "" -"Enlightenment でテーマが取り込めませんでしたこれは本当に正しいテーマ" -"ですか？" +"Enlightenment はテーマをインポートできませんでした。" +"これは有効なテーマですか？" #: src/bin/e_import_config_dialog.c:283 #, fuzzy msgid "Import Settings..." -msgstr "画像インポート設定" +msgstr "インポートの設定..." #: src/bin/e_import_config_dialog.c:313 msgid "Fill and Stretch Options" -msgstr "画像の配置方法" +msgstr "塗りつぶしと伸張のオプション" #: src/bin/e_import_config_dialog.c:315 src/modules/vkbd/e_kbd_cfg.c:40 #: src/modules/vkbd/e_kbd_cfg.c:101 src/modules/vkbd/e_kbd_cfg.c:105 msgid "Stretch" -msgstr "変形" +msgstr "伸張" #: src/bin/e_import_config_dialog.c:319 src/bin/e_int_client_menu.c:1196 #: src/bin/e_int_client_prop.c:241 @@ -2321,12 +2321,12 @@ msgstr "等倍" #: src/bin/e_import_config_dialog.c:332 src/modules/vkbd/e_kbd_cfg.c:41 #: src/modules/vkbd/e_kbd_cfg.c:102 src/modules/vkbd/e_kbd_cfg.c:106 msgid "Fill" -msgstr "全面" +msgstr "全面（塗りつぶし）" #: src/bin/e_import_config_dialog.c:336 #, fuzzy msgid "Pan" -msgstr "パン" +msgstr "パン（移動）" #: src/bin/e_import_config_dialog.c:344 msgid "File Quality" @@ -2335,12 +2335,12 @@ msgstr "画質" #: src/bin/e_import_config_dialog.c:345 #, c-format msgid "%3.0f%%" -msgstr "" +msgstr "%3.0f%%" #: src/bin/e_import_config_dialog.c:350 #, fuzzy msgid "Fill Color" -msgstr "配色" +msgstr "配色（塗りつぶしの色）" #: src/bin/e_import_dialog.c:164 msgid "Select a Picture..." @@ -2349,44 +2349,44 @@ msgstr "画像の選択..." #:
[EGIT] [enlightenment] 07/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit bc63d92c8eae52107fb81f06efe50382aadbd95a Author: usergreen AuthorDate: Sat Feb 10 08:25:52 2024 -0800 Update Japanese translation --- po/ja.po | 166 +++ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/po/ja.po b/po/ja.po index c3f47ab44..94ccae760 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1504,17 +1504,17 @@ msgstr "Enlightenment は次のディレクトリへ変更できません:< #, fuzzy, c-format msgid "Enlightenment was unable to restore to directory:%s" msgstr "" -"Enlightenment で以下の子プロセスが fork できませんでした.%s" +"Enlightenment は次のディレクトリに復元できませんでした:%s" #: src/bin/e_exec.c:701 #, fuzzy, c-format msgid "Enlightenment was unable to fork a child process:%s" msgstr "" -"Enlightenment で以下の子プロセスが fork できませんでした.%s" +"Enlightenment は次の子プロセスをフォークできませんでした:%s" #: src/bin/e_exec.c:890 msgid "Application run error" -msgstr "アプリケーション実行エラー" +msgstr "アプリケーションの実行エラー" #: src/bin/e_exec.c:892 #, fuzzy, c-format @@ -1522,37 +1522,37 @@ msgid "" "Enlightenment was unable to run the application:%sThe " "application failed to start." msgstr "" -"Enlightenment で以下のアプリケーションが実行できませんでした." -"%sこのアプリケーションの起動に失敗しました." +"Enlightenment で以下のアプリケーションを実行できませんでした:%s" +"このアプリケーションの起動に失敗しました。" #: src/bin/e_exec.c:1038 msgid "Application Execution Error" -msgstr "アプリケーション実行エラー" +msgstr "アプリケーションの実行エラー" #: src/bin/e_exec.c:1051 src/bin/e_exec.c:1053 #, c-format msgid "%s stopped running unexpectedly." -msgstr "%s が突然停止しました" +msgstr "%s が突然停止しました。" #: src/bin/e_exec.c:1059 #, c-format msgid "An exit code of %i was returned from %s." -msgstr "%2$s から終了コード %1$i が返りました" +msgstr "終了コード %1$i が %s より返りました。" #: src/bin/e_exec.c:1067 #, c-format msgid "%s was interrupted by an Interrupt Signal." -msgstr "%s に割り込みシグナルによる割り込みが入りました" +msgstr "%s は割り込みシグナルによって中断しました。" #: src/bin/e_exec.c:1070 #, c-format msgid "%s was interrupted by a Quit Signal." -msgstr "%s に Quit シグナルによる割り込みが入りました" +msgstr "%s は中止 (Quit) シグナルによって中断しました。" #: src/bin/e_exec.c:1074 #, c-format msgid "%s was interrupted by an Abort Signal." -msgstr "%s に Abort シグナルによる割り込みが入りました" +msgstr "%s は Abort シグナルによって中断しました。" #: src/bin/e_exec.c:1077 #, c-format @@ -1567,7 +1567,7 @@ msgstr "%s に割り込み不能 kill シグナルによる割り込みが入り #: src/bin/e_exec.c:1085 #, c-format msgid "%s was interrupted by a Segmentation Fault." -msgstr "%s にセグメンテーションフォールトによる割り込みが入りました" +msgstr "%s はセグメンテーション障害によって中断しました。" #: src/bin/e_exec.c:1089 #, c-format @@ -1601,7 +1601,7 @@ msgstr "エラーログ" #: src/bin/e_exec.c:1220 src/bin/e_exec.c:1300 msgid "There was no error message." -msgstr "エラーメッセージはありませんでした" +msgstr "エラーメッセージはありません。" #: src/bin/e_exec.c:1224 src/bin/e_exec.c:1307 msgid "Save This Message" @@ -1611,7 +1611,7 @@ msgstr "このメッセージを保存する" #: src/bin/e_exec.c:1315 #, c-format msgid "This error log will be saved as %s/%s.log" -msgstr "このエラーログは %s/%s.log に保存されます" +msgstr "このエラーログを %s/%s.log に保存します" #: src/bin/e_exec.c:1258 msgid "Error Information" @@ -1627,7 +1627,7 @@ msgstr "出力データ" #: src/bin/e_exec.c:1284 msgid "There was no output." -msgstr "出力はありませんでした" +msgstr "出力はありません。" #: src/bin/e_fm.c:1098 msgid "Nonexistent path" @@ -1636,7 +1636,7 @@ msgstr "存在しないパス" #: src/bin/e_fm.c:1101 #, c-format msgid "%s doesn't exist." -msgstr "%s が存在しません" +msgstr "%s が存在しません。" #: src/bin/e_fm.c:2934 src/bin/e_fm.c:3927 #, fuzzy, c-format @@ -1668,7 +1668,7 @@ msgstr "イジェクトエラー" #: src/bin/e_fm.c:3208 msgid "Can't eject device" -msgstr "デバイスをイジェクトできません" +msgstr "デバイスを取り出せません" # #: src/bin/e_fm.c:6714 src/bin/e_fm.c:6749 src/bin/e_fm.c:6852 @@ -1685,11 +1685,11 @@ msgstr "エラー" #: src/bin/e_fm.c:6714 src/bin/e_fm.c:6749 #, c-format msgid "The recent DND operation requested for '%s' has failed." -msgstr "" +msgstr "'%s' に要求した最近の DND 操作は失敗しました。" #: src/bin/e_fm.c:6852 msgid "A link to the requested URL already exists!" -msgstr "" +msgstr "要求のあった URL へのリンクはすでに存在します!" #: src/bin/e_fm.c:8918 src/modules/fileman/e_mod_config.c:375 msgid "Case Sensitive" @@ -1698,16 +1698,16 @@ msgstr "大文字と小文字を区別する" #: src/bin/e_fm.c:8924 src/modules/fileman/e_mod_config.c:378 #, fuzzy msgid "Sort By Extension" -msgstr "拡張子を表示する" +msgstr "拡張子で並べ替え" #: src/bin/e_fm.c:8930 src/modules/fileman/e_mod_config.c:381 msgid "Sort By Modification Time" -msgstr "" +msgstr "修正時刻で並べ替え" #: src/bin/e_fm.c:8936 src/modules/fileman/e_mod_config.c:384 #, fuzzy msgid "Sort By Size" -msgstr "日付で整列" +msgstr "日付で並べ替え" #: src/bin/e_fm.c:8945 src/modules/fileman/e_mod_config.c:392 #, fuzzy @@ -1728,7 +1728,7 @@ msgstr "表示モード" #: src/modules/everything/evry_config.c:501 #: src/modules/fileman/e_mod_config.c:400 msgid "Sorting" -msgstr "整列" +msgstr "並べ替え" #: src/bin/e_fm.c:9009 src/bin/e_fm.c:9158 msgid "Refresh View" @@ -1736,12 +1736,12 @@ msgstr
[EGIT] [enlightenment] 11/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 406ea43e4a5d8c941d5965d03b9f8dd6146b173c Author: usergreen AuthorDate: Sun Feb 11 19:19:30 2024 -0800 Update Japanese translation --- po/ja.po | 168 +-- 1 file changed, 98 insertions(+), 70 deletions(-) diff --git a/po/ja.po b/po/ja.po index bec50e334..fabe55595 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1642,8 +1642,8 @@ msgstr "%s が存在しません。" #, fuzzy, c-format msgid "%u file" msgid_plural "%u files" -msgstr[0] "%u 個" -msgstr[1] "%u 個" +msgstr[0] "%u ファイル" +msgstr[1] "%u ファイル" #: src/bin/e_fm.c:3177 msgid "Mount Error" @@ -1712,12 +1712,12 @@ msgstr "日付で並べ替え" #: src/bin/e_fm.c:8945 src/modules/fileman/e_mod_config.c:392 #, fuzzy msgid "Directories First" -msgstr "検索パス" +msgstr "ディレクトリを最初に" #: src/bin/e_fm.c:8951 src/modules/fileman/e_mod_config.c:396 #, fuzzy msgid "Directories Last" -msgstr "検索パス" +msgstr "ディレクトリを最後に" #: src/bin/e_fm.c:8982 src/bin/e_fm.c:9131 #: src/modules/fileman/e_mod_config.c:317 @@ -1732,7 +1732,7 @@ msgstr "並べ替え" #: src/bin/e_fm.c:9009 src/bin/e_fm.c:9158 msgid "Refresh View" -msgstr "内容を更新する" +msgstr "表示を更新する" #: src/bin/e_fm.c:9020 src/bin/e_fm.c:9170 msgid "New..." @@ -2484,7 +2484,7 @@ msgstr "ウィンドウ" #: src/modules/conf_randr/e_int_config_randr2.c:1110 #, fuzzy msgid "Align" -msgstr "配置" +msgstr "整列" #: src/bin/e_int_client_menu.c:163 src/bin/e_int_client_menu.c:1370 #, fuzzy @@ -2587,7 +2587,7 @@ msgstr "ICCCM/NetWM" #: src/bin/e_int_client_menu.c:1031 src/bin/e_int_client_menu.c:1190 msgid "Alignment" -msgstr "配置" +msgstr "アライメント（整列）" #: src/bin/e_int_client_menu.c:1032 msgid "Click an object to align with." @@ -2636,7 +2636,7 @@ msgstr "画面 %d" #: src/modules/notification/e_mod_config.c:104 #, c-format msgid "Normal" -msgstr "通常" +msgstr "標準" #: src/bin/e_int_client_menu.c:1392 msgid "Always Below" @@ -2852,7 +2852,7 @@ msgstr "基本サイズ" #: src/bin/e_int_client_prop.c:462 msgid "Resize Steps" -msgstr "サイズ増分" +msgstr "" #: src/bin/e_int_client_prop.c:463 src/modules/vkbd/e_kbd_cfg.c:162 #: src/modules/wizard/page_050.c:129 @@ -2883,7 +2883,7 @@ msgstr "ウィンドウグループ" #: src/bin/e_int_client_prop.c:471 #, fuzzy msgid "Transient For" -msgstr "過渡" +msgstr "" #: src/bin/e_int_client_prop.c:472 msgid "Client Leader" @@ -4055,104 +4055,104 @@ msgstr "Enlightenment で初期画面を設定できません。" #: src/bin/e_main.c:880 #, fuzzy msgid "Enlightenment cannot configure the backlight.\n" -msgstr "Enlightenment で DPMS が設定できません." +msgstr "Enlightenment でバックライトを設定できません。" #: src/bin/e_main.c:888 #, fuzzy msgid "Enlightenment cannot configure the DPMS settings.\n" -msgstr "Enlightenment で DPMS が設定できません." +msgstr "Enlightenment で DPMS の設定を行えません。" #: src/bin/e_main.c:897 #, fuzzy msgid "Enlightenment cannot set up its desk locking system.\n" -msgstr "Enlightenment で デスクロックシステムが準備できません." +msgstr "Enlightenment で デスクロックシステムを設定できません。" # #: src/bin/e_main.c:917 msgid "Enlightenment cannot initialize the System Command system.\n" -msgstr "Enlightenment でシステムコマンドの処理システムが初期化できません.\n" +msgstr "Enlightenment でシステムコマンド・システムを初期化できません。\n" #: src/bin/e_main.c:926 #, fuzzy msgid "Enlightenment cannot set up its exec system.\n" -msgstr "Enlightenment で exec システムが準備できません." +msgstr "Enlightenment でその実行システムを設定できません。" # #: src/bin/e_main.c:938 msgid "Enlightenment cannot initialize the File manager.\n" -msgstr "Enlightenment でファイルマネージャが初期化できません.\n" +msgstr "Enlightenment でファイルマネージャを初期化できません。\n" #: src/bin/e_main.c:947 #, fuzzy msgid "Enlightenment cannot set up its msg system.\n" -msgstr "Enlightenment で メッセージシステムが準備できません." +msgstr "Enlightenment で メッセージシステムを設定できません。" #: src/bin/e_main.c:956 #, fuzzy msgid "Enlightenment cannot set up its grab input handling system.\n" -msgstr "Enlightenment で入力グラブ処理システムが準備できません." +msgstr "Enlightenment でg rab 入力処理システムを設定できません。" #: src/bin/e_main.c:965 src/bin/e_main.c:1107 #, fuzzy msgid "Enlightenment cannot set up its module system.\n" -msgstr "Enlightenment でモジュールシステムが準備できません." +msgstr "Enlightenment でモジュールシステムを設定できません。" #: src/bin/e_main.c:974 #, fuzzy msgid "Enlightenment cannot setup remember settings.\n" -msgstr "Enlightenment で記憶機能の設定が準備できません." +msgstr "Enlightenment で記憶の設定ができません。" #: src/bin/e_main.c:983 #, fuzzy msgid "Enlightenment cannot set up its gadget control system.\n" -msgstr "Enlightenment でガジェット管理システムが準備できません." +msgstr "Enlightenment でガジェット制御システムを設定できません。" #: src/bin/e_main.c:992 #, fuzzy msgid "Enlightenment cannot set up its toolbars.\n" -msgstr "Enlightenment で国際化システムが準備できません." +msgstr "Enlightenment でツールバーの設定ができません。" #: src/bin/e_main.c:1001 #, fuzzy msgid "Enlightenment cannot set up its desktop background system.\n" -msgstr "Enlightenment でデスクトップ背景システムが準備できません." +msgstr "Enlightenment でデスクトップ背景のシステムを設定できません。" #:
[EGIT] [enlightenment] 06/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 2cfcc1a94ae158de951107fc175c74620b4f545a Author: usergreen AuthorDate: Sat Feb 10 02:56:20 2024 -0800 Update Japanese translation --- po/ja.po | 67 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1600f77d9..c3f47ab44 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1188,7 +1188,7 @@ msgstr "" #: src/bin/e_config.c:210 #, fuzzy msgid "Memory ran out while preparing the write.Please free up memory." -msgstr "書き出し準備中にメモリ不足になりました。メモリ解放してください。" +msgstr "書き出し準備中にメモリ不足になりました。メモリを解放してください。" #: src/bin/e_config.c:213 #, fuzzy @@ -1271,11 +1271,11 @@ msgid "" "the hiccup in your settings." msgstr "" "設定情報の更新が必要です。それまでの古い設定情報は消去され、新しい既定" -"の設定で初期化されました。これは開発中、定期的に行なわれるものですので、" -"バグ報告しないでください。つまり, Enlightenment で既定で使用する新しい諸機能に" -"必要な新規設定が、それまでの古い設定に存在しないからです。この新しい" -"既定の設定を追加すれば、解消されます。これでお好きなように設定可能になります。" -"お手数をお掛けしますが、よろしくお願いします。" +"の設定で初期化されました。これは開発中、定期的に行なわれるものですので、" +"バグ報告しないでください。つまり, Enlightenment で既定で使用する新しい諸機能に" +"必要な新規設定が、それまでの古い設定に存在しないからです。この新しい" +"既定の設定を追加すれば、解消されます。これでお好きなように設定可能になります。" +"お手数をお掛けしますが、よろしくお願いします。" #: src/bin/e_config.c:1297 #, fuzzy @@ -1286,11 +1286,11 @@ msgid "" "running. This is bad andas a precaution your settings have been now " "restored todefaults. Sorry for the inconvenience." msgstr "" -"設定が Enlightenment よりも新しくなっています. これは極めて不自然です." -"Enlightenment をダウングレードするとか, 新しいバージョンの " -"Enlightenmentが動いていたところから設定をコピーしない限りあり得ません." -"これではまずいので, 念のためデフォルトの設定に置き換えました.ご不便を" -"おかけしますが, よろしくお願いします." +"システム設定が現在の Enlightenment よりも新しくなっています。これはとても奇妙です。" +"Enlightenment をダウングレードするとか、新しいバージョンの " +"Enlightenmentが動いていたところから設定をコピーしない限りあり得ません。" +"この状況では不都合なため、すでに既定の設定へ復元しました.ご不便を" +"おかけして申しわけありません。" #: src/bin/e_config.c:1413 msgid "" @@ -1298,10 +1298,13 @@ msgid "" "As a result, all bindings have been reloaded from defaults.Sorry " "for the inconvenience." msgstr "" +"バインディングの設定バージョンが現在の設定バージョンと一致しません。" +"その結果、すべてのバインディングを既定から再読み込みしました。" +"ご迷惑をおかけして申し訳ありません。" #: src/bin/e_config.c:2720 msgid "Settings Upgraded" -msgstr "設定が更新されました" +msgstr "設定を更新しました" #: src/bin/e_config_dialog.c:222 src/modules/battery/e_mod_main.c:1100 #: src/modules/conf_bindings/e_mod_main.c:43 src/modules/conf/e_mod_main.c:278 @@ -1349,12 +1352,12 @@ msgstr "内部" #: src/bin/e_configure.c:36 #, fuzzy msgid "Composite Style Settings" -msgstr "位置" +msgstr "コンポジット・スタイルの設定" #: src/bin/e_configure.c:408 #, fuzzy msgid "Preferences" -msgstr "アイコン・プリファレンス" +msgstr "設定" # #: src/bin/e_desk.c:123 src/bin/e_desk.c:185 src/bin/e_desk.c:242 @@ -1362,22 +1365,22 @@ msgstr "アイコン・プリファレンス" #: src/modules/conf_display/e_int_config_desk.c:117 #, fuzzy, c-format msgid "Desktop %d,%d" -msgstr "デスクトップ %i,%i" +msgstr "デスクトップ %d,%d%" #: src/bin/e_desklock.c:235 msgid "Error - no PAM support" -msgstr "エラー - PAMがサポートされていません" +msgstr "エラー - PAM 非対応" #: src/bin/e_desklock.c:236 #, fuzzy msgid "" "No PAM support was built into Enlightenment, sodesk locking is disabled." msgstr "" -"EnlightenmentにPAMサポートが組み込まれていないため, デスクロックは無効です." +"Enlightenment では PAM に対応していないので、デスクロックは無効です。" #: src/bin/e_desktop_editor.c:212 msgid "Incomplete Window Properties" -msgstr "ウィンドウプロパティが不完全です" +msgstr "ウィンドウ・プロパティが不完全です" #: src/bin/e_desktop_editor.c:213 #, fuzzy @@ -1387,15 +1390,14 @@ msgid "" "title instead. This will onlywork if the window title is the same atthe time the window starts up, and does notchange." msgstr "" -"アイコンを作ろうとしているウィンドウにはウィンドウ名とウィンドウクラスの" -"プロパティがないので, そのウィンドウで使われるアイコンに必要なプロパティ" -"が分かりません.代わりにウィンドウタイトルを使う必要があります.ただし" -"これがうまくいくのは, ウィンドウのタイトルが起動時と同じで,変わっていない" -"場合だけです." +"あなたがアイコンを作成しているウィンドウには、ウィンドウ名とウィンドウクラスの" +"プロパティがありません。そのため、代わりにウィンドウ・タイトルを使う必要があります。" +"しかし、これが働くのはウィンドウ・タイトルがそのウィンドウの起動時と同じで、" +"変更のない場合だけです." #: src/bin/e_desktop_editor.c:265 msgid "Desktop Entry Editor" -msgstr "デスクトップエントリエディタ" +msgstr "デスクトップエントリ・エディタ" #: src/bin/e_desktop_editor.c:717 src/bin/e_int_client_prop.c:451 #: src/bin/e_int_client_prop.c:505 src/bin/e_int_config_comp_match.c:380 @@ -1408,7 +1410,7 @@ msgstr "名前" #: src/bin/e_desktop_editor.c:728 src/modules/ibar/e_mod_config.c:138 msgid "Comment" -msgstr "注釈" +msgstr "コメント" #: src/bin/e_desktop_editor.c:750 #, fuzzy @@ -1424,7 +1426,7 @@ msgstr "アイコン" #: src/bin/e_desktop_editor.c:791 msgid "Generic Name" -msgstr "一般名称" +msgstr "一般名" #: src/bin/e_desktop_editor.c:797 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:121 @@ -1442,7 +1444,7 @@ msgstr "MIME タイプ" # #: src/bin/e_desktop_editor.c:817 msgid "Desktop file" -msgstr "desktop ファイル" +msgstr "デスクトップ・ファイル" #: src/bin/e_desktop_editor.c:827 src/bin/e_fm_prop.c:501 #: src/bin/e_int_client_prop.c:456 src/bin/e_int_client_prop.c:508 @@ -1461,7 +1463,7 @@ msgstr "起動通知" #:
[EGIT] [enlightenment] 10/16: Update Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 19a716f078d6c4a915ccc75677d5427095a30e5c Author: usergreen AuthorDate: Sun Feb 11 03:27:08 2024 -0800 Update Japanese translation --- po/ja.po | 264 +++ 1 file changed, 128 insertions(+), 136 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0f460a870..bec50e334 100644 --- a/po/ja.po +++ b/po/ja.po @@ -83,7 +83,7 @@ msgstr "" #: src/bin/e_actions.c:364 msgid "Are you sure you want to kill this window?" -msgstr "本当にこのウィンドウを強制終了しますか?" +msgstr "本当にこのウィンドウを強制終了しますか？" #: src/bin/e_actions.c:367 src/bin/e_actions.c:3536 #: src/bin/e_int_client_menu.c:854 @@ -200,7 +200,7 @@ msgstr "プロファイルの選択" #: src/bin/e_actions.c:3886 src/bin/e_actions.c:3892 #: src/modules/shot/e_mod_main.c:366 msgid "Window : Actions" -msgstr "ウィンドウ: 動作" +msgstr "ウィンドウ : 動作" #: src/bin/e_actions.c:3491 src/bin/e_fm.c:11837 msgid "Move" @@ -578,7 +578,7 @@ msgstr "指定のデスクトップに切り替える(全スクリーン)" #: src/modules/winlist/e_mod_main.c:63 src/modules/winlist/e_mod_main.c:65 #: src/modules/winlist/e_mod_main.c:67 msgid "Window : List" -msgstr "ウィンドウ: ウィンドウリスト" +msgstr "ウィンドウ : リスト" #: src/bin/e_actions.c:3772 #, fuzzy @@ -644,17 +644,17 @@ msgstr "バックライトの設定" #: src/bin/e_actions.c:3808 #, fuzzy msgid "Backlight Min" -msgstr "バックライトを最小" +msgstr "バックライト最小" #: src/bin/e_actions.c:3810 #, fuzzy msgid "Backlight Mid" -msgstr "バックライトは中間" +msgstr "バックライト中間" #: src/bin/e_actions.c:3812 #, fuzzy msgid "Backlight Max" -msgstr "バックライトを最大" +msgstr "バックライト最大" #: src/bin/e_actions.c:3815 #, fuzzy @@ -755,7 +755,7 @@ msgstr "前のデスクトップへ" #: src/bin/e_actions.c:3901 msgid "By Desktop #..." -msgstr "指定分のデスクトップを移動" +msgstr "" #: src/bin/e_actions.c:3907 msgid "To Desktop..." @@ -775,7 +775,7 @@ msgstr "前のデスクトップへ" #: src/bin/e_actions.c:3929 src/bin/e_actions.c:3932 src/bin/e_actions.c:3935 #, fuzzy msgid "Window : Focus" -msgstr "ウィンドウフォーカス" +msgstr "ウィンドウ : フォーカス" # #: src/bin/e_actions.c:3921 @@ -861,16 +861,16 @@ msgstr "今すぐ終了" #: src/bin/e_actions.c:3986 src/bin/e_actions.c:3990 src/bin/e_actions.c:3994 #, fuzzy msgid "Enlightenment : Module" -msgstr "Enlightenment : モード" +msgstr "Enlightenment : モジュール" #: src/bin/e_actions.c:3987 #, fuzzy msgid "Enable the named module" -msgstr "Enlightenment Randr モジュール" +msgstr "指定のモジュールを有効にする" #: src/bin/e_actions.c:3991 msgid "Disable the named module" -msgstr "指定したモジュールを無効化" +msgstr "指定のモジュールを無効にする" #: src/bin/e_actions.c:3995 #, fuzzy @@ -936,7 +936,7 @@ msgstr "ウィンドウのクリーンアップ" #: src/bin/e_actions.c:4053 msgid "Generic : Actions" -msgstr "全般: 動作" +msgstr "全般 : 動作" #: src/bin/e_actions.c:4053 msgid "Delayed Action" @@ -1188,7 +1188,7 @@ msgstr "" #: src/bin/e_config.c:210 #, fuzzy msgid "Memory ran out while preparing the write.Please free up memory." -msgstr "書き出し準備中にメモリ不足になりました。メモリを解放してください。" +msgstr "書き出し準備中にメモリ不足となりました。メモリを解放してください。" #: src/bin/e_config.c:213 #, fuzzy @@ -1201,7 +1201,7 @@ msgid "" "The settings file is too large.It should be very small (a few hundred " "KB at most)." msgstr "" -"設定ファイルが大きすぎます。もっと小さいはずです (最大で数百KB程度です)。" +"設定ファイルが大きすぎます。もっと小さくしてください (最大でも数百KB程度です）。" #: src/bin/e_config.c:219 #, fuzzy @@ -1257,7 +1257,7 @@ msgstr "復号化に失敗しました。" #: src/bin/e_config.c:255 msgid "The error is unknown to Enlightenment." -msgstr "Enlightenment にとって未知のエラーです。" +msgstr "Enlightenment にとって不明なエラーです。" #: src/bin/e_config.c:1280 #, fuzzy @@ -1572,7 +1572,7 @@ msgstr "%s はセグメンテーション障害によって中断しました。 #: src/bin/e_exec.c:1089 #, c-format msgid "%s was interrupted by a Broken Pipe." -msgstr "%s に Broken Pipe による割り込みが入りました" +msgstr "%s は壊れたパイプによって中断されました。" #: src/bin/e_exec.c:1092 #, c-format @@ -1592,7 +1592,7 @@ msgstr "%s にシグナル番号 %i の割り込みが入りました" #: src/bin/e_exec.c:1155 msgid "" "***The remaining output has been truncated. Save the output to view.***\n" -msgstr "***残りは切り捨てられました. 出力を保存してから参照してください.***\n" +msgstr "***残りの出力は切り捨てられました。出力を保存した後でご覧ください。***\n" # #: src/bin/e_exec.c:1214 src/bin/e_exec.c:1292 src/bin/e_exec.c:1299 @@ -1642,8 +1642,8 @@ msgstr "%s が存在しません。" #, fuzzy, c-format msgid "%u file" msgid_plural "%u files" -msgstr[0] "%1.0f 個" -msgstr[1] "%1.0f 個" +msgstr[0] "%u 個" +msgstr[1] "%u 個" #: src/bin/e_fm.c:3177 msgid "Mount Error" @@ -1664,7 +1664,7 @@ msgstr "デバイスをアンマウントできません" # #: src/bin/e_fm.c:3208 msgid "Eject Error" -msgstr "イジェクトエラー" +msgstr "取り出しエラー" #: src/bin/e_fm.c:3208 msgid "Can't eject device" @@ -1807,11 +1807,11 @@ msgstr "プロパティ" #: src/bin/e_fm.c:9397 msgid "Application Properties" -msgstr "アプリケーション・プロパティ" +msgstr "アプリケーションのプロパティ" #: src/bin/e_fm.c:9405 src/bin/e_fm_prop.c:119 msgid "File Properties" -msgstr "ファイル・プロパティ" +msgstr "ファイルのプロパティ" #: src/bin/e_fm.c:9609 msgid "Use default" @@ -1867,7 +1867,7 @@ msgstr
[EGIT] [enlightenment] 16/16: Fix fatal error in Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 7dbfdfc847b8e5e9f67f8d5df0ceaea01505a557 Author: usergreen AuthorDate: Sun Feb 25 03:09:57 2024 -0800 Fix fatal error in Japanese translation --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 82dbfd55c..0ec8daabe 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7415,7 +7415,7 @@ msgstr "構成済みシェルフ： 表示 %d" #: src/modules/conf_shelves/e_int_config_shelf.c:393 #, fuzzy, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "本当に \"%s\ を削除しますか？" +msgstr "本当に \"%s\"を削除しますか？" # #: src/modules/conf_shelves/e_int_config_shelf.c:396 -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [enlightenment] 01/16: Updated Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 53916a690c03f13abdea206e9023bda2c6be1c72 Author: usergreen AuthorDate: Sun Aug 27 03:10:39 2023 -0700 Updated Japanese translation --- po/ja.po | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 285ea17bb..ee2cc6a71 100644 --- a/po/ja.po +++ b/po/ja.po @@ -46,16 +46,20 @@ msgid "" "writing it.To contact us please visit:http://www." "enlightenment.org" msgstr "" +"Copyright 2000-2023, Enable 開発チーム+">私たちがこのソフトの執筆を楽しんでいるのと同じように、あなたがこのソフトを" +"使って楽しんでくださることを願っています。私たちと連絡を取りたい場合は、" +http://www.""enlightenment.org を訪れてください。" #: src/bin/e_about.c:69 msgid "The Team" -msgstr "" +msgstr "チーム" # #: src/bin/e_acpi.c:138 #, fuzzy msgid "ACPI Error" -msgstr "エラー" +msgstr "ACPI エラー" #: src/bin/e_acpi.c:139 msgid "" -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [enlightenment] 03/16: Updated Japanese translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit c8973857ba124620e7bb23f5c9cdda01aa7d096c Author: usergreen AuthorDate: Sun Aug 27 04:31:17 2023 -0700 Updated Japanese translation --- po/ja.po | 108 --- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/po/ja.po b/po/ja.po index e6e030097..58a510b93 100644 --- a/po/ja.po +++ b/po/ja.po @@ -67,6 +67,8 @@ msgid "" "not seem to be running orcontactable. Perhaps enable the acpidservice on your system?" msgstr "" +"ACPI ベースのシステムをお持ちのようですが、acpid は実行されて" +"おらず、連絡も取れません。システムの acpid サービスを有効にしてください。" #: src/bin/e_actions.c:352 #, fuzzy, c-format @@ -100,7 +102,7 @@ msgstr "いいえ" #: src/bin/e_actions.c:2152 #, fuzzy msgid "Action Params Syntax Error" -msgstr "アクションパラメータ" +msgstr "アクションパラメータのシンタックスエラー" #: src/bin/e_actions.c:2267 src/bin/e_actions.c:3977 src/bin/e_int_menus.c:280 msgid "Exit" @@ -158,12 +160,12 @@ msgstr "本当にログアウトしますか" #: src/bin/e_actions.c:2623 src/bin/e_actions.c:4027 #: src/modules/conf_bindings/e_int_config_acpibindings.c:379 msgid "Hibernate" -msgstr "ハイバネート" +msgstr "休止状態" #: src/bin/e_actions.c:2624 #, fuzzy msgid "Are you sure you want to hibernate your computer?" -msgstr "本当にハイバネートしますか" +msgstr "本当にシステムを休止しますか？" #: src/bin/e_actions.c:3269 #, fuzzy @@ -173,7 +175,7 @@ msgstr "エラー情報" #: src/bin/e_actions.c:3270 #, c-format msgid "Invalid parameter: %s" -msgstr "" +msgstr "無効なパラメータ: %s" #: src/bin/e_actions.c:3408 #, fuzzy @@ -183,7 +185,7 @@ msgstr "マウスの設定" #: src/bin/e_actions.c:3409 #, fuzzy msgid "Mouse to key" -msgstr "マウスの設定" +msgstr "マウスキーの設定" #: src/bin/e_actions.c:3472 #, fuzzy @@ -258,7 +260,7 @@ msgstr "アイコンモード反転" #: src/bin/e_actions.c:3554 #, fuzzy msgid "Iconic Mode Enable" -msgstr "アイコンモード反転" +msgstr "アイコンモードの有効化" #: src/bin/e_actions.c:3559 msgid "Fullscreen Mode Toggle" @@ -267,7 +269,7 @@ msgstr "全画面モード反転" #: src/bin/e_actions.c:3563 #, fuzzy msgid "Fullscreen Mode Enable" -msgstr "全画面モード反転" +msgstr "全画面モードの有効化" #: src/bin/e_actions.c:3568 src/bin/e_int_client_menu.c:441 #: src/bin/e_int_client_menu.c:749 @@ -277,31 +279,31 @@ msgstr "最大化" # #: src/bin/e_actions.c:3570 src/bin/e_int_client_menu.c:452 msgid "Maximize Vertically" -msgstr "垂直に最大化" +msgstr "垂直方向に最大化" # #: src/bin/e_actions.c:3573 src/bin/e_int_client_menu.c:463 msgid "Maximize Horizontally" -msgstr "水平に最大化" +msgstr "水平方向に最大化" #: src/bin/e_actions.c:3576 src/bin/e_int_client_menu.c:474 #, fuzzy msgid "Maximize Left" -msgstr "最大化" +msgstr "左側に最大化" #: src/bin/e_actions.c:3579 src/bin/e_int_client_menu.c:485 #, fuzzy msgid "Maximize Right" -msgstr "最大化" +msgstr "右側に最大化" #: src/bin/e_actions.c:3582 msgid "Maximize Fullscreen" -msgstr "全面表示" +msgstr "全画面表示" # #: src/bin/e_actions.c:3584 msgid "Maximize Mode \"Smart\"" -msgstr "最大化モード \"賢く\"" +msgstr "最大化モード \"スマート\"" #: src/bin/e_actions.c:3586 msgid "Maximize Mode \"Expand\"" @@ -354,7 +356,7 @@ msgstr "ボーダー" #: src/bin/e_actions.c:3623 #, fuzzy msgid "Cycle between Borders" -msgstr "国境の間にサイクル" +msgstr "ボーダーの間でサイクル" #: src/bin/e_actions.c:3629 msgid "Toggle Pinned State" @@ -387,36 +389,36 @@ msgstr "デスクトップ" #: src/bin/e_actions.c:3634 msgid "Flip Desktop Left" -msgstr "左のデスクトップへ移動する" +msgstr "デスクトップを左に反転する" #: src/bin/e_actions.c:3636 msgid "Flip Desktop Right" -msgstr "右のデスクトップへ移動する" +msgstr "デスクトップを右に反転する" #: src/bin/e_actions.c:3638 msgid "Flip Desktop Up" -msgstr "上のデスクトップへ移動する" +msgstr "デスクトップを上方に反転する" #: src/bin/e_actions.c:3640 msgid "Flip Desktop Down" -msgstr "下のデスクトップへ移動する" +msgstr "デスクトップを下方へ反転する" #: src/bin/e_actions.c:3642 msgid "Flip Desktop By..." -msgstr "デスクトップを指定分移動する" +msgstr "デスクトップの反転を指定する" #: src/bin/e_actions.c:3648 #, fuzzy msgid "Flip To Previous Desktop" -msgstr "前のデスクトップへ" +msgstr "前のデスクトップへ戻る" #: src/bin/e_actions.c:3653 msgid "Show The Desktop" -msgstr "デスクトップ背景を出す" +msgstr "デスクトップを表示する" #: src/bin/e_actions.c:3659 msgid "Show The Shelf" -msgstr "シェルフを出す" +msgstr "シェルフを表示する" #: src/bin/e_actions.c:3664 msgid "Flip Desktop To..." @@ -627,12 +629,12 @@ msgstr "マウスを指定のスクリーン分だけ前後に移す..." #: src/bin/e_actions.c:3800 #, fuzzy msgid "Dim" -msgstr "薄暗い" +msgstr "暗くする" #: src/bin/e_actions.c:3803 #, fuzzy msgid "Undim" -msgstr "Undim" +msgstr "明るくする" #: src/bin/e_actions.c:3806 #, fuzzy @@ -642,51 +644,51 @@ msgstr "バックライトのセット" #: src/bin/e_actions.c:3808 #, fuzzy msgid "Backlight Min" -msgstr "バックライト最小" +msgstr "バックライトを最小" #: src/bin/e_actions.c:3810 #, fuzzy msgid "Backlight Mid" -msgstr "バックライトミッド" +msgstr "バックライトは中間" #: src/bin/e_actions.c:3812 #, fuzzy msgid "Backlight Max" -msgstr "バックライト最大" +msgstr "バックライトを最大" #: src/bin/e_actions.c:3815 #, fuzzy msgid "Backlight Adjust" -msgstr "バックライトが調整" +msgstr "バックライトの調整" #: src/bin/e_actions.c:3817
[EGIT] [enlightenment] 02/16: Fixed typo
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit ce2269617743d06c112ebab78d7f38d20f608dab Author: usergreen AuthorDate: Sun Aug 27 03:14:04 2023 -0700 Fixed typo --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index ee2cc6a71..e6e030097 100644 --- a/po/ja.po +++ b/po/ja.po @@ -46,7 +46,7 @@ msgid "" "writing it.To contact us please visit:http://www." "enlightenment.org" msgstr "" -"Copyright 2000-2023, Enable 開発チーム+"Copyright 2000-2023, Enlightenment 開発チーム ">私たちがこのソフトの執筆を楽しんでいるのと同じように、あなたがこのソフトを" "使って楽しんでくださることを願っています。私たちと連絡を取りたい場合は、" http://www.""enlightenment.org を訪れてください。" -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [www-content] 01/01: fix some typos
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository www-content. View the commit online. commit 91b422565d3e3713cf9d06ce79559acacda02a82 Author: tangcl AuthorDate: Sun Jan 21 23:03:09 2024 +0800 fix some typos --- pages/develop/tutorials/c/hello-world-gui.md.txt | 2 +- pages/develop/tutorials/c/hello-world.md.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/develop/tutorials/c/hello-world-gui.md.txt b/pages/develop/tutorials/c/hello-world-gui.md.txt index fa00a78c5..2598e2663 100644 --- a/pages/develop/tutorials/c/hello-world-gui.md.txt +++ b/pages/develop/tutorials/c/hello-world-gui.md.txt @@ -107,7 +107,7 @@ So far ``_gui_setup`` is empty. Create a window by adding the following lines wi As far as EFL is concerned, a window is just another object. You can declare it with ``Eo *win;``. The ``Eo`` type is the base object system for EFL. Most graphical elements such as windows, text boxes, buttons, sliders, etc. are ``Eo`` objects. You can give your window any name you wish but for now call it ``win``for simplicity's sake. -The next part of the code defines the window itself. The ``efl_add()`` method creates a new object of the class specified in the first parameter and puts it inside the already existing object specified in the second parameter. In an EFL graphical application widgets are inserted inside other objects. For example, you can place a text object inside a text box inside a window and so on. In this case we want to create a window (``EFL_UI_WIN _CLASS``) which must be a child of the application [...] +The next part of the code defines the window itself. The ``efl_add()`` method creates a new object of the class specified in the first parameter and puts it inside the already existing object specified in the second parameter. In an EFL graphical application widgets are inserted inside other objects. For example, you can place a text object inside a text box inside a window and so on. In this case we want to create a window (``EFL_UI_WIN_CLASS``) which must be a child of the application' [...] The rest of the parameters of ``efl_add()`` are a list of methods that will be called in order, normally to configure the object we have just created. You can add as many configuration methods as you want in this list and can use the special symbol ``efl_added`` to refer to the created object if you need to. diff --git a/pages/develop/tutorials/c/hello-world.md.txt b/pages/develop/tutorials/c/hello-world.md.txt index 90a122fa3..d09ca97e5 100644 --- a/pages/develop/tutorials/c/hello-world.md.txt +++ b/pages/develop/tutorials/c/hello-world.md.txt @@ -149,7 +149,7 @@ The ``Efl_Event`` structure contains an array with all the command line paramete Finally, the array can be found in ``args->argv``. Arrays in EFL are handled with the ``Eina_Array`` type, so you can use ``eina_array_count()`` to retrieve the number of elements in an array and ``eina_array_data_get()`` to access the contents of the array. -In the above example, if no parameters are passed to your program (``eina_array_count(args->argv) == 0``), it just prints "Hello World!". Otherwise, the first parameter is retrieved and printed. Try compiling again your program and running it with your name as the first parameter: +In the above example, if no parameters are passed to your program (``eina_array_count(args->argv) == 1``), it just prints "Hello World!". Otherwise, the first parameter is retrieved and printed. Try compiling again your program and running it with your name as the first parameter: ```bash ./hello-world Mike -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efl] 01/03: efl_ui_slider: fix the error when scrolling.
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit c6b6f4d4646a92a3ecb8497c7825f8e42e33e2a9
Author: dimmus
AuthorDate: Tue Aug 15 18:11:47 2023 +0500
efl_ui_slider: fix the error when scrolling.
When we use efl_ui_textbox and efl_ui_slider simultaneously, the slider invokes the general widget's scrolling hold and freeze behavior, which calls of the textbox's scrolling functions with an obvious error: sd->scroller = NULL. So switch off that in the slider and don't notice any lack of functionality.
Saved sd->freeze as a flag for future use.
Test: elementary_test -to Efl.Ui.Slider (before and after).
---
src/lib/elementary/efl_ui_slider.c | 38 ++
1 file changed, 2 insertions(+), 36 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 041316de68..dede87ce9d 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -179,7 +179,6 @@ _drag_start(void *data,
elm_object_focus_set(data, EINA_TRUE);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
_drag_value_fetch(data);
- elm_widget_scroll_freeze_push(data);
}
static void
@@ -190,7 +189,6 @@ _drag_stop(void *data,
{
_drag_value_fetch(data);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
- elm_widget_scroll_freeze_pop(data);
}
static void
@@ -505,10 +503,7 @@ _spacer_move_cb(void *data,
if (d > (_elm_config->thumbscroll_threshold - 1))
{
if (!sd->frozen)
- {
- elm_widget_scroll_freeze_push(data);
- sd->frozen = EINA_TRUE;
- }
+ sd->frozen = EINA_TRUE;
ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
}
@@ -519,10 +514,7 @@ _spacer_move_cb(void *data,
efl_event_callback_call
(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
- {
- elm_widget_scroll_freeze_pop(data);
- sd->frozen = EINA_FALSE;
- }
+sd->frozen = EINA_FALSE;
return;
}
if (_is_horizontal(sd->dir))
@@ -560,28 +552,7 @@ _spacer_up_cb(void *data,
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
- {
-elm_widget_scroll_freeze_pop(data);
sd->frozen = EINA_FALSE;
- }
-}
-
-static void
-_mouse_in_cb(void *data EINA_UNUSED,
- Evas *e EINA_UNUSED,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- efl_ui_widget_scroll_hold_push(obj);
-}
-
-static void
-_mouse_out_cb(void *data EINA_UNUSED,
- Evas *e EINA_UNUSED,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- efl_ui_widget_scroll_hold_pop(obj);
}
static char *
@@ -657,11 +628,6 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
(priv->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add
(priv->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
- evas_object_event_callback_add
- (obj, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, obj);
- evas_object_event_callback_add
- (obj, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, obj);
-
efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 03/03: efl_ui_textbox: fix sd->scroller=null error
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 24a908bf498f8d56ed7c7902d57831a4355a9f9c
Author: dimmus
AuthorDate: Mon Jun 3 18:47:01 2024 +0500
efl_ui_textbox: fix sd->scroller=null error
Can be called by efl_ui_widget_scroll_hold_{pop, push} from another widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set() invocation with undefined sd->scroller here as the result. So, check if sd->scroll is true to avoid this.
The same for *_freeze_set.
---
src/lib/elementary/efl_ui_textbox.c | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index b58b3a2c08..79055ecad7 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -3349,8 +3349,15 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_hold_get(const Eo *obj EINA_UNUSED, Efl
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_hold_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool hold)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ /* Can be called by efl_ui_widget_scroll_hold_{pop, push} from another
+* widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set()
+* invocation with undefined sd->scroller here as the result.
+* So, check if sd->scroll is true to avoid this. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ }
}
EOLIAN static Eina_Bool
@@ -3363,8 +3370,12 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_freeze_get(const Eo *obj EINA_UNUSED, E
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_freeze_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool freeze)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ /* The same as for hold_set. See comments above. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ }
}
EOLIAN static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 02/03: efl_ui_slider: revert previous changes
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 09571f18b9f89906d148ca37765b923d80dcbdf3
Author: dimmus
AuthorDate: Mon Jun 3 17:59:40 2024 +0500
efl_ui_slider: revert previous changes
---
src/lib/elementary/efl_ui_slider.c | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index dede87ce9d..041316de68 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -179,6 +179,7 @@ _drag_start(void *data,
elm_object_focus_set(data, EINA_TRUE);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
_drag_value_fetch(data);
+ elm_widget_scroll_freeze_push(data);
}
static void
@@ -189,6 +190,7 @@ _drag_stop(void *data,
{
_drag_value_fetch(data);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+ elm_widget_scroll_freeze_pop(data);
}
static void
@@ -503,7 +505,10 @@ _spacer_move_cb(void *data,
if (d > (_elm_config->thumbscroll_threshold - 1))
{
if (!sd->frozen)
- sd->frozen = EINA_TRUE;
+ {
+ elm_widget_scroll_freeze_push(data);
+ sd->frozen = EINA_TRUE;
+ }
ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
}
@@ -514,7 +519,10 @@ _spacer_move_cb(void *data,
efl_event_callback_call
(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
-sd->frozen = EINA_FALSE;
+ {
+ elm_widget_scroll_freeze_pop(data);
+ sd->frozen = EINA_FALSE;
+ }
return;
}
if (_is_horizontal(sd->dir))
@@ -552,7 +560,28 @@ _spacer_up_cb(void *data,
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
+ {
+elm_widget_scroll_freeze_pop(data);
sd->frozen = EINA_FALSE;
+ }
+}
+
+static void
+_mouse_in_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_push(obj);
+}
+
+static void
+_mouse_out_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_pop(obj);
}
static char *
@@ -628,6 +657,11 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
(priv->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add
(priv->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, obj);
+
efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [enlightenment] 01/01: rename wayland session desktop file
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit e52c25c71b4d9fb7f9ce17cc9e8a776a404e2ac7
Author: Ross Vandegrift
AuthorDate: Wed Jan 17 20:46:32 2024 -0800
rename wayland session desktop file
This ensures all display managers provide both the wayland and x11 sessions to
the user.
- when two different desktop files have the same desktop-id, they're merged.
- gdm uses this to implement fallback from wayland -> x11, in case of a crash.
- this behavior isn't standardized since fdo doesn't really define the desktop
session files, so there's some variation.
Providing the files under different names should work everywhere. This is
summarized from https://gitlab.gnome.org/GNOME/gdm/-/issues/898
---
.../wl/{enlightenment.desktop.in => enlightenment-wayland.desktop.in} | 0
data/session/wl/meson.build | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/session/wl/enlightenment.desktop.in b/data/session/wl/enlightenment-wayland.desktop.in
similarity index 100%
rename from data/session/wl/enlightenment.desktop.in
rename to data/session/wl/enlightenment-wayland.desktop.in
diff --git a/data/session/wl/meson.build b/data/session/wl/meson.build
index b52ff38a9..a94925dfd 100644
--- a/data/session/wl/meson.build
+++ b/data/session/wl/meson.build
@@ -2,8 +2,8 @@ desktop_config = configuration_data()
desktop_config.set('prefix', dir_prefix)
desktop_config.set('VERSION', e_version_rev)
e_desktop = configure_file(
- input : 'enlightenment.desktop.in',
- output: 'enlightenment.desktop',
+ input : 'enlightenment-wayland.desktop.in',
+ output: 'enlightenment-wayland.desktop',
configuration : desktop_config)
if config_h.has('HAVE_WAYLAND') == true
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: tidy some status code and handle initial list
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 618e7c05ae63a9f212c27401fd63c2b5a697fd61
Author: Carsten Haitzler (Rasterman)
AuthorDate: Wed Jun 5 17:48:00 2024 +0100
tidy some status code and handle initial list
---
src/shared/status_mon.c | 81 -
1 file changed, 40 insertions(+), 41 deletions(-)
diff --git a/src/shared/status_mon.c b/src/shared/status_mon.c
index 514830e..33b342e 100644
--- a/src/shared/status_mon.c
+++ b/src/shared/status_mon.c
@@ -88,6 +88,8 @@ status_op_read(Status_Op *so)
char buf[PATH_MAX + 256];
Cmd *cmd;
long pos;
+ Eina_List *l;
+ Status_Callback *sc;
pos = ftell(so->file);
fseek(so->file, pos, SEEK_SET);
@@ -97,28 +99,22 @@ status_op_read(Status_Op *so)
if (sz < 1) continue;
buf[sz - 1] = 0; // nuke \n
- printf(" READ CMD [%s]\n", buf);
cmd = cmd_parse(buf);
- if (cmd)
-{
- Eina_List *l;
- Status_Callback *sc;
-
- cbs_walk++;
- EINA_LIST_FOREACH(cbs, l, sc) sc->cb(sc->data, so, cmd);
- cbs_walk--;
- status_callback_clean();
- cmd_free(cmd);
-}
+ if (!cmd) continue;
+ cbs_walk++;
+ EINA_LIST_FOREACH(cbs, l, sc) sc->cb(sc->data, so, cmd);
+ cbs_walk--;
+ status_callback_clean();
+ cmd_free(cmd);
}
}
static void
_file_add(const char *path)
{
- Status_Op *so;
-
- fprintf(stderr, "ADD %s\n", 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);
}
@@ -126,48 +122,39 @@ _file_add(const char *path)
static void
_file_del(const char *path)
{
- Status_Op *so;
+ Status_Op *so = status_op_find(path);
+ Eina_List *l;
+ Status_Callback *sc;
- fprintf(stderr, "DEL %s\n", path);
- so = status_op_find(path);
- if (so)
-{
- Eina_List *l;
- Status_Callback *sc;
+ if (!so) return;
- cbs_walk++;
- EINA_LIST_FOREACH(cbs, l, sc) sc->cb(sc->data, so, NULL);
- cbs_walk--;
- status_callback_clean();
- status_op_del(so);
-}
+ cbs_walk++;
+ EINA_LIST_FOREACH(cbs, l, sc) sc->cb(sc->data, so, NULL);
+ cbs_walk--;
+ status_callback_clean();
+ status_op_del(so);
}
static void
_file_mod(const char *path)
{
- Status_Op *so;
+ Status_Op *so = status_op_find(path);
- fprintf(stderr, "MOD %s\n", path);
- so = status_op_find(path);
if (so) status_op_read(so);
}
static void
_cb_mon(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED,
Ecore_File_Event event, const char *path)
-{
- if ((event == ECORE_FILE_EVENT_CREATED_FILE)
- || (event == ECORE_FILE_EVENT_CREATED_DIRECTORY))
-_file_add(path);
- else if ((event == ECORE_FILE_EVENT_DELETED_FILE)
- || (event == ECORE_FILE_EVENT_DELETED_DIRECTORY))
-_file_del(path);
- else if (event == ECORE_FILE_EVENT_MODIFIED) _file_mod(path);
+{ // a efm ops dir event happened - deal with it
+ 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);
}
-void status_mon_init(void)
-{
+void
+status_mon_init(void)
+{ // for completenexx - does nothing at the moment
}
void
@@ -209,15 +196,27 @@ status_mon_callback_del(Status_Mon_Callback cb, void *data)
void
status_mon_begin(void)
{
+ Eina_Iterator *it;
+ Eina_File_Direct_Info *info;
char buf[PATH_MAX];
+ // where is the efm ops dir
eina_vpath_resolve_snprintf(buf, sizeof(buf), "(:usr.run:)/efm/ops");
ecore_file_mkpath(buf);
+ // 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);
+ if (it)
+{
+ EINA_ITERATOR_FOREACH(it, info) _file_add(info->path);
+ eina_iterator_free(it);
+}
}
void status_mon_shutdown(void)
{
if (mon) ecore_file_monitor_del(mon);
mon = NULL;
+ // XXX: delete so's
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [enlightenment] 01/01: clang: add clang-format
This is an automated email from the git hooks/post-receive script. git pushed a commit to reference refs/pull/72/head in repository enlightenment. View the commit online. commit 530c305980aab631246300b8225352fe19b47ce6 Author: dimmus AuthorDate: Tue Jun 4 20:06:22 2024 +0500 clang: add clang-format --- .clang-format | 238 ++ .clang-format-ignore | 1 + .clang-format-include | 2 + src/bin/e_slider.c| 2 + 4 files changed, 243 insertions(+) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0..b11445c21 --- /dev/null +++ b/.clang-format @@ -0,0 +1,238 @@ +# This configuration file can be used to auto-format the code base. +# Not all guidelines specified in CODING_STYLE are followed, so the +# result MUST NOT be committed indiscriminately, but each automated +# change should be reviewed and only the appropriate ones committed. +# +# The easiest way to apply the formatting to your changes ONLY, +# is to use the git-clang-format script (usually installed with clang-format). +# +# - Fix up formatting before committing +# 1. Edit and stage your files. +# 2. Run `git clang-format`. +# 3. Verify + correct + (un)stage changes. +# 4. Commit. +# +# - Fix up formatting after committing +# 1. Commit your changes. +# 2. Run `git clang-format HEAD~` - Refer the commit *before* your changes here. +# 3. Verify + correct changes, `git difftool -d` can help here. +# 4. Stage + commit, potentially with `--amend` (means to fixup the last commit). +# +# To run clang-format on all sourcefiles, use the following line: +# $ git ls-files 'src/*.[ch]' 'src/*.cc' | xargs clang-format -i -style=file +# = +# Tested to work with version: 16, 17. +# +# Introduction: https://clang.llvm.org/docs/ClangFormat.html +# Supported options: https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# See as well https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting +BasedOnStyle: GNU + +Language: Cpp +Standard: Latest + +# Line width (don't exceed 100). +ColumnLimit: 80 + +# Note: TabWidth and IndentWidth must be the same, or strange things happen. +UseTab: Never +TabWidth: 4 +IndentWidth: 4 + +PPIndentWidth: 2 +ContinuationIndentWidth: 4 + +LineEnding: LF +InsertNewlineAtEOF: true +KeepEmptyLinesAtTheStartOfBlocks: false +MaxEmptyLinesToKeep: 1 + +IndentCaseLabels: true +IndentCaseBlocks: true +IndentGotoLabels: false +IndentPPDirectives: AfterHash +IndentWrappedFunctionNames: false + +# This causes parameters on continuations to align to the opening brace. +# +# like_this_long_name(parameter_one, +# parameter_two, +# parameter_three); +# +AlignAfterOpenBracket: Align + +AlignArrayOfStructures: Right +AlignEscapedNewlines: Left +AlignOperands: Align +AlignConsecutiveAssignments: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignCompound:false +PadOperators: false +AlignConsecutiveBitFields: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignConsecutiveDeclarations: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignConsecutiveMacros: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignTrailingComments: +Kind: Leave +OverEmptyLines: 0 + +# These two settings trigger stacking of parameters in most cases; this is +# easier to read and also makes diffs easier to read (since an added or removed +# parameter is obvious). For example, function calls will look like this: +# +# like_this_long_name(parameter_one, +# parameter_two, +# parameter_three, +# parameter_four, +# parameter_five, +# parameter_six); +# +# Instead of: +# +# like_this_long_name(parameter_one, parameter_two, parameter_three, parameter_four, +# parameter_five, parameter_six); +# +BinPackArguments: false +BinPackParameters: false + +AllowAllArgumentsOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false + +# Disallow short functions on one line; break them up. +AllowShortBlocksOnASingleLine: Never + +AllowShortCaseLabelsOnASingleLine: false +AllowShortEnumsOnASingleLine: true +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: AllIfsAndElse +AllowShortLoopsOnASingleLine: false + +# Always break: +# +# const char *foo = "multi" +# "line"; +# +# Instead of: +# +# const char *foo = +# "multi" +# "line"; +# +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false + +# This tries to match EFL's style as much as possible. +BreakBeforeBraces: Custom +BraceWrapping: +AfterCaseLabel:true +AfterControlStatement: true +AfterEnum: true +
[EGIT] [enlightenment] 01/01: clang: add clang-format
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch devs/dimmus/clang-format in repository enlightenment. View the commit online. commit 530c305980aab631246300b8225352fe19b47ce6 Author: dimmus AuthorDate: Tue Jun 4 20:06:22 2024 +0500 clang: add clang-format --- .clang-format | 238 ++ .clang-format-ignore | 1 + .clang-format-include | 2 + src/bin/e_slider.c| 2 + 4 files changed, 243 insertions(+) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0..b11445c21 --- /dev/null +++ b/.clang-format @@ -0,0 +1,238 @@ +# This configuration file can be used to auto-format the code base. +# Not all guidelines specified in CODING_STYLE are followed, so the +# result MUST NOT be committed indiscriminately, but each automated +# change should be reviewed and only the appropriate ones committed. +# +# The easiest way to apply the formatting to your changes ONLY, +# is to use the git-clang-format script (usually installed with clang-format). +# +# - Fix up formatting before committing +# 1. Edit and stage your files. +# 2. Run `git clang-format`. +# 3. Verify + correct + (un)stage changes. +# 4. Commit. +# +# - Fix up formatting after committing +# 1. Commit your changes. +# 2. Run `git clang-format HEAD~` - Refer the commit *before* your changes here. +# 3. Verify + correct changes, `git difftool -d` can help here. +# 4. Stage + commit, potentially with `--amend` (means to fixup the last commit). +# +# To run clang-format on all sourcefiles, use the following line: +# $ git ls-files 'src/*.[ch]' 'src/*.cc' | xargs clang-format -i -style=file +# = +# Tested to work with version: 16, 17. +# +# Introduction: https://clang.llvm.org/docs/ClangFormat.html +# Supported options: https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# See as well https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting +BasedOnStyle: GNU + +Language: Cpp +Standard: Latest + +# Line width (don't exceed 100). +ColumnLimit: 80 + +# Note: TabWidth and IndentWidth must be the same, or strange things happen. +UseTab: Never +TabWidth: 4 +IndentWidth: 4 + +PPIndentWidth: 2 +ContinuationIndentWidth: 4 + +LineEnding: LF +InsertNewlineAtEOF: true +KeepEmptyLinesAtTheStartOfBlocks: false +MaxEmptyLinesToKeep: 1 + +IndentCaseLabels: true +IndentCaseBlocks: true +IndentGotoLabels: false +IndentPPDirectives: AfterHash +IndentWrappedFunctionNames: false + +# This causes parameters on continuations to align to the opening brace. +# +# like_this_long_name(parameter_one, +# parameter_two, +# parameter_three); +# +AlignAfterOpenBracket: Align + +AlignArrayOfStructures: Right +AlignEscapedNewlines: Left +AlignOperands: Align +AlignConsecutiveAssignments: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignCompound:false +PadOperators: false +AlignConsecutiveBitFields: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignConsecutiveDeclarations: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignConsecutiveMacros: +Enabled: true +AcrossEmptyLines: false +AcrossComments: false +AlignTrailingComments: +Kind: Leave +OverEmptyLines: 0 + +# These two settings trigger stacking of parameters in most cases; this is +# easier to read and also makes diffs easier to read (since an added or removed +# parameter is obvious). For example, function calls will look like this: +# +# like_this_long_name(parameter_one, +# parameter_two, +# parameter_three, +# parameter_four, +# parameter_five, +# parameter_six); +# +# Instead of: +# +# like_this_long_name(parameter_one, parameter_two, parameter_three, parameter_four, +# parameter_five, parameter_six); +# +BinPackArguments: false +BinPackParameters: false + +AllowAllArgumentsOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false + +# Disallow short functions on one line; break them up. +AllowShortBlocksOnASingleLine: Never + +AllowShortCaseLabelsOnASingleLine: false +AllowShortEnumsOnASingleLine: true +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: AllIfsAndElse +AllowShortLoopsOnASingleLine: false + +# Always break: +# +# const char *foo = "multi" +# "line"; +# +# Instead of: +# +# const char *foo = +# "multi" +# "line"; +# +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false + +# This tries to match EFL's style as much as possible. +BreakBeforeBraces: Custom +BraceWrapping: +AfterCaseLabel:true +AfterControlStatement: true +AfterEnum: true +
[EGIT] [enlightenment] 01/02: tools: paledit - add search entry
This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/71/head
in repository enlightenment.
View the commit online.
commit c444b230ccef37a9ee61de3a570341d1d763c173
Author: dimmus
AuthorDate: Tue Jun 4 18:31:33 2024 +0500
tools: paledit - add search entry
@feature
---
.gitignore | 3 ++
src/bin/tools/paledit/main.c | 2 +-
src/bin/tools/paledit/main.h | 2 +-
src/bin/tools/paledit/palcols.c | 80 ++--
src/bin/tools/paledit/undoredo.c | 12 +++---
5 files changed, 79 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 02ad6038e..528fd5c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@
Session.vim
/build
*~
+
+*.json
+*.patch
diff --git a/src/bin/tools/paledit/main.c b/src/bin/tools/paledit/main.c
index 383b05dd9..ffee8ecc4 100644
--- a/src/bin/tools/paledit/main.c
+++ b/src/bin/tools/paledit/main.c
@@ -21,7 +21,7 @@ pal_load(Evas_Object *win)
if (!pal) return;
undoredo_reset(win);
evas_object_data_set(win, "pal", pal);
- palcols_fill(win);
+ palcols_fill(win, NULL);
palimg_update(evas_object_data_get(win, "pal_image"), pal);
elm_object_text_set(evas_object_data_get(win, "pal_name"), palname);
pal_save(win);
diff --git a/src/bin/tools/paledit/main.h b/src/bin/tools/paledit/main.h
index 1b0d98b87..1ff934134 100644
--- a/src/bin/tools/paledit/main.h
+++ b/src/bin/tools/paledit/main.h
@@ -8,7 +8,7 @@ Evas_Object *palimg_add(Evas_Object *win);
Evas_Object *palsel_add(Evas_Object *win);
-void palcols_fill(Evas_Object *win);
+void palcols_fill(Evas_Object *win, const char *filter_str);
Evas_Object *palcols_add(Evas_Object *win);
void colsel_update(Evas_Object *win);
diff --git a/src/bin/tools/paledit/palcols.c b/src/bin/tools/paledit/palcols.c
index 93bcf1e79..6f5ba20f5 100644
--- a/src/bin/tools/paledit/palcols.c
+++ b/src/bin/tools/paledit/palcols.c
@@ -1,5 +1,12 @@
#include "main.h"
+typedef struct _Search_Event_Data Search_Event_Data;
+struct _Search_Event_Data
+{
+ Evas_Object *en_obj;
+ Evas_Object *win_obj;
+};
+
static void _pal_color_add(Evas_Object *win);
static void _pal_color_del(Evas_Object *win);
@@ -174,7 +181,7 @@ _pal_color_del(Evas_Object *win)
}
void
-palcols_fill(Evas_Object *win)
+palcols_fill(Evas_Object *win, const char *filter_str)
{
Elm_Object_Item *sel_it = NULL;
Elm_Palette *pal = evas_object_data_get(win, "pal");
@@ -198,17 +205,23 @@ palcols_fill(Evas_Object *win)
EINA_LIST_FOREACH(pal->colors, l, col)
{
-it = elm_genlist_item_sorted_insert(list, itc, col,
-NULL, ELM_GENLIST_ITEM_NONE,
-_cb_class_insert_cmp,
-_cb_class_gl_sel, win);
-if (!sel_it) sel_it = it;
+ if (filter_str && !strcasestr(col->name, filter_str))
+ continue;
+ it = elm_genlist_item_sorted_insert(list, itc, col,
+ NULL, ELM_GENLIST_ITEM_NONE,
+ _cb_class_insert_cmp,
+ _cb_class_gl_sel, win);
+ /* XXX: We found exact item, so focus it.
+ * But not shure that it's usefull, may be even annoying.
+ * It throught errors when you filter from exact to exact imidiately:
+ * Ex.: enter ':bg-dim', then select '-dim' part and delete it.
+ * You get exact ':bg' and focus_manager error in stdout ;( */
+ if (!sel_it && filter_str && !strcasecmp(col->name, filter_str))
+ sel_it = it;
}
+
if (sel_it)
- {
-elm_genlist_item_show(sel_it, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
-elm_genlist_item_selected_set(sel_it, EINA_TRUE);
- }
+ elm_genlist_item_selected_set(sel_it, EINA_TRUE);
}
static void
@@ -518,10 +531,29 @@ _cb_modify_click(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA
evas_object_show(o);
}
+static void
+_search_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ free(data);
+}
+
+static void
+_search_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ Search_Event_Data * event_data = (Search_Event_Data *)data;
+
+ const char *str = elm_entry_entry_get(event_data->en_obj);
+ if (!str || !strlen(str)) str = NULL;
+
+ palcols_fill(event_data->win_obj, str);
+}
+
Evas_Object *
palcols_add(Evas_Object *win)
{
- Evas_Object *o, *bxl, *btn, *bxh;
+ Evas_Object *o, *bxl, *btn, *bxh, *bx_entry;
+ Search_Event_Data* event_data = NULL;
+ Evas_Object *gl, *en;
bxl = o = elm_box_add(win);
elm_box_padding_set(o, 0, ELM_SCALE_SIZE(10));
@@ -594,7 +626,24 @@ palcols_add(Evas_Object *win)
elm_object_content_set(btn, o);
evas_object_show(o);
- o
[EGIT] [enlightenment] 02/02: git: revert gitignore changes
This is an automated email from the git hooks/post-receive script. git pushed a commit to reference refs/pull/71/head in repository enlightenment. View the commit online. commit 426cf1de897fd5b7246df21e8d7afedc2be8f7b4 Author: dimmus AuthorDate: Tue Jun 4 18:39:26 2024 +0500 git: revert gitignore changes --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 528fd5c33..02ad6038e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,3 @@ Session.vim /build *~ - -*.json -*.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [enlightenment] 01/01: git: revert gitignore changes
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch devs/dimmus/paledit in repository enlightenment. View the commit online. commit 426cf1de897fd5b7246df21e8d7afedc2be8f7b4 Author: dimmus AuthorDate: Tue Jun 4 18:39:26 2024 +0500 git: revert gitignore changes --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 528fd5c33..02ad6038e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,3 @@ Session.vim /build *~ - -*.json -*.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [enlightenment] 01/01: tools: paledit - add search entry
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch devs/dimmus/paledit
in repository enlightenment.
View the commit online.
commit c444b230ccef37a9ee61de3a570341d1d763c173
Author: dimmus
AuthorDate: Tue Jun 4 18:31:33 2024 +0500
tools: paledit - add search entry
@feature
---
.gitignore | 3 ++
src/bin/tools/paledit/main.c | 2 +-
src/bin/tools/paledit/main.h | 2 +-
src/bin/tools/paledit/palcols.c | 80 ++--
src/bin/tools/paledit/undoredo.c | 12 +++---
5 files changed, 79 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 02ad6038e..528fd5c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@
Session.vim
/build
*~
+
+*.json
+*.patch
diff --git a/src/bin/tools/paledit/main.c b/src/bin/tools/paledit/main.c
index 383b05dd9..ffee8ecc4 100644
--- a/src/bin/tools/paledit/main.c
+++ b/src/bin/tools/paledit/main.c
@@ -21,7 +21,7 @@ pal_load(Evas_Object *win)
if (!pal) return;
undoredo_reset(win);
evas_object_data_set(win, "pal", pal);
- palcols_fill(win);
+ palcols_fill(win, NULL);
palimg_update(evas_object_data_get(win, "pal_image"), pal);
elm_object_text_set(evas_object_data_get(win, "pal_name"), palname);
pal_save(win);
diff --git a/src/bin/tools/paledit/main.h b/src/bin/tools/paledit/main.h
index 1b0d98b87..1ff934134 100644
--- a/src/bin/tools/paledit/main.h
+++ b/src/bin/tools/paledit/main.h
@@ -8,7 +8,7 @@ Evas_Object *palimg_add(Evas_Object *win);
Evas_Object *palsel_add(Evas_Object *win);
-void palcols_fill(Evas_Object *win);
+void palcols_fill(Evas_Object *win, const char *filter_str);
Evas_Object *palcols_add(Evas_Object *win);
void colsel_update(Evas_Object *win);
diff --git a/src/bin/tools/paledit/palcols.c b/src/bin/tools/paledit/palcols.c
index 93bcf1e79..6f5ba20f5 100644
--- a/src/bin/tools/paledit/palcols.c
+++ b/src/bin/tools/paledit/palcols.c
@@ -1,5 +1,12 @@
#include "main.h"
+typedef struct _Search_Event_Data Search_Event_Data;
+struct _Search_Event_Data
+{
+ Evas_Object *en_obj;
+ Evas_Object *win_obj;
+};
+
static void _pal_color_add(Evas_Object *win);
static void _pal_color_del(Evas_Object *win);
@@ -174,7 +181,7 @@ _pal_color_del(Evas_Object *win)
}
void
-palcols_fill(Evas_Object *win)
+palcols_fill(Evas_Object *win, const char *filter_str)
{
Elm_Object_Item *sel_it = NULL;
Elm_Palette *pal = evas_object_data_get(win, "pal");
@@ -198,17 +205,23 @@ palcols_fill(Evas_Object *win)
EINA_LIST_FOREACH(pal->colors, l, col)
{
-it = elm_genlist_item_sorted_insert(list, itc, col,
-NULL, ELM_GENLIST_ITEM_NONE,
-_cb_class_insert_cmp,
-_cb_class_gl_sel, win);
-if (!sel_it) sel_it = it;
+ if (filter_str && !strcasestr(col->name, filter_str))
+ continue;
+ it = elm_genlist_item_sorted_insert(list, itc, col,
+ NULL, ELM_GENLIST_ITEM_NONE,
+ _cb_class_insert_cmp,
+ _cb_class_gl_sel, win);
+ /* XXX: We found exact item, so focus it.
+ * But not shure that it's usefull, may be even annoying.
+ * It throught errors when you filter from exact to exact imidiately:
+ * Ex.: enter ':bg-dim', then select '-dim' part and delete it.
+ * You get exact ':bg' and focus_manager error in stdout ;( */
+ if (!sel_it && filter_str && !strcasecmp(col->name, filter_str))
+ sel_it = it;
}
+
if (sel_it)
- {
-elm_genlist_item_show(sel_it, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
-elm_genlist_item_selected_set(sel_it, EINA_TRUE);
- }
+ elm_genlist_item_selected_set(sel_it, EINA_TRUE);
}
static void
@@ -518,10 +531,29 @@ _cb_modify_click(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA
evas_object_show(o);
}
+static void
+_search_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ free(data);
+}
+
+static void
+_search_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ Search_Event_Data * event_data = (Search_Event_Data *)data;
+
+ const char *str = elm_entry_entry_get(event_data->en_obj);
+ if (!str || !strlen(str)) str = NULL;
+
+ palcols_fill(event_data->win_obj, str);
+}
+
Evas_Object *
palcols_add(Evas_Object *win)
{
- Evas_Object *o, *bxl, *btn, *bxh;
+ Evas_Object *o, *bxl, *btn, *bxh, *bx_entry;
+ Search_Event_Data* event_data = NULL;
+ Evas_Object *gl, *en;
bxl = o = elm_box_add(win);
elm_box_padding_set(o, 0, ELM_SCALE_SIZE(10));
@@ -594,7 +626,24 @@ palcols_add(Evas_Object *win)
elm_object_content_set(btn, o);
evas_object_show(o);
- o =
[EGIT] [efl] 01/02: efl_ui_slider: revert previous changes
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch devs/dimmus/slider
in repository efl.
View the commit online.
commit a295045e36e921cf32aecd7da379366510ccf581
Author: dimmus
AuthorDate: Mon Jun 3 17:59:40 2024 +0500
efl_ui_slider: revert previous changes
---
src/lib/elementary/efl_ui_slider.c | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index dede87ce9d..041316de68 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -179,6 +179,7 @@ _drag_start(void *data,
elm_object_focus_set(data, EINA_TRUE);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
_drag_value_fetch(data);
+ elm_widget_scroll_freeze_push(data);
}
static void
@@ -189,6 +190,7 @@ _drag_stop(void *data,
{
_drag_value_fetch(data);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+ elm_widget_scroll_freeze_pop(data);
}
static void
@@ -503,7 +505,10 @@ _spacer_move_cb(void *data,
if (d > (_elm_config->thumbscroll_threshold - 1))
{
if (!sd->frozen)
- sd->frozen = EINA_TRUE;
+ {
+ elm_widget_scroll_freeze_push(data);
+ sd->frozen = EINA_TRUE;
+ }
ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
}
@@ -514,7 +519,10 @@ _spacer_move_cb(void *data,
efl_event_callback_call
(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
-sd->frozen = EINA_FALSE;
+ {
+ elm_widget_scroll_freeze_pop(data);
+ sd->frozen = EINA_FALSE;
+ }
return;
}
if (_is_horizontal(sd->dir))
@@ -552,7 +560,28 @@ _spacer_up_cb(void *data,
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
+ {
+elm_widget_scroll_freeze_pop(data);
sd->frozen = EINA_FALSE;
+ }
+}
+
+static void
+_mouse_in_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_push(obj);
+}
+
+static void
+_mouse_out_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_pop(obj);
}
static char *
@@ -628,6 +657,11 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
(priv->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add
(priv->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, obj);
+
efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 02/02: efl_ui_textbox: fix sd->scroller=null error
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch devs/dimmus/slider
in repository efl.
View the commit online.
commit 80e905aeacf51efb385fe5f0d3754433a359e9ef
Author: dimmus
AuthorDate: Mon Jun 3 18:47:01 2024 +0500
efl_ui_textbox: fix sd->scroller=null error
Can be called by efl_ui_widget_scroll_hold_{pop, push} from another widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set() invocation with undefined sd->scroller here as the result. So, check if sd->scroll is true to avoid this.
The same for *_freeze_set.
---
src/lib/elementary/efl_ui_textbox.c | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index b58b3a2c08..79055ecad7 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -3349,8 +3349,15 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_hold_get(const Eo *obj EINA_UNUSED, Efl
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_hold_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool hold)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ /* Can be called by efl_ui_widget_scroll_hold_{pop, push} from another
+* widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set()
+* invocation with undefined sd->scroller here as the result.
+* So, check if sd->scroll is true to avoid this. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ }
}
EOLIAN static Eina_Bool
@@ -3363,8 +3370,12 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_freeze_get(const Eo *obj EINA_UNUSED, E
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_freeze_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool freeze)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ /* The same as for hold_set. See comments above. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ }
}
EOLIAN static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 02/02: efl_ui_textbox: fix sd->scroller=null error
This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/31/head
in repository efl.
View the commit online.
commit 80e905aeacf51efb385fe5f0d3754433a359e9ef
Author: dimmus
AuthorDate: Mon Jun 3 18:47:01 2024 +0500
efl_ui_textbox: fix sd->scroller=null error
Can be called by efl_ui_widget_scroll_hold_{pop, push} from another widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set() invocation with undefined sd->scroller here as the result. So, check if sd->scroll is true to avoid this.
The same for *_freeze_set.
---
src/lib/elementary/efl_ui_textbox.c | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index b58b3a2c08..79055ecad7 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -3349,8 +3349,15 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_hold_get(const Eo *obj EINA_UNUSED, Efl
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_hold_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool hold)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ /* Can be called by efl_ui_widget_scroll_hold_{pop, push} from another
+* widget (ex., efl_ui_slider) without _efl_ui_textbox_scrollable_set()
+* invocation with undefined sd->scroller here as the result.
+* So, check if sd->scroll is true to avoid this. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_hold_set(sd->scroller, !!hold);
+ }
}
EOLIAN static Eina_Bool
@@ -3363,8 +3370,12 @@ _efl_ui_textbox_efl_ui_scrollable_scroll_freeze_get(const Eo *obj EINA_UNUSED, E
EOLIAN static void
_efl_ui_textbox_efl_ui_scrollable_scroll_freeze_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool freeze)
{
- EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
- efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ /* The same as for hold_set. See comments above. */
+ if(sd->scroll)
+ {
+ EINA_SAFETY_ON_NULL_RETURN(sd->scroller);
+ efl_ui_scrollable_scroll_freeze_set(sd->scroller, !!freeze);
+ }
}
EOLIAN static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/02: efl_ui_slider: revert previous changes
This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/31/head
in repository efl.
View the commit online.
commit a295045e36e921cf32aecd7da379366510ccf581
Author: dimmus
AuthorDate: Mon Jun 3 17:59:40 2024 +0500
efl_ui_slider: revert previous changes
---
src/lib/elementary/efl_ui_slider.c | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index dede87ce9d..041316de68 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -179,6 +179,7 @@ _drag_start(void *data,
elm_object_focus_set(data, EINA_TRUE);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
_drag_value_fetch(data);
+ elm_widget_scroll_freeze_push(data);
}
static void
@@ -189,6 +190,7 @@ _drag_stop(void *data,
{
_drag_value_fetch(data);
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+ elm_widget_scroll_freeze_pop(data);
}
static void
@@ -503,7 +505,10 @@ _spacer_move_cb(void *data,
if (d > (_elm_config->thumbscroll_threshold - 1))
{
if (!sd->frozen)
- sd->frozen = EINA_TRUE;
+ {
+ elm_widget_scroll_freeze_push(data);
+ sd->frozen = EINA_TRUE;
+ }
ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
}
@@ -514,7 +519,10 @@ _spacer_move_cb(void *data,
efl_event_callback_call
(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
-sd->frozen = EINA_FALSE;
+ {
+ elm_widget_scroll_freeze_pop(data);
+ sd->frozen = EINA_FALSE;
+ }
return;
}
if (_is_horizontal(sd->dir))
@@ -552,7 +560,28 @@ _spacer_up_cb(void *data,
efl_event_callback_call(data, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
if (sd->frozen)
+ {
+elm_widget_scroll_freeze_pop(data);
sd->frozen = EINA_FALSE;
+ }
+}
+
+static void
+_mouse_in_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_push(obj);
+}
+
+static void
+_mouse_out_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ efl_ui_widget_scroll_hold_pop(obj);
}
static char *
@@ -628,6 +657,11 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
(priv->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add
(priv->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, obj);
+ evas_object_event_callback_add
+ (obj, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, obj);
+
efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Merge branch 'master' into devs/dimmus/slider
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch devs/dimmus/slider in repository efl. View the commit online. commit 37324274a78ad7c76ead47b08298ad3b6cb70905 Merge: 380c6d35db ebd24a4815 Author: Dmitri Chudinov AuthorDate: Mon Jun 3 05:26:11 2024 -0700 Merge branch 'master' into devs/dimmus/slider README.md | 6 +- data/elementary/themes/colorclasses.edc| 6 +- data/elementary/themes/edc/border.edc | 33 ++ data/elementary/themes/edc/efl/border.edc | 6 +- data/elementary/themes/edc/elm/fileselector.edc| 2 +- data/elementary/themes/edc/elm/slider.edc | 24 +- data/elementary/themes/edc/fileman.edc | 299 ++- data/elementary/themes/edc/icons.edc | 1 + data/elementary/themes/edc/winlist.edc | 32 +- data/elementary/themes/ic.edc | 2 +- meson.build| 11 +- meson_options.txt | 14 +- src/bin/eet/vieet | 2 +- src/bin/elementary/config.c| 21 +- src/bin/elementary/test_focus.c| 2 +- src/bin/elementary/test_label.c| 4 +- src/bindings/mono/efl_mono/meson.build | 12 +- src/bindings/mono/efl_sharp.csproj.in | 3 +- src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs | 4 + .../mono/eo_mono/FunctionWrapper_Windows.cs| 15 +- src/bindings/mono/eo_mono/NativeModule_Unix.cs | 4 + src/bindings/mono/eo_mono/NativeModule_Windows.cs | 22 +- src/bindings/mono/eo_mono/iwrapper.cs | 2 +- src/bindings/mono/eo_mono/meson.build | 12 +- src/bindings/mono/eolian_mono/meson.build | 4 + src/bindings/mono/meson.build | 31 +- src/examples/ecore/ecore_audio_custom.c| 4 +- src/examples/ecore/ecore_audio_playback.c | 4 +- src/examples/ecore/ecore_audio_to_ogg.c| 4 +- src/examples/edje/en_IN/domain_name.po | 5 + src/examples/edje/hi_IN/domain_name.po | 5 + src/lib/ecore/ecore_exe.c | 28 ++ src/lib/ecore/ecore_exe_private.h | 4 + src/lib/ecore/ecore_exe_win32.c| 7 + src/lib/ecore/ecore_main.c | 53 +-- src/lib/ecore_drm2/ecore_drm2_plane.c | 13 +- src/lib/ecore_evas/ecore_evas_module.c | 11 +- src/lib/ecore_file/ecore_file.c| 98 + src/lib/ecore_x/ecore_x_fixes.c| 73 ++-- src/lib/eet/eet_dictionary.c | 9 +- src/lib/eet/eet_lib.c | 11 +- src/lib/eeze/eeze_disk.c | 18 +- src/lib/eeze/eeze_disk_libmount.c | 2 +- src/lib/efl_mono/efl_custom_exports_mono.c | 4 + src/lib/efreet/efreet_cache.c | 87 + src/lib/efreet/efreet_desktop_command.c| 2 +- src/lib/efreet/efreet_menu.c | 2 +- src/lib/eina/eina_file.h | 52 +++ src/lib/eina/eina_file_common.h| 12 - src/lib/eina/eina_file_posix.c | 42 +- src/lib/eina/eina_file_win32.c | 74 +++- src/lib/eina/eina_hash.c | 2 +- src/lib/eina/eina_inline_value.x | 6 + src/lib/eina/eina_prefix.c | 22 +- src/lib/eio/eio_monitor_poll.c | 6 - src/lib/eio/eio_single.c | 6 - src/lib/elementary/efl_ui_focus_manager_calc.c | 2 +- src/lib/elementary/efl_ui_image.c | 21 +- src/lib/elementary/efl_ui_image_zoomable.c | 21 +- src/lib/elementary/efl_ui_position_manager_grid.c | 2 +- src/lib/elementary/efl_ui_slider_interval.c| 16 +- src/lib/elementary/efl_ui_win.c| 6 +- src/lib/elementary/elm_icon.c | 21 +- src/lib/elementary/elm_main.c | 6 +- src/lib/elementary/elm_module.c| 2 +- src/lib/elementary/elm_prefs.c | 8 +- src/lib/elementary/elm_theme.c | 11 +- src/lib/elua/elua.c| 2 + src/lib/emile/emile_base64.c | 2 +- src/lib/eo/eo_ptr_indirection.c| 29 +- src/lib/eo/eo_ptr_indirection.x| 116 +- src/lib/ethumb/ethumb.c| 2 +- src/lib/evas/cache/evas_cache_image.c | 9 - src/lib/evas/canvas/evas_font_dir.c| 19 +- src/lib/evas/canvas/evas_object_textblock.c| 2 +- src/lib/evas/common/evas_draw.h
[EGIT] [efl] 01/01: Merge branch 'master' into devs/dimmus/slider
This is an automated email from the git hooks/post-receive script. git pushed a commit to reference refs/pull/31/head in repository efl. View the commit online. commit 37324274a78ad7c76ead47b08298ad3b6cb70905 Merge: 380c6d35db ebd24a4815 Author: Dmitri Chudinov AuthorDate: Mon Jun 3 05:26:11 2024 -0700 Merge branch 'master' into devs/dimmus/slider README.md | 6 +- data/elementary/themes/colorclasses.edc| 6 +- data/elementary/themes/edc/border.edc | 33 ++ data/elementary/themes/edc/efl/border.edc | 6 +- data/elementary/themes/edc/elm/fileselector.edc| 2 +- data/elementary/themes/edc/elm/slider.edc | 24 +- data/elementary/themes/edc/fileman.edc | 299 ++- data/elementary/themes/edc/icons.edc | 1 + data/elementary/themes/edc/winlist.edc | 32 +- data/elementary/themes/ic.edc | 2 +- meson.build| 11 +- meson_options.txt | 14 +- src/bin/eet/vieet | 2 +- src/bin/elementary/config.c| 21 +- src/bin/elementary/test_focus.c| 2 +- src/bin/elementary/test_label.c| 4 +- src/bindings/mono/efl_mono/meson.build | 12 +- src/bindings/mono/efl_sharp.csproj.in | 3 +- src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs | 4 + .../mono/eo_mono/FunctionWrapper_Windows.cs| 15 +- src/bindings/mono/eo_mono/NativeModule_Unix.cs | 4 + src/bindings/mono/eo_mono/NativeModule_Windows.cs | 22 +- src/bindings/mono/eo_mono/iwrapper.cs | 2 +- src/bindings/mono/eo_mono/meson.build | 12 +- src/bindings/mono/eolian_mono/meson.build | 4 + src/bindings/mono/meson.build | 31 +- src/examples/ecore/ecore_audio_custom.c| 4 +- src/examples/ecore/ecore_audio_playback.c | 4 +- src/examples/ecore/ecore_audio_to_ogg.c| 4 +- src/examples/edje/en_IN/domain_name.po | 5 + src/examples/edje/hi_IN/domain_name.po | 5 + src/lib/ecore/ecore_exe.c | 28 ++ src/lib/ecore/ecore_exe_private.h | 4 + src/lib/ecore/ecore_exe_win32.c| 7 + src/lib/ecore/ecore_main.c | 53 +-- src/lib/ecore_drm2/ecore_drm2_plane.c | 13 +- src/lib/ecore_evas/ecore_evas_module.c | 11 +- src/lib/ecore_file/ecore_file.c| 98 + src/lib/ecore_x/ecore_x_fixes.c| 73 ++-- src/lib/eet/eet_dictionary.c | 9 +- src/lib/eet/eet_lib.c | 11 +- src/lib/eeze/eeze_disk.c | 18 +- src/lib/eeze/eeze_disk_libmount.c | 2 +- src/lib/efl_mono/efl_custom_exports_mono.c | 4 + src/lib/efreet/efreet_cache.c | 87 + src/lib/efreet/efreet_desktop_command.c| 2 +- src/lib/efreet/efreet_menu.c | 2 +- src/lib/eina/eina_file.h | 52 +++ src/lib/eina/eina_file_common.h| 12 - src/lib/eina/eina_file_posix.c | 42 +- src/lib/eina/eina_file_win32.c | 74 +++- src/lib/eina/eina_hash.c | 2 +- src/lib/eina/eina_inline_value.x | 6 + src/lib/eina/eina_prefix.c | 22 +- src/lib/eio/eio_monitor_poll.c | 6 - src/lib/eio/eio_single.c | 6 - src/lib/elementary/efl_ui_focus_manager_calc.c | 2 +- src/lib/elementary/efl_ui_image.c | 21 +- src/lib/elementary/efl_ui_image_zoomable.c | 21 +- src/lib/elementary/efl_ui_position_manager_grid.c | 2 +- src/lib/elementary/efl_ui_slider_interval.c| 16 +- src/lib/elementary/efl_ui_win.c| 6 +- src/lib/elementary/elm_icon.c | 21 +- src/lib/elementary/elm_main.c | 6 +- src/lib/elementary/elm_module.c| 2 +- src/lib/elementary/elm_prefs.c | 8 +- src/lib/elementary/elm_theme.c | 11 +- src/lib/elua/elua.c| 2 + src/lib/emile/emile_base64.c | 2 +- src/lib/eo/eo_ptr_indirection.c| 29 +- src/lib/eo/eo_ptr_indirection.x| 116 +- src/lib/ethumb/ethumb.c| 2 +- src/lib/evas/cache/evas_cache_image.c | 9 - src/lib/evas/canvas/evas_font_dir.c| 19 +- src/lib/evas/canvas/evas_object_textblock.c| 2 +- src/lib/evas/common/evas_draw.h
[EGIT] [efl] 01/01: Exactness: fix signature compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/62/head
in repository efl.
View the commit online.
commit 4fea07aa92c4a6027be96fcab21508e044d7b1cf
Author: Vincent Torri
AuthorDate: Sat Jun 1 08:21:19 2024 +0200
Exactness: fix signature compilation error with gcc 14
---
src/bin/exactness/common.c | 4
src/bin/exactness/player.c | 5 +
src/bin/exactness/recorder.c | 5 +
3 files changed, 14 insertions(+)
diff --git a/src/bin/exactness/common.c b/src/bin/exactness/common.c
index d62d8fd519..4ca28fa8f4 100644
--- a/src/bin/exactness/common.c
+++ b/src/bin/exactness/common.c
@@ -4,6 +4,10 @@
#include "common.h"
+#ifdef _WIN32
+# include /* setenv */
+#endif
+
Eina_Bool
ex_is_original_app(void)
{
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index 419a236018..796c385d47 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -23,6 +23,11 @@
# endif
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index 6936521d7a..f161100cbc 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -16,6 +16,11 @@
# include
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Exactness: fix signature compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch vtorri_exactness
in repository efl.
View the commit online.
commit 4fea07aa92c4a6027be96fcab21508e044d7b1cf
Author: Vincent Torri
AuthorDate: Sat Jun 1 08:21:19 2024 +0200
Exactness: fix signature compilation error with gcc 14
---
src/bin/exactness/common.c | 4
src/bin/exactness/player.c | 5 +
src/bin/exactness/recorder.c | 5 +
3 files changed, 14 insertions(+)
diff --git a/src/bin/exactness/common.c b/src/bin/exactness/common.c
index d62d8fd519..4ca28fa8f4 100644
--- a/src/bin/exactness/common.c
+++ b/src/bin/exactness/common.c
@@ -4,6 +4,10 @@
#include "common.h"
+#ifdef _WIN32
+# include /* setenv */
+#endif
+
Eina_Bool
ex_is_original_app(void)
{
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index 419a236018..796c385d47 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -23,6 +23,11 @@
# endif
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index 6936521d7a..f161100cbc 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -16,6 +16,11 @@
# include
#endif
+#ifdef _WIN32
+# include /* setenv */
+# undef HAVE_DLSYM
+#endif
+
#include
#include
#include
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Add Angle library detection on Windows
This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/61/head
in repository efl.
View the commit online.
commit 4f8f721778d91af08a2ac5f24d91e368dd28328a
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:56:48 2024 +0200
Add Angle library detection on Windows
---
src/lib/evas/meson.build | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 5bb4c753e3..03bc02aa95 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -209,8 +209,30 @@ endif
if get_option('opengl') != 'none'
if get_option('opengl') == 'es-egl'
config_h.set('GL_GLES', '1')
-gl_deps += dependency('glesv2')
-gl_deps += dependency('egl')
+# Angle library does not provide .pc files
+if sys_windows
+ glesv2_dep = cc.find_library(
+'GLESv2',
+has_headers: 'GLES2/gl2.h'
+ )
+ if glesv2_dep.found()
+gl_deps += glesv2_dep
+ else
+error('GLES 2.0 library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+ egl_dep = cc.find_library(
+'EGL',
+has_headers: 'EGL/egl.h'
+ )
+ if egl_dep.found()
+gl_deps += egl_dep
+ else
+error('EGL library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+else
+ gl_deps += dependency('glesv2')
+ gl_deps += dependency('egl')
+endif
else
gl_deps += dependency('gl')
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Add Angle library detection on Windows
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch vtorri_angle
in repository efl.
View the commit online.
commit 4f8f721778d91af08a2ac5f24d91e368dd28328a
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:56:48 2024 +0200
Add Angle library detection on Windows
---
src/lib/evas/meson.build | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 5bb4c753e3..03bc02aa95 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -209,8 +209,30 @@ endif
if get_option('opengl') != 'none'
if get_option('opengl') == 'es-egl'
config_h.set('GL_GLES', '1')
-gl_deps += dependency('glesv2')
-gl_deps += dependency('egl')
+# Angle library does not provide .pc files
+if sys_windows
+ glesv2_dep = cc.find_library(
+'GLESv2',
+has_headers: 'GLES2/gl2.h'
+ )
+ if glesv2_dep.found()
+gl_deps += glesv2_dep
+ else
+error('GLES 2.0 library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+ egl_dep = cc.find_library(
+'EGL',
+has_headers: 'EGL/egl.h'
+ )
+ if egl_dep.found()
+gl_deps += egl_dep
+ else
+error('EGL library not found. Please make sure Angle library is installed, or disable OpenGL support.')
+ endif
+else
+ gl_deps += dependency('glesv2')
+ gl_deps += dependency('egl')
+endif
else
gl_deps += dependency('gl')
endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Eina: fix constness compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/60/head
in repository efl.
View the commit online.
commit 33c67eebe17283c5e8f57b8c661b99b50d289613
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:42:19 2024 +0200
Eina: fix constness compilation error with gcc 14
---
src/lib/eina/meson.build | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index a8f9cf82b7..4ab37d2112 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -371,13 +371,17 @@ eina_ext_deps += [iconv]
execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
+iconv_c_args = ''
if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
+ if iconv.found()
+ iconv_c_args = '-DWINICONV_CONST='
+ endif
endif
eina_lib = library('eina', eina_src,
- c_args : [package_c_args, '-DEINA_BUILD'],
+ c_args : [package_c_args, '-DEINA_BUILD', iconv_c_args],
include_directories : config_dir,
dependencies: eina_ext_deps + [eina_deps, evil],
install: true,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: Eina: fix constness compilation error with gcc 14
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch vtorri_winiconv
in repository efl.
View the commit online.
commit 33c67eebe17283c5e8f57b8c661b99b50d289613
Author: Vincent Torri
AuthorDate: Sat Jun 1 06:42:19 2024 +0200
Eina: fix constness compilation error with gcc 14
---
src/lib/eina/meson.build | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index a8f9cf82b7..4ab37d2112 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -371,13 +371,17 @@ eina_ext_deps += [iconv]
execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
+iconv_c_args = ''
if sys_windows == true
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
+ if iconv.found()
+ iconv_c_args = '-DWINICONV_CONST='
+ endif
endif
eina_lib = library('eina', eina_src,
- c_args : [package_c_args, '-DEINA_BUILD'],
+ c_args : [package_c_args, '-DEINA_BUILD', iconv_c_args],
include_directories : config_dir,
dependencies: eina_ext_deps + [eina_deps, evil],
install: true,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [enlightenment] 01/01: randr - add "use output" option to use output name (or not)
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit d7470837144eff2a1de5a66cdab347f76540aa1b
Author: Carsten Haitzler
AuthorDate: Thu May 30 18:45:12 2024 +0100
randr - add "use output" option to use output name (or not)
@feat
---
src/bin/e_randr2.c | 100 ---
src/bin/e_randr2.h | 1 +
src/modules/conf_randr/e_int_config_randr2.c | 20 ++
3 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c
index 24bc464e6..80807b912 100644
--- a/src/bin/e_randr2.c
+++ b/src/bin/e_randr2.c
@@ -91,6 +91,7 @@ e_randr2_init(void)
E_CONFIG_VAL(D, T, hotplug_response, DOUBLE);
E_CONFIG_VAL(D, T, restore, UCHAR);
E_CONFIG_VAL(D, T, use_cmd, UCHAR);
+ E_CONFIG_VAL(D, T, ignore_output, UCHAR);
E_CONFIG_VAL(D, T, ignore_hotplug_events, UCHAR);
E_CONFIG_VAL(D, T, ignore_acpi_events, UCHAR);
E_CONFIG_VAL(D, T, default_policy, UINT);
@@ -395,6 +396,7 @@ _config_load(void)
cfg->screens = NULL;
cfg->restore = 1;
cfg->use_cmd = 0;
+ cfg->ignore_output = 0;
cfg->ignore_hotplug_events = 0;
cfg->ignore_acpi_events = 0;
cfg->default_policy = E_RANDR2_POLICY_EXTEND;
@@ -644,9 +646,20 @@ _config_screen_match_count(E_Randr2 *r, E_Config_Randr2 *cfg)
if (!cs->id) continue;
EINA_LIST_FOREACH(r->screens, ll, s)
{
+ const char *s1, *s2;
+
if ((!s->id) || (!s->info.connected) ||
(_screen_closed(s))) continue;
- if (!strcmp(cs->id, s->id)) count++;
+ s1 = cs->id;
+ s2 = s->id;
+ if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+ {
+ s1 = strchr(cs->id, '/');
+ if (!s1) s1 = cs->id;
+ s2 = strchr(s->id, '/');
+ if (!s2) s2 = s->id;
+ }
+ if (!strcmp(s1, s2)) count++;
}
}
return count;
@@ -667,10 +680,18 @@ _screens_fingerprint(E_Randr2 *r)
if (!s->id) eina_strbuf_append(buf, ":NULL:");
else
{
+ const char *s1;
+
eina_strbuf_append(buf, ":");
- eina_strbuf_append(buf, s->id);
+ s1 = s->id;
+ if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+ {
+ s1 = strchr(s->id, '/');
+ if (!s1) s1 = s->id;
+ }
+ eina_strbuf_append(buf, s1);
eina_strbuf_append(buf, ":");
-// Don't do this asbecause this forces a screen replug when you open and
+// Don't do this because this forces a screen replug when you open and
// close your laptop lid and if that is the only thing you open or close...
// if (s->info.lid_closed) eina_strbuf_append(buf, ":LC:");
// else eina_strbuf_append(buf, ":LO:");
@@ -733,7 +754,23 @@ _screens_differ(E_Randr2 *r1, E_Randr2 *r2)
printf("RRR: look at r1 screen ID %s\n", ss->id);
else
printf("RRR: look at r1 screen ID NIL\n");
- if ((ss->id) && (!strcmp(s->id, ss->id))) break;
+
+ if (ss->id)
+ {
+ const char *ss1, *ss2;
+
+ ss1 = s->id;
+ ss2 = ss->id;
+ if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+{
+ ss1 = strchr(s->id, '/');
+ if (!ss1) ss1 = s->id;
+ ss2 = strchr(ss->id, '/');
+ if (!ss2) ss2 = ss->id;
+}
+
+ if (!strcmp(ss1, ss2)) break;
+ }
ss = NULL;
}
if (!ss)
@@ -973,7 +1010,19 @@ _screen_id_find(const char *id)
Eina_List *l;
EINA_LIST_FOREACH(e_randr2->screens, l, s)
{
-if (!strcmp(s->id, id)) return s;
+const char *s1, *s2;
+
+s1 = s->id;
+s2 = id;
+if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+ {
+ s1 = strchr(s->id, '/');
+ if (!s1) s1 = s->id;
+ s2 = strchr(id, '/');
+ if (!s2) s2 = id;
+ }
+
+if (!strcmp(s1, s2)) return s;
}
return NULL;
}
@@ -1001,8 +1050,21 @@ _config_screen_string_find(E_Config_Randr2 *cfg, const char *id)
if ((!id) || (!cfg)) return NULL;
EINA_LIST_FOREACH(cfg->screens, l, cs)
{
+const char *s1, *s2;
+
if (!cs->id) continue;
-if (!strcmp(cs->id, id)) return cs;
+
+s1 = cs->id;
+s2 = id;
+if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+ {
+ s1 = strchr(cs->id, '/');
+ if (!s1) s1 = cs->id;
+ s2 = strchr(id, '/');
+ if (!s2) s2
[EGIT] [efl] 05/07: tests - fix calloc num, size
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 7e346e7bc252c5a1103f2bcb0a28e30cb265d9eb
Author: Carsten Haitzler
AuthorDate: Thu May 30 16:52:55 2024 +0100
tests - fix calloc num, size
@fix
---
src/bin/elementary/test_label.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/elementary/test_label.c b/src/bin/elementary/test_label.c
index 9673e80f59..a993e4d45c 100644
--- a/src/bin/elementary/test_label.c
+++ b/src/bin/elementary/test_label.c
@@ -487,7 +487,7 @@ char * get_fit_status(Eo * textblock)
void
test_textblock_fit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- app = calloc(sizeof(APP), 1);
+ app = calloc(1, sizeof(APP));
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
@@ -616,7 +616,7 @@ static void _btn_clicked_mem(void *data EINA_UNUSED, Eo *obj, void *eventInfo EI
void
test_text_memory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- app_mem = calloc(sizeof(APP_MEM), 1);
+ app_mem = calloc(1, sizeof(APP_MEM));
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 02/07: re-indent as misleading indents lead to warnings
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 659640e4f417187c068a492c7054f8e3b0fcf38c
Author: Carsten Haitzler
AuthorDate: Thu May 30 11:15:26 2024 +0100
re-indent as misleading indents lead to warnings
poorly formatted code making warnings. fix.
---
src/tests/eina/eina_test_list.c | 123
1 file changed, 62 insertions(+), 61 deletions(-)
diff --git a/src/tests/eina/eina_test_list.c b/src/tests/eina/eina_test_list.c
index e663064666..1001a402d1 100644
--- a/src/tests/eina/eina_test_list.c
+++ b/src/tests/eina/eina_test_list.c
@@ -219,84 +219,85 @@ EFL_END_TEST
EFL_START_TEST(eina_test_list_merge)
{
- Eina_List *l1;
- Eina_List *l2;
- Eina_List *l3;
- Eina_List *l4;
- Eina_List *l5;
- int data[] = { 6, 9, 42, 1, 7, 9, 81, 1664, 1337, 3, 21, 10, 0, 5, 2008 };
- int i;
+ Eina_List *l1;
+ Eina_List *l2;
+ Eina_List *l3;
+ Eina_List *l4;
+ Eina_List *l5;
+ int data[] = { 6, 9, 42, 1, 7, 9, 81, 1664, 1337, 3, 21, 10, 0, 5, 2008 };
+ int i;
- l1 = eina_list_append(NULL, [0]);
- l1 = eina_list_append(l1, [1]);
- l1 = eina_list_append(l1, [2]);
- l1 = eina_list_append(l1, [3]);
- fail_if(l1 == NULL);
+ l1 = eina_list_append(NULL, [0]);
+ l1 = eina_list_append(l1, [1]);
+ l1 = eina_list_append(l1, [2]);
+ l1 = eina_list_append(l1, [3]);
+ fail_if(l1 == NULL);
- l2 = eina_list_append(NULL, [4]);
- l2 = eina_list_append(l2, [5]);
- fail_if(l2 == NULL);
+ l2 = eina_list_append(NULL, [4]);
+ l2 = eina_list_append(l2, [5]);
+ fail_if(l2 == NULL);
- l1 = eina_list_merge(l1, l2);
- fail_if(l1 == NULL);
- fail_if(eina_list_count(l1) != 6);
- for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next)
- fail_if(l2->data != [i]);
- fail_if(i != 6);
- fail_if(l2 != NULL);
+ l1 = eina_list_merge(l1, l2);
+ fail_if(l1 == NULL);
+ fail_if(eina_list_count(l1) != 6);
+ for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next)
+fail_if(l2->data != [i]);
- eina_list_free(l1);
+ fail_if(i != 6);
+ fail_if(l2 != NULL);
- l1 = eina_list_append(NULL, [0]);
- l1 = eina_list_append(l1, [1]);
- fail_if(l1 == NULL);
+ eina_list_free(l1);
- l2 = eina_list_append(NULL, [2]);
- l2 = eina_list_append(l2, [3]);
- l2 = eina_list_append(l2, [4]);
- l2 = eina_list_append(l2, [5]);
- fail_if(l2 == NULL);
+ l1 = eina_list_append(NULL, [0]);
+ l1 = eina_list_append(l1, [1]);
+ fail_if(l1 == NULL);
- l1 = eina_list_merge(l1, l2);
- fail_if(l1 == NULL);
- fail_if(eina_list_count(l1) != 6);
- for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next)
- fail_if(l2->data != [i]);
- fail_if(i != 6);
- fail_if(l2 != NULL);
+ l2 = eina_list_append(NULL, [2]);
+ l2 = eina_list_append(l2, [3]);
+ l2 = eina_list_append(l2, [4]);
+ l2 = eina_list_append(l2, [5]);
+ fail_if(l2 == NULL);
- l3 = eina_list_append(NULL, [6]);
- l3 = eina_list_append(l3, [7]);
- l3 = eina_list_append(l3, [8]);
+ l1 = eina_list_merge(l1, l2);
+ fail_if(l1 == NULL);
+ fail_if(eina_list_count(l1) != 6);
+ for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next)
+fail_if(l2->data != [i]);
- l4 = eina_list_append(NULL, [9]);
- l4 = eina_list_append(l4, [10]);
- l4 = eina_list_append(l4, [11]);
+ fail_if(i != 6);
+ fail_if(l2 != NULL);
- l5 = eina_list_append(NULL, [12]);
- l5 = eina_list_append(l5, [13]);
- l5 = eina_list_append(l5, [14]);
+ l3 = eina_list_append(NULL, [6]);
+ l3 = eina_list_append(l3, [7]);
+ l3 = eina_list_append(l3, [8]);
- l1 = eina_list_sort(l1, -1, eina_int_cmp);
- l3 = eina_list_sort(l3, -1, eina_int_cmp);
- l4 = eina_list_sort(l4, -1, eina_int_cmp);
- l5 = eina_list_sort(l5, -1, eina_int_cmp);
+ l4 = eina_list_append(NULL, [9]);
+ l4 = eina_list_append(l4, [10]);
+ l4 = eina_list_append(l4, [11]);
- l1 = eina_list_sorted_merge(l1, l3, eina_int_cmp);
- fail_if(l1 == NULL);
- fail_if(eina_list_count(l1) != 9);
+ l5 = eina_list_append(NULL, [12]);
+ l5 = eina_list_append(l5, [13]);
+ l5 = eina_list_append(l5, [14]);
- l1 = eina_list_sorted_merge(l1, l4, eina_int_cmp);
- fail_if(l1 == NULL);
- fail_if(eina_list_count(l1) != 12);
+ l1 = eina_list_sort(l1, -1, eina_int_cmp);
+ l3 = eina_list_sort(l3, -1, eina_int_cmp);
+ l4 = eina_list_sort(l4, -1, eina_int_cmp);
+ l5 = eina_list_sort(l5, -1, eina_int_cmp);
- l1 = eina_list_sorted_merge(l1, l5, eina_int_cmp);
- fail_if(l1 == NULL);
- fail_if(eina_list_count(l1) != 15);
+ l1 = eina_list_sorted_merge(l1, l3, eina_int_cmp);
+ fail_if(l1 == NULL);
+ fail_if(eina_list_count(l1) != 9);
- fail_if(!eina_list_sorted_check(l1));
+ l1 = eina_list_sorted_merge(l1, l4, eina_int_cmp);
+ fail_if(l1 == NULL);
+ fail_if(eina_list_count(l1) != 12);
+
[EGIT] [efl] 01/07: eina - test - lalloc - fix indenting as its totally misleading
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 18177756aeec313087c02b3c07c00cee36313454
Author: Carsten Haitzler
AuthorDate: Thu May 30 09:18:46 2024 +0100
eina - test - lalloc - fix indenting as its totally misleading
poorly written test case with wrong indents implying fail_if's were in
the for loop! no actual change to results.
---
src/tests/eina/eina_test_lalloc.c | 35 +++
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/tests/eina/eina_test_lalloc.c b/src/tests/eina/eina_test_lalloc.c
index 6e5fd4799e..547fadc315 100644
--- a/src/tests/eina/eina_test_lalloc.c
+++ b/src/tests/eina/eina_test_lalloc.c
@@ -59,27 +59,30 @@ _test_free(Eina_Lazy_Allocator_Test *elat)
EFL_START_TEST(eina_lalloc_simple)
{
- Eina_Lazy_Allocator_Test *elat;
- Eina_Lalloc *test;
- int i;
+ Eina_Lazy_Allocator_Test *elat;
+ Eina_Lalloc *test;
+ int i;
- elat = calloc(1, sizeof (Eina_Lazy_Allocator_Test));
- fail_if(!elat);
+ elat = calloc(1, sizeof (Eina_Lazy_Allocator_Test));
+ fail_if(!elat);
- test = eina_lalloc_new(elat, EINA_LALLOC_ALLOC(
- _test_alloc), EINA_LALLOC_FREE(_test_free), 10);
- fail_if(!test);
+ test = eina_lalloc_new(elat,
+ EINA_LALLOC_ALLOC(_test_alloc),
+ EINA_LALLOC_FREE(_test_free), 10);
+ fail_if(!test);
- for (i = 0; i < 10; ++i)
- fail_if(eina_lalloc_element_add(test) != EINA_TRUE);
- fail_if(eina_lalloc_element_add(test) != EINA_FALSE);
- fail_if(eina_lalloc_elements_add(test, 5) != EINA_TRUE);
- for (i = 0; i < 21; ++i)
- fail_if(eina_lalloc_element_add(test) != EINA_TRUE);
+ for (i = 0; i < 10; ++i)
+fail_if(eina_lalloc_element_add(test) != EINA_TRUE);
- fail_if(eina_lalloc_elements_add(test, 50) != EINA_FALSE);
+ fail_if(eina_lalloc_element_add(test) != EINA_FALSE);
+ fail_if(eina_lalloc_elements_add(test, 5) != EINA_TRUE);
- eina_lalloc_free(test);
+ for (i = 0; i < 21; ++i)
+fail_if(eina_lalloc_element_add(test) != EINA_TRUE);
+
+ fail_if(eina_lalloc_elements_add(test, 50) != EINA_FALSE);
+
+ eina_lalloc_free(test);
}
EFL_END_TEST
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 04/07: tests - elm - disable unused test func
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit b3a83fdea671e2bcf2b0a98e02a53a62afdc29c0
Author: Carsten Haitzler
AuthorDate: Thu May 30 11:29:52 2024 +0100
tests - elm - disable unused test func
fix warnings
---
src/tests/elementary/elm_test_video.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index 0d372960ec..970908dffd 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -26,6 +26,7 @@ EFL_START_TEST(elm_video_legacy_type_check)
}
EFL_END_TEST
+/*
EFL_START_TEST(elm_atspi_role_get)
{
Evas_Object *win, *video;
@@ -40,6 +41,7 @@ EFL_START_TEST(elm_atspi_role_get)
}
EFL_END_TEST
+*/
void elm_test_video(TCase *tc)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 07/07: tests - disable fmt warn for fail/ck asserts bc of check added NULL
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit ebd24a481563dcf61f6a29811246255822b7e60b
Author: Carsten Haitzler
AuthorDate: Thu May 30 17:40:16 2024 +0100
tests - disable fmt warn for fail/ck asserts bc of check added NULL
check adds a NULL and this messes the format warning checks in the
check macro - so disable this warning where this is done - warning
noise we don't need.
---
src/tests/ecore/ecore_test_timer.c | 24 +++
.../ecore_con/ecore_con_test_efl_net_ip_address.c | 8 ++-
src/tests/eina/eina_test_value.c | 24 +++
src/tests/eio/efl_io_model_test_file.c | 3 +++
src/tests/eio/efl_io_model_test_monitor_add.c | 3 +++
src/tests/evas/evas_test_filters.c | 27 ++
src/tests/evas/evas_test_image.c | 12 ++
src/tests/evas/evas_test_render_engines.c | 8 ++-
8 files changed, 107 insertions(+), 2 deletions(-)
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index caaa643f55..de4958738d 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -53,18 +53,27 @@ _timer2_cb(void *data)
timer->num_elem = 0;
// check add/delay timer 2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if(timer->add_timer2 > 1, "Error add/delay timer");
+#pragma GCC diagnostic pop
// check set new delay for timer 1
ecore_timer_delay(timer->timer1, timer->delay_1[timer->num_elem]);
// check set new interval for timer 1
ecore_timer_interval_set(timer->timer1, timer->interval_1[timer->num_elem]);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if(!EINA_DBL_EQ(timer->interval_1[timer->num_elem], ecore_timer_interval_get(timer->timer1)), "Error set new interval");
+#pragma GCC diagnostic pop
// check set new precision
ecore_timer_precision_set(timer->precision[timer->num_elem]);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if(!EINA_DBL_EQ(timer->precision[timer->num_elem], ecore_timer_precision_get()), "Error set new precision");
+#pragma GCC diagnostic pop
// check removal timer 2
if (ecore_timer_del(timer->timer2))
@@ -100,7 +109,10 @@ _timer4_cb(void *data)
// check frezze/thaw timer 3
if (freeze_thaw)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if(timer->check_freeze_thaw_timer3 != timer->count_timer3, "Error frezze/thaw timer");
+#pragma GCC diagnostic pop
ecore_timer_thaw(timer->timer3);
freeze_thaw = 0;
@@ -153,7 +165,10 @@ EFL_START_TEST(ecore_test_timers)
timer.timer4 = ecore_timer_add(TIMEOUT_4, _timer4_cb, );
timer.timer5 = ecore_timer_add(TIMEOUT_5, _timer5_cb, );
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if((!timer.timer1 || !timer.timer2 || !timer.timer3 || !timer.timer4 || !timer.timer5), "Error add timer\n");
+#pragma GCC diagnostic pop
ecore_main_loop_begin();
@@ -207,7 +222,10 @@ EFL_START_TEST(ecore_test_timer_inside_call)
c->t = ecore_timer_add(0.01, _timeri_cb, c);
ecore_timer_add(1.0, timeout_timer_cb, NULL);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if(!c->t, "Error add timer\n");
+#pragma GCC diagnostic pop
ecore_main_loop_begin();
}
@@ -217,7 +235,10 @@ EFL_END_TEST
EFL_START_TEST(ecore_test_timer_valid_callbackfunc)
{
Ecore_Timer *t = NULL;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if((t = ecore_timer_add(0.5, NULL, NULL)), "ERROR: Invalid callback func!\n");
+#pragma GCC diagnostic pop
}
EFL_END_TEST
@@ -259,7 +280,10 @@ _timer_cb(void *data)
{
count++;
int num = (intptr_t) data;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
fail_if (num != count, "Error timer is called out of order");
+#pragma GCC diagnostic pop
if (count == 8) ecore_main_loop_quit();
return ECORE_CALLBACK_CANCEL;
}
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index dda74b4c04..4a1724ce0b 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -172,13 +172,16 @@ _assert_found_internal(const char *file, int line, const struct resolve_ctx *ctx
unsigned int i, len;
const Efl_Net_Ip_Address *o;
- if (ctx->err != err)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+ if (ctx->err != err)
_ck_assert_failed(file, line, "Failed",
"Expected
[EGIT] [efl] 03/07: fail_if doesnt need the NULL - causes warnings
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository efl. View the commit online. commit c9dae9861186c189fdef741a573a31030efdb4a0 Author: Carsten Haitzler AuthorDate: Thu May 30 11:16:01 2024 +0100 fail_if doesnt need the NULL - causes warnings --- src/tests/eo/suite/eo_test_general.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 55c93cb9da..516a5044ab 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -991,7 +991,7 @@ EFL_START_TEST(eo_magic_checks) simple_a_set((Efl_Class *) buf, 1); simple_a_set(efl_super((Efl_Class *) buf, SIMPLE_CLASS), ++i); simple_a_set(efl_super(SIMPLE_CLASS, (Efl_Class *) buf), ++i); -fail_if(efl_class_new(NULL, (Efl_Class *) buf), NULL); +fail_if(efl_class_new(NULL, (Efl_Class *) buf)); efl_xref(obj, (Eo *) buf); efl_xunref(obj, (Eo *) buf); -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efl] 06/07: eina - value - disable warnings for ptr math
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 305750875ec50b18788cc27cb6d554799ecbfa5e
Author: Carsten Haitzler
AuthorDate: Thu May 30 17:07:05 2024 +0100
eina - value - disable warnings for ptr math
we over-alloc thus this warning is not right. silence the warning
---
src/lib/eina/eina_inline_value.x | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/lib/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x
index 649cab1900..00beecbc47 100644
--- a/src/lib/eina/eina_inline_value.x
+++ b/src/lib/eina/eina_inline_value.x
@@ -486,14 +486,20 @@ eina_value_pset(Eina_Value *value, const void *ptr)
{
if (type == EINA_VALUE_TYPE_STRINGSHARE)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
const char *str = *((const char * const *) ptr);
+#pragma GCC diagnostic pop
return eina_stringshare_replace((const char **)>value.ptr,
str);
}
else if (type == EINA_VALUE_TYPE_STRING)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
const char *str = *((const char * const *) ptr);
+#pragma GCC diagnostic pop
if (value->value.ptr == str) return EINA_TRUE;
if (!str)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [enlightenment] 01/01: fix calloc num, size where it's wrong
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit 6547408cece6ad43ac32c4fc754288018c0da2b0
Author: Carsten Haitzler
AuthorDate: Thu May 30 17:43:56 2024 +0100
fix calloc num, size where it's wrong
@fix
---
src/bin/e_font.c | 4 ++--
src/bin/e_imc_main.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index 81423aca6..e7171019b 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -163,7 +163,7 @@ _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, con
int len;
len = s1 - font;
-name = calloc(sizeof(char), len + 1);
+name = calloc(len + 1, sizeof(char));
strncpy(name, font, len);
/* Get subname (should be english) */
@@ -204,7 +204,7 @@ _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, con
len = s2 - style;
style_old = style;
- style = calloc(sizeof(char), len + 1);
+ style = calloc(len + 1, sizeof(char));
strncpy(style, style_old, len);
efp->styles = eina_list_append(efp->styles, eina_stringshare_add(style));
free(style);
diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c
index cef9253ad..91f6cf859 100644
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@@ -145,7 +145,7 @@ main(int argc, char **argv)
/* else create new imc */
if (write_ops != 0)
{
-write_imc = calloc(sizeof(E_Input_Method_Config), 1);
+write_imc = calloc(1, sizeof(E_Input_Method_Config));
write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
if (read_imc)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: evas - arm neon asm - fix initial value of some regs/vars to be zero
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 956eeb2b8cedf98c2f2c611bd05590630d7ac54f
Author: Carsten Haitzler
AuthorDate: Thu May 30 09:08:01 2024 +0100
evas - arm neon asm - fix initial value of some regs/vars to be zero
this has been annoying me for a long time - fix assuming these
regs/vars are zero. they likely are not. ensure that.
@fix
---
src/lib/evas/common/evas_map_image_loop.c | 18 +-
.../common/evas_op_blend/op_blend_mask_color_neon.c| 6 +++---
.../common/evas_op_blend/op_blend_pixel_mask_neon.c| 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/lib/evas/common/evas_map_image_loop.c b/src/lib/evas/common/evas_map_image_loop.c
index e44988ebf2..fb8dee33cb 100644
--- a/src/lib/evas/common/evas_map_image_loop.c
+++ b/src/lib/evas/common/evas_map_image_loop.c
@@ -10,7 +10,7 @@
# ifdef SCALE_USING_NEON
# ifndef COLBLACK
- uint16x4_t temp_16x4;
+ uint16x4_t temp_16x4 = { 0, 0, 0, 0 };
uint16x4_t rv_16x4;
uint16x4_t val1_16x4;
uint16x4_t val3_16x4;
@@ -19,8 +19,8 @@
uint16x8_t val2_val4_16x8;
uint16x8_t x255_16x8;
uint32x2_t res_32x2;
- uint32x2_t val1_val3_32x2;
- uint32x2_t val2_val4_32x2;
+ uint32x2_t val1_val3_32x2 = { 0, 0 };
+ uint32x2_t val2_val4_32x2 = { 0, 0 };
uint8x8_t val1_val3_8x8;
uint8x8_t val2_val4_8x8;
@@ -33,7 +33,7 @@
uint16x4_t c1_val3_16x4;
uint16x8_t c1_16x8;
uint16x8_t c1_val3_16x8;
- uint32x2_t c1_32x2;
+ uint32x2_t c1_32x2 = { 0, 0 };
uint8x8_t c1_8x8;
uint8x8_t c1_val3_8x8;
@@ -49,7 +49,7 @@
uint16x8_t c1_val1_16x8;
uint16x8_t c2_val3_16x8;
uint16x8_t cv_rv_16x8;
- uint32x2_t c1_c2_32x2;
+ uint32x2_t c1_c2_32x2 = { 0, 0 };
uint8x8_t c1_c2_8x8;
uint8x8_t val3_8x8;
uint16x8_t val3_16x8;
@@ -247,21 +247,21 @@
# ifndef COLBLACK
# ifdef COLMUL
uint16x4_t x255_16x4;
- uint16x4_t temp_16x4;
+ uint16x4_t temp_16x4 = { 0, 0, 0, 0 };
uint16x8_t cval_16x8;
uint32x2_t res_32x2;
uint8x8_t cval_8x8;
uint16x4_t c1_16x4;
uint16x4_t cval_16x4;
uint16x4_t val1_16x4;
- uint32x2_t val1_32x2;
+ uint32x2_t val1_32x2 = { 0, 0 };
uint8x8_t val1_8x8;
x255_16x4 = vdup_n_u16(0xff);
#ifdef COLSAME
uint16x8_t c1_16x8;
uint16x8_t val1_16x8;
- uint32x2_t c1_32x2;
+ uint32x2_t c1_32x2 = { 0, 0 };
uint8x8_t c1_8x8;
c1_32x2 = vset_lane_u32(c1, c1_32x2, 0);
@@ -277,7 +277,7 @@
uint16x4_t cv_16x4;
uint16x8_t c1_c2_16x8;
uint16x8_t val1_16x8;
- uint32x2_t c1_c2_32x2;
+ uint32x2_t c1_c2_32x2 = { 0, 0 };
uint8x8_t c1_c2_8x8;
c1_c2_32x2 = vset_lane_u32(c1, c1_c2_32x2, 0);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
index 78f58b5315..916c2d9d73 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
@@ -30,7 +30,7 @@ _op_blend_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, in
uint16x8_t temp1_16x8;
uint16x8_t x255_16x8;
uint32x2_t c_32x2;
- uint32x2_t m_32x2;
+ uint32x2_t m_32x2 = { 0, 0 };
uint32x4_t a_32x4;
uint32x4_t ad_32x4;
uint32x4_t cond_32x4;
@@ -294,7 +294,7 @@ _op_blend_mas_can_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d,
uint16x8_t m1_16x8;
uint16x8_t m_16x8;
uint32x2_t c_32x2;
- uint32x2_t m_32x2;
+ uint32x2_t m_32x2 = { 0, 0 };
uint32x4_t d_32x4;
uint32x4_t dc_32x4;
uint32x4_t m_32x4;
@@ -695,7 +695,7 @@ _op_blend_rel_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d
uint16x8_t temp1_16x8;
uint16x8_t x255_16x8;
uint32x2_t c_32x2;
- uint32x2_t m_32x2;
+ uint32x2_t m_32x2 = { 0, 0 };
uint32x4_t a_32x4;
uint32x4_t ad_32x4;
uint32x4_t cond_32x4;
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c
index 317e7d5ad4..cf22d54345 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c
@@ -13,7 +13,7 @@ _op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d,
uint16x8_t temp1_16x8;
uint16x8_t x255_16x8;
uint32_t m_32;
- uint32x2_t m_32x2;
+ uint32x2_t m_32x2 = {0, 0};
uint32x4_t a_32x4;
uint32x4_t ad_32x4;
uint32x4_t cond_32x4;
@@ -217,7 +217,7 @@ _op_blend_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, in
uint16x8_t temp0_16x8;
uint16x8_t temp1_16x8;
uint16x8_t x255_16x8;
- uint32x2_t m_32x2;
+ uint32x2_t m_32x2 = { 0, 0 };
uint32x4_t a_32x4;
uint32x4_t ad_32x4;
uint32x4_t cond_32x4;
--
To stop receiving notification
[EGIT] [enlightenment] 01/02: convertible - fix indents (fixes compiler warn)
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit 31f45efbfee1f9bff2ea5d09be48dc889633cd48
Author: Carsten Haitzler
AuthorDate: Thu May 30 07:58:28 2024 +0100
convertible - fix indents (fixes compiler warn)
no actual bug fixes - just formatting
---
src/modules/convertible/e-gadget-convertible.c | 67 +-
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/modules/convertible/e-gadget-convertible.c b/src/modules/convertible/e-gadget-convertible.c
index 14ba9db80..2af0d8795 100644
--- a/src/modules/convertible/e-gadget-convertible.c
+++ b/src/modules/convertible/e-gadget-convertible.c
@@ -5,52 +5,51 @@
#include "e-gadget-convertible.h"
#include "e_mod_main.h"
-
static void
_update_instances(const Instance *current_instance)
{
-Eina_List *l;
-Instance *instance;
-EINA_LIST_FOREACH(instances, l, instance)
-{
-if (current_instance != instance)
-{
-instance->locked_position = current_instance->locked_position;
-if (instance->locked_position == EINA_TRUE)
-edje_object_signal_emit(instance->o_button, "e,lock,rotation,icon", "convertible/tablet");
-else
-edje_object_signal_emit(instance->o_button, "e,unlock,rotation,icon", "convertible/tablet");
+ Eina_List *l;
+ Instance *instance;
- instance->disabled_keyboard = current_instance->disabled_keyboard;
-if (instance->disabled_keyboard == EINA_TRUE)
-edje_object_signal_emit(instance->o_button, "e,disable,keyboard,icon", "convertible/input");
-else
-edje_object_signal_emit(instance->o_button, "e,enable,keyboard,icon", "convertible/input");
+ EINA_LIST_FOREACH(instances, l, instance)
+{
+ if (current_instance != instance)
+{
+ instance->locked_position = current_instance->locked_position;
+ if (instance->locked_position == EINA_TRUE)
+edje_object_signal_emit(instance->o_button, "e,lock,rotation,icon", "convertible/tablet");
+ else
+edje_object_signal_emit(instance->o_button, "e,unlock,rotation,icon", "convertible/tablet");
+
+ instance->disabled_keyboard = current_instance->disabled_keyboard;
+ if (instance->disabled_keyboard == EINA_TRUE)
+edje_object_signal_emit(instance->o_button, "e,disable,keyboard,icon", "convertible/input");
+ else
+edje_object_signal_emit(instance->o_button, "e,enable,keyboard,icon", "convertible/input");
}
}
}
void
-_rotation_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED,
- const char *src EINA_UNUSED)
+_rotation_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
{
- Instance *inst = data;
- if (eina_str_has_prefix(sig, "e,unlock"))
- inst->locked_position = EINA_FALSE;
- if (eina_str_has_prefix(sig, "e,lock"))
- inst->locked_position = EINA_TRUE;
- _update_instances(inst);
+ Instance *inst = data;
+ if (eina_str_has_prefix(sig, "e,unlock"))
+inst->locked_position = EINA_FALSE;
+ if (eina_str_has_prefix(sig, "e,lock"))
+inst->locked_position = EINA_TRUE;
+ _update_instances(inst);
}
void
-_keyboard_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED,
- const char *src EINA_UNUSED)
+_keyboard_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
{
- Instance *inst = data;
- if (eina_str_has_prefix(sig, "e,enable,keyboard"))
- inst->disabled_keyboard = EINA_FALSE;
- if (eina_str_has_prefix(sig, "e,disable,keyboard"))
- inst->disabled_keyboard = EINA_TRUE;
- _update_instances(inst);
-
+ Instance *inst = data;
+ if (eina_str_has_prefix(sig, "e,enable,keyboard"))
+inst->disabled_keyboard = EINA_FALSE;
+ if (eina_str_has_prefix(sig, "e,disable,keyboard"))
+inst->disabled_keyboard = EINA_TRUE;
+ _update_instances(inst);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [enlightenment] 02/02: e dpms - start dpms in unknown state + debug prints/logs
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit a2d1c10d76dfc3fd72c399ca845fd2eb17f7a988
Author: Carsten Haitzler
AuthorDate: Thu May 30 07:59:18 2024 +0100
e dpms - start dpms in unknown state + debug prints/logs
@fix
---
src/bin/e_dpms.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index 71ba5f7f0..aadfb802d 100644
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -12,7 +12,7 @@ static Ecore_Event_Handler *_e_dpms_handler_desk_show = NULL;
static unsigned int _e_dpms_timeout_standby = 0;
static unsigned int _e_dpms_timeout_suspend = 0;
static unsigned int _e_dpms_timeout_off = 0;
-static int _e_dpms_enabled = EINA_FALSE;
+static int _e_dpms_enabled = -1;
E_API Eina_Bool e_dpms_actual = EINA_FALSE;
#ifdef HAVE_WAYLAND
@@ -43,15 +43,19 @@ e_dpms_update(void)
{
ecore_x_dpms_enabled_set(enabled);
e_dpms_actual = enabled;
+ if (_e_dpms_enabled) fprintf(stderr, "DPMS: on\n");
+ else fprintf(stderr, "DPMS: off\n");
}
else
{
ecore_x_dpms_enabled_set(0);
e_dpms_actual = EINA_FALSE;
+ fprintf(stderr, "DPMS: off\n");
}
}
#endif
}
+ else fprintf(stderr, "DPMS: unchanged (%s)\n", enabled ? "on" : "off");
if (!enabled) return;
if (e_config->screensaver_enable)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: elm - ui position mgr grid - fix calloc size, count
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit a819f00c04680307be941b2247831df8a40ca20d
Author: Carsten Haitzler
AuthorDate: Thu May 30 07:31:28 2024 +0100
elm - ui position mgr grid - fix calloc size, count
fix calloc size, num vs num, size.
@fix
---
src/lib/elementary/efl_ui_position_manager_grid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/efl_ui_position_manager_grid.c b/src/lib/elementary/efl_ui_position_manager_grid.c
index 59aabbe2b2..dd098a0747 100644
--- a/src/lib/elementary/efl_ui_position_manager_grid.c
+++ b/src/lib/elementary/efl_ui_position_manager_grid.c
@@ -122,7 +122,7 @@ _size_cache_require(Eo *obj EINA_UNUSED, Efl_Ui_Position_Manager_Grid_Data *pd)
pd->size_cache_dirty = EINA_FALSE;
if (pd->size_cache)
free(pd->size_cache);
- pd->size_cache = calloc(sizeof(int), eina_inarray_count(pd->group_cache));
+ pd->size_cache = calloc(eina_inarray_count(pd->group_cache), sizeof(int));
for (unsigned int i = 0; i < eina_inarray_count(pd->group_cache); ++i)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efl] 01/01: eina - hash - fix calloc to use right size of and count'
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efl.
View the commit online.
commit 8cc906628b9318a6c42b2563573fff7822395ac9
Author: Carsten Haitzler
AuthorDate: Thu May 30 07:29:09 2024 +0100
eina - hash - fix calloc to use right size of and count'
fixes a gcc warning and gcc is technically correct. calloc (num, size)
not calloc (size, num).
@fix
---
src/lib/eina/eina_hash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index a0edb8c692..68091b1f5b 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -225,7 +225,7 @@ eina_hash_add_alloc_by_hash(Eina_Hash *hash,
if (!hash->buckets)
{
-hash->buckets = calloc(sizeof (Eina_Rbtree *), hash->size);
+hash->buckets = calloc(hash->size, sizeof(Eina_Rbtree *));
if (!hash->buckets) goto on_error;
hash_head = NULL;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: add an efm task watcher with super basic ui
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 ce0776c5fb5ea8d88499a7907b3bb3ad8297af84
Author: Carsten Haitzler (Rasterman)
AuthorDate: Wed May 29 22:09:44 2024 +0100
add an efm task watcher with super basic ui
thuis starts a task/op/status watcher with a gui that can show tasks
with progress and some status. status is properly written out.
scanning and progress is properly calculated. it's beginning to really
work and be controllable.
---
src/backends/default/fs.c | 15 ++-
src/backends/default/mv.c | 33 +-
src/backends/default/open.c | 1 -
src/backends/default/status.c | 53 --
src/backends/default/status.h | 1 +
src/efm/efm_back_end.c| 4 +-
src/efm/efm_tasks.c | 238 ++
src/efm/meson.build | 10 ++
src/shared/status_mon.c | 223 +++
src/shared/status_mon.h | 17 +++
10 files changed, 574 insertions(+), 21 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index affe9b3..2da4b64 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -148,6 +148,7 @@ again_write:
}
else if (ret2 == ret)
{
+ status_pos(ret2, src);
off_ou += ret;
if (ret < size) break; // end of file
}
@@ -171,7 +172,11 @@ again_write:
goto err;
}
}
- else if (ret < size) break; // end of file
+ else
+{
+ status_pos(ret, src);
+ if (ret < size) break; // end of file
+}
}
}
}
@@ -433,16 +438,15 @@ fs_mv(const char *src, const char *dst, Eina_Bool report_err)
int ret;
const char *op = "Move";
- status_op("mv");
- status_count(1, src);
ret = rename(src, dst);
- if (ret == 0) return res;
+ if (ret == 0) goto done;
else
{
switch (errno)
{
case EXDEV: // revert to cp + rm
- return fs_cp_rm(src, dst, report_err, EINA_TRUE, EINA_TRUE);
+ res = fs_cp_rm(src, dst, report_err, EINA_TRUE, EINA_TRUE);
+ goto done;
break;
default:
if (report_err) _error_handle(src, dst, op, errno);
@@ -450,6 +454,7 @@ fs_mv(const char *src, const char *dst, Eina_Bool report_err)
break;
}
}
+done:
status_pos(1, src);
return res;
}
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index ff7a44c..e8287ec 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -98,6 +98,8 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
if (!buf) goto err;
status_begin();
+ status_op("mv");
+
EINA_LIST_FOREACH(files, l, fs)
{
struct stat stsrc, stdst;
@@ -113,12 +115,16 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
{
fname = ecore_file_file_get(fs->src);
if (!fname) break;
+// when monitoring/watching a status file dst dst=xxx allows you to place
+// progress in the right dst dir
+status_dst(fs->dst);
eina_strbuf_reset(buf);
eina_strbuf_append(buf, fs->dst);
eina_strbuf_append(buf, "/");
eina_strbuf_append(buf, fname);
+// mv the file ...
if (fs_mv(fs->src, eina_strbuf_string_get(buf), EINA_TRUE))
- {
+ { // it worked so deal with meta/thumbs
Eina_Bool src_can_write, dst_can_write;
const char *dstfile;
char *src_meta, *dst_meta;
@@ -133,15 +139,36 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
if (dst_can_write) dst_meta = meta_path_find(dstfile, "meta.efm");
else dst_meta = meta_path_user_find(dstfile, "meta.efm");
if ((src_meta) && (dst_meta) && (meta_path_prepare(dstfile)))
- fs_mv(src_meta, dst_meta, EINA_FALSE);
+ {
+status_count(1, src_meta);
+fs_mv(src_meta, dst_meta, EINA_FALSE);
+// XXX: how do we force a re-read of the meta file? also how to
+// merge? e.g. we dnd an icon into a dir - we may or may not at that
+// point write x,y to the meta file - but we have other fields we
+// will want to merge in ... so we don't want to mv here - we want
+// to merge sensibly... so ugh... bug already here ... we want
+// to also trigger an update of meta data for any efm backends
+// telling the front-ends...
+ }
free(src_meta);
free(dst_meta);
+
if (src_can_write) src_meta = meta_path_find(fs->src, "thumb.efm");
else src_meta = meta_path_user_find(fs->src, "thumb.efm");
if (dst_can_write) dst_meta =
[EGIT] [terminology] 02/02: Added translation using Weblate (Hungarian)
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch main in repository terminology. View the commit online. commit 1cc50a51830e8030d1bd0939c823ea9a0f7098b6 Author: Benedek Vigh (冯白诺) AuthorDate: Wed May 29 20:09:25 2024 +0200 Added translation using Weblate (Hungarian) Co-authored-by: Benedek Vigh (冯白诺) --- po/LINGUAS |2 +- po/hu.po | 1004 2 files changed, 1005 insertions(+), 1 deletion(-) diff --git a/po/LINGUAS b/po/LINGUAS index 1ef3fceb..6e43e4d4 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -ca da de el eo es fi fr he hi hr id it ja ko lt ms nb_NO nl pl pt pt_BR ru si sk sl sr sv tr uk vi zh_Hans +ca da de el eo es fi fr he hi hr hu id it ja ko lt ms nb_NO nl pl pt pt_BR ru si sk sl sr sv tr uk vi zh_Hans diff --git a/po/hu.po b/po/hu.po new file mode 100644 index ..a882e8e2 --- /dev/null +++ b/po/hu.po @@ -0,0 +1,1004 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# "Benedek Vigh (冯白诺)" , 2024. +msgid "" +msgstr "" +"Project-Id-Version: terminology\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-17 12:36+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: hu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/bin/about.c:129 src/bin/about.c:204 src/bin/termio.c:1308 +#: src/bin/termio.c:1317 +#, c-format +msgid "Copy '%s'" +msgstr "" + +#: src/bin/about.c:134 src/bin/about.c:209 src/bin/termio.c:1379 +msgid "Open" +msgstr "" + +#: src/bin/about.c:273 +msgid "Twitter: @_Terminology_" +msgstr "" + +#: src/bin/about.c:275 +msgid "YouTube channel" +msgstr "" + +#: src/bin/about.c:289 +#, c-format +msgid "" +"Terminology %sWhy should terminals be boring?This " +"terminal was written for Enlightenment, to use EFL and otherwise push the " +"boundaries of what a modern terminal emulator should be. We hope you enjoy " +"it.Copyright © 2012-%d by:%sDistributed under the 2-" +"clause BSD license detailed below:%s" +msgstr "" + +#: src/bin/colors.c:17 +msgid "Terminology's developers" +msgstr "" + +#: src/bin/controls.c:371 +msgid "Controls" +msgstr "" + +#: src/bin/controls.c:387 +msgid "New" +msgstr "" + +#: src/bin/controls.c:395 +msgid "Split V" +msgstr "" + +#: src/bin/controls.c:399 +msgid "Split H" +msgstr "" + +#: src/bin/controls.c:406 +msgid "Miniview" +msgstr "" + +#: src/bin/controls.c:413 src/bin/win.c:6205 +msgid "Set title" +msgstr "" + +#: src/bin/controls.c:424 src/bin/termio.c:1393 src/bin/termio.c:2803 +msgid "Copy" +msgstr "" + +#: src/bin/controls.c:430 +msgid "Paste" +msgstr "" + +#: src/bin/controls.c:436 +msgid "Settings" +msgstr "" + +#: src/bin/controls.c:442 +msgid "About" +msgstr "" + +#: src/bin/controls.c:451 +msgid "Grouped input" +msgstr "" + +#: src/bin/controls.c:463 +msgid "Close Terminal" +msgstr "" + +#: src/bin/gravatar.c:121 src/bin/main.c:898 src/bin/miniview.c:41 +#, c-format +msgid "Could not create logging domain '%s'" +msgstr "" + +#: src/bin/keyin.c:681 +msgid "Scrolling" +msgstr "" + +#: src/bin/keyin.c:682 +msgid "Scroll one page up" +msgstr "" + +#: src/bin/keyin.c:683 +msgid "Scroll one page down" +msgstr "" + +#: src/bin/keyin.c:684 +msgid "Scroll one line up" +msgstr "" + +#: src/bin/keyin.c:685 +msgid "Scroll one line down" +msgstr "" + +#: src/bin/keyin.c:686 +msgid "Go to the top of the backlog" +msgstr "" + +#: src/bin/keyin.c:687 +msgid "Reset scroll" +msgstr "" + +#: src/bin/keyin.c:689 +msgid "Copy/Paste" +msgstr "" + +#: src/bin/keyin.c:690 +msgid "Copy selection to Primary buffer" +msgstr "" + +#: src/bin/keyin.c:691 +msgid "Copy selection to Clipboard buffer" +msgstr "" + +#: src/bin/keyin.c:692 +msgid "Paste Primary buffer (highlight)" +msgstr "" + +#: src/bin/keyin.c:693 +msgid "Paste Clipboard buffer (ctrl+c/v)" +msgstr "" + +#: src/bin/keyin.c:695 +msgid "Splits/Tabs" +msgstr "" + +#: src/bin/keyin.c:696 +msgid "Focus the previous terminal" +msgstr "" + +#: src/bin/keyin.c:697 +msgid "Focus the next terminal" +msgstr "" + +#: src/bin/keyin.c:698 +msgid "Focus the terminal above" +msgstr "" + +#: src/bin/keyin.c:699 +msgid "Focus the terminal below" +msgstr "" + +#: src/bin/keyin.c:700 +msgid "Focus the terminal on the left" +msgstr "" + +#: src/bin/keyin.c:701 +msgid "Focus the terminal on the right" +msgstr "" + +#: src/bin/keyin.c:702 +msgid "Split horizontally (new below)" +msgstr "" + +#: src/bin/keyin.c:703 +msgid "Split vertically (new on right)" +msgstr "" + +#: src/bin/keyin.c:704 +msgid "Create a new \"tab\"" +msgstr "" + +#: src/bin/keyin.c:705 +msgid "Close the focused terminal" +msgstr "" + +#: src/bin/keyin.c:706 +msgid "Bring up \"tab\" switcher" +msgstr "" + +#: src/bin/keyin.c:707 +msgid "Switch to terminal tab 1" +msgstr "" + +#: src/bin/keyin.c:708 +msgid "Switch to terminal tab 2" +msgstr "" +
[EGIT] [terminology] 01/02: Translated using Weblate (Finnish)
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch main in repository terminology. View the commit online. commit 69f9e1609d027a9638799bc62cd70041c79ff3fe Author: Linus Virtanen AuthorDate: Wed May 29 20:09:24 2024 +0200 Translated using Weblate (Finnish) Currently translated at 100.0% (234 of 234 strings) Co-authored-by: Linus Virtanen Translate-URL: https://hosted.weblate.org/projects/terminology/terminology/fi/ Translation: Terminology/Terminology --- po/fi.po | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/fi.po b/po/fi.po index d6e89486..0921d69d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2,13 +2,13 @@ # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 # This file is distributed under the same license as the enlightenment package. # FIRST AUTHOR , 2014. -# Linus Virtanen , 2021. +# Linus Virtanen , 2021, 2024. msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-08-17 12:36+0200\n" -"PO-Revision-Date: 2021-10-12 19:21+\n" +"PO-Revision-Date: 2024-05-28 16:09+\n" "Last-Translator: Linus Virtanen \n" "Language-Team: Finnish \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.9-dev\n" +"X-Generator: Weblate 5.6-dev\n" #: src/bin/about.c:129 src/bin/about.c:204 src/bin/termio.c:1308 #: src/bin/termio.c:1317 @@ -505,7 +505,7 @@ msgstr "Läpikuultava" #: src/bin/options_background.c:565 msgid "Opacity:" -msgstr "" +msgstr "Läpikuultavuus:" #: src/bin/options_background.c:573 src/bin/options_background.c:574 #, c-format @@ -588,7 +588,7 @@ msgstr "Vieritä alas kun näppäintä painetaan" #: src/bin/options_behavior.c:396 msgid "React to key presses (typing sounds and animations)" -msgstr "" +msgstr "Reagoi näppäinpainalluksiin (kirjoitusäänet ja animaatiot)" #: src/bin/options_behavior.c:403 msgid "Audio Support for key presses DISABLED!" @@ -636,12 +636,11 @@ msgstr "Kytke päälle erityiset Terminology-pakokoodit" #: src/bin/options_behavior.c:418 msgid "Enable escape codes manipulating selections" -msgstr "" +msgstr "Kytke pakokoodeja hyödyntävät valinnat päälle" #: src/bin/options_behavior.c:419 -#, fuzzy msgid "Always treat Emojis as double-width characters" -msgstr "Käsittele hymiöt tuplaleveinä merkkeinä" +msgstr "Käsittele hymiöt aina kaksoisleveyksisinä merkkeinä" #: src/bin/options_behavior.c:420 msgid "" -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efm2] 03/03: come code cleaning
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 9c0cff7d786deda9e4767c6b3ab26f89ab93701f
Author: Carsten Haitzler (Rasterman)
AuthorDate: Sun May 26 16:52:56 2024 +0100
come code cleaning
---
src/backends/default/fs.c | 44 +---
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 9fb37a9..affe9b3 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -244,6 +244,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
mode_t old_umask;
struct timeval times[2];
const char*op = "";
+ intret;
if ((!src) || (!dst) || (strlen(src) < 1)) return EINA_FALSE;
@@ -287,7 +288,11 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
{
Eina_Strbuf *buf = eina_strbuf_new();
- if (!buf) abort();
+ if (!buf)
+{
+ fprintf(stderr, "Out of memory!\n");
+ abort();
+}
EINA_ITERATOR_FOREACH(it, s)
{
const char *fs = ecore_file_file_get(s);
@@ -377,34 +382,19 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
}
if ((rm) && (res))
{
- if (S_ISDIR(st.st_mode))
+ ret = 0;
+ if (S_ISDIR(st.st_mode)) ret = rmdir(src);
+ else ret = unlink(src);
+ if (ret != 0)
{
- if (rmdir(src) != 0)
+ switch (errno)
{
- switch (errno)
-{
-case ENOENT: // ignore missing
- break;
-default:
- _error_handle(src, NULL, op, errno);
- res = EINA_FALSE;
- goto err_unlink;
-}
-}
-}
- else
-{
- if (unlink(src) != 0)
-{
- switch (errno)
-{
-case ENOENT: // ignore missing
- break;
-default:
- _error_handle(src, NULL, op, errno);
- res = EINA_FALSE;
- goto err_unlink;
-}
+case ENOENT: // ignore missing
+ break;
+default:
+ _error_handle(src, NULL, op, errno);
+ res = EINA_FALSE;
+ goto err_unlink;
}
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 02/03: status - fix status to escape fields
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 fa4b0a3ed62b58ee5a422101560cbe67caecb2d3 Author: Carsten Haitzler (Rasterman) AuthorDate: Thu May 23 12:25:10 2024 +0100 status - fix status to escape fields --- src/backends/default/status.c | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/backends/default/status.c b/src/backends/default/status.c index 8501e39..cad830e 100644 --- a/src/backends/default/status.c +++ b/src/backends/default/status.c @@ -4,6 +4,7 @@ #define _GNU_SOURCE #include "status.h" +#include "esc.h" #include #include @@ -224,7 +225,7 @@ status_op(const char *op) msg = eina_thread_queue_send(status_thq, sizeof(Msg_Op), ); msg->type = MSG_OP; - msg->op = op ? strdup(op) : NULL; + msg->op = op ? escape(op) : NULL; eina_thread_queue_send_done(status_thq, ref); } @@ -237,7 +238,7 @@ status_count(unsigned long long num_inc, const char *str) msg = eina_thread_queue_send(status_thq, sizeof(Msg_Count), ); msg->type = MSG_COUNT; msg->inc = num_inc; - msg->str = str ? strdup(str) : NULL; + msg->str = str ? escape(str) : NULL; eina_thread_queue_send_done(status_thq, ref); } @@ -250,7 +251,7 @@ status_pos(unsigned long long pos_inc, const char *str) msg = eina_thread_queue_send(status_thq, sizeof(Msg_Pos), ); msg->type = MSG_POS; msg->inc = pos_inc; - msg->str = str ? strdup(str) : NULL; + msg->str = str ? escape(str) : NULL; eina_thread_queue_send_done(status_thq, ref); } @@ -262,8 +263,8 @@ status_error(const char *src, const char *dst, const char *str) msg = eina_thread_queue_send(status_thq, sizeof(Msg_Err), ); msg->type = MSG_ERR; - msg->src = "" ? strdup(src) : NULL; - msg->dst = dst ? strdup(dst) : NULL; - msg->str = str ? strdup(str) : NULL; + msg->src = "" ? escape(src) : NULL; + msg->dst = dst ? escape(dst) : NULL; + msg->str = str ? escape(str) : NULL; eina_thread_queue_send_done(status_thq, ref); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efm2] 01/03: add xattr to todo
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 26cb3fb674e38dba821195d079826704731426b1 Author: Carsten Haitzler (Rasterman) AuthorDate: Thu May 23 12:25:00 2024 +0100 add xattr to todo --- TODO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.md b/TODO.md index 6725896..4a22f75 100644 --- a/TODO.md +++ b/TODO.md @@ -90,6 +90,7 @@ * Smart support for devices * Badblocks support * Lsattr/chattr support +* Xattr support (get/set/list) * Syncing * rsync * syncthing -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efm2] 01/02: only scan if src + dst on different devices
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 db1bd0809d9328e4d2a830e008b43f637f72cd09
Author: Carsten Haitzler (Rasterman)
AuthorDate: Wed May 22 09:40:56 2024 +0100
only scan if src + dst on different devices
---
src/backends/default/mv.c | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index 2da6c80..ff7a44c 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -51,7 +51,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
File_Set*fs;
size_t sz;
char*src = "" *dst = NULL;
- char sbuf[4096 + 256];
+ char sbuf[PATH_MAX + 256];
eina_init();
eet_init();
@@ -89,8 +89,6 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
if (!home_dir) return 77; // no $HOME? definitely an error!
if (!config_dir)
{
- char sbuf[PATH_MAX];
-
snprintf(sbuf, sizeof(sbuf), "%s/.e/e", home_dir);
config_dir = eina_stringshare_add(sbuf);
}
@@ -102,8 +100,13 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
status_begin();
EINA_LIST_FOREACH(files, l, fs)
{
+struct stat stsrc, stdst;
+
if (strlen(fs->src) < 1) goto err2;
-if (!fs_scan(fs->src)) goto err2;
+if (lstat(fs->src, ) != 0) break;
+if (lstat(fs->dst, ) != 0) break;
+if (stsrc.st_dev == stdst.st_dev) status_count(1, fs->src);
+else if (!fs_scan(fs->src)) goto err2;
}
EINA_LIST_FOREACH(files, l, fs)
@@ -149,6 +152,12 @@ err2:
err:
if (buf) eina_strbuf_free(buf);
+ EINA_LIST_FREE(files, fs)
+ {
+eina_stringshare_del(fs->src);
+eina_stringshare_del(fs->dst);
+free(fs);
+ }
meta_shutdown();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 02/02: have sub opens auto exit properly when idle
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 c8059ff179c830fa6d2cbc0af0ed964c2498cdab
Author: Carsten Haitzler (Rasterman)
AuthorDate: Wed May 22 17:36:41 2024 +0100
have sub opens auto exit properly when idle
---
src/backends/default/open.c | 61 +
1 file changed, 56 insertions(+), 5 deletions(-)
diff --git a/src/backends/default/open.c b/src/backends/default/open.c
index 0ea4de8..ecce45d 100644
--- a/src/backends/default/open.c
+++ b/src/backends/default/open.c
@@ -17,7 +17,9 @@
#include
#include
+#include "Ecore_Common.h"
#include "cmd.h"
+#include "eina_types.h"
#include "sha.h"
#include "meta.h"
#include "thumb_check.h"
@@ -26,6 +28,8 @@
static const char *icon_theme = NULL;
static const char *config_dir = NULL;
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 Eina_Bool can_write = EINA_FALSE;
@@ -38,6 +42,7 @@ typedef struct
Ecore_Exe *exe;
Ecore_Timer *busy_delay_timer;
} Thumb;
+
static Ecore_Event_Handler *thumb_exe_del_handler = NULL;
static Eina_List *thumb_queue = NULL;
static Eina_List *thumb_busy_queue = NULL;
@@ -55,6 +60,41 @@ typedef struct
//static Eina_List *op_queue = NULL;
+static Eina_Bool
+_cb_auto_exit_timer(void *data EINA_UNUSED)
+{
+ ecore_main_loop_quit();
+ return EINA_FALSE;
+}
+
+static void
+_handle_exe_del(void)
+{
+ if (child_exes > 0)
+{
+ child_exes--;
+ if (child_exes <= 0)
+{
+ if (auto_exit)
+ecore_timer_add(1.0, _cb_auto_exit_timer, NULL);
+}
+}
+}
+
+static Eina_Bool
+_cb_auto_del_timer(void *data EINA_UNUSED)
+{
+ if ((child_exes <= 0) && (auto_exit)) ecore_main_loop_quit();
+ return EINA_FALSE;
+}
+
+static Eina_Bool
+_cb_exe_del(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event EINA_UNUSED)
+{
+ _handle_exe_del();
+ return ECORE_CALLBACK_DONE;
+}
+
typedef struct
{
const char *path;
@@ -126,7 +166,6 @@ _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);
- ecore_exe_free(sub->exe);
free(sub);
}
@@ -232,7 +271,6 @@ _cb_sub_exe_del(void *data, int ev_type EINA_UNUSED, void *event)
Ecore_Exe_Event_Del *ev = event;
if (sub->exe != ev->exe) return ECORE_CALLBACK_PASS_ON;
- // XXX: handle anything on sub del
_sub_del(sub);
return ECORE_CALLBACK_DONE;
}
@@ -285,15 +323,18 @@ _sub_open(const char *path, const char *backend)
eina_strbuf_append(buf, "/open");
}
}
+ 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,
+ 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));
eina_strbuf_free(buf);
buf = cmd_strbuf_new("dir-set");
@@ -369,6 +410,7 @@ _file_thumb_flush(void)
eina_strbuf_append_char(strbuf, ' ');
_strbuf_append_file_escaped(strbuf, th->thumb);
th->exe = ecore_exe_run(eina_strbuf_string_get(strbuf), th);
+ child_exes++;
}
eina_strbuf_free(strbuf);
}
@@ -1251,6 +1293,7 @@ _op_run(const char *op, Eina_List *files, const char *dst)
fprintf(stderr, "OP: op [%s]\n", eina_strbuf_string_get(buf));
exe = ecore_exe_pipe_run(eina_strbuf_string_get(buf), ECORE_EXE_PIPE_WRITE,
NULL);
+ child_exes++;
eina_strbuf_reset(buf);
EINA_LIST_FOREACH(files, l, s)
{
@@ -1477,6 +1520,8 @@ do_init(int argc EINA_UNUSED, const char **argv EINA_UNUSED)
snprintf(buf, sizeof(buf), "%s/.e/e", home_dir);
config_dir = eina_stringshare_add(buf);
}
+ s = getenv("EFM_OPEN_AUTOEXIT");
+ if ((s) && (atoi(s) == 1)) auto_exit = EINA_TRUE;
// maximum number of back-end thumbnailer slaves is num_cores - 2
// with a minimum of 1 (so dual core systems will be limited to 1
@@ -1493,6 +1538,12 @@ do_init(int argc EINA_UNUSED,
[EGIT] [efm2] 01/01: mark argc/v as unused
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 3900273435beb75accf615813861e166430d279b
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue May 21 18:04:52 2024 +0100
mark argc/v as unused
---
src/backends/default/mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index 73b4b0c..2da6c80 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -43,7 +43,7 @@ file_set_add(Eina_List *files, const char *src, const char *dst)
}
int
-main(int argc, char **argv)
+main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
{ // mv [src] [dstdir]
const char *fname, *home_dir;
Eina_Strbuf *buf = NULL;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: mknod - use rdev not dev!
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 58d95661080b7fa5fae87bcaba8fa2ed55e60dca
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue May 21 18:03:57 2024 +0100
mknod - use rdev not dev!
---
src/backends/default/fs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 491037e..9fb37a9 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -363,7 +363,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
{
if (cp)
{
- if (mknod(dst, st.st_mode, st.st_dev) < 0)
+ if (mknod(dst, st.st_mode, st.st_rdev) < 0)
{ // soft error? ignore?
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: move file list to stdin to fs op cmd
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 3e70c488c48a8f48ee55b7cf687ebde681377843
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue May 21 17:41:39 2024 +0100
move file list to stdin to fs op cmd
---
src/backends/default/fs.c| 13 ++--
src/backends/default/fs.h| 8 +--
src/backends/default/meson.build | 2 +
src/backends/default/mv.c| 141 ---
src/backends/default/open.c | 71 ++--
src/backends/default/status.c| 2 +
src/shared/esc.c | 66 ++
src/shared/esc.h | 7 ++
8 files changed, 239 insertions(+), 71 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 06f6216..491037e 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -70,7 +70,7 @@ _err: \
}
static void
-error_ok_pos(const char *src, const char *op, const char *str)
+error_ok_pos(const char *src EINA_UNUSED, const char *op, const char *str)
{
Eina_Strbuf *buf = error_strbuf_new(op);
@@ -247,12 +247,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;
- // first count how much work needs doing
- if (!fs_scan(src)) 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, ) != 0)
@@ -466,3 +463,5 @@ fs_mv(const char *src, const char *dst, Eina_Bool report_err)
status_pos(1, src);
return res;
}
+
+// add fs_cp() fs_rm() fs_trash() fs_rename()
\ No newline at end of file
diff --git a/src/backends/default/fs.h b/src/backends/default/fs.h
index cb50630..c60b212 100644
--- a/src/backends/default/fs.h
+++ b/src/backends/default/fs.h
@@ -2,9 +2,9 @@
#define FS_H
#include
-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/meson.build b/src/backends/default/meson.build
index c464309..b2f1749 100644
--- a/src/backends/default/meson.build
+++ b/src/backends/default/meson.build
@@ -9,6 +9,7 @@ inc = include_directories(
executable('open', [
'../../shared/cmd.c',
'../../shared/sha.c',
+'../../shared/esc.c',
'../../backends/common/fs_backend_core.c',
'open.c',
'meta.c'
@@ -36,6 +37,7 @@ executable('thumb', [
install_dir: dir)
executable('mv', [
'../../shared/sha.c',
+'../../shared/esc.c',
'fs.c',
'mv.c',
'meta.c',
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index 3cfe971..73b4b0c 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -14,23 +14,76 @@
#include "meta.h"
#include "status.h"
#include "fs.h"
+#include "esc.h"
static const char *config_dir = NULL;
+typedef struct _File_Set
+{
+ const char *src, *dst;
+} File_Set;
+
+static void
+mem_abort(void)
+{
+ fprintf(stderr, "Out of memory!\n");
+ abort();
+}
+
+static Eina_List *
+file_set_add(Eina_List *files, const char *src, const char *dst)
+{
+ File_Set *fs = calloc(1, sizeof(File_Set));
+ if (!fs) mem_abort();
+ fs->src = ""
+ fs->dst = eina_stringshare_add(dst);
+ if ((!fs->src) || (!fs->dst)) mem_abort();
+ files = eina_list_append(files, fs);
+ return files;
+}
+
int
main(int argc, char **argv)
-{ // mv [src] [dst]
- const char *src, *dst, *fname, *home_dir;
+{ // mv [src] [dstdir]
+ const char *fname, *home_dir;
Eina_Strbuf *buf = NULL;
+ Eina_List *files = NULL, *l;
+ File_Set*fs;
+ size_t sz;
+ char*src = "" *dst = NULL;
+ char sbuf[4096 + 256];
- if (argc < 3) return -1;
- src = ""
- dst = argv[2];
eina_init();
eet_init();
ecore_init();
efreet_init();
+ for (;;)
+{ // 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 (sbuf[sz - 1] == '\n') sbuf[sz - 1] = '\0'; // remove \n if there
+ if (!strncmp(sbuf, "src="" 4))
+{
+ if (src) free(src);
+ src = "" + 4);
+}
+ else if (!strncmp(sbuf, "dst=", 4))
+{
+ if (dst) free(dst);
+ dst =
[EGIT] [enlightenment] 01/01: Updating french translation
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository enlightenment. View the commit online. commit 2e54f9851e94ec9c3cf561b127e815970044df7d Author: Massimo Maiurana AuthorDate: Thu May 16 13:50:47 2024 +0200 Updating french translation --- po/fr.po | 39 +++ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/po/fr.po b/po/fr.po index f48d1d4de..896cf7608 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-23 21:51+0100\n" -"PO-Revision-Date: 2024-01-24 08:37+0100\n" +"PO-Revision-Date: 2024-05-15 14:34+0200\n" "Last-Translator: Philippe Jean Guillaumie \n" "Language-Team: French\n" "Language: fr\n" @@ -27,7 +27,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.4.3\n" "X-Poedit-SourceCharset: utf-8\n" #: src/bin/e_about.c:17 @@ -143,11 +143,11 @@ msgstr "Voulez-vous vraiment fermer la session ?" #: src/bin/e_actions.c:2401 msgid "Power off" -msgstr "Éteindre" +msgstr "Arrêt" #: src/bin/e_actions.c:2403 msgid "Are you sure you want to power off your computer?" -msgstr "Voulez-vous vraiment éteindre votre ordinateur ?" +msgstr "Voulez-vous vraiment arrêter votre ordinateur ?" #: src/bin/e_actions.c:2459 src/bin/e_actions.c:4011 msgid "Reboot" @@ -852,11 +852,11 @@ msgstr "Déconnexion" #: src/bin/e_actions.c:4003 msgid "Power Off Now" -msgstr "Éteindre directement" +msgstr "Arrêt immédiat" #: src/bin/e_actions.c:4007 msgid "Power Off" -msgstr "Éteindre" +msgstr "Arrêt" #: src/bin/e_actions.c:4015 msgid "Suspend Now" @@ -1471,12 +1471,12 @@ msgstr "%s a été interrompu par un signal d'interruption." #: src/bin/e_exec.c:1070 #, c-format msgid "%s was interrupted by a Quit Signal." -msgstr "%s a été interrompu par un signal de sortie." +msgstr "%s a été interrompu par un signal de sortie (Quit)." #: src/bin/e_exec.c:1074 #, c-format msgid "%s was interrupted by an Abort Signal." -msgstr "%s a été interrompu par un signal d'arrêt." +msgstr "%s a été interrompu par un signal d'abandon (Abort)." #: src/bin/e_exec.c:1077 #, c-format @@ -1929,8 +1929,8 @@ msgid "" "Are you sure you want to deletethe %d selected file in%s?" msgid_plural "" -"Are you sure you want to deletethe %d selected files in-">%s?" +"Are you sure you want to deletethe %d selected files in" +"%s?" msgstr[0] "" "Voulez-vous vraiment supprimer%d fichier sélectionné dans :%s ?" @@ -4315,8 +4315,8 @@ msgid "" "Powering off.You cannot perform any other system actionsonce a " "shutdown has been started." msgstr "" -"Extinction en cours.Vous ne pouvez pas effectuer d'autres actions " -"systèmependant cette phase." +"Arrêt en cours.Vous ne pouvez pas effectuer d'autres actions système+">pendant cette phase." #: src/bin/e_sys.c:1058 msgid "" @@ -5740,9 +5740,8 @@ msgstr "Erreur de raccourci clavier" #: src/modules/conf_bindings/e_int_config_keybindings.c:979 #, c-format msgid "" -"The binding key combination that you chose is already used by -">%s action.Please choose another binding key " -"combination." +"The binding key combination that you chose is already used by " +"%s action.Please choose another binding key combination." msgstr "" "La séquence de raccourci que vous avez choisie est déjà utiliséepar " "l'action %s.Choisissez une autre séquence de " @@ -8635,8 +8634,8 @@ msgstr "" "Ctrl+Tab détail des entrées (ça dépend du " "greffon)Ctrl+« x » va au greffon " "commençant par la lettre « x »Ctrl+Flèche gauche / " -"droite circule parmi les greffons" -"Ctrl+Flèche haut / bas va au premier / dernier élément" +"droite circule parmi les greffonsCtrl" +"+Flèche haut / bas va au premier / dernier élément" "Ctrl+1 commute le mode d'affichage (quitte cette " "page ;)Ctrl+2 commute le mode " "d'affichage en listeCtrl+3 commute le " @@ -9900,8 +9899,8 @@ msgid "" "either the app is unknown to usor it is not intended for use with this " "option.Please choose an action to take:" msgstr "" -"La fenêtre sélectionnée créée avec le nom :%set la classe :-">%s est introuvable dans la base de données desapplications pour " +"La fenêtre sélectionnée créée avec le nom :%set la classe :" +"%s est introuvable dans la base de données desapplications pour " "les accès rapides. Cela signifie que l'application est soit inconnue," "soit inutilisable dans ce cas de figure.Choisissez une action à " "appliquer :" @@ -10894,7 +10893,7 @@ msgstr "Solaris" #: src/modules/xkbswitch/e_mod_config.c:811 #: src/modules/xkbswitch/e_mod_config.c:1229 msgid "Terminate X" -msgstr "Arrêter serveur X" +msgstr "Arrêter le serveur X" #: src/modules/xkbswitch/e_mod_config.c:1073 msgid "Switch Layout" -- To stop
[EGIT] [e16-epplets] 01/01: Spec file: Set high rpm release number for non-release rpms
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository e16-epplets. View the commit online. commit da0dbeb68b3a05ec8c671cb9b576aa4de28e893c Author: Kim Woelders AuthorDate: Sat May 11 20:22:06 2024 +0200 Spec file: Set high rpm release number for non-release rpms Should normally avoid that distro rpms get installed over private build ones. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index eeeb172..ad4c836 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = api epplets dist-hook: $(top_builddir)/$(PACKAGE).spec -RPR_DEV = `echo -n "1.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD` +RPR_DEV = `echo -n "99.%(date '+%y%m%d').git"; git rev-parse --short=8 HEAD` RPR_REL = 1 SED_DEV = "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPR_DEV)/" SED_REL = "s/\@PACKAGE\@/@PACKAGE@/;s/\@VERSION\@/@VERSION@/;s/\@RPM_RELEASE\@/$(RPR_REL)/" -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efm2] 01/01: cleaner code - move file cp to own func etc.
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 3519ab0f91340d741a033a9c51a86e5138e84d17
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue Apr 30 17:07:37 2024 +0100
cleaner code - move file cp to own func etc.
---
src/backends/default/fs.c | 292 --
1 file changed, 153 insertions(+), 139 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 403704c..06f6216 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -15,22 +15,30 @@
#include "status.h"
#include "fs.h"
-// generic error handler. special case handling all errnos for everything is
-// pretty insane - so handle non-errors in switches and otherwise pass to
-// this tio handle the reast in a generic way.
-static void
-_error_handle(const char *src, const char *dst, const char *op, int errno_in)
+static Eina_Strbuf *
+error_strbuf_new(const char *op)
{
Eina_Strbuf *buf = eina_strbuf_new();
if (!buf) abort();
eina_strbuf_append(buf, op);
eina_strbuf_append(buf, ": ");
-#define HNDL(_err, _str) \
- _err: \
-eina_strbuf_append(buf, _str); \
-status_error(src, dst, eina_strbuf_string_get(buf)); \
-break
+ return buf;
+}
+
+// generic error handler. special case handling all errnos for everything is
+// pretty insane - so handle non-errors in switches and otherwise pass to
+// this tio handle the reast in a generic way.
+static void
+_error_handle(const char *src, const char *dst, const char *op, int errno_in)
+{
+ Eina_Strbuf *buf = error_strbuf_new(op);
+
+#define HNDL(_err, _str) \
+_err: \
+ eina_strbuf_append(buf, _str); \
+ status_error(src, dst, eina_strbuf_string_get(buf)); \
+ break
switch (errno_in)
{
HNDL(case EACCES, "Access denied");
@@ -61,6 +69,120 @@ _error_handle(const char *src, const char *dst, const char *op, int errno_in)
eina_strbuf_free(buf);
}
+static void
+error_ok_pos(const char *src, const char *op, const char *str)
+{
+ Eina_Strbuf *buf = error_strbuf_new(op);
+
+ eina_strbuf_append(buf, str);
+ status_pos(1, eina_strbuf_string_get(buf));
+ eina_strbuf_free(buf);
+}
+
+static Eina_Bool
+fs_cp_file(const char *src, const char *dst, const char *op, struct stat src_st)
+{
+ // copy a normal file from src to dst - use optimized copy range if possible
+ // 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;
+
+ fd_in = open(src, O_RDONLY);
+ fd_ou = open(dst, O_WRONLY | O_CREAT, src_st.st_mode);
+ if ((fd_in >= 0) && (fd_ou >= 0))
+{
+ ssize_t size = 1 * 1024 * 1024; // 1mb default for copy range
+ ssize_t ret, ret2;
+ off_t off_in = 0, off_ou = 0;
+ Eina_Bool old_copy = EINA_FALSE;
+
+ for (;;)
+{
+ if (old_copy)
+{
+ if (!old_copy_buf)
+{
+ size = 256 * 1024; // drop to 256k buffer for r+w
+ old_copy_buf = malloc(size);
+ if (!old_copy_buf)
+{
+ res = EINA_FALSE;
+ goto err;
+}
+}
+again_read:
+ ret = read(fd_in, old_copy_buf, size);
+ if (ret < 0)
+{
+ switch (errno)
+{
+case EAGAIN:
+case EINTR:
+ goto again_read;
+default:
+ _error_handle(src, NULL, op, errno);
+ res = EINA_FALSE;
+ goto err;
+}
+}
+ else
+{
+ off_in += ret;
+again_write:
+ ret2 = write(fd_ou, old_copy_buf, ret);
+ if (ret2 < 0)
+{
+ switch (errno)
+{
+case EAGAIN:
+case EINTR:
+ goto again_write;
+default:
+ _error_handle(NULL, dst, op, errno);
+ res = EINA_FALSE;
+ goto err;
+}
+}
+ else if (ret2 == ret)
+{
+ off_ou += ret;
+ if (ret < size) break; // end of file
+}
+}
+}
+ else
+
[EGIT] [efm2] 01/01: remove command and undef macro in fs.c
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 f60329683445e71f31f9794b9e5d399dc16ac4e2
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue Apr 30 15:03:30 2024 +0100
remove command and undef macro in fs.c
---
src/backends/default/fs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 1cb8db9..403704c 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -21,7 +21,6 @@
static void
_error_handle(const char *src, const char *dst, const char *op, int errno_in)
{
- // XXX: Fix str to be Move, Copy or Delete as it can handle any
Eina_Strbuf *buf = eina_strbuf_new();
if (!buf) abort();
@@ -58,6 +57,7 @@ _error_handle(const char *src, const char *dst, const char *op, int errno_in)
HNDL(case EEXIST, "File exists");
HNDL(default, "Unknown error");
}
+#undef HNDL
eina_strbuf_free(buf);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: handle errs properly in fs code without logic holes
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 f4b20c1fd870a032a642e2dbd3194c17b64133b2
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue Apr 30 14:46:11 2024 +0100
handle errs properly in fs code without logic holes
---
src/backends/default/fs.c | 83 +--
1 file changed, 52 insertions(+), 31 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index d64fccc..1cb8db9 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -125,6 +125,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
mode_t old_umask;
struct timeval times[2];
const char*op = "";
+ Eina_Strbuf *sbuf = NULL;
if (strlen(src) < 1) return EINA_FALSE;
@@ -135,19 +136,25 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
else if (!rm && cp) op = "Copy";
else if (rm && !cp) op = "Delete";
+ old_umask = umask(0);
if (lstat(src, ) != 0)
{
switch (errno)
{
case ENOENT: // ignore this error - file removed during scan ?
- status_pos(1, "Move - File vanished");
- break;
+ eina_strbuf_reset(sbuf);
+ eina_strbuf_append(sbuf, op);
+ eina_strbuf_append(sbuf, ": ");
+ eina_strbuf_append(sbuf, "File vanished");
+ status_pos(1, eina_strbuf_string_get(sbuf));
+ goto err;
default:
_error_handle(src, dst, op, errno);
- return EINA_FALSE;
+ res = EINA_FALSE;
+ goto err;
}
}
- old_umask = umask(0);
+ sbuf = eina_strbuf_new();
if (S_ISDIR(st.st_mode))
{ // it's a dir - scan this recursively
if (cp)
@@ -180,8 +187,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;
}
eina_strbuf_free(buf);
@@ -190,21 +197,6 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
}
eina_iterator_free(it);
}
- if ((rm) && (res))
-{
- if (rmdir(src) != 0)
-{
- switch (errno)
-{
-case ENOENT: // ignore missing
- break;
-default:
- _error_handle(src, NULL, op, errno);
- res = EINA_FALSE;
- goto err;
-}
-}
-}
}
else if (S_ISLNK(st.st_mode))
{
@@ -217,16 +209,24 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
if ((lnsz > 0) && (lnsz < (ssize_t)sizeof(link)))
{
if (symlink(link, dst) < 0)
-{ // XXX: soft error? e.g. mv on FAT fs?
- status_pos(1, "Move - Error creating symlink");
+{ // soft error? e.g. mv on FAT fs? report but move on
+ eina_strbuf_reset(sbuf);
+ eina_strbuf_append(sbuf, op);
+ eina_strbuf_append(sbuf, ": ");
+ eina_strbuf_append(sbuf, "Error creating symlink");
+ status_pos(1, eina_strbuf_string_get(sbuf));
}
}
else if (lnsz < 0)
-{ // XXX: handle read link err
+{
switch (errno)
{
case ENOENT: // ignore this error - file removed during scan ?
- status_pos(1, "Move - File vanished");
+ eina_strbuf_reset(sbuf);
+ eina_strbuf_append(sbuf, op);
+ eina_strbuf_append(sbuf, ": ");
+ eina_strbuf_append(sbuf, "File vanished");
+ status_pos(1, eina_strbuf_string_get(sbuf));
break;
default:
_error_handle(src, dst, op, errno);
@@ -234,7 +234,12 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
}
}
else // 0 sized symlink ... WAT?
-{ // XXX: handle this
+{
+ eina_strbuf_reset(sbuf);
+ eina_strbuf_append(sbuf, op);
+ eina_strbuf_append(sbuf, ": ");
+ eina_strbuf_append(sbuf, "Zero sized symlink");
+ status_error(src, NULL, eina_strbuf_string_get(sbuf));
}
}
}
@@ -243,7 +248,7 @@
[EGIT] [www-content] 01/01: Wiki page ubuntu-start.md changed with summary [Bump Ubuntu version in note about libjxl.] by Philippe Jean Guillaumie
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository www-content. View the commit online. commit 0cd2a978cc797a4400746a38b56c9bafd649c716 Author: Philippe Jean Guillaumie AuthorDate: Tue Apr 30 04:01:30 2024 -0700 Wiki page ubuntu-start.md changed with summary [Bump Ubuntu version in note about libjxl.] by Philippe Jean Guillaumie --- pages/docs/distros/ubuntu-start.md.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/docs/distros/ubuntu-start.md.txt b/pages/docs/distros/ubuntu-start.md.txt index 147795e95..f9799f1f2 100644 --- a/pages/docs/distros/ubuntu-start.md.txt +++ b/pages/docs/distros/ubuntu-start.md.txt @@ -151,7 +151,7 @@ As well as the dependencies specific for EFL: sudo apt install libssl-dev libsystemd-dev libjpeg-dev libglib2.0-dev libgstreamer1.0-dev liblua5.2-dev libfreetype-dev libfontconfig-dev libfribidi-dev libavahi-client-dev libharfbuzz-dev libibus-1.0-dev libx11-dev libxext-dev libxrender-dev libgl1-mesa-dev libgif-dev libtiff5-dev libpoppler-dev libpoppler-cpp-dev libspectre-dev libraw-dev librsvg2-dev libudev-dev libmount-dev libdbus-1-dev libpulse-dev libsndfile1-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxrandr-dev libxt [...] ``` > **NOTE:** -> Unless you are already running Ubuntu 23.04 or a higher version (simply install libjxl-dev), JPEG XL has to be compiled from source. If you need jxl support in efl, +> Unless you are running Ubuntu 24.04 or a higher version (simply install libjxl-dev), JPEG XL has to be compiled from source. If you need jxl support in efl, > please visit their [GitHub repository](https://github.com/libjxl/libjxl/) for more information. ### Step 3: Configuring the Software ### -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efm2] 01/01: fix err handling to contain correct operation
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 9413ca2e62c1495e3c95b269fd4520c77eb2617b
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue Apr 30 09:55:30 2024 +0100
fix err handling to contain correct operation
---
src/backends/default/fs.c | 135 ++
src/efm/efm_dnd.h | 1 +
2 files changed, 54 insertions(+), 82 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 53d19d0..d64fccc 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -19,80 +19,46 @@
// pretty insane - so handle non-errors in switches and otherwise pass to
// this tio handle the reast in a generic way.
static void
-_error_handle(const char *src, const char *dst, int errno_in)
+_error_handle(const char *src, const char *dst, const char *op, int errno_in)
{
+ // XXX: Fix str to be Move, Copy or Delete as it can handle any
+ Eina_Strbuf *buf = eina_strbuf_new();
+
+ if (!buf) abort();
+ eina_strbuf_append(buf, op);
+ eina_strbuf_append(buf, ": ");
+#define HNDL(_err, _str) \
+ _err: \
+eina_strbuf_append(buf, _str); \
+status_error(src, dst, eina_strbuf_string_get(buf)); \
+break
switch (errno_in)
{
-case EACCES:
- status_error(src, dst, "Move - Access denied");
- return;
-case EFAULT:
- status_error(src, dst, "Move - Memory Fault");
- return;
-case ELOOP:
- status_error(src, dst, "Move - Too many symlinks");
- return;
-case ENAMETOOLONG:
- status_error(src, dst, "Move - Name too long");
- return;
-case ENOMEM:
- status_error(src, dst, "Move - Out of memory");
- return;
-case ENOTDIR:
- status_error(src, dst, "Move - Path component is not a directory");
- return;
-case EOVERFLOW:
- status_error(src, dst, "Move - Overflow");
- return;
-case EDQUOT:
- status_error(src, dst, "Move - Over quota");
- return;
-case EINVAL:
- status_error(src, dst, "Move - Inmvalid value");
- return;
-case EMLINK:
- status_error(src, dst, "Move - Too many source links");
- return;
-case ENOENT:
- status_error(src, dst, "Move - File does not exist");
- return;
-case ENOSPC:
- status_error(src, dst, "Move - Disk full");
- return;
-case EPERM:
- status_error(src, dst, "Move - Permission denied");
- return;
-case EROFS:
- status_error(src, dst, "Move - Read only filesystem");
- return;
-case EBADF:
- status_error(src, dst, "Move - Bad file descriptor");
- return;
-case EIO:
- status_error(src, dst, "Move - I/O error");
- return;
-case EISDIR:
- status_error(src, dst, "Move - Destination is dir");
- return;
-case EFBIG:
- status_error(src, dst, "Move - File too big");
- return;
-case ETXTBSY:
- status_error(src, dst, "Move - Text file busy");
- return;
-case EBUSY:
- status_error(src, dst, "Move - File busy");
- return;
-case ENOTEMPTY:
- status_error(src, dst, "Move - Destination not empty");
- return;
-case EEXIST:
- status_error(src, dst, "Move - File exists");
- return;
-default: // WAT? we should not get here - we handled everything...
- status_error(src, dst, "Move - Unknown error");
- break;
+ HNDL(case EACCES, "Access denied");
+ HNDL(case EFAULT, "Memory Fault");
+ HNDL(case ELOOP, "Too many symlinks");
+ HNDL(case ENAMETOOLONG, "Name too long");
+ HNDL(case ENOMEM, "Out of memory");
+ HNDL(case ENOTDIR, "Path component is not a directory");
+ HNDL(case EOVERFLOW, "Overflow");
+ HNDL(case EDQUOT, "Over quota");
+ HNDL(case EINVAL, "Invalid value");
+ HNDL(case EMLINK, "Too many links");
+ HNDL(case ENOENT, "Does not exist");
+ HNDL(case ENOSPC, "Disk full");
+ HNDL(case EPERM, "Permission denied");
+ HNDL(case EROFS, "Read only filesystem");
+ HNDL(case EBADF, "Bad file descriptor");
+ HNDL(case EIO, "I/O error");
+ HNDL(case EISDIR, "Destination is a directory");
+ HNDL(case EFBIG, "File too big");
+ HNDL(case ETXTBSY, "Text file busy");
+ HNDL(case EBUSY, "File busy");
+ HNDL(case ENOTEMPTY, "Destination is not empty");
+ HNDL(case EEXIST, "File exists");
+ HNDL(default, "Unknown error");
}
+ eina_strbuf_free(buf);
}
// this scans a tree to build a potential operation progress count. it may
@@ -106,6 +72,7 @@ fs_scan(const char *src)
Eina_Iterator *it;
const char*s;
struct statst;
+ const char*op = "Scan";
if (strlen(src) < 1) return EINA_FALSE;
@@ -116,7 +83,7 @@ fs_scan(const char *src)
case ENOENT: // ignore this error -
[EGIT] [efm2] 01/01: remove some more debug printfs
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 887f89748c37833ff614475f8a961371b0cd4868
Author: Carsten Haitzler (Rasterman)
AuthorDate: Mon Apr 29 19:24:30 2024 +0100
remove some more debug printfs
---
src/backends/default/fs.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 5902111..53d19d0 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -431,11 +431,6 @@ err_unlink:
utimes(dst, times);
err:
umask(old_umask);
- if (!res)
-{
- fprintf(stderr, "MV: ERROR!\n");
- fflush(stderr);
-}
return res;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: remove some more comments
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 90f0005bcdef85ecd8952fcb5bfc83d1a59d5ed9
Author: Carsten Haitzler (Rasterman)
AuthorDate: Mon Apr 29 19:23:42 2024 +0100
remove some more comments
---
src/backends/default/fs.c | 37 -
1 file changed, 37 deletions(-)
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index 593fef3..5902111 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -151,43 +151,6 @@ Eina_Bool
fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
Eina_Bool rm)
{ // cp_rm /path/to/src/filename /path/to/dst/filename
- // XXX: ecore_file_mv() ? <- look at it
- // XXX: utime()/utimes() -> utimensat()
- //
- // if src is dir
- // fs_mkdir(dst)
- // for all files in src
- // fs_cp_rm(src/file, dst/file, report_err)
- // fs_utimes(src, dst)
- // fs_chmod(src, dst)
- // fs_chown(src, dst)
- // fs_utimes(src, dst)
- // fs_chmod(src, dst)
- // fs_chown(src, dst)
- // fs_rmdir(src)
- // else
- // if (src is file)
- // fs_cp(src, dst, report_err)
- // fs_cp_xattr(src, dst)
- // else if (src is symlink)
- // fs_ln(src, dst)
- // else if (src is fifo)
- // fs_mkfifo(dst)
- // else if (src is socket)
- // fs_touch(dst)
- // else if (src is chrdev)
- // fs_chrdevdup(src, dst)
- // else if (src is blkdev)
- // fs_blkdevdup(src, dst)
- // fs_utimes(src, dst)
- // fs_chmod(src, dst)
- // fs_chown(src, dst)
- // fs_rm(src)
- // fs_cp(src_meta, dst_meta)
- // fs_utimes(src_meta, dst_meta)
- // fs_chmod(src_meta, dst_meta)
- // fs_chown(src_meta, dst_meta)
- // fs_rm(src_meta)
Eina_Bool res = EINA_TRUE;
Eina_Iterator *it;
const char*s;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: remove debug/comments not needed
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 cfac7a7e4bc355595aaffc4713a2429832d2ef62
Author: Carsten Haitzler (Rasterman)
AuthorDate: Mon Apr 29 19:22:25 2024 +0100
remove debug/comments not needed
---
src/backends/default/mv.c | 21 ++---
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index 08004a3..3cfe971 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -31,9 +31,6 @@ main(int argc, char **argv)
ecore_init();
efreet_init();
- fprintf(stderr, "MV: [%s] -> [%s]\n", src, dst);
- fflush(stderr);
-
config_dir = getenv("E_HOME_DIR");
home_dir = getenv("HOME");
if (!home_dir) return 77; // no $HOME? definitely an error!
@@ -46,18 +43,6 @@ main(int argc, char **argv)
}
meta_init(config_dir);
- // src = ""
- // dst = DDIR/
- //
- // mv SDIR/SFILE DDIR/SFILE
- // if errno == EXDEV
- // cpSDIR/SFILE DDIR/SFILE
- // rmSDIR/SFILE
- // else if errno == 0
- // if exists SDIR/.efm/SFILE.efm
- // mkdir DDIR/.efm
- // mv SDIR/.efm/SFILE.efm DDIR/.efm/SFILE.efm
-
fname = ecore_file_file_get(src);
if (!fname) goto err;
buf = eina_strbuf_new();
@@ -94,10 +79,8 @@ main(int argc, char **argv)
free(src_meta);
free(dst_meta);
}
- else
-{
- status_end();
-}
+ else status_end();
+
err:
if (buf) eina_strbuf_free(buf);
status_end();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [efm2] 01/01: move fs working code into fs.c and make it also do rm and cp
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 575fbfa026df5575e0d68132c3f92450c49c7bdf
Author: Carsten Haitzler (Rasterman)
AuthorDate: Mon Apr 29 19:14:25 2024 +0100
move fs working code into fs.c and make it also do rm and cp
---
src/backends/default/{mv.c => fs.c} | 379 +-
src/backends/default/fs.h | 10 +
src/backends/default/meson.build| 1 +
src/backends/default/mv.c | 447 +---
4 files changed, 175 insertions(+), 662 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/fs.c
similarity index 57%
copy from src/backends/default/mv.c
copy to src/backends/default/fs.c
index 740357e..593fef3 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/fs.c
@@ -1,16 +1,10 @@
// for copy_file_range()
-#include
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include
-#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
@@ -18,10 +12,8 @@
#include
#include
-#include "meta.h"
#include "status.h"
-
-static const char *config_dir = NULL;
+#include "fs.h"
// generic error handler. special case handling all errnos for everything is
// pretty insane - so handle non-errors in switches and otherwise pass to
@@ -107,7 +99,7 @@ _error_handle(const char *src, const char *dst, int errno_in)
// not be 100% right as the fs can change while the scan happens and after
// so any move that devolves into a cp + rm isn't going to be atomic and
// handle a changing fs while it works anyway
-static Eina_Bool
+Eina_Bool
fs_scan(const char *src)
{
Eina_Bool res = EINA_TRUE;
@@ -150,14 +142,14 @@ fs_scan(const char *src)
// or a char or block device etc.
status_count(1, ecore_file_file_get(src));
// in addition each byte in the file count as a progress item too
- if (st.st_size > 0)
-status_count(st.st_size, ecore_file_file_get(src));
+ if (st.st_size > 0) status_count(st.st_size, ecore_file_file_get(src));
}
return res;
}
-static Eina_Bool
-fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
+Eina_Bool
+fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err, Eina_Bool cp,
+ Eina_Bool rm)
{ // cp_rm /path/to/src/filename /path/to/dst/filename
// XXX: ecore_file_mv() ? <- look at it
// XXX: utime()/utimes() -> utimensat()
@@ -196,7 +188,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
// fs_chmod(src_meta, dst_meta)
// fs_chown(src_meta, dst_meta)
// fs_rm(src_meta)
- Eina_Bool res = EINA_TRUE;
+ Eina_Bool res = EINA_TRUE;
Eina_Iterator *it;
const char*s;
struct statst;
@@ -225,16 +217,19 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
old_umask = umask(0);
if (S_ISDIR(st.st_mode))
{ // it's a dir - scan this recursively
- if (mkdir(dst, st.st_mode) != 0)
+ if (cp)
{
- switch (errno)
+ if (mkdir(dst, st.st_mode) != 0)
{
-case EEXIST: // ignore - mv would mv over this anyway
- break;
-default: // WAT
- _error_handle(NULL, dst, errno);
- res = EINA_FALSE;
- goto err;
+ switch (errno)
+{
+case EEXIST: // ignore - mv would mv over this anyway
+ break;
+default: // WAT
+ _error_handle(NULL, dst, errno);
+ res = EINA_FALSE;
+ goto err;
+}
}
}
it = eina_file_ls(src);
@@ -243,7 +238,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
EINA_ITERATOR_FOREACH(it, s)
{
Eina_Strbuf *buf = eina_strbuf_new();
-const char *fs = ecore_file_file_get(s);
+const char *fs = ecore_file_file_get(s);
if (buf)
{
@@ -252,7 +247,8 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
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))
+if (!fs_cp_rm(s, eina_strbuf_string_get(buf), report_err,
+ cp, rm))
res = EINA_FALSE;
}
eina_strbuf_free(buf);
@@ -261,149 +257,194 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
}
eina_iterator_free(it);
}
- if (res) rmdir(src);
+ if ((rm) && (res))
+{
+ if (rmdir(src) != 0)
+{
+ switch (errno)
+{
+case
[EGIT] [efm2] 01/01: actually make mv work fully
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 9489a8b691cd280b21b67e08f2bef62be58e473e
Author: Carsten Haitzler (Rasterman)
AuthorDate: Sun Apr 28 20:03:19 2024 +0100
actually make mv work fully
---
src/backends/default/mv.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index c964ba0..740357e 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -18,9 +18,6 @@
#include
#include
-#include "eina_strbuf.h"
-#include "eina_thread.h"
-#include "eina_types.h"
#include "meta.h"
#include "status.h"
@@ -264,7 +261,7 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
}
eina_iterator_free(it);
}
- // if (res) rmdir(src);
+ if (res) rmdir(src);
}
else if (S_ISLNK(st.st_mode))
{
@@ -405,7 +402,7 @@ err_copy:
if (old_copy_buf) free(old_copy_buf);
if (fd_in >= 0) close(fd_in);
if (fd_ou >= 0) close(fd_ou);
- // if (res) unlink(src);
+ if (res) unlink(src);
}
chown(dst, st.st_uid, st.st_gid);
#ifdef STAT_NSEC
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [legacy-imlib2] 01/01: Y4M loader: Fix frame size calculation for 10-bit 4:2:0 format
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch master in repository legacy-imlib2. View the commit online. commit d4648ae5275e4484a1964b1dfa98a9227fb50a79 Author: Kim Woelders AuthorDate: Sat Apr 27 09:45:57 2024 +0200 Y4M loader: Fix frame size calculation for 10-bit 4:2:0 format Seems to fix multiframe images (animation) for this format. --- src/modules/loaders/loader_y4m.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/loaders/loader_y4m.c b/src/modules/loaders/loader_y4m.c index 9b7873a..22740b8 100644 --- a/src/modules/loaders/loader_y4m.c +++ b/src/modules/loaders/loader_y4m.c @@ -338,11 +338,15 @@ y4m_parse_frame(Y4mParse *res) case Y4M_PARSE_CS_420MPEG2: case Y4M_PARSE_CS_420PALDV: case Y4M_PARSE_CS_420: -case Y4M_PARSE_CS_420P10: res->frame_data_len = npixels * 3 / 2; sdiv = 2; voff = (npixels * 5) / 4; break; +case Y4M_PARSE_CS_420P10: +res->frame_data_len = npixels * 3; +sdiv = 2; +voff = (npixels * 5) / 4; +break; case Y4M_PARSE_CS_422: res->frame_data_len = npixels * 2; sdiv = 2; -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[EGIT] [efm2] 01/01: share error handling in central func
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 b876965918f2e67b3ca34ffedc3a8aa61fbd69da
Author: Carsten Haitzler (Rasterman)
AuthorDate: Thu Apr 25 07:44:27 2024 +0100
share error handling in central func
so - too much error handling all over the place - massive switch/cse
blocks. not sustainable. handle all errors in one place. less code. yay!
---
src/backends/default/mv.c | 338 ++
1 file changed, 105 insertions(+), 233 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index 430576d..c964ba0 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -26,6 +26,86 @@
static const char *config_dir = NULL;
+// generic error handler. special case handling all errnos for everything is
+// pretty insane - so handle non-errors in switches and otherwise pass to
+// this tio handle the reast in a generic way.
+static void
+_error_handle(const char *src, const char *dst, int errno_in)
+{
+ switch (errno_in)
+{
+case EACCES:
+ status_error(src, dst, "Move - Access denied");
+ return;
+case EFAULT:
+ status_error(src, dst, "Move - Memory Fault");
+ return;
+case ELOOP:
+ status_error(src, dst, "Move - Too many symlinks");
+ return;
+case ENAMETOOLONG:
+ status_error(src, dst, "Move - Name too long");
+ return;
+case ENOMEM:
+ status_error(src, dst, "Move - Out of memory");
+ return;
+case ENOTDIR:
+ status_error(src, dst, "Move - Path component is not a directory");
+ return;
+case EOVERFLOW:
+ status_error(src, dst, "Move - Overflow");
+ return;
+case EDQUOT:
+ status_error(src, dst, "Move - Over quota");
+ return;
+case EINVAL:
+ status_error(src, dst, "Move - Inmvalid value");
+ return;
+case EMLINK:
+ status_error(src, dst, "Move - Too many source links");
+ return;
+case ENOENT:
+ status_error(src, dst, "Move - File does not exist");
+ return;
+case ENOSPC:
+ status_error(src, dst, "Move - Disk full");
+ return;
+case EPERM:
+ status_error(src, dst, "Move - Permission denied");
+ return;
+case EROFS:
+ status_error(src, dst, "Move - Read only filesystem");
+ return;
+case EBADF:
+ status_error(src, dst, "Move - Bad file descriptor");
+ return;
+case EIO:
+ status_error(src, dst, "Move - I/O error");
+ return;
+case EISDIR:
+ status_error(src, dst, "Move - Destination is dir");
+ return;
+case EFBIG:
+ status_error(src, dst, "Move - File too big");
+ return;
+case ETXTBSY:
+ status_error(src, dst, "Move - Text file busy");
+ return;
+case EBUSY:
+ status_error(src, dst, "Move - File busy");
+ return;
+case ENOTEMPTY:
+ status_error(src, dst, "Move - Destination not empty");
+ return;
+case EEXIST:
+ status_error(src, dst, "Move - File exists");
+ return;
+default: // WAT? we should not get here - we handled everything...
+ status_error(src, dst, "Move - Unknown error");
+ break;
+}
+}
+
// this scans a tree to build a potential operation progress count. it may
// not be 100% right as the fs can change while the scan happens and after
// so any move that devolves into a cp + rm isn't going to be atomic and
@@ -44,39 +124,11 @@ fs_scan(const char *src)
{
switch (errno)
{
-case EACCES:
- status_error(src, NULL, "Move - Permission denied for source");
- return EINA_FALSE;
- break;
-case EFAULT:
- status_error(src, NULL, "Move - Memory Fault");
- return EINA_FALSE;
- break;
-case ELOOP:
- status_error(src, NULL, "Move - Too many symlinks");
- return EINA_FALSE;
- break;
-case ENAMETOOLONG:
- status_error(src, NULL, "Move - Name too long");
- return EINA_FALSE;
- break;
case ENOENT: // ignore this error - file removed during scan ?
return EINA_TRUE;
- break;
-case ENOMEM:
- status_error(src, NULL, "Move - Out of memory");
- return EINA_FALSE;
- break;
-case ENOTDIR:
- status_error(src, NULL, "Move - Source path component is not a directory");
- return EINA_FALSE;
- break;
-case EOVERFLOW:
- status_error(src, NULL, "Move - Overflow");
- return EINA_FALSE;
- break;
default:
- break;
+ _error_handle(src, NULL, errno);
+ return EINA_FALSE;
}
}
if (S_ISDIR(st.st_mode))
@@ -168,28 +220,8 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
case ENOENT: // ignore this error - file removed during scan ?
[EGIT] [efm2] 01/01: more work on mv impl
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 f918c86d251299bb837cd6e0e7d4b053bb62e3e3
Author: Carsten Haitzler (Rasterman)
AuthorDate: Tue Apr 23 19:44:43 2024 +0100
more work on mv impl
---
src/backends/default/mv.c | 393 --
1 file changed, 380 insertions(+), 13 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index e39bf1c..430576d 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -1,3 +1,8 @@
+// for copy_file_range()
+#include
+#define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
+
#include
#include
#include
@@ -11,6 +16,7 @@
#include
#include
#include
+#include
#include "eina_strbuf.h"
#include "eina_thread.h"
@@ -27,11 +33,12 @@ static const char *config_dir = NULL;
static Eina_Bool
fs_scan(const char *src)
{
+ Eina_Bool res = EINA_TRUE;
Eina_Iterator *it;
- const char *s;
+ const char*s;
+ struct statst;
if (strlen(src) < 1) return EINA_FALSE;
- struct stat st;
if (lstat(src, ) != 0)
{
@@ -79,8 +86,13 @@ fs_scan(const char *src)
{
EINA_ITERATOR_FOREACH(it, s)
{
-if (!fs_scan(s)) return EINA_FALSE;
+if (res)
+ {
+if (!fs_scan(s)) res = EINA_FALSE;
+ }
+eina_stringshare_del(s);
}
+ eina_iterator_free(it);
}
}
else
@@ -92,16 +104,15 @@ fs_scan(const char *src)
if (st.st_size > 0)
status_count(st.st_size, ecore_file_file_get(src));
}
- return EINA_TRUE;
+ return res;
}
static Eina_Bool
fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
-{
- Eina_Bool res = EINA_TRUE;
-
- if (!fs_scan(src)) return EINA_FALSE;
-
+{ // cp_rm /path/to/src/filename /path/to/dst/filename
+ // XXX: ecore_file_mv() ? <- look at it
+ // XXX: utime()/utimes() -> utimensat()
+ //
// if src is dir
// fs_mkdir(dst)
// for all files in src
@@ -136,17 +147,370 @@ fs_cp_rm(const char *src, const char *dst, Eina_Bool report_err)
// fs_chmod(src_meta, dst_meta)
// fs_chown(src_meta, dst_meta)
// fs_rm(src_meta)
+ Eina_Bool res = EINA_TRUE;
+ Eina_Iterator *it;
+ const char*s;
+ struct statst;
+ mode_t old_umask;
+ struct timeval times[2];
+
+ if (strlen(src) < 1) return EINA_FALSE;
+
+ // first count how much work needs doing
+ if (!fs_scan(src)) return EINA_FALSE;
+
+ fprintf(stderr, "cp_rm [%s] -> [%s]\n", src, dst);
+ fflush(stderr);
+ if (lstat(src, ) != 0)
+{
+ switch (errno)
+{
+case ENOENT: // ignore this error - file removed during scan ?
+ status_pos(1, "Move - File vanished");
+ break;
+case EACCES:
+ status_error(src, dst, "Move - Permission denied for source");
+ return EINA_FALSE;
+case EFAULT:
+ status_error(src, dst, "Move - Memory Fault");
+ return EINA_FALSE;
+case ELOOP:
+ status_error(src, dst, "Move - Too many symlinks");
+ return EINA_FALSE;
+case ENAMETOOLONG:
+ status_error(src, dst, "Move - Name too long");
+ return EINA_FALSE;
+case ENOMEM:
+ status_error(src, dst, "Move - Out of memory");
+ return EINA_FALSE;
+case ENOTDIR:
+ status_error(src, dst, "Move - Source path component is not a directory");
+ return EINA_FALSE;
+case EOVERFLOW:
+ status_error(src, dst, "Move - Overflow");
+ return EINA_FALSE;
+default: // WAT?
+ return EINA_FALSE;
+}
+}
+ old_umask = umask(0);
+ if (S_ISDIR(st.st_mode))
+{ // it's a dir - scan this recursively
+ if (mkdir(dst, st.st_mode) != 0)
+{
+ switch (errno)
+{
+case EEXIST: // ignore - mv would mv over this anyway
+ break;
+case EACCES:
+ res = EINA_FALSE;
+ goto err;
+case EDQUOT:
+ res = EINA_FALSE;
+ goto err;
+case EFAULT:
+ res = EINA_FALSE;
+ goto err;
+case EINVAL:
+ res = EINA_FALSE;
+ goto err;
+case ELOOP:
+ res = EINA_FALSE;
+ goto err;
+case EMLINK:
+ res = EINA_FALSE;
+ goto err;
+case ENAMETOOLONG:
+ res = EINA_FALSE;
+ goto err;
+case ENOENT:
+ res = EINA_FALSE;
+ goto err;
+case ENOMEM:
+ res = EINA_FALSE;
+ goto err;
+case ENOSPC:
+ res = EINA_FALSE;
+ goto err;
+case ENOTDIR:
+ res = EINA_FALSE;
+ goto err;
+
[EGIT] [legacy-imlib2] 02/07: imlib2_view: Minor cleanup
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit f0a81d9d59b9fbd646d3ea81972ec95a5f817266
Author: Kim Woelders
AuthorDate: Sun Jan 21 13:09:19 2024 +0100
imlib2_view: Minor cleanup
---
src/bin/imlib2_view.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
index 35fd677..902a2b2 100644
--- a/src/bin/imlib2_view.c
+++ b/src/bin/imlib2_view.c
@@ -95,6 +95,8 @@ bg_im_init(int w, int h)
bg_im = imlib_create_image(w, h);
imlib_context_set_image(bg_im);
+imlib_context_set_blend(0);
+
for (y = 0; y < h; y += opt_cbfs)
{
_onoff_ = (y / opt_cbfs) & 0x1;
@@ -104,11 +106,8 @@ bg_im_init(int w, int h)
imlib_context_set_color(144, 144, 144, 255);
else
imlib_context_set_color(100, 100, 100, 255);
-imlib_context_set_blend(0);
imlib_image_fill_rectangle(x, y, opt_cbfs, opt_cbfs);
-onoff++;
-if (_onoff_ == 2)
-_onoff_ = 0;
+onoff ^= 0x1;
}
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [legacy-imlib2] 05/07: imlib2_view: Rename scaling variables
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit cd4ba13545b4574f0092deb89a9f72c92dcb9adf
Author: Kim Woelders
AuthorDate: Mon Jan 22 14:05:40 2024 +0100
imlib2_view: Rename scaling variables
Should make naming a bit more logical.
---
src/bin/imlib2_view.c | 62 ++-
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
index 82f66ef..c4a1916 100644
--- a/src/bin/imlib2_view.c
+++ b/src/bin/imlib2_view.c
@@ -37,10 +37,10 @@ static bool opt_progr = true; /* Render through progress callback */
static bool opt_scale = false;
static bool opt_cbalt = false; /* Alternate checkerboard colors (red/green) */
static bool opt_aa_final = true;/* Do final anti-aliased rendering */
-static double opt_scale_x = 1.;
-static double opt_scale_y = 1.;
-static double opt_sgrab_x = 1.;
-static double opt_sgrab_y = 1.;
+static double opt_sc_inp_x = 1.;
+static double opt_sc_inp_y = 1.;
+static double opt_sc_out_x = 1.;
+static double opt_sc_out_y = 1.;
static int opt_cbfs = 8; /* Background checkerboard field size */
static char opt_progress_granularity = 10;
static char opt_progress_print = 0;
@@ -59,8 +59,10 @@ static int animloop = 0; /* Animation loop count */
#define MAX_DIM 32767
-#define SCALE_X(x) (int)(scale_x * (x) + .5)
-#define SCALE_Y(x) (int)(scale_y * (x) + .5)
+#define SC_INP_X(x) (int)(opt_sc_inp_x * (x) + .5)
+#define SC_INP_Y(x) (int)(opt_sc_inp_y * (x) + .5)
+#define SC_OUT_X(x) (int)(scale_x * (x) + .5)
+#define SC_OUT_Y(x) (int)(scale_y * (x) + .5)
#define HELP \
"Usage:\n" \
@@ -73,8 +75,8 @@ static int animloop = 0; /* Animation loop count */
" -g N : Set progress granularity to N%% (default 10(%%))\n" \
" -l N : Introduce N ms delay in progress callback (default 0)\n" \
" -p : Print info in progress callback (default no)\n" \
- " -s Sx[,Sy] : Set render x/y scaling factors to Sx,Sy (default 1.0)\n" \
- " -S Sx[,Sy] : Set grab x/y scaling factors to Sx,Sy (default 1.0)\n" \
+ " -s Sx[,Sy] : Set output x/y scaling factors to Sx,Sy (default 1.0)\n" \
+ " -S Sx[,Sy] : Set input x/y scaling factors to Sx,Sy (default 1.0)\n" \
" -t N : Set background checkerboard field size (default 8)\n" \
" -v : Increase verbosity\n"
@@ -361,8 +363,8 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
/* first time it's called */
if (image_width == 0)
{
-scale_x = opt_scale_x;
-scale_y = opt_scale_y;
+scale_x = opt_sc_out_x;
+scale_y = opt_sc_out_y;
window_width = DisplayWidth(disp, DefaultScreen(disp));
window_height = DisplayHeight(disp, DefaultScreen(disp));
@@ -377,8 +379,8 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
(image_width > window_width || image_height > window_height))
{
scale_x = scale_y = 1.;
-while (window_width < SCALE_X(image_width) ||
- window_height < SCALE_Y(image_height))
+while (window_width < SC_OUT_X(image_width) ||
+ window_height < SC_OUT_Y(image_height))
{
scale_x *= .5;
scale_y = scale_x;
@@ -386,8 +388,8 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
}
}
-window_width = SCALE_X(image_width);
-window_height = SCALE_Y(image_height);
+window_width = SC_OUT_X(image_width);
+window_height = SC_OUT_Y(image_height);
if (window_width > MAX_DIM)
{
window_width = MAX_DIM;
@@ -457,10 +459,10 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
r_out.x, r_out.y, r_out.w, r_out.h);
/* Render image (part) (or updated canvas) on window background pixmap */
-up_wx = SCALE_X(r_out.x);
-up_wy = SCALE_Y(r_out.y);
-up_ww = SCALE_X(r_out.w);
-up_wh = SCALE_Y(r_out.h);
+up_wx = SC_OUT_X(r_out.x);
+up_wy = SC_OUT_Y(r_out.y);
+up_ww = SC_OUT_X(r_out.w);
+up_wh = SC_OUT_Y(r_out.h);
Dprintf(" Paint %d,%d %dx%d\n", up_wx, up_wy, up_ww, up_wh);
imlib_context_set_blend(0);
imlib_context_set_drawable(bg_pm);
@@ -552,8 +554,8 @@ load_image(int no, const char *name)
Vprintf("Drawable: %#lx: x,y: %d,%d wxh=%ux%u bw=%u depth=%u\n",
draw, x, y, w, h, bw, depth);
-wo = w * opt_sgrab_x;
-ho = h * opt_sgrab_y;
+wo = SC_INP_X(w);
+ho = SC_INP_Y(h);
im = imlib_create_scaled_image_from_drawable(None, 0, 0, w, h, wo, ho,
1, (get_alpha)
[EGIT] [legacy-imlib2] 03/07: imlib2_view: Enable an alternate background color set (red/green)
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit f922904687567c6d58daa9299a7f5267623972c4
Author: Kim Woelders
AuthorDate: Sun Jan 21 16:02:32 2024 +0100
imlib2_view: Enable an alternate background color set (red/green)
---
src/bin/imlib2_view.c | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
index 902a2b2..2899242 100644
--- a/src/bin/imlib2_view.c
+++ b/src/bin/imlib2_view.c
@@ -35,6 +35,7 @@ static Imlib_Image im_curr = NULL; /* The current image */
static bool opt_cache = false;
static bool opt_progr = true; /* Render through progress callback */
static bool opt_scale = false;
+static bool opt_cbalt = false; /* Alternate checkerboard colors (red/green) */
static double opt_scale_x = 1.;
static double opt_scale_y = 1.;
static double opt_sgrab_x = 1.;
@@ -102,10 +103,20 @@ bg_im_init(int w, int h)
_onoff_ = (y / opt_cbfs) & 0x1;
for (x = 0; x < w; x += opt_cbfs)
{
-if (onoff)
-imlib_context_set_color(144, 144, 144, 255);
+if (opt_cbalt)
+{
+if (onoff)
+imlib_context_set_color(255, 0, 0, 255);
+else
+imlib_context_set_color(0, 255, 0, 255);
+}
else
-imlib_context_set_color(100, 100, 100, 255);
+{
+if (onoff)
+imlib_context_set_color(144, 144, 144, 255);
+else
+imlib_context_set_color(100, 100, 100, 255);
+}
imlib_image_fill_rectangle(x, y, opt_cbfs, opt_cbfs);
onoff ^= 0x1;
}
@@ -637,6 +648,11 @@ main(int argc, char **argv)
opt_sgrab_y = opt_sgrab_x;
break;
case 't':
+if (*optarg == 'a')
+{
+optarg++;
+opt_cbalt = true;
+}
no = atoi(optarg);
if (no > 0)
opt_cbfs = no;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [legacy-imlib2] 06/07: imlib2_view: Optionally scale on input
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit 6cef7ca822e1da0416c84c0a19a90be7281c108c
Author: Kim Woelders
AuthorDate: Mon Jan 22 16:09:20 2024 +0100
imlib2_view: Optionally scale on input
For testing.
---
src/bin/imlib2_view.c | 35 +--
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
index c4a1916..1e9b0ec 100644
--- a/src/bin/imlib2_view.c
+++ b/src/bin/imlib2_view.c
@@ -321,6 +321,7 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
{
static double scale_x = 0., scale_y = 0.;
int up_wx, up_wy, up_ww, up_wh;
+int up2_wx, up2_wy, up2_ww, up2_wh;
rect_t r_up, r_out;
if (opt_progress_print)
@@ -372,8 +373,10 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
window_height -= 32;
Dprintf(" Screen WxH=%dx%d\n", window_width, window_height);
-image_width = fixedframe ? finfo.frame_w : finfo.canvas_w;
-image_height = fixedframe ? finfo.frame_h : finfo.canvas_h;
+up_ww = fixedframe ? finfo.frame_w : finfo.canvas_w;
+up_wh = fixedframe ? finfo.frame_h : finfo.canvas_h;
+image_width = SC_INP_X(up_ww);
+image_height = SC_INP_X(up_wh);
if (!opt_scale &&
(image_width > window_width || image_height > window_height))
@@ -403,7 +406,7 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
Dprintf(" Window WxH=%dx%d\n", window_width, window_height);
V2printf(" Image WxH=%dx%d fmt='%s'\n",
- image_width, image_height, imlib_image_format());
+ up_ww, up_wh, imlib_image_format());
/* Initialize checkered background image */
bg_im_init(image_width, image_height);
@@ -451,27 +454,31 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
}
/* Render image on background image */
-Dprintf(" Update %d,%d %dx%d\n", r_out.x, r_out.y, r_out.w, r_out.h);
imlib_context_set_image(bg_im);
imlib_context_set_blend(1);
+up_wx = SC_INP_X(r_out.x);
+up_wy = SC_INP_Y(r_out.y);
+up_ww = SC_INP_X(r_out.w);
+up_wh = SC_INP_Y(r_out.h);
+Dprintf(" Update %d,%d %dx%d -> %d,%d %dx%d \n",
+r_out.x, r_out.y, r_out.w, r_out.h, up_wx, up_wy, up_ww, up_wh);
imlib_blend_image_onto_image(im, 1,
r_out.x, r_out.y, r_out.w, r_out.h,
- r_out.x, r_out.y, r_out.w, r_out.h);
+ up_wx, up_wy, up_ww, up_wh);
/* Render image (part) (or updated canvas) on window background pixmap */
-up_wx = SC_OUT_X(r_out.x);
-up_wy = SC_OUT_Y(r_out.y);
-up_ww = SC_OUT_X(r_out.w);
-up_wh = SC_OUT_Y(r_out.h);
-Dprintf(" Paint %d,%d %dx%d\n", up_wx, up_wy, up_ww, up_wh);
+up2_wx = SC_OUT_X(up_wx);
+up2_wy = SC_OUT_Y(up_wy);
+up2_ww = SC_OUT_X(up_ww);
+up2_wh = SC_OUT_Y(up_wh);
+Dprintf(" Paint %d,%d %dx%d\n", up2_wx, up2_wy, up2_ww, up2_wh);
imlib_context_set_blend(0);
imlib_context_set_drawable(bg_pm);
-imlib_render_image_part_on_drawable_at_size(r_out.x, r_out.y, r_out.w,
-r_out.h, up_wx, up_wy, up_ww,
-up_wh);
+imlib_render_image_part_on_drawable_at_size(up_wx, up_wy, up_ww, up_wh,
+up2_wx, up2_wy, up2_ww, up2_wh);
/* Update window */
-XClearArea(disp, win, up_wx, up_wy, up_ww, up_wh, False);
+XClearArea(disp, win, up2_wx, up2_wy, up2_ww, up2_wh, False);
XFlush(disp);
if (opt_progress_delay > 0)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [legacy-imlib2] 07/07: imlib2_view: Enable specifying border
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit cf926c746cd3dfe4bfa5ad8fd5bff075d2efce84
Author: Kim Woelders
AuthorDate: Tue Aug 8 20:08:09 2023 +0200
imlib2_view: Enable specifying border
The border is applied during input scaling.
The output scaling scales the whole image as rendered by the input
scaling.
---
src/bin/imlib2_view.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
index 1e9b0ec..17ca47d 100644
--- a/src/bin/imlib2_view.c
+++ b/src/bin/imlib2_view.c
@@ -31,6 +31,7 @@ static Imlib_Image bg_im = NULL;
static Imlib_Image bg_im_clean = NULL;
static Imlib_Image fg_im = NULL;/* The animated image */
static Imlib_Image im_curr = NULL; /* The current image */
+static Imlib_Border border;
static bool opt_cache = false;
static bool opt_progr = true; /* Render through progress callback */
@@ -69,6 +70,7 @@ static int animloop = 0; /* Animation loop count */
" imlib2_view [OPTIONS] {FILE | XID}...\n" \
"OPTIONS:\n" \
" -a : Disable final anti-aliased rendering\n" \
+ " -b L,R,T,B : Set border\n" \
" -c : Enable image caching (implies -e)\n" \
" -d : Enable debug\n" \
" -e : Do rendering explicitly (not via progress callback)\n" \
@@ -364,6 +366,8 @@ progress(Imlib_Image im, char percent, int update_x, int update_y,
/* first time it's called */
if (image_width == 0)
{
+imlib_image_set_border();
+
scale_x = opt_sc_out_x;
scale_y = opt_sc_out_y;
@@ -622,13 +626,18 @@ main(int argc, char **argv)
verbose = 0;
-while ((opt = getopt(argc, argv, "acdeg:l:ps:S:t:v")) != -1)
+while ((opt = getopt(argc, argv, "ab:cdeg:l:ps:S:t:v")) != -1)
{
switch (opt)
{
case 'a':
opt_aa_final = false;
break;
+case 'b':
+border.left = border.right = border.top = border.bottom = 0;
+sscanf(optarg, "%d,%d,%d,%d",
+ , , , );
+break;
case 'c':
opt_cache = true;
opt_progr = false; /* Cached images won't give progress callbacks */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[EGIT] [legacy-imlib2] 01/07: imlib2_view: Use poll(), not select()
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit 73513f89d57f5ba4e3094958c8427c3434aed86b
Author: Kim Woelders
AuthorDate: Sun Apr 14 19:35:47 2024 +0200
imlib2_view: Use poll(), not select()
---
src/bin/imlib2_view.c | 26 --
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/bin/imlib2_view.c b/src/bin/imlib2_view.c
index e221089..35fd677 100644
--- a/src/bin/imlib2_view.c
+++ b/src/bin/imlib2_view.c
@@ -3,6 +3,7 @@
#include
#include
+#include
#include
#include
#include
@@ -595,6 +596,8 @@ main(int argc, char **argv)
{
int opt, err;
int no, inc;
+static int nfds;
+static struct pollfd afds[1];
verbose = 0;
@@ -684,14 +687,15 @@ main(int argc, char **argv)
exit(0);
}
+nfds = 0;
+afds[nfds++].fd = ConnectionNumber(disp);
+
for (;;)
{
-int x, y, b, count, fdsize, xfd, timeout;
+int x, y, b, count, timeout;
XEvent ev;
static int zoom_mode = 0, zx, zy;
static double zoom = 1.0;
-struct timeval tval;
-fd_set fdset;
KeySym key;
int no2;
@@ -848,21 +852,7 @@ main(int argc, char **argv)
if (multiframe)
continue;
-xfd = ConnectionNumber(disp);
-fdsize = xfd + 1;
-FD_ZERO();
-FD_SET(xfd, );
-
-if (timeout > 0)
-{
-tval.tv_sec = timeout / 100;
-tval.tv_usec = timeout - tval.tv_sec * 100;
-count = select(fdsize, , NULL, NULL, );
-}
-else
-{
-count = select(fdsize, , NULL, NULL, NULL);
-}
+count = poll(afds, nfds, timeout);
if (count < 0)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
