From cd25d3d905d3b8a7f77c03c70e470fa51940f722 Mon Sep 17 00:00:00 2001 From: ketmar Date: Sat, 14 Sep 2013 06:44:23 +0300 Subject: [PATCH] console.*: cosmetix --- src/console.c | 106 +++++++++++++++++++++++----------------------------------- src/console.h | 7 ++-- 2 files changed, 44 insertions(+), 69 deletions(-) diff --git a/src/console.c b/src/console.c index 3ae9e14..3952845 100644 --- a/src/console.c +++ b/src/console.c @@ -3,18 +3,19 @@ * * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - #include "gtk-all.h" +#include "util-gtk.h" -#include "liblj/consolecommand.h" - +#include #include #include -#include -#include "util-gtk.h" -#include "network.h" -#include "console.h" + #include "conf.h" +#include "console.h" +#include "network.h" + +#include "liblj/consolecommand.h" + typedef struct { GtkWidget *win; @@ -23,21 +24,19 @@ typedef struct { JamAccountLJ *account; } ConsoleUI; -static char * -name_from_type(LJConsoleLineType type) { + +static const char *name_from_type (LJConsoleLineType type) { switch (type) { - case LJ_CONSOLE_LINE_TYPE_INFO: - return "info"; - case LJ_CONSOLE_LINE_TYPE_ERROR: - return "error"; - case LJ_CONSOLE_LINE_TYPE_UNKNOWN: - default: - return NULL; + case LJ_CONSOLE_LINE_TYPE_INFO: return "info"; + case LJ_CONSOLE_LINE_TYPE_ERROR: return "error"; + case LJ_CONSOLE_LINE_TYPE_UNKNOWN: + default: + return NULL; } } -void -console_print(ConsoleUI *cui, char *type, const char *text, ...) { + +void console_print (ConsoleUI *cui, const char *type, const char *text, ...) { char buf[4096]; va_list ap; GtkTextBuffer *buffer; @@ -50,17 +49,15 @@ console_print(ConsoleUI *cui, char *type, const char *text, ...) { buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(cui->display)); gtk_text_buffer_get_end_iter(buffer, &iter); if (type) { - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, - buf, -1, type, NULL); + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, buf, -1, type, NULL); } else { gtk_text_buffer_insert(buffer, &iter, buf, -1); } - gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(cui->display), - cui->mark_end, 0.0, FALSE, 0, 0); + gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(cui->display), cui->mark_end, 0.0, FALSE, 0, 0); } -gboolean -run_console_command(ConsoleUI *cui, const char *command) { + +gboolean run_console_command (ConsoleUI *cui, const char *command) { NetContext *ctx; LJConsoleCommand *cc; int i; @@ -72,15 +69,15 @@ run_console_command(ConsoleUI *cui, const char *command) { cc = lj_consolecommand_new(jam_account_lj_get_user(cui->account), command); ctx = net_ctx_gtk_new(GTK_WINDOW(cui->win), _("Running Command")); - if (!net_run_verb_ctx((LJVerb*)cc, ctx, NULL)) { + if (!net_run_verb_ctx((LJVerb *) cc, ctx, NULL)) { console_print(cui, "error", _("Error running command.\n")); lj_consolecommand_free(cc); net_ctx_gtk_free(ctx); return FALSE; } - for (i = 0; i < cc->linecount; i++) { - char *typename = name_from_type(cc->lines[i].type); + for (i = 0; i < cc->linecount; ++i) { + const char *typename = name_from_type(cc->lines[i].type); console_print(cui, typename, cc->lines[i].text); console_print(cui, typename, "\n"); } @@ -91,23 +88,20 @@ run_console_command(ConsoleUI *cui, const char *command) { return TRUE; } -static void -submit_cb(GtkWidget *w, ConsoleUI *cui) { - char *command; - command = gtk_editable_get_chars(GTK_EDITABLE(cui->entry), 0, -1); - if (run_console_command(cui, command)) - gtk_editable_delete_text(GTK_EDITABLE(cui->entry), 0, -1); +static void submit_cb (GtkWidget *w, ConsoleUI *cui) { + char *command = gtk_editable_get_chars(GTK_EDITABLE(cui->entry), 0, -1); + if (run_console_command(cui, command)) gtk_editable_delete_text(GTK_EDITABLE(cui->entry), 0, -1); g_free(command); } -static void -console_help(GtkWidget *w, ConsoleUI *cui) { + +static void console_help (GtkWidget *w, ConsoleUI *cui) { run_console_command(cui, "help"); } -void -console_dialog_run(GtkWindow *parent, JamAccountLJ *acc) { + +void console_dialog_run (GtkWindow *parent, JamAccountLJ *acc) { ConsoleUI *cui; GtkWidget *vbox, *hbox, *button; GtkTextBuffer *buffer; @@ -115,15 +109,10 @@ console_dialog_run(GtkWindow *parent, JamAccountLJ *acc) { cui = g_new0(ConsoleUI, 1); cui->account = acc; - cui->win = gtk_dialog_new_with_buttons(_("LiveJournal Console"), - parent, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); + cui->win = gtk_dialog_new_with_buttons(_("LiveJournal Console"), parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); jam_win_set_size(GTK_WINDOW(cui->win), 500, 400); - g_signal_connect_swapped(G_OBJECT(cui->win), "response", - G_CALLBACK(gtk_widget_destroy), cui->win); - g_signal_connect_swapped(G_OBJECT(cui->win), "destroy", - G_CALLBACK(g_free), cui); + g_signal_connect_swapped(G_OBJECT(cui->win), "response", G_CALLBACK(gtk_widget_destroy), cui->win); + g_signal_connect_swapped(G_OBJECT(cui->win), "destroy", G_CALLBACK(g_free), cui); geometry_tie(cui->win, GEOM_CONSOLE); vbox = gtk_vbox_new(FALSE, 5); @@ -135,38 +124,25 @@ console_dialog_run(GtkWindow *parent, JamAccountLJ *acc) { button = gtk_button_new_with_mnemonic(_(" _Submit ")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(cui->entry), "activate", - G_CALLBACK(submit_cb), cui); - g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(submit_cb), cui); + g_signal_connect(G_OBJECT(cui->entry), "activate", G_CALLBACK(submit_cb), cui); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(submit_cb), cui); button = gtk_button_new_from_stock(GTK_STOCK_HELP); - g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(console_help), cui); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(console_help), cui); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); cui->display = gtk_text_view_new(); gtk_text_view_set_editable(GTK_TEXT_VIEW(cui->display), FALSE); - gtk_box_pack_start(GTK_BOX(vbox), scroll_wrap(cui->display), - TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), scroll_wrap(cui->display), TRUE, TRUE, 0); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(cui->display)); gtk_text_buffer_get_end_iter(buffer, &end); cui->mark_end = gtk_text_buffer_create_mark(buffer, NULL, &end, FALSE); - gtk_text_buffer_create_tag(buffer, "command", - "family", "monospace", - NULL); - gtk_text_buffer_create_tag(buffer, "info", - "family", "monospace", - "foreground", "darkgreen", - NULL); - gtk_text_buffer_create_tag(buffer, "error", - "family", "monospace", - "weight", PANGO_WEIGHT_BOLD, - "foreground", "red", - NULL); + gtk_text_buffer_create_tag(buffer, "command", "family", "monospace", NULL); + gtk_text_buffer_create_tag(buffer, "info", "family", "monospace", "foreground", "darkgreen", NULL); + gtk_text_buffer_create_tag(buffer, "error", "family", "monospace", "weight", PANGO_WEIGHT_BOLD, "foreground", "red", NULL); jam_dialog_set_contents(GTK_DIALOG(cui->win), vbox); diff --git a/src/console.h b/src/console.h index 98c684e..72734c6 100644 --- a/src/console.h +++ b/src/console.h @@ -1,14 +1,13 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2004 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - #ifndef __LOGJAM_CONSOLE_H__ #define __LOGJAM_CONSOLE_H__ #include "account.h" -void console_dialog_run(GtkWindow *parent, JamAccountLJ *acc); + +extern void console_dialog_run (GtkWindow *parent, JamAccountLJ *acc); + #endif /* __LOGJAM_CONSOLE_H__ */ -- 2.11.4.GIT