Download as
Browse Code »

Commit 11f225721994f7eca6bbc45cfba6661ece9b9811

Authored by perry.werneck@gmail.com
1 parent b48cbcf0
Exists in master

Controle sobre o que mudou no buffer do terminal passa a ser feito direto pela b… 

…iblioteca para evitar chamadas desnecessárias no processo de atualização da GUI
Showing 11 changed files with 120 additions and 112 deletions   Show diff stats
latest/src/gtk2/mouse.c
  Diff comments   View file @11f2257
... ... @@ -151,7 +151,7 @@
151 151 {
152 152 int ret = 0;
153 153  
154   - if( !(*screen->content[baddr+1].ch == 'F' && FA_IS_PROTECTED(get_field_attribute(baddr))) )
  154 + if( !(*screen->content[baddr+1].ch == 'F' && FA_IS_PROTECTED(get_field_attribute(NULL,baddr))) )
155 155 return ret;
156 156  
157 157 baddr++;
... ... @@ -220,8 +220,8 @@
220 220 {
221 221 if(valid_terminal_window())
222 222 {
223   - int baddr = find_field_attribute(cursor_position);
224   - int length = find_field_length(baddr);
  223 + int baddr = find_field_attribute(NULL,cursor_position);
  224 + int length = find_field_length(NULL,baddr);
225 225  
226 226 SetSelection(FALSE);
227 227  
... ...
latest/src/gtk2/screen.c
  Diff comments   View file @11f2257
... ... @@ -62,7 +62,7 @@
62 62  
63 63 /*---[ Prototipes ]----------------------------------------------------------------------------------------*/
64 64  
65   - static int addch(int row, int col, int c, unsigned short attr);
  65 + static int addch(int row, int col, unsigned char c, unsigned short attr);
66 66 static void set_charset(char *dcs);
67 67  
68 68 static void erase(void);
... ... @@ -104,7 +104,7 @@
104 104  
105 105 model_changed, // void (*model_changed)(H3270 *session, const char *name, int model, int cols, int rows);
106 106  
107   - addch, // void (*addch)(int row, int col, int c, int attr);
  107 + addch, // void (*addch)(int row, int col, unsigned char c, int attr);
108 108 set_charset, // void (*charset)(char *dcs);
109 109 settitle, // void (*title)(char *text);
110 110 gdk_beep, // void (*ring_bell)(void);
... ... @@ -272,7 +272,7 @@
272 272  
273 273 }
274 274  
275   - static int addch(int row, int col, int c, unsigned short attr)
  275 + static int addch(int row, int col, unsigned char c, unsigned short attr)
276 276 {
277 277  
278 278 int baddr = (row*screen->cols)+col;
... ...
latest/src/include/lib3270.h
  Diff comments   View file @11f2257
... ... @@ -179,7 +179,10 @@
179 179 LIB3270_EXPORT int lib3270_get_cursor_address(H3270 *h);
180 180  
181 181  
182   - LIB3270_EXPORT STATUS_CODE lib3270_get_oia_status(H3270 *h);
  182 + LIB3270_EXPORT STATUS_CODE lib3270_get_oia_status(H3270 *h);
  183 + LIB3270_EXPORT const char * lib3270_get_luname(H3270 *h);
  184 + LIB3270_EXPORT const char * lib3270_get_host(H3270 *h);
  185 +
183 186  
184 187  
185 188 #endif // LIB3270_H_INCLUDED
... ...
latest/src/include/lib3270/api.h
  Diff comments   View file @11f2257
... ... @@ -222,8 +222,8 @@
222 222 // screen info
223 223 int ov_rows;
224 224 int ov_cols;
225   - int first_changed;
226   - int last_changed;
  225 +// int first_changed;
  226 +// int last_changed;
227 227 int maxROWS;
228 228 int maxCOLS;
229 229 int rows;
... ... @@ -235,6 +235,14 @@
235 235  
236 236 int formatted; /**< set in screen_disp */
237 237  
  238 + // host.c
  239 + char std_ds_host;
  240 + char no_login_host;
  241 + char non_tn3270e_host;
  242 + char passthru_host;
  243 + char ssl_host;
  244 + char ever_3270;
  245 +
238 246 // Widget info
239 247 void * widget;
240 248  
... ... @@ -279,14 +287,19 @@
279 287 /** extended attributes */
280 288 struct ea
281 289 {
282   - unsigned char cc; /**< EBCDIC or ASCII character code */
283   - unsigned char fa; /**< field attribute, it nonzero */
284   - unsigned char fg; /**< foreground color (0x00 or 0xf<n>) */
285   - unsigned char bg; /**< background color (0x00 or 0xf<n>) */
286   - unsigned char gr; /**< ANSI graphics rendition bits */
287   - unsigned char cs; /**< character set (GE flag, or 0..2) */
288   - unsigned char ic; /**< input control (DBCS) */
289   - unsigned char db; /**< DBCS state */
  290 + unsigned char cc; /**< EBCDIC or ASCII character code */
  291 + unsigned char fa; /**< field attribute, it nonzero */
  292 + unsigned char fg; /**< foreground color (0x00 or 0xf<n>) */
  293 + unsigned char bg; /**< background color (0x00 or 0xf<n>) */
  294 + unsigned char gr; /**< ANSI graphics rendition bits */
  295 + unsigned char cs; /**< character set (GE flag, or 0..2) */
  296 + unsigned char ic; /**< input control (DBCS) */
  297 + unsigned char db; /**< DBCS state */
  298 +
  299 + /* Updated by addch() */
  300 + unsigned char chr; /**< ASCII character code */
  301 + unsigned short attr; /**< Converted character attribute (color & etc) */
  302 +
290 303 };
291 304 #define GR_BLINK 0x01
292 305 #define GR_REVERSE 0x02
... ... @@ -466,7 +479,7 @@
466 479 void (*Warning)(const char *fmt, va_list arg);
467 480 void (*SysError)(const char *title, const char *message, const char *system);
468 481 void (*model_changed)(H3270 *session, const char *name, int model, int cols, int rows);
469   - int (*addch)(int row, int col, int c, unsigned short attr);
  482 + int (*addch)(int row, int col, unsigned char c, unsigned short attr);
470 483 void (*charset)(char *dcs);
471 484 void (*title)(char *text);
472 485 void (*ring_bell)(void);
... ... @@ -554,8 +567,8 @@
554 567 LIB3270_EXPORT int get_3270_model(H3270 *session);
555 568  
556 569 /* Get connection info */
557   - LIB3270_EXPORT const char * get_connected_lu(H3270 *h);
558   - LIB3270_EXPORT const char * get_current_host(H3270 *h);
  570 + #define get_connected_lu(h) lib3270_get_luname(h)
  571 + #define get_current_host(h) lib3270_get_host(h)
559 572  
560 573 LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
561 574  
... ...
latest/src/lib/ctlr.c
  Diff comments   View file @11f2257
... ... @@ -296,7 +296,7 @@ static void ctlr_connect(H3270 *session, int ignored unused, void *dunno)
296 296 ticking_stop(session);
297 297 status_untiming(session);
298 298  
299   - if (ever_3270)
  299 + if (session->ever_3270)
300 300 ea_buf[-1].fa = FA_PRINTABLE | FA_MODIFY;
301 301 else
302 302 ea_buf[-1].fa = FA_PRINTABLE | FA_PROTECT;
... ... @@ -2618,6 +2618,7 @@ void ctlr_scroll(void)
2618 2618 */
2619 2619 void changed(H3270 *session, int bstart, int bend)
2620 2620 {
  2621 + /*
2621 2622 if(session->first_changed < 0)
2622 2623 {
2623 2624 session->first_changed = bstart;
... ... @@ -2629,7 +2630,7 @@ void changed(H3270 *session, int bstart, int bend)
2629 2630  
2630 2631 if(bend > session->last_changed)
2631 2632 session->last_changed = bend;
2632   -
  2633 + */
2633 2634 }
2634 2635  
2635 2636 /*
... ...
latest/src/lib/globals.h
  Diff comments   View file @11f2257
... ... @@ -209,8 +209,8 @@ LIB3270_INTERNAL char *hostname;
209 209 // LIB3270_INTERNAL int model_num;
210 210 LIB3270_INTERNAL Boolean no_login_host;
211 211 LIB3270_INTERNAL Boolean non_tn3270e_host;
212   -LIB3270_INTERNAL int ov_cols, ov_rows;
213   -LIB3270_INTERNAL Boolean passthru_host;
  212 +// LIB3270_INTERNAL int ov_cols, ov_rows;
  213 + LIB3270_INTERNAL Boolean passthru_host;
214 214 LIB3270_INTERNAL const char *programname;
215 215 LIB3270_INTERNAL char *qualified_host;
216 216 LIB3270_INTERNAL char *reconnect_host;
... ...
latest/src/lib/glue.c
  Diff comments   View file @11f2257
... ... @@ -167,8 +167,8 @@ H3270 * lib3270_session_new(const char *model)
167 167 hSession->sz = sizeof(H3270);
168 168 hSession->sock = -1;
169 169 hSession->model_num = -1;
170   - hSession->first_changed = -1;
171   - hSession->last_changed = -1;
  170 +// hSession->first_changed = -1;
  171 +// hSession->last_changed = -1;
172 172 hSession->cstate = NOT_CONNECTED;
173 173 hSession->oia_status = -1;
174 174  
... ... @@ -255,8 +255,8 @@ H3270 * lib3270_session_new(const char *model)
255 255 return NULL;
256 256  
257 257 kybd_init();
258   - hostfile_init();
259   - hostfile_init();
  258 +// hostfile_init();
  259 +// hostfile_init();
260 260 ansi_init();
261 261  
262 262 #if defined(X3270_FT)
... ...
latest/src/lib/host.c
  Diff comments   View file @11f2257
... ... @@ -57,23 +57,23 @@
57 57 #define RECONNECT_MS 2000 /* 2 sec before reconnecting to host */
58 58 #define RECONNECT_ERR_MS 5000 /* 5 sec before reconnecting to host */
59 59  
60   -#define MAX_RECENT 5
  60 +// #define MAX_RECENT 5
61 61  
62 62 // enum cstate cstate = NOT_CONNECTED;
63   -Boolean std_ds_host = False;
64   -Boolean no_login_host = False;
65   -Boolean non_tn3270e_host = False;
66   -Boolean passthru_host = False;
67   -Boolean ssl_host = False;
68   -Boolean ever_3270 = False;
  63 +// Boolean std_ds_host = False;
  64 +// Boolean no_login_host = False;
  65 +// Boolean non_tn3270e_host = False;
  66 +// Boolean passthru_host = False;
  67 +// Boolean ssl_host = False;
  68 +// Boolean ever_3270 = False;
69 69  
70 70 // char *full_current_host = CN;
71 71 //unsigned short current_port;
72 72 //char *reconnect_host = CN;
73 73 //char *qualified_host = CN;
74 74  
75   -struct host *hosts = (struct host *)NULL;
76   -static struct host *last_host = (struct host *)NULL;
  75 +// struct host *hosts = (struct host *)NULL;
  76 +// static struct host *last_host = (struct host *)NULL;
77 77 // static Boolean auto_reconnect_inprogress = False;
78 78 // static int net_sock = -1;
79 79  
... ... @@ -105,7 +105,7 @@ static char * stoken(char **s)
105 105  
106 106 /*
107 107 * Read the host file
108   - */
  108 + */ /*
109 109 void
110 110 hostfile_init(void)
111 111 {
... ... @@ -155,10 +155,10 @@ hostfile_init(void)
155 155 }
156 156 h->hostname = NewString(hostname);
157 157  
158   - /*
159   - * Quick syntax extension to allow the hosts file to
160   - * specify a port as host/port.
161   - */
  158 + //
  159 + // Quick syntax extension to allow the hosts file to
  160 + // specify a port as host/port.
  161 + //
162 162 if ((slash = strchr(h->hostname, '/')))
163 163 *slash = ':';
164 164  
... ... @@ -187,13 +187,14 @@ hostfile_init(void)
187 187  
188 188 // #if defined(X3270_DISPLAY)
189 189 // save_recent(CN);
190   -// #endif /*]*/
  190 +// #endif
191 191 }
  192 +*/
192 193  
193 194 /*
194 195 * Look up a host in the list. Turns aliases into real hostnames, and
195 196 * finds loginstrings.
196   - */
  197 + */ /*
197 198 static int
198 199 hostfile_lookup(const char *name, char **hostname, char **loginstring)
199 200 {
... ... @@ -215,6 +216,7 @@ hostfile_lookup(const char *name, char **hostname, char **loginstring)
215 216 }
216 217 return 0;
217 218 }
  219 +*/
218 220  
219 221 #if defined(LOCAL_PROCESS) /*[*/
220 222 /* Recognize and translate "-e" options. */
... ... @@ -247,14 +249,14 @@ parse_localprocess(const char *s)
247 249 * Returns NULL if there is a syntax error.
248 250 */
249 251 static char *
250   -split_host(char *s, Boolean *ansi, Boolean *std_ds, Boolean *passthru,
251   - Boolean *non_e, Boolean *secure, Boolean *no_login, char *xluname,
252   - char **port, Boolean *needed)
  252 +split_host(char *s, char *ansi, char *std_ds, char *passthru,
  253 + char *non_e, char *secure, char *no_login, char *xluname,
  254 + char **port, char *needed)
253 255 {
254 256 char *lbracket = CN;
255 257 char *at = CN;
256 258 char *r = NULL;
257   - Boolean colon = False;
  259 + char colon = False;
258 260  
259 261 *ansi = False;
260 262 *std_ds = False;
... ... @@ -486,7 +488,7 @@ split_success:
486 488 static int do_connect(H3270 *hSession, const char *n)
487 489 {
488 490 char nb[2048]; /* name buffer */
489   - char *s; /* temporary */
  491 + char *s; /* temporary */
490 492 const char *chost; /* to whom we will connect */
491 493 char *target_name;
492 494 char *ps = CN;
... ... @@ -534,26 +536,26 @@ static int do_connect(H3270 *hSession, const char *n)
534 536 Boolean needed;
535 537  
536 538 /* Strip off and remember leading qualifiers. */
537   - if ((s = split_host(nb, &ansi_host, &std_ds_host,
538   - &passthru_host, &non_tn3270e_host, &ssl_host,
539   - &no_login_host, hSession->luname, &port,
  539 + if ((s = split_host(nb, &ansi_host, &hSession->std_ds_host,
  540 + &hSession->passthru_host, &hSession->non_tn3270e_host, &hSession->ssl_host,
  541 + &hSession->no_login_host, hSession->luname, &port,
540 542 &needed)) == CN)
541 543 return -1;
542 544  
543   - /* Look up the name in the hosts file. */
  545 + /* Look up the name in the hosts file. */ /*
544 546 if (!needed && hostfile_lookup(s, &target_name, &ps)) {
545   - /*
546   - * Rescan for qualifiers.
547   - * Qualifiers, LU names, and ports are all overridden
548   - * by the hosts file.
549   - */
  547 + //
  548 + // Rescan for qualifiers.
  549 + // Qualifiers, LU names, and ports are all overridden
  550 + // by the hosts file.
  551 + //
550 552 Free(s);
551 553 if (!(s = split_host(target_name, &ansi_host,
552 554 &std_ds_host, &passthru_host, &non_tn3270e_host,
553 555 &ssl_host, &no_login_host, hSession->luname, &port,
554 556 &needed)))
555 557 return -1;
556   - }
  558 + } */
557 559 chost = s;
558 560  
559 561 /* Default the port. */
... ... @@ -588,7 +590,7 @@ static int do_connect(H3270 *hSession, const char *n)
588 590  
589 591 Replace(hSession->qualified_host,
590 592 xs_buffer("%s%s%s%s:%s",
591   - ssl_host? "L:": "",
  593 + hSession->ssl_host? "L:": "",
592 594 has_colons? "[": "",
593 595 chost,
594 596 has_colons? "]": "",
... ... @@ -596,7 +598,7 @@ static int do_connect(H3270 *hSession, const char *n)
596 598  
597 599  
598 600 /* Attempt contact. */
599   - ever_3270 = False;
  601 + hSession->ever_3270 = False;
600 602 hSession->net_sock = net_connect(chost, port, localprocess_cmd != CN, &resolving,&pending);
601 603  
602 604 if (hSession->net_sock < 0 && !resolving)
... ... @@ -689,8 +691,7 @@ static void try_reconnect(H3270 *session)
689 691  
690 692 void host_disconnect(H3270 *h, int failed)
691 693 {
692   - if(!h)
693   - h = &h3270;
  694 + CHECK_SESSION_HANDLE(h);
694 695  
695 696 if (CONNECTED || HALF_CONNECTED)
696 697 {
... ... @@ -731,7 +732,7 @@ host_in3270(enum cstate new_cstate)
731 732 new_cstate == CONNECTED_TN3270E);
732 733  
733 734 h3270.cstate = new_cstate;
734   - ever_3270 = now3270;
  735 + h3270.ever_3270 = now3270;
735 736 st_changed(ST_3270_MODE, now3270);
736 737 }
737 738  
... ... @@ -747,8 +748,9 @@ host_connected(void)
747 748 #endif /*]*/
748 749 }
749 750  
750   -#if defined(X3270_DISPLAY) /*[*/
751   -/* Comparison function for the qsort. */
  751 +/*
  752 +#if defined(X3270_DISPLAY)
  753 +// Comparison function for the qsort.
752 754 static int
753 755 host_compare(const void *e1, const void *e2)
754 756 {
... ... @@ -762,17 +764,18 @@ host_compare(const void *e1, const void *e2)
762 764 r = 1;
763 765 else
764 766 r = 0;
765   -#if defined(CFDEBUG) /*[*/
  767 +#if defined(CFDEBUG)
766 768 printf("%s %ld %d %s %ld\n",
767 769 h1->name, h1->connect_time,
768 770 r,
769 771 h2->name, h2->connect_time);
770   -#endif /*]*/
  772 +#endif
771 773 return r;
772 774 }
773   -#endif /*]*/
  775 +#endif
  776 +
774 777  
775   -#if defined(CFDEBUG) /*[*/
  778 +#if defined(CFDEBUG)
776 779 static void
777 780 dump_array(const char *when, struct host **array, int nh)
778 781 {
... ... @@ -783,9 +786,9 @@ dump_array(const char *when, struct host **array, int nh)
783 786 printf(" %15s %ld\n", array[i]->name, array[i]->connect_time);
784 787 }
785 788 }
786   -#endif /*]*/
  789 +#endif
  790 +
787 791  
788   -/*
789 792 #if defined(X3270_DISPLAY)
790 793 static void
791 794 save_recent(const char *hn)
... ... @@ -1039,16 +1042,14 @@ LIB3270_EXPORT int lib3270_reconnect(H3270 *h,int wait)
1039 1042 return 0;
1040 1043 }
1041 1044  
1042   -LIB3270_EXPORT const char * get_connected_lu(H3270 *h)
  1045 +LIB3270_EXPORT const char * lib3270_get_luname(H3270 *h)
1043 1046 {
1044   - if(h)
1045   - return h->connected_lu;
1046   - return h3270.connected_lu;
  1047 + CHECK_SESSION_HANDLE(h);
  1048 + return h->connected_lu;
1047 1049 }
1048 1050  
1049   -LIB3270_EXPORT const char * get_current_host(H3270 *h)
  1051 +LIB3270_EXPORT const char * lib3270_get_host(H3270 *h)
1050 1052 {
1051   - if(h)
1052   - return h->current_host;
1053   - return h3270.current_host;
  1053 + CHECK_SESSION_HANDLE(h);
  1054 + return h->current_host;
1054 1055 }
... ...
latest/src/lib/screen.c
  Diff comments   View file @11f2257
... ... @@ -99,16 +99,15 @@ void set_display_charset(char *dcs)
99 99 callbacks->charset(dcs);
100 100 }
101 101  
102   -/*
103   -static void addch(int row, int col, int c, int attr)
  102 +static void addch(H3270 *session, int baddr, unsigned char c, unsigned short attr)
104 103 {
105   - if(callbacks && callbacks->addch)
106   - callbacks->addch(row, col, c, attr);
107   -}
108   -*/
  104 + if(ea_buf[baddr].chr == c && ea_buf[baddr].attr == attr)
  105 + return;
  106 +
  107 + /* Converted char has changed, update it */
  108 + ea_buf[baddr].chr = c;
  109 + ea_buf[baddr].attr = attr;
109 110  
110   -static void addch(H3270 *session, int baddr, unsigned short c, int attr)
111   -{
112 111 if(callbacks && callbacks->addch)
113 112 callbacks->addch(baddr/session->cols, baddr%session->cols, c, attr);
114 113 }
... ... @@ -181,15 +180,6 @@ static unsigned short color_from_fa(unsigned char fa)
181 180 }
182 181  
183 182 /*
184   -static int reverse_colors(int a)
185   -{
186   - int bg = (a & 0xF0) >> 4;
187   - int fg = (a & 0x0F);
188   - return get_color_pair(bg,fg) | (a&0xFF00);
189   -}
190   -*/
191   -
192   -/*
193 183 * Find the display attributes for a baddr, fa_addr and fa.
194 184 */
195 185 static unsigned short calc_attrs(int baddr, int fa_addr, int fa)
... ... @@ -405,8 +395,8 @@ static void screen_update(H3270 *session, int bstart, int bend)
405 395  
406 396 void screen_disp(H3270 *session)
407 397 {
408   - session->first_changed = -1;
409   - session->last_changed = -1;
  398 +// session->first_changed = -1;
  399 +// session->last_changed = -1;
410 400  
411 401 screen_update(session,0,session->rows*session->cols);
412 402  
... ...
latest/src/lib/telnet.c
  Diff comments   View file @11f2257
... ... @@ -464,7 +464,7 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
464 464 Replace(h3270.hostname, NewString(host));
465 465  
466 466 /* get the passthru host and port number */
467   - if (passthru_host) {
  467 + if (h3270.passthru_host) {
468 468 const char *hn;
469 469  
470 470 hn = getenv("INTERNET_HOST");
... ... @@ -509,7 +509,7 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
509 509  
510 510 /* fill in the socket address of the given host */
511 511 (void) memset((char *) &haddr, 0, sizeof(haddr));
512   - if (passthru_host) {
  512 + if (h3270.passthru_host) {
513 513 haddr.sin.sin_family = AF_INET;
514 514 (void) memmove(&haddr.sin.sin_addr, passthru_haddr,
515 515 passthru_len);
... ... @@ -632,7 +632,7 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
632 632 /* init ssl */
633 633 #if defined(HAVE_LIBSSL) /*[*/
634 634 last_ssl_error = 0;
635   - if (ssl_host)
  635 + if (h3270.ssl_host)
636 636 ssl_init();
637 637 #endif /*]*/
638 638  
... ... @@ -663,7 +663,7 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
663 663 #endif /*]*/
664 664  
665 665 /* set up temporary termtype */
666   - if (appres.termname == CN && std_ds_host) {
  666 + if (appres.termname == CN && h3270.std_ds_host) {
667 667 (void) sprintf(ttype_tmpval, "IBM-327%c-%d",
668 668 appres.m3279 ? '9' : '8', h3270.model_num);
669 669 h3270.termtype = ttype_tmpval;
... ... @@ -768,11 +768,11 @@ net_connected(void)
768 768 }
769 769 }
770 770  
771   - trace_dsn("Connected to %s, port %u%s.\n", h3270.hostname, h3270.current_port,ssl_host? " via SSL": "");
  771 + trace_dsn("Connected to %s, port %u%s.\n", h3270.hostname, h3270.current_port,h3270.ssl_host? " via SSL": "");
772 772  
773 773 #if defined(HAVE_LIBSSL) /*[*/
774 774 /* Set up SSL. */
775   - if (ssl_host && !h3270.secure_connection) {
  775 + if (h3270.ssl_host && !h3270.secure_connection) {
776 776 if (SSL_set_fd(ssl_con, h3270.sock) != 1) {
777 777 trace_dsn("Can't set fd!\n");
778 778 }
... ... @@ -827,7 +827,7 @@ net_connected(void)
827 827 check_linemode(True);
828 828  
829 829 /* write out the passthru hostname and port nubmer */
830   - if (passthru_host) {
  830 + if (h3270.passthru_host) {
831 831 char *buf;
832 832  
833 833 buf = Malloc(strlen(h3270.hostname) + 32);
... ... @@ -1287,7 +1287,7 @@ telnet_fsm(unsigned char c)
1287 1287 #if defined(X3270_TN3270E) /*[*/
1288 1288 case TELOPT_TN3270E:
1289 1289 #endif /*]*/
1290   - if (c != TELOPT_TN3270E || !non_tn3270e_host) {
  1290 + if (c != TELOPT_TN3270E || !h3270.non_tn3270e_host) {
1291 1291 if (!hisopts[c]) {
1292 1292 hisopts[c] = 1;
1293 1293 do_opt[2] = c;
... ... @@ -1348,7 +1348,7 @@ telnet_fsm(unsigned char c)
1348 1348 #if defined(HAVE_LIBSSL) /*[*/
1349 1349 case TELOPT_STARTTLS:
1350 1350 #endif /*]*/
1351   - if (c == TELOPT_TN3270E && non_tn3270e_host)
  1351 + if (c == TELOPT_TN3270E && h3270.non_tn3270e_host)
1352 1352 goto wont;
1353 1353 if (c == TELOPT_TM && !appres.bsd_tm)
1354 1354 goto wont;
... ... @@ -3203,7 +3203,7 @@ ssl_init(void)
3203 3203 ssl_ctx = SSL_CTX_new(SSLv23_method());
3204 3204 if (ssl_ctx == NULL) {
3205 3205 popup_an_error("SSL_CTX_new failed");
3206   - ssl_host = False;
  3206 + h3270.ssl_host = False;
3207 3207 return;
3208 3208 }
3209 3209 SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
... ... @@ -3212,7 +3212,7 @@ ssl_init(void)
3212 3212 ssl_con = SSL_new(ssl_ctx);
3213 3213 if (ssl_con == NULL) {
3214 3214 popup_an_error("SSL_new failed");
3215   - ssl_host = False;
  3215 + h3270.ssl_host = False;
3216 3216 }
3217 3217 SSL_set_verify(ssl_con, 0/*xxx*/, NULL);
3218 3218  
... ...
latest/src/plugins/rexx/screen.c
  Diff comments   View file @11f2257
... ... @@ -108,7 +108,7 @@
108 108 if(Argc != 1)
109 109 return RXFUNC_BADCALL;
110 110  
111   - return RetValue(Retstr,find_field_attribute(atoi(Argv[0].strptr)));
  111 + return RetValue(Retstr,find_field_attribute(NULL,atoi(Argv[0].strptr)));
112 112 }
113 113  
114 114 RexxReturnCode REXXENTRY rx3270FindFieldLength(PSZ Name, LONG Argc, RXSTRING Argv[],PSZ Queuename, PRXSTRING Retstr)
... ... @@ -116,7 +116,7 @@
116 116 if(Argc != 1)
117 117 return RXFUNC_BADCALL;
118 118  
119   - return RetValue(Retstr,find_field_length(atoi(Argv[0].strptr)));
  119 + return RetValue(Retstr,find_field_length(NULL,atoi(Argv[0].strptr)));
120 120 }
121 121  
122 122 /*----------------------------------------------------------------------------*/
... ...