From 1324352da51d4dac0541c04fad58f76d200a1305 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 24 Jan 2019 15:27:54 -0200 Subject: [PATCH] Updating print methods. --- src/include/pw3270.h | 12 +----------- src/plugins/dbus3270/gobject.c | 2 +- src/pw3270/print.c | 23 +++++++++++------------ src/pw3270/window.c | 2 +- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/include/pw3270.h b/src/include/pw3270.h index d2d8484..9cf2d10 100644 --- a/src/include/pw3270.h +++ b/src/include/pw3270.h @@ -91,17 +91,7 @@ LIB3270_EXPORT void pw3270_set_action_state(GtkAction *action, gboolean on); - - typedef enum pw3270_src - { - PW3270_SRC_ALL, /**< Screen contents */ - PW3270_SRC_SELECTED, /**< Selected region */ - PW3270_SRC_COPY, /**< Copy buffer */ - - PW3270_SRC_USER - } PW3270_SRC; - - LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, PW3270_SRC src); + LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, LIB3270_PRINT_MODE src); #ifdef HAVE_GTKMAC #include diff --git a/src/plugins/dbus3270/gobject.c b/src/plugins/dbus3270/gobject.c index 12f75c0..1cd90a6 100644 --- a/src/plugins/dbus3270/gobject.c +++ b/src/plugins/dbus3270/gobject.c @@ -559,7 +559,7 @@ void pw3270_dbus_erase_eof(PW3270Dbus *object, DBusGMethodInvocation *context) void pw3270_dbus_print(PW3270Dbus *object, DBusGMethodInvocation *context) { - dbus_g_method_return(context,lib3270_print(pw3270_dbus_get_session_handle(object))); + dbus_g_method_return(context,lib3270_print_all(pw3270_dbus_get_session_handle(object))); } void pw3270_dbus_set_unlock_delay(PW3270Dbus *object, int value, DBusGMethodInvocation *context) diff --git a/src/pw3270/print.c b/src/pw3270/print.c index 0818e02..9f870e2 100644 --- a/src/pw3270/print.c +++ b/src/pw3270/print.c @@ -48,9 +48,9 @@ typedef struct _print_info { - GdkRGBA color[V3270_COLOR_COUNT]; + GdkRGBA color[V3270_COLOR_COUNT]; int show_selection : 1; - PW3270_SRC src; + LIB3270_PRINT_MODE src; GtkWidget * widget; H3270 * session; @@ -185,7 +185,7 @@ unsigned char c; unsigned short attr; - if(!lib3270_get_element(info->session,baddr++,&c,&attr) && (info->src == PW3270_SRC_ALL || (attr & LIB3270_ATTR_SELECTED))) + if(!lib3270_get_element(info->session,baddr++,&c,&attr) && (info->src == LIB3270_PRINT_ALL || (attr & LIB3270_ATTR_SELECTED))) { if(!info->show_selection) attr &= ~LIB3270_ATTR_SELECTED; @@ -506,7 +506,7 @@ static gchar * enum_to_string(GType type, guint enum_value) // Selection checkbox widget = gtk_check_button_new_with_label( _("Print selection box") ); - if(info->src == PW3270_SRC_ALL) + if(info->src == LIB3270_PRINT_ALL) { info->show_selection = get_boolean_from_config("print","selection",FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),info->show_selection); @@ -798,12 +798,12 @@ static gchar * enum_to_string(GType type, guint enum_value) void print_all_action(GtkAction *action, GtkWidget *widget) { - pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, PW3270_SRC_ALL); + pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_ALL); } void print_selected_action(GtkAction *action, GtkWidget *widget) { - pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, PW3270_SRC_SELECTED); + pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_SELECTED); } static void draw_text(GtkPrintOperation *prt, GtkPrintContext *context, gint pg, PRINT_INFO *info) @@ -833,10 +833,10 @@ static gchar * enum_to_string(GType type, guint enum_value) void print_copy_action(GtkAction *action, GtkWidget *widget) { - pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, PW3270_SRC_COPY); + pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_COPY); } - LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, PW3270_SRC src) + LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, LIB3270_PRINT_MODE src) { PRINT_INFO * info = NULL; GtkPrintOperation * print; @@ -862,13 +862,12 @@ static gchar * enum_to_string(GType type, guint enum_value) switch(src) { - case PW3270_SRC_ALL: - case PW3270_SRC_SELECTED: - case PW3270_SRC_USER: + case LIB3270_PRINT_ALL: + case LIB3270_PRINT_SELECTED: g_signal_connect(print,"draw_page",G_CALLBACK(draw_screen),info); break; - case PW3270_SRC_COPY: + case LIB3270_PRINT_COPY: text = v3270_get_copy(widget); diff --git a/src/pw3270/window.c b/src/pw3270/window.c index 4651f12..851f3ae 100644 --- a/src/pw3270/window.c +++ b/src/pw3270/window.c @@ -652,7 +652,7 @@ static void print_all(GtkWidget *widget, GtkWidget *window) { - pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, PW3270_SRC_ALL); + pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_ALL); } static void toggle_changed(GtkWidget *widget, LIB3270_TOGGLE id, gboolean toggled, const gchar *name, GtkWindow *toplevel) -- libgit2 0.21.2