comparison: console/libgnt/gnttextview.c
console/libgnt/gnttextview.c
- changeset 14459
- d2e639b92d79
- parent 14445
- 69f18df58bbf
- child 14460
- ec99f8f548a7
equal
deleted
inserted
replaced
| 14458:b49cf8395bfa | 14459:d2e639b92d79 |
|---|---|
| 322 gnt_text_view_next_line(view); | 322 gnt_text_view_next_line(view); |
| 323 continue; | 323 continue; |
| 324 } | 324 } |
| 325 | 325 |
| 326 line = view->list->data; | 326 line = view->list->data; |
| 327 end = gnt_util_onscreen_width_to_pointer(start, | 327 if ((end = strchr(start, '\n')) != NULL || |
| 328 widget->priv.width - line->length - 1, &len); | 328 (end = strchr(start, '\r')) != NULL) { |
| 329 int l = gnt_util_onscreen_width(start, end - 1); | |
| 330 if (l >= widget->priv.width - line->length - 1) { | |
| 331 end = NULL; | |
| 332 } | |
| 333 } | |
| 334 | |
| 335 if (end == NULL) | |
| 336 end = gnt_util_onscreen_width_to_pointer(start, | |
| 337 widget->priv.width - line->length - 1, &len); | |
| 329 | 338 |
| 330 seg = g_new0(GntTextSegment, 1); | 339 seg = g_new0(GntTextSegment, 1); |
| 331 seg->start = start - view->string->str; | 340 seg->start = start - view->string->str; |
| 332 seg->end = end - view->string->str; | 341 seg->end = end - view->string->str; |
| 333 seg->tvflag = flags; | 342 seg->tvflag = flags; |
