From 44977a0a7ed8735043d905282f77b01c759442dd Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 14 Jan 2014 23:37:46 +0000 Subject: [PATCH] Implementando propriedade "model" no widget --- src/include/lib3270.h | 3 ++- src/lib3270/ctlr.c | 9 ++++++++- src/pw3270/main.c | 2 +- src/pw3270/v3270/widget.c | 20 ++++++++++++++++++++ src/pw3270/window.c | 4 ++-- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/include/lib3270.h b/src/include/lib3270.h index 0597e6a..b41c36f 100644 --- a/src/include/lib3270.h +++ b/src/include/lib3270.h @@ -979,7 +979,8 @@ // LIB3270_EXPORT int lib3270_set_model(H3270 *session, int model); LIB3270_EXPORT int lib3270_set_model(H3270 *hSession, const char *name); - LIB3270_EXPORT int lib3270_get_model(H3270 *session); + LIB3270_EXPORT const char * lib3270_get_model(H3270 *session); + LIB3270_EXPORT int lib3270_get_model_number(H3270 *hSession); LIB3270_EXPORT int lib3270_is_protected(H3270 *h, unsigned int baddr); diff --git a/src/lib3270/ctlr.c b/src/lib3270/ctlr.c index 824bb81..e5b9a74 100644 --- a/src/lib3270/ctlr.c +++ b/src/lib3270/ctlr.c @@ -234,11 +234,18 @@ static int parse_model_number(H3270 *session, const char *m) * @param hSession selected 3270 session. * @return Current model number. */ -int lib3270_get_model(H3270 *hSession) +int lib3270_get_model_number(H3270 *hSession) { + CHECK_SESSION_HANDLE(hSession); return hSession->model_num; } +const char * lib3270_get_model(H3270 *hSession) +{ + CHECK_SESSION_HANDLE(hSession); + return hSession->model_name; +} + /** * Deal with the relationships between model numbers and rows/cols. * diff --git a/src/pw3270/main.c b/src/pw3270/main.c index f107dd1..33f9447 100644 --- a/src/pw3270/main.c +++ b/src/pw3270/main.c @@ -407,7 +407,7 @@ int main(int argc, char *argv[]) { "toggleset", 'S', 0, G_OPTION_ARG_STRING, &toggleset, N_( "Set toggles ON" ), NULL }, { "togglereset", 'R', 0, G_OPTION_ARG_STRING, &togglereset, N_( "Set toggles OFF" ), NULL }, { "charset", 'C', 0, G_OPTION_ARG_STRING, &charset, N_( "Set host charset" ), NULL }, - { "model", 'M', 0, G_OPTION_ARG_STRING, &model, N_( "The model of 3270 display to be emulated." ), NULL }, + { "model", 'M', 0, G_OPTION_ARG_STRING, &model, N_( "The model of 3270 display to be emulated" ), NULL }, #if defined( HAVE_SYSLOG ) { "syslog", 'l', 0, G_OPTION_ARG_NONE, &log_to_syslog, N_( "Send messages to syslog" ), NULL }, diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c index f2b045f..e5447c8 100644 --- a/src/pw3270/v3270/widget.c +++ b/src/pw3270/v3270/widget.c @@ -79,6 +79,7 @@ /* Widget properties */ PROP_ONLINE, PROP_SELECTION, + PROP_MODEL, /* Toggles - always the last one, the real values are PROP_TOGGLE+LIB3270_TOGGLE */ PROP_TOGGLE @@ -342,6 +343,9 @@ static void v3270_set_property(GObject *object, guint prop_id, const GValue *val switch (prop_id) { + case PROP_MODEL: + lib3270_set_model(window->host,g_value_get_string(value)); + break; default: if(prop_id < (PROP_TOGGLE + LIB3270_TOGGLE_COUNT)) @@ -360,6 +364,10 @@ static void v3270_get_property(GObject *object,guint prop_id, GValue *value, GPa switch (prop_id) { + case PROP_MODEL: + g_value_set_string(value,lib3270_get_model(window->host)); + break; + case PROP_ONLINE: g_value_set_boolean(value,lib3270_is_connected(window->host) ? TRUE : FALSE ); break; @@ -662,6 +670,13 @@ static void v3270_class_init(v3270Class *klass) FALSE,G_PARAM_READABLE); g_object_class_install_property(gobject_class,PROP_SELECTION,v3270_properties[PROP_SELECTION]); + v3270_properties[PROP_MODEL] = g_param_spec_string( + "model", + "model", + "The model of 3270 display to be emulated", + FALSE,G_PARAM_READABLE|G_PARAM_WRITABLE); + g_object_class_install_property(gobject_class,PROP_MODEL,v3270_properties[PROP_MODEL]); + // Toggle properties int f; @@ -878,6 +893,11 @@ static void update_screen_size(H3270 *session,unsigned short rows, unsigned shor static void update_model(H3270 *session, const char *name, int model, int rows, int cols) { +#if GTK_CHECK_VERSION(2,26,0) + g_object_notify_by_pspec(G_OBJECT(session->widget), v3270_properties[PROP_MODEL]); +#else + g_object_notify(G_OBJECT(session->widget),"model"); +#endif // GTK_CHECK_VERSION g_signal_emit(GTK_WIDGET(session->widget),v3270_widget_signal[SIGNAL_MODEL_CHANGED], 0, (guint) model, name); } diff --git a/src/pw3270/window.c b/src/pw3270/window.c index 1d343a9..ee98e2e 100644 --- a/src/pw3270/window.c +++ b/src/pw3270/window.c @@ -347,7 +347,7 @@ char name[2]; int model = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),"mode_3270")); - if(model == lib3270_get_model(v3270_get_session(widget))) + if(model == lib3270_get_model_number(v3270_get_session(widget))) return; trace("screen model on widget %p changes to %d",widget,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),"mode_3270"))); @@ -362,7 +362,7 @@ { static const gchar * text[] = { "80x24", "80x32", "80x43", "132x27" }; GtkWidget * menu = gtk_menu_new(); - int model = lib3270_get_model(v3270_get_session(obj))-2; + int model = lib3270_get_model_number(v3270_get_session(obj))-2; GSList * group = NULL; GtkWidget * item; int f; -- libgit2 0.21.2