enlightenment
/
enlightenment
5
6
Fork 6
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

Working on font selector:

Browse Source 
* Changed basic config so we can easily select Font/Style
  * Advanced is broken (Will be replaced)


SVN revision: 29369
devs/princeamd/enlightenment-0.17-elive
Stafford Mitchell Horne 16 years ago
parent 318788a78c
commit cca951359d
4 changed files with 359 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 175
      src/bin/e_font.c
  2. 12
      src/bin/e_font.h
  3. 209
      src/bin/e_int_config_fonts.c
  4. 2
      src/bin/e_widget_ilist.c

175
src/bin/e_font.c
Unescape View File

@ -3,11 +3,11 @@
*/
#include "e.h"
/* TODO List:
* - export to libe
* - use e_path to search for available fonts
*/
#define E_TOK_STYLE ":style="
static Evas_Bool _font_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Hash *_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name);
static E_Font_Properties *_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font);
static char _fn_buf[1024];
EAPI int
@ -134,6 +134,173 @@ e_font_available_list_free(Evas_List *available)
}
}
EAPI void
e_font_properties_free(E_Font_Properties *efp)
{
while (efp->styles)
{
const char *str;
str = efp->styles->data;
if (str) evas_stringshare_del(str);
efp->styles = evas_list_remove_list(efp->styles, efp->styles);
}
if (efp->name) evas_stringshare_del(efp->name);
free(efp);
}
static Evas_Bool
_font_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
E_Font_Properties *efp;
efp = data;
e_font_properties_free(efp);
return 1;
}
EAPI void
e_font_available_hash_free(Evas_Hash *hash)
{
evas_hash_foreach(hash, _font_hash_free_cb, NULL);
evas_hash_free(hash);
}
EAPI E_Font_Properties *
e_font_fontconfig_name_parse(const char *font)
{
if (font == NULL) return NULL;
return _e_font_fontconfig_name_parse(NULL, NULL, font);
}
static E_Font_Properties *
_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font)
{
char *s1;
s1 = strchr(font, ':');
if (s1)
{
char *s2;
char *name;
char *style;
int len;
len = s1 - font;
name = calloc(sizeof(char), len + 1);
strncpy(name, font, len);
/* Get subname (should be english) */
s2 = strchr(name, ',');
if (s2)
{
len = s2 - name;
name = realloc(name, sizeof(char) * len + 1);
memset(name, 0, sizeof(char) * len + 1);
strncpy(name, font, len);
}
if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
{
style = s1 + strlen(E_TOK_STYLE);
if (font_hash) efp = evas_hash_find(*font_hash, name);
if (efp == NULL)
{
efp = calloc(1, sizeof(E_Font_Properties));
efp->name = evas_stringshare_add(name);
if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp);
}
s2 = strchr(style, ',');
if (s2)
{
char *style_old;
len = s2 - style;
style_old = style;
style = calloc(sizeof(char), len + 1);
strncpy(style, style_old, len);
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
free(style);
}
else
{
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
}
}
free(name);
}
else
{
if (font_hash) efp = evas_hash_find(*font_hash, font);
if (efp == NULL)
{
efp = calloc(1, sizeof(E_Font_Properties));
efp->name = evas_stringshare_add(font);
if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp);
}
}
return efp;
}
static Evas_Hash *
_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name)
{
_e_font_fontconfig_name_parse(&font_hash, NULL, full_name);
return font_hash;
}
EAPI Evas_Hash *
e_font_available_list_parse(Evas_List *list)
{
Evas_Hash *font_hash;
Evas_List *next;
font_hash = NULL;
/* Populate Default Font Families */
font_hash = _e_font_available_hash_add(font_hash, "Sans:style=Regular");
font_hash = _e_font_available_hash_add(font_hash, "Sans:style=Bold");
font_hash = _e_font_available_hash_add(font_hash, "Sans:style=Oblique");
font_hash = _e_font_available_hash_add(font_hash, "Sans:style=Bold Oblique");
font_hash = _e_font_available_hash_add(font_hash, "Serif:style=Regular");
font_hash = _e_font_available_hash_add(font_hash, "Serif:style=Bold");
font_hash = _e_font_available_hash_add(font_hash, "Serif:style=Oblique");
font_hash = _e_font_available_hash_add(font_hash, "Serif:style=Bold Oblique");
font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Regular");
font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Bold");
font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Oblique");
font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Bold Oblique");
for (next = list; next; next = next->next)
{
font_hash = _e_font_available_hash_add(font_hash, next->data);
}
return font_hash;
}
EAPI const char *
e_font_fontconfig_name_get(const char *name, const char *style)
{
char buf[256];
if (name == NULL) return NULL;
if (style == NULL || style[0] == 0) return evas_stringshare_add(name);
snprintf(buf, 256, "%s"E_TOK_STYLE"%s", name, style);
return evas_stringshare_add(buf);
}
EAPI void
e_font_fallback_clear(void)
{

12
src/bin/e_font.h
Unescape View File

@ -6,6 +6,7 @@
typedef struct _E_Font_Default E_Font_Default;
typedef struct _E_Font_Fallback E_Font_Fallback;
typedef struct _E_Font_Available E_Font_Available;
typedef struct _E_Font_Properties E_Font_Properties;
#else
#ifndef E_FONT_H
@ -28,11 +29,22 @@ struct _E_Font_Available
const char *name;
};
struct _E_Font_Properties
{
const char *name;
Evas_List *styles;
};
EAPI int e_font_init(void);
EAPI int e_font_shutdown(void);
EAPI void e_font_apply(void);
EAPI Evas_List *e_font_available_list(void);
EAPI void e_font_available_list_free(Evas_List *available);
EAPI Evas_Hash *e_font_available_list_parse(Evas_List *list);
EAPI void e_font_available_hash_free(Evas_Hash *hash);
EAPI E_Font_Properties *e_font_fontconfig_name_parse(const char *font);
EAPI const char *e_font_fontconfig_name_get(const char *name, const char *style);
EAPI void e_font_properties_free(E_Font_Properties *efp);
/* global font fallbacks */
EAPI void e_font_fallback_clear(void);

209
src/bin/e_int_config_fonts.c
Unescape View File

@ -20,6 +20,7 @@ static void _enabled_fallback_cb_change(void *data, Evas_Object *obj);
static int _sort_fonts(void *data1, void *data2);
static void _size_cb_change(void *data, Evas_Object *obj);
static void _font_cb_change(void *data, Evas_Object *obj);
static void _style_cb_change(void *data, Evas_Object *obj);
struct _E_Text_Class_Pair
{
@ -32,6 +33,7 @@ struct _CFText_Class
const char *class_name;
const char *class_description;
const char *font;
const char *style;
double size;
unsigned char enabled : 1;
};
@ -93,8 +95,15 @@ struct _E_Config_Dialog_Data
/* Text Classes */
Evas_List *text_classes;
/* Font Data */
Evas_Hash *font_hash;
Evas_List *font_list;
Evas_List *style_list;
/* Current data */
char *cur_font;
char *cur_style;
double cur_size;
int cur_enabled;
int cur_index;
@ -110,6 +119,7 @@ struct _E_Config_Dialog_Data
/* Font Classes */
Evas_Object *class_list;
Evas_Object *font_list;
Evas_Object *style_list;
Evas_Object *font;
Evas_Object *size;
@ -167,17 +177,20 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (text_class_predefined_names[i].class_name)
{
/* Search manually because we dont want to fallback */
for (next = font_list; next ; next = next->next)
{
efd = next->data;
if (!strcmp(tc->class_name, efd->text_class))
{
if (efd->font)
tc->font = evas_stringshare_add(efd->font);
else
tc->font = evas_stringshare_add("");
if (efd->font)
{
E_Font_Properties *efp;
efp = e_font_fontconfig_name_parse(efd->font);
tc->font = evas_stringshare_add(efp->name);
if (efp->styles) tc->style = efp->styles->data;
}
tc->size = efd->size;
tc->enabled = 1;
}
@ -185,24 +198,27 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (!tc->enabled)
{
/* search with default fallbacks */
efd = e_font_default_get(tc->class_name);
if (efd)
{
if (efd->font)
tc->font = evas_stringshare_add(efd->font);
else
tc->font = evas_stringshare_add("");
if (efd->font)
{
E_Font_Properties *efp;
efp = e_font_fontconfig_name_parse(efd->font);
tc->font = evas_stringshare_add(efp->name);
if (efp->styles) tc->style = efp->styles->data;
}
tc->size = efd->size;
}
else
tc->font = evas_stringshare_add("");
}
}
/* Append the class */
cfdata->text_classes = evas_list_append(cfdata->text_classes, tc);
}
/* Fill Hinting */
cfdata->hinting = e_config->font_hinting;
return;
@ -231,6 +247,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
tc = l->data;
cfdata->text_classes = evas_list_remove_list(cfdata->text_classes, l);
if (tc->font) evas_stringshare_del(tc->font);
if (tc->style) evas_stringshare_del(tc->style);
E_FREE(tc);
}
@ -252,6 +269,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
tc->size = cfdata->cur_size;
if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font);
if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style);
}
for (next = cfdata->text_classes; next; next = next->next)
@ -261,7 +280,13 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (!tc->class_name) continue;
if (tc->enabled && tc->font)
e_font_default_set(tc->class_name, tc->font, tc->size);
{
const char *name;
name = e_font_fontconfig_name_get(tc->font, tc->style);
e_font_default_set(tc->class_name, name, tc->size);
printf("Adding: %s = %s\n", tc->class_name, name);
evas_stringshare_del(name);
}
else
e_font_default_remove(tc->class_name);
}
@ -271,6 +296,19 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
return 1;
}
static Evas_Bool
_font_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
E_Config_Dialog_Data *cfdata;
E_Font_Properties *efp;
cfdata = fdata;
efp = data;
cfdata->font_list = evas_list_append(cfdata->font_list, efp->name);
return 1;
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
@ -282,13 +320,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.font = NULL;
o = e_widget_list_add(evas, 0, 0);
ot = e_widget_table_add(evas, 0);
ot = e_widget_table_add(evas, 1);
/* Create Font Class Widgets */
of = e_widget_framelist_add(evas, _("Font Classes"), 0);
cfdata->gui.class_list = e_widget_ilist_add(evas, 16, 16, NULL);
e_widget_ilist_multi_select_set(cfdata->gui.class_list, 1);
e_widget_min_size_set(cfdata->gui.class_list, 100, 250);
e_widget_min_size_set(cfdata->gui.class_list, 80, 250);
e_widget_on_change_hook_set(cfdata->gui.class_list, _ilist_font_cb_change, cfdata);
_fill_ilist(cfdata);
e_widget_framelist_object_append(of, cfdata->gui.class_list);
@ -297,7 +335,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ott = e_widget_table_add(evas, 0);
cfdata->gui.enabled = e_widget_check_add(evas, _("Enable Font Class"), &(cfdata->cur_enabled));
e_widget_disabled_set(cfdata->gui.enabled, 1);
e_widget_table_object_append(ott, cfdata->gui.enabled, 0, 0, 2, 1, 1, 0, 1, 0);
e_widget_table_object_append(ott, cfdata->gui.enabled, 0, 0, 3, 1, 1, 0, 1, 0);
e_widget_on_change_hook_set(cfdata->gui.enabled, _enabled_font_cb_change, cfdata);
ob = e_widget_label_add(evas, _("Font Size:"));
@ -305,26 +343,30 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
cfdata->gui.size = e_widget_slider_add(evas, 1, 0, _("%2.1f pixels"), 5.0, 25.0, 0.5, 0, &(cfdata->cur_size), NULL, 25);
e_widget_disabled_set(cfdata->gui.size, 1);
e_widget_min_size_set(cfdata->gui.size, 180, 25);
e_widget_min_size_set(cfdata->gui.size, 80, 25);
e_widget_on_change_hook_set(cfdata->gui.size, _size_cb_change, cfdata);
e_widget_table_object_append(ott, cfdata->gui.size,
1, 1, 1, 1, 1, 0, 1, 0);
1, 1, 2, 1, 1, 0, 1, 0);
e_widget_table_object_append(ot, ott,
1, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Fonts"), 0);
1, 0, 2, 1, 1, 1, 1, 1);
/* Font List */
of = e_widget_framelist_add(evas, _("Fonts"), 1);
cfdata->gui.font_list = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_font));
e_widget_on_change_hook_set(cfdata->gui.font_list, _font_cb_change, cfdata);
evas_event_freeze(evas_object_evas_get(cfdata->gui.font_list));
edje_freeze();
e_widget_ilist_freeze(cfdata->gui.font_list);
for (fonts = evas_font_available_list(evas); fonts; fonts = fonts->next)
if (cfdata->font_hash == NULL)
{
char *f;
f = fonts->data;
l = evas_list_append(l, strdup(f));
fonts = evas_font_available_list(evas);
cfdata->font_hash = e_font_available_list_parse(fonts);
evas_hash_foreach(cfdata->font_hash, _font_hash_cb, cfdata);
evas_font_available_list_free(evas, fonts);
}
l = cfdata->font_list;
if (l)
{
l = evas_list_sort(l, evas_list_count(l), _sort_fonts);
@ -336,15 +378,24 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_ilist_append(cfdata->gui.font_list, NULL, f, NULL, NULL, f);
}
}
evas_font_available_list_free(evas, fonts);
e_widget_ilist_go(cfdata->gui.font_list);
e_widget_min_size_set(cfdata->gui.font_list, 100, 200);
e_widget_min_size_set(cfdata->gui.font_list, 75, 200);
e_widget_ilist_thaw(cfdata->gui.font_list);
edje_thaw();
evas_event_thaw(evas_object_evas_get(cfdata->gui.font_list));
e_widget_framelist_object_append(of, cfdata->gui.font_list);
e_widget_table_object_append(ot, of, 1, 1, 2, 4, 1, 1, 1, 1);
e_widget_table_object_append(ot, of, 1, 1, 1, 4, 1, 1, 1, 1);
/* Empty Style List */
of = e_widget_framelist_add(evas, _("Styles"), 1);
cfdata->gui.style_list = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_style));
e_widget_on_change_hook_set(cfdata->gui.style_list, _style_cb_change, cfdata);
e_widget_ilist_go(cfdata->gui.style_list);
e_widget_min_size_set(cfdata->gui.style_list, 75, 200);
e_widget_framelist_object_append(of, cfdata->gui.style_list);
e_widget_table_object_append(ot, of, 2, 1, 1, 4, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5);
return o;
@ -559,6 +610,7 @@ _ilist_font_cb_change(void *data, Evas_Object *obj)
cfdata = data;
if (!cfdata) return;
/* Save Current */
if (cfdata->cur_index >= 0)
{
tc = evas_list_nth(cfdata->text_classes, cfdata->cur_index);
@ -567,6 +619,11 @@ _ilist_font_cb_change(void *data, Evas_Object *obj)
if (tc->font) evas_stringshare_del(tc->font);
if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font);
if (tc->style) evas_stringshare_del(tc->style);
if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style);
if (cfdata->gui.style_list)
e_widget_ilist_unselect(cfdata->gui.style_list);
}
indx = e_widget_ilist_selected_get(cfdata->gui.class_list);
@ -588,6 +645,9 @@ _ilist_font_cb_change(void *data, Evas_Object *obj)
e_widget_disabled_set(cfdata->gui.font, !tc->enabled);
e_widget_disabled_set(cfdata->gui.size, !tc->enabled);
e_widget_check_checked_set(cfdata->gui.enabled, tc->enabled);
if (tc) printf("Trying to setup f:%s, s:%s\n", tc->font, tc->style);
/* Basic GUI Parts */
if (cfdata->gui.font_list)
{
for (indx = 0; indx < e_widget_ilist_count(cfdata->gui.font_list); indx++)
@ -595,14 +655,14 @@ _ilist_font_cb_change(void *data, Evas_Object *obj)
const char *f;
f = e_widget_ilist_nth_label_get(cfdata->gui.font_list, indx);
if (!strcmp(f, tc->font))
if (tc->font && !strcasecmp(f, tc->font))
{
e_widget_ilist_selected_set(cfdata->gui.font_list, indx);
break;
}
}
}
/* Advanced GUI */
if (cfdata->gui.font)
e_widget_entry_text_set(cfdata->gui.font, tc->font);
e_widget_slider_value_double_set(cfdata->gui.size, tc->size);
@ -619,7 +679,8 @@ _enabled_font_cb_change(void *data, Evas_Object *obj)
if (!cfdata) return;
e_widget_disabled_set(cfdata->gui.font, !cfdata->cur_enabled);
e_widget_disabled_set(cfdata->gui.size, !cfdata->cur_enabled);
/* Search class list fot selected and enable Icon */
for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++)
{
E_Ilist_Item *i;
@ -673,17 +734,19 @@ static void
_font_cb_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
CFText_Class *tc;
Evas_List *l;
int n;
tc = NULL;
cfdata = data;
if (!cfdata) return;
/* Set up the new font name */
for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++)
{
E_Ilist_Item *i;
CFText_Class *tc;
i = l->data;
if (!i) continue;
if (!i->selected) continue;
@ -692,6 +755,82 @@ _font_cb_change(void *data, Evas_Object *obj)
if (tc->font) evas_stringshare_del(tc->font);
if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font);
printf("Current Font %s\n", cfdata->cur_font);
}
printf("Changed Font\n");
/* Load the style list */
if (cfdata->cur_font)
{
E_Font_Properties *efp;
Evas_List *next;
efp = evas_hash_find(cfdata->font_hash, cfdata->cur_font);
evas_event_freeze(evas_object_evas_get(cfdata->gui.style_list));
edje_freeze();
e_widget_ilist_freeze(cfdata->gui.style_list);
e_widget_ilist_clear(cfdata->gui.style_list);
for (next = efp->styles; next; next = next->next)
{
const char *style;
style = next->data;
e_widget_ilist_append(cfdata->gui.style_list, NULL, style, NULL, NULL, style);
}
e_widget_ilist_go(cfdata->gui.style_list);
e_widget_ilist_thaw(cfdata->gui.style_list);
edje_thaw();
evas_event_thaw(evas_object_evas_get(cfdata->gui.style_list));
}
printf("Trying to change style!\n");
if (tc && tc->style)
{
printf("Changing style %s\n", tc->style);
for (n = 0; n < e_widget_ilist_count(cfdata->gui.style_list); n++)
{
const char *f;
f = e_widget_ilist_nth_label_get(cfdata->gui.style_list, n);
if (!strcasecmp(f, tc->style))
{
e_widget_ilist_selected_set(cfdata->gui.style_list, n);
break;
}
}
}
}
static void
_style_cb_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
Evas_List *l;
int n;
cfdata = data;
if (!cfdata) return;
/* Setup the new style name */
for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++)
{
E_Ilist_Item *i;
CFText_Class *tc;
i = l->data;
if (!i) continue;
if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n);
if (tc->style) evas_stringshare_del(tc->style);
if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style);
printf("Cur style %s\n", cfdata->cur_style);
}
}

2
src/bin/e_widget_ilist.c
Unescape View File

@ -115,6 +115,8 @@ e_widget_ilist_unselect(Evas_Object *obj)
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
if (*(wd->value)) free(*(wd->value));
*(wd->value) = NULL;
e_ilist_unselect(wd->o_ilist);
}

Write Preview
Loading…
Cancel
Save