From 7e4d704f0777abe619edb63fb8f8e1e55ea205c0 Mon Sep 17 00:00:00 2001 From: slava Date: Fri, 26 May 2006 06:58:11 +0000 Subject: [PATCH] Remove redundant code, cleanups --- TODO.FACTOR.txt | 8 +++----- library/ui/browser.factor | 13 ++----------- library/x11/windows.factor | 3 +-- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index ae8f96c493..f19c48a9b8 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -46,9 +46,7 @@ + ui/help: - clearing pane with ^L leaves scrollbar a pixel off - - clicking objects sends them to the listener - - right click sends to listener & pushes on the stack -- reuse windows where possible +- right click sends to listener & pushes on the stack - new browser: - browse generic words and classes - need actions for reloading the source file and opening word in jEdit @@ -57,7 +55,6 @@ - make-frame should compile - track: don't allow negative dimensions - fix top level window positioning -- changing window titles - clicks sent twice - speed up ideas: - only do clipping for certain gadgets @@ -70,7 +67,7 @@ - window zooming doesn't work - polish OS X menu bar code - dock menu - - services do not launch if not running + - services do not launch if factor not running - when scrolling wheel, or moving mouse out of window, rollover is not updated - focus is not top-level window aware @@ -81,6 +78,7 @@ + compiler/ffi: +- amd64 crash - get factor running on mac intel - free up r11, r12 as a vreg on ppc - float= on powerpc doesn't consider nans equal diff --git a/library/ui/browser.factor b/library/ui/browser.factor index 72e0f4de67..6eca8d03c2 100644 --- a/library/ui/browser.factor +++ b/library/ui/browser.factor @@ -32,7 +32,7 @@ C: browser-track ( builder closer -- gadget ) [ dup browser-track-closer call ] 2keep [ browser-track-showing remove-hash* ] keep track-remove ; -TUPLE: browser vocabs vocab-track word-track ; +TUPLE: browser vocab-track word-track ; : find-browser [ browser? ] find-parent ; @@ -111,15 +111,6 @@ DEFER: show-vocab vocabs [ ] map make-pile "Vocabularies" f ; -: add-vocabs ( vocabs browser -- ) - [ set-browser-vocabs ] 2keep track-add ; - -: add-vocab-track ( track browser -- ) - [ set-browser-vocab-track ] 2keep track-add ; - -: add-word-track ( track browser -- ) - [ set-browser-word-track ] 2keep track-add ; - : ( -- track ) [ ] [ find-browser hide-vocab-words ] ; @@ -129,7 +120,7 @@ DEFER: show-vocab C: browser ( -- browser ) { - { [ ] set-browser-vocabs 1/5 } + { [ ] f 1/5 } { [ ] set-browser-vocab-track 1/5 } { [ ] set-browser-word-track 3/5 } } { 1 0 0 } make-track* ; diff --git a/library/x11/windows.factor b/library/x11/windows.factor index b62c36b23b..5ab3e5cbed 100644 --- a/library/x11/windows.factor +++ b/library/x11/windows.factor @@ -49,8 +49,7 @@ USING: alien hashtables kernel math namespaces sequences ; : map-window ( win -- ) dpy get swap XMapWindow drop ; -: map-window* ( world win -- ) - dup set-closable map-window ; +: map-window* ( world win -- ) dup set-closable map-window ; : glx-window* ( world dim -- win context ) glx-window >r [ windows get set-hash ] keep r> ;