Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_combobox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_combobox.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_evttextchanged.h"
-#include "xfa/fwl/core/cfwl_formproxy.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_eventtextchanged.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 CFWL_ComboBox::CFWL_ComboBox(const CFWL_App* app)
     : CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
       m_pComboBoxProxy(nullptr),
       m_bLButtonDown(false),
       m_iCurSel(-1),
       m_iBtnState(CFWL_PartState_Normal),
       m_fComboFormHandler(0) {
   m_rtClient.Reset();
   m_rtBtn.Reset();
@@ skipping 478 matching lines @@
   if (!hItem)
     return;
 
   CFX_WideString wsText = m_pListBox->GetItemText(this, hItem);
   if (m_pEdit) {
     m_pEdit->SetText(wsText);
     m_pEdit->Update();
     m_pEdit->SetSelected();
   }
 
-  CFWL_EvtSelectChanged ev(this);
+  CFWL_EventSelectChanged ev(this);
   ev.bLButtonUp = bLButtonUp;
   DispatchEvent(&ev);
 }
 
 void CFWL_ComboBox::InitProxyForm() {
   if (m_pComboBoxProxy)
     return;
   if (!m_pListBox)
     return;
 
@@ skipping 224 matching lines @@
     return;
 
   switch (pMessage->GetType()) {
     case CFWL_Message::Type::SetFocus:
       OnFocusChanged(pMessage, true);
       break;
     case CFWL_Message::Type::KillFocus:
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonUp:
           OnLButtonUp(pMsg);
           break;
         case FWL_MouseCommand::Move:
           OnMouseMove(pMsg);
           break;
         case FWL_MouseCommand::Leave:
           OnMouseLeave(pMsg);
           break;
         default:
           break;
       }
       break;
     }
     case CFWL_Message::Type::Key:
-      OnKey(static_cast<CFWL_MsgKey*>(pMessage));
+      OnKey(static_cast<CFWL_MessageKey*>(pMessage));
       break;
     default:
       break;
   }
 
   CFWL_Widget::OnProcessMessage(pMessage);
 }
 
 void CFWL_ComboBox::OnProcessEvent(CFWL_Event* pEvent) {
   CFWL_Event::Type type = pEvent->GetType();
   if (type == CFWL_Event::Type::Scroll) {
-    CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
-    CFWL_EvtScroll pScrollEv(this);
+    CFWL_EventScroll* pScrollEvent = static_cast<CFWL_EventScroll*>(pEvent);
+    CFWL_EventScroll pScrollEv(this);
     pScrollEv.m_iScrollCode = pScrollEvent->m_iScrollCode;
     pScrollEv.m_fPos = pScrollEvent->m_fPos;
     DispatchEvent(&pScrollEv);
   } else if (type == CFWL_Event::Type::TextChanged) {
     CFWL_Event pTemp(CFWL_Event::Type::EditChanged, this);
     DispatchEvent(&pTemp);
   }
 }
 
 void CFWL_ComboBox::OnDrawWidget(CFX_Graphics* pGraphics,
@@ skipping 20 matching lines @@
     Repaint(&m_rtClient);
     return;
   }
   if (!m_pEdit)
     return;
 
   m_pEdit->FlagFocus(false);
   m_pEdit->ClearSelected();
 }
 
-void CFWL_ComboBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
   CFX_RectF& rtBtn = IsDropDownStyle() ? m_rtBtn : m_rtClient;
   if (!rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
   if (IsDropDownStyle() && m_pEdit)
     MatchEditText();
 
   m_bLButtonDown = true;
   m_iBtnState = CFWL_PartState_Pressed;
   Repaint(&m_rtClient);
 
   ShowDropList(true);
   m_iBtnState = CFWL_PartState_Normal;
   Repaint(&m_rtClient);
 }
 
-void CFWL_ComboBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = false;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     m_iBtnState = CFWL_PartState_Hovered;
   else
     m_iBtnState = CFWL_PartState_Normal;
 
   Repaint(&m_rtBtn);
 }
 
-void CFWL_ComboBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
   int32_t iOldState = m_iBtnState;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iBtnState =
         m_bLButtonDown ? CFWL_PartState_Pressed : CFWL_PartState_Hovered;
   } else {
     m_iBtnState = CFWL_PartState_Normal;
   }
   if ((iOldState != m_iBtnState) &&
       !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
         FWL_WGTSTATE_Disabled)) {
     Repaint(&m_rtBtn);
   }
 }
 
-void CFWL_ComboBox::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!IsDropListVisible() &&
       !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
         FWL_WGTSTATE_Disabled)) {
     m_iBtnState = CFWL_PartState_Normal;
     Repaint(&m_rtBtn);
   }
 }
 
-void CFWL_ComboBox::OnKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   if (dwKeyCode == FWL_VKEY_Tab)
     return;
   if (pMsg->m_pDstTarget == this)
     DoSubCtrlKey(pMsg);
 }
 
-void CFWL_ComboBox::DoSubCtrlKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::DoSubCtrlKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
   if (bUp || bDown) {
     int32_t iCount = m_pListBox->CountItems(nullptr);
     if (iCount < 1)
       return;
 
     bool bMatchEqual = false;
     int32_t iCurSel = m_iCurSel;
@@ skipping 40 matching lines @@
       DisForm_OnFocusChanged(pMessage, true);
       break;
     }
     case CFWL_Message::Type::KillFocus: {
       backDefault = false;
       DisForm_OnFocusChanged(pMessage, false);
       break;
     }
     case CFWL_Message::Type::Mouse: {
       backDefault = false;
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           DisForm_OnLButtonDown(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonUp:
           OnLButtonUp(pMsg);
           break;
         default:
           break;
       }
       break;
     }
     case CFWL_Message::Type::Key: {
       backDefault = false;
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyUp)
         break;
       if (DisForm_IsDropListVisible() &&
           pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
         bool bListKey = pKey->m_dwKeyCode == FWL_VKEY_Up ||
                         pKey->m_dwKeyCode == FWL_VKEY_Down ||
                         pKey->m_dwKeyCode == FWL_VKEY_Return ||
                         pKey->m_dwKeyCode == FWL_VKEY_Escape;
         if (bListKey) {
           m_pListBox->GetDelegate()->OnProcessMessage(pMessage);
           break;
         }
       }
       DisForm_OnKey(pKey);
       break;
     }
     default:
       break;
   }
   if (backDefault)
     CFWL_Widget::OnProcessMessage(pMessage);
 }
 
-void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MessageMouse* pMsg) {
   bool bDropDown = DisForm_IsDropListVisible();
   CFX_RectF& rtBtn = bDropDown ? m_rtBtn : m_rtClient;
   if (!rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
   if (DisForm_IsDropListVisible()) {
     DisForm_ShowDropList(false);
     return;
   }
   if (m_pEdit)
     MatchEditText();
   DisForm_ShowDropList(true);
 }
 
 void CFWL_ComboBox::DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet) {
     m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
     if ((m_pEdit->GetStates() & FWL_WGTSTATE_Focused) == 0) {
-      CFWL_MsgSetFocus msg(nullptr, m_pEdit.get());
+      CFWL_MessageSetFocus msg(nullptr, m_pEdit.get());
       m_pEdit->GetDelegate()->OnProcessMessage(&msg);
     }
   } else {
     m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
     DisForm_ShowDropList(false);
-    CFWL_MsgKillFocus msg(m_pEdit.get());
+    CFWL_MessageKillFocus msg(m_pEdit.get());
     m_pEdit->GetDelegate()->OnProcessMessage(&msg);
   }
 }
 
-void CFWL_ComboBox::DisForm_OnKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::DisForm_OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
   if (bUp || bDown) {
     CFWL_ComboList* pComboList = m_pListBox.get();
     int32_t iCount = pComboList->CountItems(nullptr);
     if (iCount < 1)
       return;
 
     bool bMatchEqual = false;
@@ skipping 17 matching lines @@
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     SyncEditText(m_iCurSel);
     return;
   }
   if (m_pEdit)
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }