Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PoroCYon
Bonzomatic
Commits
d7131ff2
Commit
d7131ff2
authored
Jan 24, 2015
by
Gargaj
Browse files
separate wm_char and wm_keydown
parent
e780a067
Changes
2
Hide whitespace changes
Inline
Side-by-side
main.cpp
View file @
d7131ff2
...
...
@@ -164,13 +164,16 @@ void main()
else
if
(
bShowGui
)
{
bool
consumed
=
false
;
if
(
Renderer
::
keyEventBuffer
[
i
].
scanCode
)
{
mShaderEditor
.
KeyDown
(
iswalpha
(
Renderer
::
keyEventBuffer
[
i
].
scanCode
)
?
towupper
(
Renderer
::
keyEventBuffer
[
i
].
scanCode
)
:
Renderer
::
keyEventBuffer
[
i
].
scanCode
,
Renderer
::
keyEventBuffer
[
i
].
shift
,
Renderer
::
keyEventBuffer
[
i
].
ctrl
,
Renderer
::
keyEventBuffer
[
i
].
alt
,
&
consumed
);
if
(
!
consumed
)
}
if
(
!
consumed
&&
Renderer
::
keyEventBuffer
[
i
].
character
)
{
char
utf8
[
5
]
=
{
0
,
0
,
0
,
0
,
0
};
wchar_t
utf16
[
2
]
=
{
Renderer
::
keyEventBuffer
[
i
].
character
,
0
};
...
...
platform_w32_dx9/Renderer.cpp
View file @
d7131ff2
...
...
@@ -114,14 +114,14 @@ namespace Renderer
keyEventBuffer
[
keyEventBufferCount
].
alt
=
GetAsyncKeyState
(
VK_LMENU
)
||
GetAsyncKeyState
(
VK_RMENU
);
keyEventBuffer
[
keyEventBufferCount
].
shift
=
GetAsyncKeyState
(
VK_LSHIFT
)
||
GetAsyncKeyState
(
VK_RSHIFT
);
keyEventBuffer
[
keyEventBufferCount
].
scanCode
=
sciKey
;
keyEventBuffer
[
keyEventBufferCount
].
character
=
sciKey
;
keyEventBuffer
[
keyEventBufferCount
].
character
=
0
;
keyEventBufferCount
++
;
}
//pKeys[wParam] = 1;
}
break
;
case
WM_CHAR
:
{
//
if (
sciKey
)
if
(
wParam
>=
32
)
{
keyEventBuffer
[
keyEventBufferCount
].
ctrl
=
GetAsyncKeyState
(
VK_LCONTROL
)
||
GetAsyncKeyState
(
VK_RCONTROL
);
keyEventBuffer
[
keyEventBufferCount
].
alt
=
GetAsyncKeyState
(
VK_LMENU
)
||
GetAsyncKeyState
(
VK_RMENU
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment