2 files changed, 82 insertions, 4 deletions

diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 41690010..3bf81f9a 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -12,7 +12,10 @@ static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 {
 	AV *av;
+	HV *hv_;
 	GSList *tmp;
+	GHashTableIter iter;
+	gpointer key_, val_;
 
 	perl_irc_connect_fill_hash(hv, server->connrec);
 	perl_server_fill_hash(hv, (SERVER_REC *) server);
@@ -34,10 +37,16 @@ static void perl_irc_server_fill_hash(HV *hv, IRC_SERVER_REC *server)
 	(void) hv_store(hv, "cap_complete", 12, newSViv(server->cap_complete), 0);
 	(void) hv_store(hv, "sasl_success", 12, newSViv(server->sasl_success), 0);
 
-	av = newAV();
-	for (tmp = server->cap_supported; tmp != NULL; tmp = tmp->next)
-		av_push(av, new_pv(tmp->data));
-	(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)av), 0);
+	if (server->cap_supported != NULL) {
+		hv_ = newHV();
+		g_hash_table_iter_init(&iter, server->cap_supported);
+		while (g_hash_table_iter_next(&iter, &key_, &val_)) {
+			char *key = (char *)key_;
+			char *val = (char *)val_;
+			hv_store(hv_, key, strlen(key), new_pv(val), 0);
+		}
+		(void) hv_store(hv, "cap_supported", 13, newRV_noinc((SV*)hv_), 0);
+	}
 
 	av = newAV();
 	for (tmp = server->cap_active; tmp != NULL; tmp = tmp->next)
diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs
index 5d2c8a7f..e2f162a0 100644
--- a/src/perl/textui/TextUI.xs
+++ b/src/perl/textui/TextUI.xs
@@ -40,6 +40,7 @@ static void perl_text_buffer_view_fill_hash(HV *hv, TEXT_BUFFER_VIEW_REC *view)
 
 	(void) hv_store(hv, "startline", 9, plain_bless(view->startline, "Irssi::TextUI::Line"), 0);
 	(void) hv_store(hv, "subline", 7, newSViv(view->subline), 0);
+	(void) hv_store(hv, "hidden_level", 12, newSViv(view->hidden_level), 0);
 
 	(void) hv_store(hv, "bottom_startline", 16, plain_bless(view->bottom_startline, "Irssi::TextUI::Line"), 0);
 	(void) hv_store(hv, "bottom_subline", 14, newSViv(view->bottom_subline), 0);
@@ -123,6 +124,74 @@ gui_input_set(str)
 CODE:
 	gui_entry_set_text(active_entry, str);
 
+void
+gui_input_set_extent(pos, text)
+	int pos
+	char *text
+PREINIT:
+	char *tt;
+CODE:
+	tt = text != NULL ? format_string_expand(text, NULL) : NULL;
+	gui_entry_set_extent(active_entry, pos, tt);
+	g_free(tt);
+
+void
+gui_input_set_extents(pos, len, left, right)
+	int pos
+	int len
+	char *left
+	char *right
+PREINIT:
+	char *tl;
+	char *tr;
+CODE:
+	tl = left != NULL ? format_string_expand(left, NULL) : NULL;
+	tr = right != NULL ? format_string_expand(right, NULL) : NULL;
+	gui_entry_set_extents(active_entry, pos, len, tl, tr);
+	g_free(tl);
+	g_free(tr);
+
+void
+gui_input_clear_extents(pos, len = 0)
+	int pos
+	int len
+CODE:
+	gui_entry_clear_extents(active_entry, pos, len);
+
+void
+gui_input_get_extent(pos)
+	int pos
+PREINIT:
+	char *ret;
+PPCODE:
+	ret = gui_entry_get_extent(active_entry, pos);
+	XPUSHs(sv_2mortal(new_pv(ret)));
+	g_free(ret);
+
+void
+gui_input_get_text_and_extents()
+PREINIT:
+	GSList *ret, *tmp;
+PPCODE:
+	ret = gui_entry_get_text_and_extents(active_entry);
+	for (tmp = ret; tmp != NULL; tmp = tmp->next) {
+		XPUSHs(sv_2mortal(new_pv(tmp->data)));
+	}
+	g_slist_free_full(ret, g_free);
+
+void
+gui_input_set_text_and_extents(...)
+PREINIT:
+	GSList *list;
+	int i;
+PPCODE:
+	list = NULL;
+	for (i = items; i > 0; i--) {
+		list = g_slist_prepend(list, SvPV_nolen(ST(i-1)));
+	}
+	gui_entry_set_text_and_extents(active_entry, list);
+	g_slist_free(list);
+
 int
 gui_input_get_pos()
 CODE: