enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

complete unabirdged compose table/tree in terminology now. this should 

go to ecore i think.



SVN revision: 72952
This commit is contained in:
Carsten Haitzler 2012-06-27 15:27:59 +00:00
parent a7dce6cb45
commit b8190b75ca
5 changed files with 10030 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/Makefile.am
View File

@ -13,7 +13,7 @@ private.h \
col.c col.h \
config.c config.h \
controls.c controls.h \
keyin.c keyin.h \
keyin.c keyin.h keycomp.h \
main.c main.h \
media.c media.h \
options.c options.h \

9895
src/bin/keycomp.h Normal file
View File

File diff suppressed because it is too large Load Diff

50
src/bin/keyin.c
View File

@ -212,8 +212,6 @@ _key_try(Termpty *ty, const Keyout *map, Evas_Event_Key_Down *ev)
void
keyin_handle(Termpty *ty, Evas_Event_Key_Down *ev)
{
// XXX: handle Multi_Key composition. see:
// http://en.wikipedia.org/wiki/Compose_key
if (ty->state.crlf)
{
if (_key_try(ty, crlf_keyout, ev)) return;
@ -287,6 +285,50 @@ keyin_handle(Termpty *ty, Evas_Event_Key_Down *ev)
}
}
// http://en.wikipedia.org/wiki/Compose_key
// http://andrew.triumf.ca/iso8859-1-compose.html
// http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre
// isolate compose tree into its own file
#include "keycomp.h"
int
keyin_handle_compose(Termpty *ty, char **seq)
{
Comp *c, *cend;
const char *s;
int i = 0;
s = seq[i];
cend = (Comp *)comp + (sizeof(comp) / sizeof(comp[0]));
for (c = (Comp *)comp; c->s && s;)
{
// doesn't match -> jump to next level entry
if (!(!strcmp(s, c->s)))
{
c += c->jump + 1;
if (c >= cend) return 0;
}
else
{
cend = c + c->jump;
// advance to next sequence member
i++;
s = seq[i];
c++;
// if advanced item jump is an endpoint - it's the string we want
if (c->jump == 0)
{
termpty_write(ty, c->s, strlen(c->s));
return -1;
}
}
}
if (i > 0) return 1;
return 0;
}
/*
typedef struct _Compose Compose;
struct _Compose
@ -322,7 +364,7 @@ static Compose composes[] =
COM('\'', '\'', "´"),
COM('/', 'u', "µ"),
COM('p', '!', ""),
COM('.', '.', "·"),
COM('.', '.', "…"),
COM(',', ',', "¸"),
COM('^', '1', "¹"),
COM('_', 'o', "º"),
@ -395,6 +437,7 @@ static Compose composes[] =
COM('\'', 'y', "ý"),
COM('t', 'h', "þ"),
COM('"', 'y', "ÿ"),
COM(0, 0, "END")
};
@ -412,3 +455,4 @@ keyin_handle_compose(Termpty *ty, unsigned char c1, unsigned char c2)
}
}
}
*/

3
src/bin/keyin.h
View File

@ -1,2 +1,3 @@
void keyin_handle(Termpty *ty, Evas_Event_Key_Down *ev);
void keyin_handle_compose(Termpty *ty, unsigned char c1, unsigned char c2);
int keyin_handle_compose(Termpty *ty, char **seq);
//void keyin_handle_compose(Termpty *ty, unsigned char c1, unsigned char c2);

110
src/bin/termio.c
View File

@ -41,7 +41,7 @@ struct _Termio
} backup;
int scroll;
unsigned int last_keyup;
unsigned char compose[2];
char *compose[10]; // max 10 chars
Evas_Object *event;
Termpty *pty;
Ecore_Animator *anim;
@ -464,9 +464,12 @@ _smart_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
if (!((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
(evas_key_modifier_is_set(ev->modifiers, "Alt"))))
{
if (ecore_imf_context_filter_event
(sd->imf, ECORE_IMF_EVENT_KEY_DOWN, (Ecore_IMF_Event *)&imf_ev))
goto end;
if (!sd->composing)
{
if (ecore_imf_context_filter_event
(sd->imf, ECORE_IMF_EVENT_KEY_DOWN, (Ecore_IMF_Event *)&imf_ev))
goto end;
}
}
}
if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
@ -585,33 +588,80 @@ _smart_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
// timestamp as last one
if ((sd->pty->state.no_autorepeat) &&
(ev->timestamp == sd->last_keyup)) return;
if (!strcmp(ev->keyname, "Multi_key"))
if (!sd->composing)
{
sd->composing = EINA_TRUE;
sd->compose[0] = 0;
sd->compose[1] = 0;
return;
}
if (sd->composing)
{
if (ev->string)
int i;
for (i = 0; i < 10; i++)
{
if (!sd->compose[0])
if (sd->compose[i])
{
sd->compose[0] = ev->string[0];
return;
}
else if (!ev->compose[1])
{
sd->compose[1] = ev->string[0];
keyin_handle_compose(sd->pty,
sd->compose[0], sd->compose[1]);
sd->composing = EINA_FALSE;
goto end;
free(sd->compose[i]);
sd->compose[i] = NULL;
}
else break;
}
sd->compose[0] = strdup(ev->key);
sd->compose[1] = NULL;
if (keyin_handle_compose(sd->pty, sd->compose))
sd->composing = EINA_TRUE;
if (!sd->composing)
{
free(sd->compose[0]);
sd->compose[0] = NULL;
}
else
return;
{
goto end;
}
}
else
{
int status, i;
if (!strncmp(ev->key, "Shift", 5)) goto end;
if (!strncmp(ev->key, "Control", 7)) goto end;
if (!strncmp(ev->key, "Alt", 3)) goto end;
// if (!ev->string) goto end;
for (i = 0; i < 10; i++)
{
if (!sd->compose[i])
{
sd->compose[i] = strdup(ev->key);
sd->compose[i + 1] = NULL;
break;
}
}
status = keyin_handle_compose(sd->pty, sd->compose);
if (status == 0)
{
for (i = 0; i < 10; i++)
{
if (sd->compose[i])
{
free(sd->compose[i]);
sd->compose[i] = NULL;
}
else break;
}
sd->composing = 0;
}
else if (status == -1)
{
for (i = 0; i < 10; i++)
{
if (sd->compose[i])
{
free(sd->compose[i]);
sd->compose[i] = NULL;
}
else break;
}
sd->composing = 0;
goto end;
}
else
goto end;
}
keyin_handle(sd->pty, ev);
end:
@ -1401,6 +1451,7 @@ imf_done:
static void
_smart_del(Evas_Object *obj)
{
int i;
Termio *sd = evas_object_smart_data_get(obj);
if (!sd) return;
if (sd->imf)
@ -1418,6 +1469,15 @@ _smart_del(Evas_Object *obj)
if (sd->delayed_size_timer) ecore_timer_del(sd->delayed_size_timer);
if (sd->font.name) eina_stringshare_del(sd->font.name);
if (sd->pty) termpty_free(sd->pty);
for (i = 0; i < 10; i++)
{
if (sd->compose[i])
{
free(sd->compose[i]);
sd->compose[i] = NULL;
}
else break;
}
sd->cur.obj = NULL;
sd->event = NULL;
sd->cur.selo1 = NULL;