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

2007-11-22 04:33 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/harbour-ce-spec
  * harbour/harbour-w32-spec
  * harbour/make_rpmce.sh
  * harbour/make_rpmw32.sh
    * updated for removed ace.h

  * harbour/bin/pack_src.sh
    * updated for some recent modifications in contrib/pgsql
      TOFIX: it should be updated for all recent modifications in
      contrib and MS-Windows build scripts.

  * harbour/bin/hb-func.sh
    + added gtwvg to -gt* parameters in hb* scripts

  * harbour/contrib/Makefile
    + added gtwvg in W32 builds

  * harbour/contrib/xhb/hbcomprs.c
  * harbour/contrib/xhb/hbcomprs.h
    * cleaned some warnings

  * harbour/contrib/gtwvg/gtwvt.h
  * harbour/contrib/gtwvg/wvtutils.c
  * harbour/contrib/gtwvg/wvtpaint.prg
  * harbour/contrib/gtwvg/wvtwin.ch
  * harbour/contrib/gtwvg/wvtcore.c
  * harbour/contrib/gtwvg/gtwvt.c
  * harbour/contrib/gtwvg/Makefile
  * harbour/contrib/gtwvg/wvtclass.prg
    * set svn attributes:
         svn ps svn:eol-style native
         svn ps svn:keywords Id
      Pritpal please remember about it before you commit new files.
      For .bat files use
         svn ps svn:eol-style CRLF
      or better set default attribute in your SVN config file so you will
      not have to set it manually each time you are adding new file.
This commit is contained in:
Przemyslaw Czerpak
2007-11-22 03:34:28 +00:00
parent 0d96aaa970
commit 367e0d8a54
18 changed files with 15827 additions and 15767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
harbour/ChangeLog
View File

@@ -8,6 +8,45 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-22 04:33 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/harbour-ce-spec
* harbour/harbour-w32-spec
* harbour/make_rpmce.sh
* harbour/make_rpmw32.sh
* updated for removed ace.h
* harbour/bin/pack_src.sh
* updated for some recent modifications in contrib/pgsql
TOFIX: it should be updated for all recent modifications in
contrib and MS-Windows build scripts.
* harbour/bin/hb-func.sh
+ added gtwvg to -gt* parameters in hb* scripts
* harbour/contrib/Makefile
+ added gtwvg in W32 builds
* harbour/contrib/xhb/hbcomprs.c
* harbour/contrib/xhb/hbcomprs.h
* cleaned some warnings
* harbour/contrib/gtwvg/gtwvt.h
* harbour/contrib/gtwvg/wvtutils.c
* harbour/contrib/gtwvg/wvtpaint.prg
* harbour/contrib/gtwvg/wvtwin.ch
* harbour/contrib/gtwvg/wvtcore.c
* harbour/contrib/gtwvg/gtwvt.c
* harbour/contrib/gtwvg/Makefile
* harbour/contrib/gtwvg/wvtclass.prg
* set svn attributes:
svn ps svn:eol-style native
svn ps svn:keywords Id
Pritpal please remember about it before you commit new files.
For .bat files use
svn ps svn:eol-style CRLF
or better set default attribute in your SVN config file so you will
not have to set it manually each time you are adding new file.
2007-11-21 06:08 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
+ contrib/gtwvt
+ gtwvt.c

2
harbour/bin/hb-func.sh
View File

@@ -88,7 +88,7 @@ mk_hbgetlibsctb()
then
libs="$libs gtwin"
fi
echo -n "$libs rddads ct nf tip xhb hbgd hbodbc hbpg hbmysql adordd hbwin32"
echo -n "$libs rddads ct nf tip xhb hbgd hbodbc hbpg hbmysql adordd hbwin32 gtwvg"
else
echo -n "$@"
fi

6
harbour/bin/pack_src.sh
View File

@@ -392,12 +392,16 @@ $hb_collect contrib/win32/test/*.prg
# CONTRIB\PGSQL
$hb_collect contrib/pgsql/[mM]akefile*
$hb_collect contrib/pgsql/Change[Ll]og*
$hb_collect contrib/pgsql/README
$hb_collect contrib/pgsql/README*
$hb_collect contrib/pgsql/readme*
$hb_collect contrib/pgsql/*.[ch]
$hb_collect contrib/pgsql/*.ch
$hb_collect contrib/pgsql/*.prg
$hb_collect contrib/pgsql/*.txt
$hb_collect contrib/pgsql/*.bat
$hb_collect contrib/pgsql/test/[mM]akefile*
$hb_collect contrib/pgsql/test/*.prg
$hb_collect contrib/win32/*.bat
# CONTRIB\MYSQL
$hb_collect contrib/mysql/[mM]akefile*

1
harbour/contrib/Makefile
View File

@@ -28,6 +28,7 @@ ifeq ($(HB_ARCHITECTURE),w32)
DIRS +=\
rdd_ads \
gtwvg \
ifneq ($(HB_COMPILER),rsxnt)

48
harbour/contrib/gtwvg/Makefile
View File

@@ -1,24 +1,24 @@
#
#
#
ROOT = ../../
C_SOURCES=\
gtwvt.c \
wvtcore.c \
wvtutils.c \
C_HEADERS=\
gtwvt.h \
PRG_SOURCES=\
wvtclass.prg \
wvtpaint.prg \
PRG_HEADERS=\
wvtwin.ch \
LIBNAME=gtwvg
include $(TOP)$(ROOT)config/lib.cf
#
# $Id$
#
ROOT = ../../
C_SOURCES=\
gtwvt.c \
wvtcore.c \
wvtutils.c \
C_HEADERS=\
gtwvt.h \
PRG_SOURCES=\
wvtclass.prg \
wvtpaint.prg \
PRG_HEADERS=\
wvtwin.ch \
LIBNAME=gtwvg
include $(TOP)$(ROOT)config/lib.cf

10192
harbour/contrib/gtwvg/gtwvt.c
View File

File diff suppressed because it is too large Load Diff

856
harbour/contrib/gtwvg/gtwvt.h
View File

@@ -1,428 +1,428 @@
/*
* Chr(36) + "Id" + Chr(36)
*/
/*
* Harbour Project source code:
* Header File for Video subsystem for Win32 using GUI windows instead of Console
* Copyright 2003 Peter Rees <peter@rees.co.nz>
* Rees Software & Systems Ltd
* www - http://www.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. 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.
*
*/
//-------------------------------------------------------------------//
#ifndef HB_WVT_H_
//-------------------------------------------------------------------//
#define HB_WVT_H_
//-------------------------------------------------------------------//
/* NOTE: User programs should never call this layer directly! */
/* This definition has to be placed before #include "hbapigt.h" */
//-------------------------------------------------------------------//
#define HB_GT_NAME WVG
//-------------------------------------------------------------------//
#ifndef CINTERFACE
#define CINTERFACE 1
#endif
#define NONAMELESSUNION
//-------------------------------------------------------------------//
#include "hbset.h"
#include "hbgtcore.h"
#include "hbinit.h"
#include "hbapicdp.h"
#include "hbapierr.h"
#include "hbapiitm.h"
#include "inkey.ch"
#include "error.ch"
#include "hbvm.h"
#include "hbgfxdef.ch"
#include <windows.h>
#include <ole2.h>
#include <oleauto.h>
#include <olectl.h>
#include <winuser.h>
#include <commctrl.h>
#include <commdlg.h>
#if defined(__MINGW__)
# include <comctl32.h>
#endif
#include <shlobj.h>
#include <time.h>
#include <ctype.h>
//-------------------------------------------------------------------//
#define WVT_CHAR_QUEUE_SIZE 128
#define WVT_CHAR_BUFFER 1024
#define WVT_MAX_ROWS 256
#define WVT_MAX_COLS 256
#define WVT_PICTURES_MAX 50
#define WVT_FONTS_MAX 50
#define WVT_PENS_MAX 50
#define WVT_DLGML_MAX 50
#define WVT_DLGMD_MAX 50
//-------------------------------------------------------------------//
#if defined( HB_WINCE )
# define WVT_DEFAULT_ROWS 15
# define WVT_DEFAULT_COLS 50
# define WVT_DEFAULT_FONT_HEIGHT 12
# define WVT_DEFAULT_FONT_WIDTH 8
#else
# define WVT_DEFAULT_ROWS 25
# define WVT_DEFAULT_COLS 80
# define WVT_DEFAULT_FONT_HEIGHT 20
# define WVT_DEFAULT_FONT_WIDTH 10
#endif
//-------------------------------------------------------------------//
#define BLACK RGB( 0x0 ,0x0 ,0x0 )
#define BLUE RGB( 0x0 ,0x0 ,0x85 )
#define GREEN RGB( 0x0 ,0x85,0x0 )
#define CYAN RGB( 0x0 ,0x85,0x85 )
#define RED RGB( 0x85,0x0 ,0x0 )
#define MAGENTA RGB( 0x85,0x0 ,0x85 )
#define BROWN RGB( 0x85,0x85,0x0 )
#define WHITE RGB( 0xC6,0xC6,0xC6 )
#define LIGHT_GRAY RGB( 0x60,0x60,0x60 )
#define BRIGHT_BLUE RGB( 0x00,0x00,0xFF )
#define BRIGHT_GREEN RGB( 0x60,0xFF,0x60 )
#define BRIGHT_CYAN RGB( 0x60,0xFF,0xFF )
#define BRIGHT_RED RGB( 0xF8,0x00,0x26 )
#define BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF )
#define YELLOW RGB( 0xFF,0xFF,0x00 )
#define BRIGHT_WHITE RGB( 0xFF,0xFF,0xFF )
//-------------------------------------------------------------------//
#define WM_MY_UPDATE_CARET ( WM_USER + 0x0101 )
//-------------------------------------------------------------------//
#if defined(__DMC__)
#if (_WIN32_IE >= 0x0300)
#if !defined(ICC_BAR_CLASSES)
#define ICC_BAR_CLASSES 0x00000004
#endif
#if !defined(COLOR16)
typedef USHORT COLOR16;
#endif
#if !defined(TRIVERTEX)
typedef struct _TRIVERTEX {
LONG x;
LONG y;
COLOR16 Red;
COLOR16 Green;
COLOR16 Blue;
COLOR16 Alpha;
}TRIVERTEX,*PTRIVERTEX,*LPTRIVERTEX;
#endif
#if !defined( INITCOMMONCONTROLSEX )
typedef struct tagINITCOMMONCONTROLSEX {
DWORD dwSize; // size of this structure
DWORD dwICC; // flags indicating which classes to be initialized
} INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX;
#endif
#if !defined(InitCommonControlsEx)
WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX);
#endif
#endif
#endif
//-------------------------------------------------------------------//
typedef BOOL ( WINAPI *wvtGradientFill ) (
HDC hdc,
PTRIVERTEX pVertex,
ULONG dwNumVertex,
PVOID pMesh,
ULONG dwNumMesh,
ULONG dwMode );
//-------------------------------------------------------------------//
typedef struct global_data
{
POINT PTEXTSIZE; // size of the fixed width font
BOOL FixedFont; // TRUE if current font is a fixed font
int FixedSize[ WVT_MAX_COLS ]; // buffer for ExtTextOut() to emulate fixed pitch when Proportional font selected
USHORT ROWS; // number of displayable rows in window
USHORT COLS; // number of displayable columns in window
COLORREF foreground; // forground colour
COLORREF background; // background colour
USHORT BUFFERSIZE; // size of the screen text buffer
BYTE byAttributes[ WVT_MAX_ROWS * WVT_MAX_COLS ]; // buffer with the attributes
BYTE byBuffer[ WVT_MAX_ROWS * WVT_MAX_COLS ]; // buffer with the text to be displayed on the screen
BYTE *pAttributes; // pointer to buffer
BYTE *pBuffer; // " " "
POINT caretPos; // the current caret position
BOOL CaretExist; // TRUE if a caret has been created
int CaretSize;
BOOL CaretHidden;
POINT mousePos; // the last mousedown position
BOOL MouseMove; // Flag to say whether to return mouse movement events
HWND hWnd; // the window handle
int Keys[ WVT_CHAR_QUEUE_SIZE ]; // Array to hold the characters & events
int keyPointerIn; // Offset into key array for character to be placed
int keyPointerOut; // Offset into key array of next character to read
BOOL displayCaret; // flag to indicate if caret is on
RECT RectInvalid; // Invalid rectangle if DISPBEGIN() active
HFONT hFont;
int fontHeight; // requested font height
int fontWidth ; // requested font width
int fontWeight; // Bold level
int fontQuality;
char fontFace[ LF_FACESIZE ]; // requested font face name LF_FACESIZE #defined in wingdi.h
// int closeEvent; // command to return ( in ReadKey ) on close
// int shutdownEvent; // command to return ( in ReadKey ) on shutdown
int LastMenuEvent; // Last menu item selected
int MenuKeyEvent; // User definable event number for windows menu command
BOOL CentreWindow; // True if window is to be Reset into centre of window
int CodePage; // Code page to use for display characters
BOOL Win9X; // Flag to say if running on Win9X not NT/2000/XP
BOOL AltF4Close; // Can use Alt+F4 to close application
BOOL InvalidateWindow; // Flag for controlling whether to use ScrollWindowEx()
BOOL EnableShortCuts; // Determines whether ALT key enables menu or system menu
HPEN penWhite; // White pen to draw GDI elements
HPEN penBlack; // Black pen to draw GDI elements
HPEN penWhiteDim; // White dim pen to draw GDI elements
HPEN penDarkGray; // Dark gray pen to draw GDI elements
HPEN penGray; // Gray pen equivilant to Clipper White
HPEN penNull; // Null pen
HPEN currentPen; // Handle to current pen settable at runtime
HBRUSH currentBrush; // Handle to current brush settable by runtime
HBRUSH diagonalBrush; // Handle to diaoganl brush to draw scrollbars
HBRUSH solidBrush; // Handle to solid brush
HBRUSH wvtWhiteBrush; // Wvt specific White colored brush
HDC hdc; // Handle to Windows Device Context
PHB_DYNS pSymWVT_PAINT; // Stores pointer to WVT_PAINT function
PHB_DYNS pSymWVT_SETFOCUS; // Stores pointer to WVT_SETFOCUS function
PHB_DYNS pSymWVT_KILLFOCUS; // Stores pointer to WVT_KILLFOCUS function
PHB_DYNS pSymWVT_MOUSE; // Stores pointer to WVT_MOUSE function
PHB_DYNS pSymWVT_TIMER; // Stores pointer to WVT_TIMER function
PHB_DYNS pSymWVT_KEY;
int rowStart; // Holds nTop of last WM_PAINT rectangle returned by Wvt_GetPaintRect()
int rowStop; // Holds nBottom of last WM_PAINT rectangle
int colStart; // Holds nLeft of last WM_PAINT rectangle
int colStop; // Holds nRight of last WM_PAINT rectangle
HMENU hPopup; // Handle of context menu invokable with right click
IPicture *iPicture[ WVT_PICTURES_MAX ]; // Array to hold the Picture Streams to avoid recurring loading and unloading
HDC hCompDC; // Compatible DC to _s.hdc
HFONT hUserFonts[ WVT_FONTS_MAX ] ; // User defined font handles
HPEN hUserPens[ WVT_PENS_MAX ]; // User defined pens
HWND hWndTT; // Handle to hold tooltip information
BOOL bToolTipActive; // Flag to set whether tooltip is active or not
HINSTANCE hMSImg32; // Handle to the loaded library msimg32.dll
wvtGradientFill pfnGF; // Pointer to Address of the GradientFill function in MSImg32.dll
HWND hDlgModeless[ WVT_DLGML_MAX ]; // Handle to a modeless dialog
PHB_ITEM pFunc[ WVT_DLGML_MAX ]; // Function pointer for WndProc
/* TODO: pcbFunc is redundant and should be removed */
PHB_ITEM pcbFunc[ WVT_DLGML_MAX ]; //codeblock for WndProc
int iType[ WVT_DLGML_MAX ]; // Type of Function Pointers - Function 1, Block 2, Method 3
HWND hDlgModal[ WVT_DLGMD_MAX ];// Handle to a modeless dialog
PHB_ITEM pFuncModal[ WVT_DLGMD_MAX ]; // Function pointer for WndProc
/* TODO: pcbFuncModal is redundant and should be removed */
PHB_ITEM pcbFuncModal[ WVT_DLGMD_MAX ]; // codeblock for WndProc
int iTypeModal[ WVT_DLGMD_MAX ]; // Type of Function Pointers - Function 1, Block 2, Method 3
BOOL bGui;
HDC hGuiDC;
HBITMAP hGuiBmp;
int iGuiWidth;
int iGuiHeight;
BOOL bIgnoreWM_SYSCHAR;
BOOL bPaint ;
BOOL bGetFocus ;
BOOL bSetFocus ;
BOOL bKillFocus ;
PHB_CODEPAGE hostCDP; /* Host/HVM CodePage for unicode output translations */
PHB_CODEPAGE inCDP; /* Host/HVM CodePage for unicode input translations */
} GLOBAL_DATA;
typedef GLOBAL_DATA * LPGLOBAL_DATA;
//-------------------------------------------------------------------//
//POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row );
POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row );
BOOL HB_EXPORT hb_wvt_gtSetMenuKeyEvent( int iMenuKeyEvent );
BOOL HB_EXPORT hb_wvt_gtSetCentreWindow( BOOL bCentre, BOOL bPaint );
void HB_EXPORT hb_wvt_gtResetWindow( void );
BOOL HB_EXPORT hb_wvt_gtSetCodePage( int iCodePage );
int HB_EXPORT hb_wvt_gtGetLastMenuEvent( void );
int HB_EXPORT hb_wvt_gtSetLastMenuEvent( int iLastMenuEvent );
void HB_EXPORT hb_wvt_gtSetWindowTitle( char * title );
DWORD HB_EXPORT hb_wvt_gtSetWindowIcon( int icon, char *lpicon );
DWORD HB_EXPORT hb_wvt_gtSetWindowIconFromFile( char *icon );
int HB_EXPORT hb_wvt_gtGetWindowTitle( char *title, int length );
BOOL HB_EXPORT hb_wvt_gtSetFont( char *fontFace, int height, int width, int Bold, int Quality );
//void HB_EXPORT hb_wvt_gtSetCloseEvent( int iEvent );
//void HB_EXPORT hb_wvt_gtSetShutdownEvent( int iEvent );
HWND HB_EXPORT hb_wvt_gtGetWindowHandle( void );
void HB_EXPORT hb_wvt_gtPostMessage( int message );
BOOL HB_EXPORT hb_wvt_gtSetWindowPos( int left, int top );
BOOL HB_EXPORT hb_wvt_gtSetAltF4Close( BOOL bCanClose );
void HB_EXPORT hb_wvt_gtDoProcessMessages( void );
BOOL HB_EXPORT hb_wvt_gtSetMouseMove( BOOL bHandleEvent );
BOOL HB_EXPORT hb_wvt_gtEnableShortCuts( BOOL bEnable );
void HB_EXPORT hb_wvt_gtAddCharToInputQueue( int data );
HB_EXPORT IPicture * hb_wvt_gtLoadPicture( char * image );
HB_EXPORT IPicture * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection );
BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture );
BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture );
COLORREF HB_EXPORT hb_wvt_gtGetColorData( int iIndex );
BOOL HB_EXPORT hb_wvt_gtSetColorData( int iIndex, COLORREF ulCr );
BOOL HB_EXPORT hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, char * image );
LPWORD HB_EXPORT lpwAlign( LPWORD lpIn );
int HB_EXPORT nCopyAnsiToWideChar( LPWORD lpWCStr, LPSTR lpAnsiIn );
BOOL HB_EXPORT CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam );
BOOL HB_EXPORT CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam );
GLOBAL_DATA HB_EXPORT * hb_wvt_gtGetGlobalData( void );
void HB_EXPORT hb_wvt_wvtCore( void );
void HB_EXPORT hb_wvt_wvtUtils( void );
//-------------------------------------------------------------------//
#ifndef WM_MOUSEWHEEL
#define WM_MOUSEWHEEL 0x020A
#endif
#ifndef INVALID_FILE_SIZE
#define INVALID_FILE_SIZE (DWORD)0xFFFFFFFF
#endif
#ifndef CC_ANYCOLOR
#define CC_ANYCOLOR 0x00000100
#endif
#ifndef IDC_HAND
#define IDC_HAND MAKEINTRESOURCE(32649)
#endif
#ifndef GRADIENT_FILL_RECT_H
#define GRADIENT_FILL_RECT_H 0x00
#endif
//----------------------------------------------------------------------//
typedef enum
{
GTO_POINT = 0,
GTO_LINE = 1,
GTO_SQUARE = 3,
GTO_RECTANGLE = 4,
GTO_CIRCLE = 5,
GTO_DISK = 7,
/* TODO: add other types */
GTO_TEXT = 100,
} HB_gt_object_enum;
/* Event subsystem */
typedef enum
{
GTEVENT_RESIZE = 0,
GTEVENT_CLOSE = 1,
GTEVENT_ICONIZE = 2,
GTEVENT_MAXH = 3,
GTEVENT_MAXV = 4,
GTEVENT_MAXIMIZE = 5,
GTEVENT_DEICONIZE= 6,
GTEVENT_SHUTDOWN = 7
} HB_gt_event_enum;
typedef struct _tag_HB_GT_GCOLOR
{
USHORT usAlpha;
USHORT usRed;
USHORT usGreen;
USHORT usBlue;
} HB_GT_GCOLOR;
typedef struct _tag_HB_GT_COLDEF
{
char *name;
HB_GT_GCOLOR color;
} HB_GT_COLDEF;
//----------------------------------------------------------------------//
#define K_SH_LEFT K_LEFT /* Shift-Left == Left */
#define K_SH_UP K_UP /* Shift-Up == Up */
#define K_SH_RIGHT K_RIGHT /* Shift-Right == Right */
#define K_SH_DOWN K_DOWN /* Shift-Down == Down */
#define K_SH_INS K_INS /* Shift-Ins == Ins */
#define K_SH_DEL K_DEL /* Shift-Del == Del */
#define K_SH_HOME K_HOME /* Shift-Home == Home */
#define K_SH_END K_END /* Shift-End == End */
#define K_SH_PGUP K_PGUP /* Shift-PgUp == PgUp */
#define K_SH_PGDN K_PGDN /* Shift-PgDn == PgDn */
#define K_SH_RETURN K_RETURN /* Shift-Enter == Enter */
#define K_SH_ENTER K_ENTER /* Shift-Enter == Enter */
//-------------------------------------------------------------------//
#endif
//-------------------------------------------------------------------//
/*
* $Id$
*/
/*
* Harbour Project source code:
* Header File for Video subsystem for Win32 using GUI windows instead of Console
* Copyright 2003 Peter Rees <peter@rees.co.nz>
* Rees Software & Systems Ltd
* www - http://www.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. 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.
*
*/
//-------------------------------------------------------------------//
#ifndef HB_WVT_H_
//-------------------------------------------------------------------//
#define HB_WVT_H_
//-------------------------------------------------------------------//
/* NOTE: User programs should never call this layer directly! */
/* This definition has to be placed before #include "hbapigt.h" */
//-------------------------------------------------------------------//
#define HB_GT_NAME WVG
//-------------------------------------------------------------------//
#ifndef CINTERFACE
#define CINTERFACE 1
#endif
#define NONAMELESSUNION
//-------------------------------------------------------------------//
#include "hbset.h"
#include "hbgtcore.h"
#include "hbinit.h"
#include "hbapicdp.h"
#include "hbapierr.h"
#include "hbapiitm.h"
#include "inkey.ch"
#include "error.ch"
#include "hbvm.h"
#include "hbgfxdef.ch"
#include <windows.h>
#include <ole2.h>
#include <oleauto.h>
#include <olectl.h>
#include <winuser.h>
#include <commctrl.h>
#include <commdlg.h>
#if defined(__MINGW__)
# include <comctl32.h>
#endif
#include <shlobj.h>
#include <time.h>
#include <ctype.h>
//-------------------------------------------------------------------//
#define WVT_CHAR_QUEUE_SIZE 128
#define WVT_CHAR_BUFFER 1024
#define WVT_MAX_ROWS 256
#define WVT_MAX_COLS 256
#define WVT_PICTURES_MAX 50
#define WVT_FONTS_MAX 50
#define WVT_PENS_MAX 50
#define WVT_DLGML_MAX 50
#define WVT_DLGMD_MAX 50
//-------------------------------------------------------------------//
#if defined( HB_WINCE )
# define WVT_DEFAULT_ROWS 15
# define WVT_DEFAULT_COLS 50
# define WVT_DEFAULT_FONT_HEIGHT 12
# define WVT_DEFAULT_FONT_WIDTH 8
#else
# define WVT_DEFAULT_ROWS 25
# define WVT_DEFAULT_COLS 80
# define WVT_DEFAULT_FONT_HEIGHT 20
# define WVT_DEFAULT_FONT_WIDTH 10
#endif
//-------------------------------------------------------------------//
#define BLACK RGB( 0x0 ,0x0 ,0x0 )
#define BLUE RGB( 0x0 ,0x0 ,0x85 )
#define GREEN RGB( 0x0 ,0x85,0x0 )
#define CYAN RGB( 0x0 ,0x85,0x85 )
#define RED RGB( 0x85,0x0 ,0x0 )
#define MAGENTA RGB( 0x85,0x0 ,0x85 )
#define BROWN RGB( 0x85,0x85,0x0 )
#define WHITE RGB( 0xC6,0xC6,0xC6 )
#define LIGHT_GRAY RGB( 0x60,0x60,0x60 )
#define BRIGHT_BLUE RGB( 0x00,0x00,0xFF )
#define BRIGHT_GREEN RGB( 0x60,0xFF,0x60 )
#define BRIGHT_CYAN RGB( 0x60,0xFF,0xFF )
#define BRIGHT_RED RGB( 0xF8,0x00,0x26 )
#define BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF )
#define YELLOW RGB( 0xFF,0xFF,0x00 )
#define BRIGHT_WHITE RGB( 0xFF,0xFF,0xFF )
//-------------------------------------------------------------------//
#define WM_MY_UPDATE_CARET ( WM_USER + 0x0101 )
//-------------------------------------------------------------------//
#if defined(__DMC__)
#if (_WIN32_IE >= 0x0300)
#if !defined(ICC_BAR_CLASSES)
#define ICC_BAR_CLASSES 0x00000004
#endif
#if !defined(COLOR16)
typedef USHORT COLOR16;
#endif
#if !defined(TRIVERTEX)
typedef struct _TRIVERTEX {
LONG x;
LONG y;
COLOR16 Red;
COLOR16 Green;
COLOR16 Blue;
COLOR16 Alpha;
}TRIVERTEX,*PTRIVERTEX,*LPTRIVERTEX;
#endif
#if !defined( INITCOMMONCONTROLSEX )
typedef struct tagINITCOMMONCONTROLSEX {
DWORD dwSize; // size of this structure
DWORD dwICC; // flags indicating which classes to be initialized
} INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX;
#endif
#if !defined(InitCommonControlsEx)
WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX);
#endif
#endif
#endif
//-------------------------------------------------------------------//
typedef BOOL ( WINAPI *wvtGradientFill ) (
HDC hdc,
PTRIVERTEX pVertex,
ULONG dwNumVertex,
PVOID pMesh,
ULONG dwNumMesh,
ULONG dwMode );
//-------------------------------------------------------------------//
typedef struct global_data
{
POINT PTEXTSIZE; // size of the fixed width font
BOOL FixedFont; // TRUE if current font is a fixed font
int FixedSize[ WVT_MAX_COLS ]; // buffer for ExtTextOut() to emulate fixed pitch when Proportional font selected
USHORT ROWS; // number of displayable rows in window
USHORT COLS; // number of displayable columns in window
COLORREF foreground; // forground colour
COLORREF background; // background colour
USHORT BUFFERSIZE; // size of the screen text buffer
BYTE byAttributes[ WVT_MAX_ROWS * WVT_MAX_COLS ]; // buffer with the attributes
BYTE byBuffer[ WVT_MAX_ROWS * WVT_MAX_COLS ]; // buffer with the text to be displayed on the screen
BYTE *pAttributes; // pointer to buffer
BYTE *pBuffer; // " " "
POINT caretPos; // the current caret position
BOOL CaretExist; // TRUE if a caret has been created
int CaretSize;
BOOL CaretHidden;
POINT mousePos; // the last mousedown position
BOOL MouseMove; // Flag to say whether to return mouse movement events
HWND hWnd; // the window handle
int Keys[ WVT_CHAR_QUEUE_SIZE ]; // Array to hold the characters & events
int keyPointerIn; // Offset into key array for character to be placed
int keyPointerOut; // Offset into key array of next character to read
BOOL displayCaret; // flag to indicate if caret is on
RECT RectInvalid; // Invalid rectangle if DISPBEGIN() active
HFONT hFont;
int fontHeight; // requested font height
int fontWidth ; // requested font width
int fontWeight; // Bold level
int fontQuality;
char fontFace[ LF_FACESIZE ]; // requested font face name LF_FACESIZE #defined in wingdi.h
// int closeEvent; // command to return ( in ReadKey ) on close
// int shutdownEvent; // command to return ( in ReadKey ) on shutdown
int LastMenuEvent; // Last menu item selected
int MenuKeyEvent; // User definable event number for windows menu command
BOOL CentreWindow; // True if window is to be Reset into centre of window
int CodePage; // Code page to use for display characters
BOOL Win9X; // Flag to say if running on Win9X not NT/2000/XP
BOOL AltF4Close; // Can use Alt+F4 to close application
BOOL InvalidateWindow; // Flag for controlling whether to use ScrollWindowEx()
BOOL EnableShortCuts; // Determines whether ALT key enables menu or system menu
HPEN penWhite; // White pen to draw GDI elements
HPEN penBlack; // Black pen to draw GDI elements
HPEN penWhiteDim; // White dim pen to draw GDI elements
HPEN penDarkGray; // Dark gray pen to draw GDI elements
HPEN penGray; // Gray pen equivilant to Clipper White
HPEN penNull; // Null pen
HPEN currentPen; // Handle to current pen settable at runtime
HBRUSH currentBrush; // Handle to current brush settable by runtime
HBRUSH diagonalBrush; // Handle to diaoganl brush to draw scrollbars
HBRUSH solidBrush; // Handle to solid brush
HBRUSH wvtWhiteBrush; // Wvt specific White colored brush
HDC hdc; // Handle to Windows Device Context
PHB_DYNS pSymWVT_PAINT; // Stores pointer to WVT_PAINT function
PHB_DYNS pSymWVT_SETFOCUS; // Stores pointer to WVT_SETFOCUS function
PHB_DYNS pSymWVT_KILLFOCUS; // Stores pointer to WVT_KILLFOCUS function
PHB_DYNS pSymWVT_MOUSE; // Stores pointer to WVT_MOUSE function
PHB_DYNS pSymWVT_TIMER; // Stores pointer to WVT_TIMER function
PHB_DYNS pSymWVT_KEY;
int rowStart; // Holds nTop of last WM_PAINT rectangle returned by Wvt_GetPaintRect()
int rowStop; // Holds nBottom of last WM_PAINT rectangle
int colStart; // Holds nLeft of last WM_PAINT rectangle
int colStop; // Holds nRight of last WM_PAINT rectangle
HMENU hPopup; // Handle of context menu invokable with right click
IPicture *iPicture[ WVT_PICTURES_MAX ]; // Array to hold the Picture Streams to avoid recurring loading and unloading
HDC hCompDC; // Compatible DC to _s.hdc
HFONT hUserFonts[ WVT_FONTS_MAX ] ; // User defined font handles
HPEN hUserPens[ WVT_PENS_MAX ]; // User defined pens
HWND hWndTT; // Handle to hold tooltip information
BOOL bToolTipActive; // Flag to set whether tooltip is active or not
HINSTANCE hMSImg32; // Handle to the loaded library msimg32.dll
wvtGradientFill pfnGF; // Pointer to Address of the GradientFill function in MSImg32.dll
HWND hDlgModeless[ WVT_DLGML_MAX ]; // Handle to a modeless dialog
PHB_ITEM pFunc[ WVT_DLGML_MAX ]; // Function pointer for WndProc
/* TODO: pcbFunc is redundant and should be removed */
PHB_ITEM pcbFunc[ WVT_DLGML_MAX ]; //codeblock for WndProc
int iType[ WVT_DLGML_MAX ]; // Type of Function Pointers - Function 1, Block 2, Method 3
HWND hDlgModal[ WVT_DLGMD_MAX ];// Handle to a modeless dialog
PHB_ITEM pFuncModal[ WVT_DLGMD_MAX ]; // Function pointer for WndProc
/* TODO: pcbFuncModal is redundant and should be removed */
PHB_ITEM pcbFuncModal[ WVT_DLGMD_MAX ]; // codeblock for WndProc
int iTypeModal[ WVT_DLGMD_MAX ]; // Type of Function Pointers - Function 1, Block 2, Method 3
BOOL bGui;
HDC hGuiDC;
HBITMAP hGuiBmp;
int iGuiWidth;
int iGuiHeight;
BOOL bIgnoreWM_SYSCHAR;
BOOL bPaint ;
BOOL bGetFocus ;
BOOL bSetFocus ;
BOOL bKillFocus ;
PHB_CODEPAGE hostCDP; /* Host/HVM CodePage for unicode output translations */
PHB_CODEPAGE inCDP; /* Host/HVM CodePage for unicode input translations */
} GLOBAL_DATA;
typedef GLOBAL_DATA * LPGLOBAL_DATA;
//-------------------------------------------------------------------//
//POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row );
POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row );
BOOL HB_EXPORT hb_wvt_gtSetMenuKeyEvent( int iMenuKeyEvent );
BOOL HB_EXPORT hb_wvt_gtSetCentreWindow( BOOL bCentre, BOOL bPaint );
void HB_EXPORT hb_wvt_gtResetWindow( void );
BOOL HB_EXPORT hb_wvt_gtSetCodePage( int iCodePage );
int HB_EXPORT hb_wvt_gtGetLastMenuEvent( void );
int HB_EXPORT hb_wvt_gtSetLastMenuEvent( int iLastMenuEvent );
void HB_EXPORT hb_wvt_gtSetWindowTitle( char * title );
DWORD HB_EXPORT hb_wvt_gtSetWindowIcon( int icon, char *lpicon );
DWORD HB_EXPORT hb_wvt_gtSetWindowIconFromFile( char *icon );
int HB_EXPORT hb_wvt_gtGetWindowTitle( char *title, int length );
BOOL HB_EXPORT hb_wvt_gtSetFont( char *fontFace, int height, int width, int Bold, int Quality );
//void HB_EXPORT hb_wvt_gtSetCloseEvent( int iEvent );
//void HB_EXPORT hb_wvt_gtSetShutdownEvent( int iEvent );
HWND HB_EXPORT hb_wvt_gtGetWindowHandle( void );
void HB_EXPORT hb_wvt_gtPostMessage( int message );
BOOL HB_EXPORT hb_wvt_gtSetWindowPos( int left, int top );
BOOL HB_EXPORT hb_wvt_gtSetAltF4Close( BOOL bCanClose );
void HB_EXPORT hb_wvt_gtDoProcessMessages( void );
BOOL HB_EXPORT hb_wvt_gtSetMouseMove( BOOL bHandleEvent );
BOOL HB_EXPORT hb_wvt_gtEnableShortCuts( BOOL bEnable );
void HB_EXPORT hb_wvt_gtAddCharToInputQueue( int data );
HB_EXPORT IPicture * hb_wvt_gtLoadPicture( char * image );
HB_EXPORT IPicture * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection );
BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture );
BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture );
COLORREF HB_EXPORT hb_wvt_gtGetColorData( int iIndex );
BOOL HB_EXPORT hb_wvt_gtSetColorData( int iIndex, COLORREF ulCr );
BOOL HB_EXPORT hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, char * image );
LPWORD HB_EXPORT lpwAlign( LPWORD lpIn );
int HB_EXPORT nCopyAnsiToWideChar( LPWORD lpWCStr, LPSTR lpAnsiIn );
BOOL HB_EXPORT CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam );
BOOL HB_EXPORT CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam );
GLOBAL_DATA HB_EXPORT * hb_wvt_gtGetGlobalData( void );
void HB_EXPORT hb_wvt_wvtCore( void );
void HB_EXPORT hb_wvt_wvtUtils( void );
//-------------------------------------------------------------------//
#ifndef WM_MOUSEWHEEL
#define WM_MOUSEWHEEL 0x020A
#endif
#ifndef INVALID_FILE_SIZE
#define INVALID_FILE_SIZE (DWORD)0xFFFFFFFF
#endif
#ifndef CC_ANYCOLOR
#define CC_ANYCOLOR 0x00000100
#endif
#ifndef IDC_HAND
#define IDC_HAND MAKEINTRESOURCE(32649)
#endif
#ifndef GRADIENT_FILL_RECT_H
#define GRADIENT_FILL_RECT_H 0x00
#endif
//----------------------------------------------------------------------//
typedef enum
{
GTO_POINT = 0,
GTO_LINE = 1,
GTO_SQUARE = 3,
GTO_RECTANGLE = 4,
GTO_CIRCLE = 5,
GTO_DISK = 7,
/* TODO: add other types */
GTO_TEXT = 100,
} HB_gt_object_enum;
/* Event subsystem */
typedef enum
{
GTEVENT_RESIZE = 0,
GTEVENT_CLOSE = 1,
GTEVENT_ICONIZE = 2,
GTEVENT_MAXH = 3,
GTEVENT_MAXV = 4,
GTEVENT_MAXIMIZE = 5,
GTEVENT_DEICONIZE= 6,
GTEVENT_SHUTDOWN = 7
} HB_gt_event_enum;
typedef struct _tag_HB_GT_GCOLOR
{
USHORT usAlpha;
USHORT usRed;
USHORT usGreen;
USHORT usBlue;
} HB_GT_GCOLOR;
typedef struct _tag_HB_GT_COLDEF
{
char *name;
HB_GT_GCOLOR color;
} HB_GT_COLDEF;
//----------------------------------------------------------------------//
#define K_SH_LEFT K_LEFT /* Shift-Left == Left */
#define K_SH_UP K_UP /* Shift-Up == Up */
#define K_SH_RIGHT K_RIGHT /* Shift-Right == Right */
#define K_SH_DOWN K_DOWN /* Shift-Down == Down */
#define K_SH_INS K_INS /* Shift-Ins == Ins */
#define K_SH_DEL K_DEL /* Shift-Del == Del */
#define K_SH_HOME K_HOME /* Shift-Home == Home */
#define K_SH_END K_END /* Shift-End == End */
#define K_SH_PGUP K_PGUP /* Shift-PgUp == PgUp */
#define K_SH_PGDN K_PGDN /* Shift-PgDn == PgDn */
#define K_SH_RETURN K_RETURN /* Shift-Enter == Enter */
#define K_SH_ENTER K_ENTER /* Shift-Enter == Enter */
//-------------------------------------------------------------------//
#endif
//-------------------------------------------------------------------//

7030
harbour/contrib/gtwvg/wvtclass.prg
View File

File diff suppressed because it is too large Load Diff

4974
harbour/contrib/gtwvg/wvtcore.c
View File

File diff suppressed because it is too large Load Diff

1122
harbour/contrib/gtwvg/wvtpaint.prg
View File

File diff suppressed because it is too large Load Diff

4836
harbour/contrib/gtwvg/wvtutils.c
View File

File diff suppressed because it is too large Load Diff

2470
harbour/contrib/gtwvg/wvtwin.ch
View File

File diff suppressed because it is too large Load Diff

1
harbour/contrib/xhb/hbcomprs.c
View File

@@ -3043,6 +3043,7 @@ uIntf *v) /* working area: values in order of bit length */
int y; /* number of dummy codes added */
uInt z; /* number of entries in current table */
memset( &r, '\0', sizeof( r ) );
/* Generate counts for each bit length */
p = c;

3
harbour/contrib/xhb/hbcomprs.h
View File

@@ -126,7 +126,8 @@
#endif
/* Old Borland C incorrectly complains about missing returns: */
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
#if ( defined(__BORLANDC__) && (__BORLANDC__ < 0x500) ) || \
defined( __POCC__ ) || defined( __XCC__ )
# if !defined(NEED_DUMMY_RETURN)
# define NEED_DUMMY_RETURN
# endif

1
harbour/harbour-ce-spec
View File

@@ -165,6 +165,7 @@ make -r -i install
[ "%{?_without_odbc:1}" ] && rm -f $HB_LIB_INSTALL/libhbodbc.a
[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
[ "%{?_with_adsrdd:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a
# Keep the size of the libraries to a minimim.
${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/*

1
harbour/harbour-w32-spec
View File

@@ -165,6 +165,7 @@ make -r -i install
[ "%{?_without_odbc:1}" ] && rm -f $HB_LIB_INSTALL/libhbodbc.a
[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
[ "%{?_with_adsrdd:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a
# Keep the size of the libraries to a minimim.
${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/*

6
harbour/make_rpmce.sh
View File

@@ -67,6 +67,12 @@ do
shift
done
if [ -f /usr/local/ads/acesdk/ace.h ] ||
[ -f ${HOME}/ads/acesdk/ace.h ]
then
INST_PARAM="${INST_PARAM} --with adsrdd"
fi
TOINST_LST=""
for i in ${NEED_RPM}
do

6
harbour/make_rpmw32.sh
View File

@@ -89,6 +89,12 @@ do
shift
done
if [ -f /usr/local/ads/acesdk/ace.h ] ||
[ -f ${HOME}/ads/acesdk/ace.h ]
then
INST_PARAM="${INST_PARAM} --with adsrdd"
fi
TOINST_LST=""
for i in ${NEED_RPM}
do