forked from enlightenment/enlightenment
backlight: remove code duplication
Move repeated blocks of code to a static function
This commit is contained in:
parent
1bcc205d2f
commit
294db70962
|
@ -49,6 +49,7 @@ static Eina_List *handlers;
|
||||||
|
|
||||||
|
|
||||||
static void _backlight_popup_free(Instance *inst);
|
static void _backlight_popup_free(Instance *inst);
|
||||||
|
static void _backlight_level_set(Instance *inst, double value, Eina_Bool set_slider);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_backlight_gadget_update(Instance *inst)
|
_backlight_gadget_update(Instance *inst)
|
||||||
|
@ -61,6 +62,20 @@ _backlight_gadget_update(Instance *inst)
|
||||||
edje_object_message_send(inst->o_backlight, EDJE_MESSAGE_FLOAT, 0, &msg);
|
edje_object_message_send(inst->o_backlight, EDJE_MESSAGE_FLOAT, 0, &msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_backlight_level_set(Instance *inst, double val, Eina_Bool set_slider)
|
||||||
|
{
|
||||||
|
if (val > 1.0) val = 1.0;
|
||||||
|
if (val < 0.0) val = 0.0;
|
||||||
|
if (set_slider)
|
||||||
|
e_widget_slider_value_double_set(inst->o_slider, val);
|
||||||
|
inst->val = val;
|
||||||
|
e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
|
||||||
|
e_backlight_level_set(inst->gcc->gadcon->zone, val, 0.0);
|
||||||
|
e_config->backlight.normal = val;
|
||||||
|
e_config_save_queue();
|
||||||
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
|
_backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
|
||||||
{
|
{
|
||||||
|
@ -79,14 +94,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
|
||||||
(!strcmp(keysym, "bracketright")) ||
|
(!strcmp(keysym, "bracketright")) ||
|
||||||
(!strcmp(keysym, "Prior")))
|
(!strcmp(keysym, "Prior")))
|
||||||
{
|
{
|
||||||
double v = inst->val + 0.1;
|
_backlight_level_set(inst, inst->val + 0.1, EINA_TRUE);
|
||||||
if (v > 1.0) v = 1.0;
|
|
||||||
e_widget_slider_value_double_set(inst->o_slider, v);
|
|
||||||
inst->val = v;
|
|
||||||
e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
|
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
|
|
||||||
e_config->backlight.normal = v;
|
|
||||||
e_config_save_queue();
|
|
||||||
_backlight_gadget_update(inst);
|
_backlight_gadget_update(inst);
|
||||||
}
|
}
|
||||||
else if ((!strcmp(keysym, "Down")) ||
|
else if ((!strcmp(keysym, "Down")) ||
|
||||||
|
@ -98,14 +106,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
|
||||||
(!strcmp(keysym, "bracketleft")) ||
|
(!strcmp(keysym, "bracketleft")) ||
|
||||||
(!strcmp(keysym, "Next")))
|
(!strcmp(keysym, "Next")))
|
||||||
{
|
{
|
||||||
double v = inst->val - 0.1;
|
_backlight_level_set(inst, inst->val - 0.1, EINA_TRUE);
|
||||||
if (v < 0.0) v = 0.0;
|
|
||||||
e_widget_slider_value_double_set(inst->o_slider, v);
|
|
||||||
inst->val = v;
|
|
||||||
e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
|
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
|
|
||||||
e_config->backlight.normal = v;
|
|
||||||
e_config_save_queue();
|
|
||||||
_backlight_gadget_update(inst);
|
_backlight_gadget_update(inst);
|
||||||
}
|
}
|
||||||
else if ((!strcmp(keysym, "0")) ||
|
else if ((!strcmp(keysym, "0")) ||
|
||||||
|
@ -119,13 +120,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
|
||||||
(!strcmp(keysym, "8")) ||
|
(!strcmp(keysym, "8")) ||
|
||||||
(!strcmp(keysym, "9")))
|
(!strcmp(keysym, "9")))
|
||||||
{
|
{
|
||||||
double v = (double)atoi(keysym) / 9.0;
|
_backlight_level_set(inst, (double)atoi(keysym) / 9.0, EINA_TRUE);
|
||||||
e_widget_slider_value_double_set(inst->o_slider, v);
|
|
||||||
inst->val = v;
|
|
||||||
e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
|
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
|
|
||||||
e_config->backlight.normal = v;
|
|
||||||
e_config_save_queue();
|
|
||||||
_backlight_gadget_update(inst);
|
_backlight_gadget_update(inst);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -172,10 +167,7 @@ static void
|
||||||
_slider_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
_slider_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||||
{
|
{
|
||||||
Instance *inst = data;
|
Instance *inst = data;
|
||||||
e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
|
_backlight_level_set(inst, inst->val, EINA_FALSE);
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, inst->val, 0.0);
|
|
||||||
e_config->backlight.normal = inst->val;
|
|
||||||
e_config_save_queue();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -279,26 +271,6 @@ _backlight_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_backlight_level_decrease(Instance *inst)
|
|
||||||
{
|
|
||||||
double v = inst->val - 0.1;
|
|
||||||
if (v < 0.0) v = 0.0;
|
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
|
|
||||||
e_config->backlight.normal = v;
|
|
||||||
e_config_save_queue();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_backlight_level_increase(Instance *inst)
|
|
||||||
{
|
|
||||||
double v = inst->val + 0.1;
|
|
||||||
if (v > 1.0) v = 1.0;
|
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
|
|
||||||
e_config->backlight.normal = v;
|
|
||||||
e_config_save_queue();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_backlight_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
|
_backlight_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
|
||||||
{
|
{
|
||||||
|
@ -307,9 +279,9 @@ _backlight_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __
|
||||||
|
|
||||||
inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
|
inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
|
||||||
if (ev->z > 0)
|
if (ev->z > 0)
|
||||||
_backlight_level_decrease(inst);
|
_backlight_level_set(inst, inst->val - 0.1, EINA_FALSE);
|
||||||
else if (ev->z < 0)
|
else if (ev->z < 0)
|
||||||
_backlight_level_increase(inst);
|
_backlight_level_set(inst, inst->val + 0.1, EINA_FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static E_Gadcon_Client *
|
static E_Gadcon_Client *
|
||||||
|
@ -455,13 +427,7 @@ _e_mod_action_cb(E_Object *obj __UNUSED__,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
double v = inst->val + atof(params);
|
_backlight_level_set(inst, inst->val + atof(params), EINA_FALSE);
|
||||||
if (v > 1.0) v = 1.0;
|
|
||||||
if (v < 0.0) v = 0.0;
|
|
||||||
inst->val = v;
|
|
||||||
e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0);
|
|
||||||
e_config->backlight.normal = v;
|
|
||||||
e_config_save_queue();
|
|
||||||
_backlight_popup_timer_new(inst);
|
_backlight_popup_timer_new(inst);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue