Mercurial > pidgin.yaz
view console/libgnt/gntmarshal.c @ 14419:b50aa149e09d
[gaim-migrate @ 17127]
This fixes titles containing double-column wide characters for me.
Editing of double-column characters in gntentry remains a bit
bustinated (though it is my recollection that it worked at one time).
This additionally does not require wcwidth() and its attendant
funkiness.
The version of gnt_util_onscreen_width_to_pointer in this commit
*appears* to do what the extant version was supposed to do, though I'm
not sure I grokked it fully; it does correct the rendering glitches
for me. I'm not at all comfortable with the de-constification of the
input string and attendant return of the de-constified pointer.
Sadrul will have to let me know what is supposed to happen there.
Output on non-UTF-8 terminals is not correct, but was not correct
before, either.
committer: Tailor Script <tailor@pidgin.im>
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Sat, 02 Sep 2006 16:55:32 +0000 |
parents | 0387a167f342 |
children | 52022b0a9405 |
line wrap: on
line source
#include "gntmarshal.h" void gnt_closure_marshal_BOOLEAN__STRING(GClosure *closure, GValue *ret_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*func) (gpointer data1, const char *arg1, gpointer data2); register func callback; register GCClosure *cc = (GCClosure*)closure; register gpointer data1, data2; gboolean ret; g_return_if_fail(ret_value != NULL); g_return_if_fail(n_param_values == 2); if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; data2 = g_value_peek_pointer(param_values + 0); } else { data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (func) (marshal_data ? marshal_data : cc->callback); ret = callback(data1, g_value_get_string(param_values + 1) , data2); g_value_set_boolean(ret_value, ret); } void gnt_closure_marshal_VOID__INT_INT_INT_INT(GClosure *closure, GValue *ret_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*func) (gpointer data1, int, int, int, int, gpointer data2); register func callback; register GCClosure *cc = (GCClosure*)closure; register gpointer data1, data2; g_return_if_fail(n_param_values == 5); if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; data2 = g_value_peek_pointer(param_values + 0); } else { data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (func) (marshal_data ? marshal_data : cc->callback); callback(data1, g_value_get_int(param_values + 1) , g_value_get_int(param_values + 2) , g_value_get_int(param_values + 3) , g_value_get_int(param_values + 4) , data2); } void gnt_closure_marshal_VOID__INT_INT(GClosure *closure, GValue *ret_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*func) (gpointer data1, int, int, gpointer data2); register func callback; register GCClosure *cc = (GCClosure*)closure; register gpointer data1, data2; g_return_if_fail(n_param_values == 3); if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; data2 = g_value_peek_pointer(param_values + 0); } else { data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (func) (marshal_data ? marshal_data : cc->callback); callback(data1, g_value_get_int(param_values + 1) , g_value_get_int(param_values + 2) , data2); } void gnt_closure_marshal_VOID__POINTER_POINTER(GClosure *closure, GValue *ret_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*func) (gpointer data1, gpointer, gpointer, gpointer data2); register func callback; register GCClosure *cc = (GCClosure*)closure; register gpointer data1, data2; g_return_if_fail(n_param_values == 3); if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; data2 = g_value_peek_pointer(param_values + 0); } else { data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (func) (marshal_data ? marshal_data : cc->callback); callback(data1, g_value_get_pointer(param_values + 1) , g_value_get_pointer(param_values + 2) , data2); } void gnt_closure_marshal_BOOLEAN__INT_INT(GClosure *closure, GValue *ret_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*func) (gpointer data1, int, int, gpointer data2); register func callback; register GCClosure *cc = (GCClosure*)closure; register gpointer data1, data2; gboolean ret; g_return_if_fail(ret_value != NULL); g_return_if_fail(n_param_values == 3); if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; data2 = g_value_peek_pointer(param_values + 0); } else { data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (func) (marshal_data ? marshal_data : cc->callback); ret = callback(data1, g_value_get_int(param_values + 1) , g_value_get_int(param_values + 2) , data2); g_value_set_boolean(ret_value, ret); } void gnt_closure_marshal_BOOLEAN__INT_INT_INT(GClosure *closure, GValue *ret_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*func) (gpointer data1, int, int, int, gpointer data2); register func callback; register GCClosure *cc = (GCClosure*)closure; register gpointer data1, data2; gboolean ret; g_return_if_fail(ret_value != NULL); g_return_if_fail(n_param_values == 4); if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; data2 = g_value_peek_pointer(param_values + 0); } else { data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (func) (marshal_data ? marshal_data : cc->callback); ret = callback(data1, g_value_get_int(param_values + 1) , g_value_get_int(param_values + 2) , g_value_get_int(param_values + 3) , data2); g_value_set_boolean(ret_value, ret); }