… | |
… | |
39 | while (len--) |
39 | while (len--) |
40 | *start++ = value; |
40 | *start++ = value; |
41 | } |
41 | } |
42 | |
42 | |
43 | /* ------------------------------------------------------------------------- */ |
43 | /* ------------------------------------------------------------------------- */ |
44 | #define PROP_SIZE 16384 |
44 | #define PROP_SIZE 256*1024 |
|
|
45 | #define PASTE_SIZE 32768 |
45 | #define TABSIZE 8 /* default tab size */ |
46 | #define TABSIZE 8 /* default tab size */ |
46 | |
47 | |
47 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
… | |
… | |
293 | ralloc->free (drawn_rend[p]); |
294 | ralloc->free (drawn_rend[p]); |
294 | } |
295 | } |
295 | |
296 | |
296 | /* we have fewer rows so fix up cursor position */ |
297 | /* we have fewer rows so fix up cursor position */ |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
298 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
298 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
|
|
299 | |
299 | |
300 | scr_reset_realloc (); /* realloc _last_ */ |
300 | scr_reset_realloc (); /* realloc _last_ */ |
301 | } |
301 | } |
302 | else if (nrow > prev_nrow) |
302 | else if (nrow > prev_nrow) |
303 | { |
303 | { |
… | |
… | |
336 | screen.s_cur.row += k; |
336 | screen.s_cur.row += k; |
337 | TermWin.nscrolled -= k; |
337 | TermWin.nscrolled -= k; |
338 | } |
338 | } |
339 | #ifdef DEBUG_STRICT |
339 | #ifdef DEBUG_STRICT |
340 | assert (screen.cur.row < TermWin.nrow); |
340 | assert (screen.cur.row < TermWin.nrow); |
341 | assert (swap.cur.row < TermWin.nrow); |
|
|
342 | #else /* drive with your eyes closed */ |
341 | #else /* drive with your eyes closed */ |
343 | |
342 | |
344 | MIN_IT (screen.cur.row, nrow - 1); |
343 | MIN_IT (screen.cur.row, nrow - 1); |
345 | MIN_IT (swap.cur.row, nrow - 1); |
|
|
346 | #endif |
344 | #endif |
347 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
345 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
348 | } |
346 | } |
349 | |
347 | |
350 | /* resize columns */ |
348 | /* resize columns */ |
… | |
… | |
393 | } |
391 | } |
394 | |
392 | |
395 | } |
393 | } |
396 | |
394 | |
397 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
395 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
398 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
|
|
399 | |
396 | |
400 | delete talloc; talloc = ta; |
397 | delete talloc; talloc = ta; |
401 | delete ralloc; ralloc = ra; |
398 | delete ralloc; ralloc = ra; |
402 | } |
399 | } |
403 | |
400 | |
… | |
… | |
565 | if (current_screen == scrn) |
562 | if (current_screen == scrn) |
566 | return scrn; |
563 | return scrn; |
567 | |
564 | |
568 | selection_check (2); /* check for boundary cross */ |
565 | selection_check (2); /* check for boundary cross */ |
569 | |
566 | |
570 | SWAP_IT (current_screen, scrn, int); |
567 | i = current_screen; current_screen = scrn; scrn = i; |
|
|
568 | |
|
|
569 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
|
|
570 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
571 | MAX_IT (screen.cur.row, 0); |
|
|
572 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
573 | MAX_IT (screen.cur.col, 0); |
|
|
574 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
575 | |
571 | #if NSCREENS |
576 | #if NSCREENS |
572 | if (options & Opt_secondaryScreen) |
577 | if (options & Opt_secondaryScreen) |
573 | { |
578 | { |
574 | num_scr = 0; |
579 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
580 | offset = TermWin.saveLines; |
|
|
581 | |
576 | for (i = prev_nrow; i--;) |
582 | for (i = prev_nrow; i--;) |
577 | { |
583 | { |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
584 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
585 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
586 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
581 | } |
587 | } |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
588 | |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
584 | # ifdef DEBUG_STRICT |
|
|
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
|
|
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
|
|
587 | # else /* drive with your eyes closed */ |
|
|
588 | MAX_IT (screen.cur.row, 0); |
|
|
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
590 | MAX_IT (screen.cur.col, 0); |
|
|
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
592 | # endif |
|
|
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
589 | SWAP_IT (screen.charset, swap.charset, int16_t); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
590 | SWAP_IT (screen.flags, swap.flags, int); |
595 | screen.flags |= Screen_VisibleCursor; |
591 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
592 | swap.flags |= Screen_VisibleCursor; |
597 | } |
593 | } |
598 | else |
594 | else |
599 | #endif |
595 | #endif |
600 | if (options & Opt_secondaryScroll) |
596 | if (options & Opt_secondaryScroll) |
601 | //if (current_screen == PRIMARY) |
|
|
602 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
597 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
|
|
598 | |
603 | return scrn; |
599 | return scrn; |
604 | } |
600 | } |
605 | |
601 | |
606 | // clear WrapNext indicator, solidifying position on next line |
602 | // clear WrapNext indicator, solidifying position on next line |
607 | void |
603 | void |
… | |
… | |
878 | |
874 | |
879 | stp = screen.text[row]; /* _must_ refresh */ |
875 | stp = screen.text[row]; /* _must_ refresh */ |
880 | srp = screen.rend[row]; /* _must_ refresh */ |
876 | srp = screen.rend[row]; /* _must_ refresh */ |
881 | } |
877 | } |
882 | |
878 | |
883 | if (screen.flags & Screen_Insert) |
|
|
884 | scr_insdel_chars (1, INSERT); |
|
|
885 | |
|
|
886 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
879 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
887 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
880 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
888 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
881 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
889 | int width = c < 0x100 ? 1 : wcwidth (c); |
882 | int width = c < 0x100 ? 1 : wcwidth (c); |
890 | |
883 | |
891 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
884 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
892 | { |
885 | { |
893 | // vt100 special graphics and line drawing |
886 | // vt100 special graphics and line drawing |
894 | // 5f-7e standard vt100 |
887 | // 5f-7e standard vt100 |
895 | // 40-5e rxvt extension for extra curses acs chars |
888 | // 40-5e rxvt extension for extra curses acs chars |
896 | static uint16_t vt100_0[63] = { // 5f .. 7e |
889 | static uint16_t vt100_0[63] = { // 40 .. 7e |
897 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
890 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
898 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
899 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
900 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
893 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
901 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
894 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
… | |
… | |
909 | c = vt100_0[c - 0x40]; |
902 | c = vt100_0[c - 0x40]; |
910 | width = 1; |
903 | width = 1; |
911 | } |
904 | } |
912 | } |
905 | } |
913 | |
906 | |
|
|
907 | if (screen.flags & Screen_Insert) |
|
|
908 | scr_insdel_chars (width, INSERT); |
|
|
909 | |
914 | if (width != 0) |
910 | if (width != 0) |
915 | { |
911 | { |
916 | // some utf-8 decoders decode surrogate characters. |
912 | // some utf-8 decoders decode surrogate characters. |
917 | if (0xd800 <= c && c <= 0xdfff) |
913 | if (0xd800 <= c && c <= 0xdfff) |
918 | c = 0xfffd; |
914 | c = 0xfffd; |
… | |
… | |
968 | c = NOCHAR; |
964 | c = NOCHAR; |
969 | } |
965 | } |
970 | while (--width > 0); |
966 | while (--width > 0); |
971 | |
967 | |
972 | // pad with spaces when overwriting wide character with smaller one |
968 | // pad with spaces when overwriting wide character with smaller one |
|
|
969 | if (!width) |
973 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
970 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
974 | { |
971 | { |
975 | stp[c] = ' '; |
972 | stp[c] = ' '; |
976 | srp[c] = rend; |
973 | srp[c] = rend; |
977 | } |
974 | } |
978 | } |
975 | } |
979 | else if (width == 0) |
976 | else if (width == 0) |
980 | { |
977 | { |
981 | #if ENABLE_COMBINING |
978 | #if ENABLE_COMBINING |
982 | // handle combining characters |
979 | // handle combining characters |
… | |
… | |
989 | |
986 | |
990 | if (screen.cur.col > 0) |
987 | if (screen.cur.col > 0) |
991 | { |
988 | { |
992 | tp = stp + screen.cur.col - 1; |
989 | tp = stp + screen.cur.col - 1; |
993 | rp = srp + screen.cur.col - 1; |
990 | rp = srp + screen.cur.col - 1; |
|
|
991 | |
|
|
992 | while (*tp == NOCHAR && tp > stp) |
|
|
993 | tp--, rp--; |
994 | } |
994 | } |
995 | else if (screen.cur.row > 0 |
995 | else if (screen.cur.row > 0 |
996 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
996 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
997 | { |
997 | { |
998 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
998 | int line = screen.cur.row - 1 + TermWin.saveLines; |
999 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
999 | |
|
|
1000 | tp = screen.text[line] + last_col - 1; |
|
|
1001 | rp = screen.rend[line] + last_col - 1; |
|
|
1002 | |
|
|
1003 | while (*tp == NOCHAR && tp > screen.text[line]) |
|
|
1004 | tp--, rp--; |
1000 | } |
1005 | } |
1001 | else |
1006 | else |
1002 | continue; |
1007 | continue; |
1003 | |
|
|
1004 | // handle double-width-chars by making them look extremely ugly |
|
|
1005 | if (*tp == NOCHAR) |
|
|
1006 | { |
|
|
1007 | // hack //D //TODO //--tp, --rp; |
|
|
1008 | *tp = ' '; |
|
|
1009 | *rp &= ~RS_baseattrMask; |
|
|
1010 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
1011 | } |
|
|
1012 | |
1008 | |
1013 | // first try to find a precomposed character |
1009 | // first try to find a precomposed character |
1014 | unicode_t n = rxvt_compose (*tp, c); |
1010 | unicode_t n = rxvt_compose (*tp, c); |
1015 | if (n == NOCHAR) |
1011 | if (n == NOCHAR) |
1016 | n = rxvt_composite.compose (*tp, c); |
1012 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
1096 | if (count) |
1092 | if (count) |
1097 | x = TermWin.ncol - 1; |
1093 | x = TermWin.ncol - 1; |
1098 | |
1094 | |
1099 | // store horizontal tab commands as characters inside the text |
1095 | // store horizontal tab commands as characters inside the text |
1100 | // buffer so they can be selected and pasted. |
1096 | // buffer so they can be selected and pasted. |
1101 | if (ht) |
1097 | if (ht && options & Opt_pastableTabs) |
1102 | { |
1098 | { |
1103 | base_rend = SET_FONT (base_rend, 0); |
1099 | base_rend = SET_FONT (base_rend, 0); |
1104 | |
1100 | |
1105 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1101 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1106 | MAX_IT (screen.tlen[row], x); |
1102 | MAX_IT (screen.tlen[row], x); |
… | |
… | |
1379 | ren = DEFAULT_RSTYLE; |
1375 | ren = DEFAULT_RSTYLE; |
1380 | CLEAR_ROWS (row, num); |
1376 | CLEAR_ROWS (row, num); |
1381 | } |
1377 | } |
1382 | else |
1378 | else |
1383 | { |
1379 | { |
1384 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1380 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1385 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1381 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1386 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1382 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1387 | ERASE_ROWS (row, num); |
1383 | ERASE_ROWS (row, num); |
1388 | gcvalue.foreground = pix_colors[Color_fg]; |
1384 | gcvalue.foreground = pix_colors[Color_fg]; |
1389 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1385 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1390 | } |
1386 | } |
1391 | |
1387 | |
1392 | for (; num--; row++) |
1388 | for (; num--; row++) |
1393 | { |
1389 | { |
1394 | scr_blank_screen_mem (screen.text, screen.rend, |
1390 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1395 | (unsigned int) (row + row_offset), rstyle); |
|
|
1396 | screen.tlen[row + row_offset] = 0; |
1391 | screen.tlen[row + row_offset] = 0; |
1397 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1392 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1398 | (unsigned int)TermWin.ncol, ren); |
|
|
1399 | } |
1393 | } |
1400 | } |
1394 | } |
1401 | |
1395 | |
1402 | /* ------------------------------------------------------------------------- */ |
1396 | /* ------------------------------------------------------------------------- */ |
1403 | /* |
1397 | /* |
… | |
… | |
1487 | slp = &screen.tlen[row]; |
1481 | slp = &screen.tlen[row]; |
1488 | |
1482 | |
1489 | switch (insdel) |
1483 | switch (insdel) |
1490 | { |
1484 | { |
1491 | case INSERT: |
1485 | case INSERT: |
1492 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1486 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1493 | col--) |
|
|
1494 | { |
1487 | { |
1495 | stp[col] = stp[col - count]; |
1488 | stp[col] = stp[col - count]; |
1496 | srp[col] = srp[col - count]; |
1489 | srp[col] = srp[col - count]; |
1497 | } |
1490 | } |
1498 | |
1491 | |
… | |
… | |
1508 | if (selection.end.row != screen.cur.row |
1501 | if (selection.end.row != screen.cur.row |
1509 | || (selection.end.col + count >= TermWin.ncol)) |
1502 | || (selection.end.col + count >= TermWin.ncol)) |
1510 | CLEAR_SELECTION (); |
1503 | CLEAR_SELECTION (); |
1511 | else |
1504 | else |
1512 | { /* shift selection */ |
1505 | { /* shift selection */ |
1513 | selection.beg.col += count; |
1506 | selection.beg.col += count; |
1514 | selection.mark.col += count; /* XXX: yes? */ |
1507 | selection.mark.col += count; /* XXX: yes? */ |
1515 | selection.end.col += count; |
1508 | selection.end.col += count; |
1516 | } |
1509 | } |
1517 | } |
1510 | } |
1518 | |
1511 | |
1519 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1512 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1520 | (unsigned int)count, rstyle); |
1513 | (unsigned int)count, rstyle); |
1521 | break; |
1514 | break; |
1522 | |
1515 | |
1523 | case ERASE: |
1516 | case ERASE: |
1524 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1517 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1525 | selection_check (1); |
1518 | selection_check (1); |
1526 | screen.cur.col -= count; |
1519 | screen.cur.col -= count; |
1527 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1520 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1528 | (unsigned int)count, rstyle); |
1521 | (unsigned int)count, rstyle); |
1529 | break; |
1522 | break; |
1530 | |
1523 | |
1531 | case DELETE: |
1524 | case DELETE: |
1532 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1525 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1535 | { |
1528 | { |
1536 | stp[col] = stp[col + count]; |
1529 | stp[col] = stp[col + count]; |
1537 | srp[col] = srp[col + count]; |
1530 | srp[col] = srp[col + count]; |
1538 | } |
1531 | } |
1539 | |
1532 | |
1540 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1533 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1541 | & (srp[TermWin.ncol - count]), |
|
|
1542 | (unsigned int)count, tr); |
1534 | (unsigned int)count, tr); |
1543 | |
1535 | |
1544 | if (*slp == -1) /* break line continuation */ |
1536 | if (*slp == -1) /* break line continuation */ |
1545 | *slp = TermWin.ncol; |
1537 | *slp = TermWin.ncol; |
1546 | |
1538 | |
… | |
… | |
1555 | || selection.end.col >= TermWin.ncol) |
1547 | || selection.end.col >= TermWin.ncol) |
1556 | CLEAR_SELECTION (); |
1548 | CLEAR_SELECTION (); |
1557 | else |
1549 | else |
1558 | { |
1550 | { |
1559 | /* shift selection */ |
1551 | /* shift selection */ |
1560 | selection.beg.col -= count; |
1552 | selection.beg.col -= count; |
1561 | selection.mark.col -= count; /* XXX: yes? */ |
1553 | selection.mark.col -= count; /* XXX: yes? */ |
1562 | selection.end.col -= count; |
1554 | selection.end.col -= count; |
1563 | } |
1555 | } |
1564 | } |
1556 | } |
1565 | |
1557 | |
1566 | break; |
1558 | break; |
1567 | } |
1559 | } |
… | |
… | |
1751 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1743 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1752 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1744 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1753 | */ |
1745 | */ |
1754 | void |
1746 | void |
1755 | rxvt_term::scr_charset_choose (int set) |
1747 | rxvt_term::scr_charset_choose (int set) |
1756 | { |
1748 | { |
1757 | screen.charset = set; |
1749 | screen.charset = set; |
1758 | set_font_style (); |
1750 | set_font_style (); |
1759 | } |
1751 | } |
1760 | |
1752 | |
1761 | /* ------------------------------------------------------------------------- */ |
1753 | /* ------------------------------------------------------------------------- */ |
1762 | /* |
1754 | /* |
1763 | * Set a font |
1755 | * Set a font |
1764 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
1756 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
… | |
… | |
1767 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1759 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1768 | * See set_font_style for possible values for <C> |
1760 | * See set_font_style for possible values for <C> |
1769 | */ |
1761 | */ |
1770 | void |
1762 | void |
1771 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1763 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1772 | { |
1764 | { |
1773 | charsets[set] = (unsigned char)ch; |
1765 | charsets[set] = (unsigned char)ch; |
1774 | set_font_style (); |
1766 | set_font_style (); |
1775 | } |
1767 | } |
1776 | |
1768 | |
1777 | |
1769 | |
1778 | /* ------------------------------------------------------------------------- * |
1770 | /* ------------------------------------------------------------------------- * |
1779 | * MAJOR SCREEN MANIPULATION * |
1771 | * MAJOR SCREEN MANIPULATION * |
1780 | * ------------------------------------------------------------------------- */ |
1772 | * ------------------------------------------------------------------------- */ |
… | |
… | |
2035 | row_offset; /* basic offset in screen structure */ |
2027 | row_offset; /* basic offset in screen structure */ |
2036 | #ifndef NO_CURSORCOLOR |
2028 | #ifndef NO_CURSORCOLOR |
2037 | rend_t cc1; /* store colours at cursor position (s) */ |
2029 | rend_t cc1; /* store colours at cursor position (s) */ |
2038 | #endif |
2030 | #endif |
2039 | rend_t *crp; // cursor rendition pointer |
2031 | rend_t *crp; // cursor rendition pointer |
|
|
2032 | |
|
|
2033 | want_refresh = 0; /* screen is current */ |
2040 | |
2034 | |
2041 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2035 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2042 | return; |
2036 | return; |
2043 | |
2037 | |
2044 | /* |
2038 | /* |
… | |
… | |
2242 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2236 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2243 | continue; |
2237 | continue; |
2244 | |
2238 | |
2245 | // redraw one or more characters |
2239 | // redraw one or more characters |
2246 | |
2240 | |
2247 | // seek to the beginning if wide characters |
2241 | // seek to the beginning of wide characters |
2248 | while (stp[col] == NOCHAR && col > 0) |
2242 | while (stp[col] == NOCHAR && col > 0) |
2249 | --col; |
2243 | --col; |
2250 | |
2244 | |
2251 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2245 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2252 | text_t *text = stp + col; |
2246 | text_t *text = stp + col; |
… | |
… | |
2396 | } |
2390 | } |
2397 | else |
2391 | else |
2398 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2392 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2399 | |
2393 | |
2400 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2394 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
|
|
2395 | { |
|
|
2396 | #if ENABLE_FRILLS |
|
|
2397 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2398 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2399 | else |
|
|
2400 | #endif |
|
|
2401 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2402 | |
2401 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2403 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2402 | xpixel, ypixel + font->ascent + 1, |
2404 | xpixel, ypixel + font->ascent + 1, |
2403 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2405 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
|
|
2406 | } |
2404 | } /* for (col....) */ |
2407 | } /* for (col....) */ |
2405 | } /* for (row....) */ |
2408 | } /* for (row....) */ |
2406 | |
2409 | |
2407 | #if ENABLE_OVERLAY |
2410 | #if ENABLE_OVERLAY |
2408 | scr_swap_overlay (); |
2411 | scr_swap_overlay (); |
… | |
… | |
2447 | if (refresh_type & SMOOTH_REFRESH) |
2450 | if (refresh_type & SMOOTH_REFRESH) |
2448 | XFlush (display->display); |
2451 | XFlush (display->display); |
2449 | |
2452 | |
2450 | num_scr = 0; |
2453 | num_scr = 0; |
2451 | num_scr_allow = 1; |
2454 | num_scr_allow = 1; |
2452 | want_refresh = 0; /* screen is current */ |
|
|
2453 | } |
2455 | } |
2454 | |
2456 | |
2455 | void |
2457 | void |
2456 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2458 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2457 | { |
2459 | { |
… | |
… | |
2544 | int end_row = TermWin.saveLines - TermWin.view_start; |
2546 | int end_row = TermWin.saveLines - TermWin.view_start; |
2545 | int i = selection.beg.row + TermWin.saveLines; |
2547 | int i = selection.beg.row + TermWin.saveLines; |
2546 | int col, row = selection.end.row + TermWin.saveLines; |
2548 | int col, row = selection.end.row + TermWin.saveLines; |
2547 | rend_t *srp; |
2549 | rend_t *srp; |
2548 | |
2550 | |
2549 | if (i >= end_row) |
2551 | #if ENABLE_FRILLS |
2550 | col = selection.beg.col; |
2552 | if (selection.rect) |
|
|
2553 | { |
|
|
2554 | end_row += TermWin.nrow; |
|
|
2555 | |
|
|
2556 | for (; i <= row && i <= end_row; i++) |
|
|
2557 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
|
|
2558 | srp[col] ^= RS_RVid; |
|
|
2559 | } |
2551 | else |
2560 | else |
|
|
2561 | #endif |
|
|
2562 | { |
|
|
2563 | if (i >= end_row) |
|
|
2564 | col = selection.beg.col; |
|
|
2565 | else |
2552 | { |
2566 | { |
2553 | col = 0; |
2567 | col = 0; |
2554 | i = end_row; |
2568 | i = end_row; |
2555 | } |
2569 | } |
2556 | |
2570 | |
2557 | end_row += TermWin.nrow; |
2571 | end_row += TermWin.nrow; |
|
|
2572 | |
2558 | for (; i < row && i < end_row; i++, col = 0) |
2573 | for (; i < row && i < end_row; i++, col = 0) |
2559 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2574 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2560 | srp[col] ^= RS_RVid; |
2575 | srp[col] ^= RS_RVid; |
2561 | |
2576 | |
2562 | if (i == row && i < end_row) |
2577 | if (i == row && i < end_row) |
2563 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2578 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2564 | srp[col] ^= RS_RVid; |
2579 | srp[col] ^= RS_RVid; |
|
|
2580 | } |
2565 | } |
2581 | } |
2566 | } |
2582 | } |
2567 | |
2583 | |
2568 | /* ------------------------------------------------------------------------- */ |
2584 | /* ------------------------------------------------------------------------- */ |
2569 | /* |
2585 | /* |
… | |
… | |
2637 | /* ------------------------------------------------------------------------- */ |
2653 | /* ------------------------------------------------------------------------- */ |
2638 | /* |
2654 | /* |
2639 | * Paste a selection direct to the command fd |
2655 | * Paste a selection direct to the command fd |
2640 | */ |
2656 | */ |
2641 | void |
2657 | void |
2642 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2658 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2643 | { |
2659 | { |
2644 | unsigned int i, j, n; |
|
|
2645 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
|
|
2646 | |
|
|
2647 | /* convert normal newline chars into common keyboard Return key sequence */ |
2660 | /* convert normal newline chars into common keyboard Return key sequence */ |
2648 | for (i = 0; i < len; i += PROP_SIZE) |
2661 | for (unsigned int i = 0; i < len; i++) |
2649 | { |
|
|
2650 | n = min (len - i, PROP_SIZE); |
|
|
2651 | memcpy (ds, data + i, n); |
|
|
2652 | |
|
|
2653 | for (j = 0; j < n; j++) |
|
|
2654 | if (ds[j] == C0_LF) |
2662 | if (data[i] == C0_LF) |
2655 | ds[j] = C0_CR; |
2663 | data[i] = C0_CR; |
2656 | |
2664 | |
2657 | tt_write (ds, (int)n); |
2665 | tt_write (data, len); |
2658 | } |
|
|
2659 | |
|
|
2660 | free (ds); |
|
|
2661 | } |
2666 | } |
2662 | |
2667 | |
2663 | /* ------------------------------------------------------------------------- */ |
2668 | /* ------------------------------------------------------------------------- */ |
2664 | /* |
2669 | /* |
2665 | * Respond to a notification that a primary selection has been sent |
2670 | * Respond to a notification that a primary selection has been sent |
2666 | * EXT: SelectionNotify |
2671 | * EXT: SelectionNotify |
2667 | */ |
2672 | */ |
2668 | int |
2673 | void |
2669 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2674 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2670 | { |
2675 | { |
2671 | long nread = 0; |
|
|
2672 | unsigned long bytes_after; |
|
|
2673 | XTextProperty ct; |
|
|
2674 | |
|
|
2675 | if (prop == None) /* check for failed XConvertSelection */ |
2676 | if (prop == None) /* check for failed XConvertSelection */ |
2676 | { |
2677 | { |
2677 | if ((selection_type & Sel_CompoundText)) |
2678 | if ((selection_type & Sel_CompoundText)) |
2678 | { |
2679 | { |
2679 | int selnum = selection_type & Sel_whereMask; |
2680 | int selnum = selection_type & Sel_whereMask; |
… | |
… | |
2692 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2693 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2693 | else |
2694 | else |
2694 | selection_type = 0; |
2695 | selection_type = 0; |
2695 | } |
2696 | } |
2696 | |
2697 | |
2697 | return 0; |
2698 | return; |
2698 | } |
|
|
2699 | |
|
|
2700 | for (;;) |
|
|
2701 | { |
2699 | } |
|
|
2700 | |
|
|
2701 | unsigned long bytes_after; |
|
|
2702 | XTextProperty ct; |
|
|
2703 | |
|
|
2704 | if (XGetWindowProperty (display->display, win, prop, |
|
|
2705 | 0, PROP_SIZE / 4, |
|
|
2706 | delete_prop, AnyPropertyType, |
|
|
2707 | &ct.encoding, &ct.format, |
|
|
2708 | &ct.nitems, &bytes_after, |
|
|
2709 | &ct.value) != Success) |
|
|
2710 | { |
|
|
2711 | ct.value = 0; |
|
|
2712 | goto bailout; |
|
|
2713 | } |
|
|
2714 | |
|
|
2715 | if (ct.encoding == None) |
|
|
2716 | goto bailout; |
|
|
2717 | |
|
|
2718 | if (bytes_after) |
|
|
2719 | { |
|
|
2720 | // fetch and append remaining data |
|
|
2721 | XTextProperty ct2; |
|
|
2722 | |
2702 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2723 | if (XGetWindowProperty (display->display, win, prop, |
2703 | (long) (PROP_SIZE / 4), delete_prop, |
2724 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2725 | delete_prop, AnyPropertyType, |
2704 | AnyPropertyType, &ct.encoding, &ct.format, |
2726 | &ct2.encoding, &ct2.format, |
2705 | &ct.nitems, &bytes_after, |
2727 | &ct2.nitems, &bytes_after, |
2706 | &ct.value) != Success) |
2728 | &ct2.value) != Success) |
2707 | break; |
2729 | goto bailout; |
2708 | |
2730 | |
2709 | if (ct.encoding == 0) |
2731 | // realloc should be compatible to XFree, here, and elsewhere, too |
2710 | break; |
2732 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2733 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2734 | ct.nitems += ct2.nitems; |
2711 | |
2735 | |
|
|
2736 | XFree (ct2.value); |
|
|
2737 | } |
|
|
2738 | |
|
|
2739 | if (ct.value == 0) |
|
|
2740 | goto bailout; |
|
|
2741 | |
2712 | if (ct.encoding == xa[XA_INCR]) |
2742 | if (ct.encoding == xa[XA_INCR]) |
2713 | { |
2743 | { |
2714 | // INCR selection, start handshake |
2744 | // INCR selection, start handshake |
|
|
2745 | if (!delete_prop) |
2715 | XDeleteProperty (display->display, win, prop); |
2746 | XDeleteProperty (display->display, win, prop); |
|
|
2747 | |
2716 | selection_wait = Sel_incr; |
2748 | selection_wait = Sel_incr; |
|
|
2749 | incr_buf_fill = 0; |
2717 | incr_ev.start (NOW + 10); |
2750 | incr_ev.start (NOW + 10); |
2718 | break; |
|
|
2719 | } |
|
|
2720 | |
2751 | |
2721 | if (ct.value == NULL) |
2752 | goto bailout; |
2722 | continue; |
2753 | } |
2723 | |
2754 | |
2724 | if (ct.nitems == 0) |
2755 | if (ct.nitems == 0) |
|
|
2756 | { |
|
|
2757 | if (selection_wait == Sel_incr) |
|
|
2758 | { |
|
|
2759 | XFree (ct.value); |
|
|
2760 | |
|
|
2761 | // finally complete, now paste the whole thing |
|
|
2762 | selection_wait = Sel_normal; |
|
|
2763 | ct.value = (unsigned char *)incr_buf; |
|
|
2764 | ct.nitems = incr_buf_fill; |
|
|
2765 | incr_buf = 0; |
|
|
2766 | incr_buf_size = 0; |
|
|
2767 | incr_ev.stop (); |
2725 | { |
2768 | } |
|
|
2769 | else |
|
|
2770 | { |
2726 | if (selection_wait == Sel_normal && nread == 0 |
2771 | if (selection_wait == Sel_normal |
2727 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2772 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2728 | { |
2773 | { |
2729 | /* |
2774 | /* |
2730 | * pass through again trying CUT_BUFFER0 if we've come from |
2775 | * pass through again trying CUT_BUFFER0 if we've come from |
2731 | * XConvertSelection () but nothing was presented |
2776 | * XConvertSelection () but nothing was presented |
2732 | */ |
2777 | */ |
2733 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2778 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2734 | } |
2779 | } |
2735 | |
2780 | |
2736 | nread = -1; /* discount any previous stuff */ |
2781 | goto bailout; |
2737 | break; |
2782 | } |
|
|
2783 | } |
|
|
2784 | else if (selection_wait == Sel_incr) |
|
|
2785 | { |
|
|
2786 | incr_ev.start (NOW + 10); |
|
|
2787 | |
|
|
2788 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2738 | } |
2789 | { |
|
|
2790 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2791 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2792 | } |
2739 | |
2793 | |
|
|
2794 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2740 | nread += ct.nitems; |
2795 | incr_buf_fill += ct.nitems; |
2741 | |
2796 | |
|
|
2797 | goto bailout; |
|
|
2798 | } |
|
|
2799 | |
2742 | char **cl; |
2800 | char **cl; |
2743 | int cr; |
2801 | int cr; |
|
|
2802 | |
|
|
2803 | #if ENABLE_FRILLS |
|
|
2804 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2805 | // so recode it manually |
|
|
2806 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2807 | { |
|
|
2808 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2809 | char *s = rxvt_wcstombs (w); |
|
|
2810 | free (w); |
|
|
2811 | // TODO: strlen == only the first element will be converted. well... |
|
|
2812 | paste ((unsigned char *)s, strlen (s)); |
|
|
2813 | free (s); |
|
|
2814 | } |
|
|
2815 | else |
|
|
2816 | #endif |
2744 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2817 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2745 | { |
2818 | && cl) |
|
|
2819 | { |
2746 | for (int i = 0; i < cr; i++) |
2820 | for (int i = 0; i < cr; i++) |
2747 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2821 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2748 | |
2822 | |
2749 | XFreeStringList (cl); |
2823 | XFreeStringList (cl); |
2750 | } |
2824 | } |
2751 | else |
2825 | else |
2752 | paste (ct.value, ct.nitems); |
2826 | paste (ct.value, ct.nitems); // paste raw |
2753 | |
2827 | |
2754 | if (bytes_after == 0) |
2828 | bailout: |
2755 | break; |
|
|
2756 | |
|
|
2757 | XFree (ct.value); |
|
|
2758 | } |
|
|
2759 | |
|
|
2760 | if (ct.value) |
|
|
2761 | XFree (ct.value); |
2829 | XFree (ct.value); |
2762 | |
2830 | |
2763 | if (selection_wait == Sel_normal) |
2831 | if (selection_wait == Sel_normal) |
2764 | selection_wait = Sel_none; |
2832 | selection_wait = Sel_none; |
2765 | |
|
|
2766 | return (int)nread; |
|
|
2767 | } |
2833 | } |
2768 | |
2834 | |
2769 | void |
2835 | void |
2770 | rxvt_term::incr_cb (time_watcher &w) |
2836 | rxvt_term::incr_cb (time_watcher &w) |
2771 | { |
2837 | { |
2772 | selection_wait = Sel_none; |
2838 | selection_wait = Sel_none; |
2773 | |
2839 | |
|
|
2840 | incr_buf_size = 0; |
|
|
2841 | free (incr_buf); |
|
|
2842 | |
2774 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2843 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2775 | } |
2844 | } |
2776 | |
2845 | |
2777 | /* |
|
|
2778 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
|
|
2779 | */ |
|
|
2780 | void |
2846 | void |
2781 | rxvt_term::selection_property (Window win, Atom prop) |
2847 | rxvt_term::selection_property (Window win, Atom prop) |
2782 | { |
2848 | { |
2783 | if (prop == None || selection_wait != Sel_incr) |
2849 | if (prop == None || selection_wait != Sel_incr) |
2784 | return; |
2850 | return; |
2785 | |
2851 | |
2786 | if (selection_paste (win, prop, 1) > 0) |
2852 | selection_paste (win, prop, true); |
2787 | incr_ev.start (NOW + 10); |
|
|
2788 | else |
|
|
2789 | { |
|
|
2790 | selection_wait = Sel_none; |
|
|
2791 | incr_ev.stop (); |
|
|
2792 | } |
|
|
2793 | } |
2853 | } |
2794 | |
2854 | |
2795 | /* ------------------------------------------------------------------------- */ |
2855 | /* ------------------------------------------------------------------------- */ |
2796 | /* |
2856 | /* |
2797 | * Request the current selection: |
2857 | * Request the current selection: |
… | |
… | |
2831 | #else |
2891 | #else |
2832 | selection_type = Sel_CompoundText; |
2892 | selection_type = Sel_CompoundText; |
2833 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2893 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2834 | return; |
2894 | return; |
2835 | #endif |
2895 | #endif |
2836 | |
|
|
2837 | } |
2896 | } |
2838 | } |
2897 | } |
2839 | |
2898 | |
2840 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2899 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2841 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2900 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2842 | } |
2901 | } |
2843 | |
2902 | |
2844 | int |
2903 | int |
2845 | rxvt_term::selection_request_other (Atom target, int selnum) |
2904 | rxvt_term::selection_request_other (Atom target, int selnum) |
2846 | { |
2905 | { |
… | |
… | |
2919 | |
2978 | |
2920 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2979 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2921 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2980 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2922 | |
2981 | |
2923 | col = selection.beg.col; |
2982 | col = selection.beg.col; |
2924 | MAX_IT (col, 0); |
|
|
2925 | row = selection.beg.row + TermWin.saveLines; |
2983 | row = selection.beg.row + TermWin.saveLines; |
2926 | end_row = selection.end.row + TermWin.saveLines; |
2984 | end_row = selection.end.row + TermWin.saveLines; |
2927 | int ofs = 0; |
2985 | int ofs = 0; |
2928 | int extra = 0; |
2986 | int extra = 0; |
2929 | |
2987 | |
2930 | for (; row <= end_row; row++, col = 0) |
2988 | for (; row <= end_row; row++, col = 0) |
2931 | { |
2989 | { |
2932 | t = &screen.text[row][col]; |
|
|
2933 | |
|
|
2934 | end_col = screen.tlen[row]; |
2990 | end_col = screen.tlen[row]; |
|
|
2991 | |
|
|
2992 | #if ENABLE_FRILLS |
|
|
2993 | if (selection.rect) |
|
|
2994 | { |
|
|
2995 | col = selection.beg.col; |
|
|
2996 | end_col = TermWin.ncol + 1; |
|
|
2997 | } |
|
|
2998 | #endif |
|
|
2999 | |
|
|
3000 | MAX_IT (col, 0); |
2935 | |
3001 | |
2936 | if (end_col == -1) |
3002 | if (end_col == -1) |
2937 | end_col = TermWin.ncol; |
3003 | end_col = TermWin.ncol; |
2938 | |
3004 | |
2939 | if (row == end_row) |
3005 | if (row == end_row || selection.rect) |
2940 | MIN_IT (end_col, selection.end.col); |
3006 | MIN_IT (end_col, selection.end.col); |
2941 | |
3007 | |
|
|
3008 | t = &screen.text[row][col]; |
2942 | for (; col < end_col; col++) |
3009 | for (; col < end_col; col++) |
2943 | { |
3010 | { |
2944 | if (*t == NOCHAR) |
3011 | if (*t == NOCHAR) |
2945 | t++; |
3012 | t++; |
2946 | #if ENABLE_COMBINING |
3013 | #if ENABLE_COMBINING |
… | |
… | |
2994 | #if 0 |
3061 | #if 0 |
2995 | XTextProperty ct; |
3062 | XTextProperty ct; |
2996 | |
3063 | |
2997 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3064 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2998 | { |
3065 | { |
2999 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3000 | PropModeReplace, ct.value, ct.nitems); |
|
|
3001 | XFree (ct.value); |
3067 | XFree (ct.value); |
3002 | } |
3068 | } |
3003 | #endif |
3069 | #endif |
3004 | |
3070 | |
3005 | selection_time = tm; |
3071 | selection_time = tm; |
… | |
… | |
3206 | enum { |
3272 | enum { |
3207 | LEFT, RIGHT |
3273 | LEFT, RIGHT |
3208 | } closeto = RIGHT; |
3274 | } closeto = RIGHT; |
3209 | |
3275 | |
3210 | want_refresh = 1; |
3276 | want_refresh = 1; |
|
|
3277 | |
3211 | switch (selection.op) |
3278 | switch (selection.op) |
3212 | { |
3279 | { |
3213 | case SELECTION_INIT: |
3280 | case SELECTION_INIT: |
3214 | CLEAR_SELECTION (); |
3281 | CLEAR_SELECTION (); |
3215 | selection.op = SELECTION_BEGIN; |
3282 | selection.op = SELECTION_BEGIN; |
… | |
… | |
3228 | selection_start_colrow (col, row); |
3295 | selection_start_colrow (col, row); |
3229 | /* FALLTHROUGH */ |
3296 | /* FALLTHROUGH */ |
3230 | default: |
3297 | default: |
3231 | return; |
3298 | return; |
3232 | } |
3299 | } |
|
|
3300 | |
3233 | if (selection.beg.col == selection.end.col |
3301 | if (selection.beg.col == selection.end.col |
3234 | && selection.beg.col != selection.mark.col |
3302 | && selection.beg.col != selection.mark.col |
3235 | && selection.beg.row == selection.end.row |
3303 | && selection.beg.row == selection.end.row |
3236 | && selection.beg.row != selection.mark.row) |
3304 | && selection.beg.row != selection.mark.row) |
3237 | { |
3305 | { |
… | |
… | |
3287 | } |
3355 | } |
3288 | else |
3356 | else |
3289 | { /* button1 drag or button3 drag */ |
3357 | { /* button1 drag or button3 drag */ |
3290 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3358 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3291 | { |
3359 | { |
3292 | if ((selection.mark.row == selection.end.row) |
3360 | if (selection.mark.row == selection.end.row |
3293 | && (selection.mark.col == selection.end.col) |
3361 | && selection.mark.col == selection.end.col |
|
|
3362 | && clickchange |
3294 | && clickchange && selection.clicks == 2) |
3363 | && selection.clicks == 2) |
3295 | selection.mark.col--; |
3364 | selection.mark.col--; |
3296 | |
3365 | |
3297 | selection.beg.row = pos.row; |
3366 | selection.beg.row = pos.row; |
3298 | selection.beg.col = pos.col; |
3367 | selection.beg.col = pos.col; |
3299 | selection.end.row = selection.mark.row; |
3368 | selection.end.row = selection.mark.row; |
… | |
… | |
3310 | |
3379 | |
3311 | if (selection.clicks == 1) |
3380 | if (selection.clicks == 1) |
3312 | { |
3381 | { |
3313 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3382 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3314 | |
3383 | |
3315 | if (end_col != -1 && selection.beg.col > end_col) |
3384 | if (selection.beg.col > end_col |
|
|
3385 | && end_col != -1 |
|
|
3386 | #if ENABLE_FRILLS |
|
|
3387 | && !selection.rect |
|
|
3388 | #endif |
3316 | { |
3389 | ) |
3317 | #if 1 |
|
|
3318 | selection.beg.col = ncol; |
3390 | selection.beg.col = ncol; |
3319 | #else |
|
|
3320 | if (selection.beg.row != selection.end.row) |
|
|
3321 | selection.beg.col = ncol; |
|
|
3322 | else |
|
|
3323 | selection.beg.col = selection.mark.col; |
|
|
3324 | #endif |
|
|
3325 | } |
|
|
3326 | |
3391 | |
3327 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3392 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3328 | |
3393 | |
3329 | if (end_col != -1 && selection.end.col > end_col) |
3394 | if ( |
|
|
3395 | selection.end.col > end_col |
|
|
3396 | && end_col != -1 |
|
|
3397 | #if ENABLE_FRILLS |
|
|
3398 | && !selection.rect |
|
|
3399 | #endif |
|
|
3400 | ) |
3330 | selection.end.col = ncol; |
3401 | selection.end.col = ncol; |
3331 | } |
3402 | } |
3332 | else if (selection.clicks == 2) |
3403 | else if (selection.clicks == 2) |
3333 | { |
3404 | { |
3334 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3405 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3335 | selection.end.col--; |
3406 | selection.end.col--; |
3336 | |
3407 | |
3337 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
|
|
3338 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3408 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
|
|
3409 | selection_delimit_word (DN, &selection.end, &selection.end); |
3339 | } |
3410 | } |
3340 | else if (selection.clicks == 3) |
3411 | else if (selection.clicks == 3) |
3341 | { |
3412 | { |
3342 | #if ENABLE_FRILLS |
3413 | #if ENABLE_FRILLS |
3343 | if ((options & Opt_tripleclickwords)) |
3414 | if ((options & Opt_tripleclickwords)) |
3344 | { |
3415 | { |
3345 | int end_row; |
3416 | int end_row; |
3346 | |
3417 | |
3347 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3418 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3348 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3419 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3349 | |
3420 | |
3350 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3421 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3351 | { |
3422 | { |
3352 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3423 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
… | |
… | |
3363 | else |
3434 | else |
3364 | #endif |
3435 | #endif |
3365 | { |
3436 | { |
3366 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3437 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3367 | selection.mark.col++; |
3438 | selection.mark.col++; |
|
|
3439 | |
3368 | selection.beg.col = 0; |
3440 | selection.beg.col = 0; |
3369 | selection.end.col = ncol; |
3441 | selection.end.col = ncol; |
3370 | } |
3442 | } |
3371 | } |
3443 | } |
3372 | |
3444 | |
… | |
… | |
3381 | { |
3453 | { |
3382 | selection.mark.row = selection.beg.row; |
3454 | selection.mark.row = selection.beg.row; |
3383 | selection.mark.col = selection.beg.col; |
3455 | selection.mark.col = selection.beg.col; |
3384 | } |
3456 | } |
3385 | } |
3457 | } |
3386 | } |
|
|
3387 | |
3458 | |
3388 | #if ENABLE_FRILLS |
3459 | #if ENABLE_FRILLS |
|
|
3460 | if (selection.rect && selection.beg.col > selection.end.col) |
|
|
3461 | SWAP_IT (selection.beg.col, selection.end.col, int); |
|
|
3462 | #endif |
|
|
3463 | } |
|
|
3464 | |
|
|
3465 | #if ENABLE_FRILLS |
3389 | void |
3466 | void |
3390 | rxvt_term::selection_remove_trailing_spaces () |
3467 | rxvt_term::selection_remove_trailing_spaces () |
3391 | { |
3468 | { |
3392 | int32_t end_col, end_row; |
3469 | int32_t end_col, end_row; |
3393 | text_t *stp; |
3470 | text_t *stp; |
3394 | |
3471 | |
3395 | end_col = selection.end.col; |
3472 | end_col = selection.end.col; |
3396 | end_row = selection.end.row; |
3473 | end_row = selection.end.row; |
|
|
3474 | |
3397 | for ( ; end_row >= selection.beg.row; ) |
3475 | for ( ; end_row >= selection.beg.row; ) |
3398 | { |
3476 | { |
3399 | stp = screen.text[end_row + TermWin.saveLines]; |
3477 | stp = screen.text[end_row + TermWin.saveLines]; |
|
|
3478 | |
3400 | while (--end_col >= 0) |
3479 | while (--end_col >= 0) |
3401 | { |
3480 | { |
3402 | if (stp[end_col] != ' ' && stp[end_col] != '\t') |
3481 | if (stp[end_col] != ' ' |
|
|
3482 | && stp[end_col] != '\t' |
|
|
3483 | && stp[end_col] != NOCHAR) |
3403 | break; |
3484 | break; |
3404 | } |
3485 | } |
|
|
3486 | |
3405 | if (end_col >= 0 |
3487 | if (end_col >= 0 |
3406 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3488 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3407 | { |
3489 | { |
3408 | selection.end.col = end_col + 1; |
3490 | selection.end.col = end_col + 1; |
3409 | selection.end.row = end_row; |
3491 | selection.end.row = end_row; |
3410 | break; |
3492 | break; |
3411 | } |
3493 | } |
|
|
3494 | |
3412 | end_row--; |
3495 | end_row--; |
3413 | end_col = TermWin.ncol; |
3496 | end_col = TermWin.ncol; |
3414 | } |
3497 | } |
|
|
3498 | |
3415 | if (selection.mark.row > selection.end.row) |
3499 | if (selection.mark.row > selection.end.row) |
3416 | { |
3500 | { |
3417 | selection.mark.row = selection.end.row; |
3501 | selection.mark.row = selection.end.row; |
3418 | selection.mark.col = selection.end.col; |
3502 | selection.mark.col = selection.end.col; |
3419 | } |
3503 | } |
… | |
… | |
3435 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3519 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3436 | } |
3520 | } |
3437 | |
3521 | |
3438 | /* ------------------------------------------------------------------------- */ |
3522 | /* ------------------------------------------------------------------------- */ |
3439 | /* |
3523 | /* |
3440 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
|
|
3441 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
|
|
3442 | * the X11 protocol. |
|
|
3443 | */ |
|
|
3444 | typedef CARD32 Atom32; |
|
|
3445 | |
|
|
3446 | /* ------------------------------------------------------------------------- */ |
|
|
3447 | /* |
|
|
3448 | * Respond to a request for our current selection |
3524 | * Respond to a request for our current selection |
3449 | * EXT: SelectionRequest |
3525 | * EXT: SelectionRequest |
3450 | */ |
3526 | */ |
3451 | void |
3527 | void |
3452 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3528 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3453 | { |
3529 | { |
3454 | XSelectionEvent ev; |
3530 | XSelectionEvent ev; |
3455 | XTextProperty ct; |
|
|
3456 | XICCEncodingStyle style; |
|
|
3457 | Atom target; |
|
|
3458 | |
3531 | |
3459 | ev.type = SelectionNotify; |
3532 | ev.type = SelectionNotify; |
3460 | ev.property = None; |
3533 | ev.property = None; |
3461 | ev.display = rq.display; |
3534 | ev.display = rq.display; |
3462 | ev.requestor = rq.requestor; |
3535 | ev.requestor = rq.requestor; |
… | |
… | |
3464 | ev.target = rq.target; |
3537 | ev.target = rq.target; |
3465 | ev.time = rq.time; |
3538 | ev.time = rq.time; |
3466 | |
3539 | |
3467 | if (rq.target == xa[XA_TARGETS]) |
3540 | if (rq.target == xa[XA_TARGETS]) |
3468 | { |
3541 | { |
3469 | Atom32 target_list[6]; |
3542 | Atom target_list[6]; |
3470 | Atom32 *target = target_list; |
3543 | Atom *target = target_list; |
3471 | |
3544 | |
3472 | *target++ = (Atom32) xa[XA_TARGETS]; |
3545 | *target++ = xa[XA_TARGETS]; |
3473 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3546 | *target++ = xa[XA_TIMESTAMP]; |
3474 | *target++ = (Atom32) XA_STRING; |
3547 | *target++ = XA_STRING; |
3475 | *target++ = (Atom32) xa[XA_TEXT]; |
3548 | *target++ = xa[XA_TEXT]; |
3476 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3549 | *target++ = xa[XA_COMPOUND_TEXT]; |
3477 | #if X_HAVE_UTF8_STRING |
3550 | #if X_HAVE_UTF8_STRING |
3478 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3551 | *target++ = xa[XA_UTF8_STRING]; |
3479 | #endif |
3552 | #endif |
3480 | |
3553 | |
3481 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3554 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3482 | (8 * sizeof (target_list[0])), PropModeReplace, |
3555 | 32, PropModeReplace, |
3483 | (unsigned char *)target_list, |
3556 | (unsigned char *)target_list, target - target_list); |
3484 | target - target_list); |
|
|
3485 | ev.property = rq.property; |
3557 | ev.property = rq.property; |
3486 | } |
3558 | } |
3487 | #if TODO // TODO |
3559 | #if TODO // TODO |
3488 | else if (rq.target == xa[XA_MULTIPLE]) |
3560 | else if (rq.target == xa[XA_MULTIPLE]) |
3489 | { |
3561 | { |
3490 | /* TODO: Handle MULTIPLE */ |
3562 | /* TODO: Handle MULTIPLE */ |
3491 | } |
3563 | } |
3492 | #endif |
3564 | #endif |
3493 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3565 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3494 | { |
3566 | { |
3495 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3567 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3496 | (8 * sizeof (Time)), PropModeReplace, |
|
|
3497 | (unsigned char *)&selection_time, 1); |
3568 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3498 | ev.property = rq.property; |
3569 | ev.property = rq.property; |
3499 | } |
3570 | } |
3500 | else if (rq.target == XA_STRING |
3571 | else if (rq.target == XA_STRING |
3501 | || rq.target == xa[XA_TEXT] |
3572 | || rq.target == xa[XA_TEXT] |
3502 | || rq.target == xa[XA_COMPOUND_TEXT] |
3573 | || rq.target == xa[XA_COMPOUND_TEXT] |
3503 | || rq.target == xa[XA_UTF8_STRING] |
3574 | || rq.target == xa[XA_UTF8_STRING] |
3504 | ) |
3575 | ) |
3505 | { |
3576 | { |
|
|
3577 | XTextProperty ct; |
|
|
3578 | Atom target = rq.target; |
3506 | short freect = 0; |
3579 | short freect = 0; |
3507 | int selectlen; |
3580 | int selectlen; |
3508 | wchar_t *cl; |
3581 | wchar_t *cl; |
3509 | |
3582 | enum { |
3510 | target = rq.target; |
3583 | enc_string = XStringStyle, |
|
|
3584 | enc_text = XStdICCTextStyle, |
|
|
3585 | enc_compound_text = XCompoundTextStyle, |
|
|
3586 | #ifdef X_HAVE_UTF8_STRING |
|
|
3587 | enc_utf8 = XUTF8StringStyle, |
|
|
3588 | #else |
|
|
3589 | enc_utf8 = -1, |
|
|
3590 | #endif |
|
|
3591 | } style; |
3511 | |
3592 | |
3512 | if (target == XA_STRING) |
3593 | if (target == XA_STRING) |
3513 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3594 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3514 | // will ask for another format anyways. |
3595 | // will ask for another format anyways. |
3515 | style = XStringStyle; |
3596 | style = enc_string; |
3516 | else if (target == xa[XA_TEXT]) |
3597 | else if (target == xa[XA_TEXT]) |
3517 | style = XStdICCTextStyle; |
3598 | style = enc_text; |
3518 | else if (target == xa[XA_COMPOUND_TEXT]) |
3599 | else if (target == xa[XA_COMPOUND_TEXT]) |
3519 | style = XCompoundTextStyle; |
3600 | style = enc_compound_text; |
3520 | #if X_HAVE_UTF8_STRING |
3601 | #if ENABLE_FRILLS |
3521 | else if (target == xa[XA_UTF8_STRING]) |
3602 | else if (target == xa[XA_UTF8_STRING]) |
3522 | style = XUTF8StringStyle; |
3603 | style = enc_utf8; |
3523 | #endif |
3604 | #endif |
3524 | else |
3605 | else |
3525 | { |
3606 | { |
3526 | target = xa[XA_COMPOUND_TEXT]; |
3607 | target = xa[XA_COMPOUND_TEXT]; |
3527 | style = XCompoundTextStyle; |
3608 | style = enc_compound_text; |
3528 | } |
3609 | } |
3529 | |
3610 | |
3530 | if (selection.text) |
3611 | if (selection.text) |
3531 | { |
3612 | { |
3532 | cl = selection.text; |
3613 | cl = selection.text; |
… | |
… | |
3536 | { |
3617 | { |
3537 | cl = L""; |
3618 | cl = L""; |
3538 | selectlen = 0; |
3619 | selectlen = 0; |
3539 | } |
3620 | } |
3540 | |
3621 | |
3541 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
3622 | #if ENABLE_FRILLS |
3542 | // manually for XUTF8StringStyle. |
3623 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
3624 | // so recode it manually |
|
|
3625 | if (style == enc_utf8) |
|
|
3626 | { |
|
|
3627 | freect = 1; |
|
|
3628 | ct.encoding = target; |
|
|
3629 | ct.format = 8; |
|
|
3630 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
|
|
3631 | ct.nitems = strlen ((char *)ct.value); |
|
|
3632 | } |
|
|
3633 | else |
|
|
3634 | #endif |
3543 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3635 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3544 | freect = 1; |
3636 | freect = 1; |
3545 | else |
3637 | else |
3546 | { |
3638 | { |
3547 | /* if we failed to convert then send it raw */ |
3639 | /* if we failed to convert then send it raw */ |
3548 | ct.value = (unsigned char *)cl; |
3640 | ct.value = (unsigned char *)cl; |
3549 | ct.nitems = selectlen; |
3641 | ct.nitems = selectlen; |
|
|
3642 | ct.encoding = target; |
3550 | } |
3643 | } |
3551 | |
3644 | |
3552 | XChangeProperty (display->display, rq.requestor, rq.property, |
3645 | XChangeProperty (display->display, rq.requestor, rq.property, |
3553 | target, 8, PropModeReplace, |
3646 | ct.encoding, 8, PropModeReplace, |
3554 | ct.value, (int)ct.nitems); |
3647 | ct.value, (int)ct.nitems); |
3555 | ev.property = rq.property; |
3648 | ev.property = rq.property; |
3556 | |
3649 | |
3557 | if (freect) |
3650 | if (freect) |
3558 | XFree (ct.value); |
3651 | XFree (ct.value); |