From 7e75c9232b90817668665ec94000ac18a432dfd8 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Fri, 1 Feb 2013 04:21:03 +0000 Subject: [PATCH] [access] use well defined variable again SVN revision: 83538 --- src/modules/access/e_mod_config.c | 10 ++++----- src/modules/access/e_mod_main.c | 36 +++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/modules/access/e_mod_config.c b/src/modules/access/e_mod_config.c index 3265df0ca..af15db087 100644 --- a/src/modules/access/e_mod_config.c +++ b/src/modules/access/e_mod_config.c @@ -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 int _basic_apply (E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -void +void _config_pager_module(void) { E_Config_Dialog_View *v; @@ -32,14 +32,14 @@ _config_pager_module(void) v->basic.apply_cfdata = _basic_apply; 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", "preferences-desktop-access", 0, v, NULL); } /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -54,8 +54,8 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->dummy = 1; } -static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +static void +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } diff --git a/src/modules/access/e_mod_main.c b/src/modules/access/e_mod_main.c index d9c3d650e..9aab4b0fc 100644 --- a/src/modules/access/e_mod_main.c +++ b/src/modules/access/e_mod_main.c @@ -13,7 +13,7 @@ typedef struct E_Zone *zone; Ecore_X_Window win; Ecore_Timer *timer; - Ecore_Timer *double_click_timer; + Ecore_Timer *double_down_timer; Ecore_Timer *tap_timer; Evas_Object *info; Evas_Object *text; @@ -23,7 +23,7 @@ typedef struct Eina_Inlist *history; Eina_Bool longpressed : 1; Eina_Bool two_finger_down : 1; - Eina_Bool double_clicked : 1; + Eina_Bool double_down : 1; } Cover; #if DEBUG_INFO @@ -162,13 +162,13 @@ static Eina_Bool _mouse_double_down(void *data) { Cover *cov = data; - ecore_timer_del(cov->double_click_timer); - cov->double_click_timer = NULL; + ecore_timer_del(cov->double_down_timer); + cov->double_down_timer = NULL; return EINA_FALSE; } static void -_double_click_timeout(Cover *cov) +_double_down_timeout(Cover *cov) { double short_time = 0.3; int distance = 40; @@ -177,11 +177,11 @@ _double_click_timeout(Cover *cov) dx = cov->x - cov->dx; dy = cov->y - cov->dy; - if ((cov->double_click_timer) && + if ((cov->double_down_timer) && (((dx * dx) + (dy * dy)) < (distance * distance))) { // start double tap and move from here - cov->double_clicked = EINA_TRUE; + cov->double_down = EINA_TRUE; 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); - cov->double_click_timer = NULL; + ecore_timer_del(cov->double_down_timer); + cov->double_down_timer = NULL; 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 @@ -233,7 +233,7 @@ _mouse_down(Cover *cov, Ecore_Event_Mouse_Button *ev) } /* check mouse double down - not two fingers, refer to double click */ - _double_click_timeout(cov); + _double_down_timeout(cov); } static void @@ -255,7 +255,7 @@ _mouse_up(Cover *cov, Ecore_Event_Mouse_Button *ev) } // reset double down and moving - cov->double_clicked = EINA_FALSE; + cov->double_down = EINA_FALSE; if (cov->timer) { @@ -471,13 +471,13 @@ _cb_mouse_move(void *data __UNUSED__, INFO(cov, "read"); _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]) { int distance = 5; 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; dy = ev->y - cov->my; @@ -650,10 +650,10 @@ _covers_shutdown(void) cov->timer = NULL; } - if (cov->double_click_timer) + if (cov->double_down_timer) { - ecore_timer_del(cov->double_click_timer); - cov->double_click_timer = NULL; + ecore_timer_del(cov->double_down_timer); + cov->double_down_timer = NULL; } if (cov->tap_timer)