Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot
Dir : e_modules/screenshot/src Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Fix net & screenshot modules to place nicely. =================================================================== RCS file: /cvs/e/e_modules/screenshot/src/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 29 Dec 2007 21:18:47 -0000 1.1 +++ e_mod_config.c 4 Jan 2008 06:39:46 -0000 1.2 @@ -50,7 +50,7 @@ snprintf(buf, sizeof(buf), "%s/e-module-screenshot.edj", ss_mod->dir); cfd = e_config_dialog_new(con, "Screenshot Configuration", "Screenshot", "_screenshot_cfg_dlg", buf, 0, v, NULL); - cfg->cfd = cfd; + ss_cfg->cfd = cfd; } /* private functions */ @@ -67,7 +67,7 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - cfg->cfd = NULL; + ss_cfg->cfd = NULL; E_FREE(cfdata->location); E_FREE(cfdata->filename); E_FREE(cfdata->app); @@ -77,17 +77,17 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - cfdata->delay = cfg->delay; - cfdata->prompt = cfg->prompt; - cfdata->use_app = cfg->use_app; - cfdata->use_bell = cfg->use_bell; - cfdata->quality = cfg->quality; - cfdata->use_thumb = cfg->use_thumb; - cfdata->thumb_size = cfg->thumb_size; - cfdata->mode = cfg->mode; - if (cfg->location) cfdata->location = strdup(cfg->location); - if (cfg->filename) cfdata->filename = strdup(cfg->filename); - if (cfg->app) cfdata->app = strdup(cfg->app); + cfdata->delay = ss_cfg->delay; + cfdata->prompt = ss_cfg->prompt; + cfdata->use_app = ss_cfg->use_app; + cfdata->use_bell = ss_cfg->use_bell; + cfdata->quality = ss_cfg->quality; + cfdata->use_thumb = ss_cfg->use_thumb; + cfdata->thumb_size = ss_cfg->thumb_size; + cfdata->mode = ss_cfg->mode; + if (ss_cfg->location) cfdata->location = strdup(ss_cfg->location); + if (ss_cfg->filename) cfdata->filename = strdup(ss_cfg->filename); + if (ss_cfg->app) cfdata->app = strdup(ss_cfg->app); } static Evas_Object * @@ -150,20 +150,20 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - cfg->use_bell = cfdata->use_bell; - cfg->delay = cfdata->delay; - cfg->prompt = cfdata->prompt; - cfg->mode = cfdata->mode; - if (cfg->location) evas_stringshare_del(cfg->location); + ss_cfg->use_bell = cfdata->use_bell; + ss_cfg->delay = cfdata->delay; + ss_cfg->prompt = cfdata->prompt; + ss_cfg->mode = cfdata->mode; + if (ss_cfg->location) evas_stringshare_del(ss_cfg->location); if (cfdata->location) - cfg->location = evas_stringshare_add(cfdata->location); + ss_cfg->location = evas_stringshare_add(cfdata->location); else - cfg->location = evas_stringshare_add(e_user_homedir_get()); - if (cfg->filename) evas_stringshare_del(cfg->filename); + ss_cfg->location = evas_stringshare_add(e_user_homedir_get()); + if (ss_cfg->filename) evas_stringshare_del(ss_cfg->filename); if (cfdata->filename) - cfg->filename = evas_stringshare_add(cfdata->filename); - cfg->use_app = cfdata->use_app; - cfg->use_thumb = cfdata->use_thumb; + ss_cfg->filename = evas_stringshare_add(cfdata->filename); + ss_cfg->use_app = cfdata->use_app; + ss_cfg->use_thumb = cfdata->use_thumb; e_config_save_queue(); return 1; @@ -245,25 +245,25 @@ static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - cfg->delay = cfdata->delay; - cfg->prompt = cfdata->prompt; - cfg->use_app = cfdata->use_app; - cfg->use_bell = cfdata->use_bell; - cfg->quality = cfdata->quality; - cfg->use_thumb = cfdata->use_thumb; - cfg->thumb_size = cfdata->thumb_size; - cfg->mode = cfdata->mode; - if (cfg->location) evas_stringshare_del(cfg->location); + ss_cfg->delay = cfdata->delay; + ss_cfg->prompt = cfdata->prompt; + ss_cfg->use_app = cfdata->use_app; + ss_cfg->use_bell = cfdata->use_bell; + ss_cfg->quality = cfdata->quality; + ss_cfg->use_thumb = cfdata->use_thumb; + ss_cfg->thumb_size = cfdata->thumb_size; + ss_cfg->mode = cfdata->mode; + if (ss_cfg->location) evas_stringshare_del(ss_cfg->location); if (cfdata->location) - cfg->location = evas_stringshare_add(cfdata->location); + ss_cfg->location = evas_stringshare_add(cfdata->location); else - cfg->location = evas_stringshare_add(e_user_homedir_get()); - if (cfg->filename) evas_stringshare_del(cfg->filename); + ss_cfg->location = evas_stringshare_add(e_user_homedir_get()); + if (ss_cfg->filename) evas_stringshare_del(ss_cfg->filename); if (cfdata->filename) - cfg->filename = evas_stringshare_add(cfdata->filename); - if (cfg->app) evas_stringshare_del(cfg->app); + ss_cfg->filename = evas_stringshare_add(cfdata->filename); + if (ss_cfg->app) evas_stringshare_del(ss_cfg->app); if (cfdata->app) - cfg->app = evas_stringshare_add(cfdata->app); + ss_cfg->app = evas_stringshare_add(cfdata->app); e_config_save_queue(); return 1; } =================================================================== RCS file: /cvs/e/e_modules/screenshot/src/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 1 Jan 2008 22:57:03 -0000 1.3 +++ e_mod_main.c 4 Jan 2008 06:39:46 -0000 1.4 @@ -51,7 +51,7 @@ static E_Config_DD *conf_edd = NULL; static E_Action *act = NULL; E_Module *ss_mod = NULL; -Config *cfg = NULL; +Config *ss_cfg = NULL; static const E_Gadcon_Client_Class _gc_class = { @@ -91,10 +91,10 @@ E_CONFIG_VAL(D, T, filename, STR); E_CONFIG_VAL(D, T, app, STR); - cfg = e_config_domain_load("module.screenshot", conf_edd); - if (cfg) + ss_cfg = e_config_domain_load("module.screenshot", conf_edd); + if (ss_cfg) { - if ((cfg->version >> 16) < MOD_CONFIG_FILE_EPOCH) + if ((ss_cfg->version >> 16) < MOD_CONFIG_FILE_EPOCH) { /* Config Too Old */ _cfg_free(); @@ -112,7 +112,7 @@ "You can re-configure things now to your<br>" "liking. Sorry for the inconvenience.<br>")); } - else if (cfg->version > MOD_CONFIG_FILE_VERSION) + else if (ss_cfg->version > MOD_CONFIG_FILE_VERSION) { /* Config Too New */ _cfg_free(); @@ -130,7 +130,7 @@ } } - if (!cfg) _cfg_new(); + if (!ss_cfg) _cfg_new(); /* register actions for keybindings */ act = e_action_add("screenshot"); @@ -149,7 +149,7 @@ EAPI int e_modapi_shutdown(E_Module *m) { - if (cfg->cfd) e_object_del(E_OBJECT(cfg->cfd)); + if (ss_cfg->cfd) e_object_del(E_OBJECT(ss_cfg->cfd)); if (act) { @@ -171,7 +171,7 @@ EAPI int e_modapi_save(E_Module *m) { - e_config_domain_save("module.screenshot", conf_edd, cfg); + e_config_domain_save("module.screenshot", conf_edd, ss_cfg); return 1; } @@ -266,10 +266,10 @@ static void _cfg_free(void) { - if (cfg->location) evas_stringshare_del(cfg->location); - if (cfg->filename) evas_stringshare_del(cfg->filename); - if (cfg->app) evas_stringshare_del(cfg->app); - E_FREE(cfg); + if (ss_cfg->location) evas_stringshare_del(ss_cfg->location); + if (ss_cfg->filename) evas_stringshare_del(ss_cfg->filename); + if (ss_cfg->app) evas_stringshare_del(ss_cfg->app); + E_FREE(ss_cfg); } static int @@ -282,33 +282,33 @@ static void _cfg_new(void) { - cfg = E_NEW(Config, 1); - cfg->version = (MOD_CONFIG_FILE_EPOCH << 16); + ss_cfg = E_NEW(Config, 1); + ss_cfg->version = (MOD_CONFIG_FILE_EPOCH << 16); #define IFMODCFG(v) \ - if ((cfg->version & 0xffff) < v) { + if ((ss_cfg->version & 0xffff) < v) { #define IFMODCFGEND } IFMODCFG(0x008d); - cfg->mode = 0; - cfg->quality = 75; - cfg->thumb_size = 50; - cfg->delay = 60.0; - cfg->prompt = 0; - cfg->use_app = 0; - cfg->use_bell = 1; - cfg->use_thumb = 0; - cfg->location = evas_stringshare_add(e_user_homedir_get()); - cfg->filename = NULL; - cfg->app = NULL; + ss_cfg->mode = 0; + ss_cfg->quality = 75; + ss_cfg->thumb_size = 50; + ss_cfg->delay = 60.0; + ss_cfg->prompt = 0; + ss_cfg->use_app = 0; + ss_cfg->use_bell = 1; + ss_cfg->use_thumb = 0; + ss_cfg->location = evas_stringshare_add(e_user_homedir_get()); + ss_cfg->filename = NULL; + ss_cfg->app = NULL; IFMODCFGEND; - cfg->version = MOD_CONFIG_FILE_VERSION; + ss_cfg->version = MOD_CONFIG_FILE_VERSION; - E_CONFIG_LIMIT(cfg->mode, 0, 2); - E_CONFIG_LIMIT(cfg->quality, 1, 100); - E_CONFIG_LIMIT(cfg->delay, 0.0, 60.0); - E_CONFIG_LIMIT(cfg->thumb_size, 10, 100); + E_CONFIG_LIMIT(ss_cfg->mode, 0, 2); + E_CONFIG_LIMIT(ss_cfg->quality, 1, 100); + E_CONFIG_LIMIT(ss_cfg->delay, 0.0, 60.0); + E_CONFIG_LIMIT(ss_cfg->thumb_size, 10, 100); e_config_save_queue(); } @@ -335,21 +335,21 @@ e_menu_item_label_set(mi, "Whole Screen"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if (cfg->mode == 0) e_menu_item_toggle_set(mi, 1); + if (ss_cfg->mode == 0) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _cb_normal, inst); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, "Select Window"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if (cfg->mode == 1) e_menu_item_toggle_set(mi, 1); + if (ss_cfg->mode == 1) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _cb_window, inst); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, "Select Region"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if (cfg->mode == 2) e_menu_item_toggle_set(mi, 1); + if (ss_cfg->mode == 2) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _cb_region, inst); mn = e_menu_new(); @@ -405,7 +405,7 @@ Instance *inst = NULL; if (!(inst = data)) return; - cfg->mode = 0; + ss_cfg->mode = 0; e_config_save_queue(); } @@ -415,7 +415,7 @@ Instance *inst = NULL; if (!(inst = data)) return; - cfg->mode = 1; + ss_cfg->mode = 1; e_config_save_queue(); } @@ -425,7 +425,7 @@ Instance *inst = NULL; if (!(inst = data)) return; - cfg->mode = 2; + ss_cfg->mode = 2; e_config_save_queue(); } @@ -435,7 +435,7 @@ Instance *inst = NULL; if (!(inst = data)) return; - if (cfg->prompt) + if (ss_cfg->prompt) { e_entry_dialog_show("Screenshot Module", "enlightenment/e", "Enter a new filename for this screenshot", @@ -471,14 +471,14 @@ t = ecore_file_dir_get(text); if (!strcmp(t, text)) { - snprintf(buf, sizeof(buf), "%s/%s", cfg->location, + snprintf(buf, sizeof(buf), "%s/%s", ss_cfg->location, ecore_file_file_get(text)); } else snprintf(buf, sizeof(buf), "%s", text); - if (cfg->filename) evas_stringshare_del(cfg->filename); - cfg->filename = evas_stringshare_add(buf); + if (ss_cfg->filename) evas_stringshare_del(ss_cfg->filename); + ss_cfg->filename = evas_stringshare_add(buf); _cb_send_msg(inst); } @@ -490,10 +490,10 @@ Edje_Message_Int_Set *msg = NULL; if (!(inst = data)) return; - if (cfg->delay <= 0.0) return; + if (ss_cfg->delay <= 0.0) return; msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int)); msg->count = 1; - msg->val[0] = cfg->delay; + msg->val[0] = ss_cfg->delay; edje_object_message_send(inst->o_base, EDJE_MESSAGE_INT_SET, 1, msg); free(msg); msg = NULL; @@ -507,21 +507,21 @@ char buf[4096]; tmp = strdup(""); - if (cfg->use_bell) + if (ss_cfg->use_bell) { snprintf(buf, sizeof(buf), "--beep "); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if (cfg->quality > 0) + if (ss_cfg->quality > 0) { - snprintf(buf, sizeof(buf), "--quality %d ", cfg->quality); + snprintf(buf, sizeof(buf), "--quality %d ", ss_cfg->quality); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - switch (cfg->mode) + switch (ss_cfg->mode) { case 0: break; @@ -537,38 +537,38 @@ break; } - if ((cfg->use_app) && (cfg->app)) + if ((ss_cfg->use_app) && (ss_cfg->app)) { - snprintf(buf, sizeof(buf), "--app %s ", cfg->app); + snprintf(buf, sizeof(buf), "--app %s ", ss_cfg->app); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if ((cfg->use_thumb) && (cfg->thumb_size > 0)) + if ((ss_cfg->use_thumb) && (ss_cfg->thumb_size > 0)) { - snprintf(buf, sizeof(buf), "--thumb-geom %d ", cfg->thumb_size); + snprintf(buf, sizeof(buf), "--thumb-geom %d ", ss_cfg->thumb_size); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if ((cfg->prompt) && (cfg->filename)) + if ((ss_cfg->prompt) && (ss_cfg->filename)) { - snprintf(buf, sizeof(buf), "%s", cfg->filename); + snprintf(buf, sizeof(buf), "%s", ss_cfg->filename); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } else { - if ((cfg->location) && (cfg->filename)) + if ((ss_cfg->location) && (ss_cfg->filename)) { - snprintf(buf, sizeof(buf), "%s/%s", cfg->location, - cfg->filename); + snprintf(buf, sizeof(buf), "%s/%s", ss_cfg->location, + ss_cfg->filename); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - else if (cfg->location) + else if (ss_cfg->location) { - snprintf(buf, sizeof(buf), "%s", cfg->location); + snprintf(buf, sizeof(buf), "%s", ss_cfg->location); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } @@ -587,28 +587,28 @@ char buf[4096]; tmp = strdup(""); - if (cfg->delay > 0) + if (ss_cfg->delay > 0) { - snprintf(buf, sizeof(buf), "--delay %i ", (int)cfg->delay); + snprintf(buf, sizeof(buf), "--delay %i ", (int)ss_cfg->delay); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if (cfg->use_bell) + if (ss_cfg->use_bell) { snprintf(buf, sizeof(buf), "--beep "); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if (cfg->quality > 0) + if (ss_cfg->quality > 0) { - snprintf(buf, sizeof(buf), "--quality %d ", cfg->quality); + snprintf(buf, sizeof(buf), "--quality %d ", ss_cfg->quality); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - switch (cfg->mode) + switch (ss_cfg->mode) { case 0: break; @@ -624,38 +624,38 @@ break; } - if ((cfg->use_app) && (cfg->app)) + if ((ss_cfg->use_app) && (ss_cfg->app)) { - snprintf(buf, sizeof(buf), "--app %s ", cfg->app); + snprintf(buf, sizeof(buf), "--app %s ", ss_cfg->app); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if ((cfg->use_thumb) && (cfg->thumb_size > 0)) + if ((ss_cfg->use_thumb) && (ss_cfg->thumb_size > 0)) { - snprintf(buf, sizeof(buf), "--thumb-geom %d ", cfg->thumb_size); + snprintf(buf, sizeof(buf), "--thumb-geom %d ", ss_cfg->thumb_size); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - if ((cfg->prompt) && (cfg->filename)) + if ((ss_cfg->prompt) && (ss_cfg->filename)) { - snprintf(buf, sizeof(buf), "%s", cfg->filename); + snprintf(buf, sizeof(buf), "%s", ss_cfg->filename); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } else { - if ((cfg->location) && (cfg->filename)) + if ((ss_cfg->location) && (ss_cfg->filename)) { - snprintf(buf, sizeof(buf), "%s/%s", cfg->location, - cfg->filename); + snprintf(buf, sizeof(buf), "%s/%s", ss_cfg->location, + ss_cfg->filename); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } - else if (cfg->location) + else if (ss_cfg->location) { - snprintf(buf, sizeof(buf), "%s", cfg->location); + snprintf(buf, sizeof(buf), "%s", ss_cfg->location); tmp = realloc(tmp, strlen(tmp) + strlen(buf) + 1); strcat(tmp, buf); } =================================================================== RCS file: /cvs/e/e_modules/screenshot/src/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h 29 Dec 2007 21:18:47 -0000 1.1 +++ e_mod_main.h 4 Jan 2008 06:39:46 -0000 1.2 @@ -35,7 +35,7 @@ EAPI E_Config_Dialog *e_int_config_screenshot_module(E_Container *con, const char *params __UNUSED__); -extern Config *cfg; +extern Config *ss_cfg; extern E_Module *ss_mod; #endif ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs