From dedf4f4c21633b13deb36024af8bbd804b24f037 Mon Sep 17 00:00:00 2001 From: malc Date: Sun, 4 Mar 2012 18:22:31 +0400 Subject: [PATCH] Refactor --- main.ml | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/main.ml b/main.ml index 2e314ec..7c97e4d 100644 --- a/main.ml +++ b/main.ml @@ -5271,38 +5271,11 @@ let viewmouse button down x y mask = | 1 -> let dest = if down then getunder x y else Unone in begin match dest with - | Ulinkgoto (pageno, top) -> - if pageno >= 0 - then ( - addnav (); - gotopage1 pageno top; - ) - - | Ulinkuri s -> - gotouri s - - | Uremote (filename, pageno) -> - let path = - if Sys.file_exists filename - then filename - else - let dir = Filename.dirname state.path in - let path = Filename.concat dir filename in - if Sys.file_exists path - then path - else "" - in - if String.length path > 0 - then ( - let anchor = getanchor () in - let ranchor = state.path, state.password, anchor in - state.anchor <- (pageno, 0.0); - state.ranchors <- ranchor :: state.ranchors; - opendoc path ""; - ) - else showtext '!' ("Could not find " ^ filename) - - | Uunexpected _ | Ulaunch _ | Unamed _ -> () + | Ulinkgoto _ + | Ulinkuri _ + | Uremote _ + | Uunexpected _ | Ulaunch _ | Unamed _ -> + gotounder dest | Unone when down -> Wsi.setcursor Wsi.CURSOR_CROSSHAIR; -- 2.11.4.GIT