Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Input text masking #12

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Input text masking #12

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a22729
masking working
kevinmartinjos Mar 4, 2015
8bb9f3e
masking and inscript working - commit corresponding to another commit…
kevinmartinjos Mar 7, 2015
32acc39
changing orientation to horizontal
kevinmartinjos Mar 10, 2015
f2d762c
adding num key navigation
kevinmartinjos Mar 10, 2015
a65bf47
showing malayalam letters when pressing backspace
kevinmartinjos Mar 25, 2015
b2b577e
Merge remote-tracking branch 'upstream/master' into development
kevinmartinjos Mar 25, 2015
44446da
Merge branch 'master' into development
kevinmartinjos Apr 14, 2015
bcac8ca
Removed my code after merging navaneeths version of number navigation
kevinmartinjos Apr 14, 2015
a6e8f90
Refactored usage of get_word_breakers
kevinmartinjos Apr 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 73 additions & 8 deletions engine/engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct _IBusVarnamEngine {
GString *preedit;
gint cursor_pos;
IBusLookupTable *table;
char *breakerList;
};

struct _IBusVarnamEngineClass {
Expand All @@ -45,7 +46,7 @@ struct _IBusVarnamEngineClass {
/*static void ibus_varnam_engine_init (IBusVarnamEngine *engine);*/
static void ibus_varnam_engine_destroy (IBusVarnamEngine *engine);
static gboolean ibus_varnam_engine_process_key_event (IBusEngine *engine, guint keyval, guint keycode, guint modifiers);

static char* get_word_breakers();
/*[>static void ibus_varnam_engine_focus_in (IBusEngine *engine);<]*/
/*static void ibus_varnam_engine_focus_out (IBusEngine *engine);*/
/*static void ibus_varnam_engine_reset (IBusEngine *engine);*/
Expand Down Expand Up @@ -109,6 +110,7 @@ ibus_varnam_engine_init (IBusVarnamEngine *engine)
engine->preedit = g_string_new ("");
engine->cursor_pos = 0;
engine->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
engine->breakerList = get_word_breakers();
ibus_lookup_table_set_orientation (engine->table, IBUS_ORIENTATION_VERTICAL);
g_object_ref_sink (engine->table);

Expand Down Expand Up @@ -163,6 +165,34 @@ ibus_varnam_engine_update_lookup_table (IBusVarnamEngine *engine)
ibus_engine_update_lookup_table ((IBusEngine *) engine, engine->table, TRUE);
}

static void
ibus_varnam_engine_update_lookup_table_with_text(IBusVarnamEngine *engine, gchar *text){
varray *words;
vword *word;
int rc, i;

if (engine->preedit->len == 0) {
ibus_engine_hide_lookup_table ((IBusEngine *) engine);
return;
}

ibus_lookup_table_clear (engine->table);

rc = varnam_transliterate (handle, text, &words);
if (rc != VARNAM_SUCCESS) {
g_message ("Error transliterating: %s. %s\n", text, varnam_get_last_error (handle));
ibus_engine_hide_lookup_table ((IBusEngine *) engine);
return;
}

for (i = 0; i < varray_length (words); i++) {
word = varray_get (words, i);
ibus_lookup_table_append_candidate (engine->table, ibus_text_new_from_string (word->text));
}
ibus_lookup_table_append_candidate (engine->table, ibus_text_new_from_string (engine->preedit->str));
ibus_engine_update_lookup_table ((IBusEngine *) engine, engine->table, TRUE);
}

static void
ibus_varnam_engine_update_preedit (IBusVarnamEngine *engine)
{
Expand Down Expand Up @@ -238,12 +268,36 @@ ibus_varnam_engine_commit_candidate_at (IBusVarnamEngine *engine, guint index)

#define is_alpha(c) (((c) >= IBUS_a && (c) <= IBUS_z) || ((c) >= IBUS_A && (c) <= IBUS_Z))

static char*
get_word_breakers()
{
static char *breakerList=0;
int allocatedSize=1;

if(breakerList == 0)
{
breakerList = (char*)malloc(allocatedSize);
/*varnam_word_breakers calls realloc on breakerList if
memory allocated is too small*/
varnam_word_breakers(handle, breakerList, allocatedSize);
}

return breakerList;
}

static gboolean
is_word_break (guint keyval)
is_word_breaker (guint keyval, char *breakerList)
{
if (keyval == 46 || keyval == 44 || keyval == 63 || keyval == 33 || keyval == 40 || keyval == 41 || keyval == 34 || keyval == 59 || keyval == 39)
return TRUE;
return FALSE;

int i;

for(i=0; breakerList[i] != '\0'; i++)
{
if((int)breakerList[i] == keyval)
return true;
}

return false;
}

static gboolean
Expand All @@ -254,6 +308,7 @@ ibus_varnam_engine_process_key_event (IBusEngine *engine,
{
IBusText *text, *tmp;
IBusVarnamEngine *varnamEngine = (IBusVarnamEngine *) engine;
int ncandidates = 0;

if (modifiers & IBUS_RELEASE_MASK)
return FALSE;
Expand All @@ -267,6 +322,8 @@ ibus_varnam_engine_process_key_event (IBusEngine *engine,
return TRUE;
}

ncandidates = ibus_lookup_table_get_number_of_candidates(varnamEngine->table);

switch (keyval) {
case IBUS_space:
text = ibus_varnam_engine_get_candidate (varnamEngine);
Expand Down Expand Up @@ -337,6 +394,9 @@ ibus_varnam_engine_process_key_event (IBusEngine *engine,
g_string_erase (varnamEngine->preedit, varnamEngine->cursor_pos, 1);
ibus_varnam_engine_update_preedit (varnamEngine);
ibus_varnam_engine_update_lookup_table (varnamEngine);
text = ibus_varnam_engine_get_candidate (varnamEngine);
ibus_engine_hide_preedit_text((IBusEngine*)varnamEngine);
ibus_engine_update_preedit_text((IBusEngine*)varnamEngine, text, varnamEngine->cursor_pos, TRUE);
if (varnamEngine->preedit->len == 0) {
/* Current backspace has cleared the preedit. Need to reset the engine state */
ibus_varnam_engine_clear_state (varnamEngine);
Expand All @@ -353,6 +413,7 @@ ibus_varnam_engine_process_key_event (IBusEngine *engine,
ibus_varnam_engine_update_lookup_table (varnamEngine);
}
return TRUE;

case IBUS_1:
return ibus_varnam_engine_commit_candidate_at (varnamEngine, 0);
case IBUS_2:
Expand Down Expand Up @@ -392,7 +453,7 @@ ibus_varnam_engine_process_key_event (IBusEngine *engine,

}

if (is_word_break (keyval)) {
if (is_word_breaker (keyval, varnamEngine->breakerList)) {
text = ibus_varnam_engine_get_candidate (varnamEngine);
if (text != NULL) {
tmp = ibus_text_new_from_printf ("%s%c", ibus_text_get_text (text), keyval);
Expand All @@ -413,8 +474,12 @@ ibus_varnam_engine_process_key_event (IBusEngine *engine,
}
g_string_insert_c (varnamEngine->preedit, varnamEngine->cursor_pos, keyval);
varnamEngine->cursor_pos ++;
ibus_varnam_engine_update_preedit (varnamEngine);
ibus_varnam_engine_update_lookup_table (varnamEngine);
/*ibus_varnam_engine_update_preedit (varnamEngine);*/
/*ibus_varnam_engine_update_lookup_table (varnamEngine);*/
ibus_varnam_engine_update_lookup_table_with_text(varnamEngine, varnamEngine->preedit->str);
text = ibus_varnam_engine_get_candidate (varnamEngine);
ibus_engine_hide_preedit_text((IBusEngine*)varnamEngine);
ibus_engine_update_preedit_text((IBusEngine*)varnamEngine, text, varnamEngine->cursor_pos, TRUE);
return TRUE;
}

Expand Down