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

2015-05-27 13:56 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/Makefile
  * src/rtl/net.c
  + src/rtl/netusr.c
    * moved hb_UserName() to separate file. It uses internally getpwuid()
      in *nix builds and access to this function adds additional library
      dependency which may block static builds in some cases.
      TODO: eliminate hb_UserName() from things like initial random seed
            to not create unnecessary dependency.

  * contrib/gtqtc/gtqtc1.cpp
    + enable software input panel (virtual keyboard) in iOS builds
This commit is contained in:
Przemysław Czerpak
2015-05-27 13:56:31 +02:00
parent 5576a9721b
commit c402ce1350
5 changed files with 204 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog.txt
View File

@@ -10,6 +10,19 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-05-27 13:56 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/Makefile
* src/rtl/net.c
+ src/rtl/netusr.c
* moved hb_UserName() to separate file. It uses internally getpwuid()
in *nix builds and access to this function adds additional library
dependency which may block static builds in some cases.
TODO: eliminate hb_UserName() from things like initial random seed
to not create unnecessary dependency.
* contrib/gtqtc/gtqtc1.cpp
+ enable software input panel (virtual keyboard) in iOS builds
2015-05-19 15:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/common/hbprintf.c
* removed modfl() protection with old HB_OS_IPHONE macro.

6
contrib/gtqtc/gtqtc1.cpp
View File

@@ -2571,7 +2571,7 @@ QTConsole::QTConsole( PHB_GTQTC pStructQTC, QWidget *parent ) : QWidget( parent
*/
/* setAttribute( Qt::WA_InputMethodEnabled ); */
#if defined( HB_OS_ANDROID ) || defined( HB_OS_WIN_CE )
#if defined( HB_OS_ANDROID ) || defined( HB_OS_IOS ) || defined( HB_OS_WIN_CE )
setInputMethodHints( Qt::ImhNoPredictiveText );
#endif
@@ -2995,7 +2995,7 @@ void QTConsole::focusInEvent( QFocusEvent * event )
{
hb_gt_qtc_addKeyToInputQueue( pQTC, HB_K_GOTFOCUS );
QWidget::focusInEvent( event );
#if defined( HB_OS_ANDROID ) || defined( HB_OS_WIN_CE )
#if defined( HB_OS_ANDROID ) || defined( HB_OS_IOS ) || defined( HB_OS_WIN_CE )
QEvent reqSIPevent( QEvent::RequestSoftwareInputPanel );
QApplication::sendEvent( pQTC->qWnd, &reqSIPevent );
#endif
@@ -3062,7 +3062,7 @@ void QTConsole::mouseDoubleClickEvent( QMouseEvent * event )
switch( event->button() )
{
case Qt::LeftButton:
#if defined( HB_OS_ANDROID ) || defined( HB_OS_WIN_CE )
#if defined( HB_OS_ANDROID ) || defined( HB_OS_IOS ) || defined( HB_OS_WIN_CE )
{
QEvent reqSIPevent( QEvent::RequestSoftwareInputPanel );
QApplication::sendEvent( pQTC->qWnd, &reqSIPevent );

1
src/rtl/Makefile
View File

@@ -143,6 +143,7 @@ C_SOURCES := \
natmsg.c \
natmsgu.c \
net.c \
netusr.c \
oemansi.c \
oldbox.c \
oldclear.c \

172
src/rtl/net.c
View File

@@ -59,42 +59,7 @@
#include "hbapi.h"
#if defined( HB_OS_OS2 ) && defined( __GNUC__ )
#include "hb_io.h"
/* 2004-03-25 - <maurilio.longo@libero.it>
not needed anymore as of GCC 3.2.2 */
#include <pwd.h>
#include <sys/types.h>
#if defined( __EMX__ ) && __GNUC__ * 1000 + __GNUC_MINOR__ < 3002
#include <emx/syscalls.h>
#define gethostname __gethostname
#endif
#elif defined( HB_OS_DOS )
#include <dos.h>
#if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ )
#include "hb_io.h"
#include <sys/param.h>
#endif
#elif defined( HB_OS_UNIX )
#if ! defined( __WATCOMC__ )
#if defined( HB_OS_VXWORKS )
#include <hostLib.h>
#else
#include <pwd.h>
#endif
#include <sys/types.h>
#endif
#include <unistd.h>
#elif defined( HB_OS_WIN )
#if defined( HB_OS_WIN )
#include <windows.h>
#include "hbwinuni.h"
@@ -102,6 +67,32 @@
#include "hbwince.h"
#endif
#elif defined( HB_OS_DOS )
#include "hb_io.h"
#if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ )
#include <sys/param.h>
#endif
#elif defined( HB_OS_OS2 ) && defined( __GNUC__ )
#include "hb_io.h"
/* 2004-03-25 - <maurilio.longo@libero.it>
not needed anymore as of GCC 3.2.2 */
#if defined( __EMX__ ) && __GNUC__ * 1000 + __GNUC_MINOR__ < 3002
#include <emx/syscalls.h>
#define gethostname __gethostname
#endif
#elif defined( HB_OS_UNIX ) && ! defined( __WATCOMC__ )
#if defined( HB_OS_VXWORKS )
#include <hostLib.h>
#endif
#include <unistd.h>
#endif
#if ! defined( MAXGETHOSTNAME ) && ( defined( HB_OS_UNIX ) || \
@@ -119,43 +110,7 @@
char * hb_netname( void )
{
#if defined( HB_OS_UNIX ) || ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) )
# if defined( __WATCOMC__ )
return hb_getenv( "HOSTNAME" );
# else
char szValue[ MAXGETHOSTNAME + 1 ];
szValue[ 0 ] = szValue[ MAXGETHOSTNAME ] = '\0';
gethostname( szValue, MAXGETHOSTNAME );
return szValue[ 0 ] ? hb_osStrDecode( szValue ) : NULL;
# endif
#elif defined( HB_OS_DOS )
# if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ )
char szValue[ MAXGETHOSTNAME + 1 ];
szValue[ 0 ] = szValue[ MAXGETHOSTNAME ] = '\0';
gethostname( szValue, MAXGETHOSTNAME );
return szValue[ 0 ] ? hb_osStrDecode( szValue ) : NULL;
# else
union REGS regs;
struct SREGS sregs;
char * pszValue = ( char * ) hb_xgrab( 16 );
pszValue[ 0 ] = '\0';
regs.HB_XREGS.ax = 0x5E00;
regs.HB_XREGS.dx = FP_OFF( pszValue );
sregs.ds = FP_SEG( pszValue );
HB_DOS_INT86X( 0x21, &regs, &regs, &sregs );
if( regs.h.ch == 0 )
pszValue = '\0';
return pszValue;
# endif
#elif defined( HB_OS_WIN )
#if defined( HB_OS_WIN )
DWORD ulLen = MAX_COMPUTERNAME_LENGTH + 1;
TCHAR lpValue[ MAX_COMPUTERNAME_LENGTH + 1 ];
@@ -164,44 +119,45 @@ char * hb_netname( void )
GetComputerName( lpValue, &ulLen );
lpValue[ MAX_COMPUTERNAME_LENGTH ] = TEXT( '\0' );
return lpValue[ 0 ] ? HB_OSSTRDUP( lpValue ) : NULL;
if( lpValue[ 0 ] )
return HB_OSSTRDUP( lpValue );
#else
#elif defined( HB_OS_DOS )
return NULL;
#endif
}
/* NOTE: The caller must free the returned buffer. [vszakats] */
char * hb_username( void )
{
#if defined( HB_OS_UNIX ) || ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) )
# if defined( __WATCOMC__ ) || defined( HB_OS_VXWORKS )
return hb_getenv( "USER" );
# if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ )
char szValue[ MAXGETHOSTNAME + 1 ];
szValue[ 0 ] = szValue[ MAXGETHOSTNAME ] = '\0';
gethostname( szValue, MAXGETHOSTNAME );
if( szValue[ 0 ] )
return hb_osStrDecode( szValue );
# else
struct passwd * pwd = getpwuid( getuid() );
return pwd && pwd->pw_name ? hb_osStrDecode( pwd->pw_name ) : hb_getenv( "USER" );
union REGS regs;
struct SREGS sregs;
char szValue[ 16 ];
szValue[ 0 ] = szValue[ 15 ] = '\0';
regs.HB_XREGS.ax = 0x5E00;
regs.HB_XREGS.dx = FP_OFF( pszValue );
sregs.ds = FP_SEG( pszValue );
HB_DOS_INT86X( 0x21, &regs, &regs, &sregs );
if( regs.h.ch != 0 && szValue[ 0 ] )
return hb_osStrDecode( szValue );
# endif
#elif defined( HB_OS_WIN )
#elif ( defined( HB_OS_UNIX ) && ! defined( __WATCOMC__ ) ) || \
( defined( HB_OS_OS2 ) && defined( __GNUC__ ) )
DWORD ulLen = 256;
TCHAR lpValue[ 256 ];
lpValue[ 0 ] = TEXT( '\0' );
GetUserName( lpValue, &ulLen );
lpValue[ 255 ] = TEXT( '\0' );
return lpValue[ 0 ] ? HB_OSSTRDUP( lpValue ) : NULL;
#else
return NULL;
char szValue[ MAXGETHOSTNAME + 1 ];
szValue[ 0 ] = szValue[ MAXGETHOSTNAME ] = '\0';
gethostname( szValue, MAXGETHOSTNAME );
if( szValue[ 0 ] )
return hb_osStrDecode( szValue );
#endif
return hb_getenv( "HOSTNAME" );
}
HB_FUNC( NETNAME )
@@ -213,13 +169,3 @@ HB_FUNC( NETNAME )
else
hb_retc_null();
}
HB_FUNC( HB_USERNAME )
{
char * buffer = hb_username();
if( buffer )
hb_retc_buffer( buffer );
else
hb_retc_null();
}

128
src/rtl/netusr.c Normal file
View File

@@ -0,0 +1,128 @@
/*
* Harbour Project source code:
* hb_UserName() function
*
* Copyright 1999-2001 Viktor Szakats (vszakats.net/harbour)
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING.txt. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
/*
* The following parts are Copyright of the individual authors.
* www - http://harbour-project.org
*
* Copyright 2001 Luiz Rafael Culik <culik@sl.conex.net>
* Support for DJGPP/GCC/OS2 for netname
*
* See COPYING.txt for licensing terms.
*
*/
#include "hbapi.h"
#if defined( HB_OS_WIN )
#include <windows.h>
#include "hbwinuni.h"
#if defined( HB_OS_WIN_CE )
#include "hbwince.h"
#endif
#elif defined( HB_OS_OS2 ) && defined( __GNUC__ )
#include "hb_io.h"
/* 2004-03-25 - <maurilio.longo@libero.it>
not needed anymore as of GCC 3.2.2 */
#include <pwd.h>
#include <sys/types.h>
#if defined( __EMX__ ) && __GNUC__ * 1000 + __GNUC_MINOR__ < 3002
#include <emx/syscalls.h>
#endif
#elif defined( HB_OS_UNIX ) && ! defined( HB_OS_VXWORKS ) && ! defined( __WATCOMC__ )
#include <pwd.h>
#include <sys/types.h>
#include <unistd.h>
#endif
/* NOTE: The caller must free the returned buffer. [vszakats] */
char * hb_username( void )
{
#if defined( HB_OS_WIN )
DWORD ulLen = 256;
TCHAR lpValue[ 256 ];
lpValue[ 0 ] = TEXT( '\0' );
GetUserName( lpValue, &ulLen );
lpValue[ 255 ] = TEXT( '\0' );
if( lpValue[ 0 ] )
return HB_OSSTRDUP( lpValue );
#elif ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) || \
( defined( HB_OS_UNIX ) && ! defined( HB_OS_VXWORKS ) && ! defined( __WATCOMC__ ) )
struct passwd * pwd = getpwuid( getuid() );
if( pwd && pwd->pw_name )
return hb_osStrDecode( pwd->pw_name );
#endif
return hb_getenv( "USER" );
}
HB_FUNC( HB_USERNAME )
{
char * buffer = hb_username();
if( buffer )
hb_retc_buffer( buffer );
else
hb_retc_null();
}