… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
… | |
… | |
143 | col--; |
144 | col--; |
144 | |
145 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
148 | |
|
|
149 | l.touch (); |
|
|
150 | |
148 | // found begin, nuke |
151 | // found start, nuke |
149 | do { |
152 | do { |
150 | l.t[col] = ' '; |
153 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
154 | l.r[col] = rend; |
152 | col++; |
155 | col++; |
153 | } while (col < ncol && l.t[col] == NOCHAR); |
156 | } while (col < ncol && l.t[col] == NOCHAR); |
… | |
… | |
158 | * ------------------------------------------------------------------------- */ |
161 | * ------------------------------------------------------------------------- */ |
159 | |
162 | |
160 | void |
163 | void |
161 | rxvt_term::scr_reset () |
164 | rxvt_term::scr_reset () |
162 | { |
165 | { |
163 | #if ENABLE_OVERLAY |
|
|
164 | scr_overlay_off (); |
|
|
165 | #endif |
|
|
166 | |
|
|
167 | rvideo_mode = false; |
|
|
168 | view_start = 0; |
166 | view_start = 0; |
169 | num_scr = 0; |
167 | num_scr = 0; |
170 | |
168 | |
171 | if (ncol == 0) |
169 | if (ncol == 0) |
172 | ncol = 80; |
170 | ncol = 80; |
… | |
… | |
174 | if (nrow == 0) |
172 | if (nrow == 0) |
175 | nrow = 24; |
173 | nrow = 24; |
176 | |
174 | |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
178 | return; |
176 | return; |
179 | |
|
|
180 | if (current_screen != PRIMARY) |
|
|
181 | scr_swap_screen (); |
|
|
182 | |
177 | |
183 | // we need at least two lines for wrapping to work correctly |
178 | // we need at least two lines for wrapping to work correctly |
184 | while (nrow + saveLines < 2) |
179 | while (nrow + saveLines < 2) |
185 | { |
180 | { |
186 | //TODO//FIXME |
181 | //TODO//FIXME |
… | |
… | |
239 | selection.text = NULL; |
234 | selection.text = NULL; |
240 | selection.len = 0; |
235 | selection.len = 0; |
241 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
242 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
243 | selection.clicks = 0; |
238 | selection.clicks = 0; |
|
|
239 | selection.clip_text = NULL; |
|
|
240 | selection.clip_len = 0; |
244 | } |
241 | } |
245 | else |
242 | else |
246 | { |
243 | { |
247 | /* |
244 | /* |
248 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
286 | |
283 | |
287 | if (top_row) |
284 | if (top_row) |
288 | { |
285 | { |
289 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
290 | // to come up with a lean and mean algorithm. |
287 | // to come up with a lean and mean algorithm. |
|
|
288 | // TODO: maybe optimise when width didn't change |
291 | |
289 | |
292 | row_col_t ocur = screen.cur; |
290 | row_col_t ocur = screen.cur; |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
292 | |
295 | do |
293 | do |
296 | { |
294 | { |
297 | p = MOD (p - 1, prev_total_rows); |
295 | p = MOD (p - 1, prev_total_rows); |
298 | #ifdef DEBUG_STRICT |
|
|
299 | assert (old_buf [MOD (p, prev_total_rows)].t); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
300 | #endif |
|
|
301 | int plines = 1; |
297 | int plines = 1; |
302 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
303 | |
299 | |
304 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
305 | { |
301 | { |
… | |
… | |
399 | delete old_ta; |
395 | delete old_ta; |
400 | delete old_ra; |
396 | delete old_ra; |
401 | |
397 | |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
398 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
399 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
400 | } |
404 | |
401 | |
405 | free (tabs); |
402 | free (tabs); |
406 | } |
403 | tabs = (char *)rxvt_malloc (ncol); |
|
|
404 | |
|
|
405 | for (int col = ncol; col--; ) |
|
|
406 | tabs [col] = col % TABSIZE == 0; |
407 | |
407 | |
408 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_ALL_SELECTION (); |
409 | |
409 | |
410 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
411 | 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 | |
412 | |
421 | tt_winch (); |
413 | tt_winch (); |
422 | |
414 | |
423 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
415 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
424 | } |
416 | } |
… | |
… | |
436 | delete ralloc; ralloc = 0; |
428 | delete ralloc; ralloc = 0; |
437 | |
429 | |
438 | free (row_buf); |
430 | free (row_buf); |
439 | free (swap_buf); |
431 | free (swap_buf); |
440 | free (drawn_buf); |
432 | free (drawn_buf); |
|
|
433 | row_buf = 0; // signal that we freed all the arrays above |
|
|
434 | |
441 | free (tabs); |
435 | free (tabs); |
442 | |
436 | tabs = 0; |
443 | row_buf = 0; // signal that we freed all the arrays |
|
|
444 | } |
437 | } |
445 | } |
438 | } |
446 | |
439 | |
447 | /* ------------------------------------------------------------------------- */ |
440 | /* ------------------------------------------------------------------------- */ |
448 | /* |
441 | /* |
449 | * Hard reset |
442 | * Hard/Soft reset |
450 | */ |
443 | */ |
451 | void |
444 | void |
452 | rxvt_term::scr_poweron () |
445 | rxvt_term::scr_poweron () |
453 | { |
446 | { |
454 | scr_release (); |
447 | scr_release (); |
455 | prev_nrow = prev_ncol = 0; |
448 | prev_nrow = prev_ncol = 0; |
|
|
449 | rvideo_mode = false; |
|
|
450 | scr_soft_reset (); |
456 | scr_reset (); |
451 | scr_reset (); |
457 | |
452 | |
458 | scr_clear (true); |
453 | scr_clear (true); |
459 | scr_refresh (); |
454 | scr_refresh (); |
|
|
455 | } |
|
|
456 | |
|
|
457 | void |
|
|
458 | rxvt_term::scr_soft_reset () |
|
|
459 | { |
|
|
460 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
461 | #if ENABLE_OVERLAY |
|
|
462 | scr_overlay_off (); |
|
|
463 | #endif |
|
|
464 | |
|
|
465 | if (current_screen != PRIMARY) |
|
|
466 | scr_swap_screen (); |
|
|
467 | |
|
|
468 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
469 | scr_rendition (0, ~RS_None); |
|
|
470 | scr_insert_mode (0); |
460 | } |
471 | } |
461 | |
472 | |
462 | /* ------------------------------------------------------------------------- * |
473 | /* ------------------------------------------------------------------------- * |
463 | * PROCESS SCREEN COMMANDS * |
474 | * PROCESS SCREEN COMMANDS * |
464 | * ------------------------------------------------------------------------- */ |
475 | * ------------------------------------------------------------------------- */ |
… | |
… | |
502 | } |
513 | } |
503 | |
514 | |
504 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
515 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
505 | min_it (s->cur.row, nrow - 1); |
516 | min_it (s->cur.row, nrow - 1); |
506 | min_it (s->cur.col, ncol - 1); |
517 | min_it (s->cur.col, ncol - 1); |
507 | #ifdef DEBUG_STRICT |
|
|
508 | assert (s->cur.row >= 0); |
518 | assert (s->cur.row >= 0); |
509 | assert (s->cur.col >= 0); |
519 | assert (s->cur.col >= 0); |
510 | #endif |
|
|
511 | } |
520 | } |
512 | |
521 | |
513 | void |
522 | void |
514 | rxvt_term::scr_swap_screen () |
523 | rxvt_term::scr_swap_screen () |
515 | { |
524 | { |
… | |
… | |
540 | want_refresh = 1; |
549 | want_refresh = 1; |
541 | view_start = 0; |
550 | view_start = 0; |
542 | |
551 | |
543 | selection_check (2); /* check for boundary cross */ |
552 | selection_check (2); /* check for boundary cross */ |
544 | |
553 | |
545 | int i = current_screen; current_screen = scrn; scrn = i; |
554 | current_screen = scrn; |
546 | |
555 | |
547 | #if NSCREENS |
556 | #if NSCREENS |
548 | if (option (Opt_secondaryScreen)) |
557 | if (option (Opt_secondaryScreen)) |
549 | { |
558 | { |
550 | num_scr = 0; |
559 | num_scr = 0; |
… | |
… | |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
784 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
776 | screen.cur.row -= minlines; |
785 | screen.cur.row -= minlines; |
777 | } |
786 | } |
778 | } |
787 | } |
779 | |
788 | |
780 | #ifdef DEBUG_STRICT |
|
|
781 | assert (screen.cur.col < ncol); |
789 | assert (screen.cur.col < ncol); |
782 | assert (screen.cur.row < nrow |
790 | assert (screen.cur.row < nrow |
783 | && screen.cur.row >= top_row); |
791 | && screen.cur.row >= top_row); |
784 | #endif |
|
|
785 | int row = screen.cur.row; |
792 | int row = screen.cur.row; |
786 | |
793 | |
787 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
794 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
788 | |
795 | |
789 | line_t *line = &ROW(row); |
796 | line_t *line = &ROW(row); |
… | |
… | |
893 | # else |
900 | # else |
894 | c = 0xfffd; |
901 | c = 0xfffd; |
895 | # endif |
902 | # endif |
896 | #endif |
903 | #endif |
897 | |
904 | |
898 | // nuke the character at this position, if required |
|
|
899 | if (expect_false ( |
|
|
900 | line->t[screen.cur.col] == NOCHAR |
|
|
901 | || (screen.cur.col < ncol - 1 |
|
|
902 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
903 | )) |
|
|
904 | scr_kill_char (*line, screen.cur.col); |
|
|
905 | |
|
|
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
907 | |
906 | |
908 | // if the character doesn't fit into the remaining columns... |
907 | // if the character doesn't fit into the remaining columns... |
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
910 | { |
909 | { |
911 | // ...output spaces |
910 | if (screen.flags & Screen_Autowrap) |
912 | c = ' '; |
911 | { |
|
|
912 | // ... artificially enlargen the previous one |
|
|
913 | c = NOCHAR; |
913 | // and try the same character next loop iteration |
914 | // and try the same character next loop iteration |
914 | --str; |
915 | --str; |
|
|
916 | } |
|
|
917 | else |
|
|
918 | screen.cur.col = ncol - width; |
915 | } |
919 | } |
|
|
920 | |
|
|
921 | // nuke the character at this position, if required |
|
|
922 | // due to wonderful coincidences everywhere else in this loop |
|
|
923 | // we never have to check for overwriting a wide char itself, |
|
|
924 | // only its tail. |
|
|
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
926 | scr_kill_char (*line, screen.cur.col); |
916 | |
927 | |
917 | line->touch (); |
928 | line->touch (); |
918 | |
929 | |
919 | do |
930 | do |
920 | { |
931 | { |
… | |
… | |
926 | else |
937 | else |
927 | { |
938 | { |
928 | line->l = ncol; |
939 | line->l = ncol; |
929 | if (screen.flags & Screen_Autowrap) |
940 | if (screen.flags & Screen_Autowrap) |
930 | screen.flags |= Screen_WrapNext; |
941 | screen.flags |= Screen_WrapNext; |
931 | break; |
942 | |
|
|
943 | goto end_of_line; |
932 | } |
944 | } |
933 | |
945 | |
934 | c = NOCHAR; |
946 | c = NOCHAR; |
935 | } |
947 | } |
936 | while (expect_false (--width > 0)); |
948 | while (expect_false (--width > 0)); |
937 | |
949 | |
938 | // pad with spaces when overwriting wide character with smaller one |
950 | // pad with spaces when overwriting wide character with smaller one |
939 | if (expect_false (!width)) |
951 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
940 | { |
952 | { |
941 | line->touch (); |
|
|
942 | |
|
|
943 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
944 | { |
|
|
945 | line->t[c] = ' '; |
953 | line->t[c] = ' '; |
946 | line->r[c] = rend; |
954 | line->r[c] = rend; |
947 | } |
|
|
948 | } |
955 | } |
|
|
956 | |
|
|
957 | end_of_line: |
|
|
958 | ; |
949 | } |
959 | } |
950 | #if ENABLE_COMBINING |
960 | #if ENABLE_COMBINING |
951 | else // width == 0 |
961 | else // width == 0 |
952 | { |
962 | { |
953 | if (c != 0xfeff) // ignore BOM |
963 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
993 | #endif |
1003 | #endif |
994 | } |
1004 | } |
995 | |
1005 | |
996 | max_it (line->l, screen.cur.col); |
1006 | max_it (line->l, screen.cur.col); |
997 | |
1007 | |
998 | #ifdef DEBUG_STRICT |
|
|
999 | assert (screen.cur.row >= 0); |
1008 | assert (screen.cur.row >= 0); |
1000 | #endif |
|
|
1001 | } |
1009 | } |
1002 | |
1010 | |
1003 | /* ------------------------------------------------------------------------- */ |
1011 | /* ------------------------------------------------------------------------- */ |
1004 | /* |
1012 | /* |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1013 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1018 | |
1026 | |
1019 | want_refresh = 1; |
1027 | want_refresh = 1; |
1020 | #endif |
1028 | #endif |
1021 | } |
1029 | } |
1022 | } |
1030 | } |
|
|
1031 | else if (screen.flags & Screen_WrapNext) |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
1023 | else |
1033 | else |
1024 | scr_gotorc (0, -1, RELATIVE); |
1034 | scr_gotorc (0, -1, RELATIVE); |
1025 | } |
1035 | } |
1026 | |
1036 | |
1027 | /* ------------------------------------------------------------------------- */ |
1037 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1343 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1344 | return; |
1335 | |
1345 | |
1336 | min_it (num, nrow - row); |
1346 | min_it (num, nrow - row); |
1337 | |
1347 | |
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1348 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1340 | ren = (rend_t) ~RS_None; |
1349 | ren = (rend_t) ~RS_None; |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1350 | else if (GET_BASEBG (rstyle) == Color_bg) |
1342 | { |
1351 | { |
1343 | ren = DEFAULT_RSTYLE; |
1352 | ren = DEFAULT_RSTYLE; |
1344 | |
1353 | |
1345 | if (mapped) |
1354 | if (mapped) |
1346 | XClearArea (dpy, vt, 0, |
1355 | XClearArea (dpy, vt, 0, |
1347 | Row2Pixel (row), (unsigned int)width, |
1356 | Row2Pixel (row - view_start), (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num), False); |
1357 | (unsigned int)Height2Pixel (num), False); |
1349 | } |
1358 | } |
1350 | else |
1359 | else |
1351 | { |
1360 | { |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1361 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1353 | |
1362 | |
|
|
1363 | if (mapped) |
|
|
1364 | { |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1356 | XFillRectangle (dpy, vt, gc, |
1367 | XFillRectangle (dpy, vt, gc, |
1357 | 0, Row2Pixel (row), |
1368 | 0, Row2Pixel (row - view_start), |
1358 | (unsigned int)width, |
1369 | (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num)); |
1370 | (unsigned int)Height2Pixel (num)); |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1371 | gcvalue.foreground = pix_colors[Color_fg]; |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1372 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1373 | } |
1362 | } |
1374 | } |
1363 | |
1375 | |
1364 | for (; num--; row++) |
1376 | for (; num--; row++) |
1365 | { |
1377 | { |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1378 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1379 | |
|
|
1380 | if (row - view_start < nrow) |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1381 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1368 | } |
1382 | } |
1369 | } |
1383 | } |
1370 | |
1384 | |
1371 | #if !ENABLE_MINIMAL |
1385 | #if !ENABLE_MINIMAL |
1372 | void |
1386 | void |
… | |
… | |
1464 | line_t *line = &ROW(row); |
1478 | line_t *line = &ROW(row); |
1465 | |
1479 | |
1466 | line->touch (); |
1480 | line->touch (); |
1467 | line->is_longer (0); |
1481 | line->is_longer (0); |
1468 | |
1482 | |
|
|
1483 | // nuke wide spanning the start |
|
|
1484 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1485 | scr_kill_char (*line, screen.cur.col); |
|
|
1486 | |
1469 | switch (insdel) |
1487 | switch (insdel) |
1470 | { |
1488 | { |
1471 | case INSERT: |
1489 | case INSERT: |
1472 | line->l = min (line->l + count, ncol); |
1490 | line->l = min (line->l + count, ncol); |
|
|
1491 | |
|
|
1492 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1493 | scr_kill_char (*line, screen.cur.col); |
1473 | |
1494 | |
1474 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1495 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1475 | { |
1496 | { |
1476 | line->t[col] = line->t[col - count]; |
1497 | line->t[col] = line->t[col - count]; |
1477 | line->r[col] = line->r[col - count]; |
1498 | line->r[col] = line->r[col - count]; |
… | |
… | |
1498 | case ERASE: |
1519 | case ERASE: |
1499 | screen.cur.col += count; /* don't worry if > ncol */ |
1520 | screen.cur.col += count; /* don't worry if > ncol */ |
1500 | selection_check (1); |
1521 | selection_check (1); |
1501 | screen.cur.col -= count; |
1522 | screen.cur.col -= count; |
1502 | |
1523 | |
|
|
1524 | // nuke wide char after the end |
|
|
1525 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1526 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1527 | |
1503 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1528 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1504 | break; |
1529 | break; |
1505 | |
1530 | |
1506 | case DELETE: |
1531 | case DELETE: |
1507 | { |
|
|
1508 | line->l = max (line->l - count, 0); |
1532 | line->l = max (line->l - count, 0); |
1509 | |
1533 | |
1510 | rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1534 | // nuke wide char spanning the end |
|
|
1535 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1536 | scr_kill_char (*line, screen.cur.col + count); |
1511 | |
1537 | |
1512 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1538 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1513 | { |
1539 | { |
1514 | line->t[col] = line->t[col + count]; |
1540 | line->t[col] = line->t[col + count]; |
1515 | line->r[col] = line->r[col + count]; |
1541 | line->r[col] = line->r[col + count]; |
1516 | } |
1542 | } |
1517 | |
1543 | |
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); |
1544 | scr_blank_line (*line, ncol - count, count, rstyle); |
1523 | |
1545 | |
1524 | if (selection.op && current_screen == selection.screen |
1546 | if (selection.op && current_screen == selection.screen |
1525 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1547 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1526 | { |
1548 | { |
1527 | if (selection.end.row != screen.cur.row |
1549 | if (selection.end.row != screen.cur.row |
1528 | || (screen.cur.col >= selection.beg.col - count) |
1550 | || (screen.cur.col >= selection.beg.col - count) |
1529 | || selection.end.col >= ncol) |
1551 | || selection.end.col >= ncol) |
1530 | CLEAR_SELECTION (); |
1552 | CLEAR_SELECTION (); |
1531 | else |
1553 | else |
1532 | { |
1554 | { |
1533 | /* shift selection */ |
1555 | /* shift selection */ |
1534 | selection.beg.col -= count; |
1556 | selection.beg.col -= count; |
1535 | selection.mark.col -= count; /* XXX: yes? */ |
1557 | selection.mark.col -= count; /* XXX: yes? */ |
1536 | selection.end.col -= count; |
1558 | selection.end.col -= count; |
1537 | } |
1559 | } |
1538 | } |
|
|
1539 | } |
1560 | } |
1540 | |
1561 | |
1541 | break; |
1562 | break; |
1542 | } |
1563 | } |
1543 | } |
1564 | } |
… | |
… | |
1664 | { |
1685 | { |
1665 | rvideo_state = on; |
1686 | rvideo_state = on; |
1666 | |
1687 | |
1667 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1668 | #ifdef HAVE_BG_PIXMAP |
1689 | #ifdef HAVE_BG_PIXMAP |
1669 | if (bgPixmap.pixmap == None) |
1690 | if (bg_pixmap == None) |
1670 | #endif |
1691 | #endif |
1671 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1672 | |
1693 | |
1673 | XGCValues gcvalue; |
1694 | XGCValues gcvalue; |
1674 | gcvalue.foreground = pix_colors[Color_fg]; |
1695 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1818 | for (i = PART_BEG; i < RC_COUNT; i++) |
1839 | for (i = PART_BEG; i < RC_COUNT; i++) |
1819 | { |
1840 | { |
1820 | min_it (rc[i].col, ncol - 1); |
1841 | min_it (rc[i].col, ncol - 1); |
1821 | min_it (rc[i].row, nrow - 1); |
1842 | min_it (rc[i].row, nrow - 1); |
1822 | } |
1843 | } |
1823 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1844 | |
1824 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1845 | 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); |
1846 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1826 | |
1847 | |
1827 | num_scr_allow = 0; |
1848 | num_scr_allow = 0; |
1828 | |
1849 | |
… | |
… | |
1919 | |
1940 | |
1920 | bell_ev.start (VISUAL_BELL_DURATION); |
1941 | bell_ev.start (VISUAL_BELL_DURATION); |
1921 | } |
1942 | } |
1922 | else |
1943 | else |
1923 | XBell (dpy, 0); |
1944 | XBell (dpy, 0); |
|
|
1945 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1924 | #endif |
1946 | #endif |
1925 | } |
1947 | } |
1926 | |
1948 | |
1927 | /* ------------------------------------------------------------------------- */ |
1949 | /* ------------------------------------------------------------------------- */ |
1928 | /* ARGSUSED */ |
1950 | /* ARGSUSED */ |
… | |
… | |
1947 | row_start = view_start; |
1969 | row_start = view_start; |
1948 | } |
1970 | } |
1949 | |
1971 | |
1950 | wctomb (0, 0); |
1972 | wctomb (0, 0); |
1951 | |
1973 | |
1952 | for (int r1 = 0; r1 < nrows; r1++) |
1974 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1953 | { |
1975 | { |
1954 | text_t *tp = ROW(r1).t; |
1976 | text_t *tp = ROW(r1).t; |
1955 | int len = ROW(r1).l; |
1977 | int len = ROW(r1).l; |
1956 | |
1978 | |
1957 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1979 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1986 | * screen.text/screen.rend contain what the screen will change to. |
2008 | * screen.text/screen.rend contain what the screen will change to. |
1987 | */ |
2009 | */ |
1988 | void |
2010 | void |
1989 | rxvt_term::scr_refresh () NOTHROW |
2011 | rxvt_term::scr_refresh () NOTHROW |
1990 | { |
2012 | { |
1991 | unsigned char have_bg, |
|
|
1992 | showcursor; /* show the cursor */ |
|
|
1993 | int16_t col, row, /* column/row we're processing */ |
2013 | int16_t col, row, /* column/row we're processing */ |
1994 | ocrow; /* old cursor row */ |
2014 | ocrow; /* old cursor row */ |
1995 | int i; /* tmp */ |
2015 | int i; /* tmp */ |
1996 | #ifndef NO_CURSORCOLOR |
2016 | #ifndef NO_CURSORCOLOR |
1997 | rend_t cc1; /* store colours at cursor position (s) */ |
2017 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2008 | /* |
2028 | /* |
2009 | * A: set up vars |
2029 | * A: set up vars |
2010 | */ |
2030 | */ |
2011 | refresh_count = 0; |
2031 | refresh_count = 0; |
2012 | |
2032 | |
|
|
2033 | unsigned int old_screen_flags = screen.flags; |
2013 | have_bg = 0; |
2034 | char have_bg = 0; |
2014 | #ifdef HAVE_BG_PIXMAP |
2035 | #ifdef HAVE_BG_PIXMAP |
2015 | have_bg = bgPixmap.pixmap != None; |
2036 | have_bg = bg_pixmap != None; |
2016 | #endif |
2037 | #endif |
2017 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2018 | |
2039 | |
2019 | /* |
2040 | /* |
2020 | * B: reverse any characters which are selected |
2041 | * B: reverse any characters which are selected |
2021 | */ |
2042 | */ |
2022 | scr_reverse_selection (); |
2043 | scr_reverse_selection (); |
|
|
2044 | |
|
|
2045 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2046 | #if ENABLE_OVERLAY |
|
|
2047 | scr_swap_overlay (); |
|
|
2048 | #endif |
|
|
2049 | |
|
|
2050 | char showcursor = screen.flags & Screen_VisibleCursor; |
2023 | |
2051 | |
2024 | /* |
2052 | /* |
2025 | * C: set the cursor character (s) |
2053 | * C: set the cursor character (s) |
2026 | */ |
2054 | */ |
2027 | { |
2055 | { |
2028 | unsigned char setoldcursor; |
2056 | unsigned char setoldcursor; |
2029 | |
2057 | |
2030 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2031 | #ifdef CURSOR_BLINK |
2058 | #ifdef CURSOR_BLINK |
2032 | if (hidden_cursor) |
2059 | if (hidden_cursor) |
2033 | showcursor = 0; |
2060 | showcursor = 0; |
2034 | #endif |
2061 | #endif |
2035 | |
2062 | |
… | |
… | |
2063 | ccol2 = bgcolor_of (rstyle); |
2090 | ccol2 = bgcolor_of (rstyle); |
2064 | #else |
2091 | #else |
2065 | ccol2 = Color_bg; |
2092 | ccol2 = Color_bg; |
2066 | #endif |
2093 | #endif |
2067 | |
2094 | |
2068 | if (showcursor && focus) |
2095 | if (focus) |
2069 | { |
2096 | { |
2070 | if (option (Opt_cursorUnderline)) |
2097 | if (option (Opt_cursorUnderline)) |
2071 | *crp ^= RS_Uline; |
2098 | *crp ^= RS_Uline; |
2072 | else |
2099 | else |
2073 | { |
2100 | { |
… | |
… | |
2108 | oldcursor.col = screen.cur.col; |
2135 | oldcursor.col = screen.cur.col; |
2109 | } |
2136 | } |
2110 | } |
2137 | } |
2111 | } |
2138 | } |
2112 | |
2139 | |
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 |
2140 | #ifndef NO_SLOW_LINK_SUPPORT |
2119 | /* |
2141 | /* |
2120 | * D: CopyArea pass - very useful for slower links |
2142 | * D: CopyArea pass - very useful for slower links |
2121 | * This has been deliberately kept simple. |
2143 | * This has been deliberately kept simple. |
2122 | */ |
2144 | */ |
… | |
… | |
2214 | |
2236 | |
2215 | // seek to the beginning of wide characters |
2237 | // seek to the beginning of wide characters |
2216 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2238 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2217 | --col; |
2239 | --col; |
2218 | |
2240 | |
2219 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2220 | text_t *text = stp + col; |
2242 | text_t *text = stp + col; |
2221 | int count = 1; |
2243 | int count = 1; |
2222 | |
2244 | |
2223 | dtp[col] = stp[col]; |
2245 | dtp[col] = stp[col]; |
2224 | drp[col] = rend; |
2246 | drp[col] = rend; |
… | |
… | |
2228 | for (i = 0; ++col < ncol; ) |
2250 | for (i = 0; ++col < ncol; ) |
2229 | { |
2251 | { |
2230 | if (stp[col] == NOCHAR) |
2252 | if (stp[col] == NOCHAR) |
2231 | { |
2253 | { |
2232 | dtp[col] = stp[col]; |
2254 | dtp[col] = stp[col]; |
2233 | drp[col] = rend; |
2255 | drp[col] = srp[col]; |
|
|
2256 | |
2234 | count++; |
2257 | count++; |
2235 | i++; |
2258 | i++; |
2236 | |
2259 | |
2237 | continue; |
2260 | continue; |
2238 | } |
2261 | } |
… | |
… | |
2268 | */ |
2291 | */ |
2269 | int fore = fgcolor_of (rend); // desired foreground |
2292 | int fore = fgcolor_of (rend); // desired foreground |
2270 | int back = bgcolor_of (rend); // desired background |
2293 | int back = bgcolor_of (rend); // desired background |
2271 | |
2294 | |
2272 | // only do special processing if any attributes are set, which is unlikely |
2295 | // only do special processing if any attributes are set, which is unlikely |
2273 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2296 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2274 | { |
2297 | { |
2275 | bool invert = rend & RS_RVid; |
2298 | bool invert = rend & RS_RVid; |
2276 | |
2299 | |
2277 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2300 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2278 | if (rend & RS_Bold && fore == Color_fg) |
2301 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2297 | |
2320 | |
2298 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2321 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2299 | fore = Color_UL; |
2322 | fore = Color_UL; |
2300 | #endif |
2323 | #endif |
2301 | |
2324 | |
|
|
2325 | #ifdef OPTION_HC |
|
|
2326 | if (rend & RS_Sel) |
|
|
2327 | { |
|
|
2328 | /* invert the column if no highlightColor is set or it is the |
|
|
2329 | * current cursor column */ |
|
|
2330 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2331 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2332 | { |
|
|
2333 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2334 | fore = Color_HTC; |
|
|
2335 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2336 | else if (!invert) |
|
|
2337 | fore = back; |
|
|
2338 | |
|
|
2339 | back = Color_HC; |
|
|
2340 | invert = 0; |
|
|
2341 | } |
|
|
2342 | } |
|
|
2343 | #endif |
|
|
2344 | |
2302 | if (invert) |
2345 | if (invert) |
2303 | { |
2346 | { |
2304 | #ifdef OPTION_HC |
|
|
2305 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2306 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2307 | #endif |
|
|
2308 | /* invert the column if no highlightColor is set or it is the |
|
|
2309 | * current cursor column */ |
|
|
2310 | ::swap (fore, back); |
2347 | ::swap (fore, back); |
2311 | #ifdef OPTION_HC |
|
|
2312 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2313 | back = Color_HC; |
|
|
2314 | #endif |
|
|
2315 | |
2348 | |
2316 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2349 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2317 | # ifndef OPTION_HC |
|
|
2318 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2319 | back = Color_RV; |
|
|
2320 | # endif |
|
|
2321 | if (fore == back) |
2350 | if (fore == back) |
2322 | { |
2351 | { |
2323 | fore = Color_bg; |
2352 | fore = Color_bg; |
2324 | back = Color_fg; |
2353 | back = Color_fg; |
2325 | } |
2354 | } |
… | |
… | |
2394 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2423 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2395 | } |
2424 | } |
2396 | } /* for (col....) */ |
2425 | } /* for (col....) */ |
2397 | } /* for (row....) */ |
2426 | } /* for (row....) */ |
2398 | |
2427 | |
2399 | #if ENABLE_OVERLAY |
|
|
2400 | scr_swap_overlay (); |
|
|
2401 | #endif |
|
|
2402 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2403 | |
|
|
2404 | /* |
2428 | /* |
2405 | * G: cleanup cursor and display outline cursor if necessary |
2429 | * G: cleanup cursor and display outline cursor if necessary |
2406 | */ |
2430 | */ |
2407 | if (showcursor) |
2431 | if (showcursor) |
2408 | { |
2432 | { |
… | |
… | |
2446 | } |
2470 | } |
2447 | |
2471 | |
2448 | /* |
2472 | /* |
2449 | * H: cleanup selection |
2473 | * H: cleanup selection |
2450 | */ |
2474 | */ |
|
|
2475 | #if ENABLE_OVERLAY |
|
|
2476 | scr_swap_overlay (); |
|
|
2477 | #endif |
|
|
2478 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2479 | |
2451 | scr_reverse_selection (); |
2480 | scr_reverse_selection (); |
2452 | |
2481 | |
|
|
2482 | screen.flags = old_screen_flags; |
2453 | num_scr = 0; |
2483 | num_scr = 0; |
2454 | num_scr_allow = 1; |
2484 | num_scr_allow = 1; |
2455 | } |
2485 | } |
2456 | |
2486 | |
2457 | void |
2487 | void |
… | |
… | |
2478 | scr_remap_chars (swap_buf [i]); |
2508 | scr_remap_chars (swap_buf [i]); |
2479 | } |
2509 | } |
2480 | } |
2510 | } |
2481 | |
2511 | |
2482 | void |
2512 | void |
2483 | rxvt_term::scr_recolour () NOTHROW |
2513 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2484 | { |
2514 | { |
|
|
2515 | bool transparent = false; |
|
|
2516 | |
2485 | #ifdef HAVE_BG_PIXMAP |
2517 | #ifdef HAVE_BG_PIXMAP |
2486 | bgPixmap.apply (); |
2518 | if (bg_pixmap != None) |
2487 | #else |
2519 | { |
|
|
2520 | # ifdef ENABLE_TRANSPARENCY |
|
|
2521 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2522 | { |
|
|
2523 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2524 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2488 | |
2525 | |
|
|
2526 | transparent = true; |
|
|
2527 | } |
|
|
2528 | else |
|
|
2529 | # endif |
|
|
2530 | { |
|
|
2531 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2532 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2533 | } |
|
|
2534 | } |
|
|
2535 | else |
|
|
2536 | #endif |
|
|
2537 | { |
2489 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2538 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2539 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2540 | } |
|
|
2541 | |
2490 | XClearWindow (dpy, parent[0]); |
2542 | XClearWindow (dpy, parent[0]); |
2491 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2492 | |
2543 | |
2493 | if (scrollBar.win) |
2544 | if (scrollBar.win) |
2494 | { |
2545 | { |
|
|
2546 | if (transparent) |
|
|
2547 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2548 | else |
2495 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2496 | scrollBar.state = STATE_IDLE; |
2550 | scrollBar.state = STATE_IDLE; |
2497 | scrollBar.show (0); |
2551 | scrollBar.show (0); |
2498 | } |
2552 | } |
2499 | |
2553 | |
2500 | #endif |
2554 | if (refresh) |
2501 | |
2555 | { |
2502 | /* bgPixmap.apply () does not do the following : */ |
|
|
2503 | scr_clear (); |
2556 | scr_clear (); |
2504 | scr_touch (true); |
2557 | scr_touch (true); |
|
|
2558 | } |
2505 | want_refresh = 1; |
2559 | want_refresh = 1; |
2506 | } |
2560 | } |
2507 | |
2561 | |
2508 | /* ------------------------------------------------------------------------- */ |
2562 | /* ------------------------------------------------------------------------- */ |
2509 | void |
2563 | void |
… | |
… | |
2577 | { |
2631 | { |
2578 | #if !ENABLE_MINIMAL |
2632 | #if !ENABLE_MINIMAL |
2579 | if (selection.rect) |
2633 | if (selection.rect) |
2580 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2634 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2581 | selection.end.row, selection.end.col, |
2635 | selection.end.row, selection.end.col, |
2582 | RS_RVid, RS_RVid | RS_Uline); |
2636 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2583 | else |
2637 | else |
2584 | #endif |
2638 | #endif |
2585 | scr_xor_span (selection.beg.row, selection.beg.col, |
2639 | scr_xor_span (selection.beg.row, selection.beg.col, |
2586 | selection.end.row, selection.end.col, |
2640 | selection.end.row, selection.end.col, |
2587 | RS_RVid); |
2641 | RS_Sel | RS_RVid); |
2588 | } |
2642 | } |
2589 | } |
2643 | } |
2590 | |
2644 | |
2591 | /* ------------------------------------------------------------------------- */ |
2645 | /* ------------------------------------------------------------------------- */ |
2592 | /* |
2646 | /* |
… | |
… | |
2597 | void |
2651 | void |
2598 | rxvt_term::scr_dump (int fd) NOTHROW |
2652 | rxvt_term::scr_dump (int fd) NOTHROW |
2599 | { |
2653 | { |
2600 | int row, wrote; |
2654 | int row, wrote; |
2601 | unsigned int width, towrite; |
2655 | unsigned int width, towrite; |
2602 | char r1[] = "\n"; |
2656 | const char r1[] = "\n"; |
2603 | |
2657 | |
2604 | for (row = saveLines + top_row; |
2658 | for (row = saveLines + top_row; |
2605 | row < saveLines + nrow - 1; row++) |
2659 | row < saveLines + nrow - 1; row++) |
2606 | { |
2660 | { |
2607 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2661 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2653 | /* ------------------------------------------------------------------------- */ |
2707 | /* ------------------------------------------------------------------------- */ |
2654 | /* |
2708 | /* |
2655 | * Paste a selection direct to the command fd |
2709 | * Paste a selection direct to the command fd |
2656 | */ |
2710 | */ |
2657 | void |
2711 | void |
2658 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2712 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2659 | { |
2713 | { |
2660 | /* convert normal newline chars into common keyboard Return key sequence */ |
2714 | /* convert normal newline chars into common keyboard Return key sequence */ |
2661 | for (unsigned int i = 0; i < len; i++) |
2715 | for (unsigned int i = 0; i < len; i++) |
2662 | if (data[i] == C0_LF) |
2716 | if (data[i] == C0_LF) |
2663 | data[i] = C0_CR; |
2717 | data[i] = C0_CR; |
… | |
… | |
2667 | |
2721 | |
2668 | tt_write (data, len); |
2722 | tt_write (data, len); |
2669 | |
2723 | |
2670 | if (priv_modes & PrivMode_BracketPaste) |
2724 | if (priv_modes & PrivMode_BracketPaste) |
2671 | tt_printf ("\e[201~"); |
2725 | tt_printf ("\e[201~"); |
|
|
2726 | } |
|
|
2727 | |
|
|
2728 | void |
|
|
2729 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2730 | { |
|
|
2731 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2732 | return; |
|
|
2733 | |
|
|
2734 | tt_paste (data, len); |
2672 | } |
2735 | } |
2673 | |
2736 | |
2674 | /* ------------------------------------------------------------------------- */ |
2737 | /* ------------------------------------------------------------------------- */ |
2675 | /* |
2738 | /* |
2676 | * Respond to a notification that a primary selection has been sent |
2739 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2733 | &ct2.nitems, &bytes_after, |
2796 | &ct2.nitems, &bytes_after, |
2734 | &ct2.value) != Success) |
2797 | &ct2.value) != Success) |
2735 | goto bailout; |
2798 | goto bailout; |
2736 | |
2799 | |
2737 | // realloc should be compatible to XFree, here, and elsewhere, too |
2800 | // realloc should be compatible to XFree, here, and elsewhere, too |
2738 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2801 | ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2739 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2802 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2740 | ct.nitems += ct2.nitems; |
2803 | ct.nitems += ct2.nitems; |
2741 | |
2804 | |
2742 | XFree (ct2.value); |
2805 | XFree (ct2.value); |
2743 | } |
2806 | } |
… | |
… | |
2792 | incr_ev.start (10); |
2855 | incr_ev.start (10); |
2793 | |
2856 | |
2794 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2857 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2795 | { |
2858 | { |
2796 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2859 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2797 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2860 | incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); |
2798 | } |
2861 | } |
2799 | |
2862 | |
2800 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2863 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2801 | incr_buf_fill += ct.nitems; |
2864 | incr_buf_fill += ct.nitems; |
2802 | |
2865 | |
… | |
… | |
2885 | selection_wait = Sel_normal; |
2948 | selection_wait = Sel_normal; |
2886 | |
2949 | |
2887 | #if X_HAVE_UTF8_STRING |
2950 | #if X_HAVE_UTF8_STRING |
2888 | selection_type = Sel_UTF8String; |
2951 | selection_type = Sel_UTF8String; |
2889 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2952 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2890 | return; |
2953 | return; |
2891 | #else |
2954 | #else |
2892 | selection_type = Sel_CompoundText; |
2955 | selection_type = Sel_CompoundText; |
2893 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2956 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2894 | return; |
2957 | return; |
2895 | #endif |
2958 | #endif |
2896 | } |
2959 | } |
2897 | |
2960 | |
2898 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2961 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2899 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2962 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2927 | /* |
2990 | /* |
2928 | * Clear all selected text |
2991 | * Clear all selected text |
2929 | * EXT: SelectionClear |
2992 | * EXT: SelectionClear |
2930 | */ |
2993 | */ |
2931 | void |
2994 | void |
2932 | rxvt_term::selection_clear () NOTHROW |
2995 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2933 | { |
2996 | { |
|
|
2997 | if (!clipboard) |
|
|
2998 | { |
2934 | want_refresh = 1; |
2999 | want_refresh = 1; |
2935 | free (selection.text); |
3000 | free (selection.text); |
2936 | selection.text = NULL; |
3001 | selection.text = NULL; |
2937 | selection.len = 0; |
3002 | selection.len = 0; |
2938 | CLEAR_SELECTION (); |
3003 | CLEAR_SELECTION (); |
2939 | |
3004 | |
2940 | if (display->selection_owner == this) |
3005 | if (display->selection_owner == this) |
2941 | display->selection_owner = 0; |
3006 | display->selection_owner = 0; |
|
|
3007 | } |
|
|
3008 | else |
|
|
3009 | { |
|
|
3010 | free (selection.clip_text); |
|
|
3011 | selection.clip_text = NULL; |
|
|
3012 | selection.clip_len = 0; |
|
|
3013 | |
|
|
3014 | if (display->clipboard_owner == this) |
|
|
3015 | display->clipboard_owner = 0; |
|
|
3016 | } |
2942 | } |
3017 | } |
2943 | |
3018 | |
2944 | /* ------------------------------------------------------------------------- */ |
3019 | /* ------------------------------------------------------------------------- */ |
2945 | /* |
3020 | /* |
2946 | * Copy a selection into the cut buffer |
3021 | * Copy a selection into the cut buffer |
2947 | * EXT: button 1 or 3 release |
3022 | * EXT: button 1 or 3 release |
2948 | */ |
3023 | */ |
2949 | void |
3024 | void |
2950 | rxvt_term::selection_make (Time tm) |
3025 | rxvt_term::selection_make (Time tm) |
2951 | { |
3026 | { |
2952 | int i; |
3027 | int size; |
2953 | wchar_t *new_selection_text; |
3028 | wchar_t *new_selection_text; |
2954 | text_t *t; |
3029 | text_t *t; |
2955 | |
3030 | |
2956 | switch (selection.op) |
3031 | switch (selection.op) |
2957 | { |
3032 | { |
… | |
… | |
2973 | return; /* nothing selected, go away */ |
3048 | return; /* nothing selected, go away */ |
2974 | |
3049 | |
2975 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3050 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2976 | return; |
3051 | return; |
2977 | |
3052 | |
2978 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3053 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2979 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3054 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2980 | |
3055 | |
2981 | int ofs = 0; |
3056 | int ofs = 0; |
2982 | int extra = 0; |
3057 | int extra = 0; |
2983 | |
3058 | |
2984 | int col = selection.beg.col; |
3059 | int col = selection.beg.col; |
… | |
… | |
2990 | { |
3065 | { |
2991 | #if !ENABLE_MINIMAL |
3066 | #if !ENABLE_MINIMAL |
2992 | if (selection.rect) |
3067 | if (selection.rect) |
2993 | { |
3068 | { |
2994 | col = selection.beg.col; |
3069 | col = selection.beg.col; |
2995 | end_col = ncol + 1; |
3070 | end_col = selection.end.col; |
2996 | } |
3071 | } |
2997 | else |
3072 | else |
2998 | #endif |
3073 | #endif |
2999 | end_col = ROW(row).l; |
3074 | end_col = ROW(row).l; |
3000 | |
3075 | |
3001 | col = max (col, 0); |
3076 | col = max (col, 0); |
3002 | |
3077 | |
3003 | if (row == selection.end.row |
3078 | if (row == selection.end.row) |
3004 | #if !ENABLE_MINIMAL |
|
|
3005 | || selection.rect |
|
|
3006 | #endif |
|
|
3007 | ) |
|
|
3008 | min_it (end_col, selection.end.col); |
3079 | min_it (end_col, selection.end.col); |
3009 | |
3080 | |
3010 | t = ROW(row).t + col; |
3081 | t = ROW(row).t + col; |
3011 | |
3082 | |
3012 | for (; col < end_col; col++) |
3083 | for (; col < end_col; col++) |
… | |
… | |
3020 | |
3091 | |
3021 | extra -= (len - 1); |
3092 | extra -= (len - 1); |
3022 | |
3093 | |
3023 | if (extra < 0) |
3094 | if (extra < 0) |
3024 | { |
3095 | { |
3025 | extra += i; |
3096 | extra += size; |
3026 | i += i; |
3097 | size += size; |
3027 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
3098 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3028 | } |
3099 | } |
3029 | |
3100 | |
3030 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3101 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3031 | } |
3102 | } |
3032 | #endif |
3103 | #endif |
… | |
… | |
3044 | |
3115 | |
3045 | new_selection_text[ofs++] = C0_LF; |
3116 | new_selection_text[ofs++] = C0_LF; |
3046 | } |
3117 | } |
3047 | else |
3118 | else |
3048 | #endif |
3119 | #endif |
3049 | if (!ROW(row).is_longer () && row != selection.end.row) |
3120 | if (!ROW(row).is_longer () |
|
|
3121 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
3122 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3050 | new_selection_text[ofs++] = C0_LF; |
3123 | new_selection_text[ofs++] = C0_LF; |
3051 | } |
3124 | } |
3052 | |
|
|
3053 | if (end_col != selection.end.col) |
|
|
3054 | new_selection_text[ofs++] = C0_LF; |
|
|
3055 | |
3125 | |
3056 | new_selection_text[ofs] = 0; |
3126 | new_selection_text[ofs] = 0; |
3057 | |
3127 | |
3058 | if (ofs == 0) |
3128 | if (ofs == 0) |
3059 | { |
3129 | { |
… | |
… | |
3072 | |
3142 | |
3073 | selection_grab (tm); |
3143 | selection_grab (tm); |
3074 | } |
3144 | } |
3075 | |
3145 | |
3076 | bool |
3146 | bool |
3077 | rxvt_term::selection_grab (Time tm) NOTHROW |
3147 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3078 | { |
3148 | { |
|
|
3149 | Atom sel; |
|
|
3150 | |
|
|
3151 | if (!clipboard) |
|
|
3152 | { |
3079 | selection_time = tm; |
3153 | selection_time = tm; |
|
|
3154 | sel = XA_PRIMARY; |
|
|
3155 | } |
|
|
3156 | else |
|
|
3157 | { |
|
|
3158 | clipboard_time = tm; |
|
|
3159 | sel = xa[XA_CLIPBOARD]; |
|
|
3160 | } |
3080 | |
3161 | |
3081 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3162 | XSetSelectionOwner (dpy, sel, vt, tm); |
3082 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3163 | if (XGetSelectionOwner (dpy, sel) == vt) |
3083 | { |
3164 | { |
3084 | display->set_selection_owner (this); |
3165 | display->set_selection_owner (this, clipboard); |
3085 | return true; |
3166 | return true; |
3086 | } |
3167 | } |
3087 | else |
3168 | else |
3088 | { |
3169 | { |
3089 | selection_clear (); |
3170 | selection_clear (clipboard); |
3090 | return false; |
3171 | return false; |
3091 | } |
3172 | } |
3092 | |
3173 | |
3093 | #if 0 |
3174 | #if 0 |
3094 | XTextProperty ct; |
3175 | XTextProperty ct; |
… | |
… | |
3589 | else if (rq.target == xa[XA_MULTIPLE]) |
3670 | else if (rq.target == xa[XA_MULTIPLE]) |
3590 | { |
3671 | { |
3591 | /* TODO: Handle MULTIPLE */ |
3672 | /* TODO: Handle MULTIPLE */ |
3592 | } |
3673 | } |
3593 | #endif |
3674 | #endif |
3594 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3675 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3595 | { |
3676 | { |
3596 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3677 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3597 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3678 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3679 | ev.property = rq.property; |
|
|
3680 | } |
|
|
3681 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3682 | { |
|
|
3683 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3684 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3598 | ev.property = rq.property; |
3685 | ev.property = rq.property; |
3599 | } |
3686 | } |
3600 | else if (rq.target == XA_STRING |
3687 | else if (rq.target == XA_STRING |
3601 | || rq.target == xa[XA_TEXT] |
3688 | || rq.target == xa[XA_TEXT] |
3602 | || rq.target == xa[XA_COMPOUND_TEXT] |
3689 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3635 | { |
3722 | { |
3636 | target = xa[XA_COMPOUND_TEXT]; |
3723 | target = xa[XA_COMPOUND_TEXT]; |
3637 | style = enc_compound_text; |
3724 | style = enc_compound_text; |
3638 | } |
3725 | } |
3639 | |
3726 | |
3640 | if (selection.text) |
3727 | if (rq.selection == XA_PRIMARY && selection.text) |
3641 | { |
3728 | { |
3642 | cl = selection.text; |
3729 | cl = selection.text; |
3643 | selectlen = selection.len; |
3730 | selectlen = selection.len; |
|
|
3731 | } |
|
|
3732 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3733 | { |
|
|
3734 | cl = selection.clip_text; |
|
|
3735 | selectlen = selection.clip_len; |
3644 | } |
3736 | } |
3645 | else |
3737 | else |
3646 | { |
3738 | { |
3647 | cl = L""; |
3739 | cl = L""; |
3648 | selectlen = 0; |
3740 | selectlen = 0; |
… | |
… | |
3716 | h += 2; min_it (h, nrow); |
3808 | h += 2; min_it (h, nrow); |
3717 | |
3809 | |
3718 | x -= 1; clamp_it (x, 0, ncol - w); |
3810 | x -= 1; clamp_it (x, 0, ncol - w); |
3719 | y -= 1; clamp_it (y, 0, nrow - h); |
3811 | y -= 1; clamp_it (y, 0, nrow - h); |
3720 | |
3812 | |
3721 | ov_x = x; ov_y = y; |
3813 | ov.x = x; ov.y = y; |
3722 | ov_w = w; ov_h = h; |
3814 | ov.w = w; ov.h = h; |
3723 | |
3815 | |
3724 | ov_text = new text_t *[h]; |
3816 | ov.text = new text_t *[h]; |
3725 | ov_rend = new rend_t *[h]; |
3817 | ov.rend = new rend_t *[h]; |
3726 | |
3818 | |
3727 | for (y = 0; y < h; y++) |
3819 | for (y = 0; y < h; y++) |
3728 | { |
3820 | { |
3729 | text_t *tp = ov_text[y] = new text_t[w]; |
3821 | text_t *tp = ov.text[y] = new text_t[w]; |
3730 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3822 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3731 | |
3823 | |
3732 | text_t t0, t1, t2; |
3824 | text_t t0, t1, t2; |
3733 | rend_t r = OVERLAY_RSTYLE; |
3825 | rend_t r = OVERLAY_RSTYLE; |
3734 | |
3826 | |
3735 | if (y == 0) |
3827 | if (y == 0) |
… | |
… | |
3754 | } |
3846 | } |
3755 | |
3847 | |
3756 | void |
3848 | void |
3757 | rxvt_term::scr_overlay_off () NOTHROW |
3849 | rxvt_term::scr_overlay_off () NOTHROW |
3758 | { |
3850 | { |
3759 | if (!ov_text) |
3851 | if (!ov.text) |
3760 | return; |
3852 | return; |
3761 | |
3853 | |
3762 | want_refresh = 1; |
3854 | want_refresh = 1; |
3763 | |
3855 | |
3764 | for (int y = 0; y < ov_h; y++) |
3856 | for (int y = 0; y < ov.h; y++) |
3765 | { |
3857 | { |
3766 | delete [] ov_text[y]; |
3858 | delete [] ov.text[y]; |
3767 | delete [] ov_rend[y]; |
3859 | delete [] ov.rend[y]; |
3768 | } |
3860 | } |
3769 | |
3861 | |
3770 | delete [] ov_text; ov_text = 0; |
3862 | delete [] ov.text; ov.text = 0; |
3771 | delete [] ov_rend; ov_rend = 0; |
3863 | delete [] ov.rend; ov.rend = 0; |
3772 | } |
3864 | } |
3773 | |
3865 | |
3774 | void |
3866 | void |
3775 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3867 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3776 | { |
3868 | { |
3777 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3869 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3778 | return; |
3870 | return; |
3779 | |
3871 | |
3780 | x++, y++; |
3872 | x++, y++; |
3781 | |
3873 | |
3782 | ov_text[y][x] = text; |
3874 | ov.text[y][x] = text; |
3783 | ov_rend[y][x] = rend; |
3875 | ov.rend[y][x] = rend; |
3784 | } |
3876 | } |
3785 | |
3877 | |
3786 | void |
3878 | void |
3787 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3879 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3788 | { |
3880 | { |
… | |
… | |
3807 | } |
3899 | } |
3808 | |
3900 | |
3809 | void |
3901 | void |
3810 | rxvt_term::scr_swap_overlay () NOTHROW |
3902 | rxvt_term::scr_swap_overlay () NOTHROW |
3811 | { |
3903 | { |
3812 | if (!ov_text) |
3904 | if (!ov.text) |
3813 | return; |
3905 | return; |
3814 | |
3906 | |
|
|
3907 | // hide cursor if it is within the overlay area |
|
|
3908 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3909 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3910 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3911 | |
3815 | // swap screen mem with overlay |
3912 | // swap screen mem with overlay |
3816 | for (int y = ov_h; y--; ) |
3913 | for (int y = ov.h; y--; ) |
3817 | { |
3914 | { |
3818 | text_t *t1 = ov_text[y]; |
3915 | text_t *t1 = ov.text[y]; |
3819 | rend_t *r1 = ov_rend[y]; |
3916 | rend_t *r1 = ov.rend[y]; |
3820 | |
3917 | |
3821 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3918 | 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; |
3919 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3823 | |
3920 | |
3824 | for (int x = ov_w; x--; ) |
3921 | for (int x = ov.w; x--; ) |
3825 | { |
3922 | { |
3826 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3923 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3827 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3924 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3828 | } |
3925 | } |
3829 | } |
3926 | } |