- Add keyboard and focus notifications (issue #508).

- Add CefDOMNode::IsEditable method.
- List interfaces alphabetically in CefClient.
- Correct error checking for code and command input.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@680 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef_dll/cpptoc/client_cpptoc.cc

@@ -13,8 +13,10 @@
 #include "libcef_dll/cpptoc/client_cpptoc.h"
 #include "libcef_dll/cpptoc/context_menu_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/display_handler_cpptoc.h"
+#include "libcef_dll/cpptoc/focus_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/geolocation_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/jsdialog_handler_cpptoc.h"
+#include "libcef_dll/cpptoc/keyboard_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/load_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/request_handler_cpptoc.h"
@@ -24,6 +26,102 @@
 
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
+struct _cef_context_menu_handler_t* CEF_CALLBACK client_get_context_menu_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefContextMenuHandler> _retval = CefClientCppToC::Get(
+      self)->GetContextMenuHandler();
+
+  // Return type: refptr_same
+  return CefContextMenuHandlerCppToC::Wrap(_retval);
+}
+
+struct _cef_display_handler_t* CEF_CALLBACK client_get_display_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefDisplayHandler> _retval = CefClientCppToC::Get(
+      self)->GetDisplayHandler();
+
+  // Return type: refptr_same
+  return CefDisplayHandlerCppToC::Wrap(_retval);
+}
+
+struct _cef_focus_handler_t* CEF_CALLBACK client_get_focus_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefFocusHandler> _retval = CefClientCppToC::Get(
+      self)->GetFocusHandler();
+
+  // Return type: refptr_same
+  return CefFocusHandlerCppToC::Wrap(_retval);
+}
+
+struct _cef_geolocation_handler_t* CEF_CALLBACK client_get_geolocation_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefGeolocationHandler> _retval = CefClientCppToC::Get(
+      self)->GetGeolocationHandler();
+
+  // Return type: refptr_same
+  return CefGeolocationHandlerCppToC::Wrap(_retval);
+}
+
+struct _cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefJSDialogHandler> _retval = CefClientCppToC::Get(
+      self)->GetJSDialogHandler();
+
+  // Return type: refptr_same
+  return CefJSDialogHandlerCppToC::Wrap(_retval);
+}
+
+struct _cef_keyboard_handler_t* CEF_CALLBACK client_get_keyboard_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefKeyboardHandler> _retval = CefClientCppToC::Get(
+      self)->GetKeyboardHandler();
+
+  // Return type: refptr_same
+  return CefKeyboardHandlerCppToC::Wrap(_retval);
+}
+
 struct _cef_life_span_handler_t* CEF_CALLBACK client_get_life_span_handler(
     struct _cef_client_t* self) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -72,70 +170,6 @@ struct _cef_request_handler_t* CEF_CALLBACK client_get_request_handler(
   return CefRequestHandlerCppToC::Wrap(_retval);
 }
 
-struct _cef_display_handler_t* CEF_CALLBACK client_get_display_handler(
-    struct _cef_client_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  CefRefPtr<CefDisplayHandler> _retval = CefClientCppToC::Get(
-      self)->GetDisplayHandler();
-
-  // Return type: refptr_same
-  return CefDisplayHandlerCppToC::Wrap(_retval);
-}
-
-struct _cef_geolocation_handler_t* CEF_CALLBACK client_get_geolocation_handler(
-    struct _cef_client_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  CefRefPtr<CefGeolocationHandler> _retval = CefClientCppToC::Get(
-      self)->GetGeolocationHandler();
-
-  // Return type: refptr_same
-  return CefGeolocationHandlerCppToC::Wrap(_retval);
-}
-
-struct _cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler(
-    struct _cef_client_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  CefRefPtr<CefJSDialogHandler> _retval = CefClientCppToC::Get(
-      self)->GetJSDialogHandler();
-
-  // Return type: refptr_same
-  return CefJSDialogHandlerCppToC::Wrap(_retval);
-}
-
-struct _cef_context_menu_handler_t* CEF_CALLBACK client_get_context_menu_handler(
-    struct _cef_client_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  CefRefPtr<CefContextMenuHandler> _retval = CefClientCppToC::Get(
-      self)->GetContextMenuHandler();
-
-  // Return type: refptr_same
-  return CefContextMenuHandlerCppToC::Wrap(_retval);
-}
-
 int CEF_CALLBACK client_on_process_message_recieved(struct _cef_client_t* self,
     cef_browser_t* browser, enum cef_process_id_t source_process,
     struct _cef_process_message_t* message) {
@@ -168,13 +202,15 @@ int CEF_CALLBACK client_on_process_message_recieved(struct _cef_client_t* self,
 
 CefClientCppToC::CefClientCppToC(CefClient* cls)
     : CefCppToC<CefClientCppToC, CefClient, cef_client_t>(cls) {
+  struct_.struct_.get_context_menu_handler = client_get_context_menu_handler;
+  struct_.struct_.get_display_handler = client_get_display_handler;
+  struct_.struct_.get_focus_handler = client_get_focus_handler;
+  struct_.struct_.get_geolocation_handler = client_get_geolocation_handler;
+  struct_.struct_.get_jsdialog_handler = client_get_jsdialog_handler;
+  struct_.struct_.get_keyboard_handler = client_get_keyboard_handler;
   struct_.struct_.get_life_span_handler = client_get_life_span_handler;
   struct_.struct_.get_load_handler = client_get_load_handler;
   struct_.struct_.get_request_handler = client_get_request_handler;
-  struct_.struct_.get_display_handler = client_get_display_handler;
-  struct_.struct_.get_geolocation_handler = client_get_geolocation_handler;
-  struct_.struct_.get_jsdialog_handler = client_get_jsdialog_handler;
-  struct_.struct_.get_context_menu_handler = client_get_context_menu_handler;
   struct_.struct_.on_process_message_recieved =
       client_on_process_message_recieved;
 }

libcef_dll/cpptoc/domnode_cpptoc.cc

@@ -61,6 +61,20 @@ int CEF_CALLBACK domnode_is_element(struct _cef_domnode_t* self) {
   return _retval;
 }
 
+int CEF_CALLBACK domnode_is_editable(struct _cef_domnode_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->IsEditable();
+
+  // Return type: bool
+  return _retval;
+}
+
 int CEF_CALLBACK domnode_is_form_control_element(struct _cef_domnode_t* self) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
@@ -447,6 +461,7 @@ CefDOMNodeCppToC::CefDOMNodeCppToC(CefDOMNode* cls)
   struct_.struct_.get_type = domnode_get_type;
   struct_.struct_.is_text = domnode_is_text;
   struct_.struct_.is_element = domnode_is_element;
+  struct_.struct_.is_editable = domnode_is_editable;
   struct_.struct_.is_form_control_element = domnode_is_form_control_element;
   struct_.struct_.get_form_control_element_type =
       domnode_get_form_control_element_type;

libcef_dll/cpptoc/focus_handler_cpptoc.cc

@@ -0,0 +1,90 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/focus_handler_cpptoc.h"
+#include "libcef_dll/ctocpp/browser_ctocpp.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+void CEF_CALLBACK focus_handler_on_take_focus(struct _cef_focus_handler_t* self,
+    cef_browser_t* browser, int next) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+
+  // Execute
+  CefFocusHandlerCppToC::Get(self)->OnTakeFocus(
+      CefBrowserCToCpp::Wrap(browser),
+      next?true:false);
+}
+
+int CEF_CALLBACK focus_handler_on_set_focus(struct _cef_focus_handler_t* self,
+    cef_browser_t* browser, enum cef_focus_source_t source) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+
+  // Execute
+  bool _retval = CefFocusHandlerCppToC::Get(self)->OnSetFocus(
+      CefBrowserCToCpp::Wrap(browser),
+      source);
+
+  // Return type: bool
+  return _retval;
+}
+
+void CEF_CALLBACK focus_handler_on_got_focus(struct _cef_focus_handler_t* self,
+    cef_browser_t* browser) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+
+  // Execute
+  CefFocusHandlerCppToC::Get(self)->OnGotFocus(
+      CefBrowserCToCpp::Wrap(browser));
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefFocusHandlerCppToC::CefFocusHandlerCppToC(CefFocusHandler* cls)
+    : CefCppToC<CefFocusHandlerCppToC, CefFocusHandler, cef_focus_handler_t>(
+        cls) {
+  struct_.struct_.on_take_focus = focus_handler_on_take_focus;
+  struct_.struct_.on_set_focus = focus_handler_on_set_focus;
+  struct_.struct_.on_got_focus = focus_handler_on_got_focus;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefFocusHandlerCppToC, CefFocusHandler,
+    cef_focus_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/focus_handler_cpptoc.h

@@ -0,0 +1,37 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_
+#pragma once
+
+#ifndef USING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
+#else  // USING_CEF_SHARED
+
+#include "include/cef_focus_handler.h"
+#include "include/capi/cef_focus_handler_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed wrapper-side only.
+class CefFocusHandlerCppToC
+    : public CefCppToC<CefFocusHandlerCppToC, CefFocusHandler,
+        cef_focus_handler_t> {
+ public:
+  explicit CefFocusHandlerCppToC(CefFocusHandler* cls);
+  virtual ~CefFocusHandlerCppToC() {}
+};
+
+#endif  // USING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_
+

libcef_dll/cpptoc/keyboard_handler_cpptoc.cc

@@ -0,0 +1,110 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/keyboard_handler_cpptoc.h"
+#include "libcef_dll/ctocpp/browser_ctocpp.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+int CEF_CALLBACK keyboard_handler_on_pre_key_event(
+    struct _cef_keyboard_handler_t* self, cef_browser_t* browser,
+    const struct _cef_key_event_t* event, cef_event_handle_t os_event,
+    int* is_keyboard_shortcut) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: event; type: struct_byref_const
+  DCHECK(event);
+  if (!event)
+    return 0;
+  // Verify param: is_keyboard_shortcut; type: bool_byaddr
+  DCHECK(is_keyboard_shortcut);
+  if (!is_keyboard_shortcut)
+    return 0;
+
+  // Translate param: event; type: struct_byref_const
+  CefKeyEvent eventObj;
+  if (event)
+    eventObj.Set(*event, false);
+  // Translate param: is_keyboard_shortcut; type: bool_byaddr
+  bool is_keyboard_shortcutBool = (
+      is_keyboard_shortcut && *is_keyboard_shortcut)?true:false;
+
+  // Execute
+  bool _retval = CefKeyboardHandlerCppToC::Get(self)->OnPreKeyEvent(
+      CefBrowserCToCpp::Wrap(browser),
+      eventObj,
+      os_event,
+      &is_keyboard_shortcutBool);
+
+  // Restore param: is_keyboard_shortcut; type: bool_byaddr
+  if (is_keyboard_shortcut)
+    *is_keyboard_shortcut = is_keyboard_shortcutBool?true:false;
+
+  // Return type: bool
+  return _retval;
+}
+
+int CEF_CALLBACK keyboard_handler_on_key_event(
+    struct _cef_keyboard_handler_t* self, cef_browser_t* browser,
+    const struct _cef_key_event_t* event, cef_event_handle_t os_event) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: event; type: struct_byref_const
+  DCHECK(event);
+  if (!event)
+    return 0;
+
+  // Translate param: event; type: struct_byref_const
+  CefKeyEvent eventObj;
+  if (event)
+    eventObj.Set(*event, false);
+
+  // Execute
+  bool _retval = CefKeyboardHandlerCppToC::Get(self)->OnKeyEvent(
+      CefBrowserCToCpp::Wrap(browser),
+      eventObj,
+      os_event);
+
+  // Return type: bool
+  return _retval;
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefKeyboardHandlerCppToC::CefKeyboardHandlerCppToC(CefKeyboardHandler* cls)
+    : CefCppToC<CefKeyboardHandlerCppToC, CefKeyboardHandler,
+        cef_keyboard_handler_t>(cls) {
+  struct_.struct_.on_pre_key_event = keyboard_handler_on_pre_key_event;
+  struct_.struct_.on_key_event = keyboard_handler_on_key_event;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefKeyboardHandlerCppToC, CefKeyboardHandler,
+    cef_keyboard_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/keyboard_handler_cpptoc.h

@@ -0,0 +1,37 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_
+#pragma once
+
+#ifndef USING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
+#else  // USING_CEF_SHARED
+
+#include "include/cef_keyboard_handler.h"
+#include "include/capi/cef_keyboard_handler_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed wrapper-side only.
+class CefKeyboardHandlerCppToC
+    : public CefCppToC<CefKeyboardHandlerCppToC, CefKeyboardHandler,
+        cef_keyboard_handler_t> {
+ public:
+  explicit CefKeyboardHandlerCppToC(CefKeyboardHandler* cls);
+  virtual ~CefKeyboardHandlerCppToC() {}
+};
+
+#endif  // USING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_
+

libcef_dll/cpptoc/render_process_handler_cpptoc.cc

@@ -12,6 +12,7 @@
 
 #include "libcef_dll/cpptoc/render_process_handler_cpptoc.h"
 #include "libcef_dll/ctocpp/browser_ctocpp.h"
+#include "libcef_dll/ctocpp/domnode_ctocpp.h"
 #include "libcef_dll/ctocpp/frame_ctocpp.h"
 #include "libcef_dll/ctocpp/process_message_ctocpp.h"
 #include "libcef_dll/ctocpp/v8context_ctocpp.h"
@@ -133,6 +134,27 @@ void CEF_CALLBACK render_process_handler_on_context_released(
       CefV8ContextCToCpp::Wrap(context));
 }
 
+void CEF_CALLBACK render_process_handler_on_focused_node_changed(
+    struct _cef_render_process_handler_t* self, cef_browser_t* browser,
+    cef_frame_t* frame, cef_domnode_t* node) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+  // Unverified params: frame, node
+
+  // Execute
+  CefRenderProcessHandlerCppToC::Get(self)->OnFocusedNodeChanged(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      CefDOMNodeCToCpp::Wrap(node));
+}
+
 int CEF_CALLBACK render_process_handler_on_process_message_recieved(
     struct _cef_render_process_handler_t* self, cef_browser_t* browser,
     enum cef_process_id_t source_process, cef_process_message_t* message) {
@@ -180,6 +202,8 @@ CefRenderProcessHandlerCppToC::CefRenderProcessHandlerCppToC(
       render_process_handler_on_context_created;
   struct_.struct_.on_context_released =
       render_process_handler_on_context_released;
+  struct_.struct_.on_focused_node_changed =
+      render_process_handler_on_focused_node_changed;
   struct_.struct_.on_process_message_recieved =
       render_process_handler_on_process_message_recieved;
 }