… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
143 | col--; |
142 | col--; |
144 | |
143 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
148 | // found start, nuke |
149 | // found start, nuke |
149 | do { |
150 | do { |
150 | l.t[col] = ' '; |
151 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
152 | l.r[col] = rend; |
152 | col++; |
153 | col++; |
… | |
… | |
158 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
159 | |
160 | |
160 | void |
161 | void |
161 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
162 | { |
163 | { |
163 | #if ENABLE_OVERLAY |
|
|
164 | scr_overlay_off (); |
|
|
165 | #endif |
|
|
166 | |
|
|
167 | rvideo_mode = false; |
|
|
168 | view_start = 0; |
164 | view_start = 0; |
169 | num_scr = 0; |
165 | num_scr = 0; |
170 | |
166 | |
171 | if (ncol == 0) |
167 | if (ncol == 0) |
172 | ncol = 80; |
168 | ncol = 80; |
… | |
… | |
174 | if (nrow == 0) |
170 | if (nrow == 0) |
175 | nrow = 24; |
171 | nrow = 24; |
176 | |
172 | |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | if (ncol == prev_ncol && nrow == prev_nrow) |
178 | return; |
174 | return; |
179 | |
|
|
180 | if (current_screen != PRIMARY) |
|
|
181 | scr_swap_screen (); |
|
|
182 | |
175 | |
183 | // we need at least two lines for wrapping to work correctly |
176 | // we need at least two lines for wrapping to work correctly |
184 | while (nrow + saveLines < 2) |
177 | while (nrow + saveLines < 2) |
185 | { |
178 | { |
186 | //TODO//FIXME |
179 | //TODO//FIXME |
… | |
… | |
239 | selection.text = NULL; |
232 | selection.text = NULL; |
240 | selection.len = 0; |
233 | selection.len = 0; |
241 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
242 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
243 | selection.clicks = 0; |
236 | selection.clicks = 0; |
|
|
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
244 | } |
239 | } |
245 | else |
240 | else |
246 | { |
241 | { |
247 | /* |
242 | /* |
248 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
286 | |
281 | |
287 | if (top_row) |
282 | if (top_row) |
288 | { |
283 | { |
289 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
290 | // to come up with a lean and mean algorithm. |
285 | // to come up with a lean and mean algorithm. |
|
|
286 | // TODO: maybe optimise when width didn't change |
291 | |
287 | |
292 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
290 | |
295 | do |
291 | do |
296 | { |
292 | { |
297 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
298 | #ifdef DEBUG_STRICT |
|
|
299 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
300 | #endif |
|
|
301 | int plines = 1; |
295 | int plines = 1; |
302 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
303 | |
297 | |
304 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
305 | { |
299 | { |
… | |
… | |
399 | delete old_ta; |
393 | delete old_ta; |
400 | delete old_ra; |
394 | delete old_ra; |
401 | |
395 | |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
398 | } |
404 | |
399 | |
405 | free (tabs); |
400 | free (tabs); |
406 | } |
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; col--; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
407 | |
405 | |
408 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
409 | |
407 | |
410 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
409 | 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 | |
410 | |
421 | tt_winch (); |
411 | tt_winch (); |
422 | |
412 | |
423 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
424 | } |
414 | } |
… | |
… | |
436 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
437 | |
427 | |
438 | free (row_buf); |
428 | free (row_buf); |
439 | free (swap_buf); |
429 | free (swap_buf); |
440 | free (drawn_buf); |
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
441 | free (tabs); |
433 | free (tabs); |
442 | |
434 | tabs = 0; |
443 | row_buf = 0; // signal that we freed all the arrays |
|
|
444 | } |
435 | } |
445 | } |
436 | } |
446 | |
437 | |
447 | /* ------------------------------------------------------------------------- */ |
438 | /* ------------------------------------------------------------------------- */ |
448 | /* |
439 | /* |
449 | * Hard reset |
440 | * Hard/Soft reset |
450 | */ |
441 | */ |
451 | void |
442 | void |
452 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
453 | { |
444 | { |
454 | scr_release (); |
445 | scr_release (); |
455 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
|
|
448 | scr_soft_reset (); |
456 | scr_reset (); |
449 | scr_reset (); |
457 | |
450 | |
458 | scr_clear (true); |
451 | scr_clear (true); |
459 | scr_refresh (); |
452 | scr_refresh (); |
|
|
453 | } |
|
|
454 | |
|
|
455 | void |
|
|
456 | rxvt_term::scr_soft_reset () |
|
|
457 | { |
|
|
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
459 | #if ENABLE_OVERLAY |
|
|
460 | scr_overlay_off (); |
|
|
461 | #endif |
|
|
462 | |
|
|
463 | if (current_screen != PRIMARY) |
|
|
464 | scr_swap_screen (); |
|
|
465 | |
|
|
466 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
467 | scr_rendition (0, ~RS_None); |
|
|
468 | scr_insert_mode (0); |
460 | } |
469 | } |
461 | |
470 | |
462 | /* ------------------------------------------------------------------------- * |
471 | /* ------------------------------------------------------------------------- * |
463 | * PROCESS SCREEN COMMANDS * |
472 | * PROCESS SCREEN COMMANDS * |
464 | * ------------------------------------------------------------------------- */ |
473 | * ------------------------------------------------------------------------- */ |
… | |
… | |
502 | } |
511 | } |
503 | |
512 | |
504 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
505 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
506 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
507 | #ifdef DEBUG_STRICT |
|
|
508 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
509 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
510 | #endif |
|
|
511 | } |
518 | } |
512 | |
519 | |
513 | void |
520 | void |
514 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
515 | { |
522 | { |
… | |
… | |
540 | want_refresh = 1; |
547 | want_refresh = 1; |
541 | view_start = 0; |
548 | view_start = 0; |
542 | |
549 | |
543 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
544 | |
551 | |
545 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
546 | |
553 | |
547 | #if NSCREENS |
554 | #if NSCREENS |
548 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
549 | { |
556 | { |
550 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
776 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
777 | } |
784 | } |
778 | } |
785 | } |
779 | |
786 | |
780 | #ifdef DEBUG_STRICT |
|
|
781 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
782 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
783 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
784 | #endif |
|
|
785 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
786 | |
791 | |
787 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
788 | |
793 | |
789 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
… | |
… | |
893 | # else |
898 | # else |
894 | c = 0xfffd; |
899 | c = 0xfffd; |
895 | # endif |
900 | # endif |
896 | #endif |
901 | #endif |
897 | |
902 | |
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)); |
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
907 | |
904 | |
908 | // if the character doesn't fit into the remaining columns... |
905 | // if the character doesn't fit into the remaining columns... |
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
910 | { |
907 | { |
911 | // ...output spaces |
908 | if (screen.flags & Screen_Autowrap) |
912 | c = ' '; |
909 | { |
|
|
910 | // ... artificially enlargen the previous one |
|
|
911 | c = NOCHAR; |
913 | // and try the same character next loop iteration |
912 | // and try the same character next loop iteration |
914 | --str; |
913 | --str; |
|
|
914 | } |
|
|
915 | else |
|
|
916 | screen.cur.col = ncol - width; |
915 | } |
917 | } |
|
|
918 | |
|
|
919 | // nuke the character at this position, if required |
|
|
920 | // due to wonderful coincidences everywhere else in this loop |
|
|
921 | // we never have to check for overwriting a wide char itself, |
|
|
922 | // only its tail. |
|
|
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
924 | scr_kill_char (*line, screen.cur.col); |
916 | |
925 | |
917 | line->touch (); |
926 | line->touch (); |
918 | |
927 | |
919 | do |
928 | do |
920 | { |
929 | { |
… | |
… | |
926 | else |
935 | else |
927 | { |
936 | { |
928 | line->l = ncol; |
937 | line->l = ncol; |
929 | if (screen.flags & Screen_Autowrap) |
938 | if (screen.flags & Screen_Autowrap) |
930 | screen.flags |= Screen_WrapNext; |
939 | screen.flags |= Screen_WrapNext; |
931 | break; |
940 | |
|
|
941 | goto end_of_line; |
932 | } |
942 | } |
933 | |
943 | |
934 | c = NOCHAR; |
944 | c = NOCHAR; |
935 | } |
945 | } |
936 | while (expect_false (--width > 0)); |
946 | while (expect_false (--width > 0)); |
937 | |
947 | |
938 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
939 | if (expect_false (!width)) |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
940 | { |
950 | { |
941 | line->touch (); |
|
|
942 | |
|
|
943 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
944 | { |
|
|
945 | line->t[c] = ' '; |
951 | line->t[c] = ' '; |
946 | line->r[c] = rend; |
952 | line->r[c] = rend; |
947 | } |
|
|
948 | } |
953 | } |
|
|
954 | |
|
|
955 | end_of_line: |
|
|
956 | ; |
949 | } |
957 | } |
950 | #if ENABLE_COMBINING |
958 | #if ENABLE_COMBINING |
951 | else // width == 0 |
959 | else // width == 0 |
952 | { |
960 | { |
953 | if (c != 0xfeff) // ignore BOM |
961 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
993 | #endif |
1001 | #endif |
994 | } |
1002 | } |
995 | |
1003 | |
996 | max_it (line->l, screen.cur.col); |
1004 | max_it (line->l, screen.cur.col); |
997 | |
1005 | |
998 | #ifdef DEBUG_STRICT |
|
|
999 | assert (screen.cur.row >= 0); |
1006 | assert (screen.cur.row >= 0); |
1000 | #endif |
|
|
1001 | } |
1007 | } |
1002 | |
1008 | |
1003 | /* ------------------------------------------------------------------------- */ |
1009 | /* ------------------------------------------------------------------------- */ |
1004 | /* |
1010 | /* |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1011 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1018 | |
1024 | |
1019 | want_refresh = 1; |
1025 | want_refresh = 1; |
1020 | #endif |
1026 | #endif |
1021 | } |
1027 | } |
1022 | } |
1028 | } |
|
|
1029 | else if (screen.flags & Screen_WrapNext) |
|
|
1030 | screen.flags &= ~Screen_WrapNext; |
1023 | else |
1031 | else |
1024 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1025 | } |
1033 | } |
1026 | |
1034 | |
1027 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1342 | return; |
1335 | |
1343 | |
1336 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1337 | |
1345 | |
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1340 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1342 | { |
1349 | { |
1343 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1344 | |
1351 | |
1345 | if (mapped) |
1352 | if (mapped) |
1346 | XClearArea (dpy, vt, 0, |
1353 | XClearArea (dpy, vt, 0, |
1347 | Row2Pixel (row), (unsigned int)width, |
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num), False); |
1355 | (unsigned int)Height2Pixel (num), False); |
1349 | } |
1356 | } |
1350 | else |
1357 | else |
1351 | { |
1358 | { |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1353 | |
1360 | |
|
|
1361 | if (mapped) |
|
|
1362 | { |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1356 | XFillRectangle (dpy, vt, gc, |
1365 | XFillRectangle (dpy, vt, gc, |
1357 | 0, Row2Pixel (row), |
1366 | 0, Row2Pixel (row - view_start), |
1358 | (unsigned int)width, |
1367 | (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num)); |
1368 | (unsigned int)Height2Pixel (num)); |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1371 | } |
1362 | } |
1372 | } |
1363 | |
1373 | |
1364 | for (; num--; row++) |
1374 | for (; num--; row++) |
1365 | { |
1375 | { |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1377 | |
|
|
1378 | if (row - view_start < nrow) |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1368 | } |
1380 | } |
1369 | } |
1381 | } |
1370 | |
1382 | |
1371 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1372 | void |
1384 | void |
… | |
… | |
1525 | { |
1537 | { |
1526 | line->t[col] = line->t[col + count]; |
1538 | line->t[col] = line->t[col + count]; |
1527 | line->r[col] = line->r[col + count]; |
1539 | line->r[col] = line->r[col + count]; |
1528 | } |
1540 | } |
1529 | |
1541 | |
1530 | scr_blank_line (*line, ncol - count, count, |
1542 | scr_blank_line (*line, ncol - count, count, rstyle); |
1531 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1532 | |
1543 | |
1533 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1534 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1535 | { |
1546 | { |
1536 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1672 | { |
1683 | { |
1673 | rvideo_state = on; |
1684 | rvideo_state = on; |
1674 | |
1685 | |
1675 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1676 | #ifdef HAVE_BG_PIXMAP |
1687 | #ifdef HAVE_BG_PIXMAP |
1677 | if (bgPixmap.pixmap == None) |
1688 | if (bg_pixmap == None) |
1678 | #endif |
1689 | #endif |
1679 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1680 | |
1691 | |
1681 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1682 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1826 | for (i = PART_BEG; i < RC_COUNT; i++) |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1827 | { |
1838 | { |
1828 | min_it (rc[i].col, ncol - 1); |
1839 | min_it (rc[i].col, ncol - 1); |
1829 | min_it (rc[i].row, nrow - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1830 | } |
1841 | } |
1831 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1842 | |
1832 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1843 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1833 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1844 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1834 | |
1845 | |
1835 | num_scr_allow = 0; |
1846 | num_scr_allow = 0; |
1836 | |
1847 | |
… | |
… | |
1927 | |
1938 | |
1928 | bell_ev.start (VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1929 | } |
1940 | } |
1930 | else |
1941 | else |
1931 | XBell (dpy, 0); |
1942 | XBell (dpy, 0); |
|
|
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1932 | #endif |
1944 | #endif |
1933 | } |
1945 | } |
1934 | |
1946 | |
1935 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1936 | /* ARGSUSED */ |
1948 | /* ARGSUSED */ |
… | |
… | |
1955 | row_start = view_start; |
1967 | row_start = view_start; |
1956 | } |
1968 | } |
1957 | |
1969 | |
1958 | wctomb (0, 0); |
1970 | wctomb (0, 0); |
1959 | |
1971 | |
1960 | for (int r1 = 0; r1 < nrows; r1++) |
1972 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1961 | { |
1973 | { |
1962 | text_t *tp = ROW(r1).t; |
1974 | text_t *tp = ROW(r1).t; |
1963 | int len = ROW(r1).l; |
1975 | int len = ROW(r1).l; |
1964 | |
1976 | |
1965 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1977 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1994 | * screen.text/screen.rend contain what the screen will change to. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
1995 | */ |
2007 | */ |
1996 | void |
2008 | void |
1997 | rxvt_term::scr_refresh () NOTHROW |
2009 | rxvt_term::scr_refresh () NOTHROW |
1998 | { |
2010 | { |
1999 | unsigned char have_bg, |
|
|
2000 | showcursor; /* show the cursor */ |
|
|
2001 | int16_t col, row, /* column/row we're processing */ |
2011 | int16_t col, row, /* column/row we're processing */ |
2002 | ocrow; /* old cursor row */ |
2012 | ocrow; /* old cursor row */ |
2003 | int i; /* tmp */ |
2013 | int i; /* tmp */ |
2004 | #ifndef NO_CURSORCOLOR |
2014 | #ifndef NO_CURSORCOLOR |
2005 | rend_t cc1; /* store colours at cursor position (s) */ |
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2016 | /* |
2026 | /* |
2017 | * A: set up vars |
2027 | * A: set up vars |
2018 | */ |
2028 | */ |
2019 | refresh_count = 0; |
2029 | refresh_count = 0; |
2020 | |
2030 | |
|
|
2031 | unsigned int old_screen_flags = screen.flags; |
2021 | have_bg = 0; |
2032 | char have_bg = 0; |
2022 | #ifdef HAVE_BG_PIXMAP |
2033 | #ifdef HAVE_BG_PIXMAP |
2023 | have_bg = bgPixmap.pixmap != None; |
2034 | have_bg = bg_pixmap != None; |
2024 | #endif |
2035 | #endif |
2025 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2026 | |
2037 | |
2027 | /* |
2038 | /* |
2028 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
2029 | */ |
2040 | */ |
2030 | scr_reverse_selection (); |
2041 | scr_reverse_selection (); |
|
|
2042 | |
|
|
2043 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2044 | #if ENABLE_OVERLAY |
|
|
2045 | scr_swap_overlay (); |
|
|
2046 | #endif |
|
|
2047 | |
|
|
2048 | char showcursor = screen.flags & Screen_VisibleCursor; |
2031 | |
2049 | |
2032 | /* |
2050 | /* |
2033 | * C: set the cursor character (s) |
2051 | * C: set the cursor character (s) |
2034 | */ |
2052 | */ |
2035 | { |
2053 | { |
2036 | unsigned char setoldcursor; |
2054 | unsigned char setoldcursor; |
2037 | |
2055 | |
2038 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2039 | #ifdef CURSOR_BLINK |
2056 | #ifdef CURSOR_BLINK |
2040 | if (hidden_cursor) |
2057 | if (hidden_cursor) |
2041 | showcursor = 0; |
2058 | showcursor = 0; |
2042 | #endif |
2059 | #endif |
2043 | |
2060 | |
… | |
… | |
2071 | ccol2 = bgcolor_of (rstyle); |
2088 | ccol2 = bgcolor_of (rstyle); |
2072 | #else |
2089 | #else |
2073 | ccol2 = Color_bg; |
2090 | ccol2 = Color_bg; |
2074 | #endif |
2091 | #endif |
2075 | |
2092 | |
2076 | if (showcursor && focus) |
2093 | if (focus) |
2077 | { |
2094 | { |
2078 | if (option (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2079 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2080 | else |
2097 | else |
2081 | { |
2098 | { |
… | |
… | |
2116 | oldcursor.col = screen.cur.col; |
2133 | oldcursor.col = screen.cur.col; |
2117 | } |
2134 | } |
2118 | } |
2135 | } |
2119 | } |
2136 | } |
2120 | |
2137 | |
2121 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2122 | #if ENABLE_OVERLAY |
|
|
2123 | scr_swap_overlay (); |
|
|
2124 | #endif |
|
|
2125 | |
|
|
2126 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | #ifndef NO_SLOW_LINK_SUPPORT |
2127 | /* |
2139 | /* |
2128 | * D: CopyArea pass - very useful for slower links |
2140 | * D: CopyArea pass - very useful for slower links |
2129 | * This has been deliberately kept simple. |
2141 | * This has been deliberately kept simple. |
2130 | */ |
2142 | */ |
… | |
… | |
2222 | |
2234 | |
2223 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2224 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2225 | --col; |
2237 | --col; |
2226 | |
2238 | |
2227 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2228 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2229 | int count = 1; |
2241 | int count = 1; |
2230 | |
2242 | |
2231 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2232 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2236 | for (i = 0; ++col < ncol; ) |
2248 | for (i = 0; ++col < ncol; ) |
2237 | { |
2249 | { |
2238 | if (stp[col] == NOCHAR) |
2250 | if (stp[col] == NOCHAR) |
2239 | { |
2251 | { |
2240 | dtp[col] = stp[col]; |
2252 | dtp[col] = stp[col]; |
2241 | drp[col] = rend; |
2253 | drp[col] = srp[col]; |
|
|
2254 | |
2242 | count++; |
2255 | count++; |
2243 | i++; |
2256 | i++; |
2244 | |
2257 | |
2245 | continue; |
2258 | continue; |
2246 | } |
2259 | } |
… | |
… | |
2276 | */ |
2289 | */ |
2277 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2278 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2279 | |
2292 | |
2280 | // only do special processing if any attributes are set, which is unlikely |
2293 | // only do special processing if any attributes are set, which is unlikely |
2281 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2282 | { |
2295 | { |
2283 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2284 | |
2297 | |
2285 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2286 | if (rend & RS_Bold && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2305 | |
2318 | |
2306 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2307 | fore = Color_UL; |
2320 | fore = Color_UL; |
2308 | #endif |
2321 | #endif |
2309 | |
2322 | |
|
|
2323 | #ifdef OPTION_HC |
|
|
2324 | if (rend & RS_Sel) |
|
|
2325 | { |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2329 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | { |
|
|
2331 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2332 | fore = Color_HTC; |
|
|
2333 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2334 | else if (!invert) |
|
|
2335 | fore = back; |
|
|
2336 | |
|
|
2337 | back = Color_HC; |
|
|
2338 | invert = 0; |
|
|
2339 | } |
|
|
2340 | } |
|
|
2341 | #endif |
|
|
2342 | |
2310 | if (invert) |
2343 | if (invert) |
2311 | { |
2344 | { |
2312 | #ifdef OPTION_HC |
|
|
2313 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2314 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2315 | #endif |
|
|
2316 | /* invert the column if no highlightColor is set or it is the |
|
|
2317 | * current cursor column */ |
|
|
2318 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2319 | #ifdef OPTION_HC |
|
|
2320 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2321 | back = Color_HC; |
|
|
2322 | #endif |
|
|
2323 | |
2346 | |
2324 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2325 | # ifndef OPTION_HC |
|
|
2326 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2327 | back = Color_RV; |
|
|
2328 | # endif |
|
|
2329 | if (fore == back) |
2348 | if (fore == back) |
2330 | { |
2349 | { |
2331 | fore = Color_bg; |
2350 | fore = Color_bg; |
2332 | back = Color_fg; |
2351 | back = Color_fg; |
2333 | } |
2352 | } |
… | |
… | |
2402 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2421 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2403 | } |
2422 | } |
2404 | } /* for (col....) */ |
2423 | } /* for (col....) */ |
2405 | } /* for (row....) */ |
2424 | } /* for (row....) */ |
2406 | |
2425 | |
2407 | #if ENABLE_OVERLAY |
|
|
2408 | scr_swap_overlay (); |
|
|
2409 | #endif |
|
|
2410 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2411 | |
|
|
2412 | /* |
2426 | /* |
2413 | * G: cleanup cursor and display outline cursor if necessary |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2414 | */ |
2428 | */ |
2415 | if (showcursor) |
2429 | if (showcursor) |
2416 | { |
2430 | { |
… | |
… | |
2454 | } |
2468 | } |
2455 | |
2469 | |
2456 | /* |
2470 | /* |
2457 | * H: cleanup selection |
2471 | * H: cleanup selection |
2458 | */ |
2472 | */ |
|
|
2473 | #if ENABLE_OVERLAY |
|
|
2474 | scr_swap_overlay (); |
|
|
2475 | #endif |
|
|
2476 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2477 | |
2459 | scr_reverse_selection (); |
2478 | scr_reverse_selection (); |
2460 | |
2479 | |
|
|
2480 | screen.flags = old_screen_flags; |
2461 | num_scr = 0; |
2481 | num_scr = 0; |
2462 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2463 | } |
2483 | } |
2464 | |
2484 | |
2465 | void |
2485 | void |
… | |
… | |
2486 | scr_remap_chars (swap_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2487 | } |
2507 | } |
2488 | } |
2508 | } |
2489 | |
2509 | |
2490 | void |
2510 | void |
2491 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2492 | { |
2512 | { |
|
|
2513 | bool transparent = false; |
|
|
2514 | |
2493 | #ifdef HAVE_BG_PIXMAP |
2515 | #ifdef HAVE_BG_PIXMAP |
2494 | bgPixmap.apply (); |
2516 | if (bg_pixmap != None) |
2495 | #else |
2517 | { |
|
|
2518 | # ifdef ENABLE_TRANSPARENCY |
|
|
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2520 | { |
|
|
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2496 | |
2523 | |
|
|
2524 | transparent = true; |
|
|
2525 | } |
|
|
2526 | else |
|
|
2527 | # endif |
|
|
2528 | { |
|
|
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2531 | } |
|
|
2532 | } |
|
|
2533 | else |
|
|
2534 | #endif |
|
|
2535 | { |
2497 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2538 | } |
|
|
2539 | |
2498 | XClearWindow (dpy, parent[0]); |
2540 | XClearWindow (dpy, parent[0]); |
2499 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2500 | |
2541 | |
2501 | if (scrollBar.win) |
2542 | if (scrollBar.win) |
2502 | { |
2543 | { |
|
|
2544 | if (transparent) |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2546 | else |
2503 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2504 | scrollBar.state = STATE_IDLE; |
2548 | scrollBar.state = STATE_IDLE; |
2505 | scrollBar.show (0); |
2549 | scrollBar.show (0); |
2506 | } |
2550 | } |
2507 | |
2551 | |
2508 | #endif |
2552 | if (refresh) |
2509 | |
2553 | { |
2510 | /* bgPixmap.apply () does not do the following : */ |
|
|
2511 | scr_clear (); |
2554 | scr_clear (); |
2512 | scr_touch (true); |
2555 | scr_touch (true); |
|
|
2556 | } |
2513 | want_refresh = 1; |
2557 | want_refresh = 1; |
2514 | } |
2558 | } |
2515 | |
2559 | |
2516 | /* ------------------------------------------------------------------------- */ |
2560 | /* ------------------------------------------------------------------------- */ |
2517 | void |
2561 | void |
… | |
… | |
2585 | { |
2629 | { |
2586 | #if !ENABLE_MINIMAL |
2630 | #if !ENABLE_MINIMAL |
2587 | if (selection.rect) |
2631 | if (selection.rect) |
2588 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2632 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2589 | selection.end.row, selection.end.col, |
2633 | selection.end.row, selection.end.col, |
2590 | RS_RVid, RS_RVid | RS_Uline); |
2634 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2591 | else |
2635 | else |
2592 | #endif |
2636 | #endif |
2593 | scr_xor_span (selection.beg.row, selection.beg.col, |
2637 | scr_xor_span (selection.beg.row, selection.beg.col, |
2594 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2595 | RS_RVid); |
2639 | RS_Sel | RS_RVid); |
2596 | } |
2640 | } |
2597 | } |
2641 | } |
2598 | |
2642 | |
2599 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2600 | /* |
2644 | /* |
… | |
… | |
2605 | void |
2649 | void |
2606 | rxvt_term::scr_dump (int fd) NOTHROW |
2650 | rxvt_term::scr_dump (int fd) NOTHROW |
2607 | { |
2651 | { |
2608 | int row, wrote; |
2652 | int row, wrote; |
2609 | unsigned int width, towrite; |
2653 | unsigned int width, towrite; |
2610 | char r1[] = "\n"; |
2654 | const char r1[] = "\n"; |
2611 | |
2655 | |
2612 | for (row = saveLines + top_row; |
2656 | for (row = saveLines + top_row; |
2613 | row < saveLines + nrow - 1; row++) |
2657 | row < saveLines + nrow - 1; row++) |
2614 | { |
2658 | { |
2615 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2659 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2661 | /* ------------------------------------------------------------------------- */ |
2705 | /* ------------------------------------------------------------------------- */ |
2662 | /* |
2706 | /* |
2663 | * Paste a selection direct to the command fd |
2707 | * Paste a selection direct to the command fd |
2664 | */ |
2708 | */ |
2665 | void |
2709 | void |
2666 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2710 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2667 | { |
2711 | { |
2668 | /* convert normal newline chars into common keyboard Return key sequence */ |
2712 | /* convert normal newline chars into common keyboard Return key sequence */ |
2669 | for (unsigned int i = 0; i < len; i++) |
2713 | for (unsigned int i = 0; i < len; i++) |
2670 | if (data[i] == C0_LF) |
2714 | if (data[i] == C0_LF) |
2671 | data[i] = C0_CR; |
2715 | data[i] = C0_CR; |
… | |
… | |
2677 | |
2721 | |
2678 | if (priv_modes & PrivMode_BracketPaste) |
2722 | if (priv_modes & PrivMode_BracketPaste) |
2679 | tt_printf ("\e[201~"); |
2723 | tt_printf ("\e[201~"); |
2680 | } |
2724 | } |
2681 | |
2725 | |
|
|
2726 | void |
|
|
2727 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2728 | { |
|
|
2729 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2730 | return; |
|
|
2731 | |
|
|
2732 | tt_paste (data, len); |
|
|
2733 | } |
|
|
2734 | |
2682 | /* ------------------------------------------------------------------------- */ |
2735 | /* ------------------------------------------------------------------------- */ |
2683 | /* |
2736 | /* |
2684 | * Respond to a notification that a primary selection has been sent |
2737 | * Respond to a notification that a primary selection has been sent |
2685 | * EXT: SelectionNotify |
2738 | * EXT: SelectionNotify |
2686 | */ |
2739 | */ |
2687 | void |
2740 | void |
2688 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2741 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2689 | { |
2742 | { |
2690 | if (prop == None) /* check for failed XConvertSelection */ |
2743 | if (prop == None) /* check for failed XConvertSelection */ |
2691 | { |
2744 | { |
|
|
2745 | int selnum = selection_type & Sel_whereMask; |
|
|
2746 | |
2692 | if ((selection_type & Sel_CompoundText)) |
2747 | if ((selection_type & Sel_CompoundText)) |
2693 | { |
2748 | { |
2694 | int selnum = selection_type & Sel_whereMask; |
|
|
2695 | |
|
|
2696 | selection_type = 0; |
2749 | selection_type = 0; |
2697 | if (selnum != Sel_direct) |
|
|
2698 | selection_request_other (XA_STRING, selnum); |
2750 | selection_request_other (XA_STRING, selnum); |
2699 | } |
2751 | } |
2700 | |
2752 | |
2701 | if ((selection_type & Sel_UTF8String)) |
2753 | if ((selection_type & Sel_UTF8String)) |
2702 | { |
2754 | { |
2703 | int selnum = selection_type & Sel_whereMask; |
|
|
2704 | |
|
|
2705 | selection_type = Sel_CompoundText; |
2755 | selection_type = Sel_CompoundText; |
2706 | if (selnum != Sel_direct) |
|
|
2707 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2756 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2708 | else |
|
|
2709 | selection_type = 0; |
|
|
2710 | } |
2757 | } |
2711 | |
2758 | |
2712 | return; |
2759 | return; |
2713 | } |
2760 | } |
2714 | |
2761 | |
2715 | unsigned long bytes_after; |
2762 | unsigned long bytes_after; |
2716 | XTextProperty ct; |
2763 | XTextProperty ct; |
2717 | |
2764 | |
|
|
2765 | // length == (2^31 - 1) / 4, as gdk |
2718 | if (XGetWindowProperty (dpy, win, prop, |
2766 | if (XGetWindowProperty (dpy, win, prop, |
2719 | 0, PROP_SIZE / 4, |
2767 | 0, 0x1fffffff, |
2720 | delete_prop, AnyPropertyType, |
2768 | delete_prop, AnyPropertyType, |
2721 | &ct.encoding, &ct.format, |
2769 | &ct.encoding, &ct.format, |
2722 | &ct.nitems, &bytes_after, |
2770 | &ct.nitems, &bytes_after, |
2723 | &ct.value) != Success) |
2771 | &ct.value) != Success) |
2724 | { |
2772 | { |
… | |
… | |
2726 | goto bailout; |
2774 | goto bailout; |
2727 | } |
2775 | } |
2728 | |
2776 | |
2729 | if (ct.encoding == None) |
2777 | if (ct.encoding == None) |
2730 | goto bailout; |
2778 | goto bailout; |
2731 | |
|
|
2732 | if (bytes_after) |
|
|
2733 | { |
|
|
2734 | // fetch and append remaining data |
|
|
2735 | XTextProperty ct2; |
|
|
2736 | |
|
|
2737 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2738 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2739 | delete_prop, AnyPropertyType, |
|
|
2740 | &ct2.encoding, &ct2.format, |
|
|
2741 | &ct2.nitems, &bytes_after, |
|
|
2742 | &ct2.value) != Success) |
|
|
2743 | goto bailout; |
|
|
2744 | |
|
|
2745 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2746 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2747 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2748 | ct.nitems += ct2.nitems; |
|
|
2749 | |
|
|
2750 | XFree (ct2.value); |
|
|
2751 | } |
|
|
2752 | |
2779 | |
2753 | if (ct.value == 0) |
2780 | if (ct.value == 0) |
2754 | goto bailout; |
2781 | goto bailout; |
2755 | |
2782 | |
2756 | if (ct.encoding == xa[XA_INCR]) |
2783 | if (ct.encoding == xa[XA_INCR]) |
… | |
… | |
2787 | { |
2814 | { |
2788 | /* |
2815 | /* |
2789 | * pass through again trying CUT_BUFFER0 if we've come from |
2816 | * pass through again trying CUT_BUFFER0 if we've come from |
2790 | * XConvertSelection () but nothing was presented |
2817 | * XConvertSelection () but nothing was presented |
2791 | */ |
2818 | */ |
2792 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2819 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2793 | } |
2820 | } |
2794 | |
2821 | |
2795 | goto bailout; |
2822 | goto bailout; |
2796 | } |
2823 | } |
2797 | } |
2824 | } |
… | |
… | |
2800 | incr_ev.start (10); |
2827 | incr_ev.start (10); |
2801 | |
2828 | |
2802 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2829 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2803 | { |
2830 | { |
2804 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2831 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2805 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2832 | incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); |
2806 | } |
2833 | } |
2807 | |
2834 | |
2808 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2835 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2809 | incr_buf_fill += ct.nitems; |
2836 | incr_buf_fill += ct.nitems; |
2810 | |
2837 | |
… | |
… | |
2851 | { |
2878 | { |
2852 | selection_wait = Sel_none; |
2879 | selection_wait = Sel_none; |
2853 | |
2880 | |
2854 | incr_buf_size = 0; |
2881 | incr_buf_size = 0; |
2855 | free (incr_buf); |
2882 | free (incr_buf); |
|
|
2883 | incr_buf = 0; |
2856 | |
2884 | |
2857 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2885 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2858 | } |
2886 | } |
2859 | |
2887 | |
2860 | void |
2888 | void |
… | |
… | |
2893 | selection_wait = Sel_normal; |
2921 | selection_wait = Sel_normal; |
2894 | |
2922 | |
2895 | #if X_HAVE_UTF8_STRING |
2923 | #if X_HAVE_UTF8_STRING |
2896 | selection_type = Sel_UTF8String; |
2924 | selection_type = Sel_UTF8String; |
2897 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2925 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2898 | return; |
2926 | return; |
2899 | #else |
2927 | #else |
2900 | selection_type = Sel_CompoundText; |
2928 | selection_type = Sel_CompoundText; |
2901 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2929 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2902 | return; |
2930 | return; |
2903 | #endif |
2931 | #endif |
2904 | } |
2932 | } |
2905 | |
2933 | |
2906 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2934 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2907 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2935 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2935 | /* |
2963 | /* |
2936 | * Clear all selected text |
2964 | * Clear all selected text |
2937 | * EXT: SelectionClear |
2965 | * EXT: SelectionClear |
2938 | */ |
2966 | */ |
2939 | void |
2967 | void |
2940 | rxvt_term::selection_clear () NOTHROW |
2968 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2941 | { |
2969 | { |
|
|
2970 | if (!clipboard) |
|
|
2971 | { |
2942 | want_refresh = 1; |
2972 | want_refresh = 1; |
2943 | free (selection.text); |
2973 | free (selection.text); |
2944 | selection.text = NULL; |
2974 | selection.text = NULL; |
2945 | selection.len = 0; |
2975 | selection.len = 0; |
2946 | CLEAR_SELECTION (); |
2976 | CLEAR_SELECTION (); |
2947 | |
2977 | |
2948 | if (display->selection_owner == this) |
2978 | if (display->selection_owner == this) |
2949 | display->selection_owner = 0; |
2979 | display->selection_owner = 0; |
|
|
2980 | } |
|
|
2981 | else |
|
|
2982 | { |
|
|
2983 | free (selection.clip_text); |
|
|
2984 | selection.clip_text = NULL; |
|
|
2985 | selection.clip_len = 0; |
|
|
2986 | |
|
|
2987 | if (display->clipboard_owner == this) |
|
|
2988 | display->clipboard_owner = 0; |
|
|
2989 | } |
2950 | } |
2990 | } |
2951 | |
2991 | |
2952 | /* ------------------------------------------------------------------------- */ |
2992 | /* ------------------------------------------------------------------------- */ |
2953 | /* |
2993 | /* |
2954 | * Copy a selection into the cut buffer |
2994 | * Copy a selection into the cut buffer |
2955 | * EXT: button 1 or 3 release |
2995 | * EXT: button 1 or 3 release |
2956 | */ |
2996 | */ |
2957 | void |
2997 | void |
2958 | rxvt_term::selection_make (Time tm) |
2998 | rxvt_term::selection_make (Time tm) |
2959 | { |
2999 | { |
2960 | int i; |
3000 | int size; |
2961 | wchar_t *new_selection_text; |
3001 | wchar_t *new_selection_text; |
2962 | text_t *t; |
3002 | text_t *t; |
2963 | |
3003 | |
2964 | switch (selection.op) |
3004 | switch (selection.op) |
2965 | { |
3005 | { |
… | |
… | |
2981 | return; /* nothing selected, go away */ |
3021 | return; /* nothing selected, go away */ |
2982 | |
3022 | |
2983 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3023 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2984 | return; |
3024 | return; |
2985 | |
3025 | |
2986 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3026 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2987 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3027 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2988 | |
3028 | |
2989 | int ofs = 0; |
3029 | int ofs = 0; |
2990 | int extra = 0; |
3030 | int extra = 0; |
2991 | |
3031 | |
2992 | int col = selection.beg.col; |
3032 | int col = selection.beg.col; |
… | |
… | |
2998 | { |
3038 | { |
2999 | #if !ENABLE_MINIMAL |
3039 | #if !ENABLE_MINIMAL |
3000 | if (selection.rect) |
3040 | if (selection.rect) |
3001 | { |
3041 | { |
3002 | col = selection.beg.col; |
3042 | col = selection.beg.col; |
3003 | end_col = ncol + 1; |
3043 | end_col = selection.end.col; |
3004 | } |
3044 | } |
3005 | else |
3045 | else |
3006 | #endif |
3046 | #endif |
3007 | end_col = ROW(row).l; |
3047 | end_col = ROW(row).l; |
3008 | |
3048 | |
3009 | col = max (col, 0); |
3049 | col = max (col, 0); |
3010 | |
3050 | |
3011 | if (row == selection.end.row |
3051 | if (row == selection.end.row) |
3012 | #if !ENABLE_MINIMAL |
|
|
3013 | || selection.rect |
|
|
3014 | #endif |
|
|
3015 | ) |
|
|
3016 | min_it (end_col, selection.end.col); |
3052 | min_it (end_col, selection.end.col); |
3017 | |
3053 | |
3018 | t = ROW(row).t + col; |
3054 | t = ROW(row).t + col; |
3019 | |
3055 | |
3020 | for (; col < end_col; col++) |
3056 | for (; col < end_col; col++) |
… | |
… | |
3028 | |
3064 | |
3029 | extra -= (len - 1); |
3065 | extra -= (len - 1); |
3030 | |
3066 | |
3031 | if (extra < 0) |
3067 | if (extra < 0) |
3032 | { |
3068 | { |
3033 | extra += i; |
3069 | extra += size; |
3034 | i += i; |
3070 | size += size; |
3035 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
3071 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3036 | } |
3072 | } |
3037 | |
3073 | |
3038 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3074 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3039 | } |
3075 | } |
3040 | #endif |
3076 | #endif |
… | |
… | |
3052 | |
3088 | |
3053 | new_selection_text[ofs++] = C0_LF; |
3089 | new_selection_text[ofs++] = C0_LF; |
3054 | } |
3090 | } |
3055 | else |
3091 | else |
3056 | #endif |
3092 | #endif |
3057 | if (!ROW(row).is_longer () && row != selection.end.row) |
3093 | if (!ROW(row).is_longer () |
|
|
3094 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
3095 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3058 | new_selection_text[ofs++] = C0_LF; |
3096 | new_selection_text[ofs++] = C0_LF; |
3059 | } |
3097 | } |
3060 | |
|
|
3061 | if (end_col != selection.end.col) |
|
|
3062 | new_selection_text[ofs++] = C0_LF; |
|
|
3063 | |
3098 | |
3064 | new_selection_text[ofs] = 0; |
3099 | new_selection_text[ofs] = 0; |
3065 | |
3100 | |
3066 | if (ofs == 0) |
3101 | if (ofs == 0) |
3067 | { |
3102 | { |
… | |
… | |
3080 | |
3115 | |
3081 | selection_grab (tm); |
3116 | selection_grab (tm); |
3082 | } |
3117 | } |
3083 | |
3118 | |
3084 | bool |
3119 | bool |
3085 | rxvt_term::selection_grab (Time tm) NOTHROW |
3120 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3086 | { |
3121 | { |
|
|
3122 | Atom sel; |
|
|
3123 | |
|
|
3124 | if (!clipboard) |
|
|
3125 | { |
3087 | selection_time = tm; |
3126 | selection_time = tm; |
|
|
3127 | sel = XA_PRIMARY; |
|
|
3128 | } |
|
|
3129 | else |
|
|
3130 | { |
|
|
3131 | clipboard_time = tm; |
|
|
3132 | sel = xa[XA_CLIPBOARD]; |
|
|
3133 | } |
3088 | |
3134 | |
3089 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3135 | XSetSelectionOwner (dpy, sel, vt, tm); |
3090 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3136 | if (XGetSelectionOwner (dpy, sel) == vt) |
3091 | { |
3137 | { |
3092 | display->set_selection_owner (this); |
3138 | display->set_selection_owner (this, clipboard); |
3093 | return true; |
3139 | return true; |
3094 | } |
3140 | } |
3095 | else |
3141 | else |
3096 | { |
3142 | { |
3097 | selection_clear (); |
3143 | selection_clear (clipboard); |
3098 | return false; |
3144 | return false; |
3099 | } |
3145 | } |
3100 | |
3146 | |
3101 | #if 0 |
3147 | #if 0 |
3102 | XTextProperty ct; |
3148 | XTextProperty ct; |
… | |
… | |
3597 | else if (rq.target == xa[XA_MULTIPLE]) |
3643 | else if (rq.target == xa[XA_MULTIPLE]) |
3598 | { |
3644 | { |
3599 | /* TODO: Handle MULTIPLE */ |
3645 | /* TODO: Handle MULTIPLE */ |
3600 | } |
3646 | } |
3601 | #endif |
3647 | #endif |
3602 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3648 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3603 | { |
3649 | { |
3604 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3650 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3605 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3651 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3652 | ev.property = rq.property; |
|
|
3653 | } |
|
|
3654 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3655 | { |
|
|
3656 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3657 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3606 | ev.property = rq.property; |
3658 | ev.property = rq.property; |
3607 | } |
3659 | } |
3608 | else if (rq.target == XA_STRING |
3660 | else if (rq.target == XA_STRING |
3609 | || rq.target == xa[XA_TEXT] |
3661 | || rq.target == xa[XA_TEXT] |
3610 | || rq.target == xa[XA_COMPOUND_TEXT] |
3662 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3643 | { |
3695 | { |
3644 | target = xa[XA_COMPOUND_TEXT]; |
3696 | target = xa[XA_COMPOUND_TEXT]; |
3645 | style = enc_compound_text; |
3697 | style = enc_compound_text; |
3646 | } |
3698 | } |
3647 | |
3699 | |
3648 | if (selection.text) |
3700 | if (rq.selection == XA_PRIMARY && selection.text) |
3649 | { |
3701 | { |
3650 | cl = selection.text; |
3702 | cl = selection.text; |
3651 | selectlen = selection.len; |
3703 | selectlen = selection.len; |
|
|
3704 | } |
|
|
3705 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3706 | { |
|
|
3707 | cl = selection.clip_text; |
|
|
3708 | selectlen = selection.clip_len; |
3652 | } |
3709 | } |
3653 | else |
3710 | else |
3654 | { |
3711 | { |
3655 | cl = L""; |
3712 | cl = L""; |
3656 | selectlen = 0; |
3713 | selectlen = 0; |
… | |
… | |
3724 | h += 2; min_it (h, nrow); |
3781 | h += 2; min_it (h, nrow); |
3725 | |
3782 | |
3726 | x -= 1; clamp_it (x, 0, ncol - w); |
3783 | x -= 1; clamp_it (x, 0, ncol - w); |
3727 | y -= 1; clamp_it (y, 0, nrow - h); |
3784 | y -= 1; clamp_it (y, 0, nrow - h); |
3728 | |
3785 | |
3729 | ov_x = x; ov_y = y; |
3786 | ov.x = x; ov.y = y; |
3730 | ov_w = w; ov_h = h; |
3787 | ov.w = w; ov.h = h; |
3731 | |
3788 | |
3732 | ov_text = new text_t *[h]; |
3789 | ov.text = new text_t *[h]; |
3733 | ov_rend = new rend_t *[h]; |
3790 | ov.rend = new rend_t *[h]; |
3734 | |
3791 | |
3735 | for (y = 0; y < h; y++) |
3792 | for (y = 0; y < h; y++) |
3736 | { |
3793 | { |
3737 | text_t *tp = ov_text[y] = new text_t[w]; |
3794 | text_t *tp = ov.text[y] = new text_t[w]; |
3738 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3795 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3739 | |
3796 | |
3740 | text_t t0, t1, t2; |
3797 | text_t t0, t1, t2; |
3741 | rend_t r = OVERLAY_RSTYLE; |
3798 | rend_t r = OVERLAY_RSTYLE; |
3742 | |
3799 | |
3743 | if (y == 0) |
3800 | if (y == 0) |
… | |
… | |
3762 | } |
3819 | } |
3763 | |
3820 | |
3764 | void |
3821 | void |
3765 | rxvt_term::scr_overlay_off () NOTHROW |
3822 | rxvt_term::scr_overlay_off () NOTHROW |
3766 | { |
3823 | { |
3767 | if (!ov_text) |
3824 | if (!ov.text) |
3768 | return; |
3825 | return; |
3769 | |
3826 | |
3770 | want_refresh = 1; |
3827 | want_refresh = 1; |
3771 | |
3828 | |
3772 | for (int y = 0; y < ov_h; y++) |
3829 | for (int y = 0; y < ov.h; y++) |
3773 | { |
3830 | { |
3774 | delete [] ov_text[y]; |
3831 | delete [] ov.text[y]; |
3775 | delete [] ov_rend[y]; |
3832 | delete [] ov.rend[y]; |
3776 | } |
3833 | } |
3777 | |
3834 | |
3778 | delete [] ov_text; ov_text = 0; |
3835 | delete [] ov.text; ov.text = 0; |
3779 | delete [] ov_rend; ov_rend = 0; |
3836 | delete [] ov.rend; ov.rend = 0; |
3780 | } |
3837 | } |
3781 | |
3838 | |
3782 | void |
3839 | void |
3783 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3840 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3784 | { |
3841 | { |
3785 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3842 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3786 | return; |
3843 | return; |
3787 | |
3844 | |
3788 | x++, y++; |
3845 | x++, y++; |
3789 | |
3846 | |
3790 | ov_text[y][x] = text; |
3847 | ov.text[y][x] = text; |
3791 | ov_rend[y][x] = rend; |
3848 | ov.rend[y][x] = rend; |
3792 | } |
3849 | } |
3793 | |
3850 | |
3794 | void |
3851 | void |
3795 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3852 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3796 | { |
3853 | { |
… | |
… | |
3815 | } |
3872 | } |
3816 | |
3873 | |
3817 | void |
3874 | void |
3818 | rxvt_term::scr_swap_overlay () NOTHROW |
3875 | rxvt_term::scr_swap_overlay () NOTHROW |
3819 | { |
3876 | { |
3820 | if (!ov_text) |
3877 | if (!ov.text) |
3821 | return; |
3878 | return; |
3822 | |
3879 | |
|
|
3880 | // hide cursor if it is within the overlay area |
|
|
3881 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3882 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3883 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3884 | |
3823 | // swap screen mem with overlay |
3885 | // swap screen mem with overlay |
3824 | for (int y = ov_h; y--; ) |
3886 | for (int y = ov.h; y--; ) |
3825 | { |
3887 | { |
3826 | text_t *t1 = ov_text[y]; |
3888 | text_t *t1 = ov.text[y]; |
3827 | rend_t *r1 = ov_rend[y]; |
3889 | rend_t *r1 = ov.rend[y]; |
3828 | |
3890 | |
3829 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3891 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3830 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3892 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3831 | |
3893 | |
3832 | for (int x = ov_w; x--; ) |
3894 | for (int x = ov.w; x--; ) |
3833 | { |
3895 | { |
3834 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3896 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3835 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3897 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3836 | } |
3898 | } |
3837 | } |
3899 | } |