… | |
… | |
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 seperate 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 | |
… | |
… | |
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 (); |
… | |
… | |
448 | { |
457 | { |
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 | |
|
|
454 | rvideo_mode = false; |
|
|
455 | |
|
|
456 | if (current_screen != PRIMARY) |
|
|
457 | 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 | |
462 | |
465 | if (current_screen != PRIMARY) |
463 | if (current_screen != PRIMARY) |
466 | scr_swap_screen (); |
464 | scr_swap_screen (); |
467 | |
465 | |
468 | scr_scroll_region (0, MAX_ROWS - 1); |
466 | scr_scroll_region (0, MAX_ROWS - 1); |
… | |
… | |
513 | } |
511 | } |
514 | |
512 | |
515 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
516 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
517 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
518 | #ifdef DEBUG_STRICT |
|
|
519 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
520 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
521 | #endif |
|
|
522 | } |
518 | } |
523 | |
519 | |
524 | void |
520 | void |
525 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
526 | { |
522 | { |
… | |
… | |
551 | want_refresh = 1; |
547 | want_refresh = 1; |
552 | view_start = 0; |
548 | view_start = 0; |
553 | |
549 | |
554 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
555 | |
551 | |
556 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
557 | |
553 | |
558 | #if NSCREENS |
554 | #if NSCREENS |
559 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
560 | { |
556 | { |
561 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
786 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
787 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
788 | } |
784 | } |
789 | } |
785 | } |
790 | |
786 | |
791 | #ifdef DEBUG_STRICT |
|
|
792 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
793 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
794 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
795 | #endif |
|
|
796 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
797 | |
791 | |
798 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
799 | |
793 | |
800 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
… | |
… | |
1004 | #endif |
998 | #endif |
1005 | } |
999 | } |
1006 | |
1000 | |
1007 | max_it (line->l, screen.cur.col); |
1001 | max_it (line->l, screen.cur.col); |
1008 | |
1002 | |
1009 | #ifdef DEBUG_STRICT |
|
|
1010 | assert (screen.cur.row >= 0); |
1003 | assert (screen.cur.row >= 0); |
1011 | #endif |
|
|
1012 | } |
1004 | } |
1013 | |
1005 | |
1014 | /* ------------------------------------------------------------------------- */ |
1006 | /* ------------------------------------------------------------------------- */ |
1015 | /* |
1007 | /* |
1016 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1008 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1344 | if (row >= nrow) /* Out Of Bounds */ |
1336 | if (row >= nrow) /* Out Of Bounds */ |
1345 | return; |
1337 | return; |
1346 | |
1338 | |
1347 | min_it (num, nrow - row); |
1339 | min_it (num, nrow - row); |
1348 | |
1340 | |
1349 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1341 | // TODO: the code below does not work when view_start != 0 |
|
|
1342 | // the workaround is to disable the clear and use a normal refresh |
|
|
1343 | // when view_start != 0. mysterious. |
1350 | if (rstyle & (RS_RVid | RS_Uline)) |
1344 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1351 | ren = (rend_t) ~RS_None; |
1345 | ren = (rend_t) ~RS_None; |
1352 | else if (GET_BASEBG (rstyle) == Color_bg) |
1346 | else if (GET_BASEBG (rstyle) == Color_bg) |
1353 | { |
1347 | { |
1354 | ren = DEFAULT_RSTYLE; |
1348 | ren = DEFAULT_RSTYLE; |
1355 | |
1349 | |
1356 | if (mapped) |
1350 | if (mapped && !view_start) |
1357 | XClearArea (dpy, vt, 0, |
1351 | XClearArea (dpy, vt, 0, |
1358 | Row2Pixel (row), (unsigned int)width, |
1352 | Row2Pixel (row - view_start), (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num), False); |
1353 | (unsigned int)Height2Pixel (num), False); |
1360 | } |
1354 | } |
1361 | else |
1355 | else |
1362 | { |
1356 | { |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1357 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1364 | |
1358 | |
|
|
1359 | if (mapped && !view_start) |
|
|
1360 | { |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1361 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1362 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XFillRectangle (dpy, vt, gc, |
1363 | XFillRectangle (dpy, vt, gc, |
1368 | 0, Row2Pixel (row), |
1364 | 0, Row2Pixel (row - view_start), |
1369 | (unsigned int)width, |
1365 | (unsigned int)width, |
1370 | (unsigned int)Height2Pixel (num)); |
1366 | (unsigned int)Height2Pixel (num)); |
1371 | gcvalue.foreground = pix_colors[Color_fg]; |
1367 | gcvalue.foreground = pix_colors[Color_fg]; |
1372 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1368 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1369 | } |
1373 | } |
1370 | } |
1374 | |
1371 | |
1375 | for (; num--; row++) |
1372 | for (; num--; row++) |
1376 | { |
1373 | { |
1377 | scr_blank_screen_mem (ROW(row), rstyle); |
1374 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1375 | |
|
|
1376 | if (!view_start) |
1378 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1377 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | } |
1378 | } |
1380 | } |
1379 | } |
1381 | |
1380 | |
1382 | #if !ENABLE_MINIMAL |
1381 | #if !ENABLE_MINIMAL |
1383 | void |
1382 | void |
… | |
… | |
1536 | { |
1535 | { |
1537 | line->t[col] = line->t[col + count]; |
1536 | line->t[col] = line->t[col + count]; |
1538 | line->r[col] = line->r[col + count]; |
1537 | line->r[col] = line->r[col + count]; |
1539 | } |
1538 | } |
1540 | |
1539 | |
1541 | scr_blank_line (*line, ncol - count, count, |
1540 | scr_blank_line (*line, ncol - count, count, rstyle); |
1542 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1543 | |
1541 | |
1544 | if (selection.op && current_screen == selection.screen |
1542 | if (selection.op && current_screen == selection.screen |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1543 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1546 | { |
1544 | { |
1547 | if (selection.end.row != screen.cur.row |
1545 | if (selection.end.row != screen.cur.row |
… | |
… | |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1835 | for (i = PART_BEG; i < RC_COUNT; i++) |
1838 | { |
1836 | { |
1839 | min_it (rc[i].col, ncol - 1); |
1837 | min_it (rc[i].col, ncol - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1838 | min_it (rc[i].row, nrow - 1); |
1841 | } |
1839 | } |
1842 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1840 | |
1843 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1841 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1844 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1842 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1845 | |
1843 | |
1846 | num_scr_allow = 0; |
1844 | num_scr_allow = 0; |
1847 | |
1845 | |
… | |
… | |
1938 | |
1936 | |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1937 | bell_ev.start (VISUAL_BELL_DURATION); |
1940 | } |
1938 | } |
1941 | else |
1939 | else |
1942 | XBell (dpy, 0); |
1940 | XBell (dpy, 0); |
|
|
1941 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1943 | #endif |
1942 | #endif |
1944 | } |
1943 | } |
1945 | |
1944 | |
1946 | /* ------------------------------------------------------------------------- */ |
1945 | /* ------------------------------------------------------------------------- */ |
1947 | /* ARGSUSED */ |
1946 | /* ARGSUSED */ |
… | |
… | |
1966 | row_start = view_start; |
1965 | row_start = view_start; |
1967 | } |
1966 | } |
1968 | |
1967 | |
1969 | wctomb (0, 0); |
1968 | wctomb (0, 0); |
1970 | |
1969 | |
1971 | for (int r1 = 0; r1 < nrows; r1++) |
1970 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1972 | { |
1971 | { |
1973 | text_t *tp = ROW(r1).t; |
1972 | text_t *tp = ROW(r1).t; |
1974 | int len = ROW(r1).l; |
1973 | int len = ROW(r1).l; |
1975 | |
1974 | |
1976 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1975 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2005 | * screen.text/screen.rend contain what the screen will change to. |
2004 | * screen.text/screen.rend contain what the screen will change to. |
2006 | */ |
2005 | */ |
2007 | void |
2006 | void |
2008 | rxvt_term::scr_refresh () NOTHROW |
2007 | rxvt_term::scr_refresh () NOTHROW |
2009 | { |
2008 | { |
2010 | unsigned char have_bg, |
|
|
2011 | showcursor; /* show the cursor */ |
|
|
2012 | int16_t col, row, /* column/row we're processing */ |
2009 | int16_t col, row, /* column/row we're processing */ |
2013 | ocrow; /* old cursor row */ |
2010 | ocrow; /* old cursor row */ |
2014 | int i; /* tmp */ |
2011 | int i; /* tmp */ |
2015 | #ifndef NO_CURSORCOLOR |
2012 | #ifndef NO_CURSORCOLOR |
2016 | rend_t cc1; /* store colours at cursor position (s) */ |
2013 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2027 | /* |
2024 | /* |
2028 | * A: set up vars |
2025 | * A: set up vars |
2029 | */ |
2026 | */ |
2030 | refresh_count = 0; |
2027 | refresh_count = 0; |
2031 | |
2028 | |
|
|
2029 | unsigned int old_screen_flags = screen.flags; |
2032 | have_bg = 0; |
2030 | char have_bg = 0; |
2033 | #ifdef HAVE_BG_PIXMAP |
2031 | #ifdef HAVE_BG_PIXMAP |
2034 | have_bg = bgPixmap.pixmap != None; |
2032 | have_bg = bgPixmap.pixmap != None; |
2035 | #endif |
2033 | #endif |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2034 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2037 | |
2035 | |
2038 | /* |
2036 | /* |
2039 | * B: reverse any characters which are selected |
2037 | * B: reverse any characters which are selected |
2040 | */ |
2038 | */ |
2041 | scr_reverse_selection (); |
2039 | scr_reverse_selection (); |
|
|
2040 | |
|
|
2041 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2042 | #if ENABLE_OVERLAY |
|
|
2043 | scr_swap_overlay (); |
|
|
2044 | #endif |
|
|
2045 | |
|
|
2046 | char showcursor = screen.flags & Screen_VisibleCursor; |
2042 | |
2047 | |
2043 | /* |
2048 | /* |
2044 | * C: set the cursor character (s) |
2049 | * C: set the cursor character (s) |
2045 | */ |
2050 | */ |
2046 | { |
2051 | { |
2047 | unsigned char setoldcursor; |
2052 | unsigned char setoldcursor; |
2048 | |
2053 | |
2049 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2050 | #ifdef CURSOR_BLINK |
2054 | #ifdef CURSOR_BLINK |
2051 | if (hidden_cursor) |
2055 | if (hidden_cursor) |
2052 | showcursor = 0; |
2056 | showcursor = 0; |
2053 | #endif |
2057 | #endif |
2054 | |
2058 | |
… | |
… | |
2082 | ccol2 = bgcolor_of (rstyle); |
2086 | ccol2 = bgcolor_of (rstyle); |
2083 | #else |
2087 | #else |
2084 | ccol2 = Color_bg; |
2088 | ccol2 = Color_bg; |
2085 | #endif |
2089 | #endif |
2086 | |
2090 | |
2087 | if (showcursor && focus) |
2091 | if (focus) |
2088 | { |
2092 | { |
2089 | if (option (Opt_cursorUnderline)) |
2093 | if (option (Opt_cursorUnderline)) |
2090 | *crp ^= RS_Uline; |
2094 | *crp ^= RS_Uline; |
2091 | else |
2095 | else |
2092 | { |
2096 | { |
… | |
… | |
2127 | oldcursor.col = screen.cur.col; |
2131 | oldcursor.col = screen.cur.col; |
2128 | } |
2132 | } |
2129 | } |
2133 | } |
2130 | } |
2134 | } |
2131 | |
2135 | |
2132 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2133 | #if ENABLE_OVERLAY |
|
|
2134 | scr_swap_overlay (); |
|
|
2135 | #endif |
|
|
2136 | |
|
|
2137 | #ifndef NO_SLOW_LINK_SUPPORT |
2136 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | /* |
2137 | /* |
2139 | * D: CopyArea pass - very useful for slower links |
2138 | * D: CopyArea pass - very useful for slower links |
2140 | * This has been deliberately kept simple. |
2139 | * This has been deliberately kept simple. |
2141 | */ |
2140 | */ |
… | |
… | |
2233 | |
2232 | |
2234 | // seek to the beginning of wide characters |
2233 | // seek to the beginning of wide characters |
2235 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2234 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2236 | --col; |
2235 | --col; |
2237 | |
2236 | |
2238 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2237 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2239 | text_t *text = stp + col; |
2238 | text_t *text = stp + col; |
2240 | int count = 1; |
2239 | int count = 1; |
2241 | |
2240 | |
2242 | dtp[col] = stp[col]; |
2241 | dtp[col] = stp[col]; |
2243 | drp[col] = rend; |
2242 | drp[col] = rend; |
… | |
… | |
2247 | for (i = 0; ++col < ncol; ) |
2246 | for (i = 0; ++col < ncol; ) |
2248 | { |
2247 | { |
2249 | if (stp[col] == NOCHAR) |
2248 | if (stp[col] == NOCHAR) |
2250 | { |
2249 | { |
2251 | dtp[col] = stp[col]; |
2250 | dtp[col] = stp[col]; |
2252 | drp[col] = rend; |
2251 | drp[col] = srp[col]; |
|
|
2252 | |
2253 | count++; |
2253 | count++; |
2254 | i++; |
2254 | i++; |
2255 | |
2255 | |
2256 | continue; |
2256 | continue; |
2257 | } |
2257 | } |
… | |
… | |
2287 | */ |
2287 | */ |
2288 | int fore = fgcolor_of (rend); // desired foreground |
2288 | int fore = fgcolor_of (rend); // desired foreground |
2289 | int back = bgcolor_of (rend); // desired background |
2289 | int back = bgcolor_of (rend); // desired background |
2290 | |
2290 | |
2291 | // only do special processing if any attributes are set, which is unlikely |
2291 | // only do special processing if any attributes are set, which is unlikely |
2292 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2292 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2293 | { |
2293 | { |
2294 | bool invert = rend & RS_RVid; |
2294 | bool invert = rend & RS_RVid; |
2295 | |
2295 | |
2296 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2296 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2297 | if (rend & RS_Bold && fore == Color_fg) |
2297 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2316 | |
2316 | |
2317 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2317 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2318 | fore = Color_UL; |
2318 | fore = Color_UL; |
2319 | #endif |
2319 | #endif |
2320 | |
2320 | |
|
|
2321 | #ifdef OPTION_HC |
|
|
2322 | if (rend & RS_Sel) |
|
|
2323 | { |
|
|
2324 | /* invert the column if no highlightColor is set or it is the |
|
|
2325 | * current cursor column */ |
|
|
2326 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2327 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2328 | { |
|
|
2329 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2330 | fore = Color_HTC; |
|
|
2331 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2332 | else if (!invert) |
|
|
2333 | fore = back; |
|
|
2334 | |
|
|
2335 | back = Color_HC; |
|
|
2336 | invert = 0; |
|
|
2337 | } |
|
|
2338 | } |
|
|
2339 | #endif |
|
|
2340 | |
2321 | if (invert) |
2341 | if (invert) |
2322 | { |
2342 | { |
2323 | #ifdef OPTION_HC |
|
|
2324 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2325 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2326 | #endif |
|
|
2327 | /* invert the column if no highlightColor is set or it is the |
|
|
2328 | * current cursor column */ |
|
|
2329 | ::swap (fore, back); |
2343 | ::swap (fore, back); |
2330 | #ifdef OPTION_HC |
|
|
2331 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2332 | back = Color_HC; |
|
|
2333 | #endif |
|
|
2334 | |
2344 | |
2335 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2345 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2336 | # ifndef OPTION_HC |
|
|
2337 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2338 | back = Color_RV; |
|
|
2339 | # endif |
|
|
2340 | if (fore == back) |
2346 | if (fore == back) |
2341 | { |
2347 | { |
2342 | fore = Color_bg; |
2348 | fore = Color_bg; |
2343 | back = Color_fg; |
2349 | back = Color_fg; |
2344 | } |
2350 | } |
… | |
… | |
2413 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2419 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2414 | } |
2420 | } |
2415 | } /* for (col....) */ |
2421 | } /* for (col....) */ |
2416 | } /* for (row....) */ |
2422 | } /* for (row....) */ |
2417 | |
2423 | |
2418 | #if ENABLE_OVERLAY |
|
|
2419 | scr_swap_overlay (); |
|
|
2420 | #endif |
|
|
2421 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2422 | |
|
|
2423 | /* |
2424 | /* |
2424 | * G: cleanup cursor and display outline cursor if necessary |
2425 | * G: cleanup cursor and display outline cursor if necessary |
2425 | */ |
2426 | */ |
2426 | if (showcursor) |
2427 | if (showcursor) |
2427 | { |
2428 | { |
… | |
… | |
2465 | } |
2466 | } |
2466 | |
2467 | |
2467 | /* |
2468 | /* |
2468 | * H: cleanup selection |
2469 | * H: cleanup selection |
2469 | */ |
2470 | */ |
|
|
2471 | #if ENABLE_OVERLAY |
|
|
2472 | scr_swap_overlay (); |
|
|
2473 | #endif |
|
|
2474 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2475 | |
2470 | scr_reverse_selection (); |
2476 | scr_reverse_selection (); |
2471 | |
2477 | |
|
|
2478 | screen.flags = old_screen_flags; |
2472 | num_scr = 0; |
2479 | num_scr = 0; |
2473 | num_scr_allow = 1; |
2480 | num_scr_allow = 1; |
2474 | } |
2481 | } |
2475 | |
2482 | |
2476 | void |
2483 | void |
… | |
… | |
2596 | { |
2603 | { |
2597 | #if !ENABLE_MINIMAL |
2604 | #if !ENABLE_MINIMAL |
2598 | if (selection.rect) |
2605 | if (selection.rect) |
2599 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2606 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2600 | selection.end.row, selection.end.col, |
2607 | selection.end.row, selection.end.col, |
2601 | RS_RVid, RS_RVid | RS_Uline); |
2608 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2602 | else |
2609 | else |
2603 | #endif |
2610 | #endif |
2604 | scr_xor_span (selection.beg.row, selection.beg.col, |
2611 | scr_xor_span (selection.beg.row, selection.beg.col, |
2605 | selection.end.row, selection.end.col, |
2612 | selection.end.row, selection.end.col, |
2606 | RS_RVid); |
2613 | RS_Sel | RS_RVid); |
2607 | } |
2614 | } |
2608 | } |
2615 | } |
2609 | |
2616 | |
2610 | /* ------------------------------------------------------------------------- */ |
2617 | /* ------------------------------------------------------------------------- */ |
2611 | /* |
2618 | /* |
… | |
… | |
2904 | selection_wait = Sel_normal; |
2911 | selection_wait = Sel_normal; |
2905 | |
2912 | |
2906 | #if X_HAVE_UTF8_STRING |
2913 | #if X_HAVE_UTF8_STRING |
2907 | selection_type = Sel_UTF8String; |
2914 | selection_type = Sel_UTF8String; |
2908 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2915 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2909 | return; |
2916 | return; |
2910 | #else |
2917 | #else |
2911 | selection_type = Sel_CompoundText; |
2918 | selection_type = Sel_CompoundText; |
2912 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2919 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2913 | return; |
2920 | return; |
2914 | #endif |
2921 | #endif |
2915 | } |
2922 | } |
2916 | |
2923 | |
2917 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2924 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2918 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2925 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2946 | /* |
2953 | /* |
2947 | * Clear all selected text |
2954 | * Clear all selected text |
2948 | * EXT: SelectionClear |
2955 | * EXT: SelectionClear |
2949 | */ |
2956 | */ |
2950 | void |
2957 | void |
2951 | rxvt_term::selection_clear () NOTHROW |
2958 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2952 | { |
2959 | { |
|
|
2960 | if (!clipboard) |
|
|
2961 | { |
2953 | want_refresh = 1; |
2962 | want_refresh = 1; |
2954 | free (selection.text); |
2963 | free (selection.text); |
2955 | selection.text = NULL; |
2964 | selection.text = NULL; |
2956 | selection.len = 0; |
2965 | selection.len = 0; |
2957 | CLEAR_SELECTION (); |
2966 | CLEAR_SELECTION (); |
2958 | |
2967 | |
2959 | if (display->selection_owner == this) |
2968 | if (display->selection_owner == this) |
2960 | display->selection_owner = 0; |
2969 | display->selection_owner = 0; |
|
|
2970 | } |
|
|
2971 | else |
|
|
2972 | { |
|
|
2973 | free (selection.clip_text); |
|
|
2974 | selection.clip_text = NULL; |
|
|
2975 | selection.clip_len = 0; |
|
|
2976 | |
|
|
2977 | if (display->clipboard_owner == this) |
|
|
2978 | display->clipboard_owner = 0; |
|
|
2979 | } |
|
|
2980 | } |
|
|
2981 | |
|
|
2982 | void |
|
|
2983 | rxvt_term::clipboard_copy (Time tm) |
|
|
2984 | { |
|
|
2985 | if (selection.len > 0) |
|
|
2986 | { |
|
|
2987 | free (selection.clip_text); |
|
|
2988 | selection.clip_len = selection.len; |
|
|
2989 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2990 | memcpy (selection.clip_text, selection.text, |
|
|
2991 | sizeof (wchar_t) * selection.clip_len); |
|
|
2992 | selection_grab (tm, true); |
|
|
2993 | } |
2961 | } |
2994 | } |
2962 | |
2995 | |
2963 | /* ------------------------------------------------------------------------- */ |
2996 | /* ------------------------------------------------------------------------- */ |
2964 | /* |
2997 | /* |
2965 | * Copy a selection into the cut buffer |
2998 | * Copy a selection into the cut buffer |
… | |
… | |
3091 | |
3124 | |
3092 | selection_grab (tm); |
3125 | selection_grab (tm); |
3093 | } |
3126 | } |
3094 | |
3127 | |
3095 | bool |
3128 | bool |
3096 | rxvt_term::selection_grab (Time tm) NOTHROW |
3129 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3097 | { |
3130 | { |
|
|
3131 | Atom sel; |
|
|
3132 | |
|
|
3133 | if (!clipboard) |
|
|
3134 | { |
3098 | selection_time = tm; |
3135 | selection_time = tm; |
|
|
3136 | sel = XA_PRIMARY; |
|
|
3137 | } |
|
|
3138 | else |
|
|
3139 | { |
|
|
3140 | clipboard_time = tm; |
|
|
3141 | sel = xa[XA_CLIPBOARD]; |
|
|
3142 | } |
3099 | |
3143 | |
3100 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3144 | XSetSelectionOwner (dpy, sel, vt, tm); |
3101 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3145 | if (XGetSelectionOwner (dpy, sel) == vt) |
3102 | { |
3146 | { |
3103 | display->set_selection_owner (this); |
3147 | display->set_selection_owner (this, clipboard); |
3104 | return true; |
3148 | return true; |
3105 | } |
3149 | } |
3106 | else |
3150 | else |
3107 | { |
3151 | { |
3108 | selection_clear (); |
3152 | selection_clear (clipboard); |
3109 | return false; |
3153 | return false; |
3110 | } |
3154 | } |
3111 | |
3155 | |
3112 | #if 0 |
3156 | #if 0 |
3113 | XTextProperty ct; |
3157 | XTextProperty ct; |
… | |
… | |
3608 | else if (rq.target == xa[XA_MULTIPLE]) |
3652 | else if (rq.target == xa[XA_MULTIPLE]) |
3609 | { |
3653 | { |
3610 | /* TODO: Handle MULTIPLE */ |
3654 | /* TODO: Handle MULTIPLE */ |
3611 | } |
3655 | } |
3612 | #endif |
3656 | #endif |
3613 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3657 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3614 | { |
3658 | { |
3615 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3659 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3616 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3660 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3661 | ev.property = rq.property; |
|
|
3662 | } |
|
|
3663 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3664 | { |
|
|
3665 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3666 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3617 | ev.property = rq.property; |
3667 | ev.property = rq.property; |
3618 | } |
3668 | } |
3619 | else if (rq.target == XA_STRING |
3669 | else if (rq.target == XA_STRING |
3620 | || rq.target == xa[XA_TEXT] |
3670 | || rq.target == xa[XA_TEXT] |
3621 | || rq.target == xa[XA_COMPOUND_TEXT] |
3671 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3654 | { |
3704 | { |
3655 | target = xa[XA_COMPOUND_TEXT]; |
3705 | target = xa[XA_COMPOUND_TEXT]; |
3656 | style = enc_compound_text; |
3706 | style = enc_compound_text; |
3657 | } |
3707 | } |
3658 | |
3708 | |
3659 | if (selection.text) |
3709 | if (rq.selection == XA_PRIMARY && selection.text) |
3660 | { |
3710 | { |
3661 | cl = selection.text; |
3711 | cl = selection.text; |
3662 | selectlen = selection.len; |
3712 | selectlen = selection.len; |
|
|
3713 | } |
|
|
3714 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3715 | { |
|
|
3716 | cl = selection.clip_text; |
|
|
3717 | selectlen = selection.clip_len; |
3663 | } |
3718 | } |
3664 | else |
3719 | else |
3665 | { |
3720 | { |
3666 | cl = L""; |
3721 | cl = L""; |
3667 | selectlen = 0; |
3722 | selectlen = 0; |
… | |
… | |
3735 | h += 2; min_it (h, nrow); |
3790 | h += 2; min_it (h, nrow); |
3736 | |
3791 | |
3737 | x -= 1; clamp_it (x, 0, ncol - w); |
3792 | x -= 1; clamp_it (x, 0, ncol - w); |
3738 | y -= 1; clamp_it (y, 0, nrow - h); |
3793 | y -= 1; clamp_it (y, 0, nrow - h); |
3739 | |
3794 | |
3740 | ov_x = x; ov_y = y; |
3795 | ov.x = x; ov.y = y; |
3741 | ov_w = w; ov_h = h; |
3796 | ov.w = w; ov.h = h; |
3742 | |
3797 | |
3743 | ov_text = new text_t *[h]; |
3798 | ov.text = new text_t *[h]; |
3744 | ov_rend = new rend_t *[h]; |
3799 | ov.rend = new rend_t *[h]; |
3745 | |
3800 | |
3746 | for (y = 0; y < h; y++) |
3801 | for (y = 0; y < h; y++) |
3747 | { |
3802 | { |
3748 | text_t *tp = ov_text[y] = new text_t[w]; |
3803 | text_t *tp = ov.text[y] = new text_t[w]; |
3749 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3804 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3750 | |
3805 | |
3751 | text_t t0, t1, t2; |
3806 | text_t t0, t1, t2; |
3752 | rend_t r = OVERLAY_RSTYLE; |
3807 | rend_t r = OVERLAY_RSTYLE; |
3753 | |
3808 | |
3754 | if (y == 0) |
3809 | if (y == 0) |
… | |
… | |
3773 | } |
3828 | } |
3774 | |
3829 | |
3775 | void |
3830 | void |
3776 | rxvt_term::scr_overlay_off () NOTHROW |
3831 | rxvt_term::scr_overlay_off () NOTHROW |
3777 | { |
3832 | { |
3778 | if (!ov_text) |
3833 | if (!ov.text) |
3779 | return; |
3834 | return; |
3780 | |
3835 | |
3781 | want_refresh = 1; |
3836 | want_refresh = 1; |
3782 | |
3837 | |
3783 | for (int y = 0; y < ov_h; y++) |
3838 | for (int y = 0; y < ov.h; y++) |
3784 | { |
3839 | { |
3785 | delete [] ov_text[y]; |
3840 | delete [] ov.text[y]; |
3786 | delete [] ov_rend[y]; |
3841 | delete [] ov.rend[y]; |
3787 | } |
3842 | } |
3788 | |
3843 | |
3789 | delete [] ov_text; ov_text = 0; |
3844 | delete [] ov.text; ov.text = 0; |
3790 | delete [] ov_rend; ov_rend = 0; |
3845 | delete [] ov.rend; ov.rend = 0; |
3791 | } |
3846 | } |
3792 | |
3847 | |
3793 | void |
3848 | void |
3794 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3849 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3795 | { |
3850 | { |
3796 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3851 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3797 | return; |
3852 | return; |
3798 | |
3853 | |
3799 | x++, y++; |
3854 | x++, y++; |
3800 | |
3855 | |
3801 | ov_text[y][x] = text; |
3856 | ov.text[y][x] = text; |
3802 | ov_rend[y][x] = rend; |
3857 | ov.rend[y][x] = rend; |
3803 | } |
3858 | } |
3804 | |
3859 | |
3805 | void |
3860 | void |
3806 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3861 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3807 | { |
3862 | { |
… | |
… | |
3826 | } |
3881 | } |
3827 | |
3882 | |
3828 | void |
3883 | void |
3829 | rxvt_term::scr_swap_overlay () NOTHROW |
3884 | rxvt_term::scr_swap_overlay () NOTHROW |
3830 | { |
3885 | { |
3831 | if (!ov_text) |
3886 | if (!ov.text) |
3832 | return; |
3887 | return; |
3833 | |
3888 | |
|
|
3889 | // hide cursor if it is within the overlay area |
|
|
3890 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3891 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3892 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3893 | |
3834 | // swap screen mem with overlay |
3894 | // swap screen mem with overlay |
3835 | for (int y = ov_h; y--; ) |
3895 | for (int y = ov.h; y--; ) |
3836 | { |
3896 | { |
3837 | text_t *t1 = ov_text[y]; |
3897 | text_t *t1 = ov.text[y]; |
3838 | rend_t *r1 = ov_rend[y]; |
3898 | rend_t *r1 = ov.rend[y]; |
3839 | |
3899 | |
3840 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3900 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3841 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3901 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3842 | |
3902 | |
3843 | for (int x = ov_w; x--; ) |
3903 | for (int x = ov.w; x--; ) |
3844 | { |
3904 | { |
3845 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3905 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3846 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3906 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3847 | } |
3907 | } |
3848 | } |
3908 | } |