1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
… | |
… | |
189 | } |
189 | } |
190 | |
190 | |
191 | if (prev_nrow == 0) |
191 | if (prev_nrow == 0) |
192 | { |
192 | { |
193 | /* |
193 | /* |
194 | * first time called so just malloc everything : don't rely on realloc |
194 | * first time called so just malloc everything: don't rely on realloc |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
196 | */ |
196 | */ |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
… | |
… | |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
257 | |
257 | |
258 | for (p = nrow; p < prev_nrow; p++) |
258 | for (p = nrow; p < prev_nrow; p++) |
259 | { |
259 | { |
260 | q = p + TermWin.saveLines; |
260 | q = p + TermWin.saveLines; |
|
|
261 | |
261 | if (screen.text[q]) |
262 | if (screen.text[q]) |
262 | { |
263 | { |
263 | #ifdef DEBUG_STRICT |
264 | #ifdef DEBUG_STRICT |
264 | assert (screen.rend[q]); |
265 | assert (screen.rend[q]); |
265 | #endif |
266 | #endif |
266 | talloc->free (screen.text[q]); |
267 | talloc->free (screen.text[q]); |
267 | ralloc->free (screen.rend[q]); |
268 | ralloc->free (screen.rend[q]); |
268 | } |
269 | } |
|
|
270 | |
269 | if (swap.text[p]) |
271 | if (swap.text[p]) |
270 | { |
272 | { |
271 | #ifdef DEBUG_STRICT |
273 | #ifdef DEBUG_STRICT |
272 | assert (swap.rend[p]); |
274 | assert (swap.rend[p]); |
273 | #endif |
275 | #endif |
274 | talloc->free (swap.text[p]); |
276 | talloc->free (swap.text[p]); |
275 | ralloc->free (swap.rend[p]); |
277 | ralloc->free (swap.rend[p]); |
276 | } |
278 | } |
|
|
279 | |
277 | #ifdef DEBUG_STRICT |
280 | #ifdef DEBUG_STRICT |
278 | assert (drawn_text[p] && drawn_rend[p]); |
281 | assert (drawn_text[p] && drawn_rend[p]); |
279 | #endif |
282 | #endif |
280 | talloc->free (drawn_text[p]); |
283 | talloc->free (drawn_text[p]); |
281 | ralloc->free (drawn_rend[p]); |
284 | ralloc->free (drawn_rend[p]); |
… | |
… | |
311 | swap.tlen[p] = 0; |
314 | swap.tlen[p] = 0; |
312 | swap.text[p] = NULL; |
315 | swap.text[p] = NULL; |
313 | swap.rend[p] = NULL; |
316 | swap.rend[p] = NULL; |
314 | drawn_text[p] = NULL; |
317 | drawn_text[p] = NULL; |
315 | drawn_rend[p] = NULL; |
318 | drawn_rend[p] = NULL; |
316 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
319 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
317 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
320 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
318 | } |
321 | } |
319 | |
322 | |
320 | if (k > 0) |
323 | if (k > 0) |
321 | { |
324 | { |
… | |
… | |
336 | } |
339 | } |
337 | |
340 | |
338 | /* resize columns */ |
341 | /* resize columns */ |
339 | if (ncol != prev_ncol) |
342 | if (ncol != prev_ncol) |
340 | { |
343 | { |
341 | int common = min (prev_ncol, ncol); |
|
|
342 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
344 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
343 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
345 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
344 | |
346 | |
345 | for (p = 0; p < total_rows; p++) |
347 | for (p = 0; p < total_rows; p++) |
346 | { |
348 | { |
347 | if (screen.text[p]) |
349 | if (screen.text[p]) |
348 | { |
350 | { |
349 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
351 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
350 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
352 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
351 | |
353 | |
352 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
354 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
353 | |
355 | |
354 | if (ncol > prev_ncol) |
356 | if (ncol > prev_ncol) |
355 | scr_blank_line (& (screen.text[p][prev_ncol]), |
357 | scr_blank_line (&screen.text[p][prev_ncol], |
356 | & (screen.rend[p][prev_ncol]), |
358 | &screen.rend[p][prev_ncol], |
357 | ncol - prev_ncol, |
359 | ncol - prev_ncol, setrstyle); |
358 | setrstyle); |
|
|
359 | } |
360 | } |
360 | } |
361 | } |
361 | |
362 | |
362 | for (p = 0; p < nrow; p++) |
363 | for (p = 0; p < nrow; p++) |
363 | { |
364 | { |
364 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
365 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
365 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
366 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
366 | |
367 | |
367 | if (ncol > prev_ncol) |
368 | if (ncol > prev_ncol) |
368 | scr_blank_line (& (drawn_text[p][prev_ncol]), |
369 | scr_blank_line (&drawn_text[p][prev_ncol], |
369 | & (drawn_rend[p][prev_ncol]), |
370 | &drawn_rend[p][prev_ncol], |
370 | ncol - prev_ncol, setrstyle); |
371 | ncol - prev_ncol, setrstyle); |
371 | |
372 | |
372 | if (swap.text[p]) |
373 | if (swap.text[p]) |
373 | { |
374 | { |
374 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
375 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
375 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
376 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
376 | |
377 | |
377 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
378 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
378 | |
379 | |
379 | if (ncol > prev_ncol) |
380 | if (ncol > prev_ncol) |
380 | scr_blank_line (& (swap.text[p][prev_ncol]), |
381 | scr_blank_line (&swap.text[p][prev_ncol], |
381 | & (swap.rend[p][prev_ncol]), |
382 | &swap.rend[p][prev_ncol], |
382 | ncol - prev_ncol, setrstyle); |
383 | ncol - prev_ncol, setrstyle); |
383 | } |
384 | } |
384 | |
385 | |
385 | } |
386 | } |
386 | |
387 | |
… | |
… | |
476 | |
477 | |
477 | scr_release (); |
478 | scr_release (); |
478 | prev_nrow = prev_ncol = 0; |
479 | prev_nrow = prev_ncol = 0; |
479 | scr_reset (); |
480 | scr_reset (); |
480 | |
481 | |
481 | scr_clear (); |
482 | scr_clear (true); |
482 | scr_refresh (SLOW_REFRESH); |
483 | scr_refresh (SLOW_REFRESH); |
483 | } |
484 | } |
484 | |
485 | |
485 | /* ------------------------------------------------------------------------- * |
486 | /* ------------------------------------------------------------------------- * |
486 | * PROCESS SCREEN COMMANDS * |
487 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
511 | s->s_cur.col = s->cur.col; |
512 | s->s_cur.col = s->cur.col; |
512 | s->s_rstyle = rstyle; |
513 | s->s_rstyle = rstyle; |
513 | s->s_charset = s->charset; |
514 | s->s_charset = s->charset; |
514 | s->s_charset_char = charsets[s->charset]; |
515 | s->s_charset_char = charsets[s->charset]; |
515 | break; |
516 | break; |
|
|
517 | |
516 | case RESTORE: |
518 | case RESTORE: |
517 | want_refresh = 1; |
519 | want_refresh = 1; |
518 | s->cur.row = s->s_cur.row; |
520 | s->cur.row = s->s_cur.row; |
519 | s->cur.col = s->s_cur.col; |
521 | s->cur.col = s->s_cur.col; |
520 | s->flags &= ~Screen_WrapNext; |
522 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
708 | for (i = 0, j = row1; i < count; i++, j++) |
710 | for (i = 0, j = row1; i < count; i++, j++) |
709 | { |
711 | { |
710 | buf_text[i] = screen.text[j]; |
712 | buf_text[i] = screen.text[j]; |
711 | buf_rend[i] = screen.rend[j]; |
713 | buf_rend[i] = screen.rend[j]; |
712 | } |
714 | } |
|
|
715 | |
713 | /* A2: Rotate lines */ |
716 | /* A2: Rotate lines */ |
714 | for (j = row1, i = j + count; i <= row2; i++, j++) |
717 | for (j = row1, i = j + count; i <= row2; i++, j++) |
715 | { |
718 | { |
716 | screen.tlen[j] = screen.tlen[i]; |
719 | screen.tlen[j] = screen.tlen[i]; |
717 | screen.text[j] = screen.text[i]; |
720 | screen.text[j] = screen.text[i]; |
718 | screen.rend[j] = screen.rend[i]; |
721 | screen.rend[j] = screen.rend[i]; |
719 | } |
722 | } |
|
|
723 | |
720 | j = row2 - count + 1, i = count; |
724 | j = row2 - count + 1, i = count; |
721 | } |
725 | } |
722 | else /* if (j < 0) */ |
726 | else /* if (j < 0) */ |
723 | { |
727 | { |
724 | /* B: scroll down */ |
728 | /* B: scroll down */ |
… | |
… | |
727 | for (i = 0, j = row2; i < count; i++, j--) |
731 | for (i = 0, j = row2; i < count; i++, j--) |
728 | { |
732 | { |
729 | buf_text[i] = screen.text[j]; |
733 | buf_text[i] = screen.text[j]; |
730 | buf_rend[i] = screen.rend[j]; |
734 | buf_rend[i] = screen.rend[j]; |
731 | } |
735 | } |
|
|
736 | |
732 | /* B2: Rotate lines */ |
737 | /* B2: Rotate lines */ |
733 | for (j = row2, i = j - count; i >= row1; i--, j--) |
738 | for (j = row2, i = j - count; i >= row1; i--, j--) |
734 | { |
739 | { |
735 | screen.tlen[j] = screen.tlen[i]; |
740 | screen.tlen[j] = screen.tlen[i]; |
736 | screen.text[j] = screen.text[i]; |
741 | screen.text[j] = screen.text[i]; |
737 | screen.rend[j] = screen.rend[i]; |
742 | screen.rend[j] = screen.rend[i]; |
738 | } |
743 | } |
|
|
744 | |
739 | j = row1, i = count; |
745 | j = row1, i = count; |
740 | count = -count; |
746 | count = -count; |
741 | } |
747 | } |
742 | |
748 | |
743 | /* C: Resurrect lines */ |
749 | /* C: Resurrect lines */ |
… | |
… | |
746 | screen.tlen[j] = 0; |
752 | screen.tlen[j] = 0; |
747 | screen.text[j] = buf_text[i]; |
753 | screen.text[j] = buf_text[i]; |
748 | screen.rend[j] = buf_rend[i]; |
754 | screen.rend[j] = buf_rend[i]; |
749 | |
755 | |
750 | if (!spec) /* line length may not equal TermWin.ncol */ |
756 | if (!spec) /* line length may not equal TermWin.ncol */ |
751 | scr_blank_screen_mem (screen.text, screen.rend, |
757 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
752 | (unsigned int)j, rstyle); |
|
|
753 | } |
758 | } |
754 | |
759 | |
755 | return count; |
760 | return count; |
756 | } |
761 | } |
757 | |
762 | |
… | |
… | |
810 | c = *str++; |
815 | c = *str++; |
811 | |
816 | |
812 | if (c < 0x20) |
817 | if (c < 0x20) |
813 | switch (c) |
818 | switch (c) |
814 | { |
819 | { |
815 | case '\t': |
820 | case C0_HT: |
816 | scr_tab (1); |
821 | scr_tab (1); |
817 | continue; |
822 | continue; |
818 | |
823 | |
819 | case '\n': |
824 | case C0_LF: |
820 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
825 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
821 | MAX_IT (screen.tlen[row], screen.cur.col); |
826 | MAX_IT (screen.tlen[row], screen.cur.col); |
822 | |
827 | |
823 | screen.flags &= ~Screen_WrapNext; |
828 | screen.flags &= ~Screen_WrapNext; |
824 | |
829 | |
… | |
… | |
829 | |
834 | |
830 | stp = screen.text[row]; /* _must_ refresh */ |
835 | stp = screen.text[row]; /* _must_ refresh */ |
831 | srp = screen.rend[row]; /* _must_ refresh */ |
836 | srp = screen.rend[row]; /* _must_ refresh */ |
832 | continue; |
837 | continue; |
833 | |
838 | |
834 | case '\r': |
839 | case C0_CR: |
835 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
840 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
836 | MAX_IT (screen.tlen[row], screen.cur.col); |
841 | MAX_IT (screen.tlen[row], screen.cur.col); |
837 | |
842 | |
838 | screen.flags &= ~Screen_WrapNext; |
843 | screen.flags &= ~Screen_WrapNext; |
839 | screen.cur.col = 0; |
844 | screen.cur.col = 0; |
… | |
… | |
885 | c = vt100_0[c - 0x5f]; |
890 | c = vt100_0[c - 0x5f]; |
886 | width = 1; |
891 | width = 1; |
887 | } |
892 | } |
888 | } |
893 | } |
889 | |
894 | |
890 | if (width > 0) |
895 | if (width != 0) |
891 | { |
896 | { |
892 | #if !UNICODE_3 && ENABLE_COMBINING |
897 | #if !UNICODE_3 && ENABLE_COMBINING |
893 | // trim characters we can't store directly :( |
898 | // trim characters we can't store directly :( |
894 | if (c >= 0x10000) |
899 | if (c >= 0x10000) |
895 | c = rxvt_composite.compose (c); // map to lower 16 bits |
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
987 | */ |
992 | */ |
988 | void |
993 | void |
989 | rxvt_term::scr_backspace () |
994 | rxvt_term::scr_backspace () |
990 | { |
995 | { |
991 | want_refresh = 1; |
996 | want_refresh = 1; |
|
|
997 | |
992 | if (screen.cur.col == 0) |
998 | if (screen.cur.col == 0) |
993 | { |
999 | { |
994 | if (screen.cur.row > 0) |
1000 | if (screen.cur.row > 0) |
995 | { |
1001 | { |
996 | #ifdef TERMCAP_HAS_BW |
1002 | #ifdef TERMCAP_HAS_BW |
… | |
… | |
1001 | |
1007 | |
1002 | } |
1008 | } |
1003 | } |
1009 | } |
1004 | else if ((screen.flags & Screen_WrapNext) == 0) |
1010 | else if ((screen.flags & Screen_WrapNext) == 0) |
1005 | scr_gotorc (0, -1, RELATIVE); |
1011 | scr_gotorc (0, -1, RELATIVE); |
|
|
1012 | |
1006 | screen.flags &= ~Screen_WrapNext; |
1013 | screen.flags &= ~Screen_WrapNext; |
1007 | } |
1014 | } |
1008 | |
1015 | |
1009 | /* ------------------------------------------------------------------------- */ |
1016 | /* ------------------------------------------------------------------------- */ |
1010 | /* |
1017 | /* |
… | |
… | |
1114 | want_refresh = 1; |
1121 | want_refresh = 1; |
1115 | ZERO_SCROLLBACK (); |
1122 | ZERO_SCROLLBACK (); |
1116 | |
1123 | |
1117 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1124 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1118 | |
1125 | |
1119 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1126 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1120 | : col); |
|
|
1121 | MAX_IT (screen.cur.col, 0); |
1127 | MAX_IT (screen.cur.col, 0); |
1122 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1128 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1123 | |
1129 | |
1124 | screen.flags &= ~Screen_WrapNext; |
1130 | screen.flags &= ~Screen_WrapNext; |
1125 | if (relative & R_RELATIVE) |
1131 | if (relative & R_RELATIVE) |
… | |
… | |
1164 | * direction should be UP or DN |
1170 | * direction should be UP or DN |
1165 | */ |
1171 | */ |
1166 | void |
1172 | void |
1167 | rxvt_term::scr_index (enum page_dirn direction) |
1173 | rxvt_term::scr_index (enum page_dirn direction) |
1168 | { |
1174 | { |
1169 | int dirn; |
1175 | int dirn; |
1170 | |
1176 | |
1171 | want_refresh = 1; |
1177 | want_refresh = 1; |
1172 | dirn = ((direction == UP) ? 1 : -1); |
1178 | dirn = ((direction == UP) ? 1 : -1); |
1173 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1179 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1174 | |
1180 | |
… | |
… | |
1234 | default: |
1240 | default: |
1235 | return; |
1241 | return; |
1236 | } |
1242 | } |
1237 | |
1243 | |
1238 | if (screen.text[row]) |
1244 | if (screen.text[row]) |
1239 | scr_blank_line (& (screen.text[row][col]), |
1245 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1240 | & (screen.rend[row][col]), num, rstyle); |
|
|
1241 | else |
1246 | else |
1242 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1247 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1243 | } |
1248 | } |
1244 | |
1249 | |
1245 | /* ------------------------------------------------------------------------- */ |
1250 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1517 | */ |
1522 | */ |
1518 | void |
1523 | void |
1519 | rxvt_term::scr_cursor_visible (int mode) |
1524 | rxvt_term::scr_cursor_visible (int mode) |
1520 | { |
1525 | { |
1521 | want_refresh = 1; |
1526 | want_refresh = 1; |
|
|
1527 | |
1522 | if (mode) |
1528 | if (mode) |
1523 | screen.flags |= Screen_VisibleCursor; |
1529 | screen.flags |= Screen_VisibleCursor; |
1524 | else |
1530 | else |
1525 | screen.flags &= ~Screen_VisibleCursor; |
1531 | screen.flags &= ~Screen_VisibleCursor; |
1526 | } |
1532 | } |
… | |
… | |
1764 | } |
1770 | } |
1765 | |
1771 | |
1766 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1772 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1767 | |
1773 | |
1768 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1774 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1769 | fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, |
1775 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1770 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1771 | |
1776 | |
1772 | if (refresh) |
1777 | if (refresh) |
1773 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1778 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1774 | } |
1779 | } |
1775 | |
1780 | |
… | |
… | |
1842 | if (TermWin.view_start != oldviewstart) |
1847 | if (TermWin.view_start != oldviewstart) |
1843 | { |
1848 | { |
1844 | want_refresh = 1; |
1849 | want_refresh = 1; |
1845 | num_scr -= (TermWin.view_start - oldviewstart); |
1850 | num_scr -= (TermWin.view_start - oldviewstart); |
1846 | } |
1851 | } |
|
|
1852 | |
1847 | return (int) (TermWin.view_start - oldviewstart); |
1853 | return (int) (TermWin.view_start - oldviewstart); |
1848 | } |
1854 | } |
1849 | |
1855 | |
1850 | /* ------------------------------------------------------------------------- */ |
1856 | /* ------------------------------------------------------------------------- */ |
1851 | void |
1857 | void |
… | |
… | |
2517 | { |
2523 | { |
2518 | n = min (len - i, PROP_SIZE); |
2524 | n = min (len - i, PROP_SIZE); |
2519 | MEMCPY (ds, data + i, n); |
2525 | MEMCPY (ds, data + i, n); |
2520 | |
2526 | |
2521 | for (j = 0; j < n; j++) |
2527 | for (j = 0; j < n; j++) |
2522 | if (ds[j] == '\n') |
2528 | if (ds[j] == C0_LF) |
2523 | ds[j] = '\r'; |
2529 | ds[j] = C0_CR; |
2524 | |
2530 | |
2525 | tt_write (ds, (int)n); |
2531 | tt_write (ds, (int)n); |
2526 | } |
2532 | } |
2527 | |
2533 | |
2528 | free (ds); |
2534 | free (ds); |
… | |
… | |
2609 | |
2615 | |
2610 | nread += ct.nitems; |
2616 | nread += ct.nitems; |
2611 | |
2617 | |
2612 | char **cl; |
2618 | char **cl; |
2613 | int cr; |
2619 | int cr; |
2614 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2620 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2615 | &cr) >= 0 && cl) |
|
|
2616 | { |
2621 | { |
2617 | for (int i = 0; i < cr; i++) |
2622 | for (int i = 0; i < cr; i++) |
2618 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2623 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2619 | |
2624 | |
2620 | XFreeStringList (cl); |
2625 | XFreeStringList (cl); |
… | |
… | |
2879 | else |
2884 | else |
2880 | new_selection_text[ofs++] = *t++; |
2885 | new_selection_text[ofs++] = *t++; |
2881 | } |
2886 | } |
2882 | |
2887 | |
2883 | if (screen.tlen[row] != -1 && row != end_row) |
2888 | if (screen.tlen[row] != -1 && row != end_row) |
2884 | new_selection_text[ofs++] = L'\n'; |
2889 | new_selection_text[ofs++] = C0_LF; |
2885 | } |
2890 | } |
2886 | |
2891 | |
2887 | if (end_col != selection.end.col) |
2892 | if (end_col != selection.end.col) |
2888 | new_selection_text[ofs++] = L'\n'; |
2893 | new_selection_text[ofs++] = C0_LF; |
2889 | |
2894 | |
2890 | new_selection_text[ofs] = 0; |
2895 | new_selection_text[ofs] = 0; |
2891 | |
2896 | |
2892 | if (ofs == 0) |
2897 | if (ofs == 0) |
2893 | { |
2898 | { |
… | |
… | |
3120 | * Extend the selection to the specified col/row |
3125 | * Extend the selection to the specified col/row |
3121 | */ |
3126 | */ |
3122 | void |
3127 | void |
3123 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3128 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3124 | { |
3129 | { |
3125 | int16_t ncol = TermWin.ncol; |
3130 | int16_t ncol = TermWin.ncol; |
3126 | int end_col; |
3131 | int end_col; |
3127 | row_col_t pos; |
3132 | row_col_t pos; |
3128 | enum { |
3133 | enum { |
3129 | LEFT, RIGHT |
3134 | LEFT, RIGHT |
3130 | } closeto = RIGHT; |
3135 | } closeto = RIGHT; |
3131 | |
3136 | |
3132 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
3137 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
… | |
… | |
3515 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3520 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3516 | } |
3521 | } |
3517 | |
3522 | |
3518 | #endif |
3523 | #endif |
3519 | /* ------------------------------------------------------------------------- */ |
3524 | /* ------------------------------------------------------------------------- */ |
3520 | |
|
|
3521 | /* ------------------------------------------------------------------------- * |
|
|
3522 | * DEBUG ROUTINES * |
|
|
3523 | * ------------------------------------------------------------------------- */ |
|
|
3524 | #if 0 |
|
|
3525 | void |
|
|
3526 | rxvt_debug_colors (void) |
|
|
3527 | { |
|
|
3528 | int color; |
|
|
3529 | const char *name[] = |
|
|
3530 | { |
|
|
3531 | "fg", "bg", |
|
|
3532 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3533 | }; |
|
|
3534 | |
|
|
3535 | fprintf (stderr, "Color ( "); |
|
|
3536 | if (rstyle & RS_RVid) |
|
|
3537 | fprintf (stderr, "rvid "); |
|
|
3538 | if (rstyle & RS_Bold) |
|
|
3539 | fprintf (stderr, "bold "); |
|
|
3540 | if (rstyle & RS_Blink) |
|
|
3541 | fprintf (stderr, "blink "); |
|
|
3542 | if (rstyle & RS_Uline) |
|
|
3543 | fprintf (stderr, "uline "); |
|
|
3544 | fprintf (stderr, "): "); |
|
|
3545 | |
|
|
3546 | color = GET_FGCOLOR (rstyle); |
|
|
3547 | #ifndef NO_BRIGHTCOLOR |
|
|
3548 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3549 | { |
|
|
3550 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3551 | fprintf (stderr, "bright "); |
|
|
3552 | } |
|
|
3553 | #endif |
|
|
3554 | fprintf (stderr, "%s on ", name[color]); |
|
|
3555 | |
|
|
3556 | color = GET_BGCOLOR (rstyle); |
|
|
3557 | #ifndef NO_BRIGHTCOLOR |
|
|
3558 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3559 | { |
|
|
3560 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3561 | fprintf (stderr, "bright "); |
|
|
3562 | } |
|
|
3563 | #endif |
|
|
3564 | fprintf (stderr, "%s\n", name[color]); |
|
|
3565 | } |
|
|
3566 | #endif |
|
|