aura: Make keyevents for renderers work correctly in X11.

aura: Make key and mouse events for renderers work correctly in X11 with RWHVAura.

BUG=none
TEST=manually

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106329

[Ben Goodger (Google), 2011-10-19 14:22:00]

See my comment in the other CL. WDYT?

On Wed, Oct 19, 2011 at 7:17 AM, <sadrul@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> aura: Make keyevents for renderers work correctly in X11.
>
> BUG=none
> TEST=manually
>
>
> Please review this at
http://codereview.chromium.**org/8353005/<http://codereview.chromium.org/8353...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M content/browser/renderer_host/**render_widget_host_view_aura.**cc
>  M content/browser/renderer_host/**web_input_event_aurax11.cc
>  M ui/base/keycodes/keyboard_**code_conversion_x.h
>  M views/widget/native_widget_**aura.cc
>
>
> Index: content/browser/renderer_host/**render_widget_host_view_aura.**cc
> diff --git a/content/browser/renderer_**host/render_widget_host_view_**aura.cc
> b/content/browser/renderer_**host/render_widget_host_view_**aura.cc
> index 7f1014bcb663bdcc5a3295a822307d**112af30405..**
> c7737a3a82e500fc96eaa8da697ed5**bc760ae0fc 100644
> --- a/content/browser/renderer_**host/render_widget_host_view_**aura.cc
> +++ b/content/browser/renderer_**host/render_widget_host_view_**aura.cc
> @@ -304,6 +304,11 @@ void RenderWidgetHostViewAura::**OnBlur() {
>  bool RenderWidgetHostViewAura::**OnKeyEvent(aura::KeyEvent* event) {
>   NativeWebKeyboardEvent webkit_event(event);
>   host_->ForwardKeyboardEvent(**webkit_event);
> +  // TODO(ben): This should be removed when input-method is integrated.
> +  if (event->type() == ui::ET_KEY_PRESSED) {
> +    webkit_event.type = WebKit::WebInputEvent::Char;
> +    host_->ForwardKeyboardEvent(**webkit_event);
> +  }
>   return true;
>  }
>
> Index: content/browser/renderer_host/**web_input_event_aurax11.cc
> diff --git a/content/browser/renderer_**host/web_input_event_aurax11.**cc
> b/content/browser/renderer_**host/web_input_event_aurax11.**cc
> index 4d9b3f3315ade17f18dd08204cef34**481c57638d..**
> a6b8c91ec7f6a399a314cc4b25bf04**e8cb4c2f78 100644
> --- a/content/browser/renderer_**host/web_input_event_aurax11.**cc
> +++ b/content/browser/renderer_**host/web_input_event_aurax11.**cc
> @@ -43,6 +43,7 @@
>  #include "base/event_types.h"
>  #include "base/logging.h"
>  #include "ui/base/keycodes/keyboard_**codes.h"
> +#include "ui/base/keycodes/keyboard_**code_conversion_x.h"
>
>  namespace content {
>
> @@ -79,8 +80,7 @@ int XStateToWebEventModifiers(**unsigned int state) {
>  }
>
>  int XKeyEventToWindowsKeyCode(**XKeyEvent* event) {
> -  // TODO(beng):
> -  return 0;
> +  return ui::KeyboardCodeFromXKeyEvent(**(XEvent*)event);
>  }
>
>  // From
> @@ -299,7 +299,7 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNative
> **Event(
>     webkit_event.unmodifiedText[0] = '\r';
>   } else {
>     webkit_event.unmodifiedText[0] =
> -        static_cast<WebKit::WebUChar>(**native_key_event->keycode);
> +        ui::**DefaultXKeysymFromHardwareKeyc**
> ode(native_key_event->keycode)**;
>   }
>
>   if (webkit_event.modifiers & WebKit::WebInputEvent::**ControlKey) {
> Index: ui/base/keycodes/keyboard_**code_conversion_x.h
> diff --git a/ui/base/keycodes/keyboard_**code_conversion_x.h
> b/ui/base/keycodes/keyboard_**code_conversion_x.h
> index 6adcb0bc8767cec5bce7d403034bc7**1e584308e4..**
> 17eab247413983d1cfb7c6f7292fc0**9fcb27bdc3 100644
> --- a/ui/base/keycodes/keyboard_**code_conversion_x.h
> +++ b/ui/base/keycodes/keyboard_**code_conversion_x.h
> @@ -17,7 +17,7 @@ UI_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(**XEvent*
> xev);
>  UI_EXPORT KeyboardCode KeyboardCodeFromXKeysym(**unsigned int keysym);
>
>  // Converts a hardware keycode into a key symbol on a standard US PC
> keyboard.
> -unsigned int DefaultXKeysymFromHardwareKeyc**ode(unsigned int keycode);
> +UI_EXPORT unsigned int DefaultXKeysymFromHardwareKeyc**ode(unsigned int
> keycode);
>
>  }  // namespace ui
>
> Index: views/widget/native_widget_**aura.cc
> diff --git a/views/widget/native_widget_**aura.cc
> b/views/widget/native_widget_**aura.cc
> index 19df7583113621680da769ad63970f**ce522f80e8..**
> ac3d7812ccd463756b094122d97fb3**81ffc57b9f 100644
> --- a/views/widget/native_widget_**aura.cc
> +++ b/views/widget/native_widget_**aura.cc
> @@ -534,13 +534,13 @@ bool NativeWidgetAura::**ShouldActivate(aura::Event*
> event) {
>
>  void NativeWidgetAura::OnActivated(**) {
>   delegate_->**OnNativeWidgetActivationChange**d(true);
> -  if (IsVisible())
> +  if (IsVisible() && GetWidget()->non_client_view()**)
>     GetWidget()->non_client_view()**->SchedulePaint();
>  }
>
>  void NativeWidgetAura::**OnLostActive() {
>   delegate_->**OnNativeWidgetActivationChange**d(false);
> -  if (IsVisible())
> +  if (IsVisible() && GetWidget()->non_client_view()**)
>     GetWidget()->non_client_view()**->SchedulePaint();
>  }
>
>
>
>

[sadrul, 2011-10-19 16:04:14]

I have updated the CL to also support mouse events. Creating the WebMouseEvent
from the aura::MouseEvent, rather than from the XEvent, turns out to be much
simpler. So I have taken that route here.

I have removed the change in RWHVaura to send key-press twice. But the missing
bits for constructing WebKeyEvent out of an Xevent are still there.

[Ben Goodger (Google), 2011-10-19 16:14:20]

lgtm

http://codereview.chromium.org/8353005/diff/1002/content/browser/renderer_hos...
File content/browser/renderer_host/web_input_event_aura.cc (right):

http://codereview.chromium.org/8353005/diff/1002/content/browser/renderer_hos...
content/browser/renderer_host/web_input_event_aura.cc:36: // XInput2 and XInput.
Can you note that this can be resolved and we can construct directly from the
NativeEvent once we support only XI2?

[sadrul, 2011-10-19 16:34:37]

http://codereview.chromium.org/8353005/diff/1002/content/browser/renderer_hos...
File content/browser/renderer_host/web_input_event_aura.cc (right):

http://codereview.chromium.org/8353005/diff/1002/content/browser/renderer_hos...
content/browser/renderer_host/web_input_event_aura.cc:36: // XInput2 and XInput.
On 2011/10/19 16:14:20, Ben Goodger (Google) wrote:
> Can you note that this can be resolved and we can construct directly from the
> NativeEvent once we support only XI2?

Done.