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

2006-03-01 16:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/rtl/cdpapi.c
  * harbour/source/rtl/gtxwc/gtxwc.c
    ! fixed UTF8 trnalsations
This commit is contained in:
Przemyslaw Czerpak
2006-03-01 15:40:32 +00:00
parent c5ccfa9978
commit 204f44ef8c
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -8,6 +8,11 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
* harbour/makefile.vc
F.e.: dbInfo( DBI_SCOPEDRELATION, 1 )
2006-03-01 20:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbapicdp.h
* harbour/source/rtl/cdpapi.c
* added optional BOOL parameter to functions which translate to UTF8
to not translate control code characters

8
harbour/source/rtl/cdpapi.c
View File

@@ -547,14 +547,14 @@ HB_EXPORT ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp,
{
if( ulD < ulDst )
{
if( cdp->uniTable && cdp->uniTable->uniCodes && uc >= 0x100 )
if( cdp->uniTable && cdp->uniTable->uniCodes )
{
int i;
for ( i = 0; i < cdp->uniTable->nChars; i++ )
{
if ( cdp->uniTable->uniCodes[ i ] == uc )
{
uc = i;
uc = ( USHORT ) i;
break;
}
}
@@ -576,14 +576,14 @@ HB_EXPORT BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BYTE ch, int * n, USHORT * u
{
if ( utf8tou16nextchar( ch, n, uc ) )
{
if ( *n == 0 && cdp && cdp->uniTable && cdp->uniTable->uniCodes && *uc >= 0x100 )
if ( *n == 0 && cdp && cdp->uniTable && cdp->uniTable->uniCodes )
{
int i;
for ( i = 0; i < cdp->uniTable->nChars; i++ )
{
if ( cdp->uniTable->uniCodes[ i ] == *uc )
{
*uc = i;
*uc = ( USHORT ) i;
break;
}
}

18
harbour/source/rtl/gtxwc/gtxwc.c
View File

@@ -2110,7 +2110,7 @@ static void hb_gt_xwc_WndProc( PXWND_DEF wnd, XEvent *evt )
wnd->ClipboardRequest,
wnd->ClipboardRequest == None ? "None" : XGetAtomName(wnd->dpy, wnd->ClipboardRequest) ); fflush(stdout);
#endif
if( evt->xselection.property != None && wnd->ClipboardRequest )
if( evt->xselection.property != None )
{
XTextProperty text;
unsigned long nItem;
@@ -2120,6 +2120,9 @@ static void hb_gt_xwc_WndProc( PXWND_DEF wnd, XEvent *evt )
{
if( evt->xselection.target == s_atomUTF8String && text.format == 8 )
{
#ifdef XWC_DEBUG
printf( "UTF8String='%s'\r\n", text.value ); fflush(stdout);
#endif
nItem = hb_cdpUTF8StringLength( text.value, text.nitems );
if( wnd->ClipboardData != NULL )
hb_xfree( wnd->ClipboardData );
@@ -2132,6 +2135,9 @@ static void hb_gt_xwc_WndProc( PXWND_DEF wnd, XEvent *evt )
}
else if( evt->xselection.target == s_atomString && text.format == 8 )
{
#ifdef XWC_DEBUG
printf( "String='%s'\r\n", text.value ); fflush(stdout);
#endif
if( wnd->ClipboardData != NULL )
hb_xfree( wnd->ClipboardData );
wnd->ClipboardData = ( unsigned char * ) hb_xgrab( text.nitems + 1 );
@@ -2207,7 +2213,7 @@ static void hb_gt_xwc_WndProc( PXWND_DEF wnd, XEvent *evt )
{
BYTE * pBuffer = ( BYTE * ) hb_xgrab( wnd->ClipboardSize + 1 );
memcpy( pBuffer, wnd->ClipboardData, wnd->ClipboardSize + 1 );
hb_cdpnTranslate( ( char * ) pBuffer, wnd->inCDP, wnd->hostCDP, wnd->ClipboardSize );
hb_cdpnTranslate( ( char * ) pBuffer, wnd->hostCDP, wnd->inCDP, wnd->ClipboardSize );
XChangeProperty( wnd->dpy, req->requestor, req->property,
s_atomString, 8, PropModeReplace,
pBuffer, wnd->ClipboardSize );
@@ -2222,11 +2228,13 @@ static void hb_gt_xwc_WndProc( PXWND_DEF wnd, XEvent *evt )
}
else if( req->target == s_atomUTF8String )
{
PHB_CODEPAGE cdp = wnd->inCDP ? wnd->inCDP : wnd->hostCDP;
ULONG ulLen = hb_cdpStringInUTF8Length( cdp, wnd->ClipboardData, wnd->ClipboardSize );
ULONG ulLen = hb_cdpStringInUTF8Length( wnd->hostCDP, wnd->ClipboardData, wnd->ClipboardSize );
BYTE * pBuffer = ( BYTE * ) hb_xgrab( ulLen + 1 );
hb_cdpStrnToUTF8( cdp, wnd->ClipboardData, wnd->ClipboardSize, pBuffer );
hb_cdpStrnToUTF8( wnd->hostCDP, wnd->ClipboardData, wnd->ClipboardSize, pBuffer );
#ifdef XWC_DEBUG
printf( "SelectionRequest: (%s)->(%s) [%s]\r\n", wnd->ClipboardData, pBuffer, wnd->hostCDP->id ); fflush(stdout);
#endif
XChangeProperty( wnd->dpy, req->requestor, req->property,
s_atomUTF8String, 8, PropModeReplace,
pBuffer, ulLen );