@@ -25,7 +25,8 @@ import GHCJS.DOM.Window
25import System.Directory
25import System.Directory
26import qualified GI.Gtk.Functions as Gtk (init, main)
26import qualified GI.Gtk.Functions as Gtk (init, main)
27import GI.WebKit2
27import GI.WebKit2
28+ (settingsSetEnableAccelerated2dCanvas, webInspectorShow,
28− (webViewLoadUri, webViewLoadHtml, webViewGetInspector,
29+ webViewLoadUri, webViewLoadHtml, webViewGetInspector,
29 onWebViewLoadChanged, webViewSetSettings,
30 onWebViewLoadChanged, webViewSetSettings,
30 settingsSetEnableDeveloperExtras, settingsSetUserAgent,
31 settingsSetEnableDeveloperExtras, settingsSetUserAgent,
31 settingsGetUserAgent, webViewGetSettings, webViewNew, WebView)
32 settingsGetUserAgent, webViewGetSettings, webViewNew, WebView)
@@ -71,19 +72,22 @@ runWebGUI main = do
71 putStrLn "forking server!"
72 putStrLn "forking server!"
72 _ <- forkIO $ run 3706 $ do
73 _ <- forkIO $ run 3706 $ do
73 ctx <- askJSM
74 ctx <- askJSM
74− liftIO $ forkIO $ forever $ do
75+-- liftIO $ forkIO $ forever $ do
75− threadDelay 1000000
76+-- threadDelay 1000000
76− runJSM syncPoint ctx
77+-- runJSM syncPoint ctx
77−-- liftIO $ threadDelay 20000000
78+ liftIO $ threadDelay 2000000
78−-- idleAdd PRIORITY_DEFAULT $ do
79+ idleAdd PRIORITY_DEFAULT $ do
79− liftIO $ main (webView, ctx)
80+ liftIO $ main (webView, ctx)
80− liftIO $ putStrLn "main exited"
81+ liftIO $ putStrLn "main exited"
81 -- return False
83 -- return False
82 forever $ do
84 forever $ do
83 liftIO $ threadDelay 100000
85 liftIO $ threadDelay 100000
84 settings <- webViewGetSettings webView
87 settings <- webViewGetSettings webView
85 -- TODO settingsSetEnableUniversalAccessFromFileUris settings True
88 -- TODO settingsSetEnableUniversalAccessFromFileUris settings True
86 settingsSetEnableDeveloperExtras settings True
89 settingsSetEnableDeveloperExtras settings True
90+ settingsSetEnableAccelerated2dCanvas settings False
87 webViewSetSettings webView settings
91 webViewSetSettings webView settings
88 window `containerAdd` scrollWin
92 window `containerAdd` scrollWin
89 scrollWin `containerAdd` webView
93 scrollWin `containerAdd` webView
@@ -93,6 +97,7 @@ runWebGUI main = do
93-- -- TODO run jsaddle.js when load is finished
97-- -- TODO run jsaddle.js when load is finished
94-- return ()
98-- return ()
95 inspector <- webViewGetInspector webView
99 inspector <- webViewGetInspector webView
100+ webInspectorShow inspector
96-- _ <- inspector `on` inspectWebView $ \_ -> do
101-- _ <- inspector `on` inspectWebView $ \_ -> do
97-- inspectorWindow <- windowNew
102-- inspectorWindow <- windowNew
98-- windowSetDefaultSize inspectorWindow 900 600
103-- windowSetDefaultSize inspectorWindow 900 600