[zenity/gtk4-port: 5/25] Make remaining C files build against gtk4
- From: Logan Rathbone <larathbone src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [zenity/gtk4-port: 5/25] Make remaining C files build against gtk4
- Date: Tue, 29 Jun 2021 02:19:12 +0000 (UTC)
commit 6e6dbce3eefbaadca62bd09b1375b91f75689852
Author: Logan Rathbone <poprocks gmail com>
Date: Thu Feb 11 15:12:35 2021 -0500
Make remaining C files build against gtk4
Next step: the app doesn't run because the .UI file contains
incompatibilities with gtk4 after conversion.
src/main.c | 65 +++++---
src/password.c | 165 ++++++++++----------
src/progress.c | 300 +++++++++++++++++++++----------------
src/scale.c | 121 ++++++++-------
src/text.c | 215 +++++++++++++++-----------
src/tree.c | 464 +++++++++++++++++++++++++++++++++------------------------
src/util.c | 3 +-
src/zenity.h | 19 +--
8 files changed, 773 insertions(+), 579 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index 7f0c2db7..a211e15f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,111 +1,130 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
/*
* main.c
*
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021 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.
*
- * Authors: Glynn Foster <glynn foster sun com>
+ * Original Author: Glynn Foster <glynn foster sun com>
*/
-#include <config.h>
-
#include "option.h"
#include "zenity.h"
-#include <glib.h>
#include <gtk/gtk.h>
-#include <langinfo.h>
-#include <stdlib.h>
-#ifdef HAVE_LOCALE_H
#include <locale.h>
-#endif
+#include <stdlib.h>
-gint
-main (gint argc, gchar **argv) {
+#include <config.h>
+
+
+int
+main (int argc, char *argv[])
+{
ZenityParsingOptions *results;
- gint retval;
+ int retval;
-#ifdef HAVE_LOCALE_H
+ /* boilerplate i18n stuff */
setlocale (LC_ALL, "");
-#endif
-
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
+ /* </i18n> */
- gtk_init (&argc, &argv);
+ // FIXME - may not be needed at all with the way I've factored util.c.
+ // But may need to replace this with gapplication here instead, depending.
+// gtk_init (&argc, &argv);
results = zenity_option_parse (argc, argv);
- switch (results->mode) {
+ switch (results->mode)
+ {
case MODE_CALENDAR:
zenity_calendar (results->data, results->calendar_data);
break;
+
case MODE_ENTRY:
- results->entry_data->data = (const gchar **) argv + 1;
+ results->entry_data->data = (const char **) argv + 1;
zenity_entry (results->data, results->entry_data);
break;
+
case MODE_ERROR:
case MODE_QUESTION:
case MODE_WARNING:
case MODE_INFO:
zenity_msg (results->data, results->msg_data);
break;
+
case MODE_SCALE:
zenity_scale (results->data, results->scale_data);
break;
+
case MODE_FILE:
zenity_fileselection (results->data, results->file_data);
break;
+
case MODE_LIST:
- results->tree_data->data = (const gchar **) argv + 1;
+ results->tree_data->data = (const char **) argv + 1;
zenity_tree (results->data, results->tree_data);
break;
+
#ifdef HAVE_LIBNOTIFY
case MODE_NOTIFICATION:
zenity_notification (results->data, results->notification_data);
break;
#endif
+
case MODE_PROGRESS:
zenity_progress (results->data, results->progress_data);
break;
+
case MODE_TEXTINFO:
zenity_text (results->data, results->text_data);
break;
+
case MODE_COLOR:
zenity_colorselection (results->data, results->color_data);
break;
+
case MODE_PASSWORD:
zenity_password_dialog (results->data, results->password_data);
break;
+
case MODE_ABOUT:
zenity_about (results->data);
break;
+
case MODE_FORMS:
zenity_forms_dialog (results->data, results->forms_data);
break;
+
case MODE_VERSION:
g_print ("%s\n", VERSION);
break;
+
case MODE_LAST:
g_printerr (_ ("You must specify a dialog type. See 'zenity "
"--help' for details\n"));
zenity_option_free ();
exit (-1);
+
default:
g_assert_not_reached ();
zenity_option_free ();
diff --git a/src/password.c b/src/password.c
index a5490d35..85866199 100644
--- a/src/password.c
+++ b/src/password.c
@@ -1,19 +1,22 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
/*
* password.c
*
- * Copyright (C) 2010 Arx Cruz
+ * Copyright © 2010 Arx Cruz
+ * Copyright © 2021 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., 121 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
@@ -21,140 +24,141 @@
* Authors: Arx Cruz <arxcruz gmail com>
*/
-#include "config.h"
#include "util.h"
#include "zenity.h"
+
#include <string.h>
+#include <config.h>
+
static ZenityData *zen_data;
-static void zenity_password_dialog_response (
- GtkWidget *widget, int response, gpointer data);
+static void zenity_password_dialog_response (GtkWidget *widget,
+ int response, gpointer data);
void
-zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data) {
+zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data)
+{
GtkWidget *dialog;
GtkWidget *image;
GtkWidget *hbox;
GtkWidget *vbox_labels;
GtkWidget *vbox_entries;
GtkWidget *label;
+ char *title_text;
zen_data = data;
dialog = gtk_dialog_new ();
- 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)
+ {
+ for (int i = 0; data->extra_label[i] != NULL; ++i)
+ {
+ gtk_dialog_add_button (GTK_DIALOG(dialog),
+ data->extra_label[i], i);
}
}
gtk_dialog_add_button (GTK_DIALOG (dialog),
- data->cancel_label != NULL ? data->cancel_label : _ ("_Cancel"),
+ data->cancel_label != NULL ? data->cancel_label : _("_Cancel"),
GTK_RESPONSE_CANCEL);
+
gtk_dialog_add_button (GTK_DIALOG (dialog),
- data->ok_label != NULL ? data->ok_label : _ ("_OK"),
+ data->ok_label != NULL ? data->ok_label : _("_OK"),
GTK_RESPONSE_OK);
- image =
- gtk_image_new_from_icon_name ("dialog-password", GTK_ICON_SIZE_DIALOG);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+ image = gtk_image_new_from_icon_name ("dialog-password");
+
+ gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 12);
+ gtk_box_append (GTK_BOX(hbox), image);
/* Checks if username has been passed as a parameter */
- gchar *title_text = _ ("Type your password");
-
if (password_data->username)
- title_text = _ ("Type your username and password");
+ title_text = _("Type your username and password");
+ else
+ title_text = _("Type your password");
label = gtk_label_new (title_text);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 12);
- gtk_box_pack_start (
- GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
- hbox,
- FALSE,
- TRUE,
- 5);
+ gtk_box_append (GTK_BOX(hbox), label);
+ gtk_box_append (GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dialog))),
+ hbox);
vbox_labels = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
vbox_entries = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start (
- GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
- hbox,
- FALSE,
- TRUE,
- 5);
-
- gtk_box_pack_start (GTK_BOX (hbox), vbox_labels, FALSE, TRUE, 12);
- gtk_box_pack_start (GTK_BOX (hbox), vbox_entries, TRUE, TRUE, 12);
-
- if (password_data->username) {
- label = gtk_label_new (_ ("Username:"));
- gtk_box_pack_start (GTK_BOX (vbox_labels), label, TRUE, FALSE, 12);
+ gtk_box_append (GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dialog))),
+ hbox);
+
+ gtk_box_append (GTK_BOX(hbox), vbox_labels);
+ gtk_box_append (GTK_BOX (hbox), vbox_entries);
+
+ if (password_data->username)
+ {
+ label = gtk_label_new (_("Username:"));
+ gtk_box_append (GTK_BOX(vbox_labels), label);
+
password_data->entry_username = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (vbox_entries),
- password_data->entry_username,
- TRUE,
- TRUE,
- 12);
+ gtk_box_append (GTK_BOX(vbox_entries),
+ password_data->entry_username);
}
- label = gtk_label_new (_ ("Password:"));
- gtk_box_pack_start (GTK_BOX (vbox_labels), label, TRUE, FALSE, 12);
+ label = gtk_label_new (_("Password:"));
+ gtk_box_append (GTK_BOX(vbox_labels), label);
password_data->entry_password = gtk_entry_new ();
- gtk_entry_set_visibility (GTK_ENTRY (password_data->entry_password), FALSE);
- gtk_entry_set_activates_default (
- GTK_ENTRY (password_data->entry_password), TRUE);
- gtk_box_pack_start (
- GTK_BOX (vbox_entries), password_data->entry_password, TRUE, TRUE, 12);
+ gtk_entry_set_visibility (GTK_ENTRY(password_data->entry_password), FALSE);
+ gtk_entry_set_input_purpose (GTK_ENTRY(password_data->entry_password),
+ GTK_INPUT_PURPOSE_PASSWORD);
+ gtk_entry_set_activates_default (GTK_ENTRY(password_data->entry_password),
+ TRUE);
+ gtk_box_append (GTK_BOX(vbox_entries), password_data->entry_password);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+ gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
if (data->modal)
- gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK(zenity_password_dialog_response), password_data);
- g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (zenity_password_dialog_response),
- password_data);
- gtk_widget_show_all (
- GTK_WIDGET (gtk_dialog_get_content_area (GTK_DIALOG (dialog))));
- zenity_util_show_dialog (dialog, data->attach);
+ zenity_util_show_dialog (dialog);
- if (data->timeout_delay > 0) {
+ 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_password_dialog_response (
- GtkWidget *widget, int response, gpointer data) {
- ZenityPasswordData *password_data = (ZenityPasswordData *) data;
- switch (response) {
+zenity_password_dialog_response (GtkWidget *widget, int response,
+ gpointer data)
+{
+ ZenityPasswordData *password_data = data;
+ GtkEntryBuffer *user_buff, *pass_buff;
+
+ user_buff = gtk_entry_get_buffer (GTK_ENTRY(password_data->entry_username));
+ pass_buff = gtk_entry_get_buffer (GTK_ENTRY(password_data->entry_password));
+
+ switch (response)
+ {
case GTK_RESPONSE_OK:
zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
- if (password_data->username)
+ if (password_data->username) {
g_print ("%s|%s\n",
- gtk_entry_get_text (
- GTK_ENTRY (password_data->entry_username)),
- gtk_entry_get_text (
- GTK_ENTRY (password_data->entry_password)));
- else
+ gtk_entry_buffer_get_text (user_buff),
+ gtk_entry_buffer_get_text (pass_buff));
+ }
+ else {
g_print ("%s\n",
- gtk_entry_get_text (
- GTK_ENTRY (password_data->entry_password)));
+ gtk_entry_buffer_get_text (pass_buff));
+ }
break;
case GTK_RESPONSE_CANCEL:
@@ -163,11 +167,10 @@ zenity_password_dialog_response (
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));
}
diff --git a/src/progress.c b/src/progress.c
index 00bb8aaa..69836c4b 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -1,30 +1,33 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
/*
* progress.c
*
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021 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.
*
- * Authors: Glynn Foster <glynn foster sun com>
+ * Original Author: Glynn Foster <glynn foster sun com>
*/
-#include "config.h"
#include "util.h"
#include "zenity.h"
+
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -33,11 +36,13 @@
#include <time.h>
#include <unistd.h>
+#include <config.h>
+
static GtkBuilder *builder;
static ZenityData *zen_data;
static GIOChannel *channel;
-static gint pulsate_timeout = -1;
+static int pulsate_timeout = -1;
static gboolean autokill;
static gboolean no_cancel;
static gboolean auto_close;
@@ -45,17 +50,20 @@ static gboolean auto_close;
gint zenity_progress_timeout (gpointer data);
gint zenity_progress_pulsate_timeout (gpointer data);
-static void zenity_progress_dialog_response (
- GtkWidget *widget, int response, gpointer data);
+static void zenity_progress_dialog_response (GtkWidget *widget,
+ int response, gpointer data);
static gboolean
-zenity_progress_pulsate_progress_bar (gpointer user_data) {
+zenity_progress_pulsate_progress_bar (gpointer user_data)
+{
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (user_data));
+
return TRUE;
}
static void
-zenity_progress_pulsate_stop (void) {
+zenity_progress_pulsate_stop (void)
+{
if (pulsate_timeout > 0) {
g_source_remove (pulsate_timeout);
pulsate_timeout = -1;
@@ -63,34 +71,40 @@ zenity_progress_pulsate_stop (void) {
}
static void
-zenity_progress_pulsate_start (GObject *progress_bar) {
+zenity_progress_pulsate_start (GObject *progress_bar)
+{
if (pulsate_timeout == -1) {
- pulsate_timeout = g_timeout_add (
- 100, zenity_progress_pulsate_progress_bar, progress_bar);
+ pulsate_timeout = g_timeout_add (100,
+ zenity_progress_pulsate_progress_bar, progress_bar);
}
}
static void
-zenity_progress_update_time_remaining (ZenityProgressData *progress_data) {
+zenity_progress_update_time_remaining (ZenityProgressData *progress_data)
+{
static GObject *progress_time = NULL;
static time_t start_time = (time_t) (-1);
float percentage = progress_data->percentage;
if (progress_time == NULL)
- progress_time =
- gtk_builder_get_object (builder, "zenity_progress_time");
+ progress_time = gtk_builder_get_object (builder,
+ "zenity_progress_time");
+
if (start_time == (time_t) (-1) || percentage <= 0.0 ||
- percentage >= 100.0) {
+ percentage >= 100.0)
+ {
start_time = time (NULL);
gtk_label_set_text (GTK_LABEL (progress_time), "");
- } else {
+ }
+ else
+ {
time_t current_time = time (NULL);
time_t elapsed_time = current_time - start_time;
time_t total_time =
(time_t) (100.0 * elapsed_time / progress_data->percentage);
time_t remaining_time = total_time - elapsed_time;
gulong hours, minutes, seconds;
- gchar *remaining_message;
+ char *remaining_message;
seconds = (gulong) (remaining_time % 60);
remaining_time /= 60;
@@ -98,26 +112,35 @@ zenity_progress_update_time_remaining (ZenityProgressData *progress_data) {
remaining_time /= 60;
hours = (gulong) remaining_time;
- remaining_message = g_strdup_printf (
- _ ("Time remaining: %lu:%02lu:%02lu"), hours, minutes, seconds);
+ remaining_message =
+ g_strdup_printf (_("Time remaining: %lu:%02lu:%02lu"),
+ hours, minutes, seconds);
gtk_label_set_text (GTK_LABEL (progress_time), remaining_message);
+
g_free (remaining_message);
}
}
static float
-stof(const char* s) {
+stof (const char *s)
+{
float rez = 0, fact = 1;
+
if (*s == '-') {
s++;
fact = -1;
}
- for (int point_seen = 0; *s; s++) {
+
+ for (int point_seen = 0; *s; s++)
+ {
+ int d;
+
if (*s == '.' || *s == ',') {
point_seen = 1;
continue;
}
- int d = *s - '0';
+
+ d = *s - '0';
if (d >= 0 && d <= 9) {
if (point_seen) fact /= 10.0f;
rez = rez * 10.0f + (float)d;
@@ -127,24 +150,24 @@ stof(const char* s) {
}
static gboolean
-zenity_progress_handle_stdin (
- GIOChannel *channel, GIOCondition condition, gpointer data) {
+zenity_progress_handle_stdin (GIOChannel *channel, GIOCondition condition,
+ gpointer data)
+{
static ZenityProgressData *progress_data;
static GObject *progress_bar;
static GObject *progress_label;
float percentage = 0.0;
GIOStatus status = G_IO_STATUS_NORMAL;
- progress_data = (ZenityProgressData *) data;
+ progress_data = data;
progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
progress_label = gtk_builder_get_object (builder, "zenity_progress_text");
- if ((condition & G_IO_IN) != 0) {
- GString *string;
+ if ((condition & G_IO_IN) != 0)
+ {
+ GString *string = g_string_new (NULL);
GError *error = NULL;
- string = g_string_new (NULL);
-
while (channel->is_readable != TRUE)
;
do {
@@ -152,23 +175,25 @@ zenity_progress_handle_stdin (
status = g_io_channel_read_line_string (
channel, string, NULL, &error);
- while (gtk_events_pending ())
- gtk_main_iteration ();
-
+ while (g_main_context_pending (NULL)) {
+ g_main_context_iteration (NULL, FALSE);
+ }
} while (status == G_IO_STATUS_AGAIN);
- if (status != G_IO_STATUS_NORMAL) {
+ if (status != G_IO_STATUS_NORMAL)
+ {
if (error) {
- g_warning (
- "zenity_progress_handle_stdin () : %s", error->message);
+ g_warning ("%s: %s",
+ __func__, error->message);
g_error_free (error);
error = NULL;
}
continue;
}
- if (!g_ascii_strncasecmp (string->str, "#", 1)) {
- gchar *match;
+ if (! g_ascii_strncasecmp (string->str, "#", 1))
+ {
+ char *match;
/* We have a comment, so let's try to change the label */
match = g_strstr_len (string->str, strlen (string->str), "#");
@@ -176,8 +201,10 @@ zenity_progress_handle_stdin (
gtk_label_set_text (GTK_LABEL (progress_label),
g_strcompress (g_strchomp (g_strchug (match))));
- } else if (g_str_has_prefix (string->str, "pulsate")) {
- gchar *colon, *command, *value;
+ }
+ else if (g_str_has_prefix (string->str, "pulsate"))
+ {
+ char *colon, *command, *value;
zenity_util_strip_newline (string->str);
@@ -194,45 +221,50 @@ zenity_progress_handle_stdin (
while (*value && g_ascii_isspace (*value))
value++;
- if (!g_ascii_strcasecmp (value, "false")) {
+ if (! g_ascii_strcasecmp (value, "false"))
+ {
zenity_progress_pulsate_stop ();
- gtk_progress_bar_set_fraction (
- GTK_PROGRESS_BAR (progress_bar),
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress_bar),
progress_data->percentage / 100.0);
- } else {
+ }
+ else {
zenity_progress_pulsate_start (progress_bar);
}
g_free (command);
- } else {
-
- if (!g_ascii_isdigit (*(string->str)))
+ }
+ else
+ {
+ if (! g_ascii_isdigit (*(string->str)))
continue;
/* Now try to convert the thing to a number */
percentage = CLAMP (stof (string->str), 0, 100);
- gtk_progress_bar_set_fraction (
- GTK_PROGRESS_BAR (progress_bar), percentage / 100.0);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress_bar),
+ percentage / 100.0);
progress_data->percentage = percentage;
if (progress_data->time_remaining == TRUE)
zenity_progress_update_time_remaining (progress_data);
- if (percentage == 100) {
+ if (percentage == 100)
+ {
GObject *button;
- button = gtk_builder_get_object (
- builder, "zenity_progress_ok_button");
+ button = gtk_builder_get_object (builder,
+ "zenity_progress_ok_button");
gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
gtk_widget_grab_focus (GTK_WIDGET (button));
if (progress_data->autoclose) {
zen_data->exit_code =
zenity_util_return_exit_code (ZENITY_OK);
- gtk_main_quit ();
+ // FIXME - don't know how to replace gtk_main_quit
+ // here.
+ exit(zen_data->exit_code);
}
}
}
@@ -243,21 +275,21 @@ zenity_progress_handle_stdin (
g_string_free (string, TRUE);
}
- if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+ if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF)
+ {
/* We assume that we are done, so stop the pulsating and de-sensitize
* the buttons */
GtkWidget *button;
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_progress_ok_button"));
+ button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_progress_ok_button"));
gtk_widget_set_sensitive (button, TRUE);
gtk_widget_grab_focus (button);
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_progress_cancel_button"));
+ button = GTK_WIDGET (gtk_builder_get_object (builder,
+ "zenity_progress_cancel_button"));
gtk_widget_set_sensitive (button, FALSE);
-
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 1.0);
zenity_progress_pulsate_stop ();
@@ -266,7 +298,8 @@ zenity_progress_handle_stdin (
if (progress_data->autoclose) {
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
- gtk_main_quit ();
+ // FIXME - not sure how to replace gtk_main_quit here
+ exit(zen_data->exit_code);
}
g_io_channel_shutdown (channel, TRUE, NULL);
@@ -276,7 +309,8 @@ zenity_progress_handle_stdin (
}
static void
-zenity_progress_read_info (ZenityProgressData *progress_data) {
+zenity_progress_read_info (ZenityProgressData *progress_data)
+{
channel = g_io_channel_unix_new (0);
g_io_channel_set_encoding (channel, NULL, NULL);
g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
@@ -287,21 +321,30 @@ zenity_progress_read_info (ZenityProgressData *progress_data) {
/* We need to check the pulsate state here, because, the g_io_add_watch
doesn't call the zenity_progress_handle_stdin function if there's no
input. This fix the Bug 567663 */
- if (progress_data->pulsate) {
+ if (progress_data->pulsate)
+ {
GObject *progress_bar =
gtk_builder_get_object (builder, "zenity_progress_bar");
+
zenity_progress_pulsate_start (progress_bar);
}
}
+// FIXME - I don't have context as to what this is supposed to accomplish,
+// and it uses signals that are gone in gtk4, so I'm just going to remove
+// for now and see if necessary - if so will replace later.
+#if 0
static void
-zenity_text_size_allocate (
- GtkWidget *widget, GtkAllocation *allocation, gpointer data) {
+zenity_text_size_allocate (GtkWidget *widget, GtkAllocation *allocation,
+ gpointer data)
+{
gtk_widget_set_size_request (widget, allocation->width / 2, -1);
}
+#endif
void
-zenity_progress (ZenityData *data, ZenityProgressData *progress_data) {
+zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
+{
GtkWidget *dialog;
GtkWidget *button;
GObject *text;
@@ -316,75 +359,77 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data) {
return;
}
- gtk_builder_connect_signals (builder, NULL);
-
text = gtk_builder_get_object (builder, "zenity_progress_text");
- dialog =
- GTK_WIDGET (gtk_builder_get_object (builder, "zenity_progress_dialog"));
+ dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_progress_dialog"));
progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
- g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (zenity_progress_dialog_response),
- data);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK(zenity_progress_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-progress.png"));
if (data->width > -1 || data->height > -1)
- gtk_window_set_default_size (
- GTK_WINDOW (dialog), data->width, data->height);
-
- if (data->width > -1) {
- gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
- } else {
- g_signal_connect_after (G_OBJECT (text),
- "size-allocate",
- G_CALLBACK (zenity_text_size_allocate),
- data);
- g_signal_connect_after (G_OBJECT (progress_bar),
- "size-allocate",
- G_CALLBACK (zenity_text_size_allocate),
- data);
+ gtk_window_set_default_size (GTK_WINDOW(dialog),
+ data->width, data->height);
+
+ if (data->width > -1)
+ {
+ gtk_widget_set_size_request (GTK_WIDGET(text), data->width, -1);
+ }
+#if 0
+ else
+ {
+ g_signal_connect_after (text, "size-allocate",
+ G_CALLBACK(zenity_text_size_allocate), data);
+
+ g_signal_connect_after (progress_bar, "size-allocate",
+ G_CALLBACK(zenity_text_size_allocate), data);
}
+#endif
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)
+ {
+ for (int i = 0; data->extra_label[i] != NULL; ++i)
+ {
+ gtk_dialog_add_button (GTK_DIALOG(dialog),
+ data->extra_label[i], i);
}
}
- if (data->ok_label) {
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_progress_ok_button"));
- gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+ if (data->ok_label)
+ {
+ button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_progress_ok_button"));
+ gtk_button_set_label (GTK_BUTTON(button), data->ok_label);
}
- if (data->cancel_label) {
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_progress_cancel_button"));
- gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+ if (data->cancel_label)
+ {
+ button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_progress_cancel_button"));
+ gtk_button_set_label (GTK_BUTTON(button), data->cancel_label);
}
- if (progress_data->dialog_text)
- gtk_label_set_markup (
- GTK_LABEL (text), g_strcompress (progress_data->dialog_text));
+ if (progress_data->dialog_text) {
+ gtk_label_set_markup (GTK_LABEL(text),
+ g_strcompress (progress_data->dialog_text));
+ }
- if (progress_data->percentage > -1)
- gtk_progress_bar_set_fraction (
- GTK_PROGRESS_BAR (progress_bar), progress_data->percentage / 100.0);
+ if (progress_data->percentage > -1) {
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress_bar),
+ progress_data->percentage / 100.0);
+ }
autokill = progress_data->autokill;
@@ -396,39 +441,39 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data) {
gtk_builder_get_object (builder, "zenity_progress_cancel_button");
if (no_cancel) {
- gtk_widget_hide (GTK_WIDGET (cancel_button));
- gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE);
+ gtk_widget_hide (GTK_WIDGET(cancel_button));
+ gtk_window_set_deletable (GTK_WINDOW(dialog), FALSE);
}
if (no_cancel && auto_close)
- gtk_widget_hide (GTK_WIDGET (ok_button));
+ gtk_widget_hide (GTK_WIDGET(ok_button));
- zenity_util_show_dialog (dialog, data->attach);
+ zenity_util_show_dialog (dialog);
zenity_progress_read_info (progress_data);
- if (data->timeout_delay > 0) {
+ if (data->timeout_delay > 0)
+ {
g_timeout_add_seconds (data->timeout_delay,
(GSourceFunc) zenity_util_timeout_handle,
NULL);
}
-
- gtk_main ();
+ zenity_util_gapp_main (GTK_WINDOW(dialog));
}
static void
-zenity_progress_dialog_response (
- GtkWidget *widget, int response, gpointer data) {
- switch (response) {
+zenity_progress_dialog_response (GtkWidget *widget, int response,
+ gpointer data)
+{
+ switch (response)
+ {
case GTK_RESPONSE_OK:
zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
break;
case GTK_RESPONSE_CANCEL:
/* We do not want to kill the parent process, in order to give the
- user
- the ability to choose the action to be taken. See bug #310824.
- But we want to give people the option to choose this behavior.
- -- Monday 27, March 2006
+ * user the ability to choose the action to be taken. But we want
+ * to give people the option to choose this behavior.
*/
if (autokill) {
kill (getppid (), 1);
@@ -439,12 +484,15 @@ zenity_progress_dialog_response (
case ZENITY_TIMEOUT:
zenity_util_exit_code_with_data (ZENITY_TIMEOUT, zen_data);
break;
+
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));
}
diff --git a/src/scale.c b/src/scale.c
index 7e6686b3..180a0c33 100644
--- a/src/scale.c
+++ b/src/scale.c
@@ -1,39 +1,44 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
/*
* scale.c
*
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021 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.
*
- * Authors: Lucas Rocha <lucasr gnome org>
+ * Original Author: Lucas Rocha <lucasr gnome org>
*/
-#include "config.h"
#include "util.h"
#include "zenity.h"
+#include <config.h>
+
static GtkWidget *scale;
static void zenity_scale_value_changed (GtkWidget *widget, gpointer data);
-static void zenity_scale_dialog_response (
- GtkWidget *widget, int response, gpointer data);
+static void zenity_scale_dialog_response (GtkWidget *widget, int response,
+ gpointer data);
void
-zenity_scale (ZenityData *data, ZenityScaleData *scale_data) {
+zenity_scale (ZenityData *data, ZenityScaleData *scale_data)
+{
GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *button;
@@ -53,81 +58,83 @@ zenity_scale (ZenityData *data, ZenityScaleData *scale_data) {
GTK_WIDGET (gtk_builder_get_object (builder, "zenity_scale_hscale"));
text = gtk_builder_get_object (builder, "zenity_scale_text");
- g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (zenity_scale_dialog_response),
- data);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK(zenity_scale_dialog_response), data);
- if (scale_data->min_value >= scale_data->max_value) {
- g_printerr (_ ("Maximum value must be greater than minimum value.\n"));
+ if (scale_data->min_value >= scale_data->max_value)
+ {
+ g_printerr (_("Maximum value must be greater than minimum value.\n"));
data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
return;
}
if (scale_data->value < scale_data->min_value ||
- scale_data->value > scale_data->max_value) {
+ scale_data->value > scale_data->max_value)
+ {
g_printerr (_ ("Value out of range.\n"));
data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
return;
}
- gtk_builder_connect_signals (builder, NULL);
-
if (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-scale.png"));
+ zenity_util_set_window_icon (dialog, data->window_icon,
+ ZENITY_IMAGE_FULLPATH ("zenity-scale.png"));
- if (data->width > -1 || data->height > -1)
- gtk_window_set_default_size (
- GTK_WINDOW (dialog), data->width, data->height);
+ if (data->width > -1 || data->height > -1) {
+ 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++;
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+ if (data->extra_label)
+ {
+ for (int i = 0; data->extra_label[i] != NULL; ++i)
+ {
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ data->extra_label[i], i);
}
}
if (data->ok_label) {
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_scale_ok_button"));
+ button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_scale_ok_button"));
gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
}
- if (data->cancel_label) {
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_scale_cancel_button"));
+ if (data->cancel_label)
+ {
+ button = GTK_WIDGET (gtk_builder_get_object (builder,
+ "zenity_scale_cancel_button"));
gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
}
- if (scale_data->dialog_text)
- gtk_label_set_markup (
- GTK_LABEL (text), g_strcompress (scale_data->dialog_text));
+ if (scale_data->dialog_text) {
+ gtk_label_set_markup (GTK_LABEL (text),
+ g_strcompress (scale_data->dialog_text));
+ }
- gtk_range_set_range (
- GTK_RANGE (scale), scale_data->min_value, scale_data->max_value);
+ gtk_range_set_range (GTK_RANGE (scale),
+ scale_data->min_value, scale_data->max_value);
gtk_range_set_value (GTK_RANGE (scale), scale_data->value);
gtk_range_set_increments (GTK_RANGE (scale), scale_data->step, 0);
if (scale_data->print_partial)
- g_signal_connect (G_OBJECT (scale),
- "value-changed",
- G_CALLBACK (zenity_scale_value_changed),
- data);
+ {
+ g_signal_connect (scale, "value-changed",
+ G_CALLBACK(zenity_scale_value_changed), data);
+ }
if (scale_data->hide_value)
gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
- zenity_util_show_dialog (dialog, data->attach);
+ zenity_util_show_dialog (dialog);
- if (data->timeout_delay > 0) {
+ if (data->timeout_delay > 0)
+ {
g_timeout_add_seconds (data->timeout_delay,
(GSourceFunc) zenity_util_timeout_handle,
dialog);
@@ -135,19 +142,22 @@ zenity_scale (ZenityData *data, ZenityScaleData *scale_data) {
g_object_unref (builder);
- gtk_main ();
+ zenity_util_gapp_main (GTK_WINDOW(dialog));
}
static void
-zenity_scale_value_changed (GtkWidget *widget, gpointer data) {
- g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE (widget)));
+zenity_scale_value_changed (GtkWidget *widget, gpointer data)
+{
+ g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE(widget)));
}
static void
-zenity_scale_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_scale_dialog_response (GtkWidget *widget, int response, gpointer data)
+{
ZenityData *zen_data = data;
- switch (response) {
+ switch (response)
+ {
case GTK_RESPONSE_OK:
zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
g_print ("%.0f\n", gtk_range_get_value (GTK_RANGE (scale)));
@@ -164,10 +174,13 @@ zenity_scale_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));
}
diff --git a/src/text.c b/src/text.c
index ffe7b35e..a7f47e2f 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,42 +1,48 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
/*
* text.c
*
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021 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.
*
- * Authors: Glynn Foster <glynn foster sun com>
+ * Original Author: Glynn Foster <glynn foster sun com>
*/
-#include "config.h"
#include "util.h"
#include "zenity.h"
+
#include <gio/gio.h>
#ifdef HAVE_WEBKITGTK
#include <webkit2/webkit2.h>
#endif
+#include <config.h>
+
static ZenityTextData *zen_text_data;
-static void zenity_text_dialog_response (
- GtkWidget *widget, int response, gpointer data);
+static void zenity_text_dialog_response (GtkWidget *widget, int response,
+ gpointer data);
static void zenity_text_toggle_button (GtkToggleButton *button, gpointer data);
+// TODO - I don't think gtk4 support for webkit is fully "there" yet.
#ifdef HAVE_WEBKITGTK
static void
zenity_configure_webkit (WebKitWebView *web_view) {
@@ -146,21 +152,24 @@ zenity_text_webview_load_changed (
}
}
-#endif
+#endif /* HAVE_WEBKITGTK */
static gboolean
-zenity_text_handle_stdin (
- GIOChannel *channel, GIOCondition condition, gpointer data) {
+zenity_text_handle_stdin (GIOChannel *channel, GIOCondition condition,
+ gpointer data)
+{
+#define BUF_SIZE 1024
static GtkTextBuffer *buffer;
static GtkTextView *text_view;
- gchar buf[1024];
+ char buf[BUF_SIZE];
gsize len;
text_view = GTK_TEXT_VIEW (data);
buffer = gtk_text_view_get_buffer (text_view);
- if ((condition & G_IO_IN) || (condition & (G_IO_IN | G_IO_HUP))) {
+ if ((condition & G_IO_IN) || (condition & (G_IO_IN | G_IO_HUP)))
+ {
GError *error = NULL;
gint status;
@@ -168,31 +177,36 @@ zenity_text_handle_stdin (
;
do {
- status = g_io_channel_read_chars (channel, buf, 1024, &len, &error);
-
- while (gtk_events_pending ())
- gtk_main_iteration ();
+ status = g_io_channel_read_chars (channel, buf, BUF_SIZE,
+ &len, &error);
+ while (g_main_context_pending (NULL)) {
+ g_main_context_iteration (NULL, FALSE);
+ }
} while (status == G_IO_STATUS_AGAIN);
- if (status != G_IO_STATUS_NORMAL) {
+ if (status != G_IO_STATUS_NORMAL)
+ {
if (error) {
- g_warning ("zenity_text_handle_stdin () : %s", error->message);
+ g_warning ("%s: %s",
+ __func__, error->message);
g_error_free (error);
error = NULL;
}
return FALSE;
}
- if (len > 0) {
+ if (len > 0)
+ {
GtkTextIter end;
- gchar *utftext;
+ char *utftext;
gsize localelen;
gsize utflen;
gtk_text_buffer_get_end_iter (buffer, &end);
- if (!g_utf8_validate (buf, len, NULL)) {
+ if (! g_utf8_validate (buf, len, NULL))
+ {
utftext = g_convert_with_fallback (buf,
len,
"UTF-8",
@@ -203,35 +217,42 @@ zenity_text_handle_stdin (
NULL);
gtk_text_buffer_insert (buffer, &end, utftext, utflen);
g_free (utftext);
- } else {
+ }
+ else
+ {
gtk_text_buffer_insert (buffer, &end, buf, len);
}
- if (zen_text_data->auto_scroll) {
- GtkTextMark *mark = NULL;
- mark = gtk_text_buffer_get_insert (buffer);
+
+ if (zen_text_data->auto_scroll)
+ {
+ GtkTextMark *mark = gtk_text_buffer_get_insert (buffer);
+
if (mark != NULL)
- gtk_text_view_scroll_to_mark (
- text_view, mark, 0.0, FALSE, 0, 0);
+ {
+ gtk_text_view_scroll_to_mark (text_view, mark,
+ 0.0, FALSE, 0, 0);
+ }
}
}
}
-
return TRUE;
}
static void
-zenity_text_fill_entries_from_stdin (GtkTextView *text_view) {
+zenity_text_fill_entries_from_stdin (GtkTextView *text_view)
+{
GIOChannel *channel;
channel = g_io_channel_unix_new (0);
g_io_channel_set_encoding (channel, "UTF-8", NULL);
g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL);
- g_io_add_watch (
- channel, G_IO_IN | G_IO_HUP, zenity_text_handle_stdin, text_view);
+ g_io_add_watch (channel,
+ G_IO_IN | G_IO_HUP, zenity_text_handle_stdin, text_view);
}
void
-zenity_text (ZenityData *data, ZenityTextData *text_data) {
+zenity_text (ZenityData *data, ZenityTextData *text_data)
+{
GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *ok_button;
@@ -247,6 +268,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
GtkTextIter start_iter, end_iter;
gchar *content;
#endif
+
zen_text_data = text_data;
builder =
zenity_util_load_ui_file ("zenity_text_dialog", "textbuffer1", NULL);
@@ -256,28 +278,24 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
return;
}
- gtk_builder_connect_signals (builder, NULL);
-
- dialog =
- GTK_WIDGET (gtk_builder_get_object (builder, "zenity_text_dialog"));
+ dialog = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_text_dialog"));
- ok_button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_text_close_button"));
- cancel_button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_text_cancel_button"));
- checkbox =
- GTK_WIDGET (gtk_builder_get_object (builder, "zenity_text_checkbox"));
+ ok_button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_text_close_button"));
+ cancel_button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_text_cancel_button"));
+ checkbox = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_text_checkbox"));
- g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (zenity_text_dialog_response),
- data);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK(zenity_text_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-text.png"));
+ zenity_util_set_window_icon (dialog, data->window_icon,
+ ZENITY_IMAGE_FULLPATH ("zenity-text.png"));
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
@@ -289,10 +307,26 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
if (text_data->no_wrap)
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE);
- if (text_data->font) {
- PangoFontDescription *fontDesc =
- pango_font_description_from_string (text_data->font);
- gtk_widget_override_font (GTK_WIDGET (text_view), fontDesc);
+ if (text_data->font)
+ {
+ GtkStyleContext *context;
+ GtkCssProvider *provider;
+ char *font_str;
+
+ font_str = g_strdup_printf (
+ "* { \n"
+ " font: %s\n"
+ "}\n",
+ text_data->font);
+
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider, font_str, -1);
+ g_free (font_str);
+
+ context = gtk_widget_get_style_context (GTK_WIDGET(text_view));
+ gtk_style_context_add_provider (context,
+ GTK_STYLE_PROVIDER(provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
if (text_data->uri)
@@ -303,12 +337,12 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
if (text_data->editable)
zen_text_data->buffer = text_buffer;
- 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)
+ {
+ for (int i = 0; data->extra_label[i] != NULL; ++i)
+ {
+ gtk_dialog_add_button (GTK_DIALOG(dialog),
+ data->extra_label[i], i);
}
}
@@ -325,21 +359,23 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
gtk_widget_set_sensitive (GTK_WIDGET (ok_button), FALSE);
gtk_button_set_label (GTK_BUTTON (checkbox), text_data->checkbox);
- g_signal_connect (G_OBJECT (checkbox),
- "toggled",
- G_CALLBACK (zenity_text_toggle_button),
- ok_button);
+ g_signal_connect (checkbox, "toggled",
+ G_CALLBACK(zenity_text_toggle_button), ok_button);
}
if (data->width > -1 || data->height > -1)
- gtk_window_set_default_size (
- GTK_WINDOW (dialog), data->width, data->height);
- else
+ {
+ gtk_window_set_default_size (GTK_WINDOW (dialog),
+ data->width, data->height);
+ }
+ else {
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
+ }
if (data->modal)
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+// FIXME - TODO
#ifdef HAVE_WEBKITGTK
if (text_data->html) {
web_kit = webkit_web_view_new ();
@@ -387,46 +423,53 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
gtk_container_add (GTK_CONTAINER (scrolled_window), web_kit);
gtk_widget_show (GTK_WIDGET (web_kit));
}
-#endif
+#endif /* HAVE_WEBKITGTK */
- zenity_util_show_dialog (dialog, data->attach);
+ zenity_util_show_dialog (dialog);
g_object_unref (builder);
- if (data->timeout_delay > 0) {
+ 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_text_toggle_button (GtkToggleButton *button, gpointer data) {
- GtkWidget *ok_button = (GtkWidget *) data;
- gtk_widget_set_sensitive (
- GTK_WIDGET (ok_button), gtk_toggle_button_get_active (button));
+zenity_text_toggle_button (GtkToggleButton *button, gpointer data)
+{
+ GtkWidget *ok_button = GTK_WIDGET(data);
+
+ gtk_widget_set_sensitive (ok_button,
+ gtk_toggle_button_get_active (button));
}
static void
-zenity_text_dialog_output (ZenityData *zen_data) {
- if (zen_text_data->editable) {
+zenity_text_dialog_output (ZenityData *zen_data)
+{
+ if (zen_text_data->editable)
+ {
GtkTextIter start, end;
- gchar *text;
+ char *text;
+
gtk_text_buffer_get_bounds (zen_text_data->buffer, &start, &end);
- text =
- gtk_text_buffer_get_text (zen_text_data->buffer, &start, &end, 0);
+ text = gtk_text_buffer_get_text (zen_text_data->buffer,
+ &start, &end, 0);
g_print ("%s", text);
g_free (text);
}
}
static void
-zenity_text_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_text_dialog_response (GtkWidget *widget, int response, gpointer data)
+{
ZenityData *zen_data = data;
- switch (response) {
+ switch (response)
+ {
case GTK_RESPONSE_CLOSE:
zenity_text_dialog_output (zen_data);
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
@@ -439,10 +482,12 @@ zenity_text_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]);
+ }
zenity_util_exit_code_with_data (ZENITY_ESC, zen_data);
break;
}
- gtk_main_quit ();
+ zenity_util_gapp_quit (GTK_WINDOW(widget));
}
diff --git a/src/tree.c b/src/tree.c
index d94ce7e8..26a9ca4b 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1,70 +1,76 @@
+/* vim: colorcolumn=80 ts=4 sw=4
+ */
/*
* tree.c
*
- * Copyright (C) 2002 Sun Microsystems, Inc.
+ * Copyright © 2002 Sun Microsystems, Inc.
+ * Copyright © 2021 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.
*
- * Authors: Glynn Foster <glynn foster sun com>
+ * Original Authors: Glynn Foster <glynn foster sun com>
* Jonathan Blanford <jrb redhat com>
* Kristian Rietveld <kris gtk org>
*/
-#include "config.h"
#include "util.h"
#include "zenity.h"
+
#include <stdlib.h>
#include <string.h>
+#include <config.h>
+
#define MAX_ELEMENTS_BEFORE_SCROLLING 5
#define PRINT_HIDE_COLUMN_SEPARATOR ","
static GtkBuilder *builder;
static GSList *selected;
-static gchar *separator;
+static char *separator;
static gboolean print_all_columns = FALSE;
-static gint *print_columns = NULL;
-static gint *hide_columns = NULL;
+static int *print_columns = NULL;
+static int *hide_columns = NULL;
static GIOChannel *channel;
-static int *zenity_tree_extract_column_indexes (char *indexes, gint n_columns);
-static gboolean zenity_tree_column_is_hidden (gint column_index);
-static void zenity_tree_dialog_response (
- GtkWidget *widget, int response, gpointer data);
+static int *zenity_tree_extract_column_indexes (char *indexes, int n_columns);
+static gboolean zenity_tree_column_is_hidden (int column_index);
+static void zenity_tree_dialog_response (GtkWidget *widget, int response,
+ gpointer data);
static void zenity_tree_row_activated (GtkTreeView *tree_view,
GtkTreePath *tree_path, GtkTreeViewColumn *tree_col, gpointer data);
static gboolean
-zenity_tree_dialog_untoggle (
- GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) {
- GValue toggle_value = {
- 0,
- };
+zenity_tree_dialog_untoggle (GtkTreeModel *model, GtkTreePath *path,
+ GtkTreeIter *iter, gpointer data)
+{
+ GValue toggle_value = G_VALUE_INIT;
gtk_tree_model_get_value (model, iter, 0, &toggle_value);
if (g_value_get_boolean (&toggle_value))
gtk_list_store_set (GTK_LIST_STORE (model), iter, 0, FALSE, -1);
+
return FALSE;
}
static void
-zenity_tree_toggled_callback (
- GtkCellRendererToggle *cell, gchar *path_string, gpointer data) {
+zenity_tree_toggled_callback (GtkCellRendererToggle *cell, char *path_string,
+ gpointer data)
+{
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *path;
@@ -73,11 +79,10 @@ zenity_tree_toggled_callback (
model = GTK_TREE_MODEL (data);
/* Because this is a radio list, we should untoggle the previous toggle so
- * that
- * we only have one selection at any given time
+ * that we only have one selection at any given time
*/
-
- if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "radio")) == 1) {
+ if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "radio")) == 1)
+ {
gtk_tree_model_foreach (model, zenity_tree_dialog_untoggle, NULL);
}
@@ -93,27 +98,31 @@ zenity_tree_toggled_callback (
static void
zenity_load_pixbuf (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) {
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+{
static GHashTable *pixbuf_cache = NULL;
GError *error = NULL;
GdkPixbuf *pixbuf;
- gchar *str;
+ char *str;
gtk_tree_model_get (tree_model, iter, 0, &str, -1);
- if (!str)
+ if (! str)
return;
- if (!pixbuf_cache) {
+ if (! pixbuf_cache)
+ {
pixbuf_cache = g_hash_table_new (g_str_hash, g_str_equal);
g_assert (pixbuf_cache);
}
pixbuf = g_hash_table_lookup (pixbuf_cache, str);
- if (!pixbuf) {
+ if (! pixbuf)
+ {
pixbuf = gdk_pixbuf_new_from_file (str, &error);
- if (!pixbuf)
+
+ if (! pixbuf)
g_warning ("Failed to load '%s'", str);
g_hash_table_insert (pixbuf_cache, g_strdup (str), pixbuf);
@@ -126,14 +135,15 @@ zenity_load_pixbuf (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
}
static gboolean
-zenity_tree_handle_stdin (
- GIOChannel *channel, GIOCondition condition, gpointer data) {
+zenity_tree_handle_stdin (GIOChannel *channel, GIOCondition condition,
+ gpointer data)
+{
static GtkTreeView *tree_view;
GtkTreeModel *model;
static GtkTreeIter iter;
- static gint column_count = 0;
- static gint row_count = 0;
- static gint n_columns;
+ static int column_count = 0;
+ static int row_count = 0;
+ static int n_columns;
static gboolean editable;
static gboolean toggles;
static gboolean first_time = TRUE;
@@ -149,12 +159,14 @@ zenity_tree_handle_stdin (
model = gtk_tree_view_get_model (tree_view);
- if (first_time) {
+ if (first_time)
+ {
first_time = FALSE;
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
}
- if ((condition & G_IO_IN) == G_IO_IN) {
+ if ((condition & G_IO_IN) == G_IO_IN)
+ {
GString *string;
GError *error = NULL;
@@ -165,21 +177,23 @@ zenity_tree_handle_stdin (
;
do {
do {
- if (g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE)
- status = g_io_channel_read_line_string (
- channel, string, NULL, &error);
- else
+ if (g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE) {
+ status = g_io_channel_read_line_string (channel,
+ string, NULL, &error);
+ } else {
return FALSE;
+ }
- while (gtk_events_pending ())
- gtk_main_iteration ();
-
- // TODO: Find a better way to avoid 100% cpu utilization
+ while (g_main_context_pending (NULL)) {
+ g_main_context_iteration (NULL, FALSE);
+ }
+ /* FIXME: Find a better way to avoid 100% cpu utilization */
g_usleep (10000);
} while (status == G_IO_STATUS_AGAIN);
- if (status != G_IO_STATUS_NORMAL) {
+ if (status != G_IO_STATUS_NORMAL)
+ {
if (error) {
g_warning (
"zenity_tree_handle_stdin () : %s", error->message);
@@ -189,23 +203,30 @@ zenity_tree_handle_stdin (
continue;
}
- if (column_count == n_columns) {
+ if (column_count == n_columns)
+ {
/* We're starting a new row */
column_count = 0;
row_count++;
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
}
- if (toggles && column_count == 0) {
+ if (toggles && column_count == 0)
+ {
if (strcmp (g_ascii_strdown (
zenity_util_strip_newline (string->str), -1),
"true") == 0)
- gtk_list_store_set (
- GTK_LIST_STORE (model), &iter, column_count, TRUE, -1);
- else
+ {
+ gtk_list_store_set (GTK_LIST_STORE(model),
+ &iter, column_count, TRUE, -1);
+ }
+ else {
gtk_list_store_set (
GTK_LIST_STORE (model), &iter, column_count, FALSE, -1);
- } else {
+ }
+ }
+ else
+ {
gtk_list_store_set (GTK_LIST_STORE (model),
&iter,
column_count,
@@ -214,22 +235,22 @@ zenity_tree_handle_stdin (
}
if (editable) {
- gtk_list_store_set (
- GTK_LIST_STORE (model), &iter, n_columns, TRUE, -1);
+ gtk_list_store_set (GTK_LIST_STORE(model),
+ &iter, n_columns, TRUE, -1);
}
- if (row_count == MAX_ELEMENTS_BEFORE_SCROLLING) {
+ if (row_count == MAX_ELEMENTS_BEFORE_SCROLLING)
+ {
GtkWidget *scrolled_window;
GtkRequisition rectangle;
- gtk_widget_get_preferred_size (
- GTK_WIDGET (tree_view), &rectangle, NULL);
- scrolled_window = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_tree_window"));
- gtk_widget_set_size_request (
- scrolled_window, -1, rectangle.height);
- gtk_scrolled_window_set_policy (
- GTK_SCROLLED_WINDOW (scrolled_window),
+ gtk_widget_get_preferred_size (GTK_WIDGET(tree_view),
+ &rectangle, NULL);
+ scrolled_window = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_tree_window"));
+ gtk_widget_set_size_request (scrolled_window,
+ -1, rectangle.height);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
}
@@ -238,11 +259,13 @@ zenity_tree_handle_stdin (
} while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) ==
G_IO_IN &&
- status != G_IO_STATUS_EOF);
+ status != G_IO_STATUS_EOF); /* !do while */
+
g_string_free (string, TRUE);
}
- if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+ if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF)
+ {
g_io_channel_shutdown (channel, TRUE, NULL);
return FALSE;
}
@@ -251,7 +274,8 @@ zenity_tree_handle_stdin (
static void
zenity_tree_fill_entries_from_stdin (GtkTreeView *tree_view, gint n_columns,
- gboolean toggles, gboolean editable) {
+ gboolean toggles, gboolean editable)
+{
g_object_set_data (
G_OBJECT (tree_view), "n_columns", GINT_TO_POINTER (n_columns));
g_object_set_data (
@@ -267,11 +291,12 @@ zenity_tree_fill_entries_from_stdin (GtkTreeView *tree_view, gint n_columns,
}
static void
-zenity_tree_fill_entries (GtkTreeView *tree_view, const gchar **args,
- gint n_columns, gboolean toggles, gboolean editable) {
+zenity_tree_fill_entries (GtkTreeView *tree_view, const char **args,
+ int n_columns, gboolean toggles, gboolean editable)
+{
GtkTreeModel *model;
GtkTreeIter iter;
- gint i = 0;
+ int i = 0;
model = gtk_tree_view_get_model (tree_view);
@@ -279,7 +304,7 @@ zenity_tree_fill_entries (GtkTreeView *tree_view, const gchar **args,
G_OBJECT (tree_view), "n_columns", GINT_TO_POINTER (n_columns));
while (args[i] != NULL) {
- gint j;
+ int j;
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -302,7 +327,8 @@ zenity_tree_fill_entries (GtkTreeView *tree_view, const gchar **args,
gtk_list_store_set (
GTK_LIST_STORE (model), &iter, n_columns, TRUE, -1);
- if (i == MAX_ELEMENTS_BEFORE_SCROLLING) {
+ if (i == MAX_ELEMENTS_BEFORE_SCROLLING)
+ {
GtkWidget *scrolled_window;
GtkRequisition rectangle;
@@ -322,21 +348,25 @@ zenity_tree_fill_entries (GtkTreeView *tree_view, const gchar **args,
}
static gboolean
-zenity_mid_search_func (GtkTreeModel *model, gint column, const gchar *key,
- GtkTreeIter *iter, gpointer search_data) {
- gchar *iter_string = NULL;
+zenity_mid_search_func (GtkTreeModel *model, int column, const char *key,
+ GtkTreeIter *iter, gpointer search_data)
+{
+ char *iter_string = NULL;
+
gtk_tree_model_get (model, iter, column, &iter_string, -1);
+
return !(g_strrstr (g_utf8_strdown (iter_string, -1),
g_utf8_strdown (key, -1)) != NULL);
}
static void
zenity_cell_edited_callback (GtkCellRendererText *cell,
- const gchar *path_string, const gchar *new_text, gpointer data) {
+ const char *path_string, const char *new_text, gpointer data)
+{
GtkTreeModel *model;
GtkTreePath *path;
GtkTreeIter iter;
- gint column;
+ int column;
model = GTK_TREE_MODEL (data);
path = gtk_tree_path_new_from_string (path_string);
@@ -350,7 +380,8 @@ zenity_cell_edited_callback (GtkCellRendererText *cell,
}
void
-zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
+zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
+{
GtkWidget *dialog;
GtkWidget *button;
GObject *tree_view;
@@ -360,7 +391,7 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
GType *column_types;
GSList *tmp;
gboolean first_column = FALSE;
- gint i, column_index, n_columns;
+ int i, column_index, n_columns;
builder = zenity_util_load_ui_file ("zenity_tree_dialog", NULL);
@@ -373,43 +404,45 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
n_columns = g_slist_length (tree_data->columns);
- if (tree_data->print_column) {
+ if (tree_data->print_column)
+ {
if (strcmp (g_ascii_strdown (tree_data->print_column, -1), "all") == 0)
print_all_columns = TRUE;
else
print_columns = zenity_tree_extract_column_indexes (
tree_data->print_column, n_columns);
- } else {
+ }
+ else
+ {
print_columns = g_new (gint, 2);
print_columns[0] = (tree_data->radiobox || tree_data->checkbox ? 2 : 1);
print_columns[1] = 0;
}
- if (tree_data->hide_column)
- hide_columns = zenity_tree_extract_column_indexes (
- tree_data->hide_column, n_columns);
+ if (tree_data->hide_column) {
+ hide_columns =
+ zenity_tree_extract_column_indexes (tree_data->hide_column,
+ n_columns);
+ }
if (n_columns == 0) {
- g_printerr (_ ("No column titles specified for List dialog.\n"));
+ g_printerr (_("No column titles specified for List dialog.\n"));
data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
return;
}
- if (tree_data->checkbox + tree_data->radiobox + tree_data->imagebox > 1) {
+ if (tree_data->checkbox + tree_data->radiobox + tree_data->imagebox > 1)
+ {
g_printerr (_ ("You should use only one List dialog type.\n"));
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_tree_dialog"));
- dialog =
- GTK_WIDGET (gtk_builder_get_object (builder, "zenity_tree_dialog"));
-
- g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (zenity_tree_dialog_response),
- data);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK(zenity_tree_dialog_response), data);
if (data->dialog_title)
gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
@@ -417,47 +450,48 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
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)
+ {
+ for (int i = 0; data->extra_label[i] != NULL; ++i)
+ {
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ data->extra_label[i], i);
}
}
if (data->ok_label) {
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_tree_ok_button"));
+ button = GTK_WIDGET(gtk_builder_get_object (builder,
+ "zenity_tree_ok_button"));
gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
}
if (data->cancel_label) {
- button = GTK_WIDGET (
- gtk_builder_get_object (builder, "zenity_tree_cancel_button"));
+ button = GTK_WIDGET (gtk_builder_get_object (builder,
+ "zenity_tree_cancel_button"));
gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
}
text = gtk_builder_get_object (builder, "zenity_tree_text");
if (tree_data->dialog_text)
- gtk_label_set_markup (
- GTK_LABEL (text), g_strcompress (tree_data->dialog_text));
+ gtk_label_set_markup (GTK_LABEL(text),
+ g_strcompress (tree_data->dialog_text));
- zenity_util_set_window_icon (
- dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-list.png"));
+ zenity_util_set_window_icon (dialog, data->window_icon,
+ ZENITY_IMAGE_FULLPATH ("zenity-list.png"));
- if (data->width > -1 || data->height > -1)
- gtk_window_set_default_size (
- GTK_WINDOW (dialog), data->width, data->height);
+ if (data->width > -1 || data->height > -1) {
+ gtk_window_set_default_size (GTK_WINDOW(dialog),
+ data->width, data->height);
+ }
tree_view = gtk_builder_get_object (builder, "zenity_tree_view");
if (!(tree_data->radiobox || tree_data->checkbox))
- g_signal_connect (tree_view,
- "row-activated",
- G_CALLBACK (zenity_tree_row_activated),
- data);
+ {
+ g_signal_connect (tree_view, "row-activated",
+ G_CALLBACK (zenity_tree_row_activated), data);
+ }
/* Create an empty list store */
model = g_object_new (GTK_TYPE_LIST_STORE, NULL);
@@ -467,7 +501,8 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
else
column_types = g_new (GType, n_columns);
- for (i = 0; i < n_columns; i++) {
+ for (i = 0; i < n_columns; i++)
+ {
/* Have the limitation that the radioboxes and checkboxes are in the
* first column */
if (i == 0 && (tree_data->checkbox || tree_data->radiobox))
@@ -486,7 +521,8 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
- if (!(tree_data->radiobox || tree_data->checkbox)) {
+ if (! (tree_data->radiobox || tree_data->checkbox))
+ {
if (tree_data->multi)
gtk_tree_selection_set_mode (
gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
@@ -495,16 +531,22 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
gtk_tree_selection_set_mode (
gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
GTK_SELECTION_SINGLE);
- } else
+ }
+ else
+ {
gtk_tree_selection_set_mode (
gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
GTK_SELECTION_NONE);
+ }
column_index = 0;
- for (tmp = tree_data->columns; tmp; tmp = tmp->next) {
- if (!first_column) {
- if (tree_data->checkbox || tree_data->radiobox) {
+ for (tmp = tree_data->columns; tmp; tmp = tmp->next)
+ {
+ if (! first_column)
+ {
+ if (tree_data->checkbox || tree_data->radiobox)
+ {
GtkCellRenderer *cell_renderer;
cell_renderer = gtk_cell_renderer_toggle_new ();
@@ -523,22 +565,28 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
column = gtk_tree_view_column_new_with_attributes (
tmp->data, cell_renderer, "active", column_index, NULL);
- } else if (tree_data->imagebox) {
+ }
+ else if (tree_data->imagebox)
+ {
GtkCellRenderer *cell_renderer =
gtk_cell_renderer_pixbuf_new ();
+
column = gtk_tree_view_column_new_with_attributes (
tmp->data, cell_renderer, NULL);
gtk_tree_view_column_set_cell_data_func (
column, cell_renderer, zenity_load_pixbuf, NULL, NULL);
- } else {
- if (tree_data->editable) {
+ }
+ else
+ {
+ if (tree_data->editable)
+ {
GtkCellRenderer *cell_renderer;
cell_renderer = gtk_cell_renderer_text_new ();
- g_signal_connect (G_OBJECT (cell_renderer),
- "edited",
+ g_signal_connect (cell_renderer, "edited",
G_CALLBACK (zenity_cell_edited_callback),
gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view)));
+
g_object_set_data (G_OBJECT (cell_renderer),
"column",
GINT_TO_POINTER (column_index));
@@ -551,7 +599,9 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
"editable",
n_columns,
NULL);
- } else {
+ }
+ else
+ {
column =
gtk_tree_view_column_new_with_attributes (tmp->data,
gtk_cell_renderer_text_new (),
@@ -567,15 +617,18 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
gtk_tree_view_column_set_visible (column, FALSE);
first_column = TRUE;
- } else {
- if (tree_data->editable) {
+ }
+ else
+ {
+ if (tree_data->editable)
+ {
GtkCellRenderer *cell_renderer;
cell_renderer = gtk_cell_renderer_text_new ();
- g_signal_connect (G_OBJECT (cell_renderer),
- "edited",
+ g_signal_connect (cell_renderer, "edited",
G_CALLBACK (zenity_cell_edited_callback),
gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view)));
+
g_object_set_data (G_OBJECT (cell_renderer),
"column",
GINT_TO_POINTER (column_index));
@@ -587,7 +640,9 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
"editable",
n_columns,
NULL);
- } else {
+ }
+ else
+ {
column = gtk_tree_view_column_new_with_attributes (tmp->data,
gtk_cell_renderer_text_new (),
"text",
@@ -609,39 +664,46 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
if (tree_data->hide_header)
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
- if (tree_data->radiobox || tree_data->checkbox) {
- if (tree_data->data && *tree_data->data)
+ if (tree_data->radiobox || tree_data->checkbox)
+ {
+ if (tree_data->data && *tree_data->data) {
zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view),
tree_data->data,
n_columns,
TRUE,
tree_data->editable);
- else
+ }
+ else {
zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view),
n_columns,
TRUE,
tree_data->editable);
- } else {
- if (tree_data->data && *tree_data->data)
+ }
+ }
+ else
+ {
+ if (tree_data->data && *tree_data->data) {
zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view),
tree_data->data,
n_columns,
FALSE,
tree_data->editable);
- else
+ } else {
zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view),
n_columns,
FALSE,
tree_data->editable);
+ }
}
- zenity_util_show_dialog (dialog, data->attach);
+ zenity_util_show_dialog (dialog);
- if (tree_data->mid_search)
+ if (tree_data->mid_search) {
gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (tree_view),
(GtkTreeViewSearchEqualFunc) zenity_mid_search_func,
model,
NULL);
+ }
if (data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay,
@@ -649,24 +711,25 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
dialog);
}
- gtk_main ();
-
g_object_unref (builder);
+
+ zenity_util_gapp_main (GTK_WINDOW(dialog));
}
static void
zenity_tree_dialog_get_selected (GtkTreeModel *model, GtkTreePath *path_buf,
- GtkTreeIter *iter, GtkTreeView *tree_view) {
- GValue value = {
- 0,
- };
- gint n_columns, i;
+ GtkTreeIter *iter, GtkTreeView *tree_view)
+{
+ GValue value = G_VALUE_INIT;
+ int n_columns, i;
n_columns =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
- if (print_all_columns) {
- for (i = 0; i < n_columns; i++) {
+ if (print_all_columns)
+ {
+ for (i = 0; i < n_columns; i++)
+ {
gtk_tree_model_get_value (model, iter, i, &value);
selected = g_slist_append (selected, g_value_dup_string (&value));
@@ -675,34 +738,35 @@ zenity_tree_dialog_get_selected (GtkTreeModel *model, GtkTreePath *path_buf,
return;
}
- for (i = 0; print_columns[i] != 0; i++) {
+ for (i = 0; print_columns[i] != 0; i++)
+ {
gtk_tree_model_get_value (model, iter, print_columns[i] - 1, &value);
-
selected = g_slist_append (selected, g_value_dup_string (&value));
+
g_value_unset (&value);
}
}
static gboolean
zenity_tree_dialog_toggle_get_selected (GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, GtkTreeView *tree_view) {
- GValue toggle_value = {
- 0,
- };
- gint n_columns, i;
+ GtkTreeIter *iter, GtkTreeView *tree_view)
+{
+ GValue toggle_value = G_VALUE_INIT;
+ int n_columns, i;
n_columns =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
gtk_tree_model_get_value (model, iter, 0, &toggle_value);
- if (g_value_get_boolean (&toggle_value)) {
- GValue value = {
- 0,
- };
+ if (g_value_get_boolean (&toggle_value))
+ {
+ GValue value = G_VALUE_INIT;
- if (print_all_columns) {
- for (i = 1; i < n_columns; i++) {
+ if (print_all_columns)
+ {
+ for (i = 1; i < n_columns; i++)
+ {
gtk_tree_model_get_value (model, iter, i, &value);
selected =
@@ -713,7 +777,8 @@ zenity_tree_dialog_toggle_get_selected (GtkTreeModel *model, GtkTreePath *path,
return FALSE;
}
- for (i = 0; print_columns[i] != 0; i++) {
+ for (i = 0; print_columns[i] != 0; i++)
+ {
gtk_tree_model_get_value (
model, iter, print_columns[i] - 1, &value);
@@ -721,14 +786,14 @@ zenity_tree_dialog_toggle_get_selected (GtkTreeModel *model, GtkTreePath *path,
g_value_unset (&value);
}
}
-
g_value_unset (&toggle_value);
return FALSE;
}
static void
-zenity_tree_dialog_output (void) {
+zenity_tree_dialog_output (void)
+{
GObject *tree_view;
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -737,37 +802,42 @@ zenity_tree_dialog_output (void) {
model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
if (gtk_tree_model_get_column_type (model, 0) == G_TYPE_BOOLEAN)
+ {
gtk_tree_model_foreach (model,
(GtkTreeModelForeachFunc) zenity_tree_dialog_toggle_get_selected,
GTK_TREE_VIEW (tree_view));
- else {
+ }
+ else
+ {
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
gtk_tree_selection_selected_foreach (selection,
(GtkTreeSelectionForeachFunc) zenity_tree_dialog_get_selected,
GTK_TREE_VIEW (tree_view));
}
- GSList *tmp;
- for (tmp = selected; tmp; tmp = tmp->next) {
+ for (GSList *tmp = selected; tmp != NULL; tmp = tmp->next)
+ {
if (tmp->next != NULL) {
- g_print ("%s%s", (gchar *) tmp->data, separator);
- } else
- g_print ("%s\n", (gchar *) tmp->data);
+ g_print ("%s%s", (char *)tmp->data, separator);
+ } else {
+ g_print ("%s\n", (char *)tmp->data);
+ }
}
g_free (print_columns);
g_free (hide_columns);
g_free (separator);
- g_slist_foreach (selected, (GFunc) g_free, NULL);
- selected = NULL;
+ g_slist_free_full (g_steal_pointer (&selected), g_free);
}
static void
-zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data) {
+zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data)
+{
ZenityData *zen_data = data;
- switch (response) {
+ switch (response)
+ {
case GTK_RESPONSE_OK:
zenity_tree_dialog_output ();
zenity_util_exit_code_with_data (ZENITY_OK, zen_data);
@@ -784,57 +854,69 @@ zenity_tree_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;
}
if (channel != NULL &&
g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE)
+ {
g_io_channel_shutdown (channel, TRUE, NULL);
+ }
- gtk_main_quit ();
+ zenity_util_gapp_quit (GTK_WINDOW(widget));
}
static void
zenity_tree_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path,
- GtkTreeViewColumn *tree_col, gpointer data) {
+ GtkTreeViewColumn *tree_col, gpointer data)
+{
ZenityData *zen_data = data;
zenity_tree_dialog_output ();
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
- gtk_main_quit ();
+
+ // FIXME - TEST - not sure how to replace gtk_main_quit here.
+ exit(zen_data->exit_code);
}
static gboolean
-zenity_tree_column_is_hidden (gint column_index) {
- gint i;
-
+zenity_tree_column_is_hidden (int column_index)
+{
if (hide_columns != NULL)
- for (i = 0; hide_columns[i] != 0; i++)
+ {
+ for (int i = 0; hide_columns[i] != 0; i++)
+ {
if (hide_columns[i] == column_index)
return TRUE;
-
+ }
+ }
return FALSE;
}
-static gint *
-zenity_tree_extract_column_indexes (char *indexes, int n_columns) {
+static int *
+zenity_tree_extract_column_indexes (char *indexes, int n_columns)
+{
char **tmp;
- gint *result;
- gint i, j, index;
+ int *result;
+ int i, j, index;
tmp = g_strsplit (indexes, PRINT_HIDE_COLUMN_SEPARATOR, 0);
- result = g_new (gint, 1);
+ result = g_new (int, 1);
- for (j = i = 0; tmp[i] != NULL; i++) {
+ for (j = i = 0; tmp[i] != NULL; i++)
+ {
index = atoi (tmp[i]);
- if (index > 0 && index <= n_columns) {
+ if (index > 0 && index <= n_columns)
+ {
result[j] = index;
j++;
- result = g_renew (gint, result, j + 1);
+ result = g_renew (int, result, j + 1);
}
}
result[j] = 0;
diff --git a/src/util.c b/src/util.c
index b38a4f6e..0e90201b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -304,7 +304,8 @@ zenity_util_return_exit_code (ZenityExitCode value) {
}
void
-zenity_util_exit_code_with_data (ZenityExitCode value, ZenityData *zen_data) {
+zenity_util_exit_code_with_data (ZenityExitCode value, ZenityData *zen_data)
+{
zen_data->exit_code = zenity_util_return_exit_code (value);
}
diff --git a/src/zenity.h b/src/zenity.h
index a23f00d4..a7b59d98 100644
--- a/src/zenity.h
+++ b/src/zenity.h
@@ -2,27 +2,10 @@
#define ZENITY_H
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
G_BEGIN_DECLS
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
-#endif
-#else /* NLS is disabled */
-#define _(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain, String) (String)
-#define dcgettext(Domain, String, Type) (String)
-#define bindtextdomain(Domain, Directory) (Domain)
-#endif
-
typedef struct {
char *dialog_title;
char *window_icon;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
