1 files changed, 99 insertions, 87 deletions

diff --git a/src/entry.c b/src/entry.c
index bf3db71..bf94cd4 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -1,19 +1,22 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
 /*
  * entry.c
  *
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021-2023 Logan Rathbone
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
@@ -21,98 +24,88 @@
  * Authors: Glynn Foster <glynn.foster@sun.com>
  */
 
-#include "config.h"
-
 #include "util.h"
 #include "zenity.h"
 
-static void zenity_entry_dialog_response (
-	GtkWidget *widget, int response, gpointer data);
+#include <config.h>
+
+static void zenity_entry_dialog_response (GtkWidget *widget, char *rstr, gpointer data);
 
 static GtkWidget *entry;
-static gint n_entries = 0;
+static int n_entries = 0;
 
 static void
-zenity_entry_fill_entries (GSList **entries, const gchar **args) {
-	gint i = 0;
-
-	while (args[i] != NULL) {
-		*entries = g_slist_append (*entries, (gchar *) args[i]);
-		i++;
+zenity_entry_fill_entries (GSList **entries, const char **args)
+{
+	for (int i = 0; args[i] != NULL; ++i)
+	{
+		*entries = g_slist_append (*entries, (char *)args[i]);
 	}
 }
 
 static void
-zenity_entry_combo_activate_default (GtkEntry *entry, gpointer window) {
-	gtk_window_activate_default (GTK_WINDOW (window));
+zenity_entry_combo_activate_default (GtkEntry *entry, gpointer window)
+{
+	g_signal_emit_by_name (window, "activate-default");
 }
 
 void
-zenity_entry (ZenityData *data, ZenityEntryData *entry_data) {
-	GtkBuilder *builder = NULL;
+zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
+{
+	g_autoptr(GtkBuilder) builder = NULL;
 	GtkWidget *dialog;
-	GtkWidget *button;
 	GObject *text;
 	GSList *entries = NULL;
 	GSList *tmp;
 	GObject *vbox;
 
-	builder = zenity_util_load_ui_file ("zenity_entry_dialog", NULL);
+	builder = zenity_util_load_ui_file ("zenity_entry_dialog", "zenity_entry_box", NULL);
 
-	if (builder == NULL) {
+	if (builder == NULL)
+	{
 		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
 		return;
 	}
 
-	gtk_builder_connect_signals (builder, NULL);
+	dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+				"zenity_entry_dialog"));
 
-	dialog =
-		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_entry_dialog"));
-
-	g_signal_connect (G_OBJECT (dialog),
-		"response",
-		G_CALLBACK (zenity_entry_dialog_response),
-		data);
+	g_signal_connect (dialog, "response", G_CALLBACK(zenity_entry_dialog_response), data);
 
 	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+		gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
 
-	zenity_util_set_window_icon (
-		dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-entry.png"));
+	gtk_window_set_icon_name (GTK_WINDOW(dialog),
+			"insert-text");
 
 	if (data->width > -1 || data->height > -1)
-		gtk_window_set_default_size (
-			GTK_WINDOW (dialog), data->width, data->height);
+		gtk_window_set_default_size (GTK_WINDOW (dialog),
+				data->width, data->height);
 
 	if (data->modal)
 		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-	if (data->extra_label) {
-		gint i = 0;
-		while (data->extra_label[i] != NULL) {
-			gtk_dialog_add_button (
-				GTK_DIALOG (dialog), data->extra_label[i], i);
-			i++;
-		}
+	if (data->extra_label)
+	{
+		ZENITY_UTIL_ADD_EXTRA_LABELS (dialog)
 	}
 
-	if (data->ok_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_entry_ok_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+	if (data->ok_label)
+	{
+		ZENITY_UTIL_SETUP_OK_BUTTON_LABEL (dialog);
 	}
 
-	if (data->cancel_label) {
-		button = GTK_WIDGET (
-			gtk_builder_get_object (builder, "zenity_entry_cancel_button"));
-		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	if (data->cancel_label)
+	{
+		ZENITY_UTIL_SETUP_CANCEL_BUTTON_LABEL (dialog);
 	}
 
 	text = gtk_builder_get_object (builder, "zenity_entry_text");
 
-	if (entry_data->dialog_text)
-		gtk_label_set_text_with_mnemonic (
-			GTK_LABEL (text), g_strcompress (entry_data->dialog_text));
+	if (entry_data->dialog_text) {
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (text),
+				g_strcompress (entry_data->dialog_text));
+	}
 
 	vbox = gtk_builder_get_object (builder, "vbox4");
 
@@ -120,78 +113,97 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data) {
 
 	n_entries = g_slist_length (entries);
 
-	if (n_entries > 1) {
+	if (n_entries > 1)
+	{
+		GtkWidget *child;
+
 		entry = gtk_combo_box_text_new_with_entry ();
+		child = gtk_combo_box_get_child (GTK_COMBO_BOX(entry));
 
-		for (tmp = entries; tmp; tmp = tmp->next) {
-			gtk_combo_box_text_append_text (
-				GTK_COMBO_BOX_TEXT (entry), tmp->data);
+		for (tmp = entries; tmp; tmp = tmp->next)
+		{
+			gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(entry),
+					tmp->data);
 		}
 
-		if (entry_data->entry_text) {
-			gtk_combo_box_text_prepend_text (
-				GTK_COMBO_BOX_TEXT (entry), entry_data->entry_text);
-			gtk_combo_box_set_active (GTK_COMBO_BOX (entry), 0);
+		if (entry_data->entry_text)
+		{
+			gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT(entry),
+					entry_data->entry_text);
+			gtk_combo_box_set_active (GTK_COMBO_BOX(entry), 0);
 		}
 
-		g_signal_connect (gtk_bin_get_child (GTK_BIN (entry)),
-			"activate",
+		g_signal_connect (child, "activate",
 			G_CALLBACK (zenity_entry_combo_activate_default),
 			GTK_WINDOW (dialog));
-	} else {
+	}
+	else
+	{
+		GtkEntryBuffer *buffer;
+
 		entry = gtk_entry_new ();
+		buffer = gtk_entry_get_buffer (GTK_ENTRY(entry));
 
-		gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+		gtk_entry_set_activates_default (GTK_ENTRY(entry), TRUE);
 
-		if (entry_data->entry_text)
-			gtk_entry_set_text (GTK_ENTRY (entry), entry_data->entry_text);
+		if (entry_data->entry_text) {
+			gtk_entry_buffer_set_text (buffer, entry_data->entry_text, -1);
+		}
 
-		if (entry_data->hide_text)
-			g_object_set (G_OBJECT (entry), "visibility", FALSE, NULL);
+		if (entry_data->hide_text) {
+			gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE);
+		}
 	}
 
-	gtk_widget_show (entry);
-
-	gtk_box_pack_end (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+	gtk_box_append (GTK_BOX(vbox), entry);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (text), entry);
 
-	g_object_unref (builder);
-
-	zenity_util_show_dialog (dialog, data->attach);
+	zenity_util_show_dialog (dialog);
 
 	if (data->timeout_delay > 0) {
 		g_timeout_add_seconds (data->timeout_delay,
 			(GSourceFunc) zenity_util_timeout_handle,
 			dialog);
 	}
-
-	gtk_main ();
+	zenity_util_gapp_main (GTK_WINDOW(dialog));
 }
 
 static void
-zenity_entry_dialog_output (void) {
-	const gchar *text;
+zenity_entry_dialog_output (void)
+{
+	const char *text;
+
 	if (n_entries > 1)
-		text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (entry));
+	{
+		text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(entry));
+	}
 	else
-		text = gtk_entry_get_text (GTK_ENTRY (entry));
+	{
+		GtkEntryBuffer *buffer;
+
+		buffer = gtk_entry_get_buffer (GTK_ENTRY(entry));
+		text = gtk_entry_buffer_get_text (buffer);
+	}
 
 	if (text != NULL)
 		g_print ("%s\n", text);
 }
 
 static void
-zenity_entry_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_entry_dialog_response (GtkWidget *widget, char *rstr, gpointer data)
+{
 	ZenityData *zen_data = data;
+	ZenityExitCode response = zenity_util_parse_dialog_response (rstr);
 
-	switch (response) {
-		case GTK_RESPONSE_OK:
+	switch (response)
+	{
+		case ZENITY_OK:
 			zenity_entry_dialog_output ();
 			zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
 			break;
 
-		case GTK_RESPONSE_CANCEL:
+		case ZENITY_CANCEL:
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
 			break;
 
@@ -202,10 +214,10 @@ zenity_entry_dialog_response (GtkWidget *widget, int response, gpointer data) {
 
 		default:
 			if (zen_data->extra_label &&
-				response < g_strv_length (zen_data->extra_label))
+				response < (int)g_strv_length (zen_data->extra_label))
 				printf ("%s\n", zen_data->extra_label[response]);
 			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
 			break;
 	}
-	gtk_main_quit ();
+	zenity_util_gapp_quit (GTK_WINDOW(widget), zen_data);
 }