From fe4d6777328683193819eb4efee51c502cf00c7f Mon Sep 17 00:00:00 2001 From: Diederik van Arkel Date: Tue, 12 Feb 2002 16:16:43 +0000 Subject: [PATCH] Small editor efficiency improvements --- Ed/EdAction.icl | 7 +++++-- Ed/EdVisualText.icl | 4 ++-- Ide/EdCommon.icl | 28 +++++----------------------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/Ed/EdAction.icl b/Ed/EdAction.icl index b16a62d..de4997f 100644 --- a/Ed/EdAction.icl +++ b/Ed/EdAction.icl @@ -38,7 +38,8 @@ applyAction selectionRemoved action = THEN ( positionAfterMove move selection.start >>>= \newPos -> vChangeSelectionTo {start=newPos,end=newPos} >>> - mChangeSelectionTo {start=newPos,end=newPos} >>> +// DvA: can skip this as we know we are going from no selection to no selection... +// mChangeSelectionTo {start=newPos,end=newPos} >>> IF (move == PageUp || move == PageDown) THEN (vMoveCursor move) @@ -56,7 +57,9 @@ applyAction selectionRemoved action = ) ) >>>= \newPos -> vChangeSelectionTo {start=newPos,end=newPos} >>> - mChangeSelectionTo {start=newPos,end=newPos} >>> +// DvA: we know we are going from selection to no selection so... +// mChangeSelectionTo {start=newPos,end=newPos} >>> + mRemoveSelection >>> vScrollToCursor ) diff --git a/Ed/EdVisualText.icl b/Ed/EdVisualText.icl index 35f9211..53de9ec 100644 --- a/Ed/EdVisualText.icl +++ b/Ed/EdVisualText.icl @@ -94,7 +94,7 @@ where | isNothing maybeOldViewDomain = abort "vResetViewDomain (EdVisualText.icl): unknown window id" #! oldViewDomain = fromJust maybeOldViewDomain - #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState +// #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState #! (viewDomain,(editState,pState)) = computeViewDomain (editState,pState) | viewDomain == oldViewDomain #! pState = appPIO (updateWindow windowId Nothing) pState @@ -117,7 +117,7 @@ where | isNothing maybeOldViewDomain = abort "vResetViewDomain (EdVisualText.icl): unknown window id" #! oldViewDomain = fromJust maybeOldViewDomain - #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState +// #! (oldViewFrame,pState) = accPIO (getWindowViewFrame windowId) pState #! (viewDomain,(editState,pState)) = computeViewDomain (editState,pState) | viewDomain == oldViewDomain #! pState = appPIO (updateWindow windowId Nothing) pState diff --git a/Ide/EdCommon.icl b/Ide/EdCommon.icl index bd451a8..b559691 100644 --- a/Ide/EdCommon.icl +++ b/Ide/EdCommon.icl @@ -45,30 +45,12 @@ where mRemoveSelection :: EditMonad (PSt General) nothing mRemoveSelection = - getMenuSelection >>>= \mselold -> accEnv (getMenuIds) >>>= \mIds -> - let - mselnew = Nothing - fragaction - | changed mselold mselnew = (handlefrag mselnew mIds >>> setMenuSelection mselnew) - = skip - in - fragaction -where - changed Nothing Nothing = False - changed (Just strl) (Just strr) = strl <> strr - changed _ _ = True - - handlefrag (Just str) mIds - = appEnv (appPIO (setMenuElementTitles - [(mIds.mn_odm,"Open "+++(MakeDefPathname str)) - ,(mIds.mn_oim,"Open "+++(MakeImpPathname str)) - ])) - handlefrag _ mIds = - appEnv (appPIO (setMenuElementTitles - [(mIds.mn_odm,"Open Definition...") - ,(mIds.mn_oim,"Open Implementation...") - ])) + appEnv (appPIO (setMenuElementTitles + [(mIds.mn_odm,"Open Definition...") + ,(mIds.mn_oim,"Open Implementation...") + ])) >>> + setMenuSelection Nothing // control click -- GitLab