fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-09-28 16:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/rtl/gtxwc/gtxwc.h
  * harbour/src/rtl/gtxwc/gtxwc.c
    % use common buffer for different box drawing character definitions
This commit is contained in:
Przemyslaw Czerpak
2011-09-28 14:31:02 +00:00
parent bb4446f3cf
commit 76205aef80
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-09-28 16:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/gtxwc/gtxwc.h
* harbour/src/rtl/gtxwc/gtxwc.c
% use common buffer for different box drawing character definitions
2011-09-27 20:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/gtqtc/gtqtc.cpp
! deleted unused static function shown by new mingw version.

21
harbour/src/rtl/gtxwc/gtxwc.c
View File

@@ -507,25 +507,29 @@ static void hb_gt_xwc_Enable( void )
static HB_BOOL hb_gt_xwc_DefineBoxChar( PXWND_DEF wnd, HB_USHORT usCh, XWC_CharTrans *bxCh )
{
XSegment segs[9];
XPoint pts[XWC_MAX_CHAR_POINTS];
XRectangle rect[4];
typedef union
{
XSegment segs[ XWC_MAX_CHAR_SEGS ];
XRectangle rect[ XWC_MAX_CHAR_RECTS ];
XPoint pts[ XWC_MAX_CHAR_POINTS ];
} HB_XWC_CHDEF;
HB_XWC_CHDEF chdef;
XSegment * segs = chdef.segs;
XRectangle * rect = chdef.rect;
XPoint * pts = chdef.pts;
XWC_CharType type = CH_CHAR;
int size = 0;
HB_BOOL inverse = HB_FALSE;
int cellx = wnd->fontWidth;
int celly = wnd->fontHeight;
int i;
int i, y, x, yy, xx, skip, start, mod;
switch( usCh )
{
case HB_GTXWC_FILLER1:
case HB_GTXWC_FILLER2:
case HB_GTXWC_FILLER3:
{
int x, y, xx, yy, skip, start, mod;
if( usCh == HB_GTXWC_FILLER1 )
{
skip = 4;
@@ -553,9 +557,7 @@ static HB_BOOL hb_gt_xwc_DefineBoxChar( PXWND_DEF wnd, HB_USHORT usCh, XWC_CharT
* character definition will not be finished
*/
if( size >= XWC_MAX_CHAR_POINTS )
{
break;
}
pts[size].x = x - xx;
pts[size].y = y - yy;
xx = x;
@@ -565,7 +567,6 @@ static HB_BOOL hb_gt_xwc_DefineBoxChar( PXWND_DEF wnd, HB_USHORT usCh, XWC_CharT
}
type = size == 0 ? CH_NONE : CH_PTS;
break;
}
case HB_GTXWC_ARROW_R:
i = HB_MIN( ( celly >> 1 ), cellx ) - 3;

1
harbour/src/rtl/gtxwc/gtxwc.h
View File

@@ -96,6 +96,7 @@ typedef HB_USHORT HB_GT_CELLTYPE;
#define XWC_MAX_BUTTONS 8
#define XWC_MAX_CHAR_POINTS 1024
#define XWC_MAX_CHAR_RECTS ( XWC_MAX_CHAR_POINTS / 2 )
#define XWC_MAX_CHAR_SEGS ( XWC_MAX_CHAR_POINTS / 2 )
/* Font definition */
#define XWC_DEFAULT_FONT_HEIGHT 18