Commit c3df40c4ef4e19703995c7c0dc908a1d0b9f9202

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

Fixing arch build.

README.md
... ... @@ -4,7 +4,9 @@ Created originally as part of PW3270 application.
4 4  
5 5 See more details at https://softwarepublico.gov.br/social/pw3270/
6 6  
  7 +[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
7 8 ![CodeQL](https://github.com/PerryWerneck/libv3270/workflows/CodeQL/badge.svg?branch=master)
  9 +![Analytics](https://ga-beacon.appspot.com/G-RSMGQ9Q5BG/github/libv3270)
8 10 ![Downloads](https://img.shields.io/github/downloads/PerryWerneck/libv3270/total.svg)
9 11  
10 12  
... ...
autogen.sh
... ... @@ -6,21 +6,33 @@ test -n "$srcdir" || srcdir=.
6 6 olddir=`pwd`
7 7 cd "$srcdir"
8 8  
  9 +mkdir -p scripts
9 10 mkdir -p m4
10 11  
  12 +libtoolize --force
  13 +if test $? != 0 ; then
  14 + echo "libtoolize failed."
  15 + exit -1
  16 +fi
  17 +
11 18 aclocal
12 19 if test $? != 0 ; then
13 20 echo "aclocal failed."
14 21 exit -1
15 22 fi
16 23  
17   -autoconf
  24 +#autoheader --force
  25 +#if test $? != 0 ; then
  26 +# echo "autoheader failed."
  27 +# exit -1
  28 +#fi
  29 +
  30 +autoconf --force
18 31 if test $? != 0 ; then
19 32 echo "autoconf failed."
20 33 exit -1
21 34 fi
22 35  
23   -mkdir -p scripts
24 36 automake --add-missing 2> /dev/null | true
25 37  
26 38 cd "$olddir"
... ...
src/terminal/drawing/oia.c
... ... @@ -731,7 +731,6 @@ void v3270_draw_oia(v3270 *terminal, cairo_t *cr, int row, int cols)
731 731 }
732 732  
733 733 cairo_save(cr);
734   -// v3270_draw_ssl_status(cr,terminal->host,&terminal->font,terminal->color,terminal->oia.rect+V3270_OIA_SSL);
735 734 v3270_draw_ssl_status(terminal,cr,terminal->oia.rect+V3270_OIA_SSL);
736 735 cairo_restore(cr);
737 736  
... ... @@ -762,12 +761,7 @@ cairo_t * v3270_oia_set_update_region(v3270 * terminal, GdkRectangle **r, V3270_
762 761  
763 762 *r = rect;
764 763  
765   -#ifdef DEBUG
766   - cairo_set_source_rgb(cr,0.1,0.1,0.1);
767   -#else
768 764 gdk_cairo_set_source_rgba(cr,terminal->color+V3270_COLOR_OIA_BACKGROUND);
769   -#endif
770   -
771 765 cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height);
772 766 cairo_fill(cr);
773 767  
... ... @@ -802,19 +796,18 @@ gboolean v3270_update_associated_lu(v3270 *terminal)
802 796  
803 797 void v3270_update_message(v3270 *widget, LIB3270_MESSAGE id)
804 798 {
805   - cairo_t * cr;
806   - GdkRectangle * rect;
807 799  
808   - if(!widget->surface)
809   - return;
  800 + if(widget->surface) {
810 801  
811   - cr = v3270_oia_set_update_region(widget,&rect,V3270_OIA_MESSAGE);
  802 + GdkRectangle * rect;
  803 + cairo_t * cr = v3270_oia_set_update_region(widget,&rect,V3270_OIA_MESSAGE);
812 804  
813   - draw_status_message(cr,id,&widget->font,widget->color,rect);
  805 + draw_status_message(cr,id,&widget->font,widget->color,rect);
  806 + cairo_destroy(cr);
814 807  
815   - cairo_destroy(cr);
  808 + v3270_queue_draw_area(GTK_WIDGET(widget),rect->x,rect->y,rect->width,rect->height);
816 809  
817   - v3270_queue_draw_area(GTK_WIDGET(widget),rect->x,rect->y,rect->width,rect->height);
  810 + }
818 811  
819 812 if(widget->accessible)
820 813 v3270_acessible_set_state(widget->accessible,id);
... ...