Revise gamepad interface

ppapi/examples/gamepad/gamepad.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 #include <stdarg.h>
 #include <stdio.h>
 
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/dev/ppb_gamepad_dev.h"
@@ skipping 31 matching lines @@
         callback_factory_(this),
         gamepad_(NULL) {
   }
   virtual ~MyInstance() {}
 
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
     gamepad_ = reinterpret_cast<const PPB_Gamepad_Dev*>(
         pp::Module::Get()->GetBrowserInterface(PPB_GAMEPAD_DEV_INTERFACE));
     if (!gamepad_)
       return false;
-
-    RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE |
-                       PP_INPUTEVENT_CLASS_KEYBOARD);
     return true;
   }
 
   virtual void DidChangeView(const pp::View& view) {
     pp::Rect rect = view.GetRect();
     if (rect.size().width() == width_ &&
         rect.size().height() == height_)
       return;  // We don't care about the position, only the size.
 
     width_ = rect.size().width();
@@ skipping 20 matching lines @@
     } else {
       printf("NullImage\n");
     }
   }
 
   pp::ImageData PaintImage(const pp::Size& size) {
     pp::ImageData image(this, PP_IMAGEDATAFORMAT_BGRA_PREMUL, size, false);
     if (image.is_null())
       return image;
 
-    PP_GamepadsData_Dev gamepad_data;
-    gamepad_->SampleGamepads(pp_instance(), &gamepad_data);
+    PP_GamepadsSampleData_Dev gamepad_data;
+    gamepad_->Sample(pp_instance(), &gamepad_data);
 
-    int width2 = size.width() / 2;
-    int height2 = size.height() / 2;
-    // Draw 2 axes
-    for (size_t i = 0; i < gamepad_data.items[0].axes_length; i += 2) {
-      int x = static_cast<int>(
-          gamepad_data.items[0].axes[i + 0] * width2 + width2);
-      int y = static_cast<int>(
-          gamepad_data.items[0].axes[i + 1] * height2 + height2);
-      uint32_t box_bgra = 0x80000000;  // Alpha 50%.
-      FillRect(&image, x - 3, y - 3, 7, 7, box_bgra);
-    }
+    if (gamepad_data.length > 1 && gamepad_data.items[0].connected) {
+      int width2 = size.width() / 2;
+      int height2 = size.height() / 2;
+      // Draw 2 axes
+      for (size_t i = 0; i < gamepad_data.items[0].axes_length; i += 2) {
+        int x = static_cast<int>(
+            gamepad_data.items[0].axes[i + 0] * width2 + width2);
+        int y = static_cast<int>(
+            gamepad_data.items[0].axes[i + 1] * height2 + height2);
+        uint32_t box_bgra = 0x80000000;  // Alpha 50%.
+        FillRect(&image, x - 3, y - 3, 7, 7, box_bgra);
+      }
 
-    for (size_t i = 0; i < gamepad_data.items[0].buttons_length; ++i) {
-      float button_val = gamepad_data.items[0].buttons[i];
-      uint32_t colour = static_cast<uint32_t>((button_val * 192) + 63) << 24;
-      int x = i * 8 + 10;
-      int y = 10;
-      FillRect(&image, x - 3, y - 3, 7, 7, colour);
+      for (size_t i = 0; i < gamepad_data.items[0].buttons_length; ++i) {
+        float button_val = gamepad_data.items[0].buttons[i];
+        uint32_t colour = static_cast<uint32_t>((button_val * 192) + 63) << 24;
+        int x = i * 8 + 10;
+        int y = 10;
+        FillRect(&image, x - 3, y - 3, 7, 7, colour);
+      }
     }
     return image;
   }
 
   int width_;
   int height_;
 
   pp::CompletionCallbackFactory<MyInstance> callback_factory_;
 
   const PPB_Gamepad_Dev* gamepad_;
@@ skipping 16 matching lines @@
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new MyModule();
 }
 
 }  // namespace pp