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