From 6a226758557939b91baae87ad85ab66efef90ee2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 12 Mar 2009 12:26:39 +0000 Subject: [PATCH] 2009-03-12 13:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gttrm/gttrm.c + added some missing xterm key sequences * harbour/utils/hbmk2/hbmk2.prg ! fixed curses name in SunOS builds (here we are using native curses library not ncurses) * harbour/config/hpux/global.cf * harbour/config/sunos/global.cf * enabled GTXWC disabled for default builds --- harbour/ChangeLog | 12 ++++++++++++ harbour/config/hpux/global.cf | 2 +- harbour/config/sunos/global.cf | 2 +- harbour/source/rtl/gttrm/gttrm.c | 10 ++++++++++ harbour/utils/hbmk2/hbmk2.prg | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b0b22707c6..b0cb89d2b7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-12 13:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/gttrm/gttrm.c + + added some missing xterm key sequences + + * harbour/utils/hbmk2/hbmk2.prg + ! fixed curses name in SunOS builds (here we are using native curses + library not ncurses) + + * harbour/config/hpux/global.cf + * harbour/config/sunos/global.cf + * enabled GTXWC disabled for default builds + 2009-03-12 10:55 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbtpathy/telepath.prg ! Fixed to use __PLATFORM__UNIX instead of __PLATFORM__LINUX. diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf index 84b1b7b2a5..7de86a4ea0 100644 --- a/harbour/config/hpux/global.cf +++ b/harbour/config/hpux/global.cf @@ -21,7 +21,7 @@ ifneq ($(HB_WITHOUT_GTSLN),yes) endif endif ifneq ($(HB_WITHOUT_X11),yes) -# HB_GT_LIST += gtxwc + HB_GT_LIST += gtxwc endif # verify if GT drivers exist diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf index 84b1b7b2a5..7de86a4ea0 100644 --- a/harbour/config/sunos/global.cf +++ b/harbour/config/sunos/global.cf @@ -21,7 +21,7 @@ ifneq ($(HB_WITHOUT_GTSLN),yes) endif endif ifneq ($(HB_WITHOUT_X11),yes) -# HB_GT_LIST += gtxwc + HB_GT_LIST += gtxwc endif # verify if GT drivers exist diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c index ab77527af6..0d0efa06e0 100644 --- a/harbour/source/rtl/gttrm/gttrm.c +++ b/harbour/source/rtl/gttrm/gttrm.c @@ -2457,6 +2457,16 @@ static void init_keys( PHB_GTTRM pTerm ) { EXKEY_F3 |KEY_CTRLMASK|KEY_ALTMASK, "\033O2R" }, { EXKEY_F4 |KEY_CTRLMASK|KEY_ALTMASK, "\033O2S" }, + { EXKEY_F1 |KEY_CTRLMASK|KEY_ALTMASK, "\033O1;2P" }, + { EXKEY_F2 |KEY_CTRLMASK|KEY_ALTMASK, "\033O1;2Q" }, + { EXKEY_F3 |KEY_CTRLMASK|KEY_ALTMASK, "\033O1;2R" }, + { EXKEY_F4 |KEY_CTRLMASK|KEY_ALTMASK, "\033O1;2S" }, + + { EXKEY_F1 |KEY_CTRLMASK|KEY_ALTMASK, "\033[1;2P" }, + { EXKEY_F2 |KEY_CTRLMASK|KEY_ALTMASK, "\033[1;2Q" }, + { EXKEY_F3 |KEY_CTRLMASK|KEY_ALTMASK, "\033[1;2R" }, + { EXKEY_F4 |KEY_CTRLMASK|KEY_ALTMASK, "\033[1;2S" }, + { EXKEY_F1 |KEY_CTRLMASK|KEY_ALTMASK, "\033[11;2~" }, { EXKEY_F2 |KEY_CTRLMASK|KEY_ALTMASK, "\033[12;2~" }, { EXKEY_F3 |KEY_CTRLMASK|KEY_ALTMASK, "\033[13;2~" }, diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3c50c70638..02bbcf172b 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1224,7 +1224,7 @@ FUNCTION Main( ... ) IF IsGTRequested( s_cGT, s_aLIBUSERGT, s_aLIBDYNHAS, s_lSHARED, "gtcrs" ) /* TOFIX: Sometimes 'ncur194' is needed. */ - AAdd( s_aLIBSYS, "ncurses" ) + AAdd( s_aLIBSYS, IIF( t_cARCH == "sunos", "curses", "ncurses" ) ) ENDIF IF IsGTRequested( s_cGT, s_aLIBUSERGT, s_aLIBDYNHAS, s_lSHARED, "gtsln" ) AAdd( s_aLIBSYS, "slang" )