quickwin 2.3.0 → 3.0.0

package/examples/pdf_viewer.tsx

@@ -1,17 +1,19 @@
-import { MaybePtr, PtrArrayBuffer } from '../lib/ffi/ctype.js'
+import { MaybePtr, PtrArrayBuffer, NULL } from '../lib/ffi/ctype.js'
 import '../lib/polyfill.js'
 import * as std from 'std'
 import * as gui from 'gui'
-import type { Document, Page, Pixmap } from '../vendor/mupdf-wasm/mupdf.js'
+import type { Document, Page, Pixmap } from '@quickwinlabs/mupdf-wasm'
+import { MUPDF_JS_URL, preloadMupdfWasm } from '../test/mupdf-cdn.js'
 import { useState } from 'react'
 import { render, Button, Input, ScrollView } from '../lib/react-qw/index.js'
 import { WCHAR } from '../lib/ffi/bind.js'
 import { PdfCanvas } from './PdfCanvas.js'
 import { OPENFILENAMEW } from '../lib/windows/structs.js'
 import { GetOpenFileName } from '../lib/windows/comdlg32.js'
-import { WindowStyle } from '../constants'
+import { MessageBox, ShowWindow } from '../lib/windows/user32.js'
+import { ShowWindowCmd, WindowStyle } from '../constants'
 
-type MuPdf = typeof import('../vendor/mupdf-wasm/mupdf.js')
+type MuPdf = typeof import('@quickwinlabs/mupdf-wasm')
 
 function openPdfFileDialog(owner: MaybePtr<'HWND'>): string | null {
   const fileBuf = WCHAR.alloc(260)
@@ -35,22 +37,9 @@ function openPdfFileDialog(owner: MaybePtr<'HWND'>): string | null {
 }
 
 async function loadMupdf(): Promise<MuPdf | null> {
-  const wasmPath = './vendor/mupdf-wasm/mupdf-wasm.wasm'
-  const fp = std.open(wasmPath, 'rb')
-  if (!fp) { std.printf('Error: cannot open %s\n', wasmPath); return null }
-  fp.seek(0, 2)
-  const size = fp.tell()
-  fp.seek(0, 0)
-  const buf = new ArrayBuffer(size)
-  fp.read(buf, 0, size)
-  fp.close()
-
-  ;(globalThis).$libmupdf_wasm_Module = {
-    wasmBinary: buf,
-    locateFile: (p: string) => p
-  }
   try {
-    return await import('../vendor/mupdf-wasm/mupdf.js')
+    await preloadMupdfWasm()
+    return await import(MUPDF_JS_URL)
   } catch (e) {
     std.printf('Error: mupdf load failed: %s\n', String(e))
     return null
@@ -159,7 +148,7 @@ function App({ mupdf, mainHwnd: hwnd }: { mupdf: MuPdf; mainHwnd: gui.HWND }) {
       setCurrentPage(page)
       setTotalPages(result.totalPages)
     } else {
-      gui.MessageBox('Failed to render PDF page')
+      MessageBox(NULL, 'Failed to render PDF page', 'JS Alert', 0)
     }
   }
 
@@ -219,7 +208,7 @@ function App({ mupdf, mainHwnd: hwnd }: { mupdf: MuPdf; mainHwnd: gui.HWND }) {
 async function main() {
   const mupdf = await loadMupdf()
   if (!mupdf) {
-    gui.MessageBox('Loading mupdf WASM failed.\nEnsure vendor/mupdf-wasm/ is present.')
+    MessageBox(NULL, 'Loading mupdf WASM failed.\nCheck network access to unpkg.com.', 'JS Alert', 0)
     return
   }
 
@@ -232,7 +221,7 @@ async function main() {
 
   if (hwnd) {
     render(<App mupdf={mupdf} mainHwnd={hwnd} />, hwnd)
-    setTimeout(() => gui.ShowWindow(hwnd), 0)
+    setTimeout(() => ShowWindow(hwnd, ShowWindowCmd.SHOWNORMAL), 0)
   }
 }