Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a723af61
Commit
a723af61
authored
Jul 09, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Jul 09, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "winemac: Dispatch key events directly to window to be sure to get key-up events.".
This reverts commit
0d20ac02
.
parent
4f23821f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
9 deletions
+14
-9
cocoa_app.m
dlls/winemac.drv/cocoa_app.m
+0
-6
cocoa_window.h
dlls/winemac.drv/cocoa_window.h
+0
-2
cocoa_window.m
dlls/winemac.drv/cocoa_window.m
+14
-1
No files found.
dlls/winemac.drv/cocoa_app.m
View file @
a723af61
...
...
@@ -1692,12 +1692,6 @@ int macdrv_err_on;
[
self
handleScrollWheel
:
anEvent
];
ret
=
mouseCaptureWindow
!=
nil
;
}
else
if
(
type
==
NSKeyDown
||
type
==
NSKeyUp
)
{
WineWindow
*
window
=
(
WineWindow
*
)[
anEvent
window
];
if
([
window
isKindOfClass
:[
WineWindow
class
]])
[
window
postKeyEvent
:
anEvent
];
}
return
ret
;
}
...
...
dlls/winemac.drv/cocoa_window.h
View file @
a723af61
...
...
@@ -68,6 +68,4 @@
-
(
NSInteger
)
minimumLevelForActive
:(
BOOL
)
active
;
-
(
void
)
updateFullscreen
;
-
(
void
)
postKeyEvent
:(
NSEvent
*
)
theEvent
;
@end
dlls/winemac.drv/cocoa_window.m
View file @
a723af61
...
...
@@ -1195,6 +1195,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
}
}
-
(
void
)
sendEvent
:
(
NSEvent
*
)
event
{
/* NSWindow consumes certain key-down events as part of Cocoa's keyboard
interface control. For example, Control-Tab switches focus among
views. We want to bypass that feature, so directly route key-down
events to -keyDown:. */
if
([
event
type
]
==
NSKeyDown
)
[[
self
firstResponder
]
keyDown
:
event
];
else
[
super
sendEvent
:
event
];
}
// We normally use the generic/calibrated RGB color space for the window,
// rather than the device color space, to avoid expensive color conversion
// which slows down drawing. However, for windows displaying OpenGL, having
...
...
@@ -1230,7 +1242,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
/*
* ---------- NSResponder method overrides ----------
*/
-
(
void
)
keyDown
:
(
NSEvent
*
)
theEvent
{
/* Need an implementation to avoid beeps */
}
-
(
void
)
keyDown
:
(
NSEvent
*
)
theEvent
{
[
self
postKeyEvent
:
theEvent
];
}
-
(
void
)
keyUp
:
(
NSEvent
*
)
theEvent
{
[
self
postKeyEvent
:
theEvent
];
}
-
(
void
)
flagsChanged
:
(
NSEvent
*
)
theEvent
{
...
...
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