qulogic/libgnt

Make sure the selection is within bounds before accepting a click-drag

2009-10-27, Sadrul Habib Chowdhury
14dbc1ec4834
Parents 81bc3498a388
Children 41a1d7d8de884a081a3910ef
Make sure the selection is within bounds before accepting a click-drag
selection in a textview.
1 files changed, 11 insertions(+), 4 deletions(-)
  • +11 -4
    gnttextview.c
    • --- a/gnttextview.c Tue Oct 27 23:35:45 2009 +0000
    +++ b/gnttextview.c Tue Oct 27 23:37:52 2009 +0000
    @@ -67,6 +67,12 @@
    static void reset_text_view(GntTextView *view);
    +static gboolean
    +text_view_contains(GntTextView *view, const char *str)
    +{
    + return (str >= view->string->str && str < view->string->str + view->string->len);
    +}
    +
    static void
    gnt_text_view_draw(GntWidget *widget)
    {
    @@ -109,7 +115,7 @@
    char back = *end;
    chtype fl = seg->flags;
    *end = '\0';
    - if (select_start < view->string->str + seg->start && select_end > view->string->str + seg->end) {
    + if (select_start && select_start < view->string->str + seg->start && select_end > view->string->str + seg->end) {
    fl |= A_REVERSE;
    wattrset(widget->window, fl);
    wprintw(widget->window, "%s", (view->string->str + seg->start));
    @@ -326,9 +332,10 @@
    select_start = gnt_text_view_get_p(GNT_TEXT_VIEW(widget), x - widget->priv.x, y - widget->priv.y);
    g_timeout_add(500, too_slow, NULL);
    } else if (event == GNT_MOUSE_UP) {
    - if (select_start) {
    + GntTextView *view = GNT_TEXT_VIEW(widget);
    + if (text_view_contains(view, select_start)) {
    GString *clip;
    - select_end = gnt_text_view_get_p(GNT_TEXT_VIEW(widget), x - widget->priv.x, y - widget->priv.y);
    + select_end = gnt_text_view_get_p(view, x - widget->priv.x, y - widget->priv.y);
    if (select_end < select_start) {
    gchar *t = select_start;
    select_start = select_end;
    @@ -336,7 +343,7 @@
    }
    if (select_start == select_end) {
    if (double_click) {
    - clip = select_word_text(GNT_TEXT_VIEW(widget), select_start);
    + clip = select_word_text(view, select_start);
    double_click = FALSE;
    } else {
    double_click = TRUE;