Download as
Browse Code »

Commit 5d28bb7bf3c817d3624ff02bc3a2b0db74454cc4

Authored by Perry Werneck
1 parent ebb1aa16
Exists in master and in 1 other branch develop

Adding v3270 support on glade.

Showing 16 changed files with 391 additions and 210 deletions   Show diff stats
@@ -49,4 +49,4 @@ makeruntime.sh @@ -49,4 +49,4 @@ makeruntime.sh
49 scripts 49 scripts
50 vgcore.* 50 vgcore.*
51 doxygen/doxyfile 51 doxygen/doxyfile
52 - 52 +glade/v3270.xml
@@ -53,6 +53,8 @@ WINDRES=@WINDRES@ @@ -53,6 +53,8 @@ WINDRES=@WINDRES@
53 AR=@AR@ 53 AR=@AR@
54 VALGRIND=@VALGRIND@ 54 VALGRIND=@VALGRIND@
55 GENMARSHAL=@GENMARSHAL@ 55 GENMARSHAL=@GENMARSHAL@
  56 +CONVERT=@CONVERT@
  57 +OPTIPNG=@OPTIPNG@
56 58
57 #---[ Paths ]---------------------------------------------------------------------------- 59 #---[ Paths ]----------------------------------------------------------------------------
58 60
@@ -172,6 +174,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \ @@ -172,6 +174,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \
172 @$(MKDIR) `dirname $@` 174 @$(MKDIR) `dirname $@`
173 @touch $@ 175 @touch $@
174 176
  177 +
175 #---[ Marshal Targets ]------------------------------------------------------------------ 178 #---[ Marshal Targets ]------------------------------------------------------------------
176 179
177 src/v3270/marshal.h: \ 180 src/v3270/marshal.h: \
@@ -228,6 +231,11 @@ all: \ @@ -228,6 +231,11 @@ all: \
228 $(BINRLS)/static/$(LIBNAME).a \ 231 $(BINRLS)/static/$(LIBNAME).a \
229 $(POTDIR)/$(LIBNAME).pot 232 $(POTDIR)/$(LIBNAME).pot
230 233
  234 +x: \
  235 + $(BINDIR)/icons/16x16/logo.png \
  236 + $(BINDIR)/icons/22x22/logo.png
  237 +
  238 +
231 239
232 Release: \ 240 Release: \
233 $(BINRLS)/$(LIBNAME)@DLLEXT@ \ 241 $(BINRLS)/$(LIBNAME)@DLLEXT@ \
@@ -279,7 +287,8 @@ $(BINRLS)/static/$(LIBNAME).a: \ @@ -279,7 +287,8 @@ $(BINRLS)/static/$(LIBNAME).a: \
279 287
280 install: \ 288 install: \
281 $(BINRLS)/$(LIBNAME)@DLLEXT@ \ 289 $(BINRLS)/$(LIBNAME)@DLLEXT@ \
282 - $(BINRLS)/static/$(LIBNAME).a 290 + $(BINRLS)/static/$(LIBNAME).a \
  291 + install-glade
283 292
284 # Install library 293 # Install library
285 @mkdir -p $(DESTDIR)$(libdir) 294 @mkdir -p $(DESTDIR)$(libdir)
@@ -320,6 +329,23 @@ install: \ @@ -320,6 +329,23 @@ install: \
320 libv3270.pc \ 329 libv3270.pc \
321 $(DESTDIR)$(libdir)/pkgconfig/v3270.pc 330 $(DESTDIR)$(libdir)/pkgconfig/v3270.pc
322 331
  332 +install-glade:
  333 +
  334 + @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs
  335 + @mkdir -p $(DESTDIR)$(datarootdir)/glade/pixmaps/hicolor/16x16/actions
  336 + @mkdir -p $(DESTDIR)$(datarootdir)/glade/pixmaps/hicolor/22x22/actions
  337 +
  338 + @$(INSTALL_DATA) \
  339 + glade/v3270.xml
  340 + $(DESTDIR)$(datarootdir)/glade/catalogs/v3270.xml
  341 +
  342 + @$(INSTALL_DATA) \
  343 + branding/icon-16x16.png \
  344 + $(DESTDIR)$(datarootdir)/glade/pixmaps/hicolor/16x16/actions/widget-v3270-terminal.png
  345 +
  346 + @$(INSTALL_DATA) \
  347 + branding/icon-22x22.png \
  348 + $(DESTDIR)$(datarootdir)/glade/pixmaps/hicolor/22x22/actions/widget-v3270-terminal.png
323 349
324 #---[ Misc Targets ]--------------------------------------------------------------------- 350 #---[ Misc Targets ]---------------------------------------------------------------------
325 351
@@ -357,6 +383,12 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ @@ -357,6 +383,12 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
357 run: \ 383 run: \
358 $(BINDBG)/$(LIBNAME)@EXEEXT@ 384 $(BINDBG)/$(LIBNAME)@EXEEXT@
359 385
  386 + @LD_LIBRARY_PATH=$(BINDBG) \
  387 + $(BINDBG)/$(LIBNAME)@EXEEXT@
  388 +
  389 +mem-check: \
  390 + $(BINDBG)/$(LIBNAME)@EXEEXT@
  391 +
360 ifeq ($(VALGRIND),no) 392 ifeq ($(VALGRIND),no)
361 393
362 @LD_LIBRARY_PATH=$(BINDBG) \ 394 @LD_LIBRARY_PATH=$(BINDBG) \
branding/logo.svg 0 → 100644
  Diff comments   View file @5d28bb7
@@ -0,0 +1,155 @@ @@ -0,0 +1,155 @@
  1 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  2 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
  3 +
  4 +<svg
  5 + xmlns:dc="http://purl.org/dc/elements/1.1/"
  6 + xmlns:cc="http://creativecommons.org/ns#"
  7 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  8 + xmlns:svg="http://www.w3.org/2000/svg"
  9 + xmlns="http://www.w3.org/2000/svg"
  10 + xmlns:xlink="http://www.w3.org/1999/xlink"
  11 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
  12 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
  13 + width="300"
  14 + height="154"
  15 + id="svg2685"
  16 + sodipodi:version="0.32"
  17 + inkscape:version="0.48.2 r9819"
  18 + sodipodi:docname="pw3270-logo.svg"
  19 + inkscape:output_extension="org.inkscape.output.svg.inkscape"
  20 + inkscape:export-filename="/home/perry/Project/3270/v4/image/icon.png"
  21 + inkscape:export-xdpi="90"
  22 + inkscape:export-ydpi="90"
  23 + version="1.1">
  24 + <defs
  25 + id="defs2687">
  26 + <linearGradient
  27 + id="linearGradient3687">
  28 + <stop
  29 + style="stop-color:#ffffff;stop-opacity:1;"
  30 + offset="0"
  31 + id="stop3689" />
  32 + <stop
  33 + style="stop-color:#000000;stop-opacity:1;"
  34 + offset="1"
  35 + id="stop3691" />
  36 + </linearGradient>
  37 + <radialGradient
  38 + inkscape:collect="always"
  39 + xlink:href="#linearGradient3687"
  40 + id="radialGradient2560"
  41 + gradientUnits="userSpaceOnUse"
  42 + gradientTransform="matrix(-1.2214651,1.3481449,-1.1114864,-1.0070438,1777.1401,13.255979)"
  43 + cx="593.03772"
  44 + cy="437.90591"
  45 + fx="593.03772"
  46 + fy="437.90591"
  47 + r="19.115074" />
  48 + <inkscape:perspective
  49 + sodipodi:type="inkscape:persp3d"
  50 + inkscape:vp_x="0 : 32 : 1"
  51 + inkscape:vp_y="0 : 1000 : 0"
  52 + inkscape:vp_z="64 : 32 : 1"
  53 + inkscape:persp3d-origin="32 : 21.333333 : 1"
  54 + id="perspective2693" />
  55 + </defs>
  56 + <sodipodi:namedview
  57 + id="base"
  58 + pagecolor="#ffffff"
  59 + bordercolor="#666666"
  60 + borderopacity="1.0"
  61 + inkscape:pageopacity="0.0"
  62 + inkscape:pageshadow="2"
  63 + inkscape:zoom="0.97227183"
  64 + inkscape:cx="-308.24386"
  65 + inkscape:cy="32"
  66 + inkscape:current-layer="layer1"
  67 + showgrid="true"
  68 + inkscape:document-units="px"
  69 + inkscape:grid-bbox="true"
  70 + inkscape:window-width="1280"
  71 + inkscape:window-height="966"
  72 + inkscape:window-x="0"
  73 + inkscape:window-y="26"
  74 + inkscape:window-maximized="1" />
  75 + <metadata
  76 + id="metadata2690">
  77 + <rdf:RDF>
  78 + <cc:Work
  79 + rdf:about="">
  80 + <dc:format>image/svg+xml</dc:format>
  81 + <dc:type
  82 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
  83 + </cc:Work>
  84 + </rdf:RDF>
  85 + </metadata>
  86 + <g
  87 + id="layer1"
  88 + inkscape:label="Layer 1"
  89 + inkscape:groupmode="layer"
  90 + transform="translate(0,90)">
  91 + <g
  92 + id="g3348"
  93 + transform="matrix(3.0573113,0,0,3.0573113,-1546.2767,-1196.7198)"
  94 + inkscape:export-filename="/home/perry/Desktop/g3484.png"
  95 + inkscape:export-xdpi="750"
  96 + inkscape:export-ydpi="750">
  97 + <path
  98 + inkscape:export-ydpi="750"
  99 + inkscape:export-xdpi="750"
  100 + inkscape:export-filename="/home/perry/Desktop/path4684.png"
  101 + sodipodi:nodetypes="ccccc"
  102 + id="path3877"
  103 + d="m 571.75652,365.09989 c -12.28362,1.49404 -24.71615,1.60564 -36.92919,3.70417 1.15828,9.37275 0.97923,23.2044 1.63094,30.14689 11.55053,-1.50408 27.01785,-2.59907 38.36698,-5.35307 -0.036,-8.87303 -1.02762,-19.15 -3.06873,-28.49799 z"
  104 + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#cccccc;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
  105 + inkscape:connector-curvature="0" />
  106 + <path
  107 + inkscape:export-ydpi="750"
  108 + inkscape:export-xdpi="750"
  109 + inkscape:export-filename="/home/perry/Desktop/path4684.png"
  110 + sodipodi:nodetypes="cccccccccccccccc"
  111 + id="path3879"
  112 + d="m 558.70672,398.73456 c -3.79163,0.10309 -7.64598,0.11185 -11.30721,1.27926 -2.13143,0.66011 -4.04568,2.24121 -4.70985,4.42348 -0.0967,1.1177 0.76001,2.18842 1.46457,3.02352 2.25351,2.29719 5.65545,2.82771 8.73539,2.89271 4.42579,0.006 8.86831,-0.8458 12.96682,-2.52003 1.55025,-0.88162 3.33996,-2.06142 3.56963,-3.9936 -0.59735,-2.25901 -2.87075,-3.51224 -4.96561,-4.11636 -1.84964,-0.54894 -3.83129,-0.95601 -5.75374,-0.98898 z m 0.0446,1.40178 c 2.78739,0.0968 5.75567,0.21409 8.11548,1.83476 0.87991,0.58405 1.95351,1.77677 1.15706,2.83974 -0.76499,1.1501 -2.05182,1.80199 -3.22326,2.45978 -3.23561,1.57133 -6.96349,1.61384 -10.45172,1.06373 -9.12914,-0.40554 -4.60594,-6.64603 1.06647,-7.80087 1.09861,-0.25448 2.19774,-0.40573 3.33597,-0.39714 z"
  113 + style="fill:#b6b6b6;fill-opacity:1;fill-rule:evenodd;stroke:none"
  114 + inkscape:connector-curvature="0" />
  115 + <g
  116 + transform="matrix(0.8126522,0,0,1,135.51705,-68.411175)"
  117 + id="g3881">
  118 + <path
  119 + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"
  120 + d="m 496.23743,451.70467 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"
  121 + id="path3883"
  122 + inkscape:connector-curvature="0" />
  123 + <path
  124 + style="font-size:9.27298832px;font-style:normal;font-weight:bold;fill:#00ff00;fill-opacity:1;stroke:#00ff00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Bold"
  125 + d="m 496.41233,442.38795 2.69056,-0.26631 c 0.80001,-0.0792 1.40822,0.0667 1.82464,0.43776 0.41931,0.36749 0.61951,0.93195 0.60062,1.69338 -0.019,0.76469 -0.24833,1.37492 -0.68806,1.83067 -0.43685,0.45224 -1.05527,0.71795 -1.85529,0.79713 l -1.06948,0.10586 -0.0627,2.52833 -1.62108,0.16046 0.18082,-7.28728 m 1.58729,1.20133 -0.0505,2.03536 0.89685,-0.0888 c 0.31439,-0.0311 0.55938,-0.14299 0.73498,-0.33567 0.17566,-0.19591 0.26753,-0.45656 0.27561,-0.78196 0.008,-0.3254 -0.0713,-0.56748 -0.23819,-0.72626 -0.16688,-0.15875 -0.4075,-0.22257 -0.7219,-0.19147 l -0.89684,0.0888 m 4.19384,-1.77354 1.5537,-0.15378 0.95492,5.18832 1.20932,-5.40254 1.56212,-0.15461 0.9465,5.18915 1.21774,-5.40337 1.54107,-0.15253 -1.66294,7.43397 -1.8695,0.18504 -1.00361,-5.42695 -1.2659,5.65159 -1.86949,0.18504 -1.31393,-7.13933 m 13.19263,2.04406 c 0.4207,0.085 0.73663,0.27442 0.94775,0.56837 0.214,0.29044 0.31498,0.67808 0.30296,1.16291 -0.0179,0.72239 -0.27018,1.29593 -0.75673,1.72062 -0.48649,0.42144 -1.18728,0.67745 -2.10238,0.76803 -0.32281,0.0319 -0.64626,0.0331 -0.97034,0.004 -0.32136,-0.0266 -0.63914,-0.0844 -0.95336,-0.17343 l 0.036,-1.44965 c 0.29879,0.14571 0.59584,0.2494 0.89113,0.31106 0.29817,0.0581 0.59182,0.0729 0.88095,0.0443 0.42948,-0.0425 0.76005,-0.16124 0.99169,-0.35622 0.23446,-0.19524 0.35568,-0.45393 0.36368,-0.77608 0.008,-0.3319 -0.10345,-0.57079 -0.33503,-0.71665 -0.22872,-0.1494 -0.57184,-0.20145 -1.02939,-0.15618 l -0.64842,0.0642 0.03,-1.21047 0.68211,-0.0675 c 0.40702,-0.0403 0.712,-0.1435 0.91493,-0.30966 0.20302,-0.16941 0.30828,-0.40542 0.31579,-0.70805 0.007,-0.27983 -0.0845,-0.48663 -0.27442,-0.62041 -0.18989,-0.13376 -0.46168,-0.18313 -0.81537,-0.14814 -0.26105,0.0258 -0.52577,0.0861 -0.79413,0.18086 -0.26837,0.0947 -0.53613,0.22186 -0.80331,0.38138 l 0.0341,-1.37642 c 0.32259,-0.1358 0.64172,-0.2453 0.95741,-0.32848 0.31568,-0.0832 0.6251,-0.13977 0.92826,-0.16979 0.81685,-0.0808 1.42351,0.0149 1.81998,0.28729 0.39934,0.26884 0.59127,0.71565 0.57577,1.3404 -0.0106,0.42629 -0.1161,0.78567 -0.31657,1.07816 -0.20039,0.28927 -0.49143,0.50796 -0.87312,0.6561 m 4.39998,2.10611 2.76635,-0.27381 -0.0343,1.3813 -4.56848,0.45219 0.0343,-1.38131 2.35302,-2.57489 c 0.21024,-0.23504 0.36703,-0.45992 0.47036,-0.67465 0.10334,-0.21472 0.15774,-0.43272 0.16324,-0.65399 0.008,-0.34167 -0.0844,-0.60676 -0.27848,-0.7953 -0.19133,-0.1888 -0.45121,-0.26694 -0.77963,-0.23445 -0.25263,0.025 -0.5307,0.11584 -0.8342,0.27247 -0.30343,0.15338 -0.62944,0.37068 -0.97804,0.65186 l 0.0397,-1.60096 c 0.36838,-0.17603 0.73172,-0.31748 1.08999,-0.42437 0.35835,-0.11012 0.70876,-0.18212 1.05122,-0.21603 0.75228,-0.0745 1.33139,0.0597 1.73731,0.40259 0.40872,0.34257 0.60456,0.85715 0.58752,1.54373 -0.01,0.397 -0.10747,0.77671 -0.29287,1.13912 -0.18533,0.35918 -0.56865,0.8548 -1.14996,1.48687 l -1.37709,1.49963 m 4.23502,-6.31064 4.7369,-0.46886 -0.0263,1.05916 -2.60509,6.47067 -1.57897,0.15629 2.46658,-6.13561 -3.02741,0.29965 0.0343,-1.3813 m 9.29515,2.70736 c 0.0226,-0.91111 -0.0359,-1.54479 -0.17544,-1.90102 -0.13669,-0.35974 -0.37906,-0.5224 -0.72714,-0.48796 -0.34807,0.0345 -0.60114,0.24616 -0.75919,0.63508 -0.15799,0.38568 -0.24828,1.03408 -0.27088,1.94519 -0.0229,0.92088 0.0354,1.56268 0.17484,1.92541 0.1394,0.36274 0.38314,0.52689 0.73122,0.49243 0.34526,-0.0342 0.59696,-0.24736 0.75511,-0.63954 0.15814,-0.39219 0.24863,-1.04872 0.27148,-1.96959 m 1.62071,-0.14581 c -0.03,1.20722 -0.27765,2.16172 -0.74308,2.86347 -0.46537,0.6985 -1.11069,1.0886 -1.93596,1.17029 -0.82807,0.082 -1.45856,-0.18186 -1.89146,-0.79146 -0.43282,-0.61284 -0.63425,-1.52288 -0.6043,-2.73011 0.03,-1.21048 0.27773,-2.16496 0.74309,-2.86347 0.46544,-0.70176 1.1122,-1.09361 1.94028,-1.17559 0.82527,-0.0817 1.45431,0.18391 1.88714,0.79676 0.43289,0.6096 0.63432,1.51963 0.60429,2.73011"
  126 + id="path3885"
  127 + inkscape:connector-curvature="0" />
  128 + <path
  129 + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"
  130 + d="m 498.4652,453.42295 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"
  131 + id="path3887"
  132 + inkscape:connector-curvature="0" />
  133 + <path
  134 + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"
  135 + d="m 496.77866,455.87356 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"
  136 + id="path3889"
  137 + inkscape:connector-curvature="0" />
  138 + <path
  139 + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:50.90000153;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"
  140 + d="m 499.54207,457.86404 c 37.88072,-3.53554 37.62819,-3.53554 37.62819,-3.53554"
  141 + id="path3891"
  142 + inkscape:connector-curvature="0" />
  143 + </g>
  144 + <path
  145 + inkscape:export-ydpi="750"
  146 + inkscape:export-xdpi="750"
  147 + inkscape:export-filename="/home/perry/Desktop/path4684.png"
  148 + sodipodi:nodetypes="ccccc"
  149 + id="path3893"
  150 + d="m 571.18683,366.21059 c -11.74072,1.38257 -23.62379,1.48585 -35.29705,3.42783 1.10709,8.67351 0.93595,21.47328 1.55887,27.89784 11.04002,-1.39187 25.82375,-2.40517 36.67128,-4.95371 -0.0344,-8.21108 -0.9822,-17.72136 -2.9331,-26.37196 z"
  151 + style="opacity:0.43404254;fill:url(#radialGradient2560);fill-opacity:1;fill-rule:evenodd;stroke:#cccccc;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
  152 + inkscape:connector-curvature="0" />
  153 + </g>
  154 + </g>
  155 +</svg>
@@ -53,6 +53,8 @@ AC_PROG_CC @@ -53,6 +53,8 @@ AC_PROG_CC
53 AC_PROG_SED 53 AC_PROG_SED
54 AC_PROG_LN_S 54 AC_PROG_LN_S
55 AC_PATH_TOOL([AR], [ar], [ar]) 55 AC_PATH_TOOL([AR], [ar], [ar])
  56 +AC_PATH_TOOL([CONVERT], [convert], [no])
  57 +AC_PATH_TOOL([OPTIPNG],[optipng],[no])
56 58
57 AC_LANG([C]) 59 AC_LANG([C])
58 60
@@ -258,78 +260,6 @@ if test &quot;x$DOXYGEN&quot; != &quot;x&quot;; then @@ -258,78 +260,6 @@ if test &quot;x$DOXYGEN&quot; != &quot;x&quot;; then
258 fi 260 fi
259 261
260 dnl --------------------------------------------------------------------------- 262 dnl ---------------------------------------------------------------------------
261 -dnl Check for ELF symbol visibility support  
262 -dnl ---------------------------------------------------------------------------  
263 -m4_define([GLIB_CHECK_COMPILE_WARNINGS],  
264 -[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl  
265 -rm -f conftest.$ac_objext  
266 -glib_ac_compile_save="$ac_compile"  
267 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext'  
268 -AS_IF([_AC_EVAL_STDERR($ac_compile) &&  
269 - AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])],  
270 - [$2],  
271 - [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD  
272 -cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD  
273 -m4_ifvaln([$3],[$3])dnl])  
274 -ac_compile="$glib_ac_compile_save"  
275 -rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl  
276 -])# GLIB_CHECK_COMPILE_WARNINGS  
277 -  
278 -AC_MSG_CHECKING(for GNUC visibility attribute)  
279 -GLIB_CHECK_COMPILE_WARNINGS([  
280 -void  
281 -__attribute__ ((visibility ("hidden")))  
282 - f_hidden (void)  
283 -{  
284 -}  
285 -void  
286 -__attribute__ ((visibility ("internal")))  
287 - f_internal (void)  
288 -{  
289 -}  
290 -void  
291 -__attribute__ ((visibility ("protected")))  
292 - f_protected (void)  
293 -{  
294 -}  
295 -void  
296 -__attribute__ ((visibility ("default")))  
297 - f_default (void)  
298 -{  
299 -}  
300 -int main (int argc, char **argv)  
301 -{  
302 - f_hidden();  
303 - f_internal();  
304 - f_protected();  
305 - f_default();  
306 - return 0;  
307 -}  
308 -],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no)  
309 -AC_MSG_RESULT($g_have_gnuc_visibility)  
310 -if test x$g_have_gnuc_visibility = xyes; then  
311 - AC_DEFINE(HAVE_GNUC_VISIBILITY, 1, [supports GCC visibility attributes])  
312 -fi  
313 -  
314 -dnl ---------------------------------------------------------------------------  
315 -dnl Check for compiler visibility flag  
316 -dnl ---------------------------------------------------------------------------  
317 -AC_MSG_CHECKING(whether $CC accepts -fvisibility=hidden)  
318 -AC_CACHE_VAL(app_cv_fvisibility_ok,  
319 -[ac_save_cc="$CC"  
320 -CC="$CC -fvisibility=hidden"  
321 -AC_TRY_RUN([int main() { return 0; }],  
322 - app_cv_fvisibility_ok=yes,  
323 - app_cv_fvisibility_ok=no,  
324 - app_cv_fvisibility_ok=no)  
325 -CC="$ac_save_cc"])  
326 -AC_MSG_RESULT($app_cv_fvisibility_ok)  
327 -if test $app_cv_fvisibility_ok = yes; then  
328 - CFLAGS="$CFLAGS -fvisibility=hidden"  
329 - CXXFLAGS="$CXXFLAGS -fvisibility=hidden"  
330 -fi  
331 -  
332 -dnl ---------------------------------------------------------------------------  
333 dnl Check for pic 263 dnl Check for pic
334 dnl --------------------------------------------------------------------------- 264 dnl ---------------------------------------------------------------------------
335 AC_ARG_ENABLE([pic], 265 AC_ARG_ENABLE([pic],
@@ -415,6 +345,7 @@ dnl --------------------------------------------------------------------------- @@ -415,6 +345,7 @@ dnl ---------------------------------------------------------------------------
415 345
416 AC_CONFIG_FILES(Makefile) 346 AC_CONFIG_FILES(Makefile)
417 AC_CONFIG_FILES(libv3270.pc) 347 AC_CONFIG_FILES(libv3270.pc)
  348 +AC_CONFIG_FILES(glade/v3270.xml)
418 349
419 dnl --------------------------------------------------------------------------- 350 dnl ---------------------------------------------------------------------------
420 dnl Output the generated config.status script. 351 dnl Output the generated config.status script.
glade/v3270.xml.in 0 → 100644
  Diff comments   View file @5d28bb7
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<glade-catalog version="0.50.2" supports="gtkbuilder" name="v3270-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@" library="v3270" domain="v3270-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@" depends="gtk+" book="v3270">
  3 + <glade-widget-classes>
  4 + <glade-widget-class title="v3270 Terminal" name="v3270" generic-name="TN3270 Terminal">
  5 + <properties>
  6 + <property id="online"/>
  7 + <property id="selection"/>
  8 + <property id="model"/>
  9 + <property id="luname"/>
  10 + <property id="auto_disconnect"/>
  11 + <property id="monocase"/>
  12 + <property id="cursorblink"/>
  13 + <property id="showtiming"/>
  14 + <property id="cursorpos"/>
  15 + <property id="dstrace"/>
  16 + <property id="linewrap"/>
  17 + <property id="blankfill"/>
  18 + <property id="screentrace"/>
  19 + <property id="eventtrace"/>
  20 + <property id="marginedpaste"/>
  21 + <property id="rectselect"/>
  22 + <property id="crosshair"/>
  23 + <property id="fullscreen"/>
  24 + <property id="reconnect"/>
  25 + <property id="insert"/>
  26 + <property id="smartpaste"/>
  27 + <property id="bold"/>
  28 + <property id="keepselected"/>
  29 + <property id="underline"/>
  30 + <property id="autoconnect"/>
  31 + <property id="kpalternative"/>
  32 + <property id="beep"/>
  33 + <property id="fieldattr"/>
  34 + <property id="altscreen"/>
  35 + <property id="keepalive"/>
  36 + <property id="nettrace"/>
  37 + </properties>
  38 + </glade-widget-class>
  39 + </glade-widget-classes>
  40 +
  41 + <glade-widget-group title="@PACKAGE_DESCRIPTION@" name="v3270-terminal">
  42 + <glade-widget-class-ref name="v3270"/>
  43 + </glade-widget-group>
  44 +
  45 +</glade-catalog>
rpm/libv3270.spec
  Diff comments   View file @5d28bb7
@@ -61,6 +61,7 @@ BuildRequires: coreutils @@ -61,6 +61,7 @@ BuildRequires: coreutils
61 BuildRequires: gcc-c++ 61 BuildRequires: gcc-c++
62 BuildRequires: gettext-devel 62 BuildRequires: gettext-devel
63 BuildRequires: m4 63 BuildRequires: m4
  64 +BuildRequires: libgladeui
64 65
65 %description 66 %description
66 67
@@ -89,6 +90,26 @@ Originally designed as part of the pw3270 application. @@ -89,6 +90,26 @@ Originally designed as part of the pw3270 application.
89 90
90 See more details at https://softwarepublico.gov.br/social/pw3270/ 91 See more details at https://softwarepublico.gov.br/social/pw3270/
91 92
  93 +%package -n glade-catalog-v3270
  94 +
  95 +Summary: Glade catalog for the TN3270 terminal emulator library
  96 +Group: Development/Libraries/C and C++
  97 +
  98 +Requires: libv3270-devel = %{version}
  99 +Requires: libgladeui
  100 +
  101 +%description -n glade-catalog-v3270
  102 +
  103 +3270 Virtual Terminal for GTK development files.
  104 +
  105 +Originally designed as part of the pw3270 application.
  106 +
  107 +This package provides a catalog for Glade, to allow the use of V3270
  108 +widgets in Glade.
  109 +
  110 +See more details at https://softwarepublico.gov.br/social/pw3270/
  111 +
  112 +
92 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 113 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
93 114
94 %prep 115 %prep
@@ -126,6 +147,12 @@ rm -rf $RPM_BUILD_ROOT @@ -126,6 +147,12 @@ rm -rf $RPM_BUILD_ROOT
126 147
127 %{_libdir}/libv3270.a 148 %{_libdir}/libv3270.a
128 149
  150 +%files -n glade-catalog-v3270
  151 +%defattr(-,root,root)
  152 +/usr/share/glade/catalogs/v3270.xml
  153 +/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-v3270-terminal.png
  154 +/usr/share/glade/pixmaps/hicolor/22x22/actions/widget-v3270-terminal.png
  155 +
129 %pre 156 %pre
130 /sbin/ldconfig 157 /sbin/ldconfig
131 exit 0 158 exit 0
src/dialogs/hostselect.c
  Diff comments   View file @5d28bb7
@@ -376,7 +376,7 @@ void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *ses @@ -376,7 +376,7 @@ void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *ses
376 widget->options = opt; 376 widget->options = opt;
377 } 377 }
378 378
379 -LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) 379 +void v3270_select_host(GtkWidget *widget)
380 { 380 {
381 g_return_if_fail(GTK_IS_V3270(widget)); 381 g_return_if_fail(GTK_IS_V3270(widget));
382 382
@@ -426,7 +426,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) @@ -426,7 +426,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget)
426 426
427 } 427 }
428 428
429 -LIB3270_EXPORT int v3270_host_select_apply(V3270HostSelectWidget *widget) 429 +int v3270_host_select_apply(V3270HostSelectWidget *widget)
430 { 430 {
431 g_return_val_if_fail(GTK_IS_V3270HostSelectWidget(widget),0); 431 g_return_val_if_fail(GTK_IS_V3270HostSelectWidget(widget),0);
432 432
src/include/config.h.in
  Diff comments   View file @5d28bb7
@@ -35,8 +35,6 @@ @@ -35,8 +35,6 @@
35 #undef PACKAGE_VERSION 35 #undef PACKAGE_VERSION
36 #undef PACKAGE_RELEASE 36 #undef PACKAGE_RELEASE
37 37
38 - #undef HAVE_GNUC_VISIBILITY  
39 -  
40 #undef HAVE_GNOME 38 #undef HAVE_GNOME
41 #undef HAVE_GTKMAC 39 #undef HAVE_GTKMAC
42 40
src/include/hostselect.h
  Diff comments   View file @5d28bb7
@@ -59,8 +59,8 @@ @@ -59,8 +59,8 @@
59 59
60 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/ 60 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
61 61
62 - LIB3270_EXPORT void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *session);  
63 - LIB3270_EXPORT int v3270_host_select_apply(V3270HostSelectWidget *widget); 62 + void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *session);
  63 + int v3270_host_select_apply(V3270HostSelectWidget *widget);
64 64
65 G_END_DECLS 65 G_END_DECLS
66 66
src/include/v3270.h
  Diff comments   View file @5d28bb7
@@ -168,24 +168,24 @@ @@ -168,24 +168,24 @@
168 #define v3270char void 168 #define v3270char void
169 #endif // v3270_char 169 #endif // v3270_char
170 170
171 - LIB3270_EXPORT GtkWidget * v3270_new(void);  
172 - LIB3270_EXPORT GType v3270_get_type(void); 171 + GtkWidget * v3270_new(void);
  172 + GType v3270_get_type(void);
173 173
174 - LIB3270_EXPORT void v3270_reload(GtkWidget * widget); 174 + void v3270_reload(GtkWidget * widget);
175 175
176 - LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name);  
177 - LIB3270_EXPORT const gchar * v3270_get_font_family(GtkWidget *widget); 176 + void v3270_set_font_family(GtkWidget *widget, const gchar *name);
  177 + const gchar * v3270_get_font_family(GtkWidget *widget);
178 178
179 - LIB3270_EXPORT H3270 * v3270_get_session(GtkWidget *widget);  
180 - LIB3270_EXPORT gboolean v3270_is_connected(GtkWidget *widget); 179 + H3270 * v3270_get_session(GtkWidget *widget);
  180 + gboolean v3270_is_connected(GtkWidget *widget);
181 181
182 - LIB3270_EXPORT int v3270_connect(GtkWidget *widget);  
183 - LIB3270_EXPORT void v3270_disconnect(GtkWidget *widget); 182 + int v3270_connect(GtkWidget *widget);
  183 + void v3270_disconnect(GtkWidget *widget);
184 184
185 - LIB3270_EXPORT int v3270_set_host_charset(GtkWidget *widget, const gchar *name); 185 + int v3270_set_host_charset(GtkWidget *widget, const gchar *name);
186 186
187 - LIB3270_EXPORT void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes);  
188 - LIB3270_EXPORT guint v3270_get_auto_disconnect(GtkWidget *widget); 187 + void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes);
  188 + guint v3270_get_auto_disconnect(GtkWidget *widget);
189 189
190 190
191 // Clipboard 191 // Clipboard
@@ -197,73 +197,73 @@ @@ -197,73 +197,73 @@
197 V3270_SELECT_MAX 197 V3270_SELECT_MAX
198 } V3270_SELECT_FORMAT; 198 } V3270_SELECT_FORMAT;
199 199
200 - LIB3270_EXPORT void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut);  
201 - LIB3270_EXPORT void v3270_copy_append(GtkWidget *widget);  
202 - LIB3270_EXPORT gchar * v3270_get_selected(GtkWidget *widget, gboolean cut);  
203 - LIB3270_EXPORT gchar * v3270_get_copy(GtkWidget *widget);  
204 - LIB3270_EXPORT void v3270_set_copy(GtkWidget *widget, const gchar *text); 200 + void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut);
  201 + void v3270_copy_append(GtkWidget *widget);
  202 + gchar * v3270_get_selected(GtkWidget *widget, gboolean cut);
  203 + gchar * v3270_get_copy(GtkWidget *widget);
  204 + void v3270_set_copy(GtkWidget *widget, const gchar *text);
205 205
206 - LIB3270_EXPORT int v3270_run_script(GtkWidget *widget, const gchar *script); 206 + int v3270_run_script(GtkWidget *widget, const gchar *script);
207 207
208 - LIB3270_EXPORT gchar * v3270_get_text(GtkWidget *widget,int offset, int len);  
209 - LIB3270_EXPORT gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all); 208 + gchar * v3270_get_text(GtkWidget *widget,int offset, int len);
  209 + gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all);
210 210
211 - LIB3270_EXPORT void v3270_set_string(GtkWidget *widget, const gchar *str);  
212 - LIB3270_EXPORT void v3270_tab(GtkWidget *widget);  
213 - LIB3270_EXPORT void v3270_backtab(GtkWidget *widget); 211 + void v3270_set_string(GtkWidget *widget, const gchar *str);
  212 + void v3270_tab(GtkWidget *widget);
  213 + void v3270_backtab(GtkWidget *widget);
214 214
215 // Cut & Paste 215 // Cut & Paste
216 - LIB3270_EXPORT gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end);  
217 - LIB3270_EXPORT void v3270_unselect(GtkWidget *widget);  
218 - LIB3270_EXPORT void v3270_select_all(GtkWidget *widget);  
219 - LIB3270_EXPORT void v3270_paste(GtkWidget *widget);  
220 - LIB3270_EXPORT void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding);  
221 - LIB3270_EXPORT void v3270_select_region(GtkWidget *widget, gint start, gint end); 216 + gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end);
  217 + void v3270_unselect(GtkWidget *widget);
  218 + void v3270_select_all(GtkWidget *widget);
  219 + void v3270_paste(GtkWidget *widget);
  220 + void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding);
  221 + void v3270_select_region(GtkWidget *widget, gint start, gint end);
222 222
223 // Colors 223 // Colors
224 - LIB3270_EXPORT void v3270_set_colors(GtkWidget *widget, const gchar *);  
225 - LIB3270_EXPORT void v3270_set_color_table(GdkRGBA *table, const gchar *colors);  
226 - LIB3270_EXPORT const GdkRGBA * v3270_get_color_table(GtkWidget *widget);  
227 - LIB3270_EXPORT void v3270_set_mono_color_table(GdkRGBA *table, const gchar *fg, const gchar *bg);  
228 - LIB3270_EXPORT void v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, v3270FontInfo *font, GdkRectangle *rect, GdkRGBA *color);  
229 - LIB3270_EXPORT void v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkRGBA *color);  
230 - LIB3270_EXPORT GdkRGBA * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id); 224 + void v3270_set_colors(GtkWidget *widget, const gchar *);
  225 + void v3270_set_color_table(GdkRGBA *table, const gchar *colors);
  226 + const GdkRGBA * v3270_get_color_table(GtkWidget *widget);
  227 + void v3270_set_mono_color_table(GdkRGBA *table, const gchar *fg, const gchar *bg);
  228 + void v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, v3270FontInfo *font, GdkRectangle *rect, GdkRGBA *color);
  229 + void v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkRGBA *color);
  230 + GdkRGBA * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);
231 231
232 // Misc 232 // Misc
233 - LIB3270_EXPORT GtkIMContext * v3270_get_im_context(GtkWidget *widget);  
234 - LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);  
235 - LIB3270_EXPORT void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text);  
236 - LIB3270_EXPORT const gchar * v3270_get_session_name(GtkWidget *widget);  
237 - LIB3270_EXPORT void v3270_set_session_name(GtkWidget *widget, const gchar *name);  
238 - LIB3270_EXPORT int v3270_set_script(GtkWidget *widget, const gchar id, gboolean on);  
239 - LIB3270_EXPORT void v3270_set_scaled_fonts(GtkWidget *widget, gboolean on);  
240 - LIB3270_EXPORT void v3270_set_session_options(GtkWidget *widget, LIB3270_OPTION options);  
241 - LIB3270_EXPORT int v3270_set_session_color_type(GtkWidget *widget, unsigned short colortype);  
242 - LIB3270_EXPORT int v3270_set_host_type(GtkWidget *widget, const char *name);  
243 - LIB3270_EXPORT const gchar * v3270_set_url(GtkWidget *widget, const gchar *uri);  
244 - LIB3270_EXPORT const gchar * v3270_get_hostname(GtkWidget *widget);  
245 - LIB3270_EXPORT const char * v3270_get_luname(GtkWidget *widget);  
246 - LIB3270_EXPORT GtkWidget * v3270_get_default_widget(void);  
247 -  
248 - LIB3270_EXPORT void v3270_remap_from_xml(GtkWidget *widget, const gchar *path); 233 + GtkIMContext * v3270_get_im_context(GtkWidget *widget);
  234 + gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);
  235 + void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text);
  236 + const gchar * v3270_get_session_name(GtkWidget *widget);
  237 + void v3270_set_session_name(GtkWidget *widget, const gchar *name);
  238 + int v3270_set_script(GtkWidget *widget, const gchar id, gboolean on);
  239 + void v3270_set_scaled_fonts(GtkWidget *widget, gboolean on);
  240 + void v3270_set_session_options(GtkWidget *widget, LIB3270_OPTION options);
  241 + int v3270_set_session_color_type(GtkWidget *widget, unsigned short colortype);
  242 + int v3270_set_host_type(GtkWidget *widget, const char *name);
  243 + const gchar * v3270_set_url(GtkWidget *widget, const gchar *uri);
  244 + const gchar * v3270_get_hostname(GtkWidget *widget);
  245 + const char * v3270_get_luname(GtkWidget *widget);
  246 + GtkWidget * v3270_get_default_widget(void);
  247 +
  248 + void v3270_remap_from_xml(GtkWidget *widget, const gchar *path);
249 249
250 // Keyboard & Mouse special actions 250 // Keyboard & Mouse special actions
251 - LIB3270_EXPORT gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action);  
252 - LIB3270_EXPORT void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, GtkAction *action); 251 + gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action);
  252 + void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, GtkAction *action);
253 253
254 // SSL & Security 254 // SSL & Security
255 - LIB3270_EXPORT const gchar * v3270_get_ssl_status_icon(GtkWidget *widget);  
256 - LIB3270_EXPORT const gchar * v3270_get_ssl_status_text(GtkWidget *widget);  
257 - LIB3270_EXPORT const gchar * v3270_get_ssl_status_message(GtkWidget *widget);  
258 - LIB3270_EXPORT void v3270_popup_security_dialog(GtkWidget *widget); 255 + const gchar * v3270_get_ssl_status_icon(GtkWidget *widget);
  256 + const gchar * v3270_get_ssl_status_text(GtkWidget *widget);
  257 + const gchar * v3270_get_ssl_status_message(GtkWidget *widget);
  258 + void v3270_popup_security_dialog(GtkWidget *widget);
259 259
260 260
261 // File transfer 261 // File transfer
262 - LIB3270_EXPORT gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gchar *local, const gchar *remote, int lrecl, int blksize, int primspace, int secspace, int dft); 262 + gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gchar *local, const gchar *remote, int lrecl, int blksize, int primspace, int secspace, int dft);
263 263
264 // Auxiliary widgets 264 // Auxiliary widgets
265 - LIB3270_EXPORT GtkWidget * v3270_host_select_new(GtkWidget *widget);  
266 - LIB3270_EXPORT void v3270_select_host(GtkWidget *widget); 265 + GtkWidget * v3270_host_select_new(GtkWidget *widget);
  266 + void v3270_select_host(GtkWidget *widget);
267 267
268 268
269 G_END_DECLS 269 G_END_DECLS
src/include/v3270/filetransfer.h
  Diff comments   View file @5d28bb7
@@ -50,34 +50,34 @@ @@ -50,34 +50,34 @@
50 typedef struct _v3270ftClass v3270ftClass; 50 typedef struct _v3270ftClass v3270ftClass;
51 51
52 52
53 - LIB3270_EXPORT GtkWidget * v3270ft_new(void);  
54 - LIB3270_EXPORT GType v3270ft_get_type(void);  
55 - LIB3270_EXPORT void v3270ft_set_options(GtkWidget *widget, LIB3270_FT_OPTION opt);  
56 - LIB3270_EXPORT LIB3270_FT_OPTION v3270ft_get_options(GtkWidget *widget);  
57 - LIB3270_EXPORT void v3270ft_reset(GtkWidget *widget);  
58 - LIB3270_EXPORT gboolean v3270ft_is_valid(GtkWidget *widget);  
59 - LIB3270_EXPORT guint v3270ft_get_length(GtkWidget *widget);  
60 - LIB3270_EXPORT void v3270ft_select_first(GtkWidget *widget);  
61 - LIB3270_EXPORT void v3270ft_select_last(GtkWidget *widget);  
62 - LIB3270_EXPORT void v3270ft_select_previous(GtkWidget *widget);  
63 - LIB3270_EXPORT void v3270ft_select_next(GtkWidget *widget);  
64 - LIB3270_EXPORT void v3270ft_remove_selected(GtkWidget *widget);  
65 - LIB3270_EXPORT void v3270ft_remove_all(GtkWidget *widget);  
66 - LIB3270_EXPORT void v3270ft_save(GtkWidget *widget,const gchar *filename);  
67 - LIB3270_EXPORT void v3270ft_load(GtkWidget *widget,const gchar *filename); 53 + GtkWidget * v3270ft_new(void);
  54 + GType v3270ft_get_type(void);
  55 + void v3270ft_set_options(GtkWidget *widget, LIB3270_FT_OPTION opt);
  56 + LIB3270_FT_OPTION v3270ft_get_options(GtkWidget *widget);
  57 + void v3270ft_reset(GtkWidget *widget);
  58 + gboolean v3270ft_is_valid(GtkWidget *widget);
  59 + guint v3270ft_get_length(GtkWidget *widget);
  60 + void v3270ft_select_first(GtkWidget *widget);
  61 + void v3270ft_select_last(GtkWidget *widget);
  62 + void v3270ft_select_previous(GtkWidget *widget);
  63 + void v3270ft_select_next(GtkWidget *widget);
  64 + void v3270ft_remove_selected(GtkWidget *widget);
  65 + void v3270ft_remove_all(GtkWidget *widget);
  66 + void v3270ft_save(GtkWidget *widget,const gchar *filename);
  67 + void v3270ft_load(GtkWidget *widget,const gchar *filename);
68 68
69 - LIB3270_EXPORT gboolean v3270ft_has_selected(GtkWidget *widget);  
70 - LIB3270_EXPORT gboolean v3270ft_has_next(GtkWidget *widget); 69 + gboolean v3270ft_has_selected(GtkWidget *widget);
  70 + gboolean v3270ft_has_next(GtkWidget *widget);
71 71
72 - LIB3270_EXPORT const gchar * v3270ft_get_local_filename(GtkWidget *widget);  
73 - LIB3270_EXPORT const gchar * v3270ft_get_remote_filename(GtkWidget *widget); 72 + const gchar * v3270ft_get_local_filename(GtkWidget *widget);
  73 + const gchar * v3270ft_get_remote_filename(GtkWidget *widget);
74 74
75 - LIB3270_EXPORT void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text);  
76 - LIB3270_EXPORT guint v3270ft_append_selection(GtkWidget *widget, GtkSelectionData *data); 75 + void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text);
  76 + guint v3270ft_append_selection(GtkWidget *widget, GtkSelectionData *data);
77 77
78 - LIB3270_EXPORT gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED; 78 + gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED;
79 79
80 - LIB3270_EXPORT gint v3270ft_transfer(GtkWidget *dialog, H3270 *session); 80 + gint v3270ft_transfer(GtkWidget *dialog, H3270 *session);
81 81
82 G_END_DECLS 82 G_END_DECLS
83 83
src/testprogram/testprogram.c
  Diff comments   View file @5d28bb7
@@ -94,14 +94,7 @@ static void activate(GtkApplication* app, gpointer user_data) { @@ -94,14 +94,7 @@ static void activate(GtkApplication* app, gpointer user_data) {
94 // Setup terminal 94 // Setup terminal
95 GKeyFile * conf = g_key_file_new(); 95 GKeyFile * conf = g_key_file_new();
96 96
97 - g_key_file_load_from_dirs(conf,"pw3270.conf",(const gchar **) search, &filename,G_KEY_FILE_NONE,NULL);  
98 - g_message("Configuration from %s",filename);  
99 -  
100 - // v3270_set_from_keyfile(terminal,conf);  
101 -  
102 - g_key_file_unref(conf);  
103 -  
104 - v3270_connect(terminal); 97 + // v3270_connect(terminal);
105 98
106 g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL); 99 g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL);
107 100
src/v3270/oia.c
  Diff comments   View file @5d28bb7
@@ -1165,7 +1165,7 @@ static void release_script(v3270 *widget) @@ -1165,7 +1165,7 @@ static void release_script(v3270 *widget)
1165 widget->script.id = 0; 1165 widget->script.id = 0;
1166 } 1166 }
1167 1167
1168 -LIB3270_EXPORT int v3270_set_script(GtkWidget *widget, const gchar id, gboolean on) 1168 +int v3270_set_script(GtkWidget *widget, const gchar id, gboolean on)
1169 { 1169 {
1170 v3270 *terminal; 1170 v3270 *terminal;
1171 g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL); 1171 g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL);
src/v3270/private.h
  Diff comments   View file @5d28bb7
@@ -233,9 +233,9 @@ G_BEGIN_DECLS @@ -233,9 +233,9 @@ G_BEGIN_DECLS
233 233
234 const GtkWidgetClass * v3270_get_parent_class(void); 234 const GtkWidgetClass * v3270_get_parent_class(void);
235 235
236 -gboolean v3270_draw(GtkWidget * widget, cairo_t * cr);  
237 -void v3270_draw_oia(cairo_t *cr, H3270 *host, int row, int cols, v3270FontInfo *metrics, GdkRGBA *color, GdkRectangle *rect);  
238 -void v3270_update_mouse_pointer(GtkWidget *widget); 236 +G_GNUC_INTERNAL gboolean v3270_draw(GtkWidget * widget, cairo_t * cr);
  237 +G_GNUC_INTERNAL void v3270_draw_oia(cairo_t *cr, H3270 *host, int row, int cols, v3270FontInfo *metrics, GdkRGBA *color, GdkRectangle *rect);
  238 +G_GNUC_INTERNAL void v3270_update_mouse_pointer(GtkWidget *widget);
239 239
240 #if ! GTK_CHECK_VERSION(2,18,0) 240 #if ! GTK_CHECK_VERSION(2,18,0)
241 G_GNUC_INTERNAL void gtk_widget_get_allocation(GtkWidget *widget,GtkAllocation *allocation); 241 G_GNUC_INTERNAL void gtk_widget_get_allocation(GtkWidget *widget,GtkAllocation *allocation);
@@ -259,36 +259,36 @@ void v3270_update_mouse_pointer(GtkWidget *widget); @@ -259,36 +259,36 @@ void v3270_update_mouse_pointer(GtkWidget *widget);
259 gboolean v3270_expose(GtkWidget * widget, GdkEventExpose *event); 259 gboolean v3270_expose(GtkWidget * widget, GdkEventExpose *event);
260 #endif // GTK 3 260 #endif // GTK 3
261 261
262 -void v3270_draw_shift_status(v3270 *terminal);  
263 -void v3270_draw_alt_status(v3270 *terminal);  
264 -void v3270_draw_ins_status(v3270 *terminal); 262 +G_GNUC_INTERNAL void v3270_draw_shift_status(v3270 *terminal);
  263 +G_GNUC_INTERNAL void v3270_draw_alt_status(v3270 *terminal);
  264 +G_GNUC_INTERNAL void v3270_draw_ins_status(v3270 *terminal);
265 265
266 -void v3270_clear_clipboard(v3270 *terminal); 266 +G_GNUC_INTERNAL void v3270_clear_clipboard(v3270 *terminal);
267 267
268 -void v3270_update_cursor_surface(v3270 *widget,unsigned char chr,unsigned short attr); 268 +G_GNUC_INTERNAL void v3270_update_cursor_surface(v3270 *widget,unsigned char chr,unsigned short attr);
269 269
270 -void v3270_register_io_handlers(v3270Class *cls); 270 +G_GNUC_INTERNAL void v3270_register_io_handlers(v3270Class *cls);
271 271
272 -void v3270_draw_char(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, v3270FontInfo *font, GdkRectangle *rect, GdkRGBA *fg, GdkRGBA *bg);  
273 -void v3270_draw_text(cairo_t *cr, const GdkRectangle *rect, v3270FontInfo *font, const char *str);  
274 -void v3270_draw_text_at(cairo_t *cr, int x, int y, v3270FontInfo *font, const char *str); 272 +G_GNUC_INTERNAL void v3270_draw_char(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, v3270FontInfo *font, GdkRectangle *rect, GdkRGBA *fg, GdkRGBA *bg);
  273 +G_GNUC_INTERNAL void v3270_draw_text(cairo_t *cr, const GdkRectangle *rect, v3270FontInfo *font, const char *str);
  274 +G_GNUC_INTERNAL void v3270_draw_text_at(cairo_t *cr, int x, int y, v3270FontInfo *font, const char *str);
275 275
276 -void v3270_start_timer(GtkWidget *terminal);  
277 -void v3270_stop_timer(GtkWidget *terminal); 276 +G_GNUC_INTERNAL void v3270_start_timer(GtkWidget *terminal);
  277 +G_GNUC_INTERNAL void v3270_stop_timer(GtkWidget *terminal);
278 278
279 -void v3270_draw_connection(cairo_t *cr, H3270 *host, v3270FontInfo *metrics, GdkRGBA *color, const GdkRectangle *rect);  
280 -void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, v3270FontInfo *metrics, GdkRGBA *color, GdkRectangle *rect); 279 +G_GNUC_INTERNAL void v3270_draw_connection(cairo_t *cr, H3270 *host, v3270FontInfo *metrics, GdkRGBA *color, const GdkRectangle *rect);
  280 +G_GNUC_INTERNAL void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, v3270FontInfo *metrics, GdkRGBA *color, GdkRectangle *rect);
281 281
282 -void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned short attr, unsigned char cursor); 282 +G_GNUC_INTERNAL void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned short attr, unsigned char cursor);
283 283
284 -void v3270_update_font_metrics(v3270 *terminal, cairo_t *cr, int width, int height); 284 +G_GNUC_INTERNAL void v3270_update_font_metrics(v3270 *terminal, cairo_t *cr, int width, int height);
285 285
286 -void v3270_update_cursor_rect(v3270 *widget, GdkRectangle *rect, unsigned char chr, unsigned short attr); 286 +G_GNUC_INTERNAL void v3270_update_cursor_rect(v3270 *widget, GdkRectangle *rect, unsigned char chr, unsigned short attr);
287 287
288 -void v3270_update_message(v3270 *widget, LIB3270_MESSAGE id);  
289 -void v3270_update_cursor(H3270 *session, unsigned short row, unsigned short col, unsigned char c, unsigned short attr);  
290 -void v3270_update_oia(H3270 *session, LIB3270_FLAG id, unsigned char on);  
291 -void v3270_update_ssl(H3270 *session, LIB3270_SSL_STATE state); 288 +G_GNUC_INTERNAL void v3270_update_message(v3270 *widget, LIB3270_MESSAGE id);
  289 +G_GNUC_INTERNAL void v3270_update_cursor(H3270 *session, unsigned short row, unsigned short col, unsigned char c, unsigned short attr);
  290 +G_GNUC_INTERNAL void v3270_update_oia(H3270 *session, LIB3270_FLAG id, unsigned char on);
  291 +G_GNUC_INTERNAL void v3270_update_ssl(H3270 *session, LIB3270_SSL_STATE state);
292 292
293 G_GNUC_INTERNAL void v3270_update_luname(GtkWidget *widget,const gchar *name); 293 G_GNUC_INTERNAL void v3270_update_luname(GtkWidget *widget,const gchar *name);
294 G_GNUC_INTERNAL void v3270_init_properties(GObjectClass * gobject_class); 294 G_GNUC_INTERNAL void v3270_init_properties(GObjectClass * gobject_class);
@@ -298,15 +298,15 @@ G_GNUC_INTERNAL void v3270_disable_updates(GtkWidget *widget); @@ -298,15 +298,15 @@ G_GNUC_INTERNAL void v3270_disable_updates(GtkWidget *widget);
298 G_GNUC_INTERNAL void v3270_enable_updates(GtkWidget *widget); 298 G_GNUC_INTERNAL void v3270_enable_updates(GtkWidget *widget);
299 299
300 // Keyboard & Mouse 300 // Keyboard & Mouse
301 -gboolean v3270_key_press_event(GtkWidget *widget, GdkEventKey *event);  
302 -gboolean v3270_key_release_event(GtkWidget *widget, GdkEventKey *event);  
303 -void v3270_key_commit(GtkIMContext *imcontext, gchar *str, v3270 *widget);  
304 -gboolean v3270_button_press_event(GtkWidget *widget, GdkEventButton *event);  
305 -gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event);  
306 -gboolean v3270_motion_notify_event(GtkWidget *widget, GdkEventMotion *event);  
307 -void v3270_emit_popup(v3270 *widget, int baddr, GdkEventButton *event);  
308 -gint v3270_get_offset_at_point(v3270 *widget, gint x, gint y);  
309 -gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event); 301 +G_GNUC_INTERNAL gboolean v3270_key_press_event(GtkWidget *widget, GdkEventKey *event);
  302 +G_GNUC_INTERNAL gboolean v3270_key_release_event(GtkWidget *widget, GdkEventKey *event);
  303 +G_GNUC_INTERNAL void v3270_key_commit(GtkIMContext *imcontext, gchar *str, v3270 *widget);
  304 +G_GNUC_INTERNAL gboolean v3270_button_press_event(GtkWidget *widget, GdkEventButton *event);
  305 +G_GNUC_INTERNAL gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event);
  306 +G_GNUC_INTERNAL gboolean v3270_motion_notify_event(GtkWidget *widget, GdkEventMotion *event);
  307 +G_GNUC_INTERNAL void v3270_emit_popup(v3270 *widget, int baddr, GdkEventButton *event);
  308 +G_GNUC_INTERNAL gint v3270_get_offset_at_point(v3270 *widget, gint x, gint y);
  309 +G_GNUC_INTERNAL gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event);
310 310
311 G_GNUC_INTERNAL const struct v3270_ssl_status_msg * v3270_get_ssl_status_msg(GtkWidget *widget); 311 G_GNUC_INTERNAL const struct v3270_ssl_status_msg * v3270_get_ssl_status_msg(GtkWidget *widget);
312 312
src/v3270/properties.c
  Diff comments   View file @5d28bb7
@@ -164,13 +164,13 @@ @@ -164,13 +164,13 @@
164 debug("%s",__FUNCTION__); 164 debug("%s",__FUNCTION__);
165 } 165 }
166 166
167 - LIB3270_EXPORT void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes) 167 + void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes)
168 { 168 {
169 g_return_if_fail(GTK_IS_V3270(widget)); 169 g_return_if_fail(GTK_IS_V3270(widget));
170 GTK_V3270(widget)->activity.disconnect = minutes; 170 GTK_V3270(widget)->activity.disconnect = minutes;
171 } 171 }
172 172
173 - LIB3270_EXPORT guint v3270_get_auto_disconnect(GtkWidget *widget) 173 + guint v3270_get_auto_disconnect(GtkWidget *widget)
174 { 174 {
175 g_return_val_if_fail(GTK_IS_V3270(widget),0); 175 g_return_val_if_fail(GTK_IS_V3270(widget),0);
176 return GTK_V3270(widget)->activity.disconnect; 176 return GTK_V3270(widget)->activity.disconnect;
src/v3270/security.c
  Diff comments   View file @5d28bb7
@@ -294,7 +294,7 @@ @@ -294,7 +294,7 @@
294 return NULL; 294 return NULL;
295 } 295 }
296 296
297 - LIB3270_EXPORT const gchar * v3270_get_ssl_status_icon(GtkWidget *widget) 297 + const gchar * v3270_get_ssl_status_icon(GtkWidget *widget)
298 { 298 {
299 g_return_val_if_fail(GTK_IS_V3270(widget),""); 299 g_return_val_if_fail(GTK_IS_V3270(widget),"");
300 300
@@ -315,7 +315,7 @@ @@ -315,7 +315,7 @@
315 315
316 } 316 }
317 317
318 - LIB3270_EXPORT const gchar * v3270_get_ssl_status_text(GtkWidget *widget) 318 + const gchar * v3270_get_ssl_status_text(GtkWidget *widget)
319 { 319 {
320 g_return_val_if_fail(GTK_IS_V3270(widget),""); 320 g_return_val_if_fail(GTK_IS_V3270(widget),"");
321 321
@@ -333,7 +333,7 @@ @@ -333,7 +333,7 @@
333 return v3270_get_hostname(widget); 333 return v3270_get_hostname(widget);
334 } 334 }
335 335
336 - LIB3270_EXPORT const gchar * v3270_get_ssl_status_message(GtkWidget *widget) 336 + const gchar * v3270_get_ssl_status_message(GtkWidget *widget)
337 { 337 {
338 g_return_val_if_fail(GTK_IS_V3270(widget),""); 338 g_return_val_if_fail(GTK_IS_V3270(widget),"");
339 339