Some small refactoring and renaming of sel_universel pepper emulation components.

src/trusted/sel_universal/sdl_ppapi_event_translator.cc

 /*
  * Copyright (c) 2011 The Native Client 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 provives a utilty function to translate and SDL event structure
 // into a PPAPI event structure.
 // This is very adhoc and especially the keyboard event part is very
 // incomplete.
 
 #include <stdint.h>
 #include <SDL/SDL_keysym.h>
 #include <SDL/SDL_events.h>
 #include "ppapi/c/pp_input_event.h"
 
-#include "native_client/src/trusted/sel_universal/multimedia.h"
-
-const int PP_INPUTEVENT_USER = 88;
-const int PP_INPUTEVENT_TERMINATION = 90;
-
-// ppapi does not have a user defined event notion.
-// c.f. ppapi/c/pp_input_event.h
-typedef struct {
-  int code;
-  int data1;
-  int data2;
-}  PP_InputEvent_User;
-
-static PP_InputEvent_User* GetUserEvent(PP_InputEvent* event) {
-  return reinterpret_cast<PP_InputEvent_User*>(&event->u);
-}
-
-bool IsInvalidEvent(PP_InputEvent* event) {
-  return event->type == PP_INPUTEVENT_TYPE_UNDEFINED;
-}
-
-
-void MakeInvalidEvent(PP_InputEvent* event) {
-  event->type = PP_INPUTEVENT_TYPE_UNDEFINED;
-}
-
-
-bool IsTerminationEvent(PP_InputEvent* event) {
-  return event->type == PP_INPUTEVENT_TERMINATION;
-}
-
-
-void MakeTerminationEvent(PP_InputEvent* event) {
-  event->type = (PP_InputEvent_Type) PP_INPUTEVENT_TERMINATION;
-}
-
-
-bool IsUserEvent(PP_InputEvent* event) {
-  return event->type == PP_INPUTEVENT_USER;
-}
-
-
-int GetCodeFromUserEvent(PP_InputEvent* event) {
-  return GetUserEvent(event)->code;
-}
-
-
-int GetData1FromUserEvent(PP_InputEvent* event) {
-  return  GetUserEvent(event)->data1;
-}
-
-
-int GetData2FromUserEvent(PP_InputEvent* event) {
-  return  GetUserEvent(event)->data2;
-}
-
-
-void MakeUserEvent(PP_InputEvent* event, int code, int data1, int data2) {
-  event->type = (PP_InputEvent_Type) PP_INPUTEVENT_USER;
-  PP_InputEvent_User* user = GetUserEvent(event);
-  user->code = code;
-  user->data1 = data1;
-  user->data2 = data2;
-}
-
+#include "native_client/src/trusted/sel_universal/primitives.h"
 
 static PP_InputEvent_MouseButton SDLButtonToPPButton(uint32_t button) {
   switch (button) {
     case SDL_BUTTON_LEFT:
       return PP_INPUTEVENT_MOUSEBUTTON_LEFT;
     case SDL_BUTTON_MIDDLE:
       return PP_INPUTEVENT_MOUSEBUTTON_MIDDLE;
     case SDL_BUTTON_RIGHT:
       return PP_INPUTEVENT_MOUSEBUTTON_RIGHT;
     default:
@@ skipping 136 matching lines @@
       pp_event->u.mouse.button = SDLButtonToPPButton(sdl_event.button.button);
       return true;
 
     case SDL_USEREVENT:
       MakeUserEvent(pp_event,
                     sdl_event.user.code,
                     ptr2int(sdl_event.user.data1),
                     ptr2int(sdl_event.user.data2));
       return true;
     case SDL_QUIT:
-      pp_event->type = (PP_InputEvent_Type) PP_INPUTEVENT_TERMINATION;
+      MakeTerminationEvent(pp_event);
       return true;
     case SDL_ACTIVEEVENT:
     case SDL_SYSWMEVENT:
     case SDL_VIDEORESIZE:
     case SDL_VIDEOEXPOSE:
 
     case SDL_JOYAXISMOTION:
     case SDL_JOYBALLMOTION:
     case SDL_JOYHATMOTION:
     case SDL_JOYBUTTONDOWN:
     case SDL_JOYBUTTONUP:
 
     default:
       return false;
   }
 }