… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
143 | col--; |
142 | col--; |
144 | |
143 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
148 | // found start, nuke |
149 | // found start, nuke |
149 | do { |
150 | do { |
150 | l.t[col] = ' '; |
151 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
152 | l.r[col] = rend; |
152 | col++; |
153 | col++; |
… | |
… | |
231 | selection.text = NULL; |
232 | selection.text = NULL; |
232 | selection.len = 0; |
233 | selection.len = 0; |
233 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
234 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
235 | selection.clicks = 0; |
236 | selection.clicks = 0; |
|
|
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
236 | } |
239 | } |
237 | else |
240 | else |
238 | { |
241 | { |
239 | /* |
242 | /* |
240 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
278 | |
281 | |
279 | if (top_row) |
282 | if (top_row) |
280 | { |
283 | { |
281 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
282 | // to come up with a lean and mean algorithm. |
285 | // to come up with a lean and mean algorithm. |
|
|
286 | // TODO: maybe optimise when width didn't change |
283 | |
287 | |
284 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
285 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
286 | |
290 | |
287 | do |
291 | do |
288 | { |
292 | { |
289 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
290 | #ifdef DEBUG_STRICT |
|
|
291 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
292 | #endif |
|
|
293 | int plines = 1; |
295 | int plines = 1; |
294 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | |
297 | |
296 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
297 | { |
299 | { |
… | |
… | |
393 | |
395 | |
394 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
395 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
396 | } |
398 | } |
397 | |
399 | |
|
|
400 | free (tabs); |
|
|
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; col--; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
|
|
405 | |
398 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
399 | |
407 | |
400 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
401 | prev_ncol = ncol; |
409 | prev_ncol = ncol; |
402 | |
410 | |
… | |
… | |
434 | void |
442 | void |
435 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
436 | { |
444 | { |
437 | scr_release (); |
445 | scr_release (); |
438 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
439 | scr_soft_reset (); |
448 | scr_soft_reset (); |
440 | scr_reset (); |
449 | scr_reset (); |
441 | |
450 | |
442 | scr_clear (true); |
451 | scr_clear (true); |
443 | scr_refresh (); |
452 | scr_refresh (); |
… | |
… | |
449 | /* only affects modes, nothing drastic such as clearing the screen */ |
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
450 | #if ENABLE_OVERLAY |
459 | #if ENABLE_OVERLAY |
451 | scr_overlay_off (); |
460 | scr_overlay_off (); |
452 | #endif |
461 | #endif |
453 | |
462 | |
454 | rvideo_mode = false; |
|
|
455 | |
|
|
456 | if (current_screen != PRIMARY) |
463 | if (current_screen != PRIMARY) |
457 | scr_swap_screen (); |
464 | scr_swap_screen (); |
458 | |
|
|
459 | free (tabs); |
|
|
460 | tabs = (char *)rxvt_malloc (ncol); |
|
|
461 | |
|
|
462 | for (int col = ncol; --col; ) |
|
|
463 | tabs [col] = col % TABSIZE == 0; |
|
|
464 | |
465 | |
465 | scr_scroll_region (0, MAX_ROWS - 1); |
466 | scr_scroll_region (0, MAX_ROWS - 1); |
466 | scr_rendition (0, ~RS_None); |
467 | scr_rendition (0, ~RS_None); |
467 | scr_insert_mode (0); |
468 | scr_insert_mode (0); |
468 | } |
469 | } |
… | |
… | |
510 | } |
511 | } |
511 | |
512 | |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
515 | #ifdef DEBUG_STRICT |
|
|
516 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
517 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
518 | #endif |
|
|
519 | } |
518 | } |
520 | |
519 | |
521 | void |
520 | void |
522 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
523 | { |
522 | { |
… | |
… | |
548 | want_refresh = 1; |
547 | want_refresh = 1; |
549 | view_start = 0; |
548 | view_start = 0; |
550 | |
549 | |
551 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
552 | |
551 | |
553 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
554 | |
553 | |
555 | #if NSCREENS |
554 | #if NSCREENS |
556 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
557 | { |
556 | { |
558 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
783 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
784 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
785 | } |
784 | } |
786 | } |
785 | } |
787 | |
786 | |
788 | #ifdef DEBUG_STRICT |
|
|
789 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
790 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
791 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
792 | #endif |
|
|
793 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
794 | |
791 | |
795 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
796 | |
793 | |
797 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
… | |
… | |
901 | # else |
898 | # else |
902 | c = 0xfffd; |
899 | c = 0xfffd; |
903 | # endif |
900 | # endif |
904 | #endif |
901 | #endif |
905 | |
902 | |
906 | // nuke the character at this position, if required |
|
|
907 | if (expect_false ( |
|
|
908 | line->t[screen.cur.col] == NOCHAR |
|
|
909 | || (screen.cur.col < ncol - 1 |
|
|
910 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
911 | )) |
|
|
912 | scr_kill_char (*line, screen.cur.col); |
|
|
913 | |
|
|
914 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
915 | |
904 | |
916 | // if the character doesn't fit into the remaining columns... |
905 | // if the character doesn't fit into the remaining columns... |
917 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
918 | { |
907 | { |
|
|
908 | if (screen.flags & Screen_Autowrap) |
|
|
909 | { |
919 | // ... artificially enlargen the previous one |
910 | // ... artificially enlargen the previous one |
920 | c = NOCHAR; |
911 | c = NOCHAR; |
921 | // and try the same character next loop iteration |
912 | // and try the same character next loop iteration |
922 | --str; |
913 | --str; |
|
|
914 | } |
|
|
915 | else |
|
|
916 | screen.cur.col = ncol - width; |
923 | } |
917 | } |
|
|
918 | |
|
|
919 | // nuke the character at this position, if required |
|
|
920 | // due to wonderful coincidences everywhere else in this loop |
|
|
921 | // we never have to check for overwriting a wide char itself, |
|
|
922 | // only its tail. |
|
|
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
924 | scr_kill_char (*line, screen.cur.col); |
924 | |
925 | |
925 | line->touch (); |
926 | line->touch (); |
926 | |
927 | |
927 | do |
928 | do |
928 | { |
929 | { |
… | |
… | |
934 | else |
935 | else |
935 | { |
936 | { |
936 | line->l = ncol; |
937 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
938 | if (screen.flags & Screen_Autowrap) |
938 | screen.flags |= Screen_WrapNext; |
939 | screen.flags |= Screen_WrapNext; |
939 | break; |
940 | |
|
|
941 | goto end_of_line; |
940 | } |
942 | } |
941 | |
943 | |
942 | c = NOCHAR; |
944 | c = NOCHAR; |
943 | } |
945 | } |
944 | while (expect_false (--width > 0)); |
946 | while (expect_false (--width > 0)); |
945 | |
947 | |
946 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
947 | if (expect_false (!width)) |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
948 | { |
950 | { |
949 | line->touch (); |
|
|
950 | |
|
|
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
952 | { |
|
|
953 | line->t[c] = ' '; |
951 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
952 | line->r[c] = rend; |
955 | } |
|
|
956 | } |
953 | } |
|
|
954 | |
|
|
955 | end_of_line: |
|
|
956 | ; |
957 | } |
957 | } |
958 | #if ENABLE_COMBINING |
958 | #if ENABLE_COMBINING |
959 | else // width == 0 |
959 | else // width == 0 |
960 | { |
960 | { |
961 | if (c != 0xfeff) // ignore BOM |
961 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1001 | #endif |
1001 | #endif |
1002 | } |
1002 | } |
1003 | |
1003 | |
1004 | max_it (line->l, screen.cur.col); |
1004 | max_it (line->l, screen.cur.col); |
1005 | |
1005 | |
1006 | #ifdef DEBUG_STRICT |
|
|
1007 | assert (screen.cur.row >= 0); |
1006 | assert (screen.cur.row >= 0); |
1008 | #endif |
|
|
1009 | } |
1007 | } |
1010 | |
1008 | |
1011 | /* ------------------------------------------------------------------------- */ |
1009 | /* ------------------------------------------------------------------------- */ |
1012 | /* |
1010 | /* |
1013 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1011 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1026 | |
1024 | |
1027 | want_refresh = 1; |
1025 | want_refresh = 1; |
1028 | #endif |
1026 | #endif |
1029 | } |
1027 | } |
1030 | } |
1028 | } |
|
|
1029 | else if (screen.flags & Screen_WrapNext) |
|
|
1030 | screen.flags &= ~Screen_WrapNext; |
1031 | else |
1031 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1033 | } |
1033 | } |
1034 | |
1034 | |
1035 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1342 | return; |
1342 | return; |
1343 | |
1343 | |
1344 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1345 | |
1345 | |
1346 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1347 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1348 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1349 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1350 | { |
1349 | { |
1351 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1352 | |
1351 | |
1353 | if (mapped) |
1352 | if (mapped) |
1354 | XClearArea (dpy, vt, 0, |
1353 | XClearArea (dpy, vt, 0, |
1355 | Row2Pixel (row), (unsigned int)width, |
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
1356 | (unsigned int)Height2Pixel (num), False); |
1355 | (unsigned int)Height2Pixel (num), False); |
1357 | } |
1356 | } |
1358 | else |
1357 | else |
1359 | { |
1358 | { |
1360 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1361 | |
1360 | |
|
|
1361 | if (mapped) |
|
|
1362 | { |
1362 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XFillRectangle (dpy, vt, gc, |
1365 | XFillRectangle (dpy, vt, gc, |
1365 | 0, Row2Pixel (row), |
1366 | 0, Row2Pixel (row - view_start), |
1366 | (unsigned int)width, |
1367 | (unsigned int)width, |
1367 | (unsigned int)Height2Pixel (num)); |
1368 | (unsigned int)Height2Pixel (num)); |
1368 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1371 | } |
1370 | } |
1372 | } |
1371 | |
1373 | |
1372 | for (; num--; row++) |
1374 | for (; num--; row++) |
1373 | { |
1375 | { |
1374 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1377 | |
|
|
1378 | if (row - view_start < nrow) |
1375 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1376 | } |
1380 | } |
1377 | } |
1381 | } |
1378 | |
1382 | |
1379 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1380 | void |
1384 | void |
… | |
… | |
1533 | { |
1537 | { |
1534 | line->t[col] = line->t[col + count]; |
1538 | line->t[col] = line->t[col + count]; |
1535 | line->r[col] = line->r[col + count]; |
1539 | line->r[col] = line->r[col + count]; |
1536 | } |
1540 | } |
1537 | |
1541 | |
1538 | scr_blank_line (*line, ncol - count, count, |
1542 | scr_blank_line (*line, ncol - count, count, rstyle); |
1539 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1540 | |
1543 | |
1541 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1542 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1543 | { |
1546 | { |
1544 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1680 | { |
1683 | { |
1681 | rvideo_state = on; |
1684 | rvideo_state = on; |
1682 | |
1685 | |
1683 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1684 | #ifdef HAVE_BG_PIXMAP |
1687 | #ifdef HAVE_BG_PIXMAP |
1685 | if (bgPixmap.pixmap == None) |
1688 | if (bg_pixmap == None) |
1686 | #endif |
1689 | #endif |
1687 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1688 | |
1691 | |
1689 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1690 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1834 | for (i = PART_BEG; i < RC_COUNT; i++) |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1835 | { |
1838 | { |
1836 | min_it (rc[i].col, ncol - 1); |
1839 | min_it (rc[i].col, ncol - 1); |
1837 | min_it (rc[i].row, nrow - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1838 | } |
1841 | } |
1839 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1842 | |
1840 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1843 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1841 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1844 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1842 | |
1845 | |
1843 | num_scr_allow = 0; |
1846 | num_scr_allow = 0; |
1844 | |
1847 | |
… | |
… | |
1935 | |
1938 | |
1936 | bell_ev.start (VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1937 | } |
1940 | } |
1938 | else |
1941 | else |
1939 | XBell (dpy, 0); |
1942 | XBell (dpy, 0); |
|
|
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1940 | #endif |
1944 | #endif |
1941 | } |
1945 | } |
1942 | |
1946 | |
1943 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1944 | /* ARGSUSED */ |
1948 | /* ARGSUSED */ |
… | |
… | |
1963 | row_start = view_start; |
1967 | row_start = view_start; |
1964 | } |
1968 | } |
1965 | |
1969 | |
1966 | wctomb (0, 0); |
1970 | wctomb (0, 0); |
1967 | |
1971 | |
1968 | for (int r1 = 0; r1 < nrows; r1++) |
1972 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1969 | { |
1973 | { |
1970 | text_t *tp = ROW(r1).t; |
1974 | text_t *tp = ROW(r1).t; |
1971 | int len = ROW(r1).l; |
1975 | int len = ROW(r1).l; |
1972 | |
1976 | |
1973 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1977 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2002 | * screen.text/screen.rend contain what the screen will change to. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
2003 | */ |
2007 | */ |
2004 | void |
2008 | void |
2005 | rxvt_term::scr_refresh () NOTHROW |
2009 | rxvt_term::scr_refresh () NOTHROW |
2006 | { |
2010 | { |
2007 | unsigned char have_bg, |
|
|
2008 | showcursor; /* show the cursor */ |
|
|
2009 | int16_t col, row, /* column/row we're processing */ |
2011 | int16_t col, row, /* column/row we're processing */ |
2010 | ocrow; /* old cursor row */ |
2012 | ocrow; /* old cursor row */ |
2011 | int i; /* tmp */ |
2013 | int i; /* tmp */ |
2012 | #ifndef NO_CURSORCOLOR |
2014 | #ifndef NO_CURSORCOLOR |
2013 | rend_t cc1; /* store colours at cursor position (s) */ |
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2024 | /* |
2026 | /* |
2025 | * A: set up vars |
2027 | * A: set up vars |
2026 | */ |
2028 | */ |
2027 | refresh_count = 0; |
2029 | refresh_count = 0; |
2028 | |
2030 | |
|
|
2031 | unsigned int old_screen_flags = screen.flags; |
2029 | have_bg = 0; |
2032 | char have_bg = 0; |
2030 | #ifdef HAVE_BG_PIXMAP |
2033 | #ifdef HAVE_BG_PIXMAP |
2031 | have_bg = bgPixmap.pixmap != None; |
2034 | have_bg = bg_pixmap != None; |
2032 | #endif |
2035 | #endif |
2033 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2034 | |
2037 | |
2035 | /* |
2038 | /* |
2036 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
2037 | */ |
2040 | */ |
2038 | scr_reverse_selection (); |
2041 | scr_reverse_selection (); |
|
|
2042 | |
|
|
2043 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2044 | #if ENABLE_OVERLAY |
|
|
2045 | scr_swap_overlay (); |
|
|
2046 | #endif |
|
|
2047 | |
|
|
2048 | char showcursor = screen.flags & Screen_VisibleCursor; |
2039 | |
2049 | |
2040 | /* |
2050 | /* |
2041 | * C: set the cursor character (s) |
2051 | * C: set the cursor character (s) |
2042 | */ |
2052 | */ |
2043 | { |
2053 | { |
2044 | unsigned char setoldcursor; |
2054 | unsigned char setoldcursor; |
2045 | |
2055 | |
2046 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2047 | #ifdef CURSOR_BLINK |
2056 | #ifdef CURSOR_BLINK |
2048 | if (hidden_cursor) |
2057 | if (hidden_cursor) |
2049 | showcursor = 0; |
2058 | showcursor = 0; |
2050 | #endif |
2059 | #endif |
2051 | |
2060 | |
… | |
… | |
2079 | ccol2 = bgcolor_of (rstyle); |
2088 | ccol2 = bgcolor_of (rstyle); |
2080 | #else |
2089 | #else |
2081 | ccol2 = Color_bg; |
2090 | ccol2 = Color_bg; |
2082 | #endif |
2091 | #endif |
2083 | |
2092 | |
2084 | if (showcursor && focus) |
2093 | if (focus) |
2085 | { |
2094 | { |
2086 | if (option (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2087 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2088 | else |
2097 | else |
2089 | { |
2098 | { |
… | |
… | |
2124 | oldcursor.col = screen.cur.col; |
2133 | oldcursor.col = screen.cur.col; |
2125 | } |
2134 | } |
2126 | } |
2135 | } |
2127 | } |
2136 | } |
2128 | |
2137 | |
2129 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2130 | #if ENABLE_OVERLAY |
|
|
2131 | scr_swap_overlay (); |
|
|
2132 | #endif |
|
|
2133 | |
|
|
2134 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | #ifndef NO_SLOW_LINK_SUPPORT |
2135 | /* |
2139 | /* |
2136 | * D: CopyArea pass - very useful for slower links |
2140 | * D: CopyArea pass - very useful for slower links |
2137 | * This has been deliberately kept simple. |
2141 | * This has been deliberately kept simple. |
2138 | */ |
2142 | */ |
… | |
… | |
2230 | |
2234 | |
2231 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2232 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2233 | --col; |
2237 | --col; |
2234 | |
2238 | |
2235 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2236 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2237 | int count = 1; |
2241 | int count = 1; |
2238 | |
2242 | |
2239 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2240 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2244 | for (i = 0; ++col < ncol; ) |
2248 | for (i = 0; ++col < ncol; ) |
2245 | { |
2249 | { |
2246 | if (stp[col] == NOCHAR) |
2250 | if (stp[col] == NOCHAR) |
2247 | { |
2251 | { |
2248 | dtp[col] = stp[col]; |
2252 | dtp[col] = stp[col]; |
2249 | drp[col] = rend; |
2253 | drp[col] = srp[col]; |
|
|
2254 | |
2250 | count++; |
2255 | count++; |
2251 | i++; |
2256 | i++; |
2252 | |
2257 | |
2253 | continue; |
2258 | continue; |
2254 | } |
2259 | } |
… | |
… | |
2284 | */ |
2289 | */ |
2285 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2286 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2287 | |
2292 | |
2288 | // only do special processing if any attributes are set, which is unlikely |
2293 | // only do special processing if any attributes are set, which is unlikely |
2289 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2290 | { |
2295 | { |
2291 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2292 | |
2297 | |
2293 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2294 | if (rend & RS_Bold && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2313 | |
2318 | |
2314 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2315 | fore = Color_UL; |
2320 | fore = Color_UL; |
2316 | #endif |
2321 | #endif |
2317 | |
2322 | |
|
|
2323 | #ifdef OPTION_HC |
|
|
2324 | if (rend & RS_Sel) |
|
|
2325 | { |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2329 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | { |
|
|
2331 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2332 | fore = Color_HTC; |
|
|
2333 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2334 | else if (!invert) |
|
|
2335 | fore = back; |
|
|
2336 | |
|
|
2337 | back = Color_HC; |
|
|
2338 | invert = 0; |
|
|
2339 | } |
|
|
2340 | } |
|
|
2341 | #endif |
|
|
2342 | |
2318 | if (invert) |
2343 | if (invert) |
2319 | { |
2344 | { |
2320 | #ifdef OPTION_HC |
|
|
2321 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2322 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2323 | #endif |
|
|
2324 | /* invert the column if no highlightColor is set or it is the |
|
|
2325 | * current cursor column */ |
|
|
2326 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2327 | #ifdef OPTION_HC |
|
|
2328 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2329 | back = Color_HC; |
|
|
2330 | #endif |
|
|
2331 | |
2346 | |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2333 | # ifndef OPTION_HC |
|
|
2334 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2335 | back = Color_RV; |
|
|
2336 | # endif |
|
|
2337 | if (fore == back) |
2348 | if (fore == back) |
2338 | { |
2349 | { |
2339 | fore = Color_bg; |
2350 | fore = Color_bg; |
2340 | back = Color_fg; |
2351 | back = Color_fg; |
2341 | } |
2352 | } |
… | |
… | |
2410 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2421 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2411 | } |
2422 | } |
2412 | } /* for (col....) */ |
2423 | } /* for (col....) */ |
2413 | } /* for (row....) */ |
2424 | } /* for (row....) */ |
2414 | |
2425 | |
2415 | #if ENABLE_OVERLAY |
|
|
2416 | scr_swap_overlay (); |
|
|
2417 | #endif |
|
|
2418 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2419 | |
|
|
2420 | /* |
2426 | /* |
2421 | * G: cleanup cursor and display outline cursor if necessary |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2422 | */ |
2428 | */ |
2423 | if (showcursor) |
2429 | if (showcursor) |
2424 | { |
2430 | { |
… | |
… | |
2462 | } |
2468 | } |
2463 | |
2469 | |
2464 | /* |
2470 | /* |
2465 | * H: cleanup selection |
2471 | * H: cleanup selection |
2466 | */ |
2472 | */ |
|
|
2473 | #if ENABLE_OVERLAY |
|
|
2474 | scr_swap_overlay (); |
|
|
2475 | #endif |
|
|
2476 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2477 | |
2467 | scr_reverse_selection (); |
2478 | scr_reverse_selection (); |
2468 | |
2479 | |
|
|
2480 | screen.flags = old_screen_flags; |
2469 | num_scr = 0; |
2481 | num_scr = 0; |
2470 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2471 | } |
2483 | } |
2472 | |
2484 | |
2473 | void |
2485 | void |
… | |
… | |
2494 | scr_remap_chars (swap_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2495 | } |
2507 | } |
2496 | } |
2508 | } |
2497 | |
2509 | |
2498 | void |
2510 | void |
2499 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2500 | { |
2512 | { |
|
|
2513 | bool transparent = false; |
|
|
2514 | |
2501 | #ifdef HAVE_BG_PIXMAP |
2515 | #ifdef HAVE_BG_PIXMAP |
2502 | bgPixmap.apply (); |
2516 | if (bg_pixmap != None) |
2503 | #else |
2517 | { |
|
|
2518 | # ifdef ENABLE_TRANSPARENCY |
|
|
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2520 | { |
|
|
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2504 | |
2523 | |
|
|
2524 | transparent = true; |
|
|
2525 | } |
|
|
2526 | else |
|
|
2527 | # endif |
|
|
2528 | { |
|
|
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2531 | } |
|
|
2532 | } |
|
|
2533 | else |
|
|
2534 | #endif |
|
|
2535 | { |
2505 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2538 | } |
|
|
2539 | |
2506 | XClearWindow (dpy, parent[0]); |
2540 | XClearWindow (dpy, parent[0]); |
2507 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2508 | |
2541 | |
2509 | if (scrollBar.win) |
2542 | if (scrollBar.win) |
2510 | { |
2543 | { |
|
|
2544 | if (transparent) |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2546 | else |
2511 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2512 | scrollBar.state = STATE_IDLE; |
2548 | scrollBar.state = STATE_IDLE; |
2513 | scrollBar.show (0); |
2549 | scrollBar.show (0); |
2514 | } |
2550 | } |
2515 | |
2551 | |
2516 | #endif |
2552 | if (refresh) |
2517 | |
2553 | { |
2518 | /* bgPixmap.apply () does not do the following : */ |
|
|
2519 | scr_clear (); |
2554 | scr_clear (); |
2520 | scr_touch (true); |
2555 | scr_touch (true); |
|
|
2556 | } |
2521 | want_refresh = 1; |
2557 | want_refresh = 1; |
2522 | } |
2558 | } |
2523 | |
2559 | |
2524 | /* ------------------------------------------------------------------------- */ |
2560 | /* ------------------------------------------------------------------------- */ |
2525 | void |
2561 | void |
… | |
… | |
2593 | { |
2629 | { |
2594 | #if !ENABLE_MINIMAL |
2630 | #if !ENABLE_MINIMAL |
2595 | if (selection.rect) |
2631 | if (selection.rect) |
2596 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2632 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2597 | selection.end.row, selection.end.col, |
2633 | selection.end.row, selection.end.col, |
2598 | RS_RVid, RS_RVid | RS_Uline); |
2634 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2599 | else |
2635 | else |
2600 | #endif |
2636 | #endif |
2601 | scr_xor_span (selection.beg.row, selection.beg.col, |
2637 | scr_xor_span (selection.beg.row, selection.beg.col, |
2602 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2603 | RS_RVid); |
2639 | RS_Sel | RS_RVid); |
2604 | } |
2640 | } |
2605 | } |
2641 | } |
2606 | |
2642 | |
2607 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2608 | /* |
2644 | /* |
… | |
… | |
2613 | void |
2649 | void |
2614 | rxvt_term::scr_dump (int fd) NOTHROW |
2650 | rxvt_term::scr_dump (int fd) NOTHROW |
2615 | { |
2651 | { |
2616 | int row, wrote; |
2652 | int row, wrote; |
2617 | unsigned int width, towrite; |
2653 | unsigned int width, towrite; |
2618 | char r1[] = "\n"; |
2654 | const char r1[] = "\n"; |
2619 | |
2655 | |
2620 | for (row = saveLines + top_row; |
2656 | for (row = saveLines + top_row; |
2621 | row < saveLines + nrow - 1; row++) |
2657 | row < saveLines + nrow - 1; row++) |
2622 | { |
2658 | { |
2623 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2659 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2669 | /* ------------------------------------------------------------------------- */ |
2705 | /* ------------------------------------------------------------------------- */ |
2670 | /* |
2706 | /* |
2671 | * Paste a selection direct to the command fd |
2707 | * Paste a selection direct to the command fd |
2672 | */ |
2708 | */ |
2673 | void |
2709 | void |
2674 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2710 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2675 | { |
2711 | { |
2676 | /* convert normal newline chars into common keyboard Return key sequence */ |
2712 | /* convert normal newline chars into common keyboard Return key sequence */ |
2677 | for (unsigned int i = 0; i < len; i++) |
2713 | for (unsigned int i = 0; i < len; i++) |
2678 | if (data[i] == C0_LF) |
2714 | if (data[i] == C0_LF) |
2679 | data[i] = C0_CR; |
2715 | data[i] = C0_CR; |
… | |
… | |
2685 | |
2721 | |
2686 | if (priv_modes & PrivMode_BracketPaste) |
2722 | if (priv_modes & PrivMode_BracketPaste) |
2687 | tt_printf ("\e[201~"); |
2723 | tt_printf ("\e[201~"); |
2688 | } |
2724 | } |
2689 | |
2725 | |
2690 | /* ------------------------------------------------------------------------- */ |
|
|
2691 | /* |
|
|
2692 | * Respond to a notification that a primary selection has been sent |
|
|
2693 | * EXT: SelectionNotify |
|
|
2694 | */ |
|
|
2695 | void |
2726 | void |
2696 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2727 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2697 | { |
2728 | { |
2698 | if (prop == None) /* check for failed XConvertSelection */ |
2729 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2699 | { |
|
|
2700 | if ((selection_type & Sel_CompoundText)) |
|
|
2701 | { |
|
|
2702 | int selnum = selection_type & Sel_whereMask; |
|
|
2703 | |
|
|
2704 | selection_type = 0; |
|
|
2705 | if (selnum != Sel_direct) |
|
|
2706 | selection_request_other (XA_STRING, selnum); |
|
|
2707 | } |
|
|
2708 | |
|
|
2709 | if ((selection_type & Sel_UTF8String)) |
|
|
2710 | { |
|
|
2711 | int selnum = selection_type & Sel_whereMask; |
|
|
2712 | |
|
|
2713 | selection_type = Sel_CompoundText; |
|
|
2714 | if (selnum != Sel_direct) |
|
|
2715 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2716 | else |
|
|
2717 | selection_type = 0; |
|
|
2718 | } |
|
|
2719 | |
|
|
2720 | return; |
|
|
2721 | } |
|
|
2722 | |
|
|
2723 | unsigned long bytes_after; |
|
|
2724 | XTextProperty ct; |
|
|
2725 | |
|
|
2726 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2727 | 0, PROP_SIZE / 4, |
|
|
2728 | delete_prop, AnyPropertyType, |
|
|
2729 | &ct.encoding, &ct.format, |
|
|
2730 | &ct.nitems, &bytes_after, |
|
|
2731 | &ct.value) != Success) |
|
|
2732 | { |
|
|
2733 | ct.value = 0; |
|
|
2734 | goto bailout; |
|
|
2735 | } |
|
|
2736 | |
|
|
2737 | if (ct.encoding == None) |
|
|
2738 | goto bailout; |
|
|
2739 | |
|
|
2740 | if (bytes_after) |
|
|
2741 | { |
|
|
2742 | // fetch and append remaining data |
|
|
2743 | XTextProperty ct2; |
|
|
2744 | |
|
|
2745 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2746 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2747 | delete_prop, AnyPropertyType, |
|
|
2748 | &ct2.encoding, &ct2.format, |
|
|
2749 | &ct2.nitems, &bytes_after, |
|
|
2750 | &ct2.value) != Success) |
|
|
2751 | goto bailout; |
|
|
2752 | |
|
|
2753 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2754 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2755 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2756 | ct.nitems += ct2.nitems; |
|
|
2757 | |
|
|
2758 | XFree (ct2.value); |
|
|
2759 | } |
|
|
2760 | |
|
|
2761 | if (ct.value == 0) |
|
|
2762 | goto bailout; |
|
|
2763 | |
|
|
2764 | if (ct.encoding == xa[XA_INCR]) |
|
|
2765 | { |
|
|
2766 | // INCR selection, start handshake |
|
|
2767 | if (!delete_prop) |
|
|
2768 | XDeleteProperty (dpy, win, prop); |
|
|
2769 | |
|
|
2770 | selection_wait = Sel_incr; |
|
|
2771 | incr_buf_fill = 0; |
|
|
2772 | incr_ev.start (10); |
|
|
2773 | |
|
|
2774 | goto bailout; |
|
|
2775 | } |
|
|
2776 | |
|
|
2777 | if (ct.nitems == 0) |
|
|
2778 | { |
|
|
2779 | if (selection_wait == Sel_incr) |
|
|
2780 | { |
|
|
2781 | XFree (ct.value); |
|
|
2782 | |
|
|
2783 | // finally complete, now paste the whole thing |
|
|
2784 | selection_wait = Sel_normal; |
|
|
2785 | ct.value = (unsigned char *)incr_buf; |
|
|
2786 | ct.nitems = incr_buf_fill; |
|
|
2787 | incr_buf = 0; |
|
|
2788 | incr_buf_size = 0; |
|
|
2789 | incr_ev.stop (); |
|
|
2790 | } |
|
|
2791 | else |
|
|
2792 | { |
|
|
2793 | if (selection_wait == Sel_normal |
|
|
2794 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2795 | { |
|
|
2796 | /* |
|
|
2797 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2798 | * XConvertSelection () but nothing was presented |
|
|
2799 | */ |
|
|
2800 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2801 | } |
|
|
2802 | |
|
|
2803 | goto bailout; |
|
|
2804 | } |
|
|
2805 | } |
|
|
2806 | else if (selection_wait == Sel_incr) |
|
|
2807 | { |
|
|
2808 | incr_ev.start (10); |
|
|
2809 | |
|
|
2810 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2811 | { |
|
|
2812 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2813 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2814 | } |
|
|
2815 | |
|
|
2816 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2817 | incr_buf_fill += ct.nitems; |
|
|
2818 | |
|
|
2819 | goto bailout; |
|
|
2820 | } |
|
|
2821 | |
|
|
2822 | char **cl; |
|
|
2823 | int cr; |
|
|
2824 | |
|
|
2825 | #if !ENABLE_MINIMAL |
|
|
2826 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2827 | // so recode it manually |
|
|
2828 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2829 | { |
|
|
2830 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2831 | char *s = rxvt_wcstombs (w); |
|
|
2832 | free (w); |
|
|
2833 | // TODO: strlen == only the first element will be converted. well... |
|
|
2834 | paste (s, strlen (s)); |
|
|
2835 | free (s); |
|
|
2836 | } |
|
|
2837 | else |
|
|
2838 | #endif |
|
|
2839 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2840 | && cl) |
|
|
2841 | { |
|
|
2842 | for (int i = 0; i < cr; i++) |
|
|
2843 | paste (cl[i], strlen (cl[i])); |
|
|
2844 | |
|
|
2845 | XFreeStringList (cl); |
|
|
2846 | } |
|
|
2847 | else |
|
|
2848 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2849 | |
|
|
2850 | bailout: |
|
|
2851 | XFree (ct.value); |
|
|
2852 | |
|
|
2853 | if (selection_wait == Sel_normal) |
|
|
2854 | selection_wait = Sel_none; |
|
|
2855 | } |
|
|
2856 | |
|
|
2857 | void |
|
|
2858 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2859 | { |
|
|
2860 | selection_wait = Sel_none; |
|
|
2861 | |
|
|
2862 | incr_buf_size = 0; |
|
|
2863 | free (incr_buf); |
|
|
2864 | |
|
|
2865 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2866 | } |
|
|
2867 | |
|
|
2868 | void |
|
|
2869 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2870 | { |
|
|
2871 | if (prop == None || selection_wait != Sel_incr) |
|
|
2872 | return; |
2730 | return; |
2873 | |
2731 | |
2874 | selection_paste (win, prop, true); |
2732 | tt_paste (data, len); |
2875 | } |
2733 | } |
2876 | |
2734 | |
2877 | /* ------------------------------------------------------------------------- */ |
2735 | /* ------------------------------------------------------------------------- */ |
2878 | /* |
2736 | /* |
2879 | * Request the current selection: |
2737 | * Request the current selection: |
… | |
… | |
2882 | * > CUT_BUFFER0 |
2740 | * > CUT_BUFFER0 |
2883 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2741 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2884 | * will auto fallback to CUT_BUFFER0 |
2742 | * will auto fallback to CUT_BUFFER0 |
2885 | * EXT: button 2 release |
2743 | * EXT: button 2 release |
2886 | */ |
2744 | */ |
|
|
2745 | |
|
|
2746 | static void |
|
|
2747 | selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr) |
|
|
2748 | { |
|
|
2749 | rxvt_term *term = (rxvt_term *)ptr; |
|
|
2750 | |
|
|
2751 | if (data) |
|
|
2752 | term->paste (data, len); |
|
|
2753 | delete rs; |
|
|
2754 | term->selection_req = 0; |
|
|
2755 | } |
|
|
2756 | |
2887 | void |
2757 | void |
2888 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2758 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2889 | { |
2759 | { |
2890 | if (selection.text && selnum == Sel_Primary) |
2760 | if (selection.text && selnum == Sel_Primary) |
2891 | { |
2761 | { |
… | |
… | |
2893 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2763 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2894 | paste (str, strlen (str)); |
2764 | paste (str, strlen (str)); |
2895 | free (str); |
2765 | free (str); |
2896 | return; |
2766 | return; |
2897 | } |
2767 | } |
2898 | else |
2768 | else if (!selection_req) |
2899 | { |
|
|
2900 | selection_request_time = tm; |
|
|
2901 | selection_wait = Sel_normal; |
|
|
2902 | |
|
|
2903 | #if X_HAVE_UTF8_STRING |
|
|
2904 | selection_type = Sel_UTF8String; |
|
|
2905 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2906 | return; |
|
|
2907 | #else |
|
|
2908 | selection_type = Sel_CompoundText; |
|
|
2909 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2910 | return; |
|
|
2911 | #endif |
|
|
2912 | } |
2769 | { |
2913 | |
2770 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); |
2914 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2771 | selection_req->run (); |
2915 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2916 | } |
|
|
2917 | |
|
|
2918 | int |
|
|
2919 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2920 | { |
|
|
2921 | Atom sel; |
|
|
2922 | |
|
|
2923 | selection_type |= selnum; |
|
|
2924 | |
|
|
2925 | if (selnum == Sel_Primary) |
|
|
2926 | sel = XA_PRIMARY; |
|
|
2927 | else if (selnum == Sel_Secondary) |
|
|
2928 | sel = XA_SECONDARY; |
|
|
2929 | else |
|
|
2930 | sel = xa[XA_CLIPBOARD]; |
|
|
2931 | |
|
|
2932 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2933 | { |
2772 | } |
2934 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2935 | vt, selection_request_time); |
|
|
2936 | return 1; |
|
|
2937 | } |
|
|
2938 | |
|
|
2939 | return 0; |
|
|
2940 | } |
2773 | } |
2941 | |
2774 | |
2942 | /* ------------------------------------------------------------------------- */ |
2775 | /* ------------------------------------------------------------------------- */ |
2943 | /* |
2776 | /* |
2944 | * Clear all selected text |
2777 | * Clear all selected text |
2945 | * EXT: SelectionClear |
2778 | * EXT: SelectionClear |
2946 | */ |
2779 | */ |
2947 | void |
2780 | void |
2948 | rxvt_term::selection_clear () NOTHROW |
2781 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2949 | { |
2782 | { |
|
|
2783 | if (!clipboard) |
|
|
2784 | { |
2950 | want_refresh = 1; |
2785 | want_refresh = 1; |
2951 | free (selection.text); |
2786 | free (selection.text); |
2952 | selection.text = NULL; |
2787 | selection.text = NULL; |
2953 | selection.len = 0; |
2788 | selection.len = 0; |
2954 | CLEAR_SELECTION (); |
2789 | CLEAR_SELECTION (); |
2955 | |
2790 | |
2956 | if (display->selection_owner == this) |
2791 | if (display->selection_owner == this) |
2957 | display->selection_owner = 0; |
2792 | display->selection_owner = 0; |
|
|
2793 | } |
|
|
2794 | else |
|
|
2795 | { |
|
|
2796 | free (selection.clip_text); |
|
|
2797 | selection.clip_text = NULL; |
|
|
2798 | selection.clip_len = 0; |
|
|
2799 | |
|
|
2800 | if (display->clipboard_owner == this) |
|
|
2801 | display->clipboard_owner = 0; |
|
|
2802 | } |
2958 | } |
2803 | } |
2959 | |
2804 | |
2960 | /* ------------------------------------------------------------------------- */ |
2805 | /* ------------------------------------------------------------------------- */ |
2961 | /* |
2806 | /* |
2962 | * Copy a selection into the cut buffer |
2807 | * Copy a selection into the cut buffer |
2963 | * EXT: button 1 or 3 release |
2808 | * EXT: button 1 or 3 release |
2964 | */ |
2809 | */ |
2965 | void |
2810 | void |
2966 | rxvt_term::selection_make (Time tm) |
2811 | rxvt_term::selection_make (Time tm) |
2967 | { |
2812 | { |
2968 | int i; |
2813 | int size; |
2969 | wchar_t *new_selection_text; |
2814 | wchar_t *new_selection_text; |
2970 | text_t *t; |
2815 | text_t *t; |
2971 | |
2816 | |
2972 | switch (selection.op) |
2817 | switch (selection.op) |
2973 | { |
2818 | { |
… | |
… | |
2989 | return; /* nothing selected, go away */ |
2834 | return; /* nothing selected, go away */ |
2990 | |
2835 | |
2991 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2836 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2992 | return; |
2837 | return; |
2993 | |
2838 | |
2994 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2839 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2995 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2840 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2996 | |
2841 | |
2997 | int ofs = 0; |
2842 | int ofs = 0; |
2998 | int extra = 0; |
2843 | int extra = 0; |
2999 | |
2844 | |
3000 | int col = selection.beg.col; |
2845 | int col = selection.beg.col; |
… | |
… | |
3006 | { |
2851 | { |
3007 | #if !ENABLE_MINIMAL |
2852 | #if !ENABLE_MINIMAL |
3008 | if (selection.rect) |
2853 | if (selection.rect) |
3009 | { |
2854 | { |
3010 | col = selection.beg.col; |
2855 | col = selection.beg.col; |
3011 | end_col = ncol + 1; |
2856 | end_col = selection.end.col; |
3012 | } |
2857 | } |
3013 | else |
2858 | else |
3014 | #endif |
2859 | #endif |
3015 | end_col = ROW(row).l; |
2860 | end_col = ROW(row).l; |
3016 | |
2861 | |
3017 | col = max (col, 0); |
2862 | col = max (col, 0); |
3018 | |
2863 | |
3019 | if (row == selection.end.row |
2864 | if (row == selection.end.row) |
3020 | #if !ENABLE_MINIMAL |
|
|
3021 | || selection.rect |
|
|
3022 | #endif |
|
|
3023 | ) |
|
|
3024 | min_it (end_col, selection.end.col); |
2865 | min_it (end_col, selection.end.col); |
3025 | |
2866 | |
3026 | t = ROW(row).t + col; |
2867 | t = ROW(row).t + col; |
3027 | |
2868 | |
3028 | for (; col < end_col; col++) |
2869 | for (; col < end_col; col++) |
… | |
… | |
3036 | |
2877 | |
3037 | extra -= (len - 1); |
2878 | extra -= (len - 1); |
3038 | |
2879 | |
3039 | if (extra < 0) |
2880 | if (extra < 0) |
3040 | { |
2881 | { |
3041 | extra += i; |
2882 | extra += size; |
3042 | i += i; |
2883 | size += size; |
3043 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2884 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3044 | } |
2885 | } |
3045 | |
2886 | |
3046 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2887 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3047 | } |
2888 | } |
3048 | #endif |
2889 | #endif |
… | |
… | |
3060 | |
2901 | |
3061 | new_selection_text[ofs++] = C0_LF; |
2902 | new_selection_text[ofs++] = C0_LF; |
3062 | } |
2903 | } |
3063 | else |
2904 | else |
3064 | #endif |
2905 | #endif |
3065 | if (!ROW(row).is_longer () && row != selection.end.row) |
2906 | if (!ROW(row).is_longer () |
|
|
2907 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2908 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3066 | new_selection_text[ofs++] = C0_LF; |
2909 | new_selection_text[ofs++] = C0_LF; |
3067 | } |
2910 | } |
3068 | |
|
|
3069 | if (end_col != selection.end.col) |
|
|
3070 | new_selection_text[ofs++] = C0_LF; |
|
|
3071 | |
2911 | |
3072 | new_selection_text[ofs] = 0; |
2912 | new_selection_text[ofs] = 0; |
3073 | |
2913 | |
3074 | if (ofs == 0) |
2914 | if (ofs == 0) |
3075 | { |
2915 | { |
… | |
… | |
3088 | |
2928 | |
3089 | selection_grab (tm); |
2929 | selection_grab (tm); |
3090 | } |
2930 | } |
3091 | |
2931 | |
3092 | bool |
2932 | bool |
3093 | rxvt_term::selection_grab (Time tm) NOTHROW |
2933 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3094 | { |
2934 | { |
|
|
2935 | Atom sel; |
|
|
2936 | |
|
|
2937 | if (!clipboard) |
|
|
2938 | { |
3095 | selection_time = tm; |
2939 | selection_time = tm; |
|
|
2940 | sel = XA_PRIMARY; |
|
|
2941 | } |
|
|
2942 | else |
|
|
2943 | { |
|
|
2944 | clipboard_time = tm; |
|
|
2945 | sel = xa[XA_CLIPBOARD]; |
|
|
2946 | } |
3096 | |
2947 | |
3097 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2948 | XSetSelectionOwner (dpy, sel, vt, tm); |
3098 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2949 | if (XGetSelectionOwner (dpy, sel) == vt) |
3099 | { |
2950 | { |
3100 | display->set_selection_owner (this); |
2951 | display->set_selection_owner (this, clipboard); |
3101 | return true; |
2952 | return true; |
3102 | } |
2953 | } |
3103 | else |
2954 | else |
3104 | { |
2955 | { |
3105 | selection_clear (); |
2956 | selection_clear (clipboard); |
3106 | return false; |
2957 | return false; |
3107 | } |
2958 | } |
3108 | |
2959 | |
3109 | #if 0 |
2960 | #if 0 |
3110 | XTextProperty ct; |
2961 | XTextProperty ct; |
… | |
… | |
3605 | else if (rq.target == xa[XA_MULTIPLE]) |
3456 | else if (rq.target == xa[XA_MULTIPLE]) |
3606 | { |
3457 | { |
3607 | /* TODO: Handle MULTIPLE */ |
3458 | /* TODO: Handle MULTIPLE */ |
3608 | } |
3459 | } |
3609 | #endif |
3460 | #endif |
3610 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3461 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3611 | { |
3462 | { |
3612 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3463 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3613 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3464 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3465 | ev.property = rq.property; |
|
|
3466 | } |
|
|
3467 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3468 | { |
|
|
3469 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3470 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3614 | ev.property = rq.property; |
3471 | ev.property = rq.property; |
3615 | } |
3472 | } |
3616 | else if (rq.target == XA_STRING |
3473 | else if (rq.target == XA_STRING |
3617 | || rq.target == xa[XA_TEXT] |
3474 | || rq.target == xa[XA_TEXT] |
3618 | || rq.target == xa[XA_COMPOUND_TEXT] |
3475 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3651 | { |
3508 | { |
3652 | target = xa[XA_COMPOUND_TEXT]; |
3509 | target = xa[XA_COMPOUND_TEXT]; |
3653 | style = enc_compound_text; |
3510 | style = enc_compound_text; |
3654 | } |
3511 | } |
3655 | |
3512 | |
3656 | if (selection.text) |
3513 | if (rq.selection == XA_PRIMARY && selection.text) |
3657 | { |
3514 | { |
3658 | cl = selection.text; |
3515 | cl = selection.text; |
3659 | selectlen = selection.len; |
3516 | selectlen = selection.len; |
|
|
3517 | } |
|
|
3518 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3519 | { |
|
|
3520 | cl = selection.clip_text; |
|
|
3521 | selectlen = selection.clip_len; |
3660 | } |
3522 | } |
3661 | else |
3523 | else |
3662 | { |
3524 | { |
3663 | cl = L""; |
3525 | cl = L""; |
3664 | selectlen = 0; |
3526 | selectlen = 0; |
… | |
… | |
3732 | h += 2; min_it (h, nrow); |
3594 | h += 2; min_it (h, nrow); |
3733 | |
3595 | |
3734 | x -= 1; clamp_it (x, 0, ncol - w); |
3596 | x -= 1; clamp_it (x, 0, ncol - w); |
3735 | y -= 1; clamp_it (y, 0, nrow - h); |
3597 | y -= 1; clamp_it (y, 0, nrow - h); |
3736 | |
3598 | |
3737 | ov_x = x; ov_y = y; |
3599 | ov.x = x; ov.y = y; |
3738 | ov_w = w; ov_h = h; |
3600 | ov.w = w; ov.h = h; |
3739 | |
3601 | |
3740 | ov_text = new text_t *[h]; |
3602 | ov.text = new text_t *[h]; |
3741 | ov_rend = new rend_t *[h]; |
3603 | ov.rend = new rend_t *[h]; |
3742 | |
3604 | |
3743 | for (y = 0; y < h; y++) |
3605 | for (y = 0; y < h; y++) |
3744 | { |
3606 | { |
3745 | text_t *tp = ov_text[y] = new text_t[w]; |
3607 | text_t *tp = ov.text[y] = new text_t[w]; |
3746 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3608 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3747 | |
3609 | |
3748 | text_t t0, t1, t2; |
3610 | text_t t0, t1, t2; |
3749 | rend_t r = OVERLAY_RSTYLE; |
3611 | rend_t r = OVERLAY_RSTYLE; |
3750 | |
3612 | |
3751 | if (y == 0) |
3613 | if (y == 0) |
… | |
… | |
3770 | } |
3632 | } |
3771 | |
3633 | |
3772 | void |
3634 | void |
3773 | rxvt_term::scr_overlay_off () NOTHROW |
3635 | rxvt_term::scr_overlay_off () NOTHROW |
3774 | { |
3636 | { |
3775 | if (!ov_text) |
3637 | if (!ov.text) |
3776 | return; |
3638 | return; |
3777 | |
3639 | |
3778 | want_refresh = 1; |
3640 | want_refresh = 1; |
3779 | |
3641 | |
3780 | for (int y = 0; y < ov_h; y++) |
3642 | for (int y = 0; y < ov.h; y++) |
3781 | { |
3643 | { |
3782 | delete [] ov_text[y]; |
3644 | delete [] ov.text[y]; |
3783 | delete [] ov_rend[y]; |
3645 | delete [] ov.rend[y]; |
3784 | } |
3646 | } |
3785 | |
3647 | |
3786 | delete [] ov_text; ov_text = 0; |
3648 | delete [] ov.text; ov.text = 0; |
3787 | delete [] ov_rend; ov_rend = 0; |
3649 | delete [] ov.rend; ov.rend = 0; |
3788 | } |
3650 | } |
3789 | |
3651 | |
3790 | void |
3652 | void |
3791 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3653 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3792 | { |
3654 | { |
3793 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3655 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3794 | return; |
3656 | return; |
3795 | |
3657 | |
3796 | x++, y++; |
3658 | x++, y++; |
3797 | |
3659 | |
3798 | ov_text[y][x] = text; |
3660 | ov.text[y][x] = text; |
3799 | ov_rend[y][x] = rend; |
3661 | ov.rend[y][x] = rend; |
3800 | } |
3662 | } |
3801 | |
3663 | |
3802 | void |
3664 | void |
3803 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3665 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3804 | { |
3666 | { |
… | |
… | |
3823 | } |
3685 | } |
3824 | |
3686 | |
3825 | void |
3687 | void |
3826 | rxvt_term::scr_swap_overlay () NOTHROW |
3688 | rxvt_term::scr_swap_overlay () NOTHROW |
3827 | { |
3689 | { |
3828 | if (!ov_text) |
3690 | if (!ov.text) |
3829 | return; |
3691 | return; |
3830 | |
3692 | |
|
|
3693 | // hide cursor if it is within the overlay area |
|
|
3694 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3695 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3696 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3697 | |
3831 | // swap screen mem with overlay |
3698 | // swap screen mem with overlay |
3832 | for (int y = ov_h; y--; ) |
3699 | for (int y = ov.h; y--; ) |
3833 | { |
3700 | { |
3834 | text_t *t1 = ov_text[y]; |
3701 | text_t *t1 = ov.text[y]; |
3835 | rend_t *r1 = ov_rend[y]; |
3702 | rend_t *r1 = ov.rend[y]; |
3836 | |
3703 | |
3837 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3704 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3838 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3705 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3839 | |
3706 | |
3840 | for (int x = ov_w; x--; ) |
3707 | for (int x = ov.w; x--; ) |
3841 | { |
3708 | { |
3842 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3709 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3843 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3710 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3844 | } |
3711 | } |
3845 | } |
3712 | } |