diff options
Diffstat (limited to 'src/KeyMap.cxx')
| -rw-r--r-- | src/KeyMap.cxx | 98 | 
1 files changed, 49 insertions, 49 deletions
| diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx index f16c21b31..d2a6660f3 100644 --- a/src/KeyMap.cxx +++ b/src/KeyMap.cxx @@ -28,7 +28,7 @@ void KeyMap::Clear() {  	alloc = 0;  } -void KeyMap::AssignCmdKey(int key, int modifiers, UINT msg) { +void KeyMap::AssignCmdKey(int key, int modifiers, unsigned int msg) {  	if ((len+1) >= alloc) {  		KeyToCommand *ktcNew = new KeyToCommand[alloc + 5];  		if (!ktcNew) @@ -51,7 +51,7 @@ void KeyMap::AssignCmdKey(int key, int modifiers, UINT msg) {  	len++;  } -UINT KeyMap::Find(int key, int modifiers) { +unsigned int KeyMap::Find(int key, int modifiers) {  	for (int i=0; i < len; i++) {  		if ((key == kmap[i].key) && (modifiers == kmap[i].modifiers)) {  			return kmap[i].msg; @@ -61,55 +61,55 @@ UINT KeyMap::Find(int key, int modifiers) {  }  KeyToCommand KeyMap::MapDefault[] = { -    {VK_DOWN,		SCI_NORM,	SCI_LINEDOWN}, -    {VK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND}, -    {VK_DOWN,		SCI_CTRL,	SCI_LINESCROLLDOWN}, -    {VK_UP,			SCI_NORM,	SCI_LINEUP}, -    {VK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND}, -    {VK_UP,			SCI_CTRL,	SCI_LINESCROLLUP}, -    {VK_LEFT,		SCI_NORM,	SCI_CHARLEFT}, -    {VK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND}, -    {VK_LEFT,		SCI_CTRL,	SCI_WORDLEFT}, -    {VK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND}, -    {VK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT}, -    {VK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND}, -    {VK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT}, -    {VK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND}, -    {VK_HOME, 		SCI_NORM, 	SCI_VCHOME}, -    {VK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND}, -    {VK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART}, -    {VK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND}, -    {VK_END,	 	SCI_NORM, 	SCI_LINEEND}, -    {VK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND}, -    {VK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND}, -    {VK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND}, -    {VK_PRIOR,		SCI_NORM, 	SCI_PAGEUP}, -    {VK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND}, -    {VK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN}, -    {VK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND}, -    {VK_DELETE, 	SCI_NORM,	WM_CLEAR}, -    {VK_DELETE, 	SCI_SHIFT,	WM_CUT}, -    {VK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT}, -    {VK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE}, -    {VK_INSERT, 		SCI_SHIFT,	WM_PASTE}, -    {VK_INSERT, 		SCI_CTRL,	WM_COPY}, -    {VK_ESCAPE,  	SCI_NORM,	SCI_CANCEL}, -    {VK_BACK,		SCI_NORM, 	SCI_DELETEBACK}, -    {VK_BACK,		SCI_SHIFT, 	SCI_DELETEBACK}, -    {VK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT}, -    {VK_BACK, 		SCI_ALT,	WM_UNDO}, -    {'Z', 			SCI_CTRL,	WM_UNDO}, +    {SCK_DOWN,		SCI_NORM,	SCI_LINEDOWN}, +    {SCK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND}, +    {SCK_DOWN,		SCI_CTRL,	SCI_LINESCROLLDOWN}, +    {SCK_UP,			SCI_NORM,	SCI_LINEUP}, +    {SCK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND}, +    {SCK_UP,			SCI_CTRL,	SCI_LINESCROLLUP}, +    {SCK_LEFT,		SCI_NORM,	SCI_CHARLEFT}, +    {SCK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND}, +    {SCK_LEFT,		SCI_CTRL,	SCI_WORDLEFT}, +    {SCK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND}, +    {SCK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT}, +    {SCK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND}, +    {SCK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT}, +    {SCK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND}, +    {SCK_HOME, 		SCI_NORM, 	SCI_VCHOME}, +    {SCK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND}, +    {SCK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART}, +    {SCK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND}, +    {SCK_END,	 	SCI_NORM, 	SCI_LINEEND}, +    {SCK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND}, +    {SCK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND}, +    {SCK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND}, +    {SCK_PRIOR,		SCI_NORM, 	SCI_PAGEUP}, +    {SCK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND}, +    {SCK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN}, +    {SCK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND}, +    {SCK_DELETE, 	SCI_NORM,	SCI_CLEAR}, +    {SCK_DELETE, 	SCI_SHIFT,	SCI_CUT}, +    {SCK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT}, +    {SCK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE}, +    {SCK_INSERT, 		SCI_SHIFT,	SCI_PASTE}, +    {SCK_INSERT, 		SCI_CTRL,	SCI_COPY}, +    {SCK_ESCAPE,  	SCI_NORM,	SCI_CANCEL}, +    {SCK_BACK,		SCI_NORM, 	SCI_DELETEBACK}, +    {SCK_BACK,		SCI_SHIFT, 	SCI_DELETEBACK}, +    {SCK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT}, +    {SCK_BACK, 		SCI_ALT,	SCI_UNDO}, +    {'Z', 			SCI_CTRL,	SCI_UNDO},      {'Y', 			SCI_CTRL,	SCI_REDO}, -    {'X', 			SCI_CTRL,	WM_CUT}, -    {'C', 			SCI_CTRL,	WM_COPY}, -    {'V', 			SCI_CTRL,	WM_PASTE}, +    {'X', 			SCI_CTRL,	SCI_CUT}, +    {'C', 			SCI_CTRL,	SCI_COPY}, +    {'V', 			SCI_CTRL,	SCI_PASTE},      {'A', 			SCI_CTRL,	SCI_SELECTALL}, -    {VK_TAB,		SCI_NORM,	SCI_TAB}, -    {VK_TAB,		SCI_SHIFT,	SCI_BACKTAB}, -    {VK_RETURN, 	SCI_NORM,	SCI_NEWLINE}, -    {VK_ADD, 		SCI_CTRL,	SCI_ZOOMIN}, -    {VK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT}, -    {VK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM}, +    {SCK_TAB,		SCI_NORM,	SCI_TAB}, +    {SCK_TAB,		SCI_SHIFT,	SCI_BACKTAB}, +    {SCK_RETURN, 	SCI_NORM,	SCI_NEWLINE}, +    {SCK_ADD, 		SCI_CTRL,	SCI_ZOOMIN}, +    {SCK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT}, +    {SCK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM},      //'L', 			SCI_CTRL,		SCI_FORMFEED,      {'L', 			SCI_CTRL,	SCI_LINECUT},      {'L', 			SCI_CSHIFT,	SCI_LINEDELETE}, | 
