… | |
… | |
143 | col--; |
143 | col--; |
144 | |
144 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
147 | |
148 | // found begin, nuke |
148 | // found start, nuke |
149 | do { |
149 | do { |
150 | l.t[col] = ' '; |
150 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
151 | l.r[col] = rend; |
152 | col++; |
152 | col++; |
153 | } while (col < ncol && l.t[col] == NOCHAR); |
153 | } while (col < ncol && l.t[col] == NOCHAR); |
… | |
… | |
158 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
159 | |
159 | |
160 | void |
160 | void |
161 | rxvt_term::scr_reset () |
161 | rxvt_term::scr_reset () |
162 | { |
162 | { |
163 | #if ENABLE_OVERLAY |
|
|
164 | scr_overlay_off (); |
|
|
165 | #endif |
|
|
166 | |
|
|
167 | rvideo_mode = false; |
|
|
168 | view_start = 0; |
163 | view_start = 0; |
169 | num_scr = 0; |
164 | num_scr = 0; |
170 | |
165 | |
171 | if (ncol == 0) |
166 | if (ncol == 0) |
172 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
174 | if (nrow == 0) |
169 | if (nrow == 0) |
175 | nrow = 24; |
170 | nrow = 24; |
176 | |
171 | |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
178 | return; |
173 | return; |
179 | |
|
|
180 | if (current_screen != PRIMARY) |
|
|
181 | scr_swap_screen (); |
|
|
182 | |
174 | |
183 | // we need at least two lines for wrapping to work correctly |
175 | // we need at least two lines for wrapping to work correctly |
184 | while (nrow + saveLines < 2) |
176 | while (nrow + saveLines < 2) |
185 | { |
177 | { |
186 | //TODO//FIXME |
178 | //TODO//FIXME |
… | |
… | |
239 | selection.text = NULL; |
231 | selection.text = NULL; |
240 | selection.len = 0; |
232 | selection.len = 0; |
241 | selection.op = SELECTION_CLEAR; |
233 | selection.op = SELECTION_CLEAR; |
242 | selection.screen = PRIMARY; |
234 | selection.screen = PRIMARY; |
243 | selection.clicks = 0; |
235 | selection.clicks = 0; |
|
|
236 | selection.clip_text = NULL; |
|
|
237 | selection.clip_len = 0; |
244 | } |
238 | } |
245 | else |
239 | else |
246 | { |
240 | { |
247 | /* |
241 | /* |
248 | * add or delete rows as appropriate |
242 | * add or delete rows as appropriate |
… | |
… | |
286 | |
280 | |
287 | if (top_row) |
281 | if (top_row) |
288 | { |
282 | { |
289 | // 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 |
290 | // 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 |
291 | |
286 | |
292 | row_col_t ocur = screen.cur; |
287 | row_col_t ocur = screen.cur; |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
289 | |
295 | do |
290 | do |
296 | { |
291 | { |
297 | p = MOD (p - 1, prev_total_rows); |
292 | p = MOD (p - 1, prev_total_rows); |
298 | #ifdef DEBUG_STRICT |
|
|
299 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
300 | #endif |
|
|
301 | int plines = 1; |
294 | int plines = 1; |
302 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
303 | |
296 | |
304 | 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 ()) |
305 | { |
298 | { |
… | |
… | |
399 | delete old_ta; |
392 | delete old_ta; |
400 | delete old_ra; |
393 | delete old_ra; |
401 | |
394 | |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
395 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
396 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
397 | } |
404 | |
398 | |
405 | free (tabs); |
399 | free (tabs); |
406 | } |
400 | tabs = (char *)rxvt_malloc (ncol); |
|
|
401 | |
|
|
402 | for (int col = ncol; --col; ) |
|
|
403 | tabs [col] = col % TABSIZE == 0; |
407 | |
404 | |
408 | CLEAR_ALL_SELECTION (); |
405 | CLEAR_ALL_SELECTION (); |
409 | |
406 | |
410 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
412 | |
|
|
413 | tabs = (char *)rxvt_malloc (ncol); |
|
|
414 | |
|
|
415 | for (int col = ncol; --col; ) |
|
|
416 | tabs [col] = col % TABSIZE == 0; |
|
|
417 | |
|
|
418 | if (current_screen != PRIMARY) |
|
|
419 | scr_swap_screen (); |
|
|
420 | |
409 | |
421 | tt_winch (); |
410 | tt_winch (); |
422 | |
411 | |
423 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
412 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
424 | } |
413 | } |
… | |
… | |
436 | delete ralloc; ralloc = 0; |
425 | delete ralloc; ralloc = 0; |
437 | |
426 | |
438 | free (row_buf); |
427 | free (row_buf); |
439 | free (swap_buf); |
428 | free (swap_buf); |
440 | free (drawn_buf); |
429 | free (drawn_buf); |
|
|
430 | row_buf = 0; // signal that we freed all the arrays above |
|
|
431 | |
441 | free (tabs); |
432 | free (tabs); |
442 | |
433 | tabs = 0; |
443 | row_buf = 0; // signal that we freed all the arrays |
|
|
444 | } |
434 | } |
445 | } |
435 | } |
446 | |
436 | |
447 | /* ------------------------------------------------------------------------- */ |
437 | /* ------------------------------------------------------------------------- */ |
448 | /* |
438 | /* |
449 | * Hard reset |
439 | * Hard/Soft reset |
450 | */ |
440 | */ |
451 | void |
441 | void |
452 | rxvt_term::scr_poweron () |
442 | rxvt_term::scr_poweron () |
453 | { |
443 | { |
454 | scr_release (); |
444 | scr_release (); |
455 | prev_nrow = prev_ncol = 0; |
445 | prev_nrow = prev_ncol = 0; |
|
|
446 | rvideo_mode = false; |
|
|
447 | scr_soft_reset (); |
456 | scr_reset (); |
448 | scr_reset (); |
457 | |
449 | |
458 | scr_clear (true); |
450 | scr_clear (true); |
459 | scr_refresh (); |
451 | scr_refresh (); |
|
|
452 | } |
|
|
453 | |
|
|
454 | void |
|
|
455 | rxvt_term::scr_soft_reset () |
|
|
456 | { |
|
|
457 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
458 | #if ENABLE_OVERLAY |
|
|
459 | scr_overlay_off (); |
|
|
460 | #endif |
|
|
461 | |
|
|
462 | if (current_screen != PRIMARY) |
|
|
463 | scr_swap_screen (); |
|
|
464 | |
|
|
465 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
466 | scr_rendition (0, ~RS_None); |
|
|
467 | scr_insert_mode (0); |
460 | } |
468 | } |
461 | |
469 | |
462 | /* ------------------------------------------------------------------------- * |
470 | /* ------------------------------------------------------------------------- * |
463 | * PROCESS SCREEN COMMANDS * |
471 | * PROCESS SCREEN COMMANDS * |
464 | * ------------------------------------------------------------------------- */ |
472 | * ------------------------------------------------------------------------- */ |
… | |
… | |
502 | } |
510 | } |
503 | |
511 | |
504 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
505 | min_it (s->cur.row, nrow - 1); |
513 | min_it (s->cur.row, nrow - 1); |
506 | min_it (s->cur.col, ncol - 1); |
514 | min_it (s->cur.col, ncol - 1); |
507 | #ifdef DEBUG_STRICT |
|
|
508 | assert (s->cur.row >= 0); |
515 | assert (s->cur.row >= 0); |
509 | assert (s->cur.col >= 0); |
516 | assert (s->cur.col >= 0); |
510 | #endif |
|
|
511 | } |
517 | } |
512 | |
518 | |
513 | void |
519 | void |
514 | rxvt_term::scr_swap_screen () |
520 | rxvt_term::scr_swap_screen () |
515 | { |
521 | { |
… | |
… | |
540 | want_refresh = 1; |
546 | want_refresh = 1; |
541 | view_start = 0; |
547 | view_start = 0; |
542 | |
548 | |
543 | selection_check (2); /* check for boundary cross */ |
549 | selection_check (2); /* check for boundary cross */ |
544 | |
550 | |
545 | int i = current_screen; current_screen = scrn; scrn = i; |
551 | current_screen = scrn; |
546 | |
552 | |
547 | #if NSCREENS |
553 | #if NSCREENS |
548 | if (option (Opt_secondaryScreen)) |
554 | if (option (Opt_secondaryScreen)) |
549 | { |
555 | { |
550 | num_scr = 0; |
556 | num_scr = 0; |
… | |
… | |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
781 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
776 | screen.cur.row -= minlines; |
782 | screen.cur.row -= minlines; |
777 | } |
783 | } |
778 | } |
784 | } |
779 | |
785 | |
780 | #ifdef DEBUG_STRICT |
|
|
781 | assert (screen.cur.col < ncol); |
786 | assert (screen.cur.col < ncol); |
782 | assert (screen.cur.row < nrow |
787 | assert (screen.cur.row < nrow |
783 | && screen.cur.row >= top_row); |
788 | && screen.cur.row >= top_row); |
784 | #endif |
|
|
785 | int row = screen.cur.row; |
789 | int row = screen.cur.row; |
786 | |
790 | |
787 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
791 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
788 | |
792 | |
789 | line_t *line = &ROW(row); |
793 | line_t *line = &ROW(row); |
… | |
… | |
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
910 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
907 | |
911 | |
908 | // if the character doesn't fit into the remaining columns... |
912 | // if the character doesn't fit into the remaining columns... |
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
913 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
910 | { |
914 | { |
911 | // ...output spaces |
915 | // ... artificially enlargen the previous one |
912 | c = ' '; |
916 | c = NOCHAR; |
913 | // and try the same character next loop iteration |
917 | // and try the same character next loop iteration |
914 | --str; |
918 | --str; |
915 | } |
919 | } |
916 | |
920 | |
917 | line->touch (); |
921 | line->touch (); |
… | |
… | |
993 | #endif |
997 | #endif |
994 | } |
998 | } |
995 | |
999 | |
996 | max_it (line->l, screen.cur.col); |
1000 | max_it (line->l, screen.cur.col); |
997 | |
1001 | |
998 | #ifdef DEBUG_STRICT |
|
|
999 | assert (screen.cur.row >= 0); |
1002 | assert (screen.cur.row >= 0); |
1000 | #endif |
|
|
1001 | } |
1003 | } |
1002 | |
1004 | |
1003 | /* ------------------------------------------------------------------------- */ |
1005 | /* ------------------------------------------------------------------------- */ |
1004 | /* |
1006 | /* |
1005 | * 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 |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1335 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1336 | return; |
1335 | |
1337 | |
1336 | min_it (num, nrow - row); |
1338 | min_it (num, nrow - row); |
1337 | |
1339 | |
1338 | /*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. |
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1343 | if (rstyle & (RS_RVid | RS_Uline)) |
1340 | ren = (rend_t) ~RS_None; |
1344 | ren = (rend_t) ~RS_None; |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1345 | else if (GET_BASEBG (rstyle) == Color_bg) |
1342 | { |
1346 | { |
1343 | ren = DEFAULT_RSTYLE; |
1347 | ren = DEFAULT_RSTYLE; |
1344 | |
1348 | |
1345 | if (mapped) |
1349 | if (mapped && !view_start) |
1346 | XClearArea (dpy, vt, 0, |
1350 | XClearArea (dpy, vt, 0, |
1347 | Row2Pixel (row), (unsigned int)width, |
1351 | Row2Pixel (row - view_start), (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num), False); |
1352 | (unsigned int)Height2Pixel (num), False); |
1349 | } |
1353 | } |
1350 | else |
1354 | else |
1351 | { |
1355 | { |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1356 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1353 | |
1357 | |
|
|
1358 | if (mapped && !view_start) |
|
|
1359 | { |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1360 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1356 | XFillRectangle (dpy, vt, gc, |
1362 | XFillRectangle (dpy, vt, gc, |
1357 | 0, Row2Pixel (row), |
1363 | 0, Row2Pixel (row - view_start), |
1358 | (unsigned int)width, |
1364 | (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num)); |
1365 | (unsigned int)Height2Pixel (num)); |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1366 | gcvalue.foreground = pix_colors[Color_fg]; |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1368 | } |
1362 | } |
1369 | } |
1363 | |
1370 | |
1364 | for (; num--; row++) |
1371 | for (; num--; row++) |
1365 | { |
1372 | { |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1373 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1374 | |
|
|
1375 | if (!view_start) |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1376 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1368 | } |
1377 | } |
1369 | } |
1378 | } |
1370 | |
1379 | |
1371 | #if !ENABLE_MINIMAL |
1380 | #if !ENABLE_MINIMAL |
1372 | void |
1381 | void |
… | |
… | |
1464 | line_t *line = &ROW(row); |
1473 | line_t *line = &ROW(row); |
1465 | |
1474 | |
1466 | line->touch (); |
1475 | line->touch (); |
1467 | line->is_longer (0); |
1476 | line->is_longer (0); |
1468 | |
1477 | |
|
|
1478 | // nuke wide spanning the start |
|
|
1479 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1480 | scr_kill_char (*line, screen.cur.col); |
|
|
1481 | |
1469 | switch (insdel) |
1482 | switch (insdel) |
1470 | { |
1483 | { |
1471 | case INSERT: |
1484 | case INSERT: |
1472 | line->l = min (line->l + count, ncol); |
1485 | line->l = min (line->l + count, ncol); |
|
|
1486 | |
|
|
1487 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1488 | scr_kill_char (*line, screen.cur.col); |
1473 | |
1489 | |
1474 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1490 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1475 | { |
1491 | { |
1476 | line->t[col] = line->t[col - count]; |
1492 | line->t[col] = line->t[col - count]; |
1477 | line->r[col] = line->r[col - count]; |
1493 | line->r[col] = line->r[col - count]; |
… | |
… | |
1498 | case ERASE: |
1514 | case ERASE: |
1499 | screen.cur.col += count; /* don't worry if > ncol */ |
1515 | screen.cur.col += count; /* don't worry if > ncol */ |
1500 | selection_check (1); |
1516 | selection_check (1); |
1501 | screen.cur.col -= count; |
1517 | screen.cur.col -= count; |
1502 | |
1518 | |
|
|
1519 | // nuke wide char after the end |
|
|
1520 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1521 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1522 | |
1503 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1523 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1504 | break; |
1524 | break; |
1505 | |
1525 | |
1506 | case DELETE: |
1526 | case DELETE: |
1507 | { |
|
|
1508 | line->l = max (line->l - count, 0); |
1527 | line->l = max (line->l - count, 0); |
1509 | |
1528 | |
1510 | rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1529 | // nuke wide char spanning the end |
|
|
1530 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1531 | scr_kill_char (*line, screen.cur.col + count); |
1511 | |
1532 | |
1512 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1533 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1513 | { |
1534 | { |
1514 | line->t[col] = line->t[col + count]; |
1535 | line->t[col] = line->t[col + count]; |
1515 | line->r[col] = line->r[col + count]; |
1536 | line->r[col] = line->r[col + count]; |
1516 | } |
1537 | } |
1517 | |
1538 | |
1518 | // nuke wide char at the end |
|
|
1519 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1520 | scr_kill_char (*line, screen.cur.col); |
|
|
1521 | |
|
|
1522 | scr_blank_line (*line, ncol - count, count, tr); |
1539 | scr_blank_line (*line, ncol - count, count, rstyle); |
1523 | |
1540 | |
1524 | if (selection.op && current_screen == selection.screen |
1541 | if (selection.op && current_screen == selection.screen |
1525 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1542 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1526 | { |
1543 | { |
1527 | if (selection.end.row != screen.cur.row |
1544 | if (selection.end.row != screen.cur.row |
1528 | || (screen.cur.col >= selection.beg.col - count) |
1545 | || (screen.cur.col >= selection.beg.col - count) |
1529 | || selection.end.col >= ncol) |
1546 | || selection.end.col >= ncol) |
1530 | CLEAR_SELECTION (); |
1547 | CLEAR_SELECTION (); |
1531 | else |
1548 | else |
1532 | { |
1549 | { |
1533 | /* shift selection */ |
1550 | /* shift selection */ |
1534 | selection.beg.col -= count; |
1551 | selection.beg.col -= count; |
1535 | selection.mark.col -= count; /* XXX: yes? */ |
1552 | selection.mark.col -= count; /* XXX: yes? */ |
1536 | selection.end.col -= count; |
1553 | selection.end.col -= count; |
1537 | } |
1554 | } |
1538 | } |
|
|
1539 | } |
1555 | } |
1540 | |
1556 | |
1541 | break; |
1557 | break; |
1542 | } |
1558 | } |
1543 | } |
1559 | } |
… | |
… | |
1818 | for (i = PART_BEG; i < RC_COUNT; i++) |
1834 | for (i = PART_BEG; i < RC_COUNT; i++) |
1819 | { |
1835 | { |
1820 | min_it (rc[i].col, ncol - 1); |
1836 | min_it (rc[i].col, ncol - 1); |
1821 | min_it (rc[i].row, nrow - 1); |
1837 | min_it (rc[i].row, nrow - 1); |
1822 | } |
1838 | } |
1823 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1839 | |
1824 | 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++) |
1825 | 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); |
1826 | |
1842 | |
1827 | num_scr_allow = 0; |
1843 | num_scr_allow = 0; |
1828 | |
1844 | |
… | |
… | |
1919 | |
1935 | |
1920 | bell_ev.start (VISUAL_BELL_DURATION); |
1936 | bell_ev.start (VISUAL_BELL_DURATION); |
1921 | } |
1937 | } |
1922 | else |
1938 | else |
1923 | XBell (dpy, 0); |
1939 | XBell (dpy, 0); |
|
|
1940 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1924 | #endif |
1941 | #endif |
1925 | } |
1942 | } |
1926 | |
1943 | |
1927 | /* ------------------------------------------------------------------------- */ |
1944 | /* ------------------------------------------------------------------------- */ |
1928 | /* ARGSUSED */ |
1945 | /* ARGSUSED */ |
… | |
… | |
1947 | row_start = view_start; |
1964 | row_start = view_start; |
1948 | } |
1965 | } |
1949 | |
1966 | |
1950 | wctomb (0, 0); |
1967 | wctomb (0, 0); |
1951 | |
1968 | |
1952 | for (int r1 = 0; r1 < nrows; r1++) |
1969 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1953 | { |
1970 | { |
1954 | text_t *tp = ROW(r1).t; |
1971 | text_t *tp = ROW(r1).t; |
1955 | int len = ROW(r1).l; |
1972 | int len = ROW(r1).l; |
1956 | |
1973 | |
1957 | 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 |
… | |
… | |
1986 | * screen.text/screen.rend contain what the screen will change to. |
2003 | * screen.text/screen.rend contain what the screen will change to. |
1987 | */ |
2004 | */ |
1988 | void |
2005 | void |
1989 | rxvt_term::scr_refresh () NOTHROW |
2006 | rxvt_term::scr_refresh () NOTHROW |
1990 | { |
2007 | { |
1991 | unsigned char have_bg, |
|
|
1992 | showcursor; /* show the cursor */ |
|
|
1993 | int16_t col, row, /* column/row we're processing */ |
2008 | int16_t col, row, /* column/row we're processing */ |
1994 | ocrow; /* old cursor row */ |
2009 | ocrow; /* old cursor row */ |
1995 | int i; /* tmp */ |
2010 | int i; /* tmp */ |
1996 | #ifndef NO_CURSORCOLOR |
2011 | #ifndef NO_CURSORCOLOR |
1997 | rend_t cc1; /* store colours at cursor position (s) */ |
2012 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2008 | /* |
2023 | /* |
2009 | * A: set up vars |
2024 | * A: set up vars |
2010 | */ |
2025 | */ |
2011 | refresh_count = 0; |
2026 | refresh_count = 0; |
2012 | |
2027 | |
|
|
2028 | unsigned int old_screen_flags = screen.flags; |
2013 | have_bg = 0; |
2029 | char have_bg = 0; |
2014 | #ifdef HAVE_BG_PIXMAP |
2030 | #ifdef HAVE_BG_PIXMAP |
2015 | have_bg = bgPixmap.pixmap != None; |
2031 | have_bg = bgPixmap.pixmap != None; |
2016 | #endif |
2032 | #endif |
2017 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2033 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2018 | |
2034 | |
2019 | /* |
2035 | /* |
2020 | * B: reverse any characters which are selected |
2036 | * B: reverse any characters which are selected |
2021 | */ |
2037 | */ |
2022 | 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; |
2023 | |
2046 | |
2024 | /* |
2047 | /* |
2025 | * C: set the cursor character (s) |
2048 | * C: set the cursor character (s) |
2026 | */ |
2049 | */ |
2027 | { |
2050 | { |
2028 | unsigned char setoldcursor; |
2051 | unsigned char setoldcursor; |
2029 | |
2052 | |
2030 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2031 | #ifdef CURSOR_BLINK |
2053 | #ifdef CURSOR_BLINK |
2032 | if (hidden_cursor) |
2054 | if (hidden_cursor) |
2033 | showcursor = 0; |
2055 | showcursor = 0; |
2034 | #endif |
2056 | #endif |
2035 | |
2057 | |
… | |
… | |
2108 | oldcursor.col = screen.cur.col; |
2130 | oldcursor.col = screen.cur.col; |
2109 | } |
2131 | } |
2110 | } |
2132 | } |
2111 | } |
2133 | } |
2112 | |
2134 | |
2113 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2114 | #if ENABLE_OVERLAY |
|
|
2115 | scr_swap_overlay (); |
|
|
2116 | #endif |
|
|
2117 | |
|
|
2118 | #ifndef NO_SLOW_LINK_SUPPORT |
2135 | #ifndef NO_SLOW_LINK_SUPPORT |
2119 | /* |
2136 | /* |
2120 | * D: CopyArea pass - very useful for slower links |
2137 | * D: CopyArea pass - very useful for slower links |
2121 | * This has been deliberately kept simple. |
2138 | * This has been deliberately kept simple. |
2122 | */ |
2139 | */ |
… | |
… | |
2228 | for (i = 0; ++col < ncol; ) |
2245 | for (i = 0; ++col < ncol; ) |
2229 | { |
2246 | { |
2230 | if (stp[col] == NOCHAR) |
2247 | if (stp[col] == NOCHAR) |
2231 | { |
2248 | { |
2232 | dtp[col] = stp[col]; |
2249 | dtp[col] = stp[col]; |
2233 | drp[col] = rend; |
2250 | drp[col] = srp[col]; |
|
|
2251 | |
2234 | count++; |
2252 | count++; |
2235 | i++; |
2253 | i++; |
2236 | |
2254 | |
2237 | continue; |
2255 | continue; |
2238 | } |
2256 | } |
… | |
… | |
2359 | } |
2377 | } |
2360 | |
2378 | |
2361 | /* |
2379 | /* |
2362 | * Actually do the drawing of the string here |
2380 | * Actually do the drawing of the string here |
2363 | */ |
2381 | */ |
2364 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2382 | rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend)); |
2365 | |
2383 | |
2366 | if (expect_true (have_bg && back == Color_bg)) |
2384 | if (expect_true (have_bg && back == Color_bg)) |
2367 | { |
2385 | { |
2368 | // this is very ugly, maybe push it into ->draw? |
2386 | // this is very ugly, maybe push it into ->draw? |
2369 | |
2387 | |
… | |
… | |
2393 | xpixel, ypixel + font->ascent + 1, |
2411 | xpixel, ypixel + font->ascent + 1, |
2394 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2412 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2395 | } |
2413 | } |
2396 | } /* for (col....) */ |
2414 | } /* for (col....) */ |
2397 | } /* for (row....) */ |
2415 | } /* for (row....) */ |
2398 | |
|
|
2399 | #if ENABLE_OVERLAY |
|
|
2400 | scr_swap_overlay (); |
|
|
2401 | #endif |
|
|
2402 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2403 | |
2416 | |
2404 | /* |
2417 | /* |
2405 | * G: cleanup cursor and display outline cursor if necessary |
2418 | * G: cleanup cursor and display outline cursor if necessary |
2406 | */ |
2419 | */ |
2407 | if (showcursor) |
2420 | if (showcursor) |
… | |
… | |
2446 | } |
2459 | } |
2447 | |
2460 | |
2448 | /* |
2461 | /* |
2449 | * H: cleanup selection |
2462 | * H: cleanup selection |
2450 | */ |
2463 | */ |
|
|
2464 | #if ENABLE_OVERLAY |
|
|
2465 | scr_swap_overlay (); |
|
|
2466 | #endif |
|
|
2467 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2468 | |
2451 | scr_reverse_selection (); |
2469 | scr_reverse_selection (); |
2452 | |
2470 | |
|
|
2471 | screen.flags = old_screen_flags; |
2453 | num_scr = 0; |
2472 | num_scr = 0; |
2454 | num_scr_allow = 1; |
2473 | num_scr_allow = 1; |
2455 | } |
2474 | } |
2456 | |
2475 | |
2457 | void |
2476 | void |
… | |
… | |
2927 | /* |
2946 | /* |
2928 | * Clear all selected text |
2947 | * Clear all selected text |
2929 | * EXT: SelectionClear |
2948 | * EXT: SelectionClear |
2930 | */ |
2949 | */ |
2931 | void |
2950 | void |
2932 | rxvt_term::selection_clear () NOTHROW |
2951 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2933 | { |
2952 | { |
|
|
2953 | if (!clipboard) |
|
|
2954 | { |
2934 | want_refresh = 1; |
2955 | want_refresh = 1; |
2935 | free (selection.text); |
2956 | free (selection.text); |
2936 | selection.text = NULL; |
2957 | selection.text = NULL; |
2937 | selection.len = 0; |
2958 | selection.len = 0; |
2938 | CLEAR_SELECTION (); |
2959 | CLEAR_SELECTION (); |
2939 | |
2960 | |
2940 | if (display->selection_owner == this) |
2961 | if (display->selection_owner == this) |
2941 | display->selection_owner = 0; |
2962 | display->selection_owner = 0; |
|
|
2963 | } |
|
|
2964 | else |
|
|
2965 | { |
|
|
2966 | free (selection.clip_text); |
|
|
2967 | selection.clip_text = NULL; |
|
|
2968 | selection.clip_len = 0; |
|
|
2969 | |
|
|
2970 | if (display->clipboard_owner == this) |
|
|
2971 | display->clipboard_owner = 0; |
|
|
2972 | } |
|
|
2973 | } |
|
|
2974 | |
|
|
2975 | void |
|
|
2976 | rxvt_term::clipboard_copy (Time tm) |
|
|
2977 | { |
|
|
2978 | if (selection.len > 0) |
|
|
2979 | { |
|
|
2980 | free (selection.clip_text); |
|
|
2981 | selection.clip_len = selection.len; |
|
|
2982 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2983 | memcpy (selection.clip_text, selection.text, |
|
|
2984 | sizeof (wchar_t) * selection.clip_len); |
|
|
2985 | selection_grab (tm, true); |
|
|
2986 | } |
2942 | } |
2987 | } |
2943 | |
2988 | |
2944 | /* ------------------------------------------------------------------------- */ |
2989 | /* ------------------------------------------------------------------------- */ |
2945 | /* |
2990 | /* |
2946 | * Copy a selection into the cut buffer |
2991 | * Copy a selection into the cut buffer |
… | |
… | |
3072 | |
3117 | |
3073 | selection_grab (tm); |
3118 | selection_grab (tm); |
3074 | } |
3119 | } |
3075 | |
3120 | |
3076 | bool |
3121 | bool |
3077 | rxvt_term::selection_grab (Time tm) NOTHROW |
3122 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3078 | { |
3123 | { |
|
|
3124 | Atom sel; |
|
|
3125 | |
|
|
3126 | if (!clipboard) |
|
|
3127 | { |
3079 | selection_time = tm; |
3128 | selection_time = tm; |
|
|
3129 | sel = XA_PRIMARY; |
|
|
3130 | } |
|
|
3131 | else |
|
|
3132 | { |
|
|
3133 | clipboard_time = tm; |
|
|
3134 | sel = xa[XA_CLIPBOARD]; |
|
|
3135 | } |
3080 | |
3136 | |
3081 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3137 | XSetSelectionOwner (dpy, sel, vt, tm); |
3082 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3138 | if (XGetSelectionOwner (dpy, sel) == vt) |
3083 | { |
3139 | { |
3084 | display->set_selection_owner (this); |
3140 | display->set_selection_owner (this, clipboard); |
3085 | return true; |
3141 | return true; |
3086 | } |
3142 | } |
3087 | else |
3143 | else |
3088 | { |
3144 | { |
3089 | selection_clear (); |
3145 | selection_clear (clipboard); |
3090 | return false; |
3146 | return false; |
3091 | } |
3147 | } |
3092 | |
3148 | |
3093 | #if 0 |
3149 | #if 0 |
3094 | XTextProperty ct; |
3150 | XTextProperty ct; |
… | |
… | |
3589 | else if (rq.target == xa[XA_MULTIPLE]) |
3645 | else if (rq.target == xa[XA_MULTIPLE]) |
3590 | { |
3646 | { |
3591 | /* TODO: Handle MULTIPLE */ |
3647 | /* TODO: Handle MULTIPLE */ |
3592 | } |
3648 | } |
3593 | #endif |
3649 | #endif |
3594 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3650 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3595 | { |
3651 | { |
3596 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3597 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3653 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3654 | ev.property = rq.property; |
|
|
3655 | } |
|
|
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3657 | { |
|
|
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3659 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3598 | ev.property = rq.property; |
3660 | ev.property = rq.property; |
3599 | } |
3661 | } |
3600 | else if (rq.target == XA_STRING |
3662 | else if (rq.target == XA_STRING |
3601 | || rq.target == xa[XA_TEXT] |
3663 | || rq.target == xa[XA_TEXT] |
3602 | || rq.target == xa[XA_COMPOUND_TEXT] |
3664 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3635 | { |
3697 | { |
3636 | target = xa[XA_COMPOUND_TEXT]; |
3698 | target = xa[XA_COMPOUND_TEXT]; |
3637 | style = enc_compound_text; |
3699 | style = enc_compound_text; |
3638 | } |
3700 | } |
3639 | |
3701 | |
3640 | if (selection.text) |
3702 | if (rq.selection == XA_PRIMARY && selection.text) |
3641 | { |
3703 | { |
3642 | cl = selection.text; |
3704 | cl = selection.text; |
3643 | selectlen = selection.len; |
3705 | selectlen = selection.len; |
|
|
3706 | } |
|
|
3707 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3708 | { |
|
|
3709 | cl = selection.clip_text; |
|
|
3710 | selectlen = selection.clip_len; |
3644 | } |
3711 | } |
3645 | else |
3712 | else |
3646 | { |
3713 | { |
3647 | cl = L""; |
3714 | cl = L""; |
3648 | selectlen = 0; |
3715 | selectlen = 0; |
… | |
… | |
3716 | h += 2; min_it (h, nrow); |
3783 | h += 2; min_it (h, nrow); |
3717 | |
3784 | |
3718 | x -= 1; clamp_it (x, 0, ncol - w); |
3785 | x -= 1; clamp_it (x, 0, ncol - w); |
3719 | y -= 1; clamp_it (y, 0, nrow - h); |
3786 | y -= 1; clamp_it (y, 0, nrow - h); |
3720 | |
3787 | |
3721 | ov_x = x; ov_y = y; |
3788 | ov.x = x; ov.y = y; |
3722 | ov_w = w; ov_h = h; |
3789 | ov.w = w; ov.h = h; |
3723 | |
3790 | |
3724 | ov_text = new text_t *[h]; |
3791 | ov.text = new text_t *[h]; |
3725 | ov_rend = new rend_t *[h]; |
3792 | ov.rend = new rend_t *[h]; |
3726 | |
3793 | |
3727 | for (y = 0; y < h; y++) |
3794 | for (y = 0; y < h; y++) |
3728 | { |
3795 | { |
3729 | text_t *tp = ov_text[y] = new text_t[w]; |
3796 | text_t *tp = ov.text[y] = new text_t[w]; |
3730 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3797 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3731 | |
3798 | |
3732 | text_t t0, t1, t2; |
3799 | text_t t0, t1, t2; |
3733 | rend_t r = OVERLAY_RSTYLE; |
3800 | rend_t r = OVERLAY_RSTYLE; |
3734 | |
3801 | |
3735 | if (y == 0) |
3802 | if (y == 0) |
… | |
… | |
3754 | } |
3821 | } |
3755 | |
3822 | |
3756 | void |
3823 | void |
3757 | rxvt_term::scr_overlay_off () NOTHROW |
3824 | rxvt_term::scr_overlay_off () NOTHROW |
3758 | { |
3825 | { |
3759 | if (!ov_text) |
3826 | if (!ov.text) |
3760 | return; |
3827 | return; |
3761 | |
3828 | |
3762 | want_refresh = 1; |
3829 | want_refresh = 1; |
3763 | |
3830 | |
3764 | for (int y = 0; y < ov_h; y++) |
3831 | for (int y = 0; y < ov.h; y++) |
3765 | { |
3832 | { |
3766 | delete [] ov_text[y]; |
3833 | delete [] ov.text[y]; |
3767 | delete [] ov_rend[y]; |
3834 | delete [] ov.rend[y]; |
3768 | } |
3835 | } |
3769 | |
3836 | |
3770 | delete [] ov_text; ov_text = 0; |
3837 | delete [] ov.text; ov.text = 0; |
3771 | delete [] ov_rend; ov_rend = 0; |
3838 | delete [] ov.rend; ov.rend = 0; |
3772 | } |
3839 | } |
3773 | |
3840 | |
3774 | void |
3841 | void |
3775 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3842 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3776 | { |
3843 | { |
3777 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3844 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3778 | return; |
3845 | return; |
3779 | |
3846 | |
3780 | x++, y++; |
3847 | x++, y++; |
3781 | |
3848 | |
3782 | ov_text[y][x] = text; |
3849 | ov.text[y][x] = text; |
3783 | ov_rend[y][x] = rend; |
3850 | ov.rend[y][x] = rend; |
3784 | } |
3851 | } |
3785 | |
3852 | |
3786 | void |
3853 | void |
3787 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3854 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3788 | { |
3855 | { |
… | |
… | |
3807 | } |
3874 | } |
3808 | |
3875 | |
3809 | void |
3876 | void |
3810 | rxvt_term::scr_swap_overlay () NOTHROW |
3877 | rxvt_term::scr_swap_overlay () NOTHROW |
3811 | { |
3878 | { |
3812 | if (!ov_text) |
3879 | if (!ov.text) |
3813 | return; |
3880 | return; |
3814 | |
3881 | |
|
|
3882 | // hide cursor if it is within the overlay area |
|
|
3883 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3884 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3885 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3886 | |
3815 | // swap screen mem with overlay |
3887 | // swap screen mem with overlay |
3816 | for (int y = ov_h; y--; ) |
3888 | for (int y = ov.h; y--; ) |
3817 | { |
3889 | { |
3818 | text_t *t1 = ov_text[y]; |
3890 | text_t *t1 = ov.text[y]; |
3819 | rend_t *r1 = ov_rend[y]; |
3891 | rend_t *r1 = ov.rend[y]; |
3820 | |
3892 | |
3821 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3893 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3822 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3894 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3823 | |
3895 | |
3824 | for (int x = ov_w; x--; ) |
3896 | for (int x = ov.w; x--; ) |
3825 | { |
3897 | { |
3826 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3898 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3827 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3899 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3828 | } |
3900 | } |
3829 | } |
3901 | } |