add selection

Author: evilbinary

lib/libgui/edit.c

@@ -505,9 +505,9 @@ void gl_render_edit_once(edit_t *self, float x, float y, char *text,
   }
 }
 
-void calc_lineno_width(edit_t *self){
+void calc_lineno_width(edit_t *self) {
   int no = calc_number(self->buffer->line_count);
-  self->lineno_width = no * self->font_size/self->scale+ 10;
+  self->lineno_width = no * self->font_size / self->scale + 10;
 }
 
 void gl_render_edit(edit_t *self, float x, float y) {
@@ -549,6 +549,15 @@ void update_cursor_pos(buffer_t *self) {
       measure_text(self->font, self->lines[cur_row]->texts, self->cursor_col);
 }
 
+int gl_edit_get_line_count(edit_t *self) { return self->buffer->line_count; }
+
+int gl_edit_get_row_count(edit_t *self, int row) {
+  if (row < self->buffer->line_count) {
+    return self->buffer->lines[row]->count;
+  }
+  return 0;
+}
+
 void gl_edit_cursor_move_left(buffer_t *self) {
   if (self->cursor_col > 0) {
     self->cursor_col--;
@@ -595,17 +604,24 @@ void gl_edit_cursor_move_down(buffer_t *self) {
 
 void gl_edit_mouse_motion_event(edit_t *self, float x, float y) {
   // printf("gl_edit_mouse_motion_event %f,%f\n", x, y);
-  x -= self->lineno_width/self->scale;
+  x -= self->lineno_width / self->scale;
   if (self->select_press == 1) {
     pos_to_cursor(self->buffer, x - self->scroll_x, y - self->scroll_y);
     self->select_end[0] = self->buffer->cursor_row;
     self->select_end[1] = self->buffer->cursor_col;
   }
 }
+void gl_edit_set_selection(edit_t *self, int start_row, int start_col,
+                           int end_row, int end_col) {
+  self->select_start[0] = start_row;
+  self->select_start[1] = start_col;
+  self->select_end[0] = end_row;
+  self->select_end[1] = end_col;
+}
 
 void gl_edit_mouse_event(edit_t *self, int action, float x, float y) {
   // printf("gl_edit_mouse_event %d %f,%f\n", action, x, y);
-  x -= self->lineno_width/self->scale;
+  x -= self->lineno_width / self->scale;
 
   if (action == 1) {  // press mouse button
     pos_to_cursor(self->buffer, x - self->scroll_x, y - self->scroll_y);
@@ -799,18 +815,13 @@ char *gl_get_selection(edit_t *self) {
         end = tmp;
       }
     }
-    // printf("--------->self->select_start[1]=%d self->select_end[1]=%d
-    // %d,%d\n",
-    //        self->select_start[1], self->select_end[1], start, end);
-    // printf("&self->select_text[pos]=%p
-    // &line->texts[start]=%p\n",&self->select_text[pos], &line->texts[start]);
-
     memcpy(&self->select_text[pos], &line->texts[start], end - start);
     pos += (end - start);
     memcpy(&self->select_text[pos], self->crlf, crlf_len);
     pos += crlf_len;
   }
   self->select_text[pos - 1] = 0;
+  // printf("gl_get_selection %s\n",self->select_text);
   return self->select_text;
 }
 

packages/gui/duck.ss

@@ -584,7 +584,48 @@
 		(lambda (ww name value)
 					(gl-edit-set-lineno-color (widget-get-attrs ww '%edit) value)
 					))	
-		
+	
+	(widget-set-attrs
+		widget
+		"%event-get-selection-hook"
+		(lambda (ww name)
+					(gl-edit-get-selection (widget-get-attrs ww '%edit))
+					))
+
+	(widget-set-attrs
+		widget
+		"%event-get-selection-hook"
+		(lambda (ww name)
+					(gl-edit-get-selection (widget-get-attrs ww '%edit))
+					))
+
+	(widget-set-attrs
+		widget
+		"%event-get-line-count-hook"
+		(lambda (ww name)
+					(gl-edit-get-line-count (widget-get-attrs ww '%edit))
+					))
+	
+	(widget-set-attrs
+		widget
+		"%event-get-last-row-count-hook"
+		(lambda (ww name)
+					(gl-edit-get-row-count (widget-get-attrs ww '%edit) 
+						(- (gl-edit-get-line-count (widget-get-attrs ww '%edit)) 1))
+					))
+
+	(widget-set-attrs
+		widget
+		"%event-selection-hook"
+		(lambda (ww name val)
+					(gl-edit-set-selection (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-syntax-on-hook"

packages/gui/graphic.ss

@@ -54,7 +54,10 @@
      gl-edit-set-font-line-height
      gl-edit-set-show-no
      gl-edit-set-lineno-color
-     
+     gl-edit-get-selection
+     gl-edit-set-selection
+     gl-edit-get-line-count
+     gl-edit-get-row-count
      )
     (import (scheme) (utils libutil) (cffi cffi) (gles gles2) )
 
@@ -78,6 +81,14 @@
     (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-set-selection "gl_edit_set_selection" (void*  int int int int) void)
+
+
+    (def-function gl-edit-get-line-count "gl_edit_get_line_count" (void* ) int)
+    (def-function gl-edit-get-row-count "gl_edit_get_row_count" (void* int) int)
+
+
 
 
     (def-function gl-new-edit "gl_new_edit" (int float float float float) void*)

packages/gui/widget.ss

@@ -498,7 +498,10 @@
 
   (define (widget-get-attrs widget name)
     (let ((h (vector-ref widget %attrs )))
-      (hashtable-ref h name '() )))
+	  (let ((hook (hashtable-ref h (format "%event-get-~a-hook" name) '())))
+		(if (procedure? hook)
+	    	(hook widget name)
+      		(hashtable-ref h name '() )))))
 
   (define (widget-attrs widget)
     (vector-ref widget %attrs))
@@ -507,8 +510,8 @@
     (let ((h (vector-ref widget %attrs )))
       (hashtable-set! h name value)
       (let ((hook (hashtable-ref h (format "%event-~a-hook" name) '())))
-	(if (procedure? hook)
-	    (hook widget name value)))
+		(if (procedure? hook)
+	    	(hook widget name value)))
       ))
 
   (define (widget-get-events widget name)