diff options
| author | Thomas White <taw@physics.org> | 2011-10-04 15:51:04 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2011-10-04 15:51:04 +0200 |
| commit | e5b22fe37ef3a90345eff9b5fe845df2692e4b8f (patch) | |
| tree | c30154f2384a5a1e0e2e78e6caf9d9ad48a31b7c /src/tool_text.c | |
| parent | c30470fbd44b78b17740969055a932abc7402c92 (diff) | |
Cursor fixes
Diffstat (limited to 'src/tool_text.c')
| -rw-r--r-- | src/tool_text.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/tool_text.c b/src/tool_text.c index cb689db..9b11485 100644 --- a/src/tool_text.c +++ b/src/tool_text.c @@ -251,9 +251,9 @@ void move_cursor_left(struct object *op) int new_idx, new_trail; pango_layout_move_cursor_visually(o->layout, TRUE, o->insertion_point, - 0, +1, &new_idx, &new_trail); + 0, -1, &new_idx, &new_trail); - if ( (new_idx > 0) && (new_idx < G_MAXINT) ) { + if ( (new_idx >= 0) && (new_idx < G_MAXINT) ) { o->insertion_point = new_idx; } } @@ -265,9 +265,9 @@ void move_cursor_right(struct object *op) int new_idx, new_trail; pango_layout_move_cursor_visually(o->layout, TRUE, o->insertion_point, - 0, -1, &new_idx, &new_trail); + 0, +1, &new_idx, &new_trail); - if ( (new_idx > 0) && (new_idx < G_MAXINT) ) { + if ( (new_idx >= 0) && (new_idx < G_MAXINT) ) { o->insertion_point = new_idx; } } @@ -322,13 +322,11 @@ static void draw_caret(cairo_t *cr, struct object *op) pango_layout_get_cursor_pos(o->layout, o->insertion_point, &pos, NULL); xposd = pos.x/PANGO_SCALE; - cx = o->base.x + xposd; + cx = o->base.x - o->offs_x + xposd; yposd = pos.y/PANGO_SCALE; - clow = o->base.y + yposd; + clow = o->base.y - o->offs_y + yposd; chigh = clow + (pos.height/PANGO_SCALE); - printf("Cursor %f, %f-%f\n", cx, clow, chigh); - cairo_move_to(cr, cx, clow); cairo_line_to(cr, cx, chigh); |