Download as
Browse Code »

Commit 44b6f5fb9cd9f6d75f4ba2854f442f40ee2278a5

Authored by perry.werneck@gmail.com
1 parent 7f51b2db
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Compilando lib3270 para a versão 5, ocultando simbolos da versão antiga

Showing 16 changed files with 156 additions and 89 deletions   Show diff stats
Makefile.in
  Diff comments   View file @44b6f5f
... ... @@ -48,20 +48,26 @@ sysconfdir=@sysconfdir@
48 48 OBJDIR=.obj
49 49 BINDIR=.bin
50 50  
  51 +DEPENDS=src/include/lib3270/* src/include/* Makefile
  52 +
51 53 #---[ Tools ]------------------------------------------------------------------
52 54  
53 55 VALGRIND=@VALGRIND@
  56 +MKDIR=@MKDIR_P@
54 57  
55 58 #---[ Debug targets ]----------------------------------------------------------
56 59  
57 60 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
58 61  
59   -$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* src/include/lib3270/* src/include/*
  62 +$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(DEPENDS) $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@
60 63 @$(MAKE) ROOTDIR="../.." -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
61 64  
  65 +$(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* $(DEPENDS)
  66 + @echo $(MAKE) ROOTDIR="../.." BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
62 67  
63 68 #---[ Targets ]----------------------------------------------------------------
64 69  
  70 +
65 71 clean:
66 72 @rm -fr $(OBJDIR)
67 73 @rm -fr $(BINDIR)
... ...
configure.ac
  Diff comments   View file @44b6f5f
... ... @@ -75,7 +75,8 @@ AC_SUBST(PACKAGE_REVISION, "SVN_REV")
75 75  
76 76 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
77 77  
78   -DLL_LIBS="-shared -Wl,-soname,\$(@F)"
  78 +DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
  79 +SOCKET_LIBS=""
79 80  
80 81 DLLEXT=".so"
81 82 OBJEXT=".o"
... ... @@ -89,8 +90,26 @@ else
89 90 HOST_CC=$CC
90 91 fi
91 92  
  93 +case "$host" in
  94 + *-mingw32)
  95 + DLLEXT=".dll"
  96 + EXEEXT=".exe"
  97 + SOCKET_LIBS="-lws2_32"
  98 + AC_PATH_TOOL([STRIP], [strip])
  99 + ;;
  100 +
  101 + *)
  102 + AC_PATH_TOOL([STRIP], [strip])
  103 +
  104 +esac
  105 +
  106 +
92 107 AC_SUBST(HOST_CC)
93 108 AC_SUBST(EXEEXT)
  109 +AC_SUBST(DLLPREFIX)
  110 +AC_SUBST(DLLEXT)
  111 +AC_SUBST(DLL_FLAGS)
  112 +AC_SUBST(SOCKET_LIBS)
94 113  
95 114 #--[ Debug/Release ]------------------------------------------------------------------------------------------------------------------------------------------
96 115  
... ...
src/lib3270/Makefile.in
  Diff comments   View file @44b6f5f
... ... @@ -26,10 +26,15 @@
26 26 # kraucer@bb.com.br (Kraucer Fernandes Mazuco)
27 27 #
28 28  
  29 +PACKAGE=@PACKAGE_NAME@
  30 +
29 31 CFLAGS=@CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include
30 32 SSL_CFLAGS=@SSL_CFLAGS@
31 33  
32   -LIBS=@LIBS@ @SSL_LIBS@
  34 +DLL_FLAGS=@DLL_FLAGS@
  35 +LDFLAGS=@LDFLAGS@
  36 +
  37 +LIBS=@LIBS@ @SSL_LIBS@ @SOCKET_LIBS@
33 38  
34 39 DEBUG_CFLAGS=-DDEBUG=1 -g
35 40 DEPENDS ?= *.h ../../src/include/*.h
... ... @@ -50,6 +55,10 @@ OBJEXT=.o
50 55 ROOTDIR ?= .
51 56 OBJDIR ?= $(ROOTDIR)/.obj
52 57 BINDIR ?= $(ROOTDIR)/.bin
  58 +DEPENDS ?= *.h Makefile
  59 +BINDBG ?= $(BINDIR)/Debug
  60 +
  61 +OBJDBG = $(OBJDIR)/Debug
53 62  
54 63 #---[ Rules ]------------------------------------------------------------------
55 64  
... ... @@ -69,6 +78,14 @@ SOURCES = XtGlue.c actions.c ansi.c charset.c ctlr.c \
69 78  
70 79 #---[ Misc targets ]-----------------------------------------------------------
71 80  
  81 +Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@
  82 +
  83 +
  84 +$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
  85 + @echo $@ ...
  86 + @$(MKDIR) `dirname $@`
  87 + @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
  88 +
72 89 version.c: ./mkversion.sh
73 90 @echo $@ ...
74 91 @chmod +x ./mkversion.sh
... ... @@ -80,7 +97,7 @@ fallbacks.c: $(BINDIR)/mkfb@EXEEXT@ X3270.xad
80 97  
81 98 $(BINDIR)/mkfb@EXEEXT@: mkfb.c Makefile
82 99 @echo $@ ...
83   - @$(MKDIR) $(BINDIR)
  100 + @$(MKDIR) `dirname $@`
84 101 @$(HOST_CC) -g -o $@ -D_WIN32 mkfb.c
85 102  
86 103 clean:
... ...
src/lib3270/XtGlue.c
  Diff comments   View file @44b6f5f
... ... @@ -39,6 +39,7 @@
39 39 #include "trace_dsc.h"
40 40 #include "xioc.h"
41 41 #endif /*]*/
  42 +#include "utilc.h"
42 43  
43 44 #include <stdio.h>
44 45 #include <stdlib.h>
... ...
src/lib3270/api.h
  Diff comments   View file @44b6f5f
... ... @@ -44,12 +44,10 @@
44 44 #if defined(_WIN32)
45 45 #include <windows.h>
46 46  
47   - #define LIB3270_EXPORT __declspec (dllexport)
48   -
49 47 #if defined (HAVE_GNUC_VISIBILITY)
50   - #define LOCAL_EXTERN __attribute__((visibility("hidden"))) extern
  48 + #define LOCAL_EXTERN __attribute__((visibility("hidden"))) extern
51 49 #else
52   - #define LOCAL_EXTERN extern
  50 + #define LOCAL_EXTERN extern
53 51 #endif
54 52  
55 53 #else
... ... @@ -57,14 +55,11 @@
57 55  
58 56 // http://gcc.gnu.org/wiki/Visibility
59 57 #if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
60   - #define LOCAL_EXTERN __hidden extern
61   - #define LIB3270_EXPORT
  58 + #define LOCAL_EXTERN __hidden extern
62 59 #elif defined (HAVE_GNUC_VISIBILITY)
63   - #define LOCAL_EXTERN __attribute__((visibility("hidden"))) extern
64   - #define LIB3270_EXPORT __attribute__((visibility("default"))) extern
  60 + #define LOCAL_EXTERN __attribute__((visibility("hidden"))) extern
65 61 #else
66   - #define LOCAL_EXTERN extern
67   - #define LIB3270_EXPORT
  62 + #define LOCAL_EXTERN extern
68 63 #endif
69 64  
70 65  
... ... @@ -103,9 +98,9 @@
103 98 #endif
104 99  
105 100  
106   - LIB3270_EXPORT int Set3270Log(const char *filename);
107   - LIB3270_EXPORT int WriteLog(const char *module, const char *fmt, ...);
108   - LIB3270_EXPORT int WriteRCLog(const char *module, int rc, const char *fmt, ...);
  101 + LOCAL_EXTERN int Set3270Log(const char *filename);
  102 + LOCAL_EXTERN int WriteLog(const char *module, const char *fmt, ...);
  103 + LOCAL_EXTERN int WriteRCLog(const char *module, int rc, const char *fmt, ...);
109 104  
110 105 #ifdef LIB3270_MODULE_NAME
111 106 #define Log(fmt, ...) WriteLog(LIB3270_MODULE_NAME,fmt,__VA_ARGS__)
... ... @@ -314,12 +309,12 @@
314 309 /**
315 310 * Return a "malloced" copy of the device buffer, set number of elements
316 311 */
317   - LIB3270_EXPORT struct ea * copy_device_buffer(int *el);
  312 +// LOCAL_EXTERN struct ea * copy_device_buffer(int *el);
318 313  
319 314 /**
320 315 * Set the contents of the device buffer for debugging purposes
321 316 */
322   - LIB3270_EXPORT int set_device_buffer(struct ea *src, int el);
  317 +// LOCAL_EXTERN int set_device_buffer(struct ea *src, int el);
323 318  
324 319 /* File transfer */
325 320 #define FT_FLAG_RECEIVE 0x0001
... ... @@ -348,9 +343,9 @@
348 343 FT_ABORT_SENT /**< Abort sent; awaiting response */
349 344 };
350 345  
351   - LIB3270_EXPORT int BeginFileTransfer(unsigned short flags, const char *local, const char *remote, int lrecl, int blksize, int primspace, int secspace, int dft);
352   - LIB3270_EXPORT int CancelFileTransfer(int force);
353   - LIB3270_EXPORT enum ft_state GetFileTransferState(void);
  346 + LOCAL_EXTERN int BeginFileTransfer(unsigned short flags, const char *local, const char *remote, int lrecl, int blksize, int primspace, int secspace, int dft);
  347 + LOCAL_EXTERN int CancelFileTransfer(int force);
  348 + LOCAL_EXTERN enum ft_state GetFileTransferState(void);
354 349  
355 350 struct filetransfer_callbacks
356 351 {
... ... @@ -365,7 +360,7 @@
365 360  
366 361 };
367 362  
368   - LIB3270_EXPORT int RegisterFTCallbacks(const struct filetransfer_callbacks *cbk);
  363 + LOCAL_EXTERN int RegisterFTCallbacks(const struct filetransfer_callbacks *cbk);
369 364  
370 365 #define PCONNECTED lib3270_pconnected(NULL)
371 366 #define HALF_CONNECTED lib3270_half_connected(NULL)
... ... @@ -380,7 +375,7 @@
380 375  
381 376 #ifndef LIB3270
382 377  
383   - LIB3270_EXPORT enum ft_state QueryFTstate(void);
  378 + LOCAL_EXTERN enum ft_state QueryFTstate(void);
384 379  
385 380 #endif
386 381  
... ... @@ -411,7 +406,7 @@
411 406 COUNTER_ID_USER
412 407 } COUNTER_ID;
413 408  
414   - LIB3270_EXPORT int query_counter(COUNTER_ID id);
  409 + LOCAL_EXTERN int query_counter(COUNTER_ID id);
415 410  
416 411 #define query_screen_change_counter() query_counter(COUNTER_ID_CTLR_DONE)
417 412  
... ... @@ -485,67 +480,67 @@
485 480 const char *description;
486 481 };
487 482  
488   - LIB3270_EXPORT int Register3270ScreenCallbacks(const struct lib3270_screen_callbacks *cbk);
  483 + LOCAL_EXTERN int Register3270ScreenCallbacks(const struct lib3270_screen_callbacks *cbk);
489 484  
490 485 #define new_3270_session(m) lib3270_session_new(m)
491 486  
492   - LIB3270_EXPORT const struct lib3270_option * get_3270_option_table(int sz);
  487 + LOCAL_EXTERN const struct lib3270_option * get_3270_option_table(int sz);
493 488  
494 489 /* Popups */
495   - LIB3270_EXPORT void Error(const char *fmt, ...);
496   - LIB3270_EXPORT void Warning(const char *fmt, ...);
497   - LIB3270_EXPORT void show_3270_popup_dialog(H3270 *session, PW3270_DIALOG type, const char *title, const char *msg, const char *fmt, ...);
  490 + LOCAL_EXTERN void Error(const char *fmt, ...);
  491 + LOCAL_EXTERN void Warning(const char *fmt, ...);
  492 + LOCAL_EXTERN void show_3270_popup_dialog(H3270 *session, PW3270_DIALOG type, const char *title, const char *msg, const char *fmt, ...);
498 493  
499 494 /* Set/Get screen contents */
500   - LIB3270_EXPORT int find_field_attribute(H3270 *session, int baddr);
501   - LIB3270_EXPORT int find_field_length(H3270 *session, int baddr);
502   - LIB3270_EXPORT unsigned char get_field_attribute(H3270 *session, int baddr);
503   - LIB3270_EXPORT int screen_read(char *dest, int baddr, int count);
504   - LIB3270_EXPORT void Input_String(const unsigned char *str);
505   - LIB3270_EXPORT void screen_size(int *rows, int *cols);
  495 + LOCAL_EXTERN int find_field_attribute(H3270 *session, int baddr);
  496 + LOCAL_EXTERN int find_field_length(H3270 *session, int baddr);
  497 + LOCAL_EXTERN unsigned char get_field_attribute(H3270 *session, int baddr);
  498 + LOCAL_EXTERN int screen_read(char *dest, int baddr, int count);
  499 + LOCAL_EXTERN void Input_String(const unsigned char *str);
  500 + LOCAL_EXTERN void screen_size(int *rows, int *cols);
506 501  
507 502 #define query_secure_connection(h) lib3270_get_ssl_state(h)
508 503 #define lib3270_paste_string(str) lib3270_set_string(NULL,str)
509 504 #define get_3270_terminal_size(h,r,c) lib3270_get_screen_size(h,r,c)
510 505  
511 506 /* Keyboard */
512   - LIB3270_EXPORT int emulate_input(char *s, int len, int pasting);
  507 + LOCAL_EXTERN int emulate_input(char *s, int len, int pasting);
513 508  
514 509 /* Network related calls */
515   - LIB3270_EXPORT int Get3270Socket(void);
  510 + LOCAL_EXTERN int Get3270Socket(void);
516 511  
517 512 /* Misc calls */
518   - LIB3270_EXPORT void popup_an_error(const char *fmt, ...);
519   - LIB3270_EXPORT void popup_system_error(const char *title, const char *message, const char *system);
520   - LIB3270_EXPORT void popup_a_sockerr(char *fmt, ...);
  513 + LOCAL_EXTERN void popup_an_error(const char *fmt, ...);
  514 + LOCAL_EXTERN void popup_system_error(const char *title, const char *message, const char *system);
  515 + LOCAL_EXTERN void popup_a_sockerr(char *fmt, ...);
521 516  
522 517 #define query_3270_terminal_status(void) lib3270_get_program_message(NULL)
523 518  
524 519 #define set_3270_model(h,m) lib3270_set_model(h,m)
525 520 #define get_3270_model(h) lib3270_get_model(h)
526 521  
527   - LIB3270_EXPORT int lib3270_set_model(H3270 *session, int model);
528   - LIB3270_EXPORT int lib3270_get_model(H3270 *session);
  522 + LOCAL_EXTERN int lib3270_set_model(H3270 *session, int model);
  523 + LOCAL_EXTERN int lib3270_get_model(H3270 *session);
529 524  
530 525 /* Get connection info */
531 526 #define get_connected_lu(h) lib3270_get_luname(h)
532 527 #define get_current_host(h) lib3270_get_host(h)
533 528  
534   - LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
  529 + LOCAL_EXTERN SCRIPT_STATE status_script(SCRIPT_STATE state);
535 530  
536 531 #define Toggled(ix) lib3270_get_toggle(NULL,ix)
537 532 #define CallAndWait(c,h,p) lib3270_call_thread(c,h,p)
538 533  
539   - LIB3270_EXPORT void RunPendingEvents(int wait);
540   - LIB3270_EXPORT int Wait(int seconds);
  534 + LOCAL_EXTERN void RunPendingEvents(int wait);
  535 + LOCAL_EXTERN int Wait(int seconds);
541 536  
542   - LIB3270_EXPORT int ctlr_get_cols(void) __attribute__ ((deprecated));
543   - LIB3270_EXPORT int ctlr_get_rows(void) __attribute__ ((deprecated));
  537 + LOCAL_EXTERN int ctlr_get_cols(void) __attribute__ ((deprecated));
  538 + LOCAL_EXTERN int ctlr_get_rows(void) __attribute__ ((deprecated));
544 539  
545 540 /* Screen calls */
546   - LIB3270_EXPORT void screen_resume(H3270 *session);
547   - LIB3270_EXPORT void screen_suspend(H3270 *session);
548   - LIB3270_EXPORT void screen_disp(H3270 *session);
  541 + LOCAL_EXTERN void screen_resume(H3270 *session);
  542 + LOCAL_EXTERN void screen_suspend(H3270 *session);
  543 + LOCAL_EXTERN void screen_disp(H3270 *session);
549 544  
550 545 /* Cursor calls */
551 546 #define cursor_get_addr(void) lib3270_get_cursor_address(NULL)
... ... @@ -560,10 +555,10 @@
560 555 #define register_schange(tx,func) lib3270_register_schange(NULL,tx,func,NULL)
561 556  
562 557 /* Console/Trace window */
563   - LIB3270_EXPORT HCONSOLE console_window_new(const char *title, const char *label);
564   - LIB3270_EXPORT void console_window_delete(HCONSOLE hwnd);
565   - LIB3270_EXPORT int console_window_append(HCONSOLE hwnd, const char *fmt, ...);
566   - LIB3270_EXPORT char * console_window_wait_for_user_entry(HCONSOLE hwnd);
  558 + LOCAL_EXTERN HCONSOLE console_window_new(const char *title, const char *label);
  559 + LOCAL_EXTERN void console_window_delete(HCONSOLE hwnd);
  560 + LOCAL_EXTERN int console_window_append(HCONSOLE hwnd, const char *fmt, ...);
  561 + LOCAL_EXTERN char * console_window_wait_for_user_entry(HCONSOLE hwnd);
567 562  
568 563 #ifdef __cplusplus
569 564 }
... ...
src/lib3270/charset.c
  Diff comments   View file @44b6f5f
... ... @@ -63,10 +63,6 @@
63 63 #define EURO_SUFFIX "-euro"
64 64 #define ES_SIZE (sizeof(EURO_SUFFIX) - 1)
65 65  
66   -#if defined(_WIN32) || defined(LIB3270) /*[*/
67   -extern void set_display_charset(char *dcs);
68   -#endif /*]*/
69   -
70 66 /* Globals. */
71 67 Boolean charset_changed = False;
72 68 #define DEFAULT_CGEN 0x02b90000
... ... @@ -431,23 +427,27 @@ resource_charset(char *csname, char *cs, char *ftcs)
431 427 }
432 428 #endif /*]*/
433 429  
434   -#if defined(X3270_DISPLAY) || (defined(C3270) && !defined(_WIN32) && !defined(LIB3270)) /*[*/
  430 +
  431 +/*
  432 +#if defined(X3270_DISPLAY) || (defined(C3270) && !defined(_WIN32) && !defined(LIB3270))
435 433 if (!screen_new_display_charsets(
436 434 rcs? rcs: default_display_charset,
437 435 csname)) {
438 436 return CS_PREREQ;
439 437 }
440   -#else /*][*/
441   -#if !defined(_WIN32) /*[*/
  438 +#else
  439 +*/
  440 +
  441 +#if !defined(_WIN32)
442 442 utf8_set_display_charsets(rcs? rcs: default_display_charset, csname);
443   -#endif /*]*/
444   -#if defined(X3270_DBCS) /*[*/
  443 +#endif
  444 +#if defined(X3270_DBCS)
445 445 if (n_rcs > 1)
446 446 dbcs = True;
447 447 else
448 448 dbcs = False;
449   -#endif /*]*/
450   -#endif /*]*/
  449 +#endif
  450 +/* #endif */
451 451  
452 452 /* Set up the cgcsgid. */
453 453 set_cgcsgids(get_fresource("%s.%s", ResCodepage, csname));
... ...
src/lib3270/charsetc.h
  Diff comments   View file @44b6f5f
... ... @@ -37,3 +37,5 @@ enum cs_result { CS_OKAY, CS_NOTFOUND, CS_BAD, CS_PREREQ, CS_ILLEGAL };
37 37  
38 38 LIB3270_INTERNAL enum cs_result charset_init(char *csname);
39 39 LIB3270_INTERNAL char *get_charset_name(void);
  40 +LIB3270_INTERNAL void set_display_charset(char *dcs);
  41 +
... ...
src/lib3270/ctlr.c
  Diff comments   View file @44b6f5f
... ... @@ -1910,7 +1910,7 @@ ctlr_write_sscp_lu(unsigned char buf[], int buflen)
1910 1910 unsigned char *cp = buf;
1911 1911 int s_row;
1912 1912 unsigned char c;
1913   - int baddr;
  1913 +// int baddr;
1914 1914  
1915 1915 /*
1916 1916 * The 3174 Functionl Description says that anything but NL, NULL, FM,
... ... @@ -1956,8 +1956,8 @@ ctlr_write_sscp_lu(unsigned char buf[], int buflen)
1956 1956 rcba(buffer_addr));
1957 1957 break;
1958 1958 case ORDER_SBA:
1959   - baddr = DECODE_BADDR(*(cp+1), *(cp+2));
1960   - trace_ds(" SetBufferAddress%s [ignored]\n", rcba(baddr));
  1959 +// baddr = DECODE_BADDR(*(cp+1), *(cp+2));
  1960 + trace_ds(" SetBufferAddress%s [ignored]\n", rcba(DECODE_BADDR(*(cp+1), *(cp+2))));
1961 1961 cp += 2;
1962 1962 i += 2;
1963 1963 break;
... ...
src/lib3270/ft.c
  Diff comments   View file @44b6f5f
... ... @@ -102,7 +102,7 @@ static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to m
102 102 register_schange(ST_3270_MODE, ft_in3270);
103 103 }
104 104  
105   - enum ft_state QueryFTstate(void)
  105 + enum ft_state QueryFTstate(void)
106 106 {
107 107 return ft_state;
108 108 }
... ... @@ -124,12 +124,12 @@ static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to m
124 124 return errcode;
125 125 }
126 126  
127   - LIB3270_EXPORT enum ft_state GetFileTransferState(void)
  127 + enum ft_state GetFileTransferState(void)
128 128 {
129 129 return ft_state;
130 130 }
131 131  
132   - LIB3270_EXPORT int CancelFileTransfer(int force)
  132 + int CancelFileTransfer(int force)
133 133 {
134 134 if (ft_state == FT_RUNNING)
135 135 {
... ... @@ -148,7 +148,7 @@ static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to m
148 148 return ECANCELED;
149 149 }
150 150  
151   - LIB3270_EXPORT int BeginFileTransfer(unsigned short flags, const char *local, const char *remote, int lrecl, int blksize, int primspace, int secspace, int dft)
  151 + int BeginFileTransfer(unsigned short flags, const char *local, const char *remote, int lrecl, int blksize, int primspace, int secspace, int dft)
152 152 {
153 153 static const char *rec = "fvu";
154 154 static const char *un[] = { "tracks", "cylinders", "avblock" };
... ...
src/lib3270/glue.c
  Diff comments   View file @44b6f5f
... ... @@ -96,7 +96,7 @@
96 96 static int init_calls = 0;
97 97 #endif
98 98  
99   -// extern void usage(char *);
  99 + static void lib3270_session_init(H3270 *hSession, const char *model);
100 100  
101 101 #define LAST_ARG "--"
102 102  
... ... @@ -166,7 +166,7 @@ void lib3270_session_free(H3270 *h)
166 166  
167 167 }
168 168  
169   -void lib3270_session_init(H3270 *hSession, const char *model)
  169 +static void lib3270_session_init(H3270 *hSession, const char *model)
170 170 {
171 171 int ovc, ovr;
172 172 char junk;
... ...
src/lib3270/lib3270.cbp
  Diff comments   View file @44b6f5f
... ... @@ -9,8 +9,10 @@
9 9 <Target title="Debug">
10 10 <Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
11 11 <Option object_output=".obj/Debug/" />
12   - <Option type="1" />
  12 + <Option type="3" />
13 13 <Option compiler="gcc" />
  14 + <Option createDefFile="1" />
  15 + <Option createStaticLib="1" />
14 16 <Compiler>
15 17 <Add option="-g" />
16 18 <Add option="-DDEBUG=1" />
... ... @@ -30,6 +32,17 @@
30 32 <Add option="-s" />
31 33 </Linker>
32 34 </Target>
  35 + <Target title="testprogram">
  36 + <Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
  37 + <Option object_output=".obj/testprogram/" />
  38 + <Option type="1" />
  39 + <Option compiler="gcc" />
  40 + <Option use_console_runner="0" />
  41 + <Compiler>
  42 + <Add option="-g" />
  43 + <Add option="-DDEBUG=1" />
  44 + </Compiler>
  45 + </Target>
33 46 </Build>
34 47 <Compiler>
35 48 <Add option="-Wshadow" />
... ... @@ -171,6 +184,7 @@
171 184 <Unit filename="telnetc.h" />
172 185 <Unit filename="testprogram.c">
173 186 <Option compilerVar="CC" />
  187 + <Option target="testprogram" />
174 188 </Unit>
175 189 <Unit filename="tn3270e.h" />
176 190 <Unit filename="toggles.c">
... ...
src/lib3270/localdefs.h
  Diff comments   View file @44b6f5f
... ... @@ -55,10 +55,10 @@ typedef struct _XtActionsRec{
55 55 #define NoSymbol 0L
56 56  
57 57 /* These are local functions with similar semantics to X functions. */
58   -LIB3270_INTERNAL void *Malloc(size_t);
59   -LIB3270_INTERNAL void Free(void *);
60   -LIB3270_INTERNAL void *Calloc(size_t, size_t);
61   -LIB3270_INTERNAL void *Realloc(void *, size_t);
  58 +void *Malloc(size_t);
  59 +void Free(void *);
  60 +void *Calloc(size_t, size_t);
  61 +void *Realloc(void *, size_t);
62 62  
63 63 #define NewString(x) strdup(x)
64 64 //extern char *NewString(const char *);
... ...
src/lib3270/screen.c
  Diff comments   View file @44b6f5f
... ... @@ -61,6 +61,7 @@
61 61 #include "statusc.h"
62 62 #include "togglesc.h"
63 63 #include "api.h"
  64 +#include "charsetc.h"
64 65  
65 66 #if defined(_WIN32)
66 67 #include <windows.h>
... ... @@ -79,7 +80,7 @@ extern char *profile_name;
79 80 #endif
80 81  
81 82 static const struct lib3270_screen_callbacks *callbacks = NULL;
82   -static SCRIPT_STATE script_state = SCRIPT_STATE_NONE;
  83 +// static SCRIPT_STATE script_state = SCRIPT_STATE_NONE;
83 84  
84 85  
85 86 int lib3270_event_counter[COUNTER_ID_USER] = { 0, 0 };
... ... @@ -699,12 +700,14 @@ static void status_printer(H3270 *session, int on, void *dunno)
699 700 set_status(session,OIA_FLAG_PRINTER,on);
700 701 }
701 702  
702   -LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state)
  703 +/*
  704 +SCRIPT_STATE status_script(SCRIPT_STATE state)
703 705 {
704 706 if(state != script_state && callbacks && callbacks->set_script)
705 707 callbacks->set_script(state);
706 708 return script_state = state;
707 709 }
  710 +*/
708 711  
709 712 void status_timing(H3270 *session, struct timeval *t0, struct timeval *t1)
710 713 {
... ... @@ -781,7 +784,7 @@ int Register3270ScreenCallbacks(const struct lib3270_screen_callbacks *cbk)
781 784 return 0;
782 785 }
783 786  
784   -LIB3270_EXPORT void show_3270_popup_dialog(H3270 *session, PW3270_DIALOG type, const char *title, const char *msg, const char *fmt, ...)
  787 +void show_3270_popup_dialog(H3270 *session, PW3270_DIALOG type, const char *title, const char *msg, const char *fmt, ...)
785 788 {
786 789 if(!fmt)
787 790 fmt = "";
... ... @@ -887,7 +890,7 @@ extern void popup_an_error(const char *fmt, ...)
887 890  
888 891 }
889 892  
890   -LIB3270_EXPORT void popup_system_error(const char *title, const char *message, const char *system)
  893 +void popup_system_error(const char *title, const char *message, const char *system)
891 894 {
892 895 if(callbacks && callbacks->SysError)
893 896 {
... ... @@ -898,7 +901,8 @@ LIB3270_EXPORT void popup_system_error(const char *title, const char *message, c
898 901 popup_an_error("%s\n%s\n%s",title,message,system);
899 902 }
900 903  
901   -LIB3270_EXPORT int set_device_buffer(struct ea *src, int el)
  904 +/*
  905 +int set_device_buffer(struct ea *src, int el)
902 906 {
903 907  
904 908 if(el > (h3270.maxROWS * h3270.maxCOLS))
... ... @@ -910,6 +914,7 @@ LIB3270_EXPORT int set_device_buffer(struct ea *src, int el)
910 914  
911 915 return 0;
912 916 }
  917 +*/
913 918  
914 919 LIB3270_ACTION( testpattern )
915 920 {
... ... @@ -997,6 +1002,7 @@ LIB3270_ACTION( testpattern )
997 1002 return 0;
998 1003 }
999 1004  
  1005 +/*
1000 1006 LIB3270_EXPORT struct ea * copy_device_buffer(int *el)
1001 1007 {
1002 1008 int sz = sizeof(struct ea) * (h3270.maxROWS * h3270.maxCOLS);
... ... @@ -1006,7 +1012,9 @@ LIB3270_EXPORT struct ea * copy_device_buffer(int *el)
1006 1012 *el = (h3270.maxROWS * h3270.maxCOLS);
1007 1013 return ret;
1008 1014 }
  1015 +*/
1009 1016  
  1017 +/*
1010 1018 LIB3270_EXPORT HCONSOLE console_window_new(const char *title, const char *label)
1011 1019 {
1012 1020 if(callbacks && callbacks->console_new )
... ... @@ -1041,5 +1049,5 @@ LIB3270_EXPORT char * console_window_wait_for_user_entry(HCONSOLE hwnd)
1041 1049 return callbacks->console_entry(hwnd);
1042 1050 return NULL;
1043 1051 }
1044   -
  1052 +*/
1045 1053  
... ...
src/lib3270/screenc.h
  Diff comments   View file @44b6f5f
... ... @@ -11,6 +11,9 @@
11 11 * FOR A PARTICULAR PURPOSE. See the file LICENSE for more details.
12 12 */
13 13  
  14 +#ifndef SCREENC_H_INCLUDED
  15 +
  16 +#define SCREENC_H_INCLUDED 1
14 17 /* c3270 version of screenc.h */
15 18  
16 19 #define blink_start()
... ... @@ -65,3 +68,5 @@ LIB3270_INTERNAL int windows_cp;
65 68 */
66 69  
67 70 LIB3270_INTERNAL void screen_title(char *text);
  71 +
  72 +#endif // SCREENC_H_INCLUDED
... ...
src/lib3270/telnet.c
  Diff comments   View file @44b6f5f
... ... @@ -391,7 +391,7 @@ static union {
391 391 socklen_t ha_len = sizeof(haddr);
392 392  
393 393 #if defined(_WIN32)
394   -LIB3270_EXPORT void popup_a_sockerr(char *fmt, ...)
  394 +void popup_a_sockerr(char *fmt, ...)
395 395 {
396 396 va_list args;
397 397 char buffer[4096];
... ... @@ -404,7 +404,7 @@ LIB3270_EXPORT void popup_a_sockerr(char *fmt, ...)
404 404  
405 405 }
406 406 #else
407   -LIB3270_EXPORT void popup_a_sockerr(char *fmt, ...)
  407 +void popup_a_sockerr(char *fmt, ...)
408 408 {
409 409 va_list args;
410 410 char buffer[4096];
... ...
src/lib3270/utilc.h
  Diff comments   View file @44b6f5f
... ... @@ -42,7 +42,7 @@ LIB3270_INTERNAL void RemoveInput(unsigned long);
42 42 LIB3270_INTERNAL unsigned long AddTimeOut(unsigned long msec, H3270 *session, void (*fn)(H3270 *session));
43 43 LIB3270_INTERNAL void RemoveTimeOut(unsigned long cookie);
44 44  
45   -LIB3270_INTERNAL char *KeysymToString(KeySym k);
  45 +LIB3270_INTERNAL const char * KeysymToString(KeySym k);
46 46 LIB3270_INTERNAL KeySym StringToKeysym(char *s);
47 47  
48 48 LIB3270_INTERNAL int read_resource_file(const char *filename, Boolean fatal);
... ...