FX Bool considered harmful, part 3

fpdfsdk/src/javascript/JS_EventHandler.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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Runtime.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
 #include "../../include/javascript/JS_Value.h"
 #include "../../include/javascript/Document.h"
 #include "../../include/javascript/Field.h"
 
 /* ---------------------------- CJS_EventHandler ---------------------------- */
 
 CJS_EventHandler::CJS_EventHandler(CJS_Context * pContext)   :
     m_pJSContext(pContext),
     m_eEventType(JET_UNKNOWN),
-    m_bValid(FALSE),
+    m_bValid(false),
     m_pWideStrChange(NULL),
     m_nCommitKey(-1),
-    m_bKeyDown(FALSE),
-    m_bModifier(FALSE),
-    m_bShift(FALSE),
+    m_bKeyDown(false),
+    m_bModifier(false),
+    m_bShift(false),
     m_pISelEnd(NULL),
     m_nSelEndDu(0),
     m_pISelStart(NULL),
     m_nSelStartDu(0),
-    m_bWillCommit(FALSE),
+    m_bWillCommit(false),
     m_pValue(NULL),
-    m_bFieldFull(FALSE),
+    m_bFieldFull(false),
     m_pbRc(NULL),
-    m_bRcDu(FALSE),
+    m_bRcDu(false),
     m_pSourceDoc(NULL),
     m_pTargetBookMark(NULL),
     m_pTargetDoc(NULL),
     m_pTargetAnnot(NULL)
 {
 }
 
 CJS_EventHandler::~CJS_EventHandler()
 {
 }
@@ skipping 66 matching lines @@
     m_pTargetDoc = pDoc;
 }
 
 void CJS_EventHandler::OnPage_OutView(CPDFSDK_Document* pDoc)
 {
     Initial(JET_PAGE_OUTVIEW);
 
     m_pTargetDoc = pDoc;
 }
 
-void CJS_EventHandler::OnField_MouseEnter(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget)
+void CJS_EventHandler::OnField_MouseEnter(bool bModifier, bool bShift, CPDF_FormField* pTarget)
 {
     Initial(JET_FIELD_MOUSEENTER);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
 
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
 }
 
-void CJS_EventHandler::OnField_MouseExit(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget)
+void CJS_EventHandler::OnField_MouseExit(bool bModifier, bool bShift, CPDF_FormField* pTarget)
 {
     Initial(JET_FIELD_MOUSEEXIT);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
 }
 
-void CJS_EventHandler::OnField_MouseDown(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget)
+void CJS_EventHandler::OnField_MouseDown(bool bModifier, bool bShift, CPDF_FormField* pTarget)
 {
     Initial(JET_FIELD_MOUSEDOWN);
     m_eEventType = JET_FIELD_MOUSEDOWN;
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
 }
 
-void CJS_EventHandler::OnField_MouseUp(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget)
+void CJS_EventHandler::OnField_MouseUp(bool bModifier, bool bShift, CPDF_FormField* pTarget)
 {
     Initial(JET_FIELD_MOUSEUP);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
 }
 
-void CJS_EventHandler::OnField_Focus(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget,
+void CJS_EventHandler::OnField_Focus(bool bModifier, bool bShift, CPDF_FormField* pTarget,
                                      const CFX_WideString& Value)
 {
     Initial(JET_FIELD_FOCUS);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
     m_pValue = (CFX_WideString*)&Value;
 }
 
-void CJS_EventHandler::OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget,
+void CJS_EventHandler::OnField_Blur(bool bModifier, bool bShift, CPDF_FormField* pTarget,
                                     const CFX_WideString& Value)
 {
     Initial(JET_FIELD_BLUR);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
     m_pValue = (CFX_WideString*)&Value;
 }
 
 void CJS_EventHandler::OnField_Keystroke(CFX_WideString &strChange,
-                                         const CFX_WideString& strChangeEx, FX_BOOL KeyDown,
-                                         FX_BOOL bModifier, int& nSelEnd, int& nSelStart,
-                                         FX_BOOL bShift, CPDF_FormField* pTarget,
-                                         CFX_WideString& Value, FX_BOOL bWillCommit,
-                                          FX_BOOL bFieldFull, FX_BOOL& bRc)
+                                         const CFX_WideString& strChangeEx, bool KeyDown,
+                                         bool bModifier, int& nSelEnd, int& nSelStart,
+                                         bool bShift, CPDF_FormField* pTarget,
+                                         CFX_WideString& Value, bool bWillCommit,
+                                          bool bFieldFull, bool& bRc)
 {
     Initial(JET_FIELD_KEYSTROKE);
 
     m_nCommitKey = 0;
     m_pWideStrChange = &strChange;
     m_WideStrChangeEx = strChangeEx;
     m_bKeyDown = KeyDown;
     m_bModifier = bModifier;
     m_pISelEnd = &nSelEnd;
     m_pISelStart = &nSelStart;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
     m_pValue = &Value;
     m_bWillCommit = bWillCommit;
     m_pbRc = &bRc;
     m_bFieldFull = bFieldFull;
 }
 
 void CJS_EventHandler::OnField_Validate(CFX_WideString& strChange, const CFX_WideString& strChangeEx,
-                                        FX_BOOL bKeyDown, FX_BOOL bModifier, FX_BOOL bShift,
-                                        CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc)
+                                        bool bKeyDown, bool bModifier, bool bShift,
+                                        CPDF_FormField* pTarget, CFX_WideString& Value, bool& bRc)
 {
     Initial(JET_FIELD_VALIDATE);
 
     m_pWideStrChange = &strChange;
     m_WideStrChangeEx = strChangeEx;
     m_bKeyDown = bKeyDown;
     m_bModifier = bModifier;
     m_bShift = bShift;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
     m_pValue = &Value;
     m_pbRc = &bRc;
 }
 
 void CJS_EventHandler::OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget,
-                                         CFX_WideString& Value, FX_BOOL& bRc)
+                                         CFX_WideString& Value, bool& bRc)
 {
     Initial(JET_FIELD_CALCULATE);
 
     if (pSource)
         m_strSourceName = pSource->GetFullName();
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
     m_pValue = &Value;
     m_pbRc = &bRc;
 }
 
 void CJS_EventHandler::OnField_Format(CPDF_FormField* pTarget,
                                       CFX_WideString& Value,
-                                      FX_BOOL bWillCommit)
+                                      bool bWillCommit)
 {
     Initial(JET_FIELD_FORMAT);
 
     m_nCommitKey = 0;
     ASSERT(pTarget != NULL);
     m_strTargetName = pTarget->GetFullName();
     m_pValue = &Value;
     m_bWillCommit = bWillCommit;
 }
 
-void CJS_EventHandler::OnScreen_Focus(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_Focus(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_FOCUS);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_Blur(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_BLUR);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_Open(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_Open(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_OPEN);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_Close(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_Close(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_CLOSE);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_MouseDown(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_MouseDown(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_MOUSEDOWN);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_MouseUp(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_MouseUp(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_MOUSEUP);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_MouseEnter(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_MouseEnter(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_MOUSEENTER);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_MouseExit(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_MouseExit(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_MOUSEEXIT);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_InView(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_InView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_INVIEW);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
-void CJS_EventHandler::OnScreen_OutView(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen)
+void CJS_EventHandler::OnScreen_OutView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen)
 {
     Initial(JET_SCREEN_OUTVIEW);
 
     m_bModifier = bModifier;
     m_bShift = bShift;
     m_pTargetAnnot = pScreen;
 }
 
 void CJS_EventHandler::OnLink_MouseUp(CPDFSDK_Document* pTarget)
 {
@@ skipping 38 matching lines @@
 void CJS_EventHandler::Initial(JS_EVENT_T type)
 {
     m_eEventType = type;
 
     m_strTargetName = L"";
     m_strSourceName = L"";
     m_pWideStrChange = NULL;
     m_WideStrChangeDu = L"";
     m_WideStrChangeEx = L"";
     m_nCommitKey = -1;
-    m_bKeyDown = FALSE;
-    m_bModifier = FALSE;
-    m_bShift = FALSE;
+    m_bKeyDown = false;
+    m_bModifier = false;
+    m_bShift = false;
     m_pISelEnd = NULL;
     m_nSelEndDu = 0;
     m_pISelStart = NULL;
     m_nSelStartDu = 0;
-    m_bWillCommit = FALSE;
+    m_bWillCommit = false;
     m_pValue = NULL;
-    m_bFieldFull = FALSE;
+    m_bFieldFull = false;
     m_pbRc = NULL;
-    m_bRcDu = FALSE;
+    m_bRcDu = false;
 
     m_pSourceDoc = NULL;
     m_pTargetBookMark = NULL;
     m_pTargetDoc = NULL;
     m_pTargetAnnot = NULL;
 
-    m_bValid = TRUE;
+    m_bValid = true;
 }
 
 void CJS_EventHandler::Destroy()
 {
-    m_bValid = FALSE;
+    m_bValid = false;
 }
 
-FX_BOOL CJS_EventHandler::IsValid()
+bool CJS_EventHandler::IsValid()
 {
     return m_bValid;
 }
 
 CFX_WideString & CJS_EventHandler::Change()
 {
     if (m_pWideStrChange) {
         return *m_pWideStrChange;
     }
     return m_WideStrChangeDu;
 }
 
 CFX_WideString CJS_EventHandler::ChangeEx()
 {
     return m_WideStrChangeEx;
 }
 
 int CJS_EventHandler::CommitKey()
 {
     return m_nCommitKey;
 }
 
-FX_BOOL CJS_EventHandler::FieldFull()
+bool CJS_EventHandler::FieldFull()
 {
     return m_bFieldFull;
 }
 
-FX_BOOL CJS_EventHandler::KeyDown()
+bool CJS_EventHandler::KeyDown()
 {
     return m_bKeyDown;
 }
 
-FX_BOOL CJS_EventHandler::Modifier()
+bool CJS_EventHandler::Modifier()
 {
     return m_bModifier;
 }
 
 const FX_WCHAR* CJS_EventHandler::Name()
 {
     switch (m_eEventType)
     {
     case JET_APP_INIT:          return L"Init";
     case JET_BATCH_EXEC:        return L"Exec";
@@ skipping 80 matching lines @@
     case JET_PAGE_CLOSE:
     case JET_PAGE_INVIEW:
     case JET_PAGE_OUTVIEW:return L"Page";
     default:
         return L"";
     }
 
     return L"";
 }
 
-FX_BOOL& CJS_EventHandler::Rc()
+bool& CJS_EventHandler::Rc()
 {
     if (m_pbRc) {
         return *m_pbRc;
     }
     return m_bRcDu;
 }
 
 int & CJS_EventHandler::SelEnd()
 {
     if (m_pISelEnd) {
         return *m_pISelEnd;
     }
     return m_nSelEndDu;
 }
 
 int & CJS_EventHandler::SelStart()
 {
     if (m_pISelStart) {
         return *m_pISelStart;
     }
     return m_nSelStartDu;
 }
 
-FX_BOOL CJS_EventHandler::Shift()
+bool CJS_EventHandler::Shift()
 {
     return m_bShift;
 }
 
 Field* CJS_EventHandler::Source()
 {
     ASSERT(m_pJSContext != NULL);
 
     CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime();
 
     JSFXObject  pDocObj = JS_NewFxDynamicObj(*pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Document"));
-    ASSERT(pDocObj.IsEmpty() == FALSE);
+    ASSERT(pDocObj.IsEmpty() == false);
     JSFXObject  pFieldObj = JS_NewFxDynamicObj(*pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Field"));
-    ASSERT(pFieldObj.IsEmpty() == FALSE);
+    ASSERT(pFieldObj.IsEmpty() == false);
 
     CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pDocObj);
     ASSERT(pJSDocument != NULL);
     Document* pDocument = (Document*)pJSDocument->GetEmbedObject();
     ASSERT(pDocument != NULL);
     if (m_pTargetDoc != NULL)
         pDocument->AttachDoc(m_pTargetDoc);
     else
         pDocument->AttachDoc(m_pJSContext->GetReaderDocument());
 
@@ skipping 11 matching lines @@
     return pField;
 }
 
 Field* CJS_EventHandler::Target_Field()
 {
     ASSERT(m_pJSContext != NULL);
 
     CJS_Runtime* pRuntime = m_pJSContext->GetJSRuntime();
 
     JSFXObject pDocObj = JS_NewFxDynamicObj(*pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Document"));
-    ASSERT(pDocObj.IsEmpty() == FALSE);
+    ASSERT(pDocObj.IsEmpty() == false);
     JSFXObject pFieldObj = JS_NewFxDynamicObj(*pRuntime, m_pJSContext, JS_GetObjDefnID(*pRuntime, L"Field"));
-    ASSERT(pFieldObj.IsEmpty() == FALSE);
+    ASSERT(pFieldObj.IsEmpty() == false);
 
     CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pDocObj);
     ASSERT(pJSDocument != NULL);
     Document* pDocument = (Document*)pJSDocument->GetEmbedObject();
     ASSERT(pDocument != NULL);
     if (m_pTargetDoc != NULL)
         pDocument->AttachDoc(m_pTargetDoc);
     else
         pDocument->AttachDoc(m_pJSContext->GetReaderDocument());
 
     CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(pFieldObj);
     ASSERT(pJSField != NULL);
 
     Field* pField = (Field *)pJSField->GetEmbedObject();
     ASSERT(pField != NULL);
 
     pField->AttachField(pDocument, m_strTargetName);
     return pField;
 }
 
 CFX_WideString& CJS_EventHandler::Value()
 {
     return *m_pValue;
 }
 
-FX_BOOL CJS_EventHandler::WillCommit()
+bool CJS_EventHandler::WillCommit()
 {
     return m_bWillCommit;
 }
 
 CFX_WideString CJS_EventHandler::TargetName()
 {
     return m_strTargetName;
 }