[access] use well defined variable again
SVN revision: 83538
This commit is contained in:
parent
165db3bfa7
commit
7e75c9232b
|
@ -15,7 +15,7 @@ static void _free_data (E_Config_Dialog *cfd __UNUSED__, E_Config_Dial
|
||||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata);
|
static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||||
static int _basic_apply (E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata);
|
static int _basic_apply (E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata);
|
||||||
|
|
||||||
void
|
void
|
||||||
_config_pager_module(void)
|
_config_pager_module(void)
|
||||||
{
|
{
|
||||||
E_Config_Dialog_View *v;
|
E_Config_Dialog_View *v;
|
||||||
|
@ -32,14 +32,14 @@ _config_pager_module(void)
|
||||||
v->basic.apply_cfdata = _basic_apply;
|
v->basic.apply_cfdata = _basic_apply;
|
||||||
|
|
||||||
con = e_container_current_get(e_manager_current_get());
|
con = e_container_current_get(e_manager_current_get());
|
||||||
e_config_dialog_new(con, _("Access Settings"), "E",
|
e_config_dialog_new(con, _("Access Settings"), "E",
|
||||||
"_e_mod_access_config_dialog",
|
"_e_mod_access_config_dialog",
|
||||||
"preferences-desktop-access", 0, v, NULL);
|
"preferences-desktop-access", 0, v, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* local function prototypes */
|
/* local function prototypes */
|
||||||
static void *
|
static void *
|
||||||
_create_data(E_Config_Dialog *cfd __UNUSED__)
|
_create_data(E_Config_Dialog *cfd __UNUSED__)
|
||||||
{
|
{
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
||||||
|
@ -54,8 +54,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
cfdata->dummy = 1;
|
cfdata->dummy = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
E_FREE(cfdata);
|
E_FREE(cfdata);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ typedef struct
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
Ecore_X_Window win;
|
Ecore_X_Window win;
|
||||||
Ecore_Timer *timer;
|
Ecore_Timer *timer;
|
||||||
Ecore_Timer *double_click_timer;
|
Ecore_Timer *double_down_timer;
|
||||||
Ecore_Timer *tap_timer;
|
Ecore_Timer *tap_timer;
|
||||||
Evas_Object *info;
|
Evas_Object *info;
|
||||||
Evas_Object *text;
|
Evas_Object *text;
|
||||||
|
@ -23,7 +23,7 @@ typedef struct
|
||||||
Eina_Inlist *history;
|
Eina_Inlist *history;
|
||||||
Eina_Bool longpressed : 1;
|
Eina_Bool longpressed : 1;
|
||||||
Eina_Bool two_finger_down : 1;
|
Eina_Bool two_finger_down : 1;
|
||||||
Eina_Bool double_clicked : 1;
|
Eina_Bool double_down : 1;
|
||||||
} Cover;
|
} Cover;
|
||||||
|
|
||||||
#if DEBUG_INFO
|
#if DEBUG_INFO
|
||||||
|
@ -162,13 +162,13 @@ static Eina_Bool
|
||||||
_mouse_double_down(void *data)
|
_mouse_double_down(void *data)
|
||||||
{
|
{
|
||||||
Cover *cov = data;
|
Cover *cov = data;
|
||||||
ecore_timer_del(cov->double_click_timer);
|
ecore_timer_del(cov->double_down_timer);
|
||||||
cov->double_click_timer = NULL;
|
cov->double_down_timer = NULL;
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_double_click_timeout(Cover *cov)
|
_double_down_timeout(Cover *cov)
|
||||||
{
|
{
|
||||||
double short_time = 0.3;
|
double short_time = 0.3;
|
||||||
int distance = 40;
|
int distance = 40;
|
||||||
|
@ -177,11 +177,11 @@ _double_click_timeout(Cover *cov)
|
||||||
dx = cov->x - cov->dx;
|
dx = cov->x - cov->dx;
|
||||||
dy = cov->y - cov->dy;
|
dy = cov->y - cov->dy;
|
||||||
|
|
||||||
if ((cov->double_click_timer) &&
|
if ((cov->double_down_timer) &&
|
||||||
(((dx * dx) + (dy * dy)) < (distance * distance)))
|
(((dx * dx) + (dy * dy)) < (distance * distance)))
|
||||||
{
|
{
|
||||||
// start double tap and move from here
|
// start double tap and move from here
|
||||||
cov->double_clicked = EINA_TRUE;
|
cov->double_down = EINA_TRUE;
|
||||||
|
|
||||||
if (cov->timer)
|
if (cov->timer)
|
||||||
{
|
{
|
||||||
|
@ -190,14 +190,14 @@ _double_click_timeout(Cover *cov)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cov->double_click_timer)
|
if (cov->double_down_timer)
|
||||||
{
|
{
|
||||||
ecore_timer_del(cov->double_click_timer);
|
ecore_timer_del(cov->double_down_timer);
|
||||||
cov->double_click_timer = NULL;
|
cov->double_down_timer = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
cov->double_click_timer = ecore_timer_add(short_time, _mouse_double_down, cov);
|
cov->double_down_timer = ecore_timer_add(short_time, _mouse_double_down, cov);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -233,7 +233,7 @@ _mouse_down(Cover *cov, Ecore_Event_Mouse_Button *ev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check mouse double down - not two fingers, refer to double click */
|
/* check mouse double down - not two fingers, refer to double click */
|
||||||
_double_click_timeout(cov);
|
_double_down_timeout(cov);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -255,7 +255,7 @@ _mouse_up(Cover *cov, Ecore_Event_Mouse_Button *ev)
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset double down and moving
|
// reset double down and moving
|
||||||
cov->double_clicked = EINA_FALSE;
|
cov->double_down = EINA_FALSE;
|
||||||
|
|
||||||
if (cov->timer)
|
if (cov->timer)
|
||||||
{
|
{
|
||||||
|
@ -471,13 +471,13 @@ _cb_mouse_move(void *data __UNUSED__,
|
||||||
INFO(cov, "read");
|
INFO(cov, "read");
|
||||||
_messsage_read_send(cov);
|
_messsage_read_send(cov);
|
||||||
}
|
}
|
||||||
else if (cov->double_clicked && // client message for moving is available only after long press is detected
|
else if (cov->double_down && // client message for moving is available only after long press is detected
|
||||||
!(cov->two_finger_down) && ev->multi.device == multi_device[0])
|
!(cov->two_finger_down) && ev->multi.device == multi_device[0])
|
||||||
{
|
{
|
||||||
int distance = 5;
|
int distance = 5;
|
||||||
int dx, dy;
|
int dx, dy;
|
||||||
|
|
||||||
if (ev->multi.device == multi_device[0] && cov->double_clicked)
|
if (ev->multi.device == multi_device[0] && cov->double_down)
|
||||||
{
|
{
|
||||||
dx = ev->x - cov->mx;
|
dx = ev->x - cov->mx;
|
||||||
dy = ev->y - cov->my;
|
dy = ev->y - cov->my;
|
||||||
|
@ -650,10 +650,10 @@ _covers_shutdown(void)
|
||||||
cov->timer = NULL;
|
cov->timer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cov->double_click_timer)
|
if (cov->double_down_timer)
|
||||||
{
|
{
|
||||||
ecore_timer_del(cov->double_click_timer);
|
ecore_timer_del(cov->double_down_timer);
|
||||||
cov->double_click_timer = NULL;
|
cov->double_down_timer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cov->tap_timer)
|
if (cov->tap_timer)
|
||||||
|
|
Loading…
Reference in New Issue