namespace Msp {
namespace GLtk {
-Entry::Entry(const string &t):
- text(),
- multiline(false),
- edit_width(10),
- edit_height(1),
- edit_pos(0),
- first_row(0),
- visible_rows(1),
- text_part(0),
- slider(0),
- got_key_press(false),
- cursor_blink(true),
- selection_active(false),
- selection_pos(0)
+Entry::Entry(const string &t)
{
input_type = INPUT_TEXT;
set_text(t);
set_edit_position(text.size());
}
-void Entry::insert(unsigned pos, const string &t)
+void Entry::insert(size_t pos, const string &t)
{
if(t.empty())
return;
mark_rebuild();
}
-void Entry::erase(unsigned pos, unsigned len)
+void Entry::erase(size_t pos, size_t len)
{
if(!len)
return;
mark_rebuild();
}
-bool Entry::get_selection(unsigned &start, unsigned &end) const
+bool Entry::get_selection(size_t &start, size_t &end) const
{
if(!selection_active)
return false;
return true;
}
-void Entry::translate_position(unsigned pos, unsigned &row, unsigned &col) const
+void Entry::translate_position(size_t pos, size_t &row, size_t &col) const
{
text.offset_to_coords(pos, row, col);
}
-unsigned Entry::translate_position(unsigned row, unsigned col) const
+size_t Entry::translate_position(size_t row, size_t col) const
{
return text.coords_to_offset(row, col);
}
{
if(!slider)
{
- slider = new VSlider;
- add(*slider);
+ unique_ptr<VSlider> s = make_unique<VSlider>();
+ slider = s.get();
+ add(move(s));
slider->set_step(1);
slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
mark_rebuild();
if(!text_part || !graphic || !graphic->get_texture())
return;
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
if(row<first_row || row>=first_row+visible_rows)
Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
- bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+ bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
}
else if(part.get_name()=="selection")
if(!text_part || !graphic || !graphic->get_texture())
return;
- unsigned start, end;
+ size_t start, end;
get_selection(start, end);
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(start, row, col);
- unsigned end_row, end_col;
+ size_t end_row, end_col;
text.offset_to_coords(end, end_row, end_col);
if(end_row<first_row || row>=first_row+visible_rows)
while(row<=end_row)
{
- unsigned ec = (row==end_row ? end_col : text.get_line_length(row));
+ size_t ec = (row==end_row ? end_col : text.get_line_length(row));
if(ec>col)
{
Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
Geometry egeom = text.coords_to_geometry(*text_part, geom, first_row, row, ec);
GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
- bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+ bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
graphic->build(egeom.x-rgeom.x, part.get_geometry().h, bld);
}
erase_selection(true);
else if(edit_pos>0)
{
- unsigned start_pos = text.move_offset(edit_pos, -1);
+ size_t start_pos = text.move_offset(edit_pos, -1);
erase(start_pos, edit_pos-start_pos);
}
}
erase_selection(true);
else
{
- unsigned end_pos = text.move_offset(edit_pos, 1);
+ size_t end_pos = text.move_offset(edit_pos, 1);
erase(edit_pos, end_pos-edit_pos);
}
}
insert(edit_pos, "\n");
else if(key==Input::KEY_END)
{
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
set_edit_position(text.coords_to_offset(row, text.get_line_length(row)), mod==MOD_SHIFT);
}
else if(key==Input::KEY_HOME)
{
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
set_edit_position(text.coords_to_offset(row, 0), mod==MOD_SHIFT);
}
else if(key==Input::KEY_PGUP)
{
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
set_edit_position(text.coords_to_offset((row<visible_rows ? 0 : row-visible_rows), col), mod==MOD_SHIFT);
}
else if(key==Input::KEY_PGDN)
{
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
set_edit_position(text.coords_to_offset(row+visible_rows, col), mod==MOD_SHIFT);
}
{
if(nav==NAV_LEFT || nav==NAV_RIGHT || ((nav==NAV_DOWN || nav==NAV_UP) && multiline))
move_edit_position(nav, false);
- else if(nav==NAV_ACCEPT && !signal_enter.empty())
- signal_enter.emit();
else
return false;
if(!style)
{
- text_part = 0;
+ text_part = nullptr;
return;
}
- text_part = style->get_part("text");
+ text_part = style->find_part("text");
if(multiline)
check_view_range();
set_edit_position(text.move_offset(edit_pos, 1), select);
else if(nav==NAV_DOWN)
{
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
set_edit_position(text.coords_to_offset(row+1, col), select);
}
else if(nav==NAV_UP)
{
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
set_edit_position((row>0 ? text.coords_to_offset(row-1, col) : 0), select);
}
throw invalid_argument("Entry::move_edit_position");
}
-void Entry::adjust_edit_position_for_change(unsigned pos, int change)
+void Entry::adjust_edit_position_for_change(size_t pos, ptrdiff_t change)
{
- unsigned old_edit_pos = edit_pos;
- unsigned old_select_pos = selection_pos;
+ size_t old_edit_pos = edit_pos;
+ size_t old_select_pos = selection_pos;
if(change>0)
{
else if(change<0)
{
if(edit_pos>=pos)
- edit_pos -= min<unsigned>(edit_pos-pos, -change);
+ edit_pos -= min<size_t>(edit_pos-pos, -change);
if(selection_active && selection_pos>=pos)
- selection_pos -= min<unsigned>(selection_pos-pos, -change);
+ selection_pos -= min<size_t>(selection_pos-pos, -change);
}
if(edit_pos!=old_edit_pos)
signal_edit_position_changed.emit(edit_pos);
if(selection_active && (edit_pos!=old_edit_pos || selection_pos!=old_select_pos))
{
- unsigned start, end;
+ size_t start, end;
if(get_selection(start, end))
signal_selection_changed.emit(start, end);
}
}
-void Entry::set_edit_position(unsigned ep, bool select)
+void Entry::set_edit_position(size_t ep, bool select)
{
bool selection_was_active = selection_active;
if(select && !selection_active)
selection_pos = edit_pos;
selection_active = select;
- unsigned old_edit_pos = edit_pos;
+ size_t old_edit_pos = edit_pos;
edit_pos = min(ep, text.size());
if(edit_pos!=old_edit_pos)
{
signal_edit_position_changed.emit(edit_pos);
- unsigned start, end;
+ size_t start, end;
if(get_selection(start, end))
signal_selection_changed.emit(start, end);
else if(selection_was_active)
void Entry::erase_selection(bool emit_change)
{
- unsigned start, end;
+ size_t start, end;
if(!get_selection(start, end))
return;
void Entry::check_cursor_blink()
{
- const Part *cursor_part = style->get_part("cursor");
+ const Part *cursor_part = style->find_part("cursor");
bool has_blink = (cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS));
cursor_blink = (state&FOCUS);
if(!multiline || !text_part)
return;
- visible_rows = text.get_visible_lines(*text_part, geom, 0);
+ visible_rows = text.get_visible_lines(*text_part, geom, nullptr);
- unsigned row, col;
+ size_t row, col;
text.offset_to_coords(edit_pos, row, col);
- unsigned old_first_row = first_row;
+ size_t old_first_row = first_row;
if(first_row>row)
first_row = row;
else if(row>=first_row+visible_rows)
first_row = row+1-visible_rows;
- unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
+ size_t scroll = max<size_t>(text.get_n_lines(), visible_rows)-visible_rows;
if(first_row>scroll)
first_row = scroll;
{
if(text.get_n_lines()>visible_rows)
{
- unsigned old_first_row = first_row;
- first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
+ size_t old_first_row = first_row;
+ first_row = text.get_n_lines()-visible_rows-static_cast<size_t>(value);
if(first_row!=old_first_row)
signal_scroll_position_changed.emit(first_row);
mark_rebuild();
projects / libs / gltk.git / blobdiff