okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2fa8df456a57fb48860beb0caec3db3d43d42498
commit 2fa8df456a57fb48860beb0caec3db3d43d42498 Author: Stephen 'Okra' Houston <[email protected]> Date: Wed Jul 12 13:31:22 2017 -0500 Thermal: Add left click info popup --- src/modules/sysinfo/mod.c | 4 +- src/modules/sysinfo/sysinfo.c | 1 + src/modules/sysinfo/sysinfo.h | 2 + src/modules/sysinfo/thermal/thermal.c | 93 ++++++++++++++++++++++++++++++++--- 4 files changed, 91 insertions(+), 9 deletions(-) diff --git a/src/modules/sysinfo/mod.c b/src/modules/sysinfo/mod.c index 5dad8227d..b87a4520c 100644 --- a/src/modules/sysinfo/mod.c +++ b/src/modules/sysinfo/mod.c @@ -96,6 +96,7 @@ sysinfo_init(void) ci->thermal.sensor_name = NULL; ci->thermal.temp = -900; ci->thermal.units = CELSIUS; + ci->thermal.popup = NULL; ci->thermal.configure = NULL; ci->cpuclock.poll_interval = 32; ci->cpuclock.restore_governor = 0; @@ -104,7 +105,8 @@ sysinfo_init(void) ci->cpuclock.governor = NULL; ci->cpuclock.pstate_min = 1; ci->cpuclock.pstate_max = 101; - ci->cpuclock.configure = NULL; + ci->cpuclock.popup = NULL; + ci->cpuclock.configure = NULL; ci->cpumonitor.poll_interval = 32; ci->cpumonitor.total = 0; ci->cpumonitor.idle = 0; diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c index 4b97fae54..4dc02f01b 100644 --- a/src/modules/sysinfo/sysinfo.c +++ b/src/modules/sysinfo/sysinfo.c @@ -104,6 +104,7 @@ _conf_item_get(int *id) ci->thermal.sensor_type = SENSOR_TYPE_NONE; ci->thermal.sensor_name = NULL; ci->thermal.units = CELSIUS; + ci->thermal.popup = NULL; ci->thermal.configure = NULL; ci->cpuclock.poll_interval = 32; ci->cpuclock.restore_governor = 0; diff --git a/src/modules/sysinfo/sysinfo.h b/src/modules/sysinfo/sysinfo.h index 06f06eaae..98275af8a 100644 --- a/src/modules/sysinfo/sysinfo.h +++ b/src/modules/sysinfo/sysinfo.h @@ -157,6 +157,8 @@ struct _Config_Item { Evas_Object *o_gadget; Evas_Object *configure; + Evas_Object *popup; + Evas_Object *popup_label; int poll_interval; int low, high; int sensor_type; diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c index ddf0d7215..d2e1ddfdf 100644 --- a/src/modules/sysinfo/thermal/thermal.c +++ b/src/modules/sysinfo/thermal/thermal.c @@ -32,7 +32,6 @@ _thermal_face_level_set(Instance *inst, double level) static void _thermal_apply(Instance *inst, int temp) { - char buf[64]; if (inst->cfg->thermal.temp == temp) return; inst->cfg->thermal.temp = temp; @@ -46,15 +45,10 @@ _thermal_apply(Instance *inst, int temp) elm_layout_signal_emit(inst->cfg->thermal.o_gadget, "e,state,known", ""); inst->cfg->thermal.have_temp = EINA_TRUE; } - if (inst->cfg->thermal.units == FAHRENHEIT) - snprintf(buf, sizeof(buf), "%i°F", temp); - else - snprintf(buf, sizeof(buf), "%i°C", temp); _thermal_face_level_set(inst, (double)(temp - inst->cfg->thermal.low) / (double)(inst->cfg->thermal.high - inst->cfg->thermal.low)); - elm_layout_text_set(inst->cfg->thermal.o_gadget, "e.text.reading", buf); } else { @@ -62,11 +56,20 @@ _thermal_apply(Instance *inst, int temp) { /* disable therm object */ elm_layout_signal_emit(inst->cfg->thermal.o_gadget, "e,state,unknown", ""); - elm_layout_text_set(inst->cfg->thermal.o_gadget, "e.text.reading", "N/A"); _thermal_face_level_set(inst, 0.5); inst->cfg->thermal.have_temp = EINA_FALSE; } } + if (inst->cfg->thermal.popup) + { + char buf[100]; + + if (inst->cfg->thermal.units == FAHRENHEIT) + snprintf(buf, 100, "%s: %d F", _("Temperature"), (int)((inst->cfg->thermal.temp * 9.0 / 5.0) + 32)); + else + snprintf(buf, 100, "%s: %d C", _("Temperature"), inst->cfg->thermal.temp); + elm_object_text_set(inst->cfg->thermal.popup_label, buf); + } } #if defined(HAVE_EEZE) @@ -146,18 +149,82 @@ _thermal_configure_cb(Evas_Object *g) Instance *inst = evas_object_data_get(g, "Instance"); if (!sysinfo_config) return NULL; + if (inst->cfg->thermal.popup) return NULL; return thermal_configure(inst); } static void +_thermal_popup_dismissed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + Instance *inst = data; + E_FREE_FUNC(obj, evas_object_del); + + inst->cfg->thermal.popup = NULL; + inst->cfg->thermal.popup_label = NULL; +} + +static void +_thermal_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Instance *inst = data; + inst->cfg->thermal.popup = NULL; +} + +static Evas_Object * +_thermal_popup_create(Instance *inst) +{ + Evas_Object *popup, *box, *label; + char buf[100]; + + popup = elm_ctxpopup_add(e_comp->elm); + elm_object_style_set(popup, "noblock"); + evas_object_smart_callback_add(popup, "dismissed", + _thermal_popup_dismissed, inst); + evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, + _thermal_popup_deleted, inst); + + box = elm_box_add(popup); + elm_box_horizontal_set(box, EINA_FALSE); + E_EXPAND(box); E_FILL(box); + elm_object_content_set(popup, box); + evas_object_show(box); + + label = elm_label_add(box); + elm_object_style_set(label, "marker"); + if (inst->cfg->thermal.units == FAHRENHEIT) + snprintf(buf, 100, "%s: %d F", _("Temperature"), (int)((inst->cfg->thermal.temp * 9.0 / 5.0) + 32)); + else + snprintf(buf, 100, "%s: %d C", _("Temperature"), inst->cfg->thermal.temp); + elm_object_text_set(label, buf); + elm_box_pack_end(box, label); + evas_object_show(label); + inst->cfg->thermal.popup_label = label; + + e_gadget_util_ctxpopup_place(inst->o_main, popup, + inst->cfg->thermal.o_gadget); + evas_object_show(popup); + + return popup; +} + +static void _thermal_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data) { Evas_Event_Mouse_Down *ev = event_data; Instance *inst = data; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; - if (ev->button == 3) + if (ev->button != 3) { + if (inst->cfg->thermal.popup) + elm_ctxpopup_dismiss(inst->cfg->thermal.popup); + else + inst->cfg->thermal.popup = _thermal_popup_create(inst); + } + else + { + if (inst->cfg->thermal.popup) + elm_ctxpopup_dismiss(inst->cfg->thermal.popup); if (!sysinfo_config) return; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (inst->cfg->esm != E_SYSINFO_MODULE_THERMAL) @@ -223,6 +290,7 @@ _thermal_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED Instance *inst = data; edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->thermal.o_gadget), 0, 0, &w, &h); + printf("%d x %d\n", w, h); if (w < 1) w = 1; if (h < 1) h = 1; if (inst->cfg->esm == E_SYSINFO_MODULE_THERMAL) @@ -237,6 +305,11 @@ _thermal_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data) Instance *inst = data; if (inst->o_main != event_data) return; + + if (inst->cfg->thermal.popup_label) + E_FREE_FUNC(inst->cfg->thermal.popup_label, evas_object_del); + if (inst->cfg->thermal.popup) + E_FREE_FUNC(inst->cfg->thermal.popup, evas_object_del); if (inst->cfg->thermal.configure) E_FREE_FUNC(inst->cfg->thermal.configure, evas_object_del); _thermal_face_shutdown(inst); @@ -252,6 +325,10 @@ sysinfo_thermal_remove(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN { Instance *inst = data; + if (inst->cfg->thermal.popup_label) + E_FREE_FUNC(inst->cfg->thermal.popup_label, evas_object_del); + if (inst->cfg->thermal.popup) + E_FREE_FUNC(inst->cfg->thermal.popup, evas_object_del); if (inst->cfg->thermal.configure) E_FREE_FUNC(inst->cfg->thermal.configure, evas_object_del); _thermal_face_shutdown(inst); --
