[EGIT] [core/efl] master 01/01: exactness: Make sure image valid before usage....
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=868a5c28ff73adcdd913bc58c44cb558ebd1f974
commit 868a5c28ff73adcdd913bc58c44cb558ebd1f974
Author: Christopher Michael
Date: Mon Jun 28 00:14:49 2021 -0400
exactness: Make sure image valid before usage
dh
---
src/bin/exactness/player.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index ed493a521d..66506ba729 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -206,9 +206,13 @@ _shot_do(Evas *e)
else if (_dest_type == FTYPE_EXU)
{
Exactness_Image *ex_img = malloc(sizeof(*ex_img));
- _dest_unit->imgs = eina_list_append(_dest_unit->imgs, ex_img);
- _dest_unit->nb_shots++;
- e_data = ex_img;
+
+ if (ex_img)
+ {
+ _dest_unit->imgs = eina_list_append(_dest_unit->imgs,
ex_img);
+ _dest_unit->nb_shots++;
+ e_data = ex_img;
+ }
}
else if (_dest_type == FTYPE_REMOTE)
{
--
[EGIT] [core/efl] master 01/01: elput: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3d9590231e55d33e2e9fc7aa58f296ebc941bf7e
commit 3d9590231e55d33e2e9fc7aa58f296ebc941bf7e
Author: Christopher Michael
Date: Thu Apr 1 14:49:35 2021 -0400
elput: Fix formatting
NB: No functional changes, just fixing formatting to match the rest of
the library
---
src/lib/elput/elput_gestures.c | 35 ++-
src/lib/elput/elput_input.c| 15 ++-
src/lib/elput/elput_private.h | 12 +++-
src/lib/elput/elput_root.c | 14 +-
4 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/src/lib/elput/elput_gestures.c b/src/lib/elput/elput_gestures.c
index baa67e9519..120297194f 100644
--- a/src/lib/elput/elput_gestures.c
+++ b/src/lib/elput/elput_gestures.c
@@ -17,12 +17,11 @@ ACCESSOR(swipe, device, Elput_Device*, NULL)
EAPI Elput_Manager*
elput_manager_connect_gestures(const char *seat, unsigned int tty)
{
- Elput_Manager *em = elput_manager_connect(seat, tty);
+ Elput_Manager *em;
+ em = elput_manager_connect(seat, tty);
if (em)
- {
-em->only_gesture_events = EINA_TRUE;
- }
+ em->only_gesture_events = EINA_TRUE;
return em;
}
@@ -30,19 +29,26 @@ elput_manager_connect_gestures(const char *seat, unsigned
int tty)
static void
_free_and_unref_device(void *userdata EINA_UNUSED, void *data)
{
- Elput_Swipe_Gesture *gesture = data;
- libinput_device_unref(gesture->device->device);
- free(gesture);
+ Elput_Swipe_Gesture *gesture;
+
+ gesture = data;
+ libinput_device_unref(gesture->device->device);
+ free(gesture);
}
static void
_eval_callback(int event, struct libinput_device *device, struct
libinput_event_gesture *gesture)
{
- Elput_Device *dev = libinput_device_get_user_data(device);
- Elput_Swipe_Gesture *elput_gesture = calloc(1, sizeof(Elput_Swipe_Gesture));
+ Elput_Device *dev;
+ Elput_Swipe_Gesture *elput_gesture;
+
+ dev = libinput_device_get_user_data(device);
+ elput_gesture = calloc(1, sizeof(Elput_Swipe_Gesture));
+
elput_gesture->dx = libinput_event_gesture_get_dx(gesture);
elput_gesture->dy = libinput_event_gesture_get_dy(gesture);
- elput_gesture->finger_count =
libinput_event_gesture_get_finger_count(gesture);
+ elput_gesture->finger_count =
+ libinput_event_gesture_get_finger_count(gesture);
elput_gesture->window = dev->seat->manager->window;
elput_gesture->device = dev;
@@ -61,13 +67,16 @@ _gesture_event_process(struct libinput_event *event)
switch (libinput_event_get_type(event))
{
case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
-_eval_callback(ELPUT_EVENT_SWIPE_BEGIN, dev,
libinput_event_get_gesture_event(event));
+_eval_callback(ELPUT_EVENT_SWIPE_BEGIN, dev,
+ libinput_event_get_gesture_event(event));
break;
case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
-_eval_callback(ELPUT_EVENT_SWIPE_UPDATE, dev,
libinput_event_get_gesture_event(event));
+_eval_callback(ELPUT_EVENT_SWIPE_UPDATE, dev,
+ libinput_event_get_gesture_event(event));
break;
case LIBINPUT_EVENT_GESTURE_SWIPE_END:
-_eval_callback(ELPUT_EVENT_SWIPE_END, dev,
libinput_event_get_gesture_event(event));
+_eval_callback(ELPUT_EVENT_SWIPE_END, dev,
+ libinput_event_get_gesture_event(event));
break;
default:
ret = 0;
diff --git a/src/lib/elput/elput_input.c b/src/lib/elput/elput_input.c
index 1ec339fb4e..4005a43cdb 100644
--- a/src/lib/elput/elput_input.c
+++ b/src/lib/elput/elput_input.c
@@ -315,8 +315,9 @@ static void
_process_events(Elput_Manager *em)
{
struct libinput_event *event;
- Elput_Input *ei = &em->input;
+ Elput_Input *ei;
+ ei = &em->input;
while ((ei->lib) && (event = libinput_get_event(ei->lib)))
{
_process_event(em, event);
@@ -342,8 +343,9 @@ _cb_input_dispatch(void *data, Ecore_Fd_Handler *hdlr
EINA_UNUSED)
static void
_elput_input_init_cancel(void *data, Ecore_Thread *eth EINA_UNUSED)
{
- Elput_Manager *manager = data;
+ Elput_Manager *manager;
+ manager = data;
manager->input.thread = NULL;
if (manager->input.current_pending)
{
@@ -358,8 +360,9 @@ _elput_input_init_cancel(void *data, Ecore_Thread *eth
EINA_UNUSED)
static void
_elput_input_init_end(void *data, Ecore_Thread *eth EINA_UNUSED)
{
- Elput_Manager *manager = data;
+ Elput_Manager *manager;
+ manager = data;
manager->input.thread = NULL;
if (!manager->input.lib) return;
@@ -389,8 +392,9 @@ _elput_input_init_end(void *data, Ecore_Thread *eth
EINA_UNUSED)
static void
_elput_input_init_notify(void *data EINA_UNUSED, Ecore_Thread *eth
EINA_UNUSED, void *msg_data)
{
- Elput_Async_Open *ao = msg_data;
+ Elput_Async_Open *ao;
+ a
[EGIT] [core/enlightenment] master 01/02: enlightenment: Remove teamwork protocol
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=14d359e11d96baaef5daa308fe3d0f2b9afcfb05 commit 14d359e11d96baaef5daa308fe3d0f2b9afcfb05 Author: Christopher Michael Date: Mon Mar 1 11:18:25 2021 -0500 enlightenment: Remove teamwork protocol The teamwork module has been removed for a while so there is no need to have a protocol file either --- src/bin/e_module.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 06d9c3b4d..1bb37300b 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -766,7 +766,6 @@ _e_module_whitelist_check(void) "sysinfo", "systray", "tasks", - "teamwork", "temperature", "tiling", "time", --
[EGIT] [core/enlightenment] master 02/02: enlightenment: Remove teamwork protocol
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=06d80f603a42ca27870362f307899e450df77eb7 commit 06d80f603a42ca27870362f307899e450df77eb7 Author: Christopher Michael Date: Mon Mar 1 11:24:13 2021 -0500 enlightenment: Remove teamwork protocol The teamwork module has been removed for some time now, so let's also remove the custom protocol file --- src/protocol/teamwork.xml | 39 --- 1 file changed, 39 deletions(-) diff --git a/src/protocol/teamwork.xml b/src/protocol/teamwork.xml deleted file mode 100644 index 99e2f33df..0 --- a/src/protocol/teamwork.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --
[EGIT] [core/efl] master 01/01: ecore_wl2: Remove legacy teamwork stuff
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=914a85159be2244e541b7f44f16ea4c7e4f3aca5
commit 914a85159be2244e541b7f44f16ea4c7e4f3aca5
Author: Christopher Michael
Date: Mon Mar 1 11:22:58 2021 -0500
ecore_wl2: Remove legacy teamwork stuff
This patch removes the remainder of the Teamwork protocol &
implementation. The module has been removed from Enlightenment for
some time now so there is no need to generate a protocol or have any
legacy code remaining..
---
src/lib/ecore_wl2/ecore_wl2_display.c | 6 --
src/lib/ecore_wl2/ecore_wl2_private.h | 4
src/wayland_protocol/meson.build | 3 +--
src/wayland_protocol/teamwork.xml | 39 ---
4 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index efaa25363c..7a0e20cf31 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -326,12 +326,6 @@ _cb_global_add(void *data, struct wl_registry *registry,
unsigned int id, const
EINA_INLIST_FOREACH(ewd->windows, window)
if (window->surface)
efl_aux_hints_get_supported_aux_hints(ewd->wl.efl_aux_hints, window->surface);
}
- else if (!strcmp(interface, "zwp_teamwork"))
- {
-ewd->wl.teamwork =
- wl_registry_bind(registry, id,
- &zwp_teamwork_interface, EFL_TEAMWORK_VERSION);
- }
else if (!strcmp(interface, "wl_output"))
_ecore_wl2_output_add(ewd, id);
else if (!strcmp(interface, "wl_seat"))
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 0a662e7884..c374c67857 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -7,9 +7,6 @@
# include
# include "ecore_wl2_internal.h"
-# define EFL_TEAMWORK_VERSION 2
-# include "teamwork-client-protocol.h"
-
# include "session-recovery-client-protocol.h"
# include "xdg-shell-client-protocol.h"
@@ -92,7 +89,6 @@ struct _Ecore_Wl2_Display
struct xdg_wm_base *xdg_wm_base;
struct zwp_e_session_recovery *session_recovery;
struct efl_aux_hints *efl_aux_hints;
-struct zwp_teamwork *teamwork;
struct efl_hints *efl_hints;
int compositor_version;
} wl;
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index 652dfd551d..3749e5d91b 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -7,8 +7,7 @@ wayland_client = dependency('wayland-client')
wl_protocol_local = [
'efl-aux-hints.xml',
'efl-hints.xml',
- 'session-recovery.xml',
- 'teamwork.xml'
+ 'session-recovery.xml'
]
wl_unstable_protocol_sys = [
diff --git a/src/wayland_protocol/teamwork.xml
b/src/wayland_protocol/teamwork.xml
deleted file mode 100644
index 99e2f33dfa..00
--- a/src/wayland_protocol/teamwork.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
[EGIT] [core/enlightenment] master 03/03: e_comp_wl: Remove wayland wobbly windows stuffs
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8fd255c45c48aa3bd0659524238cfaf92985691f
commit 8fd255c45c48aa3bd0659524238cfaf92985691f
Author: Christopher Michael
Date: Mon Mar 1 10:35:15 2021 -0500
e_comp_wl: Remove wayland wobbly windows stuffs
This never worked properly, is unsupported by upstream wayland, and
just general clutter so let's remove it. There are no plans to support
this and is just extra overhead...
---
src/bin/e_comp_wl.c| 16 --
src/bin/e_comp_wl.h| 9 --
src/bin/e_comp_wl_extensions.c | 72 --
3 files changed, 97 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 67f5f591e..123cd5906 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -5,8 +5,6 @@
#define __STDC_FORMAT_MACROS
#include
-#include "www-server-protocol.h"
-
#define COMPOSITOR_VERSION 4
E_API int E_EVENT_WAYLAND_GLOBAL_ADD = -1;
@@ -757,20 +755,6 @@ _e_comp_wl_evas_cb_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_U
Eina_List *l;
if (e_object_is_del(E_OBJECT(ec))) return;
- if (ec->comp_data->www.surface)
- {
-if (ec->comp_data->moved)
- {
- if ((!ec->maximized) && (!ec->fullscreen) &&
(!ec->comp_data->maximizing) && (!ec->maximize_override))
- www_surface_send_status(ec->comp_data->www.surface,
- ec->x - ec->comp_data->www.x, ec->y - ec->comp_data->www.y,
lround(ecore_loop_time_get()));
- else if (ec->comp_data->maximizing || ec->maximize_override)
- www_surface_send_status(ec->comp_data->www.surface,
- ec->w / 3, ec->h / 3, lround(ecore_loop_time_get()));
- }
-ec->comp_data->www.x = ec->x;
-ec->comp_data->www.y = ec->y;
- }
ec->comp_data->moved = 1;
EINA_LIST_FOREACH(ec->comp_data->sub.list, l, sec)
{
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index f9b29b5dd..a18746c5d 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -109,10 +109,6 @@ typedef struct E_Comp_Wl_Extension_Data
{
struct wl_global *global;
} session_recovery;
- struct
- {
-struct wl_global *global;
- } www;
/* begin xdg-foreign */
struct
{
@@ -330,11 +326,6 @@ struct _E_Comp_Wl_Client_Data
int fs_zone;
} set;
} shell;
- struct
- {
- struct wl_resource *surface;
- int x, y;
- } www;
E_Comp_Wl_Surface_State pending;
diff --git a/src/bin/e_comp_wl_extensions.c b/src/bin/e_comp_wl_extensions.c
index 241ba107c..7de8de268 100644
--- a/src/bin/e_comp_wl_extensions.c
+++ b/src/bin/e_comp_wl_extensions.c
@@ -1,16 +1,13 @@
#define E_COMP_WL
#include "e.h"
-
#include
#include "session-recovery-server-protocol.h"
-#include "www-server-protocol.h"
#include "xdg-foreign-unstable-v1-server-protocol.h"
#include "relative-pointer-unstable-v1-server-protocol.h"
#include "pointer-constraints-unstable-v1-server-protocol.h"
#include "action_route-server-protocol.h"
-
/* mutter uses 32, seems reasonable */
#define HANDLE_LEN 32
@@ -51,18 +48,12 @@ static void
_e_comp_wl_extensions_client_move_begin(void *d EINA_UNUSED, E_Client *ec)
{
if (e_client_has_xwindow(ec) || e_object_is_del(E_OBJECT(ec))) return;
-
- if (ec->comp_data->www.surface)
- www_surface_send_start_drag(ec->comp_data->www.surface);
}
static void
_e_comp_wl_extensions_client_move_end(void *d EINA_UNUSED, E_Client *ec)
{
if (e_client_has_xwindow(ec) || e_object_is_del(E_OBJECT(ec))) return;
-
- if (ec->comp_data->www.surface)
- www_surface_send_end_drag(ec->comp_data->www.surface);
}
static void
@@ -133,62 +124,6 @@ _e_comp_wl_session_recovery_destroy_uuid(struct wl_client
*client EINA_UNUSED, s
e_remember_apply(ec->sr_remember, ec);
}
-static void
-_e_comp_wl_www_surface_del(struct wl_resource *res)
-{
- E_Client *ec;
-
- ec = wl_resource_get_user_data(res);
- if (!e_object_is_del(E_OBJECT(ec)))
- {
-ec->comp_data->www.surface = NULL;
-ec->comp_data->maximize_anims_disabled = 0;
- }
- ec->maximize_anims_disabled = 0;
- e_object_unref(E_OBJECT(ec));
-}
-
-static void
-_e_comp_wl_www_surface_destroy(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource)
-{
- wl_resource_destroy(resource);
-}
-
-static const struct www_surface_interface _e_www_surface_interface =
-{
- _e_comp_wl_www_surface_destroy,
-};
-
-static void
-_e_comp_wl_www_cb_create(struct wl_client *client, struct wl_resource
*resource, uint32_t id, struct wl_resource *surfac
[EGIT] [core/efl] master 03/03: ecore-evas-wayland: Remove wayland wobbly windows junk
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f174e739e162e1e2ce070deee97f3cf67517fc76
commit f174e739e162e1e2ce070deee97f3cf67517fc76
Author: Christopher Michael
Date: Mon Mar 1 10:33:31 2021 -0500
ecore-evas-wayland: Remove wayland wobbly windows junk
Never worked properly, is unsupported by upstream wayland, and is just
general clutter so let's remove it.
---
.../engines/wayland/ecore_evas_wayland_common.c| 48 --
1 file changed, 48 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 5a815fdd90..1cec016ebc 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -987,45 +987,6 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
}
}
-static Eina_Bool
-_ecore_evas_wl_common_cb_www_drag(void *d EINA_UNUSED, int t EINA_UNUSED, void
*event)
-{
- Ecore_Wl2_Event_Window_WWW_Drag *ev = event;
- Ecore_Evas_Engine_Wl_Data *wdata;
- Ecore_Evas *ee;
-
- ee = ecore_event_window_match((Ecore_Window)ev->window);
- if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if ((Ecore_Window)ev->window != ee->prop.window)
- return ECORE_CALLBACK_PASS_ON;
-
- wdata = ee->engine.data;
- wdata->dragging = !!ev->dragging;
- if (!ev->dragging)
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
-_ecore_evas_wl_common_cb_www(void *d EINA_UNUSED, int t EINA_UNUSED, void
*event)
-{
- Ecore_Wl2_Event_Window_WWW *ev = event;
- Ecore_Evas_Engine_Wl_Data *wdata;
- Ecore_Evas *ee;
-
- ee = ecore_event_window_match((Ecore_Window)ev->window);
- if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if ((Ecore_Window)ev->window != ee->prop.window)
- return ECORE_CALLBACK_PASS_ON;
-
- wdata = ee->engine.data;
- wdata->x_rel += ev->x_rel;
- wdata->y_rel += ev->y_rel;
- wdata->timestamp = ev->timestamp;
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- return ECORE_CALLBACK_RENEW;
-}
-
static void
_ecore_evas_wl_common_cb_device_event_free(void *user_data, void *func_data)
{
@@ -1361,14 +1322,6 @@ _ecore_evas_wl_common_init(void)
_ecore_evas_wl_common_cb_window_configure,
NULL);
eina_array_push(_ecore_evas_wl_event_hdls, h);
- h = ecore_event_handler_add(_ecore_wl2_event_window_www,
- _ecore_evas_wl_common_cb_www, NULL);
- eina_array_push(_ecore_evas_wl_event_hdls, h);
-
- h = ecore_event_handler_add(_ecore_wl2_event_window_www_drag,
- _ecore_evas_wl_common_cb_www_drag, NULL);
- eina_array_push(_ecore_evas_wl_event_hdls, h);
-
h = ecore_event_handler_add(ECORE_WL2_EVENT_DISCONNECT,
_ecore_evas_wl_common_cb_disconnect, NULL);
eina_array_push(_ecore_evas_wl_event_hdls, h);
@@ -2255,7 +2208,6 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
einfo->info.destination_alpha = ee_needs_alpha(ee);
einfo->info.wl2_win = wdata->win;
einfo->info.hidden = wdata->win->pending.configure; //EINA_FALSE;
- einfo->www_avail = !!wdata->win->www_surface;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
if (ECORE_EVAS_PORTRAIT(ee))
--
[EGIT] [core/efl] master 02/03: ecore_wl2: Remove wayland wobbly windows stuffs
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=350b65fc21fb413ea69b07d8dc12510eae38e846
commit 350b65fc21fb413ea69b07d8dc12510eae38e846
Author: Christopher Michael
Date: Mon Mar 1 10:32:08 2021 -0500
ecore_wl2: Remove wayland wobbly windows stuffs
This cleans up the www mess that never worked properly and is
unsupported with no plans to ever be used
---
src/lib/ecore_wl2/ecore_wl2_display.c | 10 -
src/lib/ecore_wl2/ecore_wl2_private.h | 21 ---
src/lib/ecore_wl2/ecore_wl2_window.c | 69 ---
3 files changed, 100 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 7344cf8b74..efaa25363c 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -307,15 +307,6 @@ _cb_global_add(void *data, struct wl_registry *registry,
unsigned int id, const
ewd->wl.data_device_manager =
wl_registry_bind(registry, id, &wl_data_device_manager_interface,
ewd->wl.data_device_manager_version);
}
- else if ((eina_streq(interface, "www")) &&
-(getenv("EFL_WAYLAND_ENABLE_WWW")))
- {
-Ecore_Wl2_Window *window;
-
-ewd->wl.www = wl_registry_bind(registry, id, &www_interface, 1);
-EINA_INLIST_FOREACH(ewd->windows, window)
- _ecore_wl2_window_www_surface_init(window);
- }
else if ((!strcmp(interface, "zwp_e_session_recovery")) &&
(!no_session_recovery))
{
@@ -452,7 +443,6 @@ _ecore_wl2_display_globals_cleanup(Ecore_Wl2_Display *ewd)
{
if (ewd->wl.session_recovery)
zwp_e_session_recovery_destroy(ewd->wl.session_recovery);
- if (ewd->wl.www) www_destroy(ewd->wl.www);
if (ewd->wl.xdg_wm_base) xdg_wm_base_destroy(ewd->wl.xdg_wm_base);
if (ewd->wl.zxdg_shell) zxdg_shell_v6_destroy(ewd->wl.zxdg_shell);
if (ewd->wl.shm) wl_shm_destroy(ewd->wl.shm);
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index e4d19bd1e0..0a662e7884 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -5,7 +5,6 @@
# include "Ecore_Wl2.h"
# include "Ecore_Input.h"
# include
-# include "www-client-protocol.h"
# include "ecore_wl2_internal.h"
# define EFL_TEAMWORK_VERSION 2
@@ -91,7 +90,6 @@ struct _Ecore_Wl2_Display
struct zwp_linux_dmabuf_v1 *dmabuf;
struct zxdg_shell_v6 *zxdg_shell;
struct xdg_wm_base *xdg_wm_base;
-struct www *www;
struct zwp_e_session_recovery *session_recovery;
struct efl_aux_hints *efl_aux_hints;
struct zwp_teamwork *teamwork;
@@ -182,7 +180,6 @@ struct _Ecore_Wl2_Window
struct wl_surface *surface;
void *buffer;
struct wl_callback *callback;
- struct www_surface *www_surface;
struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel;
struct xdg_popup *xdg_popup;
@@ -529,20 +526,6 @@ struct _Ecore_Wl2_Input
Eina_List *devices_list;
};
-typedef struct Ecore_Wl2_Event_Window_WWW
-{
- Ecore_Wl2_Window *window;
- int x_rel;
- int y_rel;
- uint32_t timestamp;
-} Ecore_Wl2_Event_Window_WWW;
-
-typedef struct Ecore_Wl2_Event_Window_WWW_Drag
-{
- Ecore_Wl2_Window *window;
- Eina_Bool dragging;
-} Ecore_Wl2_Event_Window_WWW_Drag;
-
typedef struct _Buffer_Handle Buffer_Handle;
typedef struct _Ecore_Wl2_Buffer
{
@@ -573,9 +556,6 @@ typedef struct _Ecore_Wl2_Surface
Eina_Bool alpha : 1;
} Ecore_Wl2_Surface;
-EAPI extern int _ecore_wl2_event_window_www;
-EAPI extern int _ecore_wl2_event_window_www_drag;
-
Ecore_Wl2_Window *_ecore_wl2_display_window_surface_find(Ecore_Wl2_Display
*display, struct wl_surface *wl_surface);
void _display_event_free(void *d, void *event EINA_UNUSED);
@@ -605,7 +585,6 @@ void _ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf);
void _ecore_wl2_window_surface_create(Ecore_Wl2_Window *window);
void _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window);
-void _ecore_wl2_window_www_surface_init(Ecore_Wl2_Window *window);
void _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window);
void _ecore_wl2_offer_unref(Ecore_Wl2_Offer *offer);
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c
b/src/lib/ecore_wl2/ecore_wl2_window.c
index e11e2e30a3..8c018ebd38 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -28,10 +28,6 @@ _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window)
if (window->zxdg_surface) zxdg_surface_v6_destroy(window->zxdg_surface);
window->zxdg_surface = NULL;
- if (window->www_surface)
- www_surface_destroy(window->www_surface);
- window->www_surface = NULL;
-
if (window->surface) wl_surface_destroy(window->surface);
[EGIT] [core/enlightenment] master 01/03: enlightenment: Remove wayland wobbly windows protocol file
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=edad732eeeabbd12b400a7bc2db677cc0b47478b commit edad732eeeabbd12b400a7bc2db677cc0b47478b Author: Christopher Michael Date: Mon Mar 1 10:34:31 2021 -0500 enlightenment: Remove wayland wobbly windows protocol file Unsupported, untested, unused... --- src/protocol/www.xml | 28 1 file changed, 28 deletions(-) diff --git a/src/protocol/www.xml b/src/protocol/www.xml deleted file mode 100644 index 8d455178d..0 --- a/src/protocol/www.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - --
[EGIT] [core/efl] master 01/03: wayland_protocol: Remove wayland wobbly windows junk
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fbfcb4b309d264f8d8ad7fd239792c55acae4230 commit fbfcb4b309d264f8d8ad7fd239792c55acae4230 Author: Christopher Michael Date: Mon Mar 1 10:29:50 2021 -0500 wayland_protocol: Remove wayland wobbly windows junk This protocol never fully worked properly, is unsupported & unused, would never be accepted in upstream wayland, and is just generally worthless so let's remove it. There are no plans to ever support it... --- src/wayland_protocol/meson.build | 3 +-- src/wayland_protocol/www.xml | 28 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build index f08e84b31c..652dfd551d 100644 --- a/src/wayland_protocol/meson.build +++ b/src/wayland_protocol/meson.build @@ -8,8 +8,7 @@ wl_protocol_local = [ 'efl-aux-hints.xml', 'efl-hints.xml', 'session-recovery.xml', - 'teamwork.xml', - 'www.xml' + 'teamwork.xml' ] wl_unstable_protocol_sys = [ diff --git a/src/wayland_protocol/www.xml b/src/wayland_protocol/www.xml deleted file mode 100644 index 8d455178de..00 --- a/src/wayland_protocol/www.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - --
[EGIT] [core/enlightenment] master 02/03: generated: Remove www xml file
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e0672775f29d7e39d945f35aa4b1dcbbd3d002db commit e0672775f29d7e39d945f35aa4b1dcbbd3d002db Author: Christopher Michael Date: Mon Mar 1 10:35:02 2021 -0500 generated: Remove www xml file --- src/bin/generated/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/generated/meson.build b/src/bin/generated/meson.build index 9d8e7db48..0ad40be1f 100644 --- a/src/bin/generated/meson.build +++ b/src/bin/generated/meson.build @@ -1,7 +1,6 @@ protos = [ '@0@/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'.format(dir_wayland_protocols), '../../protocol/session-recovery.xml', - '../../protocol/www.xml', '../../protocol/efl-aux-hints.xml', '../../protocol/action_route.xml', '@0@/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml'.format(dir_wayland_protocols), --
[EGIT] [core/efl] master 01/01: eeze_disk: fix potential memory leak
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95a88f5a6c5c8bcc8bacb014742e37e3bfaf503d
commit 95a88f5a6c5c8bcc8bacb014742e37e3bfaf503d
Author: Christopher Michael
Date: Thu Feb 25 10:02:07 2021 -0500
eeze_disk: fix potential memory leak
If allocation for disk fails, then we leak memory from previously
called _new_device function.
This patch based on D12223 from akanad (Wonki Kim)
ref D12223
---
src/lib/eeze/eeze_disk.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/eeze/eeze_disk.c b/src/lib/eeze/eeze_disk.c
index ea413976fc..9747b9801a 100644
--- a/src/lib/eeze/eeze_disk.c
+++ b/src/lib/eeze/eeze_disk.c
@@ -175,7 +175,11 @@ eeze_disk_new(const char *path)
return NULL;
if (!(disk = calloc(1, sizeof(Eeze_Disk
- return NULL;
+ {
+eina_stringshare_del(syspath);
+udev_device_unref(dev);
+return NULL;
+ }
if (is_dev)
{
@@ -185,7 +189,6 @@ eeze_disk_new(const char *path)
else
disk->syspath = eina_stringshare_add(udev_device_get_syspath(dev));
-
disk->device = dev;
disk->mount_opts = EEZE_DISK_MOUNTOPT_DEFAULTS;
disk->mount_cmd_changed = EINA_TRUE;
--
[EGIT] [core/efl] master 01/01: eeze_disk: Remove extra blank lines
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=691621336ad68b29481b8438b89bcca6e148b7f2
commit 691621336ad68b29481b8438b89bcca6e148b7f2
Author: Christopher Michael
Date: Thu Feb 25 09:57:47 2021 -0500
eeze_disk: Remove extra blank lines
NB: No functional changes
---
src/lib/eeze/eeze_disk.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/eeze/eeze_disk.c b/src/lib/eeze/eeze_disk.c
index 60c4fa74b7..ea413976fc 100644
--- a/src/lib/eeze/eeze_disk.c
+++ b/src/lib/eeze/eeze_disk.c
@@ -174,11 +174,9 @@ eeze_disk_new(const char *path)
else if (!(dev = _new_device(path)))
return NULL;
-
if (!(disk = calloc(1, sizeof(Eeze_Disk
return NULL;
-
if (is_dev)
{
disk->devpath = eina_stringshare_add(path);
--
[EGIT] [core/efl] master 04/07: elm_glview: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0df61dc4fda991a2b64c57a6c7825f76d6a887ba
commit 0df61dc4fda991a2b64c57a6c7825f76d6a887ba
Author: Christopher Michael
Date: Thu Feb 25 09:25:25 2021 -0500
elm_glview: Fix unchecked return value
Small patch to check return value of evas_gl_make_current reported by
Coverity.
Fixes CID1401018
---
src/lib/elementary/elm_glview.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index a33921a4c9..eaa01f0cf0 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -53,7 +53,8 @@ _glview_update_surface(Evas_Object *obj)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd) return;
- evas_gl_make_current(sd->evasgl, NULL, NULL);
+ if (!evas_gl_make_current(sd->evasgl, NULL, NULL))
+ return;
if (sd->surface)
{
--
[EGIT] [core/efl] master 07/07: efl_loop: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=369f2b3d87677ac076627a44c1e0e0c14c56d467
commit 369f2b3d87677ac076627a44c1e0e0c14c56d467
Author: Christopher Michael
Date: Thu Feb 25 09:40:29 2021 -0500
efl_loop: Fix unchecked return value
Small patch to check return value of eina_value_get reported by Coverity
Fixes CID1400919
---
src/lib/ecore/efl_loop.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 726a4b36a0..d85d5b1661 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -140,7 +140,11 @@ efl_loop_exit_code_process(Eina_Value *value)
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
if (!eina_value_convert(value, &v)) r = -1;
-else eina_value_get(&v, &r);
+else
+ {
+ if (!eina_value_get(&v, &r))
+ r = -1;
+ }
}
else
{
--
[EGIT] [core/efl] master 02/07: eldbus_fake_server: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3a07f18294e73f0b306077861d7b54a06130fc06
commit 3a07f18294e73f0b306077861d7b54a06130fc06
Author: Christopher Michael
Date: Thu Feb 25 09:18:46 2021 -0500
eldbus_fake_server: Fix unchecked return value
Small patch to check return values of
eldbus_message_iter_arguments_get reported by Coverity.
Fixes CID1401042
---
src/tests/eldbus/eldbus_fake_server.c | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/tests/eldbus/eldbus_fake_server.c
b/src/tests/eldbus/eldbus_fake_server.c
index 41d4b1f7a4..32f5b9bd17 100644
--- a/src/tests/eldbus/eldbus_fake_server.c
+++ b/src/tests/eldbus/eldbus_fake_server.c
@@ -153,12 +153,20 @@ _fake_server_property_set(const Eldbus_Service_Interface
*iface,
ck_assert_ptr_ne(NULL, data);
if (strcmp(propname, FAKE_SERVER_WRITEONLY_PROPERTY) == 0)
- eldbus_message_iter_arguments_get(iter, "i", &data->writeonly_property);
- else
- if (strcmp(propname, FAKE_SERVER_READWRITE_PROPERTY) == 0)
- eldbus_message_iter_arguments_get(iter, "i", &data->readwrite_property);
+ {
+if (!eldbus_message_iter_arguments_get(iter, "i",
&data->writeonly_property))
+ ck_abort_msg("error getting iter arguments on
_fake_server_property_set");
+ }
else
- return eldbus_message_error_new(msg, "Invalid property", "Invalid
property.");
+ {
+if (strcmp(propname, FAKE_SERVER_READWRITE_PROPERTY) == 0)
+ {
+ if (!eldbus_message_iter_arguments_get(iter, "i",
&data->readwrite_property))
+ ck_abort_msg("error getting iter arguments on
_fake_server_property_set");
+ }
+else
+ return eldbus_message_error_new(msg, "Invalid property", "Invalid
property.");
+ }
return eldbus_message_method_return_new(msg);
}
--
[EGIT] [core/efl] master 03/07: eina_value: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=732e622a8205f2d21032d1c74417331309fc5bab
commit 732e622a8205f2d21032d1c74417331309fc5bab
Author: Christopher Michael
Date: Thu Feb 25 09:23:23 2021 -0500
eina_value: Fix unchecked return value
Small patch to check return value of eina_value_type_setup reported by
Coverity
Fixes CID1401023
---
src/lib/eina/eina_value.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index 3cf4c06ab2..4045124775 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -4614,27 +4614,27 @@ eina_value_optional_pset(Eina_Value *value,
{
eina_value_optional_reset(value);
- if(sizeof(Eina_Value_Optional_Outer) <= sizeof(Eina_Value_Union))
+ if (sizeof(Eina_Value_Optional_Outer) <= sizeof(Eina_Value_Union))
{
- Eina_Value_Optional_Outer outer;
- outer.subtype = subtype;
- outer.value = malloc(subtype->value_size);
- eina_value_type_setup(subtype, outer.value);
- eina_value_type_pset(subtype, outer.value, subvalue);
- if (!eina_value_pset(value, &outer))
- {
- return EINA_FALSE;
- }
+Eina_Value_Optional_Outer outer;
+outer.subtype = subtype;
+outer.value = malloc(subtype->value_size);
+if (!eina_value_type_setup(subtype, outer.value))
+ return EINA_FALSE;
+eina_value_type_pset(subtype, outer.value, subvalue);
+if (!eina_value_pset(value, &outer))
+ return EINA_FALSE;
}
else
{
Eina_Value_Optional_Inner *inner =
malloc(sizeof(Eina_Value_Optional_Inner) + subtype->value_size);
inner->subtype = subtype;
-eina_value_type_setup(subtype, inner->value);
+if (!eina_value_type_setup(subtype, inner->value))
+ return EINA_FALSE;
eina_value_type_pset(subtype, inner->value, subvalue);
if (!eina_value_pset(value, &inner))
- return EINA_FALSE;
+ return EINA_FALSE;
}
return EINA_TRUE;
--
[EGIT] [core/efl] master 01/07: elm_slider: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=598b7a1be6f6e42b217c423c6dcdad8132a1a941
commit 598b7a1be6f6e42b217c423c6dcdad8132a1a941
Author: Christopher Michael
Date: Thu Feb 25 09:11:17 2021 -0500
elm_slider: Fix unchecked return value
Small patch to check the return value of eina_value_get reported by
Coverity
Fixes CID1401061
---
src/lib/elementary/elm_slider.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 6604c4c2fb..8d6f9871ec 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1571,7 +1571,9 @@ _format_legacy_to_format_eo_cb(void *data, Eina_Strbuf
*str, const Eina_Value va
const Eina_Value_Type *type = eina_value_type_get(&value);
if (type == EINA_VALUE_TYPE_DOUBLE)
- eina_value_get(&value, &val);
+ {
+if (!eina_value_get(&value, &val)) return EINA_FALSE;
+ }
if (sfwd->format_cb)
buf = sfwd->format_cb(val);
--
[EGIT] [core/efl] master 05/07: eina_promise: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=359435bed97c06f4a3b7b3fe29cc3f2b1a0a8d43
commit 359435bed97c06f4a3b7b3fe29cc3f2b1a0a8d43
Author: Christopher Michael
Date: Thu Feb 25 09:27:15 2021 -0500
eina_promise: Fix unchecked return value
Small patch to check return value of eina_value_get reported by Coverity
Fixes CID1400993
---
src/lib/eina/eina_promise.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index 735c793373..4fe51206e4 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -1468,7 +1468,9 @@ _eina_future_cb_ignore_error(void *data, const Eina_Value
value,
if (value.type == EINA_VALUE_TYPE_ERROR)
{
Eina_Error err;
-eina_value_get(&value, &err);
+
+if (!eina_value_get(&value, &err))
+ return EINA_VALUE_EMPTY;
if ((!expected_err) || (expected_err == err))
{
DBG("ignored error %d (%s)", err, eina_error_msg_get(err));
--
[EGIT] [core/efl] master 06/07: eio_test_manager: Fix unchecked return value
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3e5629f12554d517a9c2b94450350d2a729292ae commit 3e5629f12554d517a9c2b94450350d2a729292ae Author: Christopher Michael Date: Thu Feb 25 09:33:42 2021 -0500 eio_test_manager: Fix unchecked return value Small patch to check return value of eina_value_convert reported by Coverity Fixes CID1400976 --- src/tests/eio/eio_test_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c index 3c49cf6271..fbbe3b78e5 100644 --- a/src/tests/eio/eio_test_manager.c +++ b/src/tests/eio/eio_test_manager.c @@ -88,7 +88,7 @@ _done_cb(void *data, unsigned long files_count = 0; eina_value_setup(&convert, EINA_VALUE_TYPE_ULONG); -eina_value_convert(&file, &convert); +fail_if(eina_value_convert(&file, &convert) != EINA_TRUE); fail_unless(eina_value_ulong_get(&convert, &files_count)); fail_if((*number_of_listed_files) != test_count); --
[EGIT] [core/efl] master 01/02: header_checks: Add check for mallinfo2
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c6f20933c61afd4732dc10adcb42ca26d6b7875e commit c6f20933c61afd4732dc10adcb42ca26d6b7875e Author: Christopher Michael Date: Thu Feb 25 08:25:09 2021 -0500 header_checks: Add check for mallinfo2 --- header_checks/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/header_checks/meson.build b/header_checks/meson.build index c71fdbf216..2f0205f28a 100644 --- a/header_checks/meson.build +++ b/header_checks/meson.build @@ -113,6 +113,7 @@ function_checks = [ ['dlopen', ['dlfcn.h'], ['dl']], ['dlsym', ['dlfcn.h'],['dl']], ['lround', ['math.h'],['m']], + ['mallinfo2', ['malloc.h'],['malloc']], ['mallinfo', ['malloc.h'],['malloc']], ['shm_open', ['sys/mman.h', 'sys/stat.h', 'fcntl.h'], ['rt']], #from here on we specify arguments --
[EGIT] [core/efl] master 02/02: ecore: Update to not use deprecated mallinfo
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d70f9484c6e6e9a5034adb350d78f761481cb3b0
commit d70f9484c6e6e9a5034adb350d78f761481cb3b0
Author: Christopher Michael
Date: Thu Feb 25 08:25:29 2021 -0500
ecore: Update to not use deprecated mallinfo
mallinfo (the structure) and mallinfo (the function) have both been
deprecated in favor of mallinfo2 which has been updated to
handle allocations > 4GB.
This patch updates ecore usage of deprecated mallinfo to use
mallinfo2. If the system does NOT have mallinfo2, then this code will
fallback to using mallinfo.
---
src/lib/ecore/ecore.c | 63 ++-
1 file changed, 47 insertions(+), 16 deletions(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 0d79b621b2..0b4ba4a8fd 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -32,8 +32,8 @@
#include "ecore_private.h"
#include "../../static_libs/buildsystem/buildsystem.h"
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
-#include
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) ||
defined(HAVE_MALLINFO2)
+# include
#endif
#ifndef O_BINARY
@@ -45,14 +45,19 @@ EAPI Ecore_Version *ecore_version = &_version;
EAPI double _efl_startup_time = 0;
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
-#define KEEP_MAX(Global, Local) \
- if (Global < (Local)) \
-Global = Local;
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) ||
defined(HAVE_MALLINFO2)
+# define KEEP_MAX(Global, Local) \
+ if (Global < (Local)) \
+ Global = Local;
static Eina_Bool _ecore_memory_statistic(void *data);
+# ifdef HAVE_MALLINFO2
+static size_t _ecore_memory_max_total = 0;
+static size_t _ecore_memory_max_free = 0;
+# else
static int _ecore_memory_max_total = 0;
static int _ecore_memory_max_free = 0;
+# endif
static pid_t _ecore_memory_pid = 0;
#ifdef HAVE_MALLOC_INFO
static FILE *_ecore_memory_statistic_file = NULL;
@@ -291,7 +296,7 @@ ecore_init(void)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) ||
defined(HAVE_MALLINFO2)
if (getenv("ECORE_MEM_STAT"))
{
#ifdef HAVE_MALLOC_INFO
@@ -432,16 +437,22 @@ ecore_shutdown(void)
_ecore_main_loop_shutdown();
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) ||
defined(HAVE_MALLINFO2)
if (getenv("ECORE_MEM_STAT"))
{
_ecore_memory_statistic(NULL);
+ #ifdef HAVE_MALLINFO2
+ ERR("[%i] Memory MAX total: %lu, free: %lu",
+ _ecore_memory_pid,
+ _ecore_memory_max_total,
+ _ecore_memory_max_free);
+ #else
ERR("[%i] Memory MAX total: %i, free: %i",
_ecore_memory_pid,
_ecore_memory_max_total,
_ecore_memory_max_free);
-
+ #endif
#ifdef HAVE_MALLOC_INFO
fclose(_ecore_memory_statistic_file);
@@ -963,20 +974,30 @@ _systemd_watchdog_cb(void *data EINA_UNUSED, const
Efl_Event *event EINA_UNUSED)
}
#endif
-#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) ||
defined(HAVE_MALLINFO2)
static Eina_Bool
_ecore_memory_statistic(EINA_UNUSED void *data)
{
#ifdef HAVE_MALLOC_INFO
static int frame = 0;
#endif
-#ifdef HAVE_MALLINFO
+
+#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
+ Eina_Bool changed = EINA_FALSE;
+
+# if defined(HAVE_MALLINFO2)
+ struct mallinfo2 mi;
+ static size_t uordblks = 0;
+ static size_t fordblks = 0;
+
+ mi = mallinfo2();
+# else
struct mallinfo mi;
static int uordblks = 0;
static int fordblks = 0;
- Eina_Bool changed = EINA_FALSE;
mi = mallinfo();
+# endif
#define HAS_CHANGED(Global, Local) \
if (Global != Local) \
@@ -989,14 +1010,24 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
HAS_CHANGED(fordblks, mi.fordblks);
if (changed)
- ERR("[%i] Memory total: %i, free: %i",
- _ecore_memory_pid,
- mi.uordblks,
- mi.fordblks);
+ {
+#ifdef HAVE_MALLINFO2
+ERR("[%i] Memory total: %lu, free: %lu",
+_ecore_memory_pid,
+mi.uordblks,
+mi.fordblks);
+#else
+ERR("[%i] Memory total: %i, free: %i",
+_ecore_memory_pid,
+mi.uordblks,
+mi.fordblks);
+#endif
+ }
KEEP_MAX(_ecore_memory_max_total, mi.uordblks);
KEEP_MAX(_ecore_memory_max_free, mi.fordblks);
#endif
+
#ifdef HAVE_MALLOC_INFO
if (frame) fputs("\n", _ecore_memory_statistic_file);
malloc_info(0, _ecore_memory_statistic_file);
--
[EGIT] [core/efl] master 01/01: eina_tests: Fix argument cannot be negative
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d0288f4730451a2c6813a7bd1a133e09cd600994 commit d0288f4730451a2c6813a7bd1a133e09cd600994 Author: Christopher Michael Date: Wed Feb 24 08:00:13 2021 -0500 eina_tests: Fix argument cannot be negative Coverity reports that 'fd' returned from 'open' here returns a negative number. Passing a negative number to the 'write' function is not allowed, so we should change the 'fail_if' checks here to make sure 'fd' is not negative. Fixes CID1400940 @fix --- src/tests/eina/eina_test_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c index 3d4412bfa2..3e12206094 100644 --- a/src/tests/eina/eina_test_file.c +++ b/src/tests/eina/eina_test_file.c @@ -357,12 +357,12 @@ EFL_START_TEST(eina_file_map_new_test) strcat(test_file2_path, test_file2_name_part); fd = open(test_file_path, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, S_IWUSR | S_IRUSR); - fail_if(fd == 0); + fail_if(fd <= 0); fail_if(write(fd, eina_map_test_string, strlen(eina_map_test_string)) != (ssize_t) strlen(eina_map_test_string)); close(fd); fd = open(test_file2_path, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, S_IWUSR | S_IRUSR); - fail_if(fd == 0); + fail_if(fd <= 0); fail_if(write(fd, big_buffer, big_buffer_size - file_min_offset) != big_buffer_size - file_min_offset); close(fd); --
[EGIT] [core/efl] master 01/01: Revert "ecore: Update to not use deprecated mallinfo"
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1842d3997a88e22421eddeed49be50a0db08b7ce
commit 1842d3997a88e22421eddeed49be50a0db08b7ce
Author: Christopher Michael
Date: Wed Feb 17 10:52:20 2021 -0500
Revert "ecore: Update to not use deprecated mallinfo"
Reverting this, for now, because some distro's are still not
updated... This should probably use a malloc version check, but I
don't have time this week for a proper fix...
This reverts commit 17137316eeb728a30c3c14e4b3a2f1cd8765bbfc.
---
src/lib/ecore/ecore.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index c3ffaa4165..0d79b621b2 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -51,8 +51,8 @@ EAPI double _efl_startup_time = 0;
Global = Local;
static Eina_Bool _ecore_memory_statistic(void *data);
-static size_t _ecore_memory_max_total = 0;
-static size_t _ecore_memory_max_free = 0;
+static int _ecore_memory_max_total = 0;
+static int _ecore_memory_max_free = 0;
static pid_t _ecore_memory_pid = 0;
#ifdef HAVE_MALLOC_INFO
static FILE *_ecore_memory_statistic_file = NULL;
@@ -437,7 +437,7 @@ ecore_shutdown(void)
{
_ecore_memory_statistic(NULL);
- ERR("[%i] Memory MAX total: %lu, free: %lu",
+ ERR("[%i] Memory MAX total: %i, free: %i",
_ecore_memory_pid,
_ecore_memory_max_total,
_ecore_memory_max_free);
@@ -971,12 +971,12 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
static int frame = 0;
#endif
#ifdef HAVE_MALLINFO
- struct mallinfo2 mi;
- static size_t uordblks = 0;
- static size_t fordblks = 0;
+ struct mallinfo mi;
+ static int uordblks = 0;
+ static int fordblks = 0;
Eina_Bool changed = EINA_FALSE;
- mi = mallinfo2();
+ mi = mallinfo();
#define HAS_CHANGED(Global, Local) \
if (Global != Local) \
@@ -989,7 +989,7 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
HAS_CHANGED(fordblks, mi.fordblks);
if (changed)
- ERR("[%i] Memory total: %lu, free: %lu",
+ ERR("[%i] Memory total: %i, free: %i",
_ecore_memory_pid,
mi.uordblks,
mi.fordblks);
--
[EGIT] [apps/express] master 01/01: express: Remove static from elm_main function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ec9f9c95150da86925b9e3cf0ad9017fc2c8a531
commit ec9f9c95150da86925b9e3cf0ad9017fc2c8a531
Author: Christopher Michael
Date: Tue Feb 16 13:33:15 2021 -0500
express: Remove static from elm_main function
---
src/bin/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 88d938e..9e78ec3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -9,7 +9,7 @@
int _log_dom = -1;
/* public functions */
-EAPI_MAIN static int
+EAPI_MAIN int
elm_main(int argc, char **argv)
{
int i = 0;
--
[EGIT] [apps/express] master 01/01: express: No need to check for -fvisibility=hidden twice
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=a9fdbee77a742383869d24e6f322665d4b8da175
commit a9fdbee77a742383869d24e6f322665d4b8da175
Author: Christopher Michael
Date: Tue Feb 16 13:26:07 2021 -0500
express: No need to check for -fvisibility=hidden twice
---
meson.build | 5 -
1 file changed, 5 deletions(-)
diff --git a/meson.build b/meson.build
index 346e46b..6a333a9 100644
--- a/meson.build
+++ b/meson.build
@@ -63,11 +63,6 @@ if cc.has_link_argument('-Wl,--no-copy-dt-needed-entries')
endif
add_global_link_arguments(express_lflags, language: 'c')
-have_visibility_hidden = cc.has_argument('-fvisibility=hidden')
-if have_visibility_hidden
- add_global_arguments('-fvisibility=hidden', language: 'c')
-endif
-
pkgconfig = import('pkgconfig')
windows = import('windows')
--
[EGIT] [apps/express] master 01/01: express: Change pkgconfig file to be libexpress
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=c8beecb61fd45d99fc9ce6292300aab60dab5db4
commit c8beecb61fd45d99fc9ce6292300aab60dab5db4
Author: Christopher Michael
Date: Tue Feb 16 13:23:05 2021 -0500
express: Change pkgconfig file to be libexpress
This pkgconfig file is just for the library of express...as such,
let's name it libexpress
---
express.pc.in => libexpress.pc.in | 0
meson.build | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/express.pc.in b/libexpress.pc.in
similarity index 100%
rename from express.pc.in
rename to libexpress.pc.in
diff --git a/meson.build b/meson.build
index 6293773..346e46b 100644
--- a/meson.build
+++ b/meson.build
@@ -141,8 +141,8 @@ pkgconf.set('requirements_libexpress_libs',
requirement_express_libs)
pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
configure_file(
- input : join_paths(meson.source_root(), 'express.pc.in'),
- output : 'express.pc',
+ input : join_paths(meson.source_root(), 'libexpress.pc.in'),
+ output : 'libexpress.pc',
configuration : pkgconf,
install_dir : pkg_install_dir
)
--
[EGIT] [apps/express] master 01/02: express: Add missing EINA_UNUSED
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=2257324eed31e9f0b2a9e69e1ab9efe0750fe7bf
commit 2257324eed31e9f0b2a9e69e1ab9efe0750fe7bf
Author: Christopher Michael
Date: Tue Feb 16 12:56:34 2021 -0500
express: Add missing EINA_UNUSED
---
src/bin/callbacks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/callbacks.c b/src/bin/callbacks.c
index 0211634..6f646b9 100644
--- a/src/bin/callbacks.c
+++ b/src/bin/callbacks.c
@@ -334,7 +334,7 @@ _callback_user_join(Express_Network *net, const char *event
EINA_UNUSED, const c
}
void
-_callback_user_private(Express_Network *net, const char *event EINA_UNUSED,
const char *source, const char **params, unsigned int count EINA_UNUSED, void
*data EINA_UNUSED)
+_callback_user_private(Express_Network *net EINA_UNUSED, const char *event
EINA_UNUSED, const char *source, const char **params, unsigned int count
EINA_UNUSED, void *data EINA_UNUSED)
{
Channel * chl = NULL;
--
[EGIT] [apps/express] master 02/02: express: Remove meson warnings about linker flags
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=524b5dcc285948991c1c50b0099c54da2cac8b63
commit 524b5dcc285948991c1c50b0099c54da2cac8b63
Author: Christopher Michael
Date: Tue Feb 16 12:56:47 2021 -0500
express: Remove meson warnings about linker flags
This fixes a small issue where meson was warning about linker flags in
compiler argument support checks.
---
meson.build | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index b8497f9..6293773 100644
--- a/meson.build
+++ b/meson.build
@@ -37,9 +37,6 @@ express_cflags_try = [
'-fdata-sections',
'-ffunction-sections',
'-fno-strict-aliasing',
- '-Wl,--gc-sections',
- '-Wl,--as-needed',
- '-Wl,--no-copy-dt-needed-entries',
'-Wshadow',
'-Wstrict-prototypes',
'-Werror=pointer-arith',
@@ -52,6 +49,20 @@ foreach cf: express_cflags_try
endforeach
add_global_arguments(express_cflags, language: 'c')
+express_lflags = []
+if cc.has_link_argument('-Wl,--gc-sections')
+ express_lflags += '-Wl,--gc-sections'
+endif
+
+if cc.has_link_argument('-Wl,--as-needed')
+ express_lflags += '-Wl,--as-needed'
+endif
+
+if cc.has_link_argument('-Wl,--no-copy-dt-needed-entries')
+ express_lflags += '-Wl,--no-copy-dt-needed-entries'
+endif
+add_global_link_arguments(express_lflags, language: 'c')
+
have_visibility_hidden = cc.has_argument('-fvisibility=hidden')
if have_visibility_hidden
add_global_arguments('-fvisibility=hidden', language: 'c')
--
[EGIT] [core/efl] master 01/01: ecore: Update to not use deprecated mallinfo
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=17137316eeb728a30c3c14e4b3a2f1cd8765bbfc
commit 17137316eeb728a30c3c14e4b3a2f1cd8765bbfc
Author: Christopher Michael
Date: Tue Feb 16 12:41:56 2021 -0500
ecore: Update to not use deprecated mallinfo
mallinfo (the structure) and mallinfo (the function) have both been
deprecated in favor of mallinfo2 which has been updated to handle
allocations > 4GB.
This patch updates ecore usage of deprecated mallinfo to use mallinfo2
---
src/lib/ecore/ecore.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 0d79b621b2..c3ffaa4165 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -51,8 +51,8 @@ EAPI double _efl_startup_time = 0;
Global = Local;
static Eina_Bool _ecore_memory_statistic(void *data);
-static int _ecore_memory_max_total = 0;
-static int _ecore_memory_max_free = 0;
+static size_t _ecore_memory_max_total = 0;
+static size_t _ecore_memory_max_free = 0;
static pid_t _ecore_memory_pid = 0;
#ifdef HAVE_MALLOC_INFO
static FILE *_ecore_memory_statistic_file = NULL;
@@ -437,7 +437,7 @@ ecore_shutdown(void)
{
_ecore_memory_statistic(NULL);
- ERR("[%i] Memory MAX total: %i, free: %i",
+ ERR("[%i] Memory MAX total: %lu, free: %lu",
_ecore_memory_pid,
_ecore_memory_max_total,
_ecore_memory_max_free);
@@ -971,12 +971,12 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
static int frame = 0;
#endif
#ifdef HAVE_MALLINFO
- struct mallinfo mi;
- static int uordblks = 0;
- static int fordblks = 0;
+ struct mallinfo2 mi;
+ static size_t uordblks = 0;
+ static size_t fordblks = 0;
Eina_Bool changed = EINA_FALSE;
- mi = mallinfo();
+ mi = mallinfo2();
#define HAS_CHANGED(Global, Local) \
if (Global != Local) \
@@ -989,7 +989,7 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
HAS_CHANGED(fordblks, mi.fordblks);
if (changed)
- ERR("[%i] Memory total: %i, free: %i",
+ ERR("[%i] Memory total: %lu, free: %lu",
_ecore_memory_pid,
mi.uordblks,
mi.fordblks);
--
[EGIT] [apps/express] master 02/02: express: If we cannot find a channel to display a message, just use Status channel
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=b84c4fd9941cacdfc3322a47493b065e3588688a
commit b84c4fd9941cacdfc3322a47493b065e3588688a
Author: Christopher Michael
Date: Fri Feb 12 15:35:13 2021 -0500
express: If we cannot find a channel to display a message, just use
Status channel
---
src/bin/callbacks.c | 29 ++---
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/bin/callbacks.c b/src/bin/callbacks.c
index adc5221..0211634 100644
--- a/src/bin/callbacks.c
+++ b/src/bin/callbacks.c
@@ -121,8 +121,7 @@ _callback_channel_notice(Express_Network *net EINA_UNUSED,
const char *event EIN
if (!(chl = _window_channel_find("Status")))
{
ERR("Could not find channel with server name: %s", source);
- if (!(chl = _window_channel_find("Status")))
- chl = _window_channel_active_get();
+ chl = _window_channel_active_get();
}
}
else
@@ -339,26 +338,18 @@ _callback_user_private(Express_Network *net, const char
*event EINA_UNUSED, cons
{
Channel * chl = NULL;
- DBG("User Private %s", params[0]);
- DBG("\tCount: %d", count);
- DBG("\tUser: %s", source);
- DBG("\tMessage:");
- DBG("\t%s", params[1]); // message
- DBG("\t%s", params[2]);
- DBG("\t%s", params[3]);
+ /* DBG("User Private %s", params[0]); */
+ /* DBG("\tCount: %d", count); */
+ /* DBG("\tUser: %s", source); */
+ /* DBG("\tMessage:"); */
+ /* DBG("\t%s", params[1]); */
+ /* DBG("\t%s", params[2]); */
+ /* DBG("\t%s", params[3]); */
if (!(chl = _window_channel_find(source)))
{
-Express_Server *srv;
-
-if ((srv = express_network_server_connected_get(net)))
- {
- const char *srv_name = NULL;
-
- srv_name = express_network_server_realname_get(srv);
- chl = _window_channel_create(net, source, srv_name);
- if (!chl) return;
- }
+if (!(chl = _window_channel_find("Status")))
+ return;
}
_channel_text_append(chl, source, params[1],
--
[EGIT] [apps/express] master 01/02: express: Ignore ctcp version requests for now
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=a7c02223db34b747b24a782da26ffdcff1748a3d
commit a7c02223db34b747b24a782da26ffdcff1748a3d
Author: Christopher Michael
Date: Fri Feb 12 15:33:29 2021 -0500
express: Ignore ctcp version requests for now
---
src/lib/network.c | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/lib/network.c b/src/lib/network.c
index 39d2f20..1450b37 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -375,10 +375,18 @@ _process_buffer(Express_Network *net, char *data, int
length)
else if (!strncasecmp(params[0],
net->nick, strlen(net->nick)))
{
- if (net->callbacks.priv_msg)
- (*net->callbacks.priv_msg)(net, "PRIVMSG", prefix,
-params, index,
-net->callbacks.data);
+ if (!strncasecmp(params[1], "VERSION", len))
+ {
+/* TODO: Implement version support */
+ }
+ else
+ {
+if (net->callbacks.priv_msg)
+ (*net->callbacks.priv_msg)(net, "PRIVMSG",
+ prefix, params,
+ index,
+ net->callbacks.data);
+ }
}
else
{
--
[EGIT] [apps/express] master 02/02: express: Fix using pkgdata dir
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ad0e68948574bc634a52ae7bdb8f97157425eef3
commit ad0e68948574bc634a52ae7bdb8f97157425eef3
Author: Christopher Michael
Date: Fri Feb 12 14:54:42 2021 -0500
express: Fix using pkgdata dir
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 3c588aa..b8497f9 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ dir_include = join_paths(dir_prefix, get_option('includedir'))
dir_pkginclude = join_paths(dir_include, meson.project_name())
dir_bin = join_paths(dir_prefix, get_option('bindir'))
dir_lib = join_paths(dir_prefix, get_option('libdir'))
-dir_data = join_paths(dir_prefix, get_option('datadir'), meson.project_name())
+dir_data = join_paths(dir_prefix, get_option('datadir'))
dir_pkgdata = join_paths(dir_data, meson.project_name())
dir_locale = join_paths(dir_prefix, get_option('localedir'))
@@ -92,7 +92,7 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
-config_h.set_quoted('PACKAGE_DATA_DIR', dir_data)
+config_h.set_quoted('PACKAGE_DATA_DIR', dir_pkgdata)
config_h.set_quoted('PACKAGE_LOCALE_DIR', dir_locale)
if cc.has_function('mkstemps')
--
[EGIT] [apps/express] master 01/02: express: Use malloc instead of mmap
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ba17e21d9c26315d5d2af880142b3f4f9e786da9
commit ba17e21d9c26315d5d2af880142b3f4f9e786da9
Author: Christopher Michael
Date: Fri Feb 12 14:43:30 2021 -0500
express: Use malloc instead of mmap
---
src/bin/grid_save.c | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/bin/grid_save.c b/src/bin/grid_save.c
index 198d69e..45de6de 100644
--- a/src/bin/grid_save.c
+++ b/src/bin/grid_save.c
@@ -113,16 +113,18 @@ _alloc_new(int size, unsigned char gen)
// so allocate a new block
sz = GS_MMAP_SIZE;
// get mmaped anonymous memory so when freed it goes away from the system
- ptr = mmap(NULL, sz, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- if (ptr == MAP_FAILED)
+ ptr = malloc(sz);
+
+ /* ptr = mmap(NULL, sz, PROT_READ | PROT_WRITE, */
+ /*MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); */
+ if (!ptr)
{
ERR("Cannot allocate more memory with mmap MAP_ANONYMOUS");
return NULL;
}
// note - we SHOULD memset to 0, but we are assuming mmap anon give 0 pages
- //memset(ptr, 0, newsize);
+ memset(ptr, 0, sz);//newsize);
al = (Alloc *)ptr;
al->size = sz;
@@ -176,7 +178,9 @@ _gs_free(void *ptr)
al->allocated -= sz;
if (al->count > 0) return;
alloc[al->slot] = NULL;
- munmap(al, al->size);
+
+ free(al);
+// munmap(al, al->size);
}
static void
--
[EGIT] [apps/express] master 01/01: express: Fix meson app directory name
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=a4cbdc8d4ec9c9ae88a36ee3ec81766297501c6b
commit a4cbdc8d4ec9c9ae88a36ee3ec81766297501c6b
Author: Christopher Michael
Date: Fri Feb 12 13:51:24 2021 -0500
express: Fix meson app directory name
datadir should have the project name appended so that things like
elm_app_data_dir_get will retrieve the proper path
---
meson.build | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 25798ee..3c588aa 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ dir_include = join_paths(dir_prefix, get_option('includedir'))
dir_pkginclude = join_paths(dir_include, meson.project_name())
dir_bin = join_paths(dir_prefix, get_option('bindir'))
dir_lib = join_paths(dir_prefix, get_option('libdir'))
-dir_data = join_paths(dir_prefix, get_option('datadir'))
+dir_data = join_paths(dir_prefix, get_option('datadir'), meson.project_name())
dir_pkgdata = join_paths(dir_data, meson.project_name())
dir_locale = join_paths(dir_prefix, get_option('localedir'))
@@ -85,6 +85,9 @@ express_cargs = [ ]
# configuration
config_h = configuration_data()
+config_h.set('EFL_BETA_API_SUPPORT', 1)
+config_h.set('EFL_EO_API_SUPPORT', 1)
+config_h.set_quoted('PACKAGE', meson.project_name())
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
--
[EGIT] [apps/express] master 03/03: express: Remove all old autofoo files
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=c9c54d2e57769bb3664c8b26efbabea67f3bb8e4
commit c9c54d2e57769bb3664c8b26efbabea67f3bb8e4
Author: Christopher Michael
Date: Fri Feb 12 12:26:49 2021 -0500
express: Remove all old autofoo files
---
Makefile.am| 88 -
configure.ac | 209 -
data/Makefile.am | 4 -
data/desktop/Makefile.am | 6 --
data/fonts/Makefile.am | 31 --
data/images/Makefile.am| 6 --
data/themes/Makefile.am| 29 --
data/themes/images/Makefile.am | 48 --
data/themes/sounds/Makefile.am | 8 --
m4/ac_attribute.m4 | 14 ---
m4/efl_attribute.m4| 83
m4/efl_beta.m4 | 5 -
m4/efl_binary.m4 | 71 --
m4/efl_compiler.m4 | 90 --
m4/efl_compiler_flag.m4| 57 ---
m4/efl_eo.m4 | 6 --
m4/efl_path_max.m4 | 36 ---
m4/efl_threads.m4 | 132 --
src/Makefile.am| 5 -
src/bin/Makefile.am| 78 ---
src/lib/Makefile.am| 23 -
21 files changed, 1029 deletions(-)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 36cef76..000
--- a/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-SUBDIRS = src data
-if HAVE_PO
- SUBDIRS += po
-endif
-
-MAINTAINERCLEANFILES = \
- ABOUT-NLS* \
- Makefile.in \
- aclocal.m4 \
- compile \
- config.guess \
- config.h.in \
- config.h.in~ \
- config.rpath \
- config.sub \
- configure \
- configure~\
- depcomp \
- install-sh \
- ltmain.sh \
- missing \
- mkinstalldirs \
- INSTALL \
- $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
- $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
- m4/libtool.m4 \
- m4/lt~obsolete.m4 \
- m4/ltoptions.m4 \
- m4/ltsugar.m4 \
- m4/ltversion.m4 \
- m4/codeset.m4 \
- m4/gettext.m4 \
- m4/glibc2.m4 \
- m4/glibc21.m4 \
- m4/iconv.m4 \
- m4/intmax.m4 \
- m4/intdiv0.m4 \
- m4/inttypes_h.m4 \
- m4/inttypes.m4 \
- m4/inttypes-pri.m4 \
- m4/isc-posix.m4 \
- m4/lcmessage.m4 \
- m4/lib-ld.m4 \
- m4/lib-link.m4 \
- m4/lib-prefix.m4 \
- m4/nls.m4 \
- m4/po.m4 \
- m4/progtest.m4 \
- m4/stdint_h.m4 \
- m4/uintmax_t.m4 \
- m4/ulonglong.m4 \
- m4/intl.m4 \
- m4/intldir.m4 \
- m4/intlmacosx.m4 \
- m4/lock.m4 \
- m4/longlong.m4 \
- m4/printf-posix.m4 \
- m4/size_max.m4 \
- m4/visibility.m4 \
- m4/wchar_t.m4 \
- m4/wint_t.m4 \
- m4/xsize.m4 \
- express_config.h.in
-
-if HAVE_PO
-
-MAINTAINERCLEANFILES += \
- po/boldquot.sed \
- po/en@boldquot.header \
- po/en@quot.header \
- po/insert-header.sin \
- po/Makefile.in.in \
- po/Makevars.template \
- po/quot.sed \
- po/remove-potcdate.sin \
- po/Rules-quot
-
-endif
-
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN
-
-filesdir = $(datadir)/express
-files_DATA = $(EXTRA_DIST)
-
-ACLOCAL_AMFLAGS = -I m4
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = express.pc
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index a701fdf..000
--- a/configure.ac
+++ /dev/null
@@ -1,209 +0,0 @@
-
-m4_define([v_maj], [0])
-m4_define([v_min], [0])
-m4_define([v_mic], [2])
-m4_define([v_ver], [v_maj.v_min.v_mic])
-
-m4_define([lt_cur], [m4_eval(v_maj + v_min)])
-m4_define([lt_rev], [v_mic])
-m4_define([lt_age], [v_min])
-
-AC_INIT([express], [v_ver], [devilho...@comcast.net])
-AC_PREREQ([2.60])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([express_config.h])
-
-AM_INIT_AUTOMAKE([1.6 dist-xz subdir-objects])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_USE_SYSTEM_EXTENSIONS
-
-LT_INIT([win32-dll disable-static])
-
-version_info="lt_cur:lt_rev:lt_age"
-release_info="v_rel"
-AC_SUBST([version_info])
-AC_SUBST([release_info])
-
-VMAJ=v_maj
-AC_SUBST([VMAJ])
-
-
-### Additional options to configure
-
-
-### Default options with respect to host
-
-AC_CANONICAL_HOST
-
-have_win32="no"
-case "$host_os" in
- mingw*)
- have_win32="yes"
- ;;
-esac
-
-
-### Checks for programs
-
-AM_GNU_GETTEXT_VERSION([0.17])
-
-m4_ifdef([AC_GNU_GETTEXT], [
-AC_GNU_GETTEXT([external])
-po_makefile_in=po/Makefile.in
-have_po="yes"
-],
-[
-m4_ifdef([AM_GNU_GETTEXT], [
-AM_GNU_GETTEXT([external])
-po_makefile_in=po/Makefile.in
-have_po="yes"
-],
-[
-have_po="no"
-])
-])
-AC_SUBST([LTLIBINTL])
-LOCALE_DIR="${localedir}"
-AC_SUBST(LOCALE_DIR)
-
-if test "x${POSUB}" = "x" ; then
- have_po="no"
-fi
-
-AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
-
-AC_PROG_CC
-
-PKG_PROG_PKG_CONFIG
-if test "x${PKG_CONFIG}" = "x" ; then
- AC_MSG_ERROR([pkg-config to
[EGIT] [apps/express] master 01/03: express: Update autogen.sh for meson
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=69cb06943538bb19ce07c8e60568b5cc13aacc87 commit 69cb06943538bb19ce07c8e60568b5cc13aacc87 Author: Christopher Michael Date: Fri Feb 12 12:01:07 2021 -0500 express: Update autogen.sh for meson --- autogen.sh | 25 +++-- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3c1192f..9c632a0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,24 +1,5 @@ #!/bin/sh -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - ( -cd "$srcdir" && - ( -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh -touch README -touch ABOUT-NLS - -echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1 -echo "Running autoconf..." ; autoconf || exit 1 -echo "Running autoheader..." ; autoheader || exit 1 -echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 -echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 - ) - ) - -if [ -z "$NOCONFIGURE" ]; then - $srcdir/configure "$@" -fi +rm -rf build +meson $@ . build +meson configure build --
[EGIT] [apps/express] master 02/03: express: Fix express meson build for library dependencies
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ebc80a3fe6b688de4f0d599a6085e824e5078bd4
commit ebc80a3fe6b688de4f0d599a6085e824e5078bd4
Author: Christopher Michael
Date: Fri Feb 12 12:25:27 2021 -0500
express: Fix express meson build for library dependencies
This should be the final patch to make Express be fully Meson-able
NB: A Big Thank You to Vincent Torri for his work
on
converting Express to use meson !!! :D
---
meson.build | 2 +-
src/lib/meson.build | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 83ce370..25798ee 100644
--- a/meson.build
+++ b/meson.build
@@ -42,7 +42,6 @@ express_cflags_try = [
'-Wl,--no-copy-dt-needed-entries',
'-Wshadow',
'-Wstrict-prototypes',
- '-Werror=missing-prototypes',
'-Werror=pointer-arith',
'-Wno-missing-field-initializers']
@@ -123,6 +122,7 @@ pkgconf.set('pkgincludedir',
'${prefix}/@0@'.format(get_option('includedir')) +
pkgconf.set('VMAJ', v_maj)
pkgconf.set('VERSION', meson.project_version())
pkgconf.set('requirements_libexpress_pc', requirement_express_pc)
+pkgconf.set('requirements_libexpress_libs', requirement_express_libs)
pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
diff --git a/src/lib/meson.build b/src/lib/meson.build
index 760d797..a25b5ea 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -27,8 +27,10 @@ sys_windows = win32.contains(host_os)
if sys_windows == true
ws2_32 = cc.find_library('ws2_32')
express_ext_deps = [ ws2_32 ]
+ requirement_express_libs = '-lws2_32'
else
express_ext_deps = [ ]
+ requirement_express_libs = ''
endif
express_lib = library('express', express_lib_src,
--
[EGIT] [apps/express] master 01/01: express: Add mkstemps for meson build
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ec14650a3681063d9ff0a85068b5a6ee2d20d63f
commit ec14650a3681063d9ff0a85068b5a6ee2d20d63f
Author: Christopher Michael
Date: Fri Feb 12 11:32:55 2021 -0500
express: Add mkstemps for meson build
---
meson.build | 4
1 file changed, 4 insertions(+)
diff --git a/meson.build b/meson.build
index e4cb4b9..83ce370 100644
--- a/meson.build
+++ b/meson.build
@@ -93,6 +93,10 @@ config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
config_h.set_quoted('PACKAGE_DATA_DIR', dir_data)
config_h.set_quoted('PACKAGE_LOCALE_DIR', dir_locale)
+if cc.has_function('mkstemps')
+ config_h.set('HAVE_MKSTEMPS', 1)
+endif
+
subdir('data/desktop')
subdir('data/fonts')
subdir('data/images')
--
[EGIT] [apps/express] master 01/01: express: Add configure~ to maintainer-clean list
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=dd0f6e5351d9e902b786b0b9acb60992da6bd8c2 commit dd0f6e5351d9e902b786b0b9acb60992da6bd8c2 Author: Christopher Michael Date: Mon Feb 1 09:41:51 2021 -0500 express: Add configure~ to maintainer-clean list --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 4e6cca2..36cef76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ MAINTAINERCLEANFILES = \ config.rpath \ config.sub \ configure \ + configure~\ depcomp \ install-sh \ ltmain.sh \ --
[EGIT] [apps/express] master 01/01: express: Add missing EINA_UNUSED
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=5c912b17cf95449fe9effdc8fa725b6cb0452598
commit 5c912b17cf95449fe9effdc8fa725b6cb0452598
Author: Christopher Michael
Date: Mon Feb 1 09:38:16 2021 -0500
express: Add missing EINA_UNUSED
---
src/bin/callbacks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/callbacks.c b/src/bin/callbacks.c
index 9ef69ad..adc5221 100644
--- a/src/bin/callbacks.c
+++ b/src/bin/callbacks.c
@@ -397,7 +397,7 @@ _callback_user_nick(Express_Network *net EINA_UNUSED, const
char *event EINA_UNU
}
void
-_callback_user_mode(Express_Network *net EINA_UNUSED, const char *event
EINA_UNUSED, const char *source, const char **params, unsigned int count
EINA_UNUSED, void *data EINA_UNUSED)
+_callback_user_mode(Express_Network *net EINA_UNUSED, const char *event
EINA_UNUSED, const char *source EINA_UNUSED, const char **params, unsigned int
count EINA_UNUSED, void *data EINA_UNUSED)
{
char user[PATH_MAX];
int crlf = 0, lf = 0;
--
[EGIT] [apps/express] master 01/01: express: Fix autofoo building
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=eb936584e73ca566a6ed105853a8df93cd6cf73f
commit eb936584e73ca566a6ed105853a8df93cd6cf73f
Author: Christopher Michael
Date: Mon Feb 1 09:37:21 2021 -0500
express: Fix autofoo building
Check for sys/mmap.h header file in configure.ac
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 321ffb3..a701fdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,7 @@ LIBEXPRESS_LIBS="${LIBEXPRESS_LIBS}
${requirements_libexpress_libs}"
AC_HEADER_TIME
-AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h])
+AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h sys/mman.h])
### Checks for types
--
[EGIT] [apps/express] master 01/01: express: Update gitignore file
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=b804f0680f61f6961f2815983bc6282e914c2d7d commit b804f0680f61f6961f2815983bc6282e914c2d7d Author: Christopher Michael Date: Mon Feb 1 08:29:12 2021 -0500 express: Update gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5323285..b22ef98 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ Makefile.in /express_config.h.in /express.pc /libtool +/build --
[EGIT] [apps/express] master 01/01: express: Add repositor callsign to arcconfig
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=c9c19735b8fe29425dc0f1b81a928bc07355f6d8 commit c9c19735b8fe29425dc0f1b81a928bc07355f6d8 Author: Christopher Michael Date: Fri Jan 29 11:13:14 2021 -0500 express: Add repositor callsign to arcconfig --- .arcconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.arcconfig b/.arcconfig index b27b1c4..137a036 100644 --- a/.arcconfig +++ b/.arcconfig @@ -2,5 +2,6 @@ "project_id" : "express", "projects" : "express", "conduit_uri" : "https://phab.enlightenment.org/";, - "phabricator.uri" : "https://phab.enlightenment.org/"; + "phabricator.uri" : "https://phab.enlightenment.org/";, + "repository.callsign" : "EXP" } --
[EGIT] [apps/express] master 01/02: express: Add arcconfig file
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=fe70146d65711bdaff6bb6b8530d1512f5ee480f
commit fe70146d65711bdaff6bb6b8530d1512f5ee480f
Author: Christopher Michael
Date: Fri Jan 29 11:08:49 2021 -0500
express: Add arcconfig file
---
.arcconfig | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.arcconfig b/.arcconfig
index dbac912..d17833a 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,4 +1,6 @@
{
- "project_id" : "devs/devilhorns/express",
- "conduit_uri" : "https://phab.enlightenment.org/";
+ "project_id" : "express",
+ "projects" : "express",
+ "conduit_uri" : "https://phab.enlightenment.org/";,
+ "phabricator.uri" : "https://phab.enlightenment.org/";,
}
--
[EGIT] [apps/express] master 02/02: express: Fix arcconfig trainling comma
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=4eea0be9d48dcb8d59385fde9ae6d300326d48c7 commit 4eea0be9d48dcb8d59385fde9ae6d300326d48c7 Author: Christopher Michael Date: Fri Jan 29 11:12:00 2021 -0500 express: Fix arcconfig trainling comma --- .arcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.arcconfig b/.arcconfig index d17833a..b27b1c4 100644 --- a/.arcconfig +++ b/.arcconfig @@ -2,5 +2,5 @@ "project_id" : "express", "projects" : "express", "conduit_uri" : "https://phab.enlightenment.org/";, - "phabricator.uri" : "https://phab.enlightenment.org/";, + "phabricator.uri" : "https://phab.enlightenment.org/"; } --
[EGIT] [apps/express] master 01/03: express: Fix config saving
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=f4f969feec4c0de3d425a76bf311dfac3c63b348
commit f4f969feec4c0de3d425a76bf311dfac3c63b348
Author: Christopher Michael
Date: Wed Jan 27 13:18:46 2021 -0500
express: Fix config saving
So apparently the problem with express not saving it's config was due
to PEBKAC :( We should only be setting defaults (and thus nuking
Networks) if we are saving a new default config file
---
src/bin/config.c | 77 +---
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index fec07b6..d50a219 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -260,43 +260,46 @@ _config_load(void)
#define IFCFGELSE } else {
#define IFCFGEND }
- /* setup defaults */
- _ex_cfg->font.size = 10;
- _ex_cfg->font.bitmap = EINA_TRUE;
- _ex_cfg->font.name = eina_stringshare_add("nexus.pcf");
- _ex_cfg->gui.translucent = EINA_TRUE;
- _ex_cfg->gui.opacity = 70;
- _ex_cfg->gui.zoom = 0.5;
- _ex_cfg->gui.scrollback = 2000;
- _ex_cfg->networks = NULL;
-
- IFCFG(1);
- _ex_cfg->gui.tabs = 1;
- IFCFGEND;
-
- IFCFG(2);
- _ex_cfg->gui.use_gravatar = EINA_TRUE;
- IFCFGEND;
-
- IFCFG(3);
- _ex_cfg->font.use_entry = EINA_TRUE;
- IFCFGEND;
-
- IFCFG(4);
- _ex_cfg->video.module = 0;
- _ex_cfg->video.muted = EINA_FALSE;
- _ex_cfg->video.visualized = EINA_TRUE;
- IFCFGEND;
-
- /* limit config values so they are sane */
- EX_CONFIG_LIMIT(_ex_cfg->font.size, 3, 400);
- EX_CONFIG_LIMIT(_ex_cfg->gui.zoom, 0.1, 1.0);
- EX_CONFIG_LIMIT(_ex_cfg->gui.scrollback, 0, 20);
- EX_CONFIG_LIMIT(_ex_cfg->video.module, 0, 4);
-
- _ex_cfg->version = EX_CONFIG_FILE_VERSION;
-
- if (save) _config_save();
+ if (save)
+ {
+/* setup defaults */
+_ex_cfg->font.size = 10;
+_ex_cfg->font.bitmap = EINA_TRUE;
+_ex_cfg->font.name = eina_stringshare_add("nexus.pcf");
+_ex_cfg->gui.translucent = EINA_TRUE;
+_ex_cfg->gui.opacity = 70;
+_ex_cfg->gui.zoom = 0.5;
+_ex_cfg->gui.scrollback = 2000;
+_ex_cfg->networks = NULL;
+
+IFCFG(1);
+_ex_cfg->gui.tabs = 1;
+IFCFGEND;
+
+IFCFG(2);
+_ex_cfg->gui.use_gravatar = EINA_TRUE;
+IFCFGEND;
+
+IFCFG(3);
+_ex_cfg->font.use_entry = EINA_TRUE;
+IFCFGEND;
+
+IFCFG(4);
+_ex_cfg->video.module = 0;
+_ex_cfg->video.muted = EINA_FALSE;
+_ex_cfg->video.visualized = EINA_TRUE;
+IFCFGEND;
+
+/* limit config values so they are sane */
+EX_CONFIG_LIMIT(_ex_cfg->font.size, 3, 400);
+EX_CONFIG_LIMIT(_ex_cfg->gui.zoom, 0.1, 1.0);
+EX_CONFIG_LIMIT(_ex_cfg->gui.scrollback, 0, 20);
+EX_CONFIG_LIMIT(_ex_cfg->video.module, 0, 4);
+
+_ex_cfg->version = EX_CONFIG_FILE_VERSION;
+
+_config_save();
+ }
}
void
--
[EGIT] [apps/express] master 02/03: express: Delay channel creation until user has identified...
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=367817b07854296b42617280807e8bf373d74097
commit 367817b07854296b42617280807e8bf373d74097
Author: Christopher Michael
Date: Thu Jan 28 05:48:48 2021 -0500
express: Delay channel creation until user has identified...
Also fix quit message...
---
src/bin/callbacks.c | 40 ++--
src/bin/callbacks.h | 1 +
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/bin/callbacks.c b/src/bin/callbacks.c
index 85aace4..9ef69ad 100644
--- a/src/bin/callbacks.c
+++ b/src/bin/callbacks.c
@@ -41,10 +41,9 @@ _find_crlf(const char *data, int length, int *lf)
}
void
-_callback_server_connected(Express_Network *net, const char *event
EINA_UNUSED, const char *source, const char **params EINA_UNUSED, unsigned int
count EINA_UNUSED, void *data EINA_UNUSED)
+_callback_server_connected(Express_Network *net EINA_UNUSED, const char *event
EINA_UNUSED, const char *source, const char **params EINA_UNUSED, unsigned int
count EINA_UNUSED, void *data EINA_UNUSED)
{
DBG("Server %s Connected", source);
- _window_network_channels_create(net);
}
void
@@ -265,7 +264,7 @@ _callback_user_quit(Express_Network *net EINA_UNUSED, const
char *event EINA_UNU
/* DBG("\tMessage:"); */
/* DBG("\t%s", params[0]); */
- snprintf(buff, sizeof(buff), "%s has %s", source, params[0]);
+ snprintf(buff, sizeof(buff), "%s has quit: %s", source, params[0]);
channels = _window_channels_user_find(source);
EINA_LIST_FOREACH(channels, l, chl)
@@ -340,13 +339,13 @@ _callback_user_private(Express_Network *net, const char
*event EINA_UNUSED, cons
{
Channel * chl = NULL;
- /* DBG("User Private %s", params[0]); */
- /* DBG("\tCount: %d", count); */
- /* DBG("\tUser: %s", source); */
- /* DBG("\tMessage:"); */
- /* DBG("\t%s", params[1]); // message */
- /* DBG("\t%s", params[2]); */
- /* DBG("\t%s", params[3]); */
+ DBG("User Private %s", params[0]);
+ DBG("\tCount: %d", count);
+ DBG("\tUser: %s", source);
+ DBG("\tMessage:");
+ DBG("\t%s", params[1]); // message
+ DBG("\t%s", params[2]);
+ DBG("\t%s", params[3]);
if (!(chl = _window_channel_find(source)))
{
@@ -396,3 +395,24 @@ _callback_user_nick(Express_Network *net EINA_UNUSED,
const char *event EINA_UNU
_channel_text_append(chl, "*", buff,
_row_color_simple_create(COLOR_NICK_CHANGE));
}
+
+void
+_callback_user_mode(Express_Network *net EINA_UNUSED, const char *event
EINA_UNUSED, const char *source, const char **params, unsigned int count
EINA_UNUSED, void *data EINA_UNUSED)
+{
+ char user[PATH_MAX];
+ int crlf = 0, lf = 0;
+
+ crlf = _find_crlf(params[0], strlen(params[0]), &lf);
+ if (crlf > 0)
+ eina_strlcpy(user, params[0], crlf + lf - 1);
+ else
+ eina_strlcpy(user, params[0], strlen(params[0]) + 1);
+
+ /* DBG("User Mode %s", user); */
+ /* DBG("\tCount: %d", count); */
+ /* DBG("\tUser: %s", source); */
+ /* DBG("\tMessage:"); */
+ /* DBG("\t%s", params[1]); */
+
+ _window_network_channels_create(net);
+}
diff --git a/src/bin/callbacks.h b/src/bin/callbacks.h
index 233e4fb..0f8e1d5 100644
--- a/src/bin/callbacks.h
+++ b/src/bin/callbacks.h
@@ -18,5 +18,6 @@ void _callback_user_part(Express_Network *net, const char
*event, const char *so
void _callback_user_join(Express_Network *net, const char *event, const char
*source, const char **params, unsigned int count, void *data);
void _callback_user_private(Express_Network *net, const char *event, const
char *source, const char **params, unsigned int count, void *data);
void _callback_user_nick(Express_Network *net, const char *event, const char
*source, const char **params, unsigned int count, void *data);
+void _callback_user_mode(Express_Network *net EINA_UNUSED, const char *event
EINA_UNUSED, const char *source, const char **params, unsigned int count
EINA_UNUSED, void *data EINA_UNUSED);
#endif
--
[EGIT] [apps/express] master 03/03: express: Add window callback for user mode set
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=8d10ee68cf2681b9c3f6015c75d7c61414cc09a8 commit 8d10ee68cf2681b9c3f6015c75d7c61414cc09a8 Author: Christopher Michael Date: Thu Jan 28 05:49:29 2021 -0500 express: Add window callback for user mode set Wait for user mode set until we create channels in the window, this way we are sure that 1) connected 2) user verified 3) we can chat in channels --- src/bin/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/window.c b/src/bin/window.c index c550028..0203dbd 100644 --- a/src/bin/window.c +++ b/src/bin/window.c @@ -236,12 +236,12 @@ _cb_idle(void *data EINA_UNUSED) cbs.join = _callback_user_join; cbs.priv_msg = _callback_user_private; cbs.nick = _callback_user_nick; +cbs.user_mode = _callback_user_mode; /* TODO: Implement remaining callbacks * * NB: See src/lib/Express.h for callback comments */ /* cbs.mode = ; */ -/* cbs.user_mode = ; */ /* cbs.kick = ; */ /* cbs.invite = ; */ /* cbs.numeric = ; */ --
[EGIT] [core/efl] master 01/01: ecore-evas: Formatting fix
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6a3522352b305923fd860505e09a28aed3a5e577
commit 6a3522352b305923fd860505e09a28aed3a5e577
Author: Christopher Michael
Date: Wed Jan 27 15:11:57 2021 -0500
ecore-evas: Formatting fix
NB: No functional changes
---
src/lib/ecore_evas/ecore_evas.c | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 23409d96ef..a579abff97 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3088,11 +3088,18 @@ _ecore_evas_animator_detach(Ecore_Animator *a)
ee = a->ee;
if (a->suspended)
- ee->ee_anim.suspended = eina_inlist_remove(ee->ee_anim.suspended,
EINA_INLIST_GET(a));
- else if ((!tmp->next) && (!tmp->prev) && (EINA_INLIST_GET(a) !=
ee->ee_anim.active))
+ {
+ee->ee_anim.suspended =
+ eina_inlist_remove(ee->ee_anim.suspended, EINA_INLIST_GET(a));
+ }
+ else if ((!tmp->next) && (!tmp->prev) &&
+(EINA_INLIST_GET(a) != ee->ee_anim.active))
return;
else
- ee->ee_anim.active = eina_inlist_remove(ee->ee_anim.active,
EINA_INLIST_GET(a));
+ {
+ee->ee_anim.active =
+ eina_inlist_remove(ee->ee_anim.active, EINA_INLIST_GET(a));
+ }
a->suspended = EINA_FALSE;
}
--
[EGIT] [apps/express] master 02/03: express: Remove unused images from edc
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=d970f637e40f4fb5a99805130877333866af506a
commit d970f637e40f4fb5a99805130877333866af506a
Author: Christopher Michael
Date: Wed Jan 27 12:10:02 2021 -0500
express: Remove unused images from edc
---
data/themes/default.edc | 10 +-
data/themes/images/Makefile.am | 4
data/themes/images/bg_led.png| Bin 1010 -> 0 bytes
data/themes/images/bg_led_base.png | Bin 529 -> 0 bytes
data/themes/images/bg_led_glow.png | Bin 15959 -> 0 bytes
data/themes/images/bg_led_strobe.png | Bin 1277 -> 0 bytes
6 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 6c03043..304c52b 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -652,10 +652,6 @@ collections
image: "bg_bevel.png" COMP;
image: "bg_glint.png" COMP;
image: "bg_glow_in.png" COMP;
- image: "bg_led_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
image: "pm_shadow.png" COMP;
image: "pm_overlay.png" COMP;
image: "pm_fill.png" COMP;
@@ -1332,7 +1328,7 @@ collections
description
{
state: "default" 0.0;
- image.normal: "bg_shine.png";
+ image.normal: "bg_shine";
fill.smooth: 0;
align: 0.5 0.0;
aspect: (256 / 120) (256 / 120);
@@ -3239,10 +3235,6 @@ collections
image: "bg_bevel.png" COMP;
image: "bg_shine.png" COMP;
image: "bg_glint.png" COMP;
- image: "bg_led_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
image: "pm_shadow.png" COMP;
image: "cr_glow.png" COMP;
}
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 1b6745b..e8545fe 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -4,10 +4,6 @@ bg_bevel.png \
bg_shine.png \
bg_glint.png \
bg_glow_in.png \
-bg_led.png \
-bg_led_base.png \
-bg_led_glow.png \
-bg_led_strobe.png \
bg_shadow.png \
bg_shadow2.png \
bg_shadow3.png \
diff --git a/data/themes/images/bg_led.png b/data/themes/images/bg_led.png
deleted file mode 100644
index 1d99430..000
Binary files a/data/themes/images/bg_led.png and /dev/null differ
diff --git a/data/themes/images/bg_led_base.png
b/data/themes/images/bg_led_base.png
deleted file mode 100644
index 75fe30d..000
Binary files a/data/themes/images/bg_led_base.png and /dev/null differ
diff --git a/data/themes/images/bg_led_glow.png
b/data/themes/images/bg_led_glow.png
deleted file mode 100644
index 7b52620..000
Binary files a/data/themes/images/bg_led_glow.png and /dev/null differ
diff --git a/data/themes/images/bg_led_strobe.png
b/data/themes/images/bg_led_strobe.png
deleted file mode 100644
index a6ae8ed..000
Binary files a/data/themes/images/bg_led_strobe.png and /dev/null differ
--
[EGIT] [apps/express] master 03/03: express: Increase buffer size for formatted messages
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=02e53a27e696f46040862b1fb5d7e5348ba5f5ec
commit 02e53a27e696f46040862b1fb5d7e5348ba5f5ec
Author: Christopher Michael
Date: Wed Jan 27 12:14:48 2021 -0500
express: Increase buffer size for formatted messages
---
src/bin/callbacks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/callbacks.c b/src/bin/callbacks.c
index f9cc79f..85aace4 100644
--- a/src/bin/callbacks.c
+++ b/src/bin/callbacks.c
@@ -296,7 +296,7 @@ void
_callback_user_join(Express_Network *net, const char *event EINA_UNUSED, const
char *source, const char **params, unsigned int count EINA_UNUSED, void *data
EINA_UNUSED)
{
Channel *chl = NULL;
- char buff[PATH_MAX], channel[PATH_MAX];
+ char buff[PATH_MAX + 100], channel[PATH_MAX];
int crlf = 0, lf = 0;
crlf = _find_crlf(params[0], strlen(params[0]), &lf);
@@ -371,7 +371,7 @@ _callback_user_nick(Express_Network *net EINA_UNUSED, const
char *event EINA_UNU
{
Eina_List *channels, *l;
Channel *chl;
- char buff[PATH_MAX], user[PATH_MAX];
+ char buff[PATH_MAX + 100], user[PATH_MAX];
int crlf = 0, lf = 0;
crlf = _find_crlf(params[0], strlen(params[0]), &lf);
--
[EGIT] [apps/express] master 01/03: libexpress: Add missing break statements for switch
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=aefd22211192c82a73e8ba54504d5159a64dae51
commit aefd22211192c82a73e8ba54504d5159a64dae51
Author: Christopher Michael
Date: Wed Jan 27 12:04:37 2021 -0500
libexpress: Add missing break statements for switch
---
src/lib/network.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/network.c b/src/lib/network.c
index 2aa8606..39d2f20 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -217,6 +217,7 @@ _process_buffer(Express_Network *net, char *data, int
length)
(*net->callbacks.command)(net, "AWAY", prefix, params, index,
net->callbacks.data);
}
+ break;
case 403:
case 704:
case 705:
@@ -226,6 +227,7 @@ _process_buffer(Express_Network *net, char *data, int
length)
(*net->callbacks.command)(net, "HELP", prefix, params, index,
net->callbacks.data);
}
+ break;
case 332:
{
if (net->callbacks.topic)
--
[EGIT] [apps/express] master 01/01: express: Redo config version system
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=e77cf7c9234134cac03668791aa1a86189f1fb09
commit e77cf7c9234134cac03668791aa1a86189f1fb09
Author: Christopher Michael
Date: Wed Jan 27 11:17:31 2021 -0500
express: Redo config version system
NB: This WILL cause your existing config to be nuked sadly :(
---
src/bin/config.c | 19 ++-
src/bin/options_general.c | 4 ++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 257baa4..fec07b6 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -24,10 +24,10 @@
# define EX_CONFIG_HASH(edd, type, member, eddtype) \
EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
-# define EX_CONFIG_FILE_EPOCH 0x0004
-# define EX_CONFIG_FILE_GENERATION 0x012d
+# define EX_CONFIG_FILE_EPOCH 2
+# define EX_CONFIG_FILE_GENERATION 4
# define EX_CONFIG_FILE_VERSION \
- ((EX_CONFIG_FILE_EPOCH << 16) | EX_CONFIG_FILE_GENERATION)
+ ((EX_CONFIG_FILE_EPOCH * 100) + EX_CONFIG_FILE_GENERATION)
typedef Eet_Data_Descriptor Ex_Config_DD;
@@ -233,7 +233,7 @@ _config_load(void)
{
Eina_Bool reload = EINA_FALSE;
-if ((_ex_cfg->version >> 16) < EX_CONFIG_FILE_EPOCH)
+if (_ex_cfg->version < (EX_CONFIG_FILE_EPOCH * 100))
{
/* config too old */
reload = EINA_TRUE;
@@ -255,7 +255,8 @@ _config_load(void)
}
/* define some convenient macros */
-#define IFCFG(v) if ((_ex_cfg->version & 0x) < (v)) {
+#define IFCFG(v) \
+ if ((_ex_cfg->version - (EX_CONFIG_FILE_EPOCH * 100)) < (v)) {
#define IFCFGELSE } else {
#define IFCFGEND }
@@ -269,19 +270,19 @@ _config_load(void)
_ex_cfg->gui.scrollback = 2000;
_ex_cfg->networks = NULL;
- IFCFG(0x009d);
+ IFCFG(1);
_ex_cfg->gui.tabs = 1;
IFCFGEND;
- IFCFG(0x010d);
+ IFCFG(2);
_ex_cfg->gui.use_gravatar = EINA_TRUE;
IFCFGEND;
- IFCFG(0x011d);
+ IFCFG(3);
_ex_cfg->font.use_entry = EINA_TRUE;
IFCFGEND;
- IFCFG(0x012d);
+ IFCFG(4);
_ex_cfg->video.module = 0;
_ex_cfg->video.muted = EINA_FALSE;
_ex_cfg->video.visualized = EINA_TRUE;
diff --git a/src/bin/options_general.c b/src/bin/options_general.c
index 7fcd04b..3bc5a52 100644
--- a/src/bin/options_general.c
+++ b/src/bin/options_general.c
@@ -63,7 +63,6 @@ _options_general(Evas_Object *box, Evas_Object *grid
EINA_UNUSED)
ALIGN_SET(group, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(group, "Use Tabs");
elm_radio_state_value_set(group, 1);
- elm_radio_value_pointer_set(group, &_ex_cfg->gui.tabs);
evas_object_smart_callback_add(group, "changed", _cb_tabs, NULL);
elm_box_pack_end(vbox, group);
evas_object_show(group);
@@ -73,12 +72,13 @@ _options_general(Evas_Object *box, Evas_Object *grid
EINA_UNUSED)
ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o, "Use Treeview");
elm_radio_state_value_set(o, 0);
- elm_radio_value_pointer_set(group, &_ex_cfg->gui.tabs);
elm_radio_group_add(o, group);
evas_object_smart_callback_add(o, "changed", _cb_tabs, NULL);
elm_box_pack_end(vbox, o);
evas_object_show(o);
+ elm_radio_value_set(group, _ex_cfg->gui.tabs);
+
o = elm_separator_add(box);
elm_separator_horizontal_set(o, EINA_TRUE);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
--
[EGIT] [apps/express] master 02/05: express: Remove dead commented out code
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=b55974bfb6b9b90681dc5e1fdce1492d3d06c5c3 commit b55974bfb6b9b90681dc5e1fdce1492d3d06c5c3 Author: Christopher Michael Date: Wed Jan 27 10:22:57 2021 -0500 express: Remove dead commented out code --- src/bin/options_networks.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/options_networks.c b/src/bin/options_networks.c index 93ff8c6..22630df 100644 --- a/src/bin/options_networks.c +++ b/src/bin/options_networks.c @@ -90,7 +90,6 @@ _cb_net_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EI free(cfg_net); _config_save(); -// _em_gui_options_changed(); } elm_object_item_del(item); --
[EGIT] [apps/express] master 03/05: express: Don't update window on every config change
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=6e3461f5e0bf093315c205321fb62f3e6f62c9cd
commit 6e3461f5e0bf093315c205321fb62f3e6f62c9cd
Author: Christopher Michael
Date: Wed Jan 27 10:23:47 2021 -0500
express: Don't update window on every config change
Changing a single letter in the Network options entry boxes would
always cause the window to update ... this is silly. Defer updating
window until config is done.
---
src/bin/config.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 2c2df84..257baa4 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -301,9 +301,5 @@ _config_load(void)
void
_config_save(void)
{
- if (_config_domain_save(PACKAGE_NAME, _ex_cfg_edd, _ex_cfg))
- {
-/* update window, channels, etc */
-_window_update();
- }
+ _config_domain_save(PACKAGE_NAME, _ex_cfg_edd, _ex_cfg);
}
--
[EGIT] [apps/express] master 01/05: express: Don't set focus to entries in network options
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=42b8d6bd781f30ba44df8115c1c3e20873f77d4b commit 42b8d6bd781f30ba44df8115c1c3e20873f77d4b Author: Christopher Michael Date: Wed Jan 27 10:21:52 2021 -0500 express: Don't set focus to entries in network options Now that Elementary has a fairly reliable focus chain, we should not need to be manually setting focus to entries here --- src/bin/options_network.c | 5 - 1 file changed, 5 deletions(-) diff --git a/src/bin/options_network.c b/src/bin/options_network.c index 71e4051..889a85a 100644 --- a/src/bin/options_network.c +++ b/src/bin/options_network.c @@ -13,7 +13,6 @@ _cb_name_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) txt = elm_entry_entry_get(obj); eina_stringshare_replace(&cfg_net->name, txt); _config_save(); - elm_object_focus_set(obj, EINA_TRUE); } static void @@ -26,7 +25,6 @@ _cb_nick_pass_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) txt = elm_entry_entry_get(obj); eina_stringshare_replace(&cfg_net->nick_passwd, txt); _config_save(); - elm_object_focus_set(obj, EINA_TRUE); } static void @@ -39,7 +37,6 @@ _cb_srv_pass_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) txt = elm_entry_entry_get(obj); eina_stringshare_replace(&cfg_net->server_passwd, txt); _config_save(); - elm_object_focus_set(obj, EINA_TRUE); } static void @@ -52,7 +49,6 @@ _cb_nickname_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_ txt = elm_entry_entry_get(obj); eina_stringshare_replace(&cfg_net->nickname, txt); _config_save(); - elm_object_focus_set(obj, EINA_TRUE); } static void @@ -65,7 +61,6 @@ _cb_username_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_ txt = elm_entry_entry_get(obj); eina_stringshare_replace(&cfg_net->username, txt); _config_save(); - elm_object_focus_set(obj, EINA_TRUE); } static void --
[EGIT] [apps/express] master 05/05: express: Update window when all config option windows are closed
devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=89499cd64290b9434f9b413b465fe4be9997ff3a commit 89499cd64290b9434f9b413b465fe4be9997ff3a Author: Christopher Michael Date: Wed Jan 27 10:27:09 2021 -0500 express: Update window when all config option windows are closed This allows us to only have to redraw the window once when the user is done with configure --- src/bin/options.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bin/options.c b/src/bin/options.c index e19cf3a..a4b493a 100644 --- a/src/bin/options.c +++ b/src/bin/options.c @@ -6,6 +6,7 @@ #include "options_video.h" #include "options_networks.h" #include "options_tools.h" +#include "window.h" /* local variables */ static Evas_Object *o_win = NULL; @@ -56,6 +57,8 @@ _cb_del_delay(void *data EINA_UNUSED) _opts_del_timer = NULL; elm_cache_all_flush(); + _window_update(); + return EINA_FALSE; } --
[EGIT] [apps/express] master 04/05: express: Create channel bg opject before base object
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=9ecc43ccd1a6d8fab9e4ac53565569e11b0214c1
commit 9ecc43ccd1a6d8fab9e4ac53565569e11b0214c1
Author: Christopher Michael
Date: Wed Jan 27 10:25:56 2021 -0500
express: Create channel bg opject before base object
---
src/bin/channel.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/bin/channel.c b/src/bin/channel.c
index c3cd335..30c0e1a 100644
--- a/src/bin/channel.c
+++ b/src/bin/channel.c
@@ -174,7 +174,7 @@ _channel_popmedia(Channel *chl, const char *src)
type = _media_src_type_get(src);
if (type == MEDIA_TYPE_UNKNOWN)
{
-
+
}
else
_channel_popmedia_show(chl, src, type);
@@ -732,13 +732,6 @@ _channel_create(Evas *evas, Evas_Object *win, const char
*name, const char *serv
/* store channel server */
if (server) chl->server = eina_stringshare_add(server);
- /* add base object */
- chl->o_base = edje_object_add(evas);
- _theme_apply(chl->o_base, "express/channel");
- _theme_reload_enable(chl->o_base);
- evas_object_data_set(chl->o_base, "theme_reload_func", _cb_theme_reload);
- evas_object_data_set(chl->o_base, "theme_reload_func_data", chl);
-
/* add bg object */
chl->o_bg = edje_object_add(evas);
WEIGHT_SET(chl->o_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -748,6 +741,13 @@ _channel_create(Evas *evas, Evas_Object *win, const char
*name, const char *serv
evas_object_data_set(chl->o_bg, "theme_reload_func", _cb_theme_reload);
evas_object_data_set(chl->o_bg, "theme_reload_func_data", chl);
+ /* add base object */
+ chl->o_base = edje_object_add(evas);
+ _theme_apply(chl->o_base, "express/channel");
+ _theme_reload_enable(chl->o_base);
+ evas_object_data_set(chl->o_base, "theme_reload_func", _cb_theme_reload);
+ evas_object_data_set(chl->o_base, "theme_reload_func_data", chl);
+
/* add tabregion */
if (_ex_cfg->gui.tabs)
_channel_tabbar_create(chl);
--
[EGIT] [core/enlightenment] master 01/01: Revert "TODO--"
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=21a7db9dac739365f9e07d91c10531327f08f5ee commit 21a7db9dac739365f9e07d91c10531327f08f5ee Author: Christopher Michael Date: Thu Jan 21 13:26:27 2021 -0500 Revert "TODO--" Reverting the removal of the pointer bugger from TODO as it still seems to be occuring This reverts commit 6444fa73eb8dd81898980d02702d11376682f90c. --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 542d5ae41..87e14de18 100644 --- a/TODO +++ b/TODO @@ -88,6 +88,8 @@ TODO: * wifi appears or disappears * wifi or wired network connected or disconnected to/from * perhaps need a more generic "events" bindings and these are events? +* S pointer: bug: sometiems gets stuck in move/resize modfe if mouse + over move/resize area when desklock kicks in * clipboard manager - monitor clipboard changes + history + select from it * scriptlets: stdin/out module that provides gui services to some back-end script or process where e just talks via stdin/out. --
[EGIT] [core/enlightenment] master 02/03: TODO--
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6444fa73eb8dd81898980d02702d11376682f90c commit 6444fa73eb8dd81898980d02702d11376682f90c Author: Christopher Michael Date: Thu Jan 21 12:07:07 2021 -0500 TODO-- --- TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO b/TODO index 87e14de18..542d5ae41 100644 --- a/TODO +++ b/TODO @@ -88,8 +88,6 @@ TODO: * wifi appears or disappears * wifi or wired network connected or disconnected to/from * perhaps need a more generic "events" bindings and these are events? -* S pointer: bug: sometiems gets stuck in move/resize modfe if mouse - over move/resize area when desklock kicks in * clipboard manager - monitor clipboard changes + history + select from it * scriptlets: stdin/out module that provides gui services to some back-end script or process where e just talks via stdin/out. --
[EGIT] [core/enlightenment] master 03/03: e_pointer: Reset mouse pointer when we return from blanking or desklock
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1eddc939434b60c1855c560d528fd913534cb9f3
commit 1eddc939434b60c1855c560d528fd913534cb9f3
Author: Christopher Michael
Date: Thu Jan 21 12:07:15 2021 -0500
e_pointer: Reset mouse pointer when we return from blanking or desklock
This should fix the issue of mouse pointer getting stuck in
move/resize mode if mouse over move/resize area when desklock or
blanking kicks in
---
src/bin/e_desklock.c| 2 ++
src/bin/e_pointer.c | 17 -
src/bin/e_pointer.h | 2 ++
src/bin/e_screensaver.c | 4
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 15a242aef..b78a93988 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -407,6 +407,8 @@ _desklock_hide_internal(void)
}
if (getenv("E_START_MANAGER")) kill(getppid(), SIGHUP);
+
+ e_pointer_reset(e_comp->pointer);
}
E_API int
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 93865c3ea..a8d9918cc 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -682,7 +682,7 @@ e_pointer_type_pop(E_Pointer *ptr, void *obj, const char
*type)
_e_pointer_type_set(ptr, stack->type);
- eina_stringshare_replace(&ptr->type, stack->type);
+ /* eina_stringshare_replace(&ptr->type, stack->type); */
}
E_API void
@@ -887,6 +887,21 @@ e_pointer_grab_set(E_Pointer *ptr, Eina_Bool grab)
}
}
+E_API void
+e_pointer_reset(E_Pointer *ptr)
+{
+ EINA_SAFETY_ON_NULL_RETURN(ptr);
+
+ /* free stack of pointer types */
+ E_FREE_LIST(ptr->stack, _e_pointer_stack_free);
+
+ eina_stringshare_del(ptr->type);
+ eina_stringshare_del(ptr->deferred_type);
+
+ /* reset pointer to default */
+ e_pointer_type_push(ptr, ptr, "default");
+}
+
EINTERN void
e_pointers_freeze_set(Eina_Bool set)
{
diff --git a/src/bin/e_pointer.h b/src/bin/e_pointer.h
index 1ce0dc8c6..1b7ce579d 100644
--- a/src/bin/e_pointer.h
+++ b/src/bin/e_pointer.h
@@ -84,5 +84,7 @@ E_API void e_pointer_idler_before(void);
E_API void e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int
y);
E_API void e_pointer_window_add(E_Pointer *ptr, Ecore_Window win);
E_API void e_pointer_grab_set(E_Pointer *ptr, Eina_Bool grab);
+E_API void e_pointer_reset(E_Pointer *ptr);
+
# endif
#endif
diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index 5a6fd930d..60b142ffa 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -227,6 +227,10 @@ _e_screensaver_handler_screensaver_off_cb(void *data
EINA_UNUSED, int type EINA_
ecore_timer_del(_e_screensaver_suspend_timer);
_e_screensaver_suspend_timer = NULL;
}
+
+ if (!e_desklock_state_get())
+ e_pointer_reset(e_comp->pointer);
+
return ECORE_CALLBACK_PASS_ON;
}
--
[EGIT] [core/enlightenment] master 01/03: e_actions: Minor formatting fix
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6f1d88128eae33970b729bbde6532e705141cb54
commit 6f1d88128eae33970b729bbde6532e705141cb54
Author: Christopher Michael
Date: Thu Jan 21 10:31:30 2021 -0500
e_actions: Minor formatting fix
NB: No functional changes
---
src/bin/e_actions.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 7bcde40ef..002396901 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -2909,8 +2909,10 @@ ACT_FN_GO(backlight_adjust, )
ACT_FN_GO(blanking, EINA_UNUSED)
{
- if (params && (!strcmp(params, "on"))) e_config->screensaver_enable =
1;
- else if (params && (!strcmp(params, "off"))) e_config->screensaver_enable =
0;
+ if (params && (!strcmp(params, "on")))
+ e_config->screensaver_enable = 1;
+ else if (params && (!strcmp(params, "off")))
+ e_config->screensaver_enable = 0;
else if (params && (!strcmp(params, "toggle")))
{
if (e_config->screensaver_enable) e_config->screensaver_enable = 0;
--
[EGIT] [core/enlightenment] master 03/03: TODO--;
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b98c69924eff869d6a3417787cb9c6db2e373818 commit b98c69924eff869d6a3417787cb9c6db2e373818 Author: Christopher Michael Date: Wed Jan 20 14:48:57 2021 -0500 TODO--; --- TODO | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO b/TODO index 4d222adc4..87e14de18 100644 --- a/TODO +++ b/TODO @@ -52,7 +52,6 @@ TODO: * usb tehtering * wifi tethering * S fix vkbd to work in wl - e_kbd_send.c - look at ecore_wl2_input.c -* S action to switch config profiles so it can be bound * S clean up some old actions that are handled better by newer ones * S like suspend intelligently is better than regular suspend but suspend now is very explicit and worth keeping --
[EGIT] [core/enlightenment] master 02/03: e_int_config_profiles: When a profile gets deleted, also delete any existing e_action for that profile.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=361dc0928574ba1cde4205696720365f44f1cbca
commit 361dc0928574ba1cde4205696720365f44f1cbca
Author: Christopher Michael
Date: Wed Jan 20 14:48:34 2021 -0500
e_int_config_profiles: When a profile gets deleted, also delete any
existing e_action for that profile.
---
src/modules/conf_dialogs/e_int_config_profiles.c | 28
1 file changed, 28 insertions(+)
diff --git a/src/modules/conf_dialogs/e_int_config_profiles.c
b/src/modules/conf_dialogs/e_int_config_profiles.c
index c894197d8..ceae843b5 100644
--- a/src/modules/conf_dialogs/e_int_config_profiles.c
+++ b/src/modules/conf_dialogs/e_int_config_profiles.c
@@ -387,11 +387,39 @@ static void
_cb_dialog_yes(void *data)
{
Del_Profile_Confirm_Data *d;
+ Efreet_Desktop *desk = NULL;
+ char *pdir, buff[PATH_MAX];
+ const char *label;
d = data;
if (!data) return;
e_config_profile_del(d->cfdata->sel_profile);
+
+ pdir = e_config_profile_dir_get(d->cfdata->sel_profile);
+ snprintf(buff, sizeof(buff), "%s/profile.desktop", pdir);
+ desk = efreet_desktop_new(buff);
+ if (!desk)
+ {
+e_prefix_data_snprintf(buff, sizeof(buff),
+ "data/config/%s/", d->cfdata->sel_profile);
+free(pdir);
+pdir = strdup(buff);
+if (pdir)
+ {
+ snprintf(buff, sizeof(buff), "%s/profile.desktop", pdir);
+ desk = efreet_desktop_new(buff);
+ }
+ }
+
+ label = d->cfdata->sel_profile;
+ if ((desk) && (desk->name)) label = desk->name;
+
+ free(pdir);
+ if (desk) efreet_desktop_free(desk);
+
+ e_action_predef_name_del("Profile: Switch", label);
+
e_config_save_queue();
_ilist_fill(d->cfdata);
}
--
[EGIT] [core/enlightenment] master 01/03: e_actions: Add ability to switch Config Profiles via keybinding
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=3f2ddb4d1e3d78596f72272f9c31867adbe16de4
commit 3f2ddb4d1e3d78596f72272f9c31867adbe16de4
Author: Christopher Michael
Date: Wed Jan 20 14:12:51 2021 -0500
e_actions: Add ability to switch Config Profiles via keybinding
---
src/bin/e_actions.c | 70 +
1 file changed, 70 insertions(+)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 1902ca7d9..7bcde40ef 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -3255,6 +3255,73 @@ _e_actions_post_init(void *d EINA_UNUSED)
#endif
}
+ACT_FN_GO_KEY(profile_switch, , EINA_UNUSED)
+{
+ E_Action *a;
+ const char *cur_profile;
+
+ if (!params) return;
+
+ cur_profile = e_config_profile_get();
+
+ if (strcmp(cur_profile, params) == 0) return;
+
+ e_config_save_flush();
+ e_config_profile_set(params);
+ elm_config_profile_set(params);
+ e_config_profile_save();
+ e_config_save_block_set(1);
+
+ a = e_action_find("restart");
+ if ((a) && (a->func.go)) a->func.go(NULL, NULL);
+}
+
+static void
+_e_actions_profiles_create(void)
+{
+ E_Action *act;
+ Eina_List *profiles, *l;
+ int i = 0;
+
+ ACT_GO_KEY(profile_switch);
+
+ profiles = e_config_profile_list();
+ for (i = 0, l = profiles; l; l = l->next, i++)
+ {
+Efreet_Desktop *desk = NULL;
+char *prof, *pdir, buff[PATH_MAX];
+const char *label;
+
+prof = l->data;
+
+pdir = e_config_profile_dir_get(prof);
+snprintf(buff, sizeof(buff), "%s/profile.desktop", pdir);
+desk = efreet_desktop_new(buff);
+if (!desk)
+ {
+ e_prefix_data_snprintf(buff, sizeof(buff),
+"data/config/%s/", prof);
+ free(pdir);
+ pdir = strdup(buff);
+ if (pdir)
+ {
+ snprintf(buff, sizeof(buff), "%s/profile.desktop", pdir);
+ desk = efreet_desktop_new(buff);
+ }
+ }
+
+label = prof;
+if ((desk) && (desk->name)) label = desk->name;
+e_action_predef_name_set(N_("Profile: Switch"), label,
+ "profile_switch", prof, NULL, 0);
+
+free(prof);
+free(pdir);
+if (desk) efreet_desktop_free(desk);
+ }
+ if (profiles) eina_list_free(profiles);
+}
+
/* externally accessible functions */
EINTERN int
@@ -3840,6 +3907,9 @@ e_actions_init(void)
N_("Previous keyboard layout"), "kbd_layout_prev",
NULL, NULL, 0);
+ /* profiles */
+ _e_actions_profiles_create();
+
ecore_job_add(_e_actions_post_init, NULL);
return 1;
--
[EGIT] [core/enlightenment] master 01/08: e_entry: Rework e_entry dialog to be more sane
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=efb062efe24fb9a73f77408f4e96c9274eeaa0f1
commit efb062efe24fb9a73f77408f4e96c9274eeaa0f1
Author: Christopher Michael
Date: Wed Jan 20 12:27:21 2021 -0500
e_entry: Rework e_entry dialog to be more sane
This commit fixes an issue where e_entry_dialog would have a giant
entry widget and looked incredibly stupid.
This commit also fixes another issue where it was possible to close the
dialog behind the entry (ie: parent dialog) and the entry dialog would
remain
open (eg: Add a shelf, the Shelf Name dialog shows up, and it was possible
to
close the Shelf Settings dialog behind it)
---
src/bin/e_entry_dialog.c | 180 +++
src/bin/e_entry_dialog.h | 45 ++--
2 files changed, 113 insertions(+), 112 deletions(-)
diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c
index 9a6b68d30..dc3b68946 100644
--- a/src/bin/e_entry_dialog.c
+++ b/src/bin/e_entry_dialog.c
@@ -1,96 +1,29 @@
#include "e.h"
-/* Private function definitions */
-static void _e_entry_dia_del(void *data);
-static void _e_entry_dialog_free(E_Entry_Dialog *dia);
-static void _e_entry_dialog_ok(void *data, E_Dialog *dia);
-static void _e_entry_dialog_cancel(void *data, E_Dialog *dia);
-static void _e_entry_dialog_delete(E_Dialog *dia, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
-static void _e_entry_cb_key_down(void *data, Evas_Object *obj, void
*event_info);
-
-/* Externally accessible functions */
-E_API E_Entry_Dialog *
-e_entry_dialog_show(const char *title, const char *icon, const char *text,
-const char *initial_text,
-const char *button_text, const char *button2_text,
-void (*ok_func)(void *data, char *text),
-void (*cancel_func)(void *data), void *data)
+static void
+_e_entry_dialog_free(E_Entry_Dialog *ed)
{
- E_Entry_Dialog *ed;
- E_Dialog *dia;
- Evas_Object *o, *ob;
- Evas_Modifier_Mask mask;
- int w, h;
- Evas *e;
-
- ed = E_OBJECT_ALLOC(E_Entry_Dialog, E_ENTRY_DIALOG_TYPE,
_e_entry_dialog_free);
- ed->ok.func = ok_func;
- ed->ok.data = data;
- ed->cancel.func = cancel_func;
- ed->cancel.data = data;
- if (initial_text)
- ed->text = strdup(initial_text);
-
- dia = e_dialog_new(NULL, "E", "_entry_dialog");
- if (!dia)
- {
-e_object_del(E_OBJECT(ed));
-return NULL;
- }
- dia->data = ed;
- ed->dia = dia;
-
- mask = 0;
- evas_object_key_ungrab(dia->event_object, "space", mask, ~mask);
- e_object_del_attach_func_set(E_OBJECT(dia), _e_entry_dia_del);
- evas_object_event_callback_add(dia->win, EVAS_CALLBACK_DEL,
(Evas_Object_Event_Cb)_e_entry_dialog_delete, dia);
-
- if (title) e_dialog_title_set(dia, title);
- if (icon) e_dialog_icon_set(dia, icon, 64);
-
- e = evas_object_evas_get(dia->win);
- o = e_widget_list_add(e, 0, 0);
- if (text)
- {
-ob = e_widget_label_add(e, text);
-e_widget_list_object_append(o, ob, 1, 0, 0.5);
- }
-
- ed->entry = e_widget_entry_add(dia->win, &(ed->text), NULL, NULL, NULL);
- evas_object_smart_callback_add(ed->entry, "key_down", _e_entry_cb_key_down,
ed);
- evas_object_size_hint_weight_set(ed->entry, EVAS_HINT_EXPAND, 0.5);
-
- e_widget_list_object_append(o, ed->entry, 1, 1, 0.5);
- e_widget_size_min_get(o, &w, &h);
- e_dialog_content_set(dia, o, 2 * w, h);
-
- e_dialog_button_add(dia, !button_text ? _("OK") : button_text, NULL,
_e_entry_dialog_ok, ed);
- e_dialog_button_add(dia, !button2_text ? _("Cancel") : button2_text, NULL,
_e_entry_dialog_cancel, ed);
-
- elm_win_center(dia->win, 1, 1);
- e_dialog_resizable_set(dia, 1);
- e_dialog_show(dia);
- e_widget_focus_set(ed->entry, 1);
- e_widget_entry_select_all(ed->entry);
- return ed;
+ e_object_del(E_OBJECT(ed->dia));
+ E_FREE(ed->text);
+ free(ed);
}
-/* Private Function Bodies */
static void
-_e_entry_dia_del(void *data)
+_e_entry_dialog_delete(E_Dialog *dia, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info EINA_UNUSED)
{
- E_Dialog *dia = data;
-
- evas_object_event_callback_add(dia->win, EVAS_CALLBACK_DEL,
(Evas_Object_Event_Cb)_e_entry_dialog_delete, dia);
- e_object_del(dia->data);
+ e_object_del(E_OBJECT(dia->data));
}
static void
-_e_entry_dialog_free(E_Entry_Dialog *ed)
+_e_entry_dialog_del(void *data)
{
- e_object_del(E_OBJECT(ed->dia));
- E_FREE(ed->text);
- free(ed);
+ E_Dialog *dia;
+
+ dia = data;
+ evas_object_event_callback_add(dia->win, EVAS_CALLBACK_DEL,
+ (Evas_Object_Event_Cb)_e_entry_dialog_delete,
+
[EGIT] [core/enlightenment] master 04/08: e_int_menus: Adjust call to e_shelf_new_dialog to provide NULL parent (for now)
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c8c9d0751fec6f6ebc11da26a47ccfc5442540b7 commit c8c9d0751fec6f6ebc11da26a47ccfc5442540b7 Author: Christopher Michael Date: Wed Jan 20 12:36:23 2021 -0500 e_int_menus: Adjust call to e_shelf_new_dialog to provide NULL parent (for now) --- src/bin/e_int_menus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index eac50938f..5db55db19 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -1942,7 +1942,7 @@ _e_int_menus_shelves_add_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Men E_Zone *zone; zone = e_zone_current_get(); - e_shelf_new_dialog(zone); + e_shelf_new_dialog(NULL, zone); } static void --
[EGIT] [core/enlightenment] master 02/08: e_shelf: Add parent parameter to e_shelf_new_dialog
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=945b46213564e3c451eb537c44a382a778062ba2
commit 945b46213564e3c451eb537c44a382a778062ba2
Author: Christopher Michael
Date: Wed Jan 20 12:33:56 2021 -0500
e_shelf: Add parent parameter to e_shelf_new_dialog
This adds a parent param to e_shelf_new_dialog function so that the
Add Shelf window cannot be closed while Shelf Name dialog is open.
---
src/bin/e_shelf.c | 17 ++---
src/bin/e_shelf.h | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 2d211763e..853045479 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1124,12 +1124,14 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es)
}
E_API E_Entry_Dialog *
-e_shelf_new_dialog(E_Zone *zone)
+e_shelf_new_dialog(Evas_Object *parent, E_Zone *zone)
{
char buf[256];
- snprintf(buf, sizeof(buf), _("Shelf #%d"),
eina_list_count(e_config->shelves));
- return e_entry_dialog_show(_("Add New Shelf"), "preferences-desktop-shelf",
+ snprintf(buf, sizeof(buf), _("Shelf #%d"),
+eina_list_count(e_config->shelves));
+ return e_entry_dialog_show(parent, _("Add New Shelf"),
+ "preferences-desktop-shelf",
_("Name:"), buf, NULL, NULL,
_e_shelf_new_dialog_ok, NULL, zone);
}
@@ -2282,10 +2284,11 @@ _e_shelf_cb_menu_rename(void *data, E_Menu *m
EINA_UNUSED, E_Menu_Item *mi EINA_
{
E_Shelf *es = data;
if (es->rename_dialog) return;
- es->rename_dialog = e_entry_dialog_show(_("Rename Shelf"), "edit-rename",
- _("Name:"), es->name, NULL, NULL,
- _e_shelf_cb_menu_rename_yes_cb,
- NULL, es);
+ es->rename_dialog =
+ e_entry_dialog_show(NULL, _("Rename Shelf"), "edit-rename",
+ _("Name:"), es->name, NULL, NULL,
+ _e_shelf_cb_menu_rename_yes_cb,
+ NULL, es);
e_object_data_set(E_OBJECT(es->rename_dialog), es);
e_object_del_attach_func_set(E_OBJECT(es->rename_dialog),
_e_shelf_cb_menu_rename_cb);
diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h
index a98b3ba98..dfabb41ad 100644
--- a/src/bin/e_shelf.h
+++ b/src/bin/e_shelf.h
@@ -71,7 +71,7 @@ E_API extern int E_EVENT_SHELF_DEL;
EINTERN int e_shelf_init(void);
EINTERN int e_shelf_shutdown(void);
E_API void e_shelf_config_update(void);
-E_API E_Entry_Dialog *e_shelf_new_dialog(E_Zone *zone);
+E_API E_Entry_Dialog *e_shelf_new_dialog(Evas_Object *parent, E_Zone *zone);
E_API Eina_List *e_shelf_list(void);
E_API Eina_List *e_shelf_list_all(void); // includes dummy shelves
E_API E_Shelf *e_shelf_zone_new(E_Zone *zone, const char *name, const
char *style, E_Layer layer, int id);
--
[EGIT] [core/enlightenment] master 05/08: e_int_config_profiles: Add NULL parent param to e_entry_dialog_show call
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b177afeb436a5a75603b28564e1227ab5ae91b42
commit b177afeb436a5a75603b28564e1227ab5ae91b42
Author: Christopher Michael
Date: Wed Jan 20 12:37:18 2021 -0500
e_int_config_profiles: Add NULL parent param to e_entry_dialog_show call
---
src/modules/conf_dialogs/e_int_config_profiles.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/modules/conf_dialogs/e_int_config_profiles.c
b/src/modules/conf_dialogs/e_int_config_profiles.c
index 634601125..c894197d8 100644
--- a/src/modules/conf_dialogs/e_int_config_profiles.c
+++ b/src/modules/conf_dialogs/e_int_config_profiles.c
@@ -313,10 +313,11 @@ _cb_add(void *data, void *data2 EINA_UNUSED)
elm_win_raise(cfdata->dia_new_profile->dia->win);
else
{
-cfdata->dia_new_profile = e_entry_dialog_show(_("Add New Profile"),
NULL,
- _("Name:"), NULL, NULL, NULL,
- _new_profile_cb_ok,
- NULL, cfdata);
+cfdata->dia_new_profile =
+ e_entry_dialog_show(NULL, _("Add New Profile"), NULL,
+ _("Name:"), NULL, NULL, NULL,
+ _new_profile_cb_ok,
+ NULL, cfdata);
e_object_data_set(E_OBJECT(cfdata->dia_new_profile), cfdata);
e_object_del_attach_func_set(E_OBJECT(cfdata->dia_new_profile),
_new_profile_cb_dia_del);
}
--
[EGIT] [core/enlightenment] master 07/08: ibar: Add NULL parent (for now) to call of e_entry_dialog_show function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ce4a7f5d8cb1dfbdecc73c62c5144019f6e817aa
commit ce4a7f5d8cb1dfbdecc73c62c5144019f6e817aa
Author: Christopher Michael
Date: Wed Jan 20 12:38:43 2021 -0500
ibar: Add NULL parent (for now) to call of e_entry_dialog_show function
---
src/modules/ibar/e_mod_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index 99a89a955..d8c4c5a5b 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -186,7 +186,7 @@ _cb_add(void *data, void *data2 EINA_UNUSED)
E_Config_Dialog_Data *cfdata;
cfdata = data;
- e_entry_dialog_show(_("Create new IBar source"), "enlightenment",
+ e_entry_dialog_show(NULL, _("Create new IBar source"), "enlightenment",
_("Enter a name for this new source:"), "", NULL, NULL,
_cb_entry_ok, NULL, cfdata);
}
--
[EGIT] [core/enlightenment] master 06/08: e_int_config_shelf: Add parent param to e_shelf_new_dialog function call
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=89db85e4e7df2bcf6777d972afeedb0c63c4571c commit 89db85e4e7df2bcf6777d972afeedb0c63c4571c Author: Christopher Michael Date: Wed Jan 20 12:37:50 2021 -0500 e_int_config_shelf: Add parent param to e_shelf_new_dialog function call This stops the ability to close the Shelf Settings dialog while the Add New Shelf dialog is open --- src/modules/conf_shelves/e_int_config_shelf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index 8482639b8..a9a0b7bd1 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -349,9 +349,10 @@ _cb_add(void *data, void *data2 EINA_UNUSED) if (!cfdata) return; zone = e_comp_object_util_zone_get(cfdata->cfd->dia->win); - cfdata->dia_new_shelf = e_shelf_new_dialog(zone); + cfdata->dia_new_shelf = e_shelf_new_dialog(cfdata->cfd->dia->win, zone); e_object_data_set(E_OBJECT(cfdata->dia_new_shelf), cfdata); - e_object_del_attach_func_set(E_OBJECT(cfdata->dia_new_shelf), _new_shelf_cb_close); + e_object_del_attach_func_set(E_OBJECT(cfdata->dia_new_shelf), +_new_shelf_cb_close); _widgets_disable(cfdata, 1, EINA_TRUE); cfdata->num_shelves = eina_list_count(e_config->shelves); } --
[EGIT] [core/enlightenment] master 08/08: quickaccess: Add NULL parent param to call for e_entry_dialog_show
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=15c61b7ddbde3dd0435662379c07e1d10c5a921f
commit 15c61b7ddbde3dd0435662379c07e1d10c5a921f
Author: Christopher Michael
Date: Wed Jan 20 12:39:17 2021 -0500
quickaccess: Add NULL parent param to call for e_entry_dialog_show
---
src/modules/quickaccess/e_mod_config.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/modules/quickaccess/e_mod_config.c
b/src/modules/quickaccess/e_mod_config.c
index d4683e73c..15efee8d5 100644
--- a/src/modules/quickaccess/e_mod_config.c
+++ b/src/modules/quickaccess/e_mod_config.c
@@ -226,9 +226,11 @@ _list_rename(void *data, void *list)
ce = e_widget_ilist_selected_data_get(list);
if (!ce) return;
- cfdata->ed = e_entry_dialog_show(_("Rename"), "edit-rename", _("Enter a
unique name for this entry"),
-ce->id ?: ce->entry->id, NULL, NULL,
-_rename_ok, NULL, ce);
+ cfdata->ed =
+ e_entry_dialog_show(NULL, _("Rename"), "edit-rename",
+ _("Enter a unique name for this entry"),
+ ce->id ?: ce->entry->id, NULL, NULL,
+ _rename_ok, NULL, ce);
e_object_data_set(E_OBJECT(cfdata->ed), cfdata);
e_object_del_attach_func_set(E_OBJECT(cfdata->ed), _rename_del);
}
--
[EGIT] [core/enlightenment] master 03/08: e_fm: Add NULL parent parameter to e_entry_dialog_show call
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=30b17779bd13df6c1021f04d723ddf161f6567f2
commit 30b17779bd13df6c1021f04d723ddf161f6567f2
Author: Christopher Michael
Date: Wed Jan 20 12:35:20 2021 -0500
e_fm: Add NULL parent parameter to e_entry_dialog_show call
With the changes to e_entry_dialog now taking a parent param, we need
to adjust function call here
---
src/bin/e_fm.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 0c40b917b..1e25bda9b 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -10431,10 +10431,11 @@ _e_fm2_file_rename(void *data, E_Menu *m EINA_UNUSED,
E_Menu_Item *mi EINA_UNUSE
snprintf(text, PATH_MAX + 256,
_("Rename %s to:"),
ic->info.file);
-ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "edit-rename",
- text, ic->info.file, NULL, NULL,
- _e_fm2_file_rename_yes_cb,
- _e_fm2_file_rename_no_cb, ic);
+ic->entry_dialog =
+ e_entry_dialog_show(NULL, _("Rename File"), "edit-rename",
+ text, ic->info.file, NULL, NULL,
+ _e_fm2_file_rename_yes_cb,
+ _e_fm2_file_rename_no_cb, ic);
E_OBJECT(ic->entry_dialog)->data = ic;
e_object_del_attach_func_set(E_OBJECT(ic->entry_dialog),
_e_fm2_file_rename_delete_cb);
@@ -10793,7 +10794,7 @@ _e_fm_overwrite_rename(void *data EINA_UNUSED, E_Dialog
*dialog)
e_object_del(E_OBJECT(dialog));
file = ecore_file_file_get(ere->src);
snprintf(text, sizeof(text), _("Rename %s to:"), file);
- ed = e_entry_dialog_show(_("Rename File"), "edit-rename",
+ ed = e_entry_dialog_show(NULL, _("Rename File"), "edit-rename",
text, file, NULL, NULL,
_e_fm_overwrite_rename_yes_cb,
NULL, ere);
--
[EGIT] [core/enlightenment] master 01/01: desks: Assign some default desktop names
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f4e0d7612e7f7aadce96186a5d0d11e643a81922
commit f4e0d7612e7f7aadce96186a5d0d11e643a81922
Author: Christopher Michael
Date: Tue Jan 19 15:51:12 2021 -0500
desks: Assign some default desktop names
By default, desktops should (realistically) be assigned some form of
name so that they are not blank. This Fixes the issue of no Desktop
labels in the Virtual Desktop menu, and also fixes the issue mentioned
in the below ticket where "Show on Specific Desktop" dialog would not
show any type of description for the desktops when trying to place a
shelf.
NB: Uses the format of Desktop X,Y (ie: Desktop 0,1)
Fixes T8838
@fix
---
src/bin/e_desk.c | 31
src/modules/conf_display/e_int_config_desk.c | 19 ++---
2 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 24070446e..0f3730541 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -116,7 +116,13 @@ e_desk_new(E_Zone *zone, int x, int y)
break;
}
- if (!ok) desk->name = eina_stringshare_add("");
+ if (!ok)
+ {
+char buff[PATH_MAX];
+
+snprintf(buff, sizeof(buff), _("Desktop %d,%d"), desk->x, desk->y);
+desk->name = eina_stringshare_add(buff);
+ }
/* Get window profile name for current desktop */
if (zone->randr2_id)
@@ -170,8 +176,16 @@ e_desk_name_add(int zone, int desk_x, int desk_y, const
char *name)
cfname->zone = zone;
cfname->desk_x = desk_x;
cfname->desk_y = desk_y;
- if (name) cfname->name = eina_stringshare_add(name);
- else cfname->name = NULL;
+ if (name)
+ cfname->name = eina_stringshare_add(name);
+ else
+ {
+char buff[PATH_MAX];
+
+snprintf(buff, sizeof(buff), _("Desktop %d,%d"),
+ cfname->desk_x, cfname->desk_y);
+cfname->name = eina_stringshare_add(buff);
+ }
e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname);
}
@@ -219,7 +233,16 @@ e_desk_name_update(void)
((int)zone->num != cfname->zone)) continue;
if ((cfname->desk_x != d_x) ||
(cfname->desk_y != d_y)) continue;
- e_desk_name_set(desk, cfname->name);
+ if (cfname->name)
+ e_desk_name_set(desk, cfname->name);
+ else
+ {
+char buff[PATH_MAX];
+
+snprintf(buff, sizeof(buff), _("Desktop %d,%d"),
+ cfname->desk_x, cfname->desk_y);
+e_desk_name_set(desk, buff);
+ }
ok = 1;
break;
}
diff --git a/src/modules/conf_display/e_int_config_desk.c
b/src/modules/conf_display/e_int_config_desk.c
index 313ccc4a5..6891e3b9c 100644
--- a/src/modules/conf_display/e_int_config_desk.c
+++ b/src/modules/conf_display/e_int_config_desk.c
@@ -71,6 +71,14 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (dn->name)
cfdata->name = strdup(dn->name);
+else
+ {
+ char buff[PATH_MAX];
+
+ snprintf(buff, sizeof(buff), _("Desktop %d,%d"),
+ cfdata->desk_x, cfdata->desk_y);
+ cfdata->name = strdup(buff);
+ }
ok = 1;
break;
}
@@ -103,8 +111,12 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfdata)
{
if ((!cfdata->name) || (!cfdata->name[0]))
{
+char buff[PATH_MAX];
+
free(cfdata->name);
-cfdata->name = strdup("");
+snprintf(buff, sizeof(buff), _("Desktop %d,%d"),
+ cfdata->desk_x, cfdata->desk_y);
+cfdata->name = strdup(buff);
}
e_desk_name_del(cfdata->zone_num,
@@ -151,7 +163,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
if (cfdata->hdl)
ecore_event_handler_del(cfdata->hdl);
- cfdata->hdl = ecore_event_handler_add(E_EVENT_BG_UPDATE, _cb_bg_change,
cfdata);
+
+ cfdata->hdl =
+ ecore_event_handler_add(E_EVENT_BG_UPDATE, _cb_bg_change, cfdata);
return o;
}
@@ -192,4 +206,3 @@ _cb_bg_change(void *data, int type, void *event)
return ECORE_CALLBACK_PASS_ON;
}
-
--
[EGIT] [core/enlightenment] master 01/01: e_about: Update copyright year
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e45170f27fceb444d4e93fc4d766e5ecd41cc6e9 commit e45170f27fceb444d4e93fc4d766e5ecd41cc6e9 Author: Christopher Michael Date: Tue Jan 19 14:57:23 2021 -0500 e_about: Update copyright year A new year, a new copyright update --- src/bin/e_about.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_about.c b/src/bin/e_about.c index c7c8fd0bf..79380ab99 100644 --- a/src/bin/e_about.c +++ b/src/bin/e_about.c @@ -23,7 +23,7 @@ e_about_new(void) snprintf (buf, sizeof(buf), "%s%s", _( - "Copyright © 2000-2020, by the Enlightenment " + "Copyright © 2000-2021, by the Enlightenment " "Development Team" "" "We hope you enjoy using this software as much as we enjoyed " --
[EGIT] [core/enlightenment] master 01/01: wl_x11: Fix wrong return value on function that does not return bool....
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c82f6e81d1c533844f8044bf172765b930dc0e73
commit c82f6e81d1c533844f8044bf172765b930dc0e73
Author: Christopher Michael
Date: Mon Nov 9 21:28:32 2020 -0500
wl_x11: Fix wrong return value on function that does not return bool
Read the API. Returns INT ...
Also, you're already getting root so create randr canvas_new with that
first.,.. then check that Root is 'managed'...
---
src/modules/wl_x11/e_mod_main.c | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index d3e43c813..b21fc598e 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -10,7 +10,7 @@ e_modapi_init(E_Module *m)
{
int w = 0, h = 0;
Ecore_X_Window root, win;
- Eina_Bool managed;
+ int managed;
printf("LOAD WL_X11 MODULE\n");
@@ -20,9 +20,15 @@ e_modapi_init(E_Module *m)
return NULL;
}
root = ecore_x_window_root_first_get();
- managed = !!ecore_x_window_prop_window_get(root,
ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK,
- &win, 1);
- e_comp_x_randr_canvas_new(ecore_x_window_root_first_get(), 1, 1);
+
+ /* get root and setup canvas first */
+ e_comp_x_randr_canvas_new(root, 1, 1);
+
+ /* then check if it's 'managed' or not */
+ managed =
+ ecore_x_window_prop_window_get(root,
+ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK,
+&win, 1);
if (!e_comp->ee)
{
--
[EGIT] [core/enlightenment] master 02/03: e_module: Increase 'body' buffer size
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=43035f34f79a026f361f4855d8d1a6777d35f079
commit 43035f34f79a026f361f4855d8d1a6777d35f079
Author: Christopher Michael
Date: Thu Sep 17 12:14:45 2020 -0400
e_module: Increase 'body' buffer size
Increase size of body text to eliminate compiler warnings about
truncated strings
---
src/bin/e_module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index af5cf1f15..06d9c3b4d 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -181,7 +181,7 @@ e_module_new(const char *name)
{
E_Module *m;
char buf[PATH_MAX];
- char body[4096], title[1024];
+ char body[PATH_MAX + 256], title[1024];
const char *modpath = NULL;
char *s;
int in_list = 0;
--
[EGIT] [core/enlightenment] master 01/03: e_intl: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=595babc0eb7eaff2d444d741000ae9811121d9c8
commit 595babc0eb7eaff2d444d741000ae9811121d9c8
Author: Christopher Michael
Date: Thu Sep 17 12:14:20 2020 -0400
e_intl: Fix formatting
NB: No functional changes
---
src/bin/e_intl.h | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/bin/e_intl.h b/src/bin/e_intl.h
index 90f8da080..6a19936ca 100644
--- a/src/bin/e_intl.h
+++ b/src/bin/e_intl.h
@@ -3,33 +3,33 @@
# if E_INTERNAL
# ifdef HAVE_GETTEXT
-#define _(str) gettext(str)
-#define d_(str, dom) dgettext(PACKAGE dom, str)
-#define P_(str, str_p, n) ngettext(str, str_p, n)
-#define dP_(str, str_p, n, dom) dngettext(PACKAGE dom, str, str_p, n)
+#define _(str) gettext(str)
+#define d_(str, dom) dgettext(PACKAGE dom, str)
+#define P_(str, str_p, n) ngettext(str, str_p, n)
+#define dP_(str, str_p, n, dom) dngettext(PACKAGE dom, str, str_p, n)
# else
-#define _(str) (str)
-#define d_(str, dom) (str)
-#define P_(str, str_p, n) (str_p)
-#define dP_(str, str_p, n, dom) (str_p)
+#define _(str) (str)
+#define d_(str, dom) (str)
+#define P_(str, str_p, n) (str_p)
+#define dP_(str, str_p, n, dom) (str_p)
# endif
/* These macros are used to just mark strings for translation, this is useful
* for string lists which are not dynamically allocated
*/
-#define N_(str) (str)
-#define NP_(str, str_p) str, str_p
+# define N_(str) (str)
+# define NP_(str, str_p) str, str_p
# endif
# endif
typedef struct _E_Locale_Parts E_Locale_Parts;
-# else
-#ifndef E_INTL_H
-#define E_INTL_H
+#else
+# ifndef E_INTL_H
+# define E_INTL_H
-#define E_INTL_LOC_CODESET 1 << 0
-#define E_INTL_LOC_REGION1 << 1
-#define E_INTL_LOC_MODIFIER 1 << 2
-#define E_INTL_LOC_LANG 1 << 3
+# define E_INTL_LOC_CODESET 1 << 0
+# define E_INTL_LOC_REGION1 << 1
+# define E_INTL_LOC_MODIFIER 1 << 2
+# define E_INTL_LOC_LANG 1 << 3
struct _E_Locale_Parts
{
--
[EGIT] [core/enlightenment] master 03/03: e_utils: Increase tmpbuf allocated size
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9adfc913e4b6bda4ae018112efe7af3f33c940d8
commit 9adfc913e4b6bda4ae018112efe7af3f33c940d8
Author: Christopher Michael
Date: Thu Sep 17 12:15:38 2020 -0400
e_utils: Increase tmpbuf allocated size
Increase size of allocated tmpbuf in order to eliminate compiler
warnings in regard to truncated strings
---
src/bin/e_utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index a1588c351..56a3ecbd9 100644
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -6,7 +6,7 @@
#define e_util_dialog_show(title, args...) \
do { \
- char __tmpbuf[4096]; \
+ char __tmpbuf[PATH_MAX + 256]; \
\
snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \
e_util_dialog_internal(title, __tmpbuf); \
--
[EGIT] [core/enlightenment] master 01/01: temperature: Mark hdata paramater as unused
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ec1c6b42b40a5139ac4751791842e1f889266cec
commit ec1c6b42b40a5139ac4751791842e1f889266cec
Author: Christopher Michael
Date: Thu Sep 17 11:23:47 2020 -0400
temperature: Mark hdata paramater as unused
Compiler warns 'hdata' is unused, so mark it with EINA_UNUSED
---
src/modules/temperature/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/temperature/e_mod_main.c
b/src/modules/temperature/e_mod_main.c
index c9e2a9f24..8ecd02c9a 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -268,7 +268,7 @@ _temperature_face_shutdown(const Eina_Hash *hash
EINA_UNUSED, const void *key EI
}
static Eina_Bool
-_temperature_face_id_max(const Eina_Hash *hash EINA_UNUSED, const void *key,
void *hdata, void *fdata)
+_temperature_face_id_max(const Eina_Hash *hash EINA_UNUSED, const void *key,
void *hdata EINA_UNUSED, void *fdata)
{
const char *p;
int *max;
--
[EGIT] [core/enlightenment] master 01/01: e_bindings: Remove unused variable
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a8eb8821f8c4013369d4fd69bbb867e1560cc5c5 commit a8eb8821f8c4013369d4fd69bbb867e1560cc5c5 Author: Christopher Michael Date: Sat Aug 22 14:41:07 2020 -0400 e_bindings: Remove unused variable --- src/bin/e_bindings.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c index e2d231761..08a19c336 100644 --- a/src/bin/e_bindings.c +++ b/src/bin/e_bindings.c @@ -48,7 +48,6 @@ e_bindings_init(void) E_Config_Binding_Edge *ebe; E_Config_Binding_Key *ebk; E_Config_Binding_Acpi *eba; - E_Config_Binding_Acpi *ebsw; Eina_List *l; EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm) --
[EGIT] [core/enlightenment] enlightenment-0.24 04/11: e_comp_wl: Fix possible typo with function name
raster pushed a commit to branch enlightenment-0.24.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=099d42c02fcabd63d79862839799381dce32f182
commit 099d42c02fcabd63d79862839799381dce32f182
Author: Christopher Michael
Date: Mon Jun 29 09:07:04 2020 -0400
e_comp_wl: Fix possible typo with function name
---
src/bin/e_comp_wl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a9ceed782..17dd6c738 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -3701,7 +3701,7 @@ static Ecore_Timer *screensaver_eval_timer = NULL;
static Ecore_Timer *screensaver_idle_timer = NULL;
static Eina_Bool
-_e_comp_wl_creensaver_eval_cb(void *d EINA_UNUSED)
+_e_comp_wl_screensaver_eval_cb(void *d EINA_UNUSED)
{
screensaver_eval_timer = NULL;
if (!saver_on)
@@ -3723,7 +3723,7 @@ _e_comp_wl_screensaver_idle_cb(void *data EINA_UNUSED)
saver_on = EINA_TRUE;
E_FREE_FUNC(screensaver_eval_timer, ecore_timer_del);
screensaver_eval_timer = ecore_timer_loop_add
- (0.3, _e_comp_wl_creensaver_eval_cb, NULL);
+ (0.3, _e_comp_wl_screensaver_eval_cb, NULL);
}
return EINA_FALSE;
}
@@ -3811,7 +3811,7 @@ e_comp_wl_notidle(void)
saver_on = EINA_FALSE;
E_FREE_FUNC(screensaver_eval_timer, ecore_timer_del);
screensaver_eval_timer = ecore_timer_loop_add
- (0.3, _e_comp_wl_creensaver_eval_cb, NULL);
+ (0.3, _e_comp_wl_screensaver_eval_cb, NULL);
}
E_FREE_FUNC(screensaver_idle_timer, ecore_timer_del);
screensaver_idle_timer = ecore_timer_add
--
[EGIT] [core/enlightenment] master 01/01: e_comp_wl: Fix possible typo with function name
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bc5f4e56355d58af97736daad25cd11054fe65ef
commit bc5f4e56355d58af97736daad25cd11054fe65ef
Author: Christopher Michael
Date: Mon Jun 29 09:07:04 2020 -0400
e_comp_wl: Fix possible typo with function name
---
src/bin/e_comp_wl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a9ceed782..17dd6c738 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -3701,7 +3701,7 @@ static Ecore_Timer *screensaver_eval_timer = NULL;
static Ecore_Timer *screensaver_idle_timer = NULL;
static Eina_Bool
-_e_comp_wl_creensaver_eval_cb(void *d EINA_UNUSED)
+_e_comp_wl_screensaver_eval_cb(void *d EINA_UNUSED)
{
screensaver_eval_timer = NULL;
if (!saver_on)
@@ -3723,7 +3723,7 @@ _e_comp_wl_screensaver_idle_cb(void *data EINA_UNUSED)
saver_on = EINA_TRUE;
E_FREE_FUNC(screensaver_eval_timer, ecore_timer_del);
screensaver_eval_timer = ecore_timer_loop_add
- (0.3, _e_comp_wl_creensaver_eval_cb, NULL);
+ (0.3, _e_comp_wl_screensaver_eval_cb, NULL);
}
return EINA_FALSE;
}
@@ -3811,7 +3811,7 @@ e_comp_wl_notidle(void)
saver_on = EINA_FALSE;
E_FREE_FUNC(screensaver_eval_timer, ecore_timer_del);
screensaver_eval_timer = ecore_timer_loop_add
- (0.3, _e_comp_wl_creensaver_eval_cb, NULL);
+ (0.3, _e_comp_wl_screensaver_eval_cb, NULL);
}
E_FREE_FUNC(screensaver_idle_timer, ecore_timer_del);
screensaver_idle_timer = ecore_timer_add
--
[EGIT] [core/efl] master 01/01: ecore-evas-wayland: Fix minor typo in error message
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=682e9a6b55bc5d50a8eacbeab989c56e7e3a58fa
commit 682e9a6b55bc5d50a8eacbeab989c56e7e3a58fa
Author: Christopher Michael
Date: Mon Jun 29 09:01:54 2020 -0400
ecore-evas-wayland: Fix minor typo in error message
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 44d99a7e34..947ac2de7e 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -2716,7 +2716,7 @@ _wl_selection_receive(void *data, int type EINA_UNUSED,
void *event)
if ((!ready->data) || (ready->len < 1))
{
-ERR("no se;lection data");
+ERR("no selection data");
return ECORE_CALLBACK_PASS_ON;
}
for (int i = 0; i < ECORE_EVAS_SELECTION_BUFFER_LAST; ++i)
--
[EGIT] [core/efl] master 02/03: tests/ecore_wl2: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ca1eba10af084bd44d2aa1738b2b55a408ece802
commit ca1eba10af084bd44d2aa1738b2b55a408ece802
Author: Christopher Michael
Date: Wed Jun 10 08:32:40 2020 -0400
tests/ecore_wl2: Fix unchecked return value
Coverity reports eglChooseConfig is called without checking return
value here. This patch fixes the issue by checking the return value
and by also making _init_egl return a bool so that we can fail the
test if eglChooseConfig results in failure.
Fixes Coverity CID1412365
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 5 -
src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h | 16 ++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index c094515e93..4b9e734d61 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -324,6 +324,7 @@ _test_activated_window_activate(void *data EINA_UNUSED, int
type EINA_UNUSED, vo
EFL_START_TEST(wl2_window_activated)
{
Test_Data *td;
+ Eina_Bool ret = EINA_FALSE;
ecore_wl2_init();
@@ -345,7 +346,9 @@ EFL_START_TEST(wl2_window_activated)
ecore_wl2_window_show(td->win);
- _init_egl(td);
+ ret = _init_egl(td);
+ fail_if(ret != EINA_TRUE);
+
td->handler =
ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE,
_test_activated_configure_complete,
td);
ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ACTIVATE,
diff --git a/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
b/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
index 27fa4a615e..f235a481bb 100644
--- a/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
+++ b/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
@@ -5,7 +5,7 @@
#include
#include
-static void
+static Eina_Bool
_init_egl(Test_Data *td)
{
eglBindAPI(EGL_OPENGL_API);
@@ -21,18 +21,30 @@ _init_egl(Test_Data *td)
td->egl_display =
eglGetDisplay((EGLNativeDisplayType)ecore_wl2_display_get(td->display));
+
eglInitialize(td->egl_display, NULL, NULL);
- eglChooseConfig(td->egl_display, attributes, &td->egl_conf, 1, &num_config);
+
+ if (!eglChooseConfig(td->egl_display, attributes, &td->egl_conf,
+1, &num_config))
+ {
+ERR("Failed to choose egl config");
+eglTerminate(td->egl_display);
+return EINA_FALSE;
+ }
+
td->egl_context =
eglCreateContext(td->egl_display, td->egl_conf, EGL_NO_CONTEXT, NULL);
td->egl_window = wl_egl_window_create(td->surface, td->width, td->height);
+
td->egl_surface =
eglCreateWindowSurface(td->egl_display,
td->egl_conf, td->egl_window, NULL);
eglMakeCurrent(td->egl_display, td->egl_surface,
td->egl_surface, td->egl_context);
+
+ return EINA_TRUE;
}
static void
--
[EGIT] [core/efl] master 01/03: ecore_wl2_tests: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e48ac73bdcd431177739d2aa2c015da9a3cb
commit e48ac73bdcd431177739d2aa2c015da9a3cb
Author: Christopher Michael
Date: Wed Jun 10 08:26:29 2020 -0400
ecore_wl2_tests: Fix formatting
---
src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
b/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
index 03da269c38..27fa4a615e 100644
--- a/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
+++ b/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
@@ -11,23 +11,28 @@ _init_egl(Test_Data *td)
eglBindAPI(EGL_OPENGL_API);
EGLint num_config;
- EGLint attributes[] = {
+ EGLint attributes[] =
+ {
EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8,
EGL_NONE
- };
+ };
- td->egl_display =
eglGetDisplay((EGLNativeDisplayType)ecore_wl2_display_get(td->display));
+ td->egl_display =
+ eglGetDisplay((EGLNativeDisplayType)ecore_wl2_display_get(td->display));
eglInitialize(td->egl_display, NULL, NULL);
eglChooseConfig(td->egl_display, attributes, &td->egl_conf, 1, &num_config);
- td->egl_context = eglCreateContext(td->egl_display, td->egl_conf,
EGL_NO_CONTEXT, NULL);
+ td->egl_context =
+ eglCreateContext(td->egl_display, td->egl_conf, EGL_NO_CONTEXT, NULL);
td->egl_window = wl_egl_window_create(td->surface, td->width, td->height);
- td->egl_surface = eglCreateWindowSurface(td->egl_display,
-td->egl_conf, td->egl_window,
NULL);
+ td->egl_surface =
+ eglCreateWindowSurface(td->egl_display,
+td->egl_conf, td->egl_window, NULL);
- eglMakeCurrent(td->egl_display, td->egl_surface, td->egl_surface,
td->egl_context);
+ eglMakeCurrent(td->egl_display, td->egl_surface,
+ td->egl_surface, td->egl_context);
}
static void
--
[EGIT] [core/efl] master 03/03: tests/ecore_wl2: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e99fc2e3f10a5af900c50f0bab230683080bbe6
commit 9e99fc2e3f10a5af900c50f0bab230683080bbe6
Author: Christopher Michael
Date: Wed Jun 10 08:38:02 2020 -0400
tests/ecore_wl2: Fix unchecked return value
Coverity reports that we do not check the return of eglInitialize
here.
Fixes Coverity CID1412362
---
src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
b/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
index f235a481bb..4446bc547f 100644
--- a/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
+++ b/src/tests/ecore_wl2/ecore_wl2_tests_helper_egl.h
@@ -22,7 +22,12 @@ _init_egl(Test_Data *td)
td->egl_display =
eglGetDisplay((EGLNativeDisplayType)ecore_wl2_display_get(td->display));
- eglInitialize(td->egl_display, NULL, NULL);
+ if (!eglInitialize(td->egl_display, NULL, NULL))
+ {
+ERR("Failed to initialize egl");
+eglTerminate(td->egl_display);
+return EINA_FALSE;
+ }
if (!eglChooseConfig(td->egl_display, attributes, &td->egl_conf,
1, &num_config))
--
[EGIT] [core/efl] master 01/02: ecore-wl2: Remove unused variables
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6f68a9d892bf07d168ed45ab6d274d2e0937da18
commit 6f68a9d892bf07d168ed45ab6d274d2e0937da18
Author: Christopher Michael
Date: Tue May 26 14:49:32 2020 -0400
ecore-wl2: Remove unused variables
Patch d584696f12c6d93e26 remove the unmapping of subsurfaces on window
hide, however the variables were left declared so remove those
---
src/lib/ecore_wl2/ecore_wl2_window.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c
b/src/lib/ecore_wl2/ecore_wl2_window.c
index 86ea5d3f90..be5eff6e22 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -649,9 +649,6 @@ ecore_wl2_window_show(Ecore_Wl2_Window *window)
EAPI void
ecore_wl2_window_hide(Ecore_Wl2_Window *window)
{
- Ecore_Wl2_Subsurface *subsurf;
- Eina_Inlist *tmp;
-
EINA_SAFETY_ON_NULL_RETURN(window);
_ecore_wl2_window_hide_send(window);
--
[EGIT] [core/efl] master 02/02: ecore-evas-wayland: Fix unused variables
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f240a528ddd31fc6f91df040e33ea50107473adc
commit f240a528ddd31fc6f91df040e33ea50107473adc
Author: Christopher Michael
Date: Tue May 26 14:51:53 2020 -0400
ecore-evas-wayland: Fix unused variables
Patch 09ab8c9967512e67b7 added code to printf wl client animation
ticks, however the line that actually does the printing is commented
out (which is fine) but the variables used in that printf are not
needed if we are not printing things out
---
.../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index c52022b333..450f0aa16c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -41,19 +41,19 @@ _anim_cb_tick(Ecore_Wl2_Window *win EINA_UNUSED, uint32_t
timestamp, void *data)
{
Ecore_Evas *ee = data;
Ecore_Evas_Engine_Wl_Data *edata;
- double t, rt;
- static double pt = 0.0, prt = 0.0;
+ double t;//, rt;
+ /* static double pt = 0.0, prt = 0.0; */
edata = ee->engine.data;
if (!edata->ticking) return;
t = ((double)timestamp / 1000.0);
ecore_loop_time_set(t);
- rt = ecore_time_get();
-// printf("ECORE_EVAS: wl client anim tick %p | %p - %1.5f @ %1.5f
delt=%1.5f | %1.5f\n", ee, edata, t, ecore_time_get(), t - pt, rt - prt);
+ /* rt = ecore_time_get(); */
+ /* printf("ECORE_EVAS: wl client anim tick %p | %p - %1.5f @ %1.5f
delt=%1.5f | %1.5f\n", ee, edata, t, ecore_time_get(), t - pt, rt - prt); */
ecore_evas_animator_tick(ee, NULL, t);
- pt = t;
- prt = rt;
+ /* pt = t; */
+ /* prt = rt; */
}
static void
--
[EGIT] [core/efl] master 01/01: ecore-wl2: Fix build break from patch 9ca13ef5c10904b620407
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b655111c6dedab5b6390b8ef99584725effce289 commit b655111c6dedab5b6390b8ef99584725effce289 Author: Christopher Michael Date: Tue May 26 14:47:56 2020 -0400 ecore-wl2: Fix build break from patch 9ca13ef5c10904b620407 Above commit caused a build break from a missing comma ... Sole blame falls on the reviewer for not doing a build test ... bad me ;) --- src/lib/ecore_wl2/ecore_wl2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c index a07d3ce27c..f9dbda85f4 100644 --- a/src/lib/ecore_wl2/ecore_wl2.c +++ b/src/lib/ecore_wl2/ecore_wl2.c @@ -281,7 +281,7 @@ ecore_wl2_shutdown(void) ECORE_WL2_EVENT_WINDOW_ACTIVATE, ECORE_WL2_EVENT_WINDOW_DEACTIVATE, ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE, - ECORE_WL2_EVENT_WINDOW_OFFSCREEN + ECORE_WL2_EVENT_WINDOW_OFFSCREEN, ECORE_WL2_EVENT_WINDOW_CREATE, ECORE_WL2_EVENT_WINDOW_DESTROY); --
[EGIT] [core/efl] master 03/03: elput: Rmove empty pub_eo_file_target in meson.build
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=93cddac02df13275e19c43fa52d8eebe32b9aab8 commit 93cddac02df13275e19c43fa52d8eebe32b9aab8 Author: Christopher Michael Date: Mon May 18 11:48:08 2020 -0400 elput: Rmove empty pub_eo_file_target in meson.build --- src/lib/elput/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/elput/meson.build b/src/lib/elput/meson.build index 0e3e2f9c5f..8fde7b5ac7 100644 --- a/src/lib/elput/meson.build +++ b/src/lib/elput/meson.build @@ -1,6 +1,5 @@ elput_deps = [ecore, ecore_input, eeze, eo, m] elput_pub_deps = [eina, eldbus] -pub_eo_file_target = [] elput_header_src = [ 'Elput.h' --
[EGIT] [core/efl] master 01/03: ecore-evas-drm: Remove duplicate config set in meson.build file
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ef733d2035d4b288b67d8fe5bbb1c5a3c7c3a903
commit ef733d2035d4b288b67d8fe5bbb1c5a3c7c3a903
Author: Christopher Michael
Date: Mon May 18 11:24:48 2020 -0400
ecore-evas-drm: Remove duplicate config set in meson.build file
---
src/modules/ecore_evas/engines/drm/meson.build | 4
1 file changed, 4 deletions(-)
diff --git a/src/modules/ecore_evas/engines/drm/meson.build
b/src/modules/ecore_evas/engines/drm/meson.build
index 584cc56159..58071010d0 100644
--- a/src/modules/ecore_evas/engines/drm/meson.build
+++ b/src/modules/ecore_evas/engines/drm/meson.build
@@ -1,7 +1,3 @@
-if get_option('opengl') != 'none'
- config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1')
-endif
-
engine_src = files(['ecore_evas_drm.c'])
engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm]
--
[EGIT] [core/efl] master 02/03: elput: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ce04ff02cfd0d95080fee28ec601b5bfa4ca1d62
commit ce04ff02cfd0d95080fee28ec601b5bfa4ca1d62
Author: Christopher Michael
Date: Mon May 18 11:26:34 2020 -0400
elput: Fix formatting
NB: No functional changes
---
src/lib/elput/Elput.h | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/lib/elput/Elput.h b/src/lib/elput/Elput.h
index eb9e0a15db..7a05f8e795 100644
--- a/src/lib/elput/Elput.h
+++ b/src/lib/elput/Elput.h
@@ -2,22 +2,21 @@
# define _ELPUT_H
# ifdef EFL_BETA_API_SUPPORT
-# include
+# include
-# ifdef EAPI
-# undef EAPI
-# endif
+# ifdef EAPI
+# undef EAPI
+# endif
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+#define EAPI __attribute__ ((visibility("default")))
+# else
+#define EAPI
+# endif
# else
# define EAPI
# endif
-# else
-# define EAPI
-# endif
-
typedef enum
{
--
[EGIT] [core/enlightenment] master 01/01: wl_drm: Add missing new line on error printing
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ba685cc0e5206c5a4672ff040f8d0e3ae13c475f
commit ba685cc0e5206c5a4672ff040f8d0e3ae13c475f
Author: Christopher Michael
Date: Mon May 18 10:15:12 2020 -0400
wl_drm: Add missing new line on error printing
---
src/modules/wl_drm/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 10a08ce47..45f589361 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -938,7 +938,7 @@ e_modapi_init(E_Module *m)
}
else
{
- fprintf(stderr, "Could not create ecore_evas_drm canvas");
+ fprintf(stderr, "Could not create ecore_evas_drm canvas\n");
return NULL;
}
}
--
[EGIT] [core/efl] master 01/01: ecore-evas-wayland: Fix formatting according to coding conventions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=783e99081999601b13a0bf90e496bfb95957a814
commit 783e99081999601b13a0bf90e496bfb95957a814
Author: Christopher Michael
Date: Mon May 18 09:58:43 2020 -0400
ecore-evas-wayland: Fix formatting according to coding conventions
"80 column code whenever possible - Wrap longer lines where required."
NB: No functional changes
---
.../engines/wayland/ecore_evas_wayland_common.c| 237 ++---
1 file changed, 159 insertions(+), 78 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index bd1022e3e5..0331c2a56c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -140,7 +140,8 @@ _ecore_evas_wl_common_cb_mouse_out(void *data EINA_UNUSED,
int type EINA_UNUSED,
ev = event;
ee = ecore_event_window_match((Ecore_Window)ev->window);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if ((Ecore_Window)ev->window != ee->prop.window) return
ECORE_CALLBACK_PASS_ON;
+ if ((Ecore_Window)ev->window != ee->prop.window)
+ return ECORE_CALLBACK_PASS_ON;
if (!_ecore_evas_mouse_in_check(ee, ev->dev)) return ECORE_CALLBACK_PASS_ON;
ecore_event_evas_seat_modifier_lock_update(ee->evas,
@@ -162,7 +163,8 @@ _ecore_evas_wl_common_cb_focus_in(void *data EINA_UNUSED,
int type EINA_UNUSED,
ev = event;
ee = ecore_event_window_match((Ecore_Window)ev->window);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if ((Ecore_Window)ev->window != ee->prop.window) return
ECORE_CALLBACK_PASS_ON;
+ if ((Ecore_Window)ev->window != ee->prop.window)
+ return ECORE_CALLBACK_PASS_ON;
_ecore_evas_focus_device_set(ee, ev->dev, EINA_TRUE);
return ECORE_CALLBACK_PASS_ON;
}
@@ -178,7 +180,8 @@ _ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED,
int type EINA_UNUSED,
ev = event;
ee = ecore_event_window_match((Ecore_Window)ev->window);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if ((Ecore_Window)ev->window != ee->prop.window) return
ECORE_CALLBACK_PASS_ON;
+ if ((Ecore_Window)ev->window != ee->prop.window)
+ return ECORE_CALLBACK_PASS_ON;
_ecore_evas_focus_device_set(ee, ev->dev, EINA_FALSE);
return ECORE_CALLBACK_PASS_ON;
}
@@ -284,9 +287,7 @@ _ecore_evas_wayland_window_update(Ecore_Evas *ee,
Ecore_Evas_Engine_Wl_Data *wda
*/
else if (!ee->alpha)
{
-ecore_wl2_window_opaque_region_set(wdata->win,
- 0, 0,
- fullw, fullh);
+ecore_wl2_window_opaque_region_set(wdata->win, 0, 0, fullw, fullh);
}
/* alpha is set and we might use it, so we'd better clear the
* opaque region, let the compositor blend it all.
@@ -304,9 +305,9 @@ _ecore_evas_wayland_window_update(Ecore_Evas *ee,
Ecore_Evas_Engine_Wl_Data *wda
if (!change) return;
if (ECORE_EVAS_PORTRAIT(ee))
- evas_damage_rectangle_add(ee->evas, 0, 0, fullw, fullh);
+ evas_damage_rectangle_add(ee->evas, 0, 0, fullw, fullh);
else
- evas_damage_rectangle_add(ee->evas, 0, 0, fullh, fullw);
+ evas_damage_rectangle_add(ee->evas, 0, 0, fullh, fullw);
ee->shadow.changed = EINA_FALSE;
}
@@ -337,25 +338,33 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
ee->w = w;
ee->h = h;
- if (wdata->win->xdg_set_min_size && wdata->win->xdg_toplevel &&
wdata->win->pending.min)
+ if (wdata->win->xdg_set_min_size && wdata->win->xdg_toplevel &&
+ wdata->win->pending.min)
{
-wdata->win->xdg_set_min_size(wdata->win->xdg_toplevel, ee->prop.min.w
+ fw, ee->prop.min.h + fh);
+wdata->win->xdg_set_min_size(wdata->win->xdg_toplevel,
+ ee->prop.min.w + fw, ee->prop.min.h + fh);
wdata->win->pending.min = 0;
}
- if (wdata->win->xdg_set_max_size && wdata->win->xdg_toplevel &&
wdata->win->pending.max)
+ if (wdata->win->xdg_set_max_size && wdata->win->xdg_toplevel &&
+ wdata->win->pending.max)
{
-wdata->win->xdg_set_max_size(wdata->win->xdg_toplevel, ee->prop.max.w
+ fw, ee->prop.max.h + fh);
+wdata->win->xdg_set_max_size(wdata->win->xdg_toplevel,
+ ee->prop.max.w + fw, ee->prop.max.h + fh);
wdata->win->pending.max = 0;
}
- if (wdata->win->zxdg_set_min_size &&
[EGIT] [core/efl] master 01/01: ecore-drm2: Add missing params for doxygen
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ca169ec71505c1d43a1d4ac793d6a0626667c320 commit ca169ec71505c1d43a1d4ac793d6a0626667c320 Author: Christopher Michael Date: Fri May 15 10:50:37 2020 -0400 ecore-drm2: Add missing params for doxygen --- src/lib/ecore_drm2/Ecore_Drm2.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h index 6e2dd1fafc..4dde788355 100644 --- a/src/lib/ecore_drm2/Ecore_Drm2.h +++ b/src/lib/ecore_drm2/Ecore_Drm2.h @@ -415,6 +415,8 @@ EAPI Eina_Bool ecore_drm2_device_prefer_shadow(Ecore_Drm2_Device *device); * Get the default depth & bpp from a given device * * @param device + * @param depth + * @param bpp * * @ingroup Ecore_Drm2_Device_Group * @since 1.25 --
[EGIT] [core/efl] master 01/01: ecore-drm2: Add API function to return default depth
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f3c4692221892da6e500deb66ccd6087e8857691
commit f3c4692221892da6e500deb66ccd6087e8857691
Author: Christopher Michael
Date: Thu May 7 11:28:05 2020 -0400
ecore-drm2: Add API function to return default depth
Rather than hard-coding depth & bpp in the evas drm engines, we can
use this function to return the default depth & bpp.
@feature
---
src/lib/ecore_drm2/Ecore_Drm2.h| 10 ++
src/lib/ecore_drm2/ecore_drm2_device.c | 20
2 files changed, 30 insertions(+)
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index 4d10e0d3a6..6e2dd1fafc 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -411,6 +411,16 @@ EAPI Eina_Bool ecore_drm2_device_vt_set(Ecore_Drm2_Device
*device, int vt);
*/
EAPI Eina_Bool ecore_drm2_device_prefer_shadow(Ecore_Drm2_Device *device);
+/**
+ * Get the default depth & bpp from a given device
+ *
+ * @param device
+ *
+ * @ingroup Ecore_Drm2_Device_Group
+ * @since 1.25
+ */
+EAPI void ecore_drm2_device_preferred_depth_get(Ecore_Drm2_Device *device, int
*depth, int *bpp);
+
/**
* @defgroup Ecore_Drm2_Output_Group Drm output functions
*
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c
b/src/lib/ecore_drm2/ecore_drm2_device.c
index 7602114453..77498d806e 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -1,5 +1,9 @@
#include "ecore_drm2_private.h"
+#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
+# define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3
+#endif
+
#ifndef DRM_CAP_DUMB_PREFER_SHADOW
# define DRM_CAP_DUMB_PREFER_SHADOW 0x4
#endif
@@ -883,6 +887,22 @@ ecore_drm2_device_prefer_shadow(Ecore_Drm2_Device *device)
return EINA_FALSE;
}
+EAPI void
+ecore_drm2_device_preferred_depth_get(Ecore_Drm2_Device *device, int *depth,
int *bpp)
+{
+ uint64_t caps;
+ int ret;
+
+ EINA_SAFETY_ON_NULL_RETURN(device);
+
+ ret = sym_drmGetCap(device->fd, DRM_CAP_DUMB_PREFERRED_DEPTH, &caps);
+ if (ret == 0)
+ {
+if (depth) *depth = caps;
+if (bpp) *bpp = caps;
+ }
+}
+
EAPI int
ecore_drm2_device_fd_get(Ecore_Drm2_Device *device)
{
--
[EGIT] [core/efl] master 01/01: ecore-evas-drm: Remove useless check for visibility
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a70b811e8d7b0abd40618e7beba68ea9562f7352 commit a70b811e8d7b0abd40618e7beba68ea9562f7352 Author: Christopher Michael Date: Wed May 6 10:06:53 2020 -0400 ecore-evas-drm: Remove useless check for visibility This is already checked above so having a second check here is just silliness --- src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c index 3953b3323d..ca0f61413c 100644 --- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c +++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c @@ -404,8 +404,6 @@ _drm_show(Ecore_Evas *ee) if (ee->func.fn_state_change) ee->func.fn_state_change(ee); } - if (ee->visible) return; - ee->visible = 1; if (ee->func.fn_show) ee->func.fn_show(ee); --
[EGIT] [core/efl] master 01/01: ecore-buffer: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=09df69a3eb23309dedf109f6daac3480f3175515
commit 09df69a3eb23309dedf109f6daac3480f3175515
Author: Christopher Michael
Date: Sat May 2 14:44:59 2020 -0400
ecore-buffer: Fix formatting
NB: No functional changes
---
src/lib/ecore_buffer/ecore_buffer_private.h | 35 +++---
src/lib/ecore_buffer/ecore_buffer_provider.c | 43 +---
2 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/src/lib/ecore_buffer/ecore_buffer_private.h
b/src/lib/ecore_buffer/ecore_buffer_private.h
index 4e33772ed6..4487ea2a2c 100644
--- a/src/lib/ecore_buffer/ecore_buffer_private.h
+++ b/src/lib/ecore_buffer/ecore_buffer_private.h
@@ -1,29 +1,30 @@
#ifndef _ECORE_BUFFER_PRIVATE_H_
# define _ECORE_BUFFER_PRIVATE_H_
-#ifdef ERR
-#undef ERR
-#endif
-#ifdef WARN
-#undef WARN
-#endif
-#ifdef DBG
-#undef DBG
-#endif
+# ifdef ERR
+# undef ERR
+# endif
+# ifdef WARN
+# undef WARN
+# endif
+# ifdef DBG
+# undef DBG
+# endif
-#define ERR(...) EINA_LOG_DOM_ERR(_ecore_buffer_queue_log_dom, __VA_ARGS__)
-#define DBG(...) EINA_LOG_DOM_DBG(_ecore_buffer_queue_log_dom, __VA_ARGS__)
-#define WARN(...) EINA_LOG_DOM_WARN(_ecore_buffer_queue_log_dom, __VA_ARGS__)
+# define ERR(...) EINA_LOG_DOM_ERR(_ecore_buffer_queue_log_dom, __VA_ARGS__)
+# define DBG(...) EINA_LOG_DOM_DBG(_ecore_buffer_queue_log_dom, __VA_ARGS__)
+# define WARN(...) EINA_LOG_DOM_WARN(_ecore_buffer_queue_log_dom, __VA_ARGS__)
-#define CALLBACK_CALL(obj, cbname) \
-do { \
- if (obj->cb.cbname) \
- obj->cb.cbname(obj, obj->cb.data);\
-} while(0)
+# define CALLBACK_CALL(obj, cbname) \
+ do { \
+ if (obj->cb.cbname) \
+obj->cb.cbname(obj, obj->cb.data);\
+ } while(0)
extern int _ecore_buffer_queue_log_dom;
const char*_ecore_buffer_engine_name_get(Ecore_Buffer *buf);
+
/* NOTE: if Ecore_Export_Type as a return value is EXPORT_TYPE_FD,
* then caller should close the fd after using it. */
Ecore_Export_Type _ecore_buffer_export(Ecore_Buffer *buf, int *id);
diff --git a/src/lib/ecore_buffer/ecore_buffer_provider.c
b/src/lib/ecore_buffer/ecore_buffer_provider.c
index 53380fac84..e5cd4f0cf6 100644
--- a/src/lib/ecore_buffer/ecore_buffer_provider.c
+++ b/src/lib/ecore_buffer/ecore_buffer_provider.c
@@ -17,20 +17,20 @@ struct _Ecore_Buffer_Provider
Ecore_Buffer_Queue *ebq;
int free_slot;
struct
- {
- void (*consumer_add) (Ecore_Buffer_Provider *provider, int queue_size,
int w, int h, void *data);
- void (*consumer_del) (Ecore_Buffer_Provider *provider, void *data);
- void (*enqueue) (Ecore_Buffer_Provider *provider, void *data);
- void *data;
- } cb;
+ {
+void (*consumer_add) (Ecore_Buffer_Provider *provider, int
queue_size, int w, int h, void *data);
+void (*consumer_del) (Ecore_Buffer_Provider *provider, void *data);
+void (*enqueue) (Ecore_Buffer_Provider *provider, void *data);
+void *data;
+ } cb;
};
-static void _ecore_buffer_provider_cb_consumer_connected(void *data,
struct bq_provider *bq_provider, int32_t queue_size, int32_t width, int32_t
height);
-static void _ecore_buffer_provider_cb_consumer_disconnected(void
*data, struct bq_provider *bq_provider);
-static void _ecore_buffer_provider_cb_add_buffer(void *data, struct
bq_provider *bq_provider, struct bq_buffer *buffer, uint32_t serial);
+static void _ecore_buffer_provider_cb_consumer_connected(void *data, struct
bq_provider *bq_provider, int32_t queue_size, int32_t width, int32_t height);
+static void _ecore_buffer_provider_cb_consumer_disconnected(void *data, struct
bq_provider *bq_provider);
+static void _ecore_buffer_provider_cb_add_buffer(void *data, struct
bq_provider *bq_provider, struct bq_buffer *buffer, uint32_t serial);
static Shared_Buffer
*_ecore_buffer_provider_shared_buffer_new(Ecore_Buffer_Provider *provider,
Ecore_Buffer *buffer);
-static void
_ecore_buffer_provider_shared_buffer_free(Ecore_Buffer_Provider *provider,
Shared_Buffer *sb);
-static void _ecore_buffer_provider_cb_buffer_free(Ecore_Buffer *buf,
void *data);
+static void _ecore_buffer_provider_shared_buffer_free(Ecore_Buffer_Provider
*provider, Shared_Buffer *sb);
+static void _ecore_buffer_provider_cb_buffer_free(Ecore_Buffer *buf, void
*data);
struct bq_provider_listener _ecore_buffer_provider_listener =
{
@@ -83,7 +83,9 @@ ecore_buffer_provider_free(Ecore_Buffer_Provider *provider)
if (provider->ebq)
{
-shared_buffers =
_ecore_buffer_queue_shared_buffer_list_get(provider->ebq);
+shared_buffers =
+ _ecore_buffer_queue_shared_buffer_list_get(provider->ebq);
+
