2010-03-08 02:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* src/rtl/gtwin/gtwin.c
    ! Minor formattting.
This commit is contained in:
Viktor Szakats
2010-03-08 01:47:35 +00:00
parent 43e1411e6e
commit 895f95fe45
2 changed files with 106 additions and 102 deletions

View File

@@ -17,6 +17,10 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-08 02:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/gtwin/gtwin.c
! Minor formattting.
2010-03-08 02:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added trick to recognize 'unicows' lib for win targets

View File

@@ -211,11 +211,11 @@ static int s_mouse_iRow;
typedef struct _CLIPKEYCODE
{
int key;
int alt_key;
int ctrl_key;
int shift_key;
int altgr_key;
int key;
int alt_key;
int ctrl_key;
int shift_key;
int altgr_key;
} CLIPKEYCODE;
#define CLIP_STDKEY_COUNT 96
@@ -225,102 +225,102 @@ typedef struct _CLIPKEYCODE
static const CLIPKEYCODE stdKeyTab[CLIP_STDKEY_COUNT] = {
{ 32, 0, 0, 0, 0}, /* ' ' */
{ 33, 0, 0, 0, 0}, /* '!' */
{ 34, 0, 0, 0, 0}, /* '"' */
{ 35, 0, 0, 0, 0}, /* '#' */
{ 36, 0, 0, 0, 0}, /* '$' */
{ 37, 0, 0, 0, 0}, /* '%' */
{ 38, 0, 0, 0, 0}, /* '&' */
{ 39, K_ALT_QUOTE, 7, 0, 0}, /* ''' */
{ 40, 0, 0, 0, 0}, /* '(' */
{ 41, 0, 0, 0, 0}, /* ')' */
{ 42, 0, 0, 0, 0}, /* '*' */
{ 43, 0, 0, 0, 0}, /* '+' */
{ 44, K_ALT_COMMA, 0, 0, 0}, /* ',' */
{ 45, K_ALT_MINUS, 398, 0, 0}, /* '-' */
{ 46, K_ALT_PERIOD, 0, 0, 0}, /* '.' */
{ 47, K_ALT_SLASH, 0, 0, 0}, /* '/' */
{ 48, K_ALT_0, 0, 0, K_ALT_0}, /* '0' */
{ 49, K_ALT_1, 0, 0, K_ALT_1}, /* '1' */
{ 50, K_ALT_2, 259, 0, K_ALT_2}, /* '2' */
{ 51, K_ALT_3, 27, 0, K_ALT_3}, /* '3' */
{ 52, K_ALT_4, 28, 0, K_ALT_4}, /* '4' */
{ 53, K_ALT_5, 29, 0, K_ALT_5}, /* '5' */
{ 54, K_ALT_6, 30, 0, K_ALT_6}, /* '6' */
{ 55, K_ALT_7, 31, 0, K_ALT_7}, /* '7' */
{ 56, K_ALT_8, 127, 0, K_ALT_8}, /* '8' */
{ 57, K_ALT_9, 0, 0, K_ALT_9}, /* '9' */
{ 58, 0, 0, 0, 0}, /* ':' */
{ 59, K_ALT_SC, 0, 0, 0}, /* ';' */
{ 60, 0, 0, 0, 0}, /* '<' */
{ 61, K_ALT_EQUALS, 0, 0, 0}, /* '=' */
{ 62, 0, 0, 0, 0}, /* '>' */
{ 63, 0, K_CTRL_QUESTION, 0, 0}, /* '?' */
{ 64, 0, 0, 0, 0}, /* '@' */
{ 65, K_ALT_A, K_CTRL_A, 0, K_ALT_A}, /* 'A' */
{ 66, K_ALT_B, K_CTRL_B, 0, K_ALT_B}, /* 'B' */
{ 67, K_ALT_C, K_CTRL_C, 0, K_ALT_C}, /* 'C' */
{ 68, K_ALT_D, K_CTRL_D, 0, K_ALT_D}, /* 'D' */
{ 69, K_ALT_E, K_CTRL_E, 0, K_ALT_E}, /* 'E' */
{ 70, K_ALT_F, K_CTRL_F, 0, K_ALT_F}, /* 'F' */
{ 71, K_ALT_G, K_CTRL_G, 0, K_ALT_G}, /* 'G' */
{ 72, K_ALT_H, K_CTRL_H, 0, K_ALT_H}, /* 'H' */
{ 73, K_ALT_I, K_CTRL_I, 0, K_ALT_I}, /* 'I' */
{ 74, K_ALT_J, K_CTRL_J, 0, K_ALT_J}, /* 'J' */
{ 75, K_ALT_K, K_CTRL_K, 0, K_ALT_K}, /* 'K' */
{ 76, K_ALT_L, K_CTRL_L, 0, K_ALT_L}, /* 'L' */
{ 77, K_ALT_M, K_CTRL_M, 0, K_ALT_M}, /* 'M' */
{ 78, K_ALT_N, K_CTRL_N, 0, K_ALT_N}, /* 'N' */
{ 79, K_ALT_O, K_CTRL_O, 0, K_ALT_O}, /* 'O' */
{ 80, K_ALT_P, K_CTRL_P, 0, K_ALT_P}, /* 'P' */
{ 81, K_ALT_Q, K_CTRL_Q, 0, K_ALT_Q}, /* 'Q' */
{ 82, K_ALT_R, K_CTRL_R, 0, K_ALT_R}, /* 'R' */
{ 83, K_ALT_S, K_CTRL_S, 0, K_ALT_S}, /* 'S' */
{ 84, K_ALT_T, K_CTRL_T, 0, K_ALT_T}, /* 'T' */
{ 85, K_ALT_U, K_CTRL_U, 0, K_ALT_U}, /* 'U' */
{ 86, K_ALT_V, K_CTRL_V, 0, K_ALT_V}, /* 'V' */
{ 87, K_ALT_W, K_CTRL_W, 0, K_ALT_W}, /* 'W' */
{ 88, K_ALT_X, K_CTRL_X, 0, K_ALT_X}, /* 'X' */
{ 89, K_ALT_Y, K_CTRL_Y, 0, K_ALT_Y}, /* 'Y' */
{ 90, K_ALT_Z, K_CTRL_Z, 0, K_ALT_Z}, /* 'Z' */
{ 91, K_ALT_OSB, 0, 0, 0}, /* '[' */
{ 92, K_ALT_BACKSLASH, 0, 0, 0}, /* '\' */
{ 93, K_ALT_CSB, 0, 0, 0}, /* ']' */
{ 94, K_ALT_6, 0, 0, 0}, /* '^' */
{ 95, 0, 0, 0, 0}, /* '_' */
{ 96, K_ALT_BACKQUOTE, 0, 0, 0}, /* '`' */
{ 97, K_ALT_A, K_CTRL_A, 0, K_ALT_A}, /* 'a' */
{ 98, K_ALT_B, K_CTRL_B, 0, K_ALT_B}, /* 'b' */
{ 99, K_ALT_C, K_CTRL_C, 0, K_ALT_C}, /* 'c' */
{100, K_ALT_D, K_CTRL_D, 0, K_ALT_D}, /* 'd' */
{101, K_ALT_E, K_CTRL_E, 0, K_ALT_E}, /* 'e' */
{102, K_ALT_F, K_CTRL_F, 0, K_ALT_F}, /* 'f' */
{103, K_ALT_G, K_CTRL_G, 0, K_ALT_G}, /* 'g' */
{104, K_ALT_H, K_CTRL_H, 0, K_ALT_H}, /* 'h' */
{105, K_ALT_I, K_CTRL_I, 0, K_ALT_I}, /* 'i' */
{106, K_ALT_J, K_CTRL_J, 0, K_ALT_J}, /* 'j' */
{107, K_ALT_K, K_CTRL_K, 0, K_ALT_K}, /* 'k' */
{108, K_ALT_L, K_CTRL_L, 0, K_ALT_L}, /* 'l' */
{109, K_ALT_M, K_CTRL_M, 0, K_ALT_M}, /* 'm' */
{110, K_ALT_N, K_CTRL_N, 0, K_ALT_N}, /* 'n' */
{111, K_ALT_O, K_CTRL_O, 0, K_ALT_O}, /* 'o' */
{112, K_ALT_P, K_CTRL_P, 0, K_ALT_P}, /* 'p' */
{113, K_ALT_Q, K_CTRL_Q, 0, K_ALT_Q}, /* 'q' */
{114, K_ALT_R, K_CTRL_R, 0, K_ALT_R}, /* 'r' */
{115, K_ALT_S, K_CTRL_S, 0, K_ALT_S}, /* 's' */
{116, K_ALT_T, K_CTRL_T, 0, K_ALT_T}, /* 't' */
{117, K_ALT_U, K_CTRL_U, 0, K_ALT_U}, /* 'u' */
{118, K_ALT_V, K_CTRL_V, 0, K_ALT_V}, /* 'v' */
{119, K_ALT_W, K_CTRL_W, 0, K_ALT_W}, /* 'w' */
{120, K_ALT_X, K_CTRL_X, 0, K_ALT_X}, /* 'x' */
{121, K_ALT_Y, K_CTRL_Y, 0, K_ALT_Y}, /* 'y' */
{122, K_ALT_Z, K_CTRL_Z, 0, K_ALT_Z}, /* 'z' */
{123, 282, 27, 0, 0}, /* '{' */
{124, 299, 28, 0, 0}, /* '|' */
{125, 283, 29, 0, 0}, /* '}' */
{126, 297, 297, 0, 0}, /* '~' */
{127, K_ALT_BS, 127, 0, K_ALT_BS}, /* '' */
{ 32, 0, 0, 0, 0}, /* ' ' */
{ 33, 0, 0, 0, 0}, /* '!' */
{ 34, 0, 0, 0, 0}, /* '"' */
{ 35, 0, 0, 0, 0}, /* '#' */
{ 36, 0, 0, 0, 0}, /* '$' */
{ 37, 0, 0, 0, 0}, /* '%' */
{ 38, 0, 0, 0, 0}, /* '&' */
{ 39, K_ALT_QUOTE, 7, 0, 0}, /* ''' */
{ 40, 0, 0, 0, 0}, /* '(' */
{ 41, 0, 0, 0, 0}, /* ')' */
{ 42, 0, 0, 0, 0}, /* '*' */
{ 43, 0, 0, 0, 0}, /* '+' */
{ 44, K_ALT_COMMA, 0, 0, 0}, /* ',' */
{ 45, K_ALT_MINUS, 398, 0, 0}, /* '-' */
{ 46, K_ALT_PERIOD, 0, 0, 0}, /* '.' */
{ 47, K_ALT_SLASH, 0, 0, 0}, /* '/' */
{ 48, K_ALT_0, 0, 0, K_ALT_0}, /* '0' */
{ 49, K_ALT_1, 0, 0, K_ALT_1}, /* '1' */
{ 50, K_ALT_2, 259, 0, K_ALT_2}, /* '2' */
{ 51, K_ALT_3, 27, 0, K_ALT_3}, /* '3' */
{ 52, K_ALT_4, 28, 0, K_ALT_4}, /* '4' */
{ 53, K_ALT_5, 29, 0, K_ALT_5}, /* '5' */
{ 54, K_ALT_6, 30, 0, K_ALT_6}, /* '6' */
{ 55, K_ALT_7, 31, 0, K_ALT_7}, /* '7' */
{ 56, K_ALT_8, 127, 0, K_ALT_8}, /* '8' */
{ 57, K_ALT_9, 0, 0, K_ALT_9}, /* '9' */
{ 58, 0, 0, 0, 0}, /* ':' */
{ 59, K_ALT_SC, 0, 0, 0}, /* ';' */
{ 60, 0, 0, 0, 0}, /* '<' */
{ 61, K_ALT_EQUALS, 0, 0, 0}, /* '=' */
{ 62, 0, 0, 0, 0}, /* '>' */
{ 63, 0, K_CTRL_QUESTION, 0, 0}, /* '?' */
{ 64, 0, 0, 0, 0}, /* '@' */
{ 65, K_ALT_A, K_CTRL_A, 0, K_ALT_A}, /* 'A' */
{ 66, K_ALT_B, K_CTRL_B, 0, K_ALT_B}, /* 'B' */
{ 67, K_ALT_C, K_CTRL_C, 0, K_ALT_C}, /* 'C' */
{ 68, K_ALT_D, K_CTRL_D, 0, K_ALT_D}, /* 'D' */
{ 69, K_ALT_E, K_CTRL_E, 0, K_ALT_E}, /* 'E' */
{ 70, K_ALT_F, K_CTRL_F, 0, K_ALT_F}, /* 'F' */
{ 71, K_ALT_G, K_CTRL_G, 0, K_ALT_G}, /* 'G' */
{ 72, K_ALT_H, K_CTRL_H, 0, K_ALT_H}, /* 'H' */
{ 73, K_ALT_I, K_CTRL_I, 0, K_ALT_I}, /* 'I' */
{ 74, K_ALT_J, K_CTRL_J, 0, K_ALT_J}, /* 'J' */
{ 75, K_ALT_K, K_CTRL_K, 0, K_ALT_K}, /* 'K' */
{ 76, K_ALT_L, K_CTRL_L, 0, K_ALT_L}, /* 'L' */
{ 77, K_ALT_M, K_CTRL_M, 0, K_ALT_M}, /* 'M' */
{ 78, K_ALT_N, K_CTRL_N, 0, K_ALT_N}, /* 'N' */
{ 79, K_ALT_O, K_CTRL_O, 0, K_ALT_O}, /* 'O' */
{ 80, K_ALT_P, K_CTRL_P, 0, K_ALT_P}, /* 'P' */
{ 81, K_ALT_Q, K_CTRL_Q, 0, K_ALT_Q}, /* 'Q' */
{ 82, K_ALT_R, K_CTRL_R, 0, K_ALT_R}, /* 'R' */
{ 83, K_ALT_S, K_CTRL_S, 0, K_ALT_S}, /* 'S' */
{ 84, K_ALT_T, K_CTRL_T, 0, K_ALT_T}, /* 'T' */
{ 85, K_ALT_U, K_CTRL_U, 0, K_ALT_U}, /* 'U' */
{ 86, K_ALT_V, K_CTRL_V, 0, K_ALT_V}, /* 'V' */
{ 87, K_ALT_W, K_CTRL_W, 0, K_ALT_W}, /* 'W' */
{ 88, K_ALT_X, K_CTRL_X, 0, K_ALT_X}, /* 'X' */
{ 89, K_ALT_Y, K_CTRL_Y, 0, K_ALT_Y}, /* 'Y' */
{ 90, K_ALT_Z, K_CTRL_Z, 0, K_ALT_Z}, /* 'Z' */
{ 91, K_ALT_OSB, 0, 0, 0}, /* '[' */
{ 92, K_ALT_BACKSLASH, 0, 0, 0}, /* '\' */
{ 93, K_ALT_CSB, 0, 0, 0}, /* ']' */
{ 94, K_ALT_6, 0, 0, 0}, /* '^' */
{ 95, 0, 0, 0, 0}, /* '_' */
{ 96, K_ALT_BACKQUOTE, 0, 0, 0}, /* '`' */
{ 97, K_ALT_A, K_CTRL_A, 0, K_ALT_A}, /* 'a' */
{ 98, K_ALT_B, K_CTRL_B, 0, K_ALT_B}, /* 'b' */
{ 99, K_ALT_C, K_CTRL_C, 0, K_ALT_C}, /* 'c' */
{100, K_ALT_D, K_CTRL_D, 0, K_ALT_D}, /* 'd' */
{101, K_ALT_E, K_CTRL_E, 0, K_ALT_E}, /* 'e' */
{102, K_ALT_F, K_CTRL_F, 0, K_ALT_F}, /* 'f' */
{103, K_ALT_G, K_CTRL_G, 0, K_ALT_G}, /* 'g' */
{104, K_ALT_H, K_CTRL_H, 0, K_ALT_H}, /* 'h' */
{105, K_ALT_I, K_CTRL_I, 0, K_ALT_I}, /* 'i' */
{106, K_ALT_J, K_CTRL_J, 0, K_ALT_J}, /* 'j' */
{107, K_ALT_K, K_CTRL_K, 0, K_ALT_K}, /* 'k' */
{108, K_ALT_L, K_CTRL_L, 0, K_ALT_L}, /* 'l' */
{109, K_ALT_M, K_CTRL_M, 0, K_ALT_M}, /* 'm' */
{110, K_ALT_N, K_CTRL_N, 0, K_ALT_N}, /* 'n' */
{111, K_ALT_O, K_CTRL_O, 0, K_ALT_O}, /* 'o' */
{112, K_ALT_P, K_CTRL_P, 0, K_ALT_P}, /* 'p' */
{113, K_ALT_Q, K_CTRL_Q, 0, K_ALT_Q}, /* 'q' */
{114, K_ALT_R, K_CTRL_R, 0, K_ALT_R}, /* 'r' */
{115, K_ALT_S, K_CTRL_S, 0, K_ALT_S}, /* 's' */
{116, K_ALT_T, K_CTRL_T, 0, K_ALT_T}, /* 't' */
{117, K_ALT_U, K_CTRL_U, 0, K_ALT_U}, /* 'u' */
{118, K_ALT_V, K_CTRL_V, 0, K_ALT_V}, /* 'v' */
{119, K_ALT_W, K_CTRL_W, 0, K_ALT_W}, /* 'w' */
{120, K_ALT_X, K_CTRL_X, 0, K_ALT_X}, /* 'x' */
{121, K_ALT_Y, K_CTRL_Y, 0, K_ALT_Y}, /* 'y' */
{122, K_ALT_Z, K_CTRL_Z, 0, K_ALT_Z}, /* 'z' */
{123, 282, 27, 0, 0}, /* '{' */
{124, 299, 28, 0, 0}, /* '|' */
{125, 283, 29, 0, 0}, /* '}' */
{126, 297, 297, 0, 0}, /* '~' */
{127, K_ALT_BS, 127, 0, K_ALT_BS}, /* '' */
};
#define EXKEY_F1 ( 0)
@@ -1522,7 +1522,7 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
*/
extKey = EXKEY_DEL;
}
else if( wChar == 191 && ch == 63 && ( dwState & ENHANCED_KEY ))
else if( wChar == 191 && ch == 63 && ( dwState & ENHANCED_KEY ) )
{ /* numpad '/' always */
/* This is the Win98 test */
ch = 47;