steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-11-30 15:53:05 -06:00
parent 6f5de8f673 8b106b6a77
commit 9217dd6c5b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
basis/ui/gadgets/editors/editors.factor Normal file → Executable file
View File

@ -1,6 +1,6 @@
! Copyright (C) 2006, 2008 Slava Pestov ! Copyright (C) 2006, 2008 Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays documents io kernel math models USING: accessors arrays documents kernel math models
namespaces locals fry make opengl opengl.gl sequences strings namespaces locals fry make opengl opengl.gl sequences strings
io.styles math.vectors sorting colors combinators assocs io.styles math.vectors sorting colors combinators assocs
math.order fry calendar alarms ui.clipboards ui.commands math.order fry calendar alarms ui.clipboards ui.commands
@ -218,7 +218,7 @@ M: editor ungraft*
] with-editor-translation ; ] with-editor-translation ;
: selection-start/end ( editor -- start end ) : selection-start/end ( editor -- start end )
dup editor-mark* swap editor-caret* sort-pair ; [ editor-mark* ] [ editor-caret* ] bi sort-pair ;
: (draw-selection) ( x1 x2 -- ) : (draw-selection) ( x1 x2 -- )
over - over -
@ -227,9 +227,8 @@ M: editor ungraft*
swap [ gl-fill-rect ] with-translation ; swap [ gl-fill-rect ] with-translation ;
: draw-selected-line ( start end n -- ) : draw-selected-line ( start end n -- )
[ start/end-on-line ] keep tuck [ start/end-on-line ] keep
[ editor get offset>x ] 2dip tuck [ editor get offset>x ] 2bi@
editor get offset>x
(draw-selection) ; (draw-selection) ;
: draw-selection ( -- ) : draw-selection ( -- )
@ -237,9 +236,9 @@ M: editor ungraft*
editor get selection-start/end editor get selection-start/end
over first [ over first [
2dup [ 2dup [
[ 2dup ] dip draw-selected-line draw-selected-line
1 translate-lines 1 translate-lines
] each-line 2drop ] with with each-line
] with-editor-translation ; ] with-editor-translation ;
M: editor draw-gadget* M: editor draw-gadget*

2
basis/ui/windows/windows.factor
View File

@ -284,7 +284,7 @@ SYMBOL: nc-buttons
message>button nc-buttons get message>button nc-buttons get
swap [ push ] [ delete ] if ; swap [ push ] [ delete ] if ;
: >lo-hi ( WORD -- array ) [ lo-word ] keep hi-word 2array ; : >lo-hi ( WORD -- array ) [ lo-word ] [ hi-word ] bi 2array ;
: mouse-wheel ( wParam -- array ) >lo-hi [ sgn neg ] map ; : mouse-wheel ( wParam -- array ) >lo-hi [ sgn neg ] map ;
: mouse-absolute>relative ( lparam handle -- array ) : mouse-absolute>relative ( lparam handle -- array )