From 4ee3a9c71bcdab171f6084d7d8a3866686314235 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 14 Aug 2019 10:34:27 -0300 Subject: [PATCH] Updating lib3270 methods. --- src/terminal/blink.c | 12 +----------- src/terminal/callbacks.c | 4 +--- src/terminal/mouse.c | 2 +- src/terminal/oia.c | 4 +--- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/terminal/blink.c b/src/terminal/blink.c index 3971cd6..2da7de3 100644 --- a/src/terminal/blink.c +++ b/src/terminal/blink.c @@ -46,7 +46,7 @@ rc = TRUE; } - if(lib3270_get_secure(widget->host) == LIB3270_SSL_NEGOTIATING) + if(lib3270_get_ssl_state(widget->host) == LIB3270_SSL_NEGOTIATING) { GdkRectangle * r; cairo_t * cr = v3270_oia_set_update_region(widget,&r,V3270_OIA_SSL); @@ -58,16 +58,6 @@ rc = TRUE; } - /* - if(!widget->script.id) - return FALSE; - - update_text_field(widget,1,V3270_OIA_SCRIPT,widget->script.blink ? 'S' : ' '); - widget->script.blink = !widget->script.blink; - - return TRUE; - */ - return rc; } diff --git a/src/terminal/callbacks.c b/src/terminal/callbacks.c index 023c533..2802b6a 100644 --- a/src/terminal/callbacks.c +++ b/src/terminal/callbacks.c @@ -386,11 +386,9 @@ static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title static gboolean bg_update_ssl(H3270 *session) { -// trace("%s(%p,%p)",__FUNCTION__,session,lib3270_get_user_data(session)); - v3270_blink_ssl(GTK_V3270(lib3270_get_user_data(session))); - if(lib3270_get_secure(session) == LIB3270_SSL_NEGOTIATING) + if(lib3270_get_ssl_state(session) == LIB3270_SSL_NEGOTIATING) v3270_start_blinking(GTK_WIDGET(lib3270_get_user_data(session))); return FALSE; diff --git a/src/terminal/mouse.c b/src/terminal/mouse.c index 90a9bc8..53b9b98 100644 --- a/src/terminal/mouse.c +++ b/src/terminal/mouse.c @@ -269,7 +269,7 @@ gboolean v3270_motion_notify_event(GtkWidget *widget, GdkEventMotion *event) if(event->x >= terminal->oia.rect[V3270_OIA_SSL].x && event->x <= (terminal->oia.rect[V3270_OIA_SSL].x + terminal->oia.rect[V3270_OIA_SSL].width)) { - switch(lib3270_get_secure(terminal->host)) + switch(lib3270_get_ssl_state(terminal->host)) { case LIB3270_SSL_UNSECURE: /**< No secure connection */ id = LIB3270_POINTER_QUESTION; diff --git a/src/terminal/oia.c b/src/terminal/oia.c index 0cfd84a..2f360e1 100644 --- a/src/terminal/oia.c +++ b/src/terminal/oia.c @@ -347,15 +347,13 @@ static void draw_xbm(cairo_t *cr, GdkRectangle *rect, int width, int height, uns void v3270_draw_ssl_status(v3270 *widget, cairo_t *cr, GdkRectangle *rect) { - // v3270_draw_ssl_status(cr,terminal->host,&terminal->font,terminal->color,r); - gdk_cairo_set_source_rgba(cr,widget->color+V3270_COLOR_OIA_BACKGROUND); cairo_translate(cr, rect->x, rect->y); cairo_rectangle(cr, 0, 0, rect->width, rect->height); cairo_fill(cr); - switch(lib3270_get_secure(widget->host)) + switch(lib3270_get_ssl_state(widget->host)) { case LIB3270_SSL_UNDEFINED: // Undefined. break; -- libgit2 0.21.2