| Index: fpdfsdk/include/cpdfsdk_environment.h
|
| diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h
|
| index 338d70f33b9bbfc9d5ffe23a50075e99749d984c..61916e46ad9e3d165fb188087edca06bb4bd2a0d 100644
|
| --- a/fpdfsdk/include/cpdfsdk_environment.h
|
| +++ b/fpdfsdk/include/cpdfsdk_environment.h
|
| @@ -34,107 +34,35 @@ class CPDFSDK_Environment final {
|
| double left,
|
| double top,
|
| double right,
|
| - double bottom) {
|
| - if (m_pInfo && m_pInfo->FFI_Invalidate)
|
| - m_pInfo->FFI_Invalidate(m_pInfo, page, left, top, right, bottom);
|
| - }
|
| -
|
| + double bottom);
|
| void OutputSelectedRect(FPDF_PAGE page,
|
| double left,
|
| double top,
|
| double right,
|
| - double bottom) {
|
| - if (m_pInfo && m_pInfo->FFI_OutputSelectedRect)
|
| - m_pInfo->FFI_OutputSelectedRect(m_pInfo, page, left, top, right, bottom);
|
| - }
|
| -
|
| - void SetCursor(int nCursorType) {
|
| - if (m_pInfo && m_pInfo->FFI_SetCursor)
|
| - m_pInfo->FFI_SetCursor(m_pInfo, nCursorType);
|
| - }
|
| -
|
| - int SetTimer(int uElapse, TimerCallback lpTimerFunc) {
|
| - if (m_pInfo && m_pInfo->FFI_SetTimer)
|
| - return m_pInfo->FFI_SetTimer(m_pInfo, uElapse, lpTimerFunc);
|
| - return -1;
|
| - }
|
| -
|
| - void KillTimer(int nTimerID) {
|
| - if (m_pInfo && m_pInfo->FFI_KillTimer)
|
| - m_pInfo->FFI_KillTimer(m_pInfo, nTimerID);
|
| - }
|
| -
|
| - FX_SYSTEMTIME GetLocalTime() const {
|
| - FX_SYSTEMTIME fxtime;
|
| - if (m_pInfo && m_pInfo->FFI_GetLocalTime) {
|
| - FPDF_SYSTEMTIME systime = m_pInfo->FFI_GetLocalTime(m_pInfo);
|
| - fxtime.wDay = systime.wDay;
|
| - fxtime.wDayOfWeek = systime.wDayOfWeek;
|
| - fxtime.wHour = systime.wHour;
|
| - fxtime.wMilliseconds = systime.wMilliseconds;
|
| - fxtime.wMinute = systime.wMinute;
|
| - fxtime.wMonth = systime.wMonth;
|
| - fxtime.wSecond = systime.wSecond;
|
| - fxtime.wYear = systime.wYear;
|
| - }
|
| - return fxtime;
|
| - }
|
| -
|
| - void OnChange() {
|
| - if (m_pInfo && m_pInfo->FFI_OnChange)
|
| - m_pInfo->FFI_OnChange(m_pInfo);
|
| - }
|
| -
|
| - FX_BOOL IsSHIFTKeyDown(uint32_t nFlag) const {
|
| - return (nFlag & FWL_EVENTFLAG_ShiftKey) != 0;
|
| - }
|
| -
|
| - FX_BOOL IsCTRLKeyDown(uint32_t nFlag) const {
|
| - return (nFlag & FWL_EVENTFLAG_ControlKey) != 0;
|
| - }
|
| -
|
| - FX_BOOL IsALTKeyDown(uint32_t nFlag) const {
|
| - return (nFlag & FWL_EVENTFLAG_AltKey) != 0;
|
| - }
|
| + double bottom);
|
|
|
| - FPDF_PAGE GetPage(FPDF_DOCUMENT document, int nPageIndex) {
|
| - if (m_pInfo && m_pInfo->FFI_GetPage)
|
| - return m_pInfo->FFI_GetPage(m_pInfo, document, nPageIndex);
|
| - return nullptr;
|
| - }
|
| + void SetCursor(int nCursorType);
|
| + int SetTimer(int uElapse, TimerCallback lpTimerFunc);
|
| + void KillTimer(int nTimerID);
|
| + FX_SYSTEMTIME GetLocalTime() const;
|
|
|
| - FPDF_PAGE GetCurrentPage(FPDF_DOCUMENT document) {
|
| - if (m_pInfo && m_pInfo->FFI_GetCurrentPage)
|
| - return m_pInfo->FFI_GetCurrentPage(m_pInfo, document);
|
| - return nullptr;
|
| - }
|
| + void OnChange();
|
| + FX_BOOL IsSHIFTKeyDown(uint32_t nFlag) const;
|
| + FX_BOOL IsCTRLKeyDown(uint32_t nFlag) const;
|
| + FX_BOOL IsALTKeyDown(uint32_t nFlag) const;
|
|
|
| - void ExecuteNamedAction(const FX_CHAR* namedAction) {
|
| - if (m_pInfo && m_pInfo->FFI_ExecuteNamedAction)
|
| - m_pInfo->FFI_ExecuteNamedAction(m_pInfo, namedAction);
|
| - }
|
| + FPDF_PAGE GetPage(FPDF_DOCUMENT document, int nPageIndex);
|
| + FPDF_PAGE GetCurrentPage(FPDF_DOCUMENT document);
|
|
|
| - void OnSetFieldInputFocus(void* field,
|
| - FPDF_WIDESTRING focusText,
|
| + void ExecuteNamedAction(const FX_CHAR* namedAction);
|
| + void OnSetFieldInputFocus(FPDF_WIDESTRING focusText,
|
| FPDF_DWORD nTextLen,
|
| - FX_BOOL bFocus) {
|
| - if (m_pInfo && m_pInfo->FFI_SetTextFieldFocus)
|
| - m_pInfo->FFI_SetTextFieldFocus(m_pInfo, focusText, nTextLen, bFocus);
|
| - }
|
| -
|
| - void DoURIAction(const FX_CHAR* bsURI) {
|
| - if (m_pInfo && m_pInfo->FFI_DoURIAction)
|
| - m_pInfo->FFI_DoURIAction(m_pInfo, bsURI);
|
| - }
|
| -
|
| + FX_BOOL bFocus);
|
| + void DoURIAction(const FX_CHAR* bsURI);
|
| void DoGoToAction(int nPageIndex,
|
| int zoomMode,
|
| float* fPosArray,
|
| - int sizeOfArray) {
|
| - if (m_pInfo && m_pInfo->FFI_DoGoToAction)
|
| - m_pInfo->FFI_DoGoToAction(m_pInfo, nPageIndex, zoomMode, fPosArray,
|
| - sizeOfArray);
|
| - }
|
| + int sizeOfArray);
|
|
|
| #ifdef PDF_ENABLE_XFA
|
| void DisplayCaret(FPDF_PAGE page,
|
| @@ -142,219 +70,46 @@ class CPDFSDK_Environment final {
|
| double left,
|
| double top,
|
| double right,
|
| - double bottom) {
|
| - if (m_pInfo && m_pInfo->FFI_DisplayCaret)
|
| - m_pInfo->FFI_DisplayCaret(m_pInfo, page, bVisible, left, top, right,
|
| - bottom);
|
| - }
|
| -
|
| - int GetCurrentPageIndex(FPDF_DOCUMENT document) {
|
| - if (!m_pInfo || !m_pInfo->FFI_GetCurrentPageIndex)
|
| - return -1;
|
| - return m_pInfo->FFI_GetCurrentPageIndex(m_pInfo, document);
|
| - }
|
| -
|
| - void SetCurrentPage(FPDF_DOCUMENT document, int iCurPage) {
|
| - if (m_pInfo && m_pInfo->FFI_SetCurrentPage)
|
| - m_pInfo->FFI_SetCurrentPage(m_pInfo, document, iCurPage);
|
| - }
|
| + double bottom);
|
| + int GetCurrentPageIndex(FPDF_DOCUMENT document);
|
| + void SetCurrentPage(FPDF_DOCUMENT document, int iCurPage);
|
|
|
| // TODO(dsinclair): This should probably change to PDFium?
|
| CFX_WideString FFI_GetAppName() const { return CFX_WideString(L"Acrobat"); }
|
|
|
| - CFX_WideString GetPlatform() {
|
| - if (!m_pInfo || !m_pInfo->FFI_GetPlatform)
|
| - return L"";
|
| -
|
| - int nRequiredLen = m_pInfo->FFI_GetPlatform(m_pInfo, nullptr, 0);
|
| - if (nRequiredLen <= 0)
|
| - return L"";
|
| -
|
| - char* pbuff = new char[nRequiredLen];
|
| - memset(pbuff, 0, nRequiredLen);
|
| - int nActualLen = m_pInfo->FFI_GetPlatform(m_pInfo, pbuff, nRequiredLen);
|
| - if (nActualLen <= 0 || nActualLen > nRequiredLen) {
|
| - delete[] pbuff;
|
| - return L"";
|
| - }
|
| - CFX_ByteString bsRet = CFX_ByteString(pbuff, nActualLen);
|
| - CFX_WideString wsRet = CFX_WideString::FromUTF16LE(
|
| - (unsigned short*)bsRet.GetBuffer(bsRet.GetLength()),
|
| - bsRet.GetLength() / sizeof(unsigned short));
|
| - delete[] pbuff;
|
| - return wsRet;
|
| - }
|
| -
|
| - void GotoURL(FPDF_DOCUMENT document,
|
| - const CFX_WideStringC& wsURL,
|
| - FX_BOOL bAppend) {
|
| - if (m_pInfo && m_pInfo->FFI_GotoURL) {
|
| - CFX_ByteString bsTo = CFX_WideString(wsURL).UTF16LE_Encode();
|
| - FPDF_WIDESTRING pTo = (FPDF_WIDESTRING)bsTo.GetBuffer(wsURL.GetLength());
|
| - m_pInfo->FFI_GotoURL(m_pInfo, document, pTo);
|
| - bsTo.ReleaseBuffer();
|
| - }
|
| - }
|
| -
|
| - void GetPageViewRect(FPDF_PAGE page, FS_RECTF& dstRect) {
|
| - if (m_pInfo && m_pInfo->FFI_GetPageViewRect) {
|
| - double left;
|
| - double top;
|
| - double right;
|
| - double bottom;
|
| - m_pInfo->FFI_GetPageViewRect(m_pInfo, page, &left, &top, &right, &bottom);
|
| -
|
| - dstRect.left = static_cast<float>(left);
|
| - dstRect.top = static_cast<float>(top < bottom ? bottom : top);
|
| - dstRect.bottom = static_cast<float>(top < bottom ? top : bottom);
|
| - dstRect.right = static_cast<float>(right);
|
| - }
|
| - }
|
| -
|
| + CFX_WideString GetPlatform();
|
| + void GotoURL(FPDF_DOCUMENT document, const CFX_WideStringC& wsURL);
|
| + void GetPageViewRect(FPDF_PAGE page, FS_RECTF& dstRect);
|
| FX_BOOL PopupMenu(FPDF_PAGE page,
|
| FPDF_WIDGET hWidget,
|
| int menuFlag,
|
| - CFX_PointF ptPopup,
|
| - const CFX_PointF* pRectExclude) {
|
| - if (m_pInfo && m_pInfo->FFI_PopupMenu)
|
| - return m_pInfo->FFI_PopupMenu(m_pInfo, page, hWidget, menuFlag, ptPopup.x,
|
| - ptPopup.y);
|
| - return FALSE;
|
| - }
|
| -
|
| - void Alert(FPDF_WIDESTRING Msg, FPDF_WIDESTRING Title, int Type, int Icon) {
|
| - if (m_pInfo && m_pInfo->m_pJsPlatform && m_pInfo->m_pJsPlatform->app_alert)
|
| - m_pInfo->m_pJsPlatform->app_alert(m_pInfo->m_pJsPlatform, Msg, Title,
|
| - Type, Icon);
|
| - }
|
| + CFX_PointF pt);
|
|
|
| + void Alert(FPDF_WIDESTRING Msg, FPDF_WIDESTRING Title, int Type, int Icon);
|
| void EmailTo(FPDF_FILEHANDLER* fileHandler,
|
| FPDF_WIDESTRING pTo,
|
| FPDF_WIDESTRING pSubject,
|
| FPDF_WIDESTRING pCC,
|
| FPDF_WIDESTRING pBcc,
|
| - FPDF_WIDESTRING pMsg) {
|
| - if (m_pInfo && m_pInfo->FFI_EmailTo)
|
| - m_pInfo->FFI_EmailTo(m_pInfo, fileHandler, pTo, pSubject, pCC, pBcc,
|
| - pMsg);
|
| - }
|
| -
|
| + FPDF_WIDESTRING pMsg);
|
| void UploadTo(FPDF_FILEHANDLER* fileHandler,
|
| int fileFlag,
|
| - FPDF_WIDESTRING uploadTo) {
|
| - if (m_pInfo && m_pInfo->FFI_UploadTo)
|
| - m_pInfo->FFI_UploadTo(m_pInfo, fileHandler, fileFlag, uploadTo);
|
| - }
|
| -
|
| + FPDF_WIDESTRING uploadTo);
|
| FPDF_FILEHANDLER* OpenFile(int fileType,
|
| FPDF_WIDESTRING wsURL,
|
| - const char* mode) {
|
| - if (m_pInfo && m_pInfo->FFI_OpenFile)
|
| - return m_pInfo->FFI_OpenFile(m_pInfo, fileType, wsURL, mode);
|
| - return nullptr;
|
| - }
|
| -
|
| - IFX_FileRead* DownloadFromURL(const FX_WCHAR* url) {
|
| - if (!m_pInfo || !m_pInfo->FFI_DownloadFromURL)
|
| - return nullptr;
|
| -
|
| - CFX_ByteString bstrURL = CFX_WideString(url).UTF16LE_Encode();
|
| - FPDF_WIDESTRING wsURL =
|
| - (FPDF_WIDESTRING)bstrURL.GetBuffer(bstrURL.GetLength());
|
| -
|
| - FPDF_LPFILEHANDLER fileHandler =
|
| - m_pInfo->FFI_DownloadFromURL(m_pInfo, wsURL);
|
| -
|
| - return new CFPDF_FileStream(fileHandler);
|
| - }
|
| -
|
| + const char* mode);
|
| + IFX_FileRead* DownloadFromURL(const FX_WCHAR* url);
|
| CFX_WideString PostRequestURL(const FX_WCHAR* wsURL,
|
| const FX_WCHAR* wsData,
|
| const FX_WCHAR* wsContentType,
|
| const FX_WCHAR* wsEncode,
|
| - const FX_WCHAR* wsHeader) {
|
| - if (!m_pInfo || !m_pInfo->FFI_PostRequestURL)
|
| - return L"";
|
| -
|
| - CFX_ByteString bsURL = CFX_WideString(wsURL).UTF16LE_Encode();
|
| - FPDF_WIDESTRING URL = (FPDF_WIDESTRING)bsURL.GetBuffer(bsURL.GetLength());
|
| -
|
| - CFX_ByteString bsData = CFX_WideString(wsData).UTF16LE_Encode();
|
| - FPDF_WIDESTRING data =
|
| - (FPDF_WIDESTRING)bsData.GetBuffer(bsData.GetLength());
|
| -
|
| - CFX_ByteString bsContentType =
|
| - CFX_WideString(wsContentType).UTF16LE_Encode();
|
| - FPDF_WIDESTRING contentType =
|
| - (FPDF_WIDESTRING)bsContentType.GetBuffer(bsContentType.GetLength());
|
| -
|
| - CFX_ByteString bsEncode = CFX_WideString(wsEncode).UTF16LE_Encode();
|
| - FPDF_WIDESTRING encode =
|
| - (FPDF_WIDESTRING)bsEncode.GetBuffer(bsEncode.GetLength());
|
| -
|
| - CFX_ByteString bsHeader = CFX_WideString(wsHeader).UTF16LE_Encode();
|
| - FPDF_WIDESTRING header =
|
| - (FPDF_WIDESTRING)bsHeader.GetBuffer(bsHeader.GetLength());
|
| -
|
| - FPDF_BSTR response;
|
| - FPDF_BStr_Init(&response);
|
| - m_pInfo->FFI_PostRequestURL(m_pInfo, URL, data, contentType, encode, header,
|
| - &response);
|
| -
|
| - CFX_WideString wsRet = CFX_WideString::FromUTF16LE(
|
| - (unsigned short*)response.str, response.len / sizeof(unsigned short));
|
| - FPDF_BStr_Clear(&response);
|
| -
|
| - return wsRet;
|
| - }
|
| -
|
| + const FX_WCHAR* wsHeader);
|
| FPDF_BOOL PutRequestURL(const FX_WCHAR* wsURL,
|
| const FX_WCHAR* wsData,
|
| - const FX_WCHAR* wsEncode) {
|
| - if (!m_pInfo || !m_pInfo->FFI_PutRequestURL)
|
| - return FALSE;
|
| -
|
| - CFX_ByteString bsURL = CFX_WideString(wsURL).UTF16LE_Encode();
|
| - FPDF_WIDESTRING URL = (FPDF_WIDESTRING)bsURL.GetBuffer(bsURL.GetLength());
|
| + const FX_WCHAR* wsEncode);
|
| + CFX_WideString GetLanguage();
|
|
|
| - CFX_ByteString bsData = CFX_WideString(wsData).UTF16LE_Encode();
|
| - FPDF_WIDESTRING data =
|
| - (FPDF_WIDESTRING)bsData.GetBuffer(bsData.GetLength());
|
| -
|
| - CFX_ByteString bsEncode = CFX_WideString(wsEncode).UTF16LE_Encode();
|
| - FPDF_WIDESTRING encode =
|
| - (FPDF_WIDESTRING)bsEncode.GetBuffer(bsEncode.GetLength());
|
| -
|
| - return m_pInfo->FFI_PutRequestURL(m_pInfo, URL, data, encode);
|
| - }
|
| -
|
| - CFX_WideString GetLanguage() {
|
| - if (!m_pInfo || !m_pInfo->FFI_GetLanguage)
|
| - return L"";
|
| -
|
| - int nRequiredLen = m_pInfo->FFI_GetLanguage(m_pInfo, nullptr, 0);
|
| - if (nRequiredLen <= 0)
|
| - return L"";
|
| -
|
| - char* pbuff = new char[nRequiredLen];
|
| - memset(pbuff, 0, nRequiredLen);
|
| - int nActualLen = m_pInfo->FFI_GetLanguage(m_pInfo, pbuff, nRequiredLen);
|
| - if (nActualLen <= 0 || nActualLen > nRequiredLen) {
|
| - delete[] pbuff;
|
| - return L"";
|
| - }
|
| - CFX_ByteString bsRet = CFX_ByteString(pbuff, nActualLen);
|
| - CFX_WideString wsRet = CFX_WideString::FromUTF16LE(
|
| - (unsigned short*)bsRet.GetBuffer(bsRet.GetLength()),
|
| - bsRet.GetLength() / sizeof(unsigned short));
|
| - delete[] pbuff;
|
| - return wsRet;
|
| - }
|
| -
|
| - void PageEvent(int iPageCount, uint32_t dwEventType) const {
|
| - if (m_pInfo && m_pInfo->FFI_PageEvent)
|
| - m_pInfo->FFI_PageEvent(m_pInfo, iPageCount, dwEventType);
|
| - }
|
| + void PageEvent(int iPageCount, uint32_t dwEventType) const;
|
| #endif // PDF_ENABLE_XFA
|
|
|
| int JS_appAlert(const FX_WCHAR* Msg,
|
|
|