edit in root

Author: evilbinary

packages/gui/duck.ss

@@ -645,6 +645,32 @@
 						(list-ref val 3)
 						 )
 					))
+	(widget-set-attrs
+		widget
+		"%event-get-text-range-hook"
+		(lambda (ww name val)
+					(gl-edit-get-text-range (widget-get-attrs ww '%edit) 
+						(list-ref val 0)
+						(list-ref val 1)
+						(list-ref val 2)
+						(list-ref val 3)
+						 )
+					))
+	(widget-set-attrs
+		widget
+		"%event-get-current-line-text-hook"
+		(lambda (ww name)
+			(let* ( (ed (widget-get-attrs ww '%edit))
+					(current-row (gl-edit-get-selection-row-start ed))
+					(row-count (gl-edit-get-row-count ed current-row))
+					)
+					(gl-edit-get-text-range  ed
+						current-row
+						0
+						current-row
+						row-count
+						 )
+					)))
 
       (widget-set-attrs
        widget
@@ -673,24 +699,23 @@
       (widget-set-draw
        widget
        (lambda (widget parent);;draw
-	 
-	 (let ((gx  (+ (vector-ref parent %gx) (vector-ref widget %x)))
-	       (gy   (+ (vector-ref parent %gy) (vector-ref widget %y)))
-	       (background (widget-get-attrs  widget 'background ))
-		   (border (widget-get-attrs widget 'border))
-	       (ww  (vector-ref  widget %w))
-	       (hh  (vector-ref  widget %h))
-	       )
-					(vector-set! widget %gx gx)
-					(vector-set! widget %gy gy)
+		(let ((gx  (widget-in-parent-gx widget parent))
+			(gy   (widget-in-parent-gy widget parent) )
+			(background (widget-get-attrs  widget 'background ))
+			(border (widget-get-attrs widget 'border))
+			(ww  (vector-ref  widget %w))
+			(hh  (vector-ref  widget %h))
+			)
+						(vector-set! widget %gx gx)
+						(vector-set! widget %gy gy)
 
-					(if (equal? '() background)
-							'()
-							(draw-panel gx gy ww hh '() background))
-					(if (number? border)
-						(draw-border gx gy ww hh border))
-					(graphic-draw-edit ed gx gy)
-					)))
+						(if (equal? '() background)
+								'()
+								(draw-panel gx gy ww hh '() background))
+						(if (number? border)
+							(draw-border gx gy ww hh border))
+						(graphic-draw-edit ed gx gy)
+						)))
 
       (widget-set-event
        widget

packages/gui/graphic.ss

@@ -61,6 +61,11 @@
      gl-edit-get-cursor-y
      gl-edit-measure-text
      gl-edit-get-font
+     gl-edit-get-text-range
+     gl-edit-get-selection-row-start
+     gl-edit-get-selection-row-end
+     gl-edit-get-selection-col-start
+     gl-edit-get-selection-col-end
      )
     (import (scheme) (utils libutil) (cffi cffi) (gles gles2) )
 
@@ -84,8 +89,13 @@
     (def-function gl-edit-set-editable "gl_edit_set_editable" (void*  int) void)
     (def-function gl-edit-set-show-no "gl_edit_set_show_no" (void*  int) void)
     (def-function gl-edit-set-lineno-color "gl_edit_set_lineno_color" (void*  int) void)
-    (def-function gl-edit-get-selection "gl_get_selection" (void* ) string)
+    (def-function gl-edit-get-selection "gl_edit_get_selection" (void* ) string)
     (def-function gl-edit-set-selection "gl_edit_set_selection" (void*  int int int int) void)
+    (def-function gl-edit-get-text-range "gl_edit_get_text_range" (void*  int int int int) string)
+    (def-function gl-edit-get-selection-row-start "gl_edit_get_select_row_start" (void*) int)
+    (def-function gl-edit-get-selection-row-end "gl_edit_get_select_row_end" (void*) int)
+    (def-function gl-edit-get-selection-col-start "gl_edit_get_select_col_start" (void*) int)
+    (def-function gl-edit-get-selection-col-end "gl_edit_get_select_col_end" (void*) int)
 
 
     (def-function gl-edit-get-line-count "gl_edit_get_line_count" (void* ) int)

packages/gui/video.ss

@@ -10,6 +10,7 @@
    video-get-fps
    video-set-pause
    video-get-duration
+   video-set-soft-conver
    video-get-current-duration
    )
 
@@ -23,8 +24,10 @@
   (def-function video-set-pause "video_set_pause" (void* int) void)
   (def-function video-get-duration "video_get_duration" (void*) double)
   (def-function video-get-current-duration "video_get_current_duration" (void*) double)
+  (def-function video-set-soft-conver "video_set_soft_conver" (void* int) void)
 
 
+  
 
 
   )

packages/gui/widget.ss

@@ -54,8 +54,9 @@
    widget-child-focus-event
    widget-get-global-center-xy
    widget-print
-   is-in-widget-top
-   is-in-child-widget
+   widget-in-parent-gx
+   widget-in-parent-gy
+  
    widget-child-rect-event-mouse-button
    widget-child-rect-event-mouse-motion
    widget-child-rect-key-event
@@ -65,6 +66,8 @@
    widget-rect-fun
    in-rect
    is-in
+   is-in-widget-top
+   is-in-child-widget
    widget-set-child-attr
    widget-set-child-attrs
    widget-child-rect-event-scroll
@@ -269,7 +272,8 @@
     (case-lambda
      [(p)
       (set! $widgets (append! $widgets (list p)))
-	  ((vector-ref p %layout) p)
+	  (if (procedure? (vector-ref p %layout))
+	  	((vector-ref p %layout) p))
       p]
      [(p w)
       (vector-set! w %parent p)
@@ -389,6 +393,17 @@
 		(+ (widget-get-attr widget %gy) (/ (widget-get-attr widget %h) 2) )
 	 ))
 
+  (define (widget-in-parent-gx widget parent)
+	(if (null? parent)
+		(vector-ref widget %x)
+		(+ (vector-ref parent %gx) (vector-ref widget %x))))
+
+  (define (widget-in-parent-gy widget parent)
+	(if (null? parent)
+		(vector-ref widget %y)
+		(+ (vector-ref parent %gy) (vector-ref widget %y))))
+
+
   (define (far gx gy a b)
 	(+ (* (- gx a) (- gx a))  (* (- gy b) (- gy b)))
    )
@@ -628,7 +643,7 @@
 		(let ((h (vector-ref widget %attrs )))
 		(let ((hook (hashtable-ref h (format "%event-get-~a-hook" name) '())))
 			(if (procedure? hook)
-				(hook widget name)
+				(hook widget name default)
 				(hashtable-ref h name default))))]	
   ))
 
@@ -661,23 +676,23 @@
 	  )
       (set! nw (vector x y
 		       w h
-		       default-layout ;;layout
-		       (lambda (widget parent);;draw
-			 (let ((x  (vector-ref  widget %x))
-			       (y  (vector-ref widget %y))
-			       (w  (vector-ref  widget %w))
-			       (h  (vector-ref  widget %h))
-			       (draw (vector-ref widget %draw)))
-			   ;;(draw-widget-rect widget)
-			   (vector-set! widget %gx x)
-			   (vector-set! widget %gy y)
-
-			   ;;(graphic-sissor-begin x y w h)
-			   ;;(draw-dialog x y w h text)
-			   ;;(draw-text x y  (format "status =>~a" (vector-ref widget %status)))
-			   ;;(widget-draw-child widget)
-			   ;;(graphic-sissor-end)
-			   ))
+		       default-layout ;;layout 4
+		       (lambda (widget parent);;draw 5
+				(let ((x  (vector-ref  widget %x))
+					(y  (vector-ref widget %y))
+					(w  (vector-ref  widget %w))
+					(h  (vector-ref  widget %h))
+					(draw (vector-ref widget %draw)))
+				;;(draw-widget-rect widget)
+				(vector-set! widget %gx x)
+				(vector-set! widget %gy y)
+
+				;;(graphic-sissor-begin x y w h)
+				;;(draw-dialog x y w h text)
+				;;(draw-text x y  (format "status =>~a" (vector-ref widget %status)))
+				;;(widget-draw-child widget)
+				;;(graphic-sissor-end)
+				))
 		       (lambda (widget parent type data);;event
 			 (if (= type %event-mouse-button)
 			     (let ((xx (vector-ref widget %x))
@@ -771,7 +786,7 @@
 			       ))
 			 )
 		       (list )
-		       0   ;;status
+		       0   ;;status 8
 		       0.0 ;;top
 		       0.0 ;;bottom
 		       0.0 ;;left
@@ -785,11 +800,11 @@
 		       '() ;;parent
 		       0.0 ;;gx
 		       0.0 ;;gy
-		       text  ;;text
+		       text  ;;text 20
 		       '()  ;;
 		       (make-hashtable equal-hash equal?)  ;;attrs
 		       (make-hashtable equal-hash equal?)  ;events
-		       #t ;;visible
+		       #t ;;visible 24
 		       '()
 		       '()
 		       '()
@@ -1178,13 +1193,14 @@
   (define (widget-render)
     (let loop ((w $widgets))
       (if (pair? w)
-	  (begin
-	    ;;(printf "~a ~a\n" (widget-get-attr (car w) %text) (widget-get-attr (car w) %visible))
-	    (if (widget-get-attr (car w) %visible)
-		(let ((draw (vector-ref (car w) %draw)))
-		  (draw (car w) '() )))
-	    (loop (cdr w))
-	    )))
+		(begin
+			;;(printf "~a ~a\n" (widget-get-attr (car w) %text) (widget-get-attr (car w) %visible))
+			(if (widget-get-attr (car w) %visible)
+				(let ((draw (vector-ref (car w) %draw)))
+						(draw (car w) '() )
+						))
+	    (loop (cdr w)))
+	    ))
     ;;(graphic-draw-solid-quad cursor-x cursor-y (+ cursor-x 10.0) (+ cursor-y 10.0) 255.0 0.0 0.0 0.5)
     ;;(if (> cursor-arrow 0)
     ;;   (draw-image cursor-x cursor-y 22.0 24.0 cursor-arrow))