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

2012-11-09 19:53 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/rtl/hbgtcore.c
    ! indentation to prev

  * src/rtl/sha1.c
    % removed unnecessary parenthesis
This commit is contained in:
Viktor Szakats
2012-11-09 18:54:36 +00:00
parent 829d9ab965
commit ed422e9606
3 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-09 19:53 UTC+0100 Viktor Szakats (harbour syenar.net)
* src/rtl/hbgtcore.c
! indentation to prev
* src/rtl/sha1.c
% removed unnecessary parenthesis
2012-11-09 19:31 UTC+0100 Viktor Szakats (harbour syenar.net)
* src/common/hbprintf.c
* src/common/hbtrace.c

100
harbour/src/rtl/hbgtcore.c
View File

@@ -2593,6 +2593,47 @@ static int hb_gt_def_InkeyFilter( PHB_GT pGT, int iKey, int iEventMask )
else if( HB_INKEY_ISMOUSEKEY( iKey ) )
{
switch( HB_INKEY_VALUE( iKey ) )
{
case K_MOUSEMOVE:
case K_MMLEFTDOWN:
case K_MMRIGHTDOWN:
case K_MMMIDDLEDOWN:
case K_NCMOUSEMOVE:
iMask = INKEY_MOVE;
break;
case K_LBUTTONDOWN:
case K_LDBLCLK:
iMask = INKEY_LDOWN;
break;
case K_LBUTTONUP:
iMask = INKEY_LUP;
break;
case K_RBUTTONDOWN:
case K_RDBLCLK:
iMask = INKEY_RDOWN;
break;
case K_RBUTTONUP:
iMask = INKEY_RUP;
break;
case K_MBUTTONDOWN:
case K_MBUTTONUP:
case K_MDBLCLK:
iMask = INKEY_MMIDDLE;
break;
case K_MWFORWARD:
case K_MWBACKWARD:
iMask = INKEY_MWHEEL;
break;
default:
iMask = INKEY_KEYBOARD;
}
}
else
iMask = INKEY_KEYBOARD;
}
else
{
switch( iKey )
{
case K_MOUSEMOVE:
case K_MMLEFTDOWN:
@@ -2624,59 +2665,18 @@ static int hb_gt_def_InkeyFilter( PHB_GT pGT, int iKey, int iEventMask )
case K_MWBACKWARD:
iMask = INKEY_MWHEEL;
break;
case HB_K_RESIZE:
case HB_K_CLOSE:
case HB_K_GOTFOCUS:
case HB_K_LOSTFOCUS:
case HB_K_CONNECT:
case HB_K_DISCONNECT:
iMask = HB_INKEY_GTEVENT;
break;
default:
iMask = INKEY_KEYBOARD;
break;
}
}
else
iMask = INKEY_KEYBOARD;
}
else
{
switch( iKey )
{
case K_MOUSEMOVE:
case K_MMLEFTDOWN:
case K_MMRIGHTDOWN:
case K_MMMIDDLEDOWN:
case K_NCMOUSEMOVE:
iMask = INKEY_MOVE;
break;
case K_LBUTTONDOWN:
case K_LDBLCLK:
iMask = INKEY_LDOWN;
break;
case K_LBUTTONUP:
iMask = INKEY_LUP;
break;
case K_RBUTTONDOWN:
case K_RDBLCLK:
iMask = INKEY_RDOWN;
break;
case K_RBUTTONUP:
iMask = INKEY_RUP;
break;
case K_MBUTTONDOWN:
case K_MBUTTONUP:
case K_MDBLCLK:
iMask = INKEY_MMIDDLE;
break;
case K_MWFORWARD:
case K_MWBACKWARD:
iMask = INKEY_MWHEEL;
break;
case HB_K_RESIZE:
case HB_K_CLOSE:
case HB_K_GOTFOCUS:
case HB_K_LOSTFOCUS:
case HB_K_CONNECT:
case HB_K_DISCONNECT:
iMask = HB_INKEY_GTEVENT;
break;
default:
iMask = INKEY_KEYBOARD;
break;
}
}
if( ( iMask & iEventMask ) == 0 )

2
harbour/src/rtl/sha1.c
View File

@@ -35,7 +35,7 @@
/* ugly workaround for bugs in XCC preprocessor */
static sha1_quadbyte rol( sha1_quadbyte value, int bits )
{
return ((value << bits) | (value >> (32 - bits)));
return (value << bits) | (value >> (32 - bits));
}
#endif