Changeset cedd33b in mainline

Timestamp:

2009-12-05T17:35:57Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc77bfa

Parents:

f1b37d6

Message:

Cut (Ctrl-X) and select all (Ctrl-A).

Location:

uspace/app

Files:

• bdsh/input.c (modified) (5 diffs)
• edit/edit.c (modified) (3 diffs)

uspace/app/bdsh/input.c

@@ -90 +90 @@
 static void tinput_sel_get_bounds(tinput_t *ti, int *sa, int *sb);
 static bool tinput_sel_active(tinput_t *ti);
+static void tinput_sel_all(tinput_t *ti);
 static void tinput_sel_delete(tinput_t *ti);
 static void tinput_key_ctrl(tinput_t *ti, console_event_t *ev);
@@ -255 +256 @@
         size_t off;
 
-        ilen = min(str_length(str), INPUT_MAX - ti->nc);
+        ilen = min((ssize_t) str_length(str), INPUT_MAX - ti->nc);
         if (ilen == 0)
                 return;
@@ -477 +478 @@
 }
 
+static void tinput_sel_all(tinput_t *ti)
+{
+        ti->sel_start = 0;
+        ti->pos = ti->nc;
+        tinput_display_tail(ti, 0, 0);
+        tinput_position_caret(ti);
+}
+
 static void tinput_sel_delete(tinput_t *ti)
 {
@@ -654 +663 @@
                 tinput_seek_vertical(ti, seek_forward, false);
                 break;
+        case KC_X:
+                tinput_sel_copy_to_cb(ti);
+                tinput_sel_delete(ti);
+                break;
         case KC_C:
                 tinput_sel_copy_to_cb(ti);
@@ -659 +672 @@
         case KC_V:
                 tinput_paste_from_cb(ti);
+                break;
+        case KC_A:
+                tinput_sel_all(ti);
                 break;
         default:

uspace/app/edit/edit.c

@@ -135 +135 @@
 
 static bool selection_active(void);
+static void selection_sel_all(void);
 static void selection_get_points(spt_t *pa, spt_t *pb);
 static void selection_delete(void);
@@ -335 +336 @@
                 pane.rflags |= REDRAW_TEXT;
                 caret_update();
+                break;
+        case KC_X:
+                selection_copy();
+                selection_delete();
+                pane.rflags |= REDRAW_TEXT;
+                caret_update();
+                break;
+        case KC_A:
+                selection_sel_all();
                 break;
         default:
@@ -1004 +1014 @@
 }
 
+static void selection_sel_all(void)
+{
+        spt_t spt, ept;
+
+        pt_get_sof(&spt);
+        pt_get_eof(&ept);
+        sheet_remove_tag(&doc.sh, &pane.sel_start);
+        sheet_place_tag(&doc.sh, &spt, &pane.sel_start);
+        sheet_remove_tag(&doc.sh, &pane.caret_pos);
+        sheet_place_tag(&doc.sh, &ept, &pane.caret_pos);
+
+        pane.rflags |= REDRAW_TEXT;
+}
+
 static void selection_copy(void)
 {