diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-06-27 13:59:25 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-06-27 13:59:25 +0000 |
commit | ca96353d9fac049057535ed7fdff19e43ac79666 (patch) | |
tree | 39237c6894679fc7434de9a490458c4d51227270 /riscos/treeview.c | |
parent | fa99a7a3ce6aea22368c75d38866e4a95ab8fd84 (diff) | |
download | netsurf-ca96353d9fac049057535ed7fdff19e43ac79666.tar.gz netsurf-ca96353d9fac049057535ed7fdff19e43ac79666.tar.bz2 |
Merged revisions 7764-7977,7979-8058 via svnmerge from
svn://svn.netsurf-browser.org/branches/paulblokus/textinput
........
r7769 | paulblokus | 2009-06-11 22:26:16 +0100 (Thu, 11 Jun 2009) | 4 lines
replace global history window with an empty window for future tests
add the necessary files
first lines ported
........
r7771 | paulblokus | 2009-06-11 23:51:46 +0100 (Thu, 11 Jun 2009) | 1 line
more functions
........
r7772 | paulblokus | 2009-06-12 02:07:36 +0100 (Fri, 12 Jun 2009) | 1 line
redraw working
........
r7777 | paulblokus | 2009-06-12 11:35:45 +0100 (Fri, 12 Jun 2009) | 3 lines
plotter fix
make use of the provided clipping rectangle
........
r7781 | paulblokus | 2009-06-12 16:26:51 +0100 (Fri, 12 Jun 2009) | 3 lines
callbacks for taxtarea to request a [caret]redraw
basic caret handling drawing
........
r7782 | paulblokus | 2009-06-12 22:36:50 +0100 (Fri, 12 Jun 2009) | 1 line
single character insertion
........
r7783 | paulblokus | 2009-06-12 22:41:37 +0100 (Fri, 12 Jun 2009) | 1 line
single character insertion
........
r7784 | paulblokus | 2009-06-12 23:55:40 +0100 (Fri, 12 Jun 2009) | 3 lines
fixed caret clipping
arrows, delete and backspace
........
r7812 | paulblokus | 2009-06-16 14:55:41 +0100 (Tue, 16 Jun 2009) | 1 line
remove bug causing NS hang on \n in textarea
........
r7816 | paulblokus | 2009-06-16 16:29:48 +0100 (Tue, 16 Jun 2009) | 1 line
Enter, Home, End keys
........
r7817 | paulblokus | 2009-06-16 16:56:16 +0100 (Tue, 16 Jun 2009) | 1 line
Ctrl + Home/End
........
r7818 | paulblokus | 2009-06-16 17:16:51 +0100 (Tue, 16 Jun 2009) | 1 line
redraw caret only on caret moves
........
r7821 | paulblokus | 2009-06-16 20:18:30 +0100 (Tue, 16 Jun 2009) | 1 line
line end/start delete
........
r7822 | paulblokus | 2009-06-16 23:43:42 +0100 (Tue, 16 Jun 2009) | 1 line
selection drawing + select all
........
r7823 | paulblokus | 2009-06-17 02:31:07 +0100 (Wed, 17 Jun 2009) | 3 lines
auto scrolling on caret moves
clear selection
........
r7845 | paulblokus | 2009-06-18 17:35:03 +0100 (Thu, 18 Jun 2009) | 1 line
page up/down
........
r7846 | paulblokus | 2009-06-18 17:38:45 +0100 (Thu, 18 Jun 2009) | 1 line
remove unnecessary fix
........
r7847 | paulblokus | 2009-06-18 18:00:16 +0100 (Thu, 18 Jun 2009) | 1 line
clipping fixes
........
r7849 | paulblokus | 2009-06-18 18:21:02 +0100 (Thu, 18 Jun 2009) | 1 line
scroll fix
........
r7850 | paulblokus | 2009-06-18 18:45:13 +0100 (Thu, 18 Jun 2009) | 1 line
simplified redraw request logic
........
r7855 | paulblokus | 2009-06-18 19:56:24 +0100 (Thu, 18 Jun 2009) | 1 line
front end passing mouse events
........
r7858 | paulblokus | 2009-06-18 22:18:39 +0100 (Thu, 18 Jun 2009) | 3 lines
drag selection
bug fixes
........
r7860 | paulblokus | 2009-06-18 23:32:39 +0100 (Thu, 18 Jun 2009) | 3 lines
take selection into account on keypress of different types
a few bugs fixed
........
r7876 | paulblokus | 2009-06-19 13:43:07 +0100 (Fri, 19 Jun 2009) | 3 lines
pango nsfont_split fix
a few textarea fixes
........
r7879 | paulblokus | 2009-06-19 17:33:10 +0100 (Fri, 19 Jun 2009) | 4 lines
newline handling seems to work this way
clear selection on mouse click
more bug fixes
........
r7880 | paulblokus | 2009-06-19 18:16:27 +0100 (Fri, 19 Jun 2009) | 3 lines
no caret option
selection follows drag
........
r7883 | paulblokus | 2009-06-19 19:08:44 +0100 (Fri, 19 Jun 2009) | 3 lines
o width selection bug fix
caret at correct side of drag selection
........
r7918 | paulblokus | 2009-06-22 21:01:28 +0100 (Mon, 22 Jun 2009) | 3 lines
fix caret positioning at line end
CR removal in input methods
........
r7919 | paulblokus | 2009-06-22 21:34:39 +0100 (Mon, 22 Jun 2009) | 1 line
fix crash on 0 length text
........
r7926 | paulblokus | 2009-06-23 09:53:56 +0100 (Tue, 23 Jun 2009) | 3 lines
change LF into spaces for single line widget
text normalisation at one place
........
r7931 | paulblokus | 2009-06-23 10:51:25 +0100 (Tue, 23 Jun 2009) | 1 line
cleanup
........
r7933 | paulblokus | 2009-06-23 11:17:22 +0100 (Tue, 23 Jun 2009) | 1 line
fix selection draw
........
r7935 | paulblokus | 2009-06-23 11:41:30 +0100 (Tue, 23 Jun 2009) | 1 line
guard readonly
........
r7942 | paulblokus | 2009-06-24 08:19:39 +0100 (Wed, 24 Jun 2009) | 1 line
applied changes suggested by jmb
........
r7943 | paulblokus | 2009-06-24 09:04:49 +0100 (Wed, 24 Jun 2009) | 1 line
little fixes
........
r7945 | paulblokus | 2009-06-24 12:50:14 +0100 (Wed, 24 Jun 2009) | 1 line
correct line length and wrapping
........
r7947 | paulblokus | 2009-06-24 14:32:36 +0100 (Wed, 24 Jun 2009) | 3 lines
fixed page up/down broken in last commit
changed logic for caret positioning on soft breaks
........
r7949 | paulblokus | 2009-06-24 16:31:42 +0100 (Wed, 24 Jun 2009) | 1 line
remove temporary/test code
........
r7975 | paulblokus | 2009-06-25 16:00:46 +0100 (Thu, 25 Jun 2009) | 1 line
changes suggested by jmb
........
r7976 | paulblokus | 2009-06-25 16:33:23 +0100 (Thu, 25 Jun 2009) | 1 line
added ro_ prefix to RISC OS textarea code
........
svn path=/trunk/netsurf/; revision=8060
Diffstat (limited to 'riscos/treeview.c')
-rw-r--r-- | riscos/treeview.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/riscos/treeview.c b/riscos/treeview.c index 5f826e865..ef23c5e3e 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -1080,7 +1080,7 @@ void ro_gui_tree_start_edit(struct tree *tree, struct node_element *element, LOG(("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess)); - tree->textarea_handle = textarea_create((wimp_w)tree->handle, + tree->textarea_handle = ro_textarea_create((wimp_w)tree->handle, (wimp_i)tree->edit_handle, 0, ro_gui_desktop_font_family, ro_gui_desktop_font_size, ro_gui_desktop_font_style); @@ -1088,12 +1088,13 @@ void ro_gui_tree_start_edit(struct tree *tree, struct node_element *element, ro_gui_tree_stop_edit(tree); return; } - textarea_set_text(tree->textarea_handle, element->text); + ro_textarea_set_text(tree->textarea_handle, element->text); if (pointer) - textarea_set_caret_xy(tree->textarea_handle, + ro_textarea_set_caret_xy(tree->textarea_handle, pointer->pos.x, pointer->pos.y); else - textarea_set_caret(tree->textarea_handle, strlen(element->text)); + ro_textarea_set_caret(tree->textarea_handle, + strlen(element->text)); tree_handle_node_element_changed(tree, element); ro_gui_tree_scroll_visible(tree, element); @@ -1114,7 +1115,7 @@ void ro_gui_tree_stop_edit(struct tree *tree) if (!tree->editing) return; if (tree->textarea_handle) { - textarea_destroy(tree->textarea_handle); + ro_textarea_destroy(tree->textarea_handle); tree->textarea_handle = 0; } error = xwimp_delete_icon((wimp_w)tree->handle, (wimp_i)tree->edit_handle); @@ -1308,7 +1309,8 @@ bool ro_gui_tree_keypress(wimp_key *key) return true; case wimp_KEY_RETURN: if ((tree->editing) && (tree->textarea_handle)) { - strlen = textarea_get_text(tree->textarea_handle, + strlen = ro_textarea_get_text( + tree->textarea_handle, NULL, 0); if (strlen == -1) { ro_gui_tree_stop_edit(tree); @@ -1321,7 +1323,7 @@ bool ro_gui_tree_keypress(wimp_key *key) warn_user("NoMemory", 0); return true; } - textarea_get_text(tree->textarea_handle, + ro_textarea_get_text(tree->textarea_handle, new_string, strlen); free((void *)tree->editing->text); tree->editing->text = new_string; |