Author: manolo
Date: 2012-03-27 01:47:29 -0700 (Tue, 27 Mar 2012)
New Revision: 9305
Log:
Added support for the additional key of ISO keyboards (a.k.a. 102-key
keyboards) named fltk3::IsoKey.
Modified:
branches/branch-3.0/include/FL/Enumerations.H
branches/branch-3.0/include/fltk3/enumerations.h
branches/branch-3.0/include/fltk3/run.h
branches/branch-3.0/src/fltk3/cocoa_get_key.cxx
branches/branch-3.0/src/fltk3/win32.cxx
branches/branch-3.0/src/fltk3/win32_get_key.cxx
branches/branch-3.0/test/keyboard.cxx
Modified: branches/branch-3.0/include/FL/Enumerations.H
===================================================================
--- branches/branch-3.0/include/FL/Enumerations.H 2012-03-27 08:22:54 UTC
(rev 9304)
+++ branches/branch-3.0/include/FL/Enumerations.H 2012-03-27 08:47:29 UTC
(rev 9305)
@@ -124,6 +124,7 @@
#define FL_Button 0xfee8
#define FL_BackSpace 0xff08
#define FL_Tab 0xff09
+#define FL_Iso_Key 0xff0c
#define FL_Enter 0xff0d
#define FL_Pause 0xff13
#define FL_Scroll_Lock 0xff14
Modified: branches/branch-3.0/include/fltk3/enumerations.h
===================================================================
--- branches/branch-3.0/include/fltk3/enumerations.h 2012-03-27 08:22:54 UTC
(rev 9304)
+++ branches/branch-3.0/include/fltk3/enumerations.h 2012-03-27 08:47:29 UTC
(rev 9305)
@@ -343,6 +343,7 @@
const unsigned int MouseButton = 0xfee8; ///< A mouse button;
use fltk3::Button + n for mouse button n.
const unsigned int BackSpaceKey = 0xff08; ///< The backspace key.
const unsigned int TabKey = 0xff09; ///< The tab key.
+ const unsigned int IsoKey = 0xff0c; ///< The additional key of ISO
keyboards.
const unsigned int EnterKey = 0xff0d; ///< The enter key.
const unsigned int PauseKey = 0xff13; ///< The pause key.
const unsigned int ScrollLockKey= 0xff14; ///< The scroll lock key.
Modified: branches/branch-3.0/include/fltk3/run.h
===================================================================
--- branches/branch-3.0/include/fltk3/run.h 2012-03-27 08:22:54 UTC (rev
9304)
+++ branches/branch-3.0/include/fltk3/run.h 2012-03-27 08:47:29 UTC (rev
9305)
@@ -641,7 +641,7 @@
\li All other keys on the keypad have a symbol: fltk3::EscapeKey,
fltk3::BackSpaceKey, fltk3::TabKey, fltk3::EnterKey, fltk3::PrintKey,
fltk3::ScrollLockKey, fltk3::PauseKey,
fltk3::InsertKey, fltk3::HomeKey, fltk3::PageUpKey, fltk3::DeleteKey,
fltk3::EndKey, fltk3::PageDownKey,
- fltk3::LeftKey, fltk3::UpKey, fltk3::RightKey, fltk3::DownKey,
fltk3::ShiftLKey, fltk3::ShiftRKey,
+ fltk3::LeftKey, fltk3::UpKey, fltk3::RightKey, fltk3::DownKey,
fltk3::IsoKey, fltk3::ShiftLKey, fltk3::ShiftRKey,
fltk3::ControlLKey, fltk3::ControlRKey, fltk3::CapsLockKey, fltk3::AltLKey,
fltk3::AltRKey,
fltk3::MetaLKey, fltk3::MetaRKey, fltk3::MenuKey, fltk3::NumLockKey,
fltk3::KPEnterKey. Be
careful not to confuse these with the very similar, but all-caps,
Modified: branches/branch-3.0/src/fltk3/cocoa_get_key.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/cocoa_get_key.cxx 2012-03-27 08:22:54 UTC
(rev 9304)
+++ branches/branch-3.0/src/fltk3/cocoa_get_key.cxx 2012-03-27 08:47:29 UTC
(rev 9305)
@@ -168,6 +168,11 @@
kVK_UpArrow = 0x7E
};
+/* ISO keyboards only*/
+enum {
+ kVK_ISO_Section = 0x0A
+};
+
#endif
// convert an FLTK (X) keysym to a MacOS symbol:
@@ -185,7 +190,7 @@
{ kVK_ANSI_U, 'U' }, { kVK_ANSI_V, 'V' }, { kVK_ANSI_W, 'W' }, {
kVK_ANSI_X, 'X' },
{ kVK_ANSI_Y, 'Y' }, { kVK_ANSI_Z, 'Z' },
{ kVK_ANSI_LeftBracket, '[' }, { kVK_ANSI_Backslash, '\\' },{
kVK_ANSI_RightBracket, ']' }, { kVK_ANSI_Grave, '`' },
- { kVK_Delete, fltk3::BackSpaceKey }, { kVK_Tab, fltk3::TabKey }, {
kVK_Return, fltk3::EnterKey }, /*{ 0x7F, fltk3::PauseKey },
+ { kVK_Delete, fltk3::BackSpaceKey }, { kVK_Tab, fltk3::TabKey }, {
kVK_ISO_Section, fltk3::IsoKey }, { kVK_Return, fltk3::EnterKey }, /*{ 0x7F,
fltk3::PauseKey },
{ 0x7F, fltk3::ScrollLockKey },*/ { kVK_Escape, fltk3::EscapeKey }, {
kVK_Home, fltk3::HomeKey }, { kVK_LeftArrow, fltk3::LeftKey },
{ kVK_UpArrow, fltk3::UpKey }, { kVK_RightArrow, fltk3::RightKey }, {
kVK_DownArrow, fltk3::DownKey }, { kVK_PageUp, fltk3::PageUpKey },
{ kVK_PageDown, fltk3::PageDownKey }, { kVK_End, fltk3::EndKey }, /*{ 0x7F,
fltk3::PrintKey }, { 0x7F, fltk3::InsertKey },*/
Modified: branches/branch-3.0/src/fltk3/win32.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32.cxx 2012-03-27 08:22:54 UTC (rev
9304)
+++ branches/branch-3.0/src/fltk3/win32.cxx 2012-03-27 08:47:29 UTC (rev
9305)
@@ -776,7 +776,8 @@
{0xdb, '['},
{0xdc, '\\'},
{0xdd, ']'},
- {0xde, '\''}
+ {0xde, '\''},
+ {VK_OEM_102, fltk3::IsoKey}
};
static int ms2fltk(int vk, int extended) {
static unsigned short vklut[256];
Modified: branches/branch-3.0/src/fltk3/win32_get_key.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32_get_key.cxx 2012-03-27 08:22:54 UTC
(rev 9304)
+++ branches/branch-3.0/src/fltk3/win32_get_key.cxx 2012-03-27 08:47:29 UTC
(rev 9305)
@@ -73,6 +73,7 @@
{VK_BACK, fltk3::BackSpaceKey},
{VK_TAB, fltk3::TabKey},
{VK_CLEAR, 0xff0b/*XK_Clear*/},
+ {0xe2 /*VK_OEM_102*/, fltk3::IsoKey},
{VK_RETURN, fltk3::EnterKey},
{VK_PAUSE, fltk3::PauseKey},
{VK_SCROLL, fltk3::ScrollLockKey},
Modified: branches/branch-3.0/test/keyboard.cxx
===================================================================
--- branches/branch-3.0/test/keyboard.cxx 2012-03-27 08:22:54 UTC (rev
9304)
+++ branches/branch-3.0/test/keyboard.cxx 2012-03-27 08:47:29 UTC (rev
9305)
@@ -69,6 +69,7 @@
{fltk3::EscapeKey, "fltk3::EscapeKey"},
{fltk3::BackSpaceKey, "fltk3::BackSpaceKey"},
{fltk3::TabKey, "fltk3::TabKey"},
+ {fltk3::IsoKey, "fltk3::IsoKey"},
{fltk3::EnterKey, "fltk3::EnterKey"},
{fltk3::PrintKey, "fltk3::PrintKey"},
{fltk3::ScrollLockKey, "fltk3::ScrollLockKey"},
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
