… | |
… | |
93 | */ |
93 | */ |
94 | #define drawBuffer vt |
94 | #define drawBuffer vt |
95 | |
95 | |
96 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
97 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
98 | XClearArea (xdisp, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
101 | |
101 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
103 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (xdisp, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
107 | |
107 | |
108 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | XFillRectangle (xdisp, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
113 | |
113 | |
114 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
… | |
… | |
126 | width = ncol; |
126 | width = ncol; |
127 | } |
127 | } |
128 | |
128 | |
129 | l.touch (); |
129 | l.touch (); |
130 | |
130 | |
131 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
133 | |
134 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
136 | |
136 | |
… | |
… | |
173 | nrow = 24; |
173 | nrow = 24; |
174 | |
174 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
176 | return; |
177 | |
177 | |
|
|
178 | if (current_screen != PRIMARY) |
|
|
179 | scr_swap_screen (); |
|
|
180 | |
178 | // we need at least two lines for wrapping to work correctly |
181 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + saveLines < 2) |
182 | while (nrow + saveLines < 2) |
180 | { |
183 | { |
181 | //TODO//FIXME |
184 | //TODO//FIXME |
182 | saveLines++; |
185 | saveLines++; |
183 | prev_nrow--; |
186 | prev_nrow--; |
184 | top_row--; |
187 | top_row--; |
… | |
… | |
195 | if (!row_buf) |
198 | if (!row_buf) |
196 | { |
199 | { |
197 | /* |
200 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
201 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
202 | */ |
200 | top_row = 0; /* no saved lines */ |
203 | top_row = 0; |
201 | term_start = 0; |
204 | term_start = 0; |
202 | |
205 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
206 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
207 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
208 | |
… | |
… | |
234 | selection.text = NULL; |
237 | selection.text = NULL; |
235 | selection.len = 0; |
238 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
239 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
240 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
241 | selection.clicks = 0; |
239 | rvideo = 0; |
242 | rvideo_state = rvideo_mode = false; |
240 | } |
243 | } |
241 | else |
244 | else |
242 | { |
245 | { |
243 | /* |
246 | /* |
244 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
280 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
282 | |
285 | |
283 | if (top_row) |
286 | if (top_row) |
284 | { |
287 | { |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
287 | |
290 | |
288 | row_col_t ocur = screen.cur; |
291 | row_col_t ocur = screen.cur; |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
293 | |
… | |
… | |
347 | |
350 | |
348 | line_t &pline = old_buf [prow]; |
351 | line_t &pline = old_buf [prow]; |
349 | |
352 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
354 | |
352 | #if DEBUG_STRICT |
|
|
353 | assert (len); |
|
|
354 | assert (pline.t); |
|
|
355 | #endif |
|
|
356 | |
|
|
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
356 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
359 | |
357 | |
360 | lofs += len; |
358 | lofs += len; |
361 | qcol += len; |
359 | qcol += len; |
… | |
… | |
401 | delete old_ra; |
399 | delete old_ra; |
402 | |
400 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
403 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
404 | free (tabs); |
408 | } |
405 | } |
409 | |
406 | |
410 | CLEAR_ALL_SELECTION (); |
407 | CLEAR_ALL_SELECTION (); |
411 | |
408 | |
412 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
… | |
… | |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
416 | |
413 | |
417 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
418 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
419 | |
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
420 | tt_winch (); |
420 | tt_winch (); |
421 | |
421 | |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | } |
423 | } |
424 | |
424 | |
… | |
… | |
427 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
428 | */ |
428 | */ |
429 | void |
429 | void |
430 | rxvt_term::scr_release () NOTHROW |
430 | rxvt_term::scr_release () NOTHROW |
431 | { |
431 | { |
|
|
432 | if (row_buf) |
|
|
433 | { |
432 | delete talloc; talloc = 0; |
434 | delete talloc; talloc = 0; |
433 | delete ralloc; ralloc = 0; |
435 | delete ralloc; ralloc = 0; |
434 | |
436 | |
435 | free (row_buf); |
437 | free (row_buf); |
436 | free (swap_buf); |
438 | free (swap_buf); |
437 | free (drawn_buf); |
439 | free (drawn_buf); |
438 | free (tabs); |
440 | free (tabs); |
439 | |
441 | |
440 | row_buf = 0; // signal that we freed all the arrays |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
441 | } |
444 | } |
442 | |
445 | |
443 | /* ------------------------------------------------------------------------- */ |
446 | /* ------------------------------------------------------------------------- */ |
444 | /* |
447 | /* |
445 | * Hard reset |
448 | * Hard reset |
446 | */ |
449 | */ |
447 | void |
450 | void |
448 | rxvt_term::scr_poweron () NOTHROW |
451 | rxvt_term::scr_poweron () |
449 | { |
452 | { |
450 | scr_release (); |
453 | scr_release (); |
451 | prev_nrow = prev_ncol = 0; |
454 | prev_nrow = prev_ncol = 0; |
452 | scr_reset (); |
455 | scr_reset (); |
453 | |
456 | |
… | |
… | |
504 | assert (s->cur.row >= 0); |
507 | assert (s->cur.row >= 0); |
505 | assert (s->cur.col >= 0); |
508 | assert (s->cur.col >= 0); |
506 | #endif |
509 | #endif |
507 | } |
510 | } |
508 | |
511 | |
|
|
512 | void |
|
|
513 | rxvt_term::scr_swap_screen () |
|
|
514 | { |
|
|
515 | if (!OPTION (Opt_secondaryScreen)) |
|
|
516 | return; |
|
|
517 | |
|
|
518 | for (int i = prev_nrow; i--; ) |
|
|
519 | ::swap (ROW(i), swap_buf [i]); |
|
|
520 | |
|
|
521 | ::swap (screen.cur, swap.cur); |
|
|
522 | |
|
|
523 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
524 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
525 | } |
|
|
526 | |
509 | /* ------------------------------------------------------------------------- */ |
527 | /* ------------------------------------------------------------------------- */ |
510 | /* |
528 | /* |
511 | * Swap between primary and secondary screens |
529 | * Swap between primary and secondary screens |
512 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
530 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
513 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
531 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
514 | */ |
532 | */ |
515 | int |
533 | void |
516 | rxvt_term::scr_change_screen (int scrn) NOTHROW |
534 | rxvt_term::scr_change_screen (int scrn) |
517 | { |
535 | { |
|
|
536 | if (scrn == current_screen) |
|
|
537 | return; |
|
|
538 | |
518 | want_refresh = 1; |
539 | want_refresh = 1; |
519 | view_start = 0; |
540 | view_start = 0; |
520 | |
541 | |
521 | if (current_screen == scrn) |
|
|
522 | return scrn; |
|
|
523 | |
|
|
524 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
525 | |
543 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
527 | |
|
|
528 | ::swap (screen.cur.row, swap.cur.row); |
|
|
529 | ::swap (screen.cur.col, swap.cur.col); |
|
|
530 | |
|
|
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
533 | |
545 | |
534 | #if NSCREENS |
546 | #if NSCREENS |
535 | if (OPTION (Opt_secondaryScreen)) |
547 | if (OPTION (Opt_secondaryScreen)) |
536 | { |
548 | { |
537 | num_scr = 0; |
549 | num_scr = 0; |
538 | |
550 | |
539 | for (int i = prev_nrow; i--; ) |
551 | scr_swap_screen (); |
540 | ::swap (ROW(i), swap_buf [i]); |
|
|
541 | |
552 | |
542 | ::swap (screen.charset, swap.charset); |
553 | ::swap (screen.charset, swap.charset); |
543 | ::swap (screen.flags, swap.flags); |
554 | ::swap (screen.flags, swap.flags); |
544 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
546 | } |
557 | } |
547 | else |
558 | else |
548 | #endif |
559 | #endif |
549 | if (OPTION (Opt_secondaryScroll)) |
560 | if (OPTION (Opt_secondaryScroll)) |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | |
|
|
552 | return scrn; |
|
|
553 | } |
562 | } |
554 | |
563 | |
555 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
556 | void |
565 | void |
557 | rxvt_term::scr_do_wrap () NOTHROW |
566 | rxvt_term::scr_do_wrap () NOTHROW |
… | |
… | |
632 | } |
641 | } |
633 | |
642 | |
634 | // erase newly scrolled-in lines |
643 | // erase newly scrolled-in lines |
635 | for (int i = count; i--; ) |
644 | for (int i = count; i--; ) |
636 | { |
645 | { |
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - 1 - i); |
646 | line_t &l = ROW(nrow - 1 - i); |
640 | |
647 | |
|
|
648 | // optimize if already cleared, can be significant on slow machines |
|
|
649 | // could be rolled into scr_blank_screen_mem |
|
|
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) |
|
|
651 | { |
641 | scr_blank_line (l, 0, l.l, rstyle); |
652 | scr_blank_line (l, 0, l.l, rstyle); |
642 | |
|
|
643 | l.l = 0; |
653 | l.l = 0; |
644 | l.f = 0; |
654 | l.f = 0; |
|
|
655 | } |
|
|
656 | else |
|
|
657 | scr_blank_screen_mem (l, rstyle); |
645 | } |
658 | } |
646 | |
659 | |
647 | // now copy lines below the scroll region bottom to the |
660 | // now copy lines below the scroll region bottom to the |
648 | // bottom of the screen again, so they look as if they |
661 | // bottom of the screen again, so they look as if they |
649 | // hadn't moved. |
662 | // hadn't moved. |
… | |
… | |
749 | ZERO_SCROLLBACK (); |
762 | ZERO_SCROLLBACK (); |
750 | |
763 | |
751 | if (minlines > 0) |
764 | if (minlines > 0) |
752 | { |
765 | { |
753 | minlines += screen.cur.row - screen.bscroll; |
766 | minlines += screen.cur.row - screen.bscroll; |
|
|
767 | min_it (minlines, screen.cur.row - top_row); |
754 | |
768 | |
755 | if (minlines > 0 |
769 | if (minlines > 0 |
756 | && screen.tscroll == 0 |
770 | && screen.tscroll == 0 |
757 | && screen.bscroll == nrow - 1) |
771 | && screen.bscroll == nrow - 1) |
758 | { |
772 | { |
… | |
… | |
832 | |
846 | |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
834 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
835 | c = 0xfffd; |
849 | c = 0xfffd; |
836 | |
850 | |
837 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
838 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
839 | // for the line drawing characters below as they might be invalid in the current |
853 | // drawing characters below as they might be invalid in the current |
840 | // locale. |
854 | // locale. |
841 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
842 | |
856 | |
843 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
844 | { |
858 | { |
845 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
846 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
1100 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1101 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1102 | * Move cursor left in row. If we're at the left boundary, shift everything |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1103 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1104 | */ |
1118 | */ |
1105 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1106 | void |
1120 | void |
1107 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1108 | { |
1122 | { |
1109 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1110 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1117 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1118 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1119 | * Move cursor right in row. If we're at the right boundary, shift everything |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1120 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1121 | */ |
1135 | */ |
1122 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1123 | void |
1137 | void |
1124 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1125 | { |
1139 | { |
1126 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1127 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1328 | } |
1342 | } |
1329 | else |
1343 | else |
1330 | { |
1344 | { |
1331 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1332 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1334 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1335 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1336 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1337 | } |
1351 | } |
1338 | |
1352 | |
1339 | for (; num--; row++) |
1353 | for (; num--; row++) |
1340 | { |
1354 | { |
1341 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1342 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1343 | } |
1357 | } |
1344 | } |
1358 | } |
1345 | |
1359 | |
1346 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1347 | void |
1361 | void |
1348 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1349 | { |
1363 | { |
1350 | want_refresh = 1; |
1364 | want_refresh = 1; |
1351 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1621 | * Set reverse/normal video |
1635 | * Set reverse/normal video |
1622 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1636 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1623 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1637 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1624 | */ |
1638 | */ |
1625 | void |
1639 | void |
1626 | rxvt_term::scr_rvideo_mode (int mode) NOTHROW |
1640 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1627 | { |
1641 | { |
1628 | XGCValues gcvalue; |
1642 | rvideo_mode = on; |
1629 | |
1643 | |
|
|
1644 | #ifndef NO_BELL |
|
|
1645 | on ^= rvideo_bell; |
|
|
1646 | #endif |
|
|
1647 | |
1630 | if (rvideo != mode) |
1648 | if (rvideo_state != on) |
1631 | { |
1649 | { |
1632 | rvideo = mode; |
1650 | rvideo_state = on; |
|
|
1651 | |
1633 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1634 | #if XPM_BACKGROUND |
1653 | #if XPM_BACKGROUND |
1635 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1636 | #endif |
1655 | #endif |
1637 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1638 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1639 | #endif |
1658 | #endif |
1640 | XSetWindowBackground (display->display, vt, |
1659 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1641 | pix_colors[Color_bg]); |
|
|
1642 | |
1660 | |
|
|
1661 | XGCValues gcvalue; |
1643 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1644 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1645 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1664 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1646 | &gcvalue); |
1665 | |
1647 | scr_clear (); |
1666 | scr_clear (); |
1648 | scr_touch (true); |
1667 | scr_touch (true); |
1649 | } |
1668 | } |
1650 | } |
1669 | } |
1651 | |
1670 | |
… | |
… | |
1735 | { |
1754 | { |
1736 | bool found = false; |
1755 | bool found = false; |
1737 | |
1756 | |
1738 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1739 | { |
1758 | { |
1740 | int col = 0; |
|
|
1741 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1742 | |
1760 | |
1743 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1744 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1745 | { |
1763 | { |
1746 | found = true; |
1764 | found = true; |
1747 | *drp = ~value; |
1765 | *drp = ~value; |
1748 | } |
1766 | } |
… | |
… | |
1851 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1869 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1852 | |
1870 | |
1853 | return true; |
1871 | return true; |
1854 | } |
1872 | } |
1855 | |
1873 | |
|
|
1874 | #ifndef NO_BELL |
|
|
1875 | void |
|
|
1876 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1877 | { |
|
|
1878 | rvideo_bell = false; |
|
|
1879 | scr_rvideo_mode (rvideo_mode); |
|
|
1880 | } |
|
|
1881 | #endif |
|
|
1882 | |
1856 | /* ------------------------------------------------------------------------- */ |
1883 | /* ------------------------------------------------------------------------- */ |
1857 | void |
1884 | void |
1858 | rxvt_term::scr_bell () NOTHROW |
1885 | rxvt_term::scr_bell () NOTHROW |
1859 | { |
1886 | { |
1860 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
1861 | |
1888 | |
1862 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1863 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1864 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1865 | # endif |
1892 | # endif |
1866 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (xdisp, parent[0]); |
1867 | # endif |
1894 | # endif |
1868 | |
1895 | |
1869 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1870 | { |
1897 | { |
1871 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1898 | rvideo_bell = true; |
|
|
1899 | scr_rvideo_mode (rvideo_mode); |
1872 | display->flush (); |
1900 | display->flush (); |
1873 | rxvt_usleep (VISUAL_BELL_DURATION); |
1901 | |
1874 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1875 | } |
1903 | } |
1876 | else |
1904 | else |
1877 | XBell (display->display, 0); |
1905 | XBell (xdisp, 0); |
1878 | |
1906 | |
1879 | #endif |
1907 | #endif |
1880 | } |
1908 | } |
1881 | |
1909 | |
1882 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2121 | { |
2149 | { |
2122 | /* also comes here at end if needed because of >= above */ |
2150 | /* also comes here at end if needed because of >= above */ |
2123 | if (wlen < len) |
2151 | if (wlen < len) |
2124 | ::swap (wlen, len); |
2152 | ::swap (wlen, len); |
2125 | |
2153 | |
2126 | XCopyArea (display->display, vt, vt, |
2154 | XCopyArea (xdisp, vt, vt, |
2127 | gc, 0, Row2Pixel (len + i), |
2155 | gc, 0, Row2Pixel (len + i), |
2128 | (unsigned int)this->width, |
2156 | (unsigned int)this->width, |
2129 | (unsigned int)Height2Pixel (wlen - len + 1), |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2130 | 0, Row2Pixel (len)); |
2158 | 0, Row2Pixel (len)); |
2131 | len = -1; |
2159 | len = -1; |
… | |
… | |
2219 | |
2247 | |
2220 | // only do special processing if any attributes are set, which is unlikely |
2248 | // only do special processing if any attributes are set, which is unlikely |
2221 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2249 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2222 | { |
2250 | { |
2223 | #if ENABLE_STYLES |
2251 | #if ENABLE_STYLES |
2224 | // force redraw after "careful" characters to avoid pixel droppings |
2252 | // "careful" (too wide) character handling |
2225 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2226 | drp[col + 1] = ~srp[col + 1]; |
|
|
2227 | |
2253 | |
2228 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2229 | while (text > stp |
2255 | while (text > stp |
2230 | && srp[text - stp - 1] & RS_Careful |
2256 | && srp[text - stp - 1] & RS_Careful |
2231 | && RS_SAME (rend, srp[text - stp - 1])) |
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
2232 | text--, count++, xpixel -= fwidth; |
2258 | text--, count++, xpixel -= fwidth; |
|
|
2259 | |
|
|
2260 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2263 | |
|
|
2264 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2233 | #endif |
2267 | #endif |
2234 | |
2268 | |
2235 | bool invert = rend & RS_RVid; |
2269 | bool invert = rend & RS_RVid; |
2236 | |
2270 | |
2237 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2321 | |
2355 | |
2322 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2323 | { |
2357 | { |
2324 | #if ENABLE_FRILLS |
2358 | #if ENABLE_FRILLS |
2325 | if (ISSET_PIXCOLOR (Color_underline)) |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2326 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2327 | else |
2361 | else |
2328 | #endif |
2362 | #endif |
2329 | XSetForeground (display->display, gc, pix_colors[fore]); |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2330 | |
2364 | |
2331 | XDrawLine (display->display, drawBuffer, gc, |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2332 | xpixel, ypixel + font->ascent + 1, |
2366 | xpixel, ypixel + font->ascent + 1, |
2333 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2334 | } |
2368 | } |
2335 | } /* for (col....) */ |
2369 | } /* for (col....) */ |
2336 | } /* for (row....) */ |
2370 | } /* for (row....) */ |
… | |
… | |
2369 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2370 | cursorwidth++; |
2404 | cursorwidth++; |
2371 | |
2405 | |
2372 | #ifndef NO_CURSORCOLOR |
2406 | #ifndef NO_CURSORCOLOR |
2373 | if (ISSET_PIXCOLOR (Color_cursor)) |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2374 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2375 | #endif |
2409 | #endif |
2376 | |
2410 | |
2377 | XDrawRectangle (display->display, drawBuffer, gc, |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2378 | Col2Pixel (col), |
2412 | Col2Pixel (col), |
2379 | Row2Pixel (oldcursor.row), |
2413 | Row2Pixel (oldcursor.row), |
2380 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2381 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2382 | } |
2416 | } |
… | |
… | |
2426 | #if XPM_BACKGROUND |
2460 | #if XPM_BACKGROUND |
2427 | && !bgPixmap.pixmap |
2461 | && !bgPixmap.pixmap |
2428 | #endif |
2462 | #endif |
2429 | ) |
2463 | ) |
2430 | { |
2464 | { |
2431 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2432 | XClearWindow (display->display, parent[0]); |
2466 | XClearWindow (xdisp, parent[0]); |
2433 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2434 | #if HAVE_SCROLLBARS |
2468 | #if HAVE_SCROLLBARS |
2435 | if (scrollBar.win) |
2469 | if (scrollBar.win) |
2436 | { |
2470 | { |
2437 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2438 | scrollBar.setIdle (); |
2472 | scrollBar.setIdle (); |
2439 | scrollbar_show (0); |
2473 | scrollbar_show (0); |
2440 | } |
2474 | } |
2441 | #endif |
2475 | #endif |
2442 | } |
2476 | } |
… | |
… | |
2455 | |
2489 | |
2456 | num_scr_allow = 0; |
2490 | num_scr_allow = 0; |
2457 | want_refresh = 1; |
2491 | want_refresh = 1; |
2458 | |
2492 | |
2459 | if (really) |
2493 | if (really) |
2460 | XClearWindow (display->display, vt); |
2494 | XClearWindow (xdisp, vt); |
2461 | } |
2495 | } |
2462 | |
2496 | |
2463 | void |
2497 | void |
2464 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2498 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2465 | { |
2499 | { |
… | |
… | |
2514 | { |
2548 | { |
2515 | if (selection.op |
2549 | if (selection.op |
2516 | && current_screen == selection.screen |
2550 | && current_screen == selection.screen |
2517 | && selection.end.row >= view_start) |
2551 | && selection.end.row >= view_start) |
2518 | { |
2552 | { |
2519 | #if ENABLE_FRILLS |
2553 | #if !ENABLE_MINIMAL |
2520 | if (selection.rect) |
2554 | if (selection.rect) |
2521 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2555 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2522 | selection.end.row, selection.end.col, |
2556 | selection.end.row, selection.end.col, |
2523 | RS_RVid, RS_RVid | RS_Uline); |
2557 | RS_RVid, RS_RVid | RS_Uline); |
2524 | else |
2558 | else |
… | |
… | |
2640 | } |
2674 | } |
2641 | |
2675 | |
2642 | unsigned long bytes_after; |
2676 | unsigned long bytes_after; |
2643 | XTextProperty ct; |
2677 | XTextProperty ct; |
2644 | |
2678 | |
2645 | if (XGetWindowProperty (display->display, win, prop, |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2646 | 0, PROP_SIZE / 4, |
2680 | 0, PROP_SIZE / 4, |
2647 | delete_prop, AnyPropertyType, |
2681 | delete_prop, AnyPropertyType, |
2648 | &ct.encoding, &ct.format, |
2682 | &ct.encoding, &ct.format, |
2649 | &ct.nitems, &bytes_after, |
2683 | &ct.nitems, &bytes_after, |
2650 | &ct.value) != Success) |
2684 | &ct.value) != Success) |
… | |
… | |
2659 | if (bytes_after) |
2693 | if (bytes_after) |
2660 | { |
2694 | { |
2661 | // fetch and append remaining data |
2695 | // fetch and append remaining data |
2662 | XTextProperty ct2; |
2696 | XTextProperty ct2; |
2663 | |
2697 | |
2664 | if (XGetWindowProperty (display->display, win, prop, |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2665 | ct.nitems / 4, (bytes_after + 3) / 4, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2666 | delete_prop, AnyPropertyType, |
2700 | delete_prop, AnyPropertyType, |
2667 | &ct2.encoding, &ct2.format, |
2701 | &ct2.encoding, &ct2.format, |
2668 | &ct2.nitems, &bytes_after, |
2702 | &ct2.nitems, &bytes_after, |
2669 | &ct2.value) != Success) |
2703 | &ct2.value) != Success) |
… | |
… | |
2682 | |
2716 | |
2683 | if (ct.encoding == xa[XA_INCR]) |
2717 | if (ct.encoding == xa[XA_INCR]) |
2684 | { |
2718 | { |
2685 | // INCR selection, start handshake |
2719 | // INCR selection, start handshake |
2686 | if (!delete_prop) |
2720 | if (!delete_prop) |
2687 | XDeleteProperty (display->display, win, prop); |
2721 | XDeleteProperty (xdisp, win, prop); |
2688 | |
2722 | |
2689 | selection_wait = Sel_incr; |
2723 | selection_wait = Sel_incr; |
2690 | incr_buf_fill = 0; |
2724 | incr_buf_fill = 0; |
2691 | incr_ev.start (NOW + 10); |
2725 | incr_ev.start (NOW + 10); |
2692 | |
2726 | |
… | |
… | |
2739 | } |
2773 | } |
2740 | |
2774 | |
2741 | char **cl; |
2775 | char **cl; |
2742 | int cr; |
2776 | int cr; |
2743 | |
2777 | |
2744 | #if ENABLE_FRILLS |
2778 | #if !ENABLE_MINIMAL |
2745 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2779 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2746 | // so recode it manually |
2780 | // so recode it manually |
2747 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2781 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2748 | { |
2782 | { |
2749 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2783 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2753 | paste (s, strlen (s)); |
2787 | paste (s, strlen (s)); |
2754 | free (s); |
2788 | free (s); |
2755 | } |
2789 | } |
2756 | else |
2790 | else |
2757 | #endif |
2791 | #endif |
2758 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2759 | && cl) |
2793 | && cl) |
2760 | { |
2794 | { |
2761 | for (int i = 0; i < cr; i++) |
2795 | for (int i = 0; i < cr; i++) |
2762 | paste (cl[i], strlen (cl[i])); |
2796 | paste (cl[i], strlen (cl[i])); |
2763 | |
2797 | |
… | |
… | |
2804 | * EXT: button 2 release |
2838 | * EXT: button 2 release |
2805 | */ |
2839 | */ |
2806 | void |
2840 | void |
2807 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2841 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2808 | { |
2842 | { |
2809 | /* After making a selection with selection_make this function will always |
2843 | if (selection.text && selnum == Sel_Primary) |
2810 | * return the internal selection, which is not correct IMO, now much more since |
|
|
2811 | * I added the selnum parameter. |
|
|
2812 | */ |
|
|
2813 | #if 0 |
|
|
2814 | if (selection.text) |
|
|
2815 | { /* internal selection */ |
2844 | { /* internal selection */ |
2816 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2845 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2817 | paste (str, strlen (str)); |
2846 | paste (str, strlen (str)); |
2818 | free (str); |
2847 | free (str); |
2819 | return; |
2848 | return; |
2820 | } |
2849 | } |
2821 | else |
2850 | else |
2822 | #endif |
|
|
2823 | { |
2851 | { |
2824 | selection_request_time = tm; |
2852 | selection_request_time = tm; |
2825 | selection_wait = Sel_normal; |
2853 | selection_wait = Sel_normal; |
2826 | |
2854 | |
2827 | #if X_HAVE_UTF8_STRING |
2855 | #if X_HAVE_UTF8_STRING |
… | |
… | |
2851 | else if (selnum == Sel_Secondary) |
2879 | else if (selnum == Sel_Secondary) |
2852 | sel = XA_SECONDARY; |
2880 | sel = XA_SECONDARY; |
2853 | else |
2881 | else |
2854 | sel = xa[XA_CLIPBOARD]; |
2882 | sel = xa[XA_CLIPBOARD]; |
2855 | |
2883 | |
2856 | if (XGetSelectionOwner (display->display, sel) != None) |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2857 | { |
2885 | { |
2858 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2859 | vt, selection_request_time); |
2887 | vt, selection_request_time); |
2860 | return 1; |
2888 | return 1; |
2861 | } |
2889 | } |
2862 | |
2890 | |
2863 | return 0; |
2891 | return 0; |
… | |
… | |
2926 | |
2954 | |
2927 | int end_col; |
2955 | int end_col; |
2928 | |
2956 | |
2929 | for (; row <= selection.end.row; row++, col = 0) |
2957 | for (; row <= selection.end.row; row++, col = 0) |
2930 | { |
2958 | { |
2931 | #if ENABLE_FRILLS |
2959 | #if !ENABLE_MINIMAL |
2932 | if (selection.rect) |
2960 | if (selection.rect) |
2933 | { |
2961 | { |
2934 | col = selection.beg.col; |
2962 | col = selection.beg.col; |
2935 | end_col = ncol + 1; |
2963 | end_col = ncol + 1; |
2936 | } |
2964 | } |
… | |
… | |
2939 | end_col = ROW(row).l; |
2967 | end_col = ROW(row).l; |
2940 | |
2968 | |
2941 | col = max (col, 0); |
2969 | col = max (col, 0); |
2942 | |
2970 | |
2943 | if (row == selection.end.row |
2971 | if (row == selection.end.row |
2944 | #if ENABLE_FRILLS |
2972 | #if !ENABLE_MINIMAL |
2945 | || selection.rect |
2973 | || selection.rect |
2946 | #endif |
2974 | #endif |
2947 | ) |
2975 | ) |
2948 | min_it (end_col, selection.end.col); |
2976 | min_it (end_col, selection.end.col); |
2949 | |
2977 | |
… | |
… | |
2972 | #endif |
3000 | #endif |
2973 | else |
3001 | else |
2974 | new_selection_text[ofs++] = *t++; |
3002 | new_selection_text[ofs++] = *t++; |
2975 | } |
3003 | } |
2976 | |
3004 | |
2977 | #if ENABLE_FRILLS |
3005 | #if !ENABLE_MINIMAL |
2978 | if (selection.rect) |
3006 | if (selection.rect) |
2979 | { |
3007 | { |
2980 | while (ofs |
3008 | while (ofs |
2981 | && new_selection_text[ofs - 1] != C0_LF |
3009 | && new_selection_text[ofs - 1] != C0_LF |
2982 | && unicode::is_space (new_selection_text[ofs - 1])) |
3010 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3016 | bool |
3044 | bool |
3017 | rxvt_term::selection_grab (Time tm) NOTHROW |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3018 | { |
3046 | { |
3019 | selection_time = tm; |
3047 | selection_time = tm; |
3020 | |
3048 | |
3021 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3022 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3023 | { |
3051 | { |
3024 | display->set_selection_owner (this); |
3052 | display->set_selection_owner (this); |
3025 | return true; |
3053 | return true; |
3026 | } |
3054 | } |
3027 | else |
3055 | else |
… | |
… | |
3031 | } |
3059 | } |
3032 | |
3060 | |
3033 | #if 0 |
3061 | #if 0 |
3034 | XTextProperty ct; |
3062 | XTextProperty ct; |
3035 | |
3063 | |
3036 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3037 | { |
3065 | { |
3038 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3039 | XFree (ct.value); |
3067 | XFree (ct.value); |
3040 | } |
3068 | } |
3041 | #endif |
3069 | #endif |
… | |
… | |
3343 | |
3371 | |
3344 | if (selection.clicks == 1) |
3372 | if (selection.clicks == 1) |
3345 | { |
3373 | { |
3346 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3374 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3347 | && !ROW(selection.beg.row).is_longer () |
3375 | && !ROW(selection.beg.row).is_longer () |
3348 | #if ENABLE_FRILLS |
3376 | #if !ENABLE_MINIMAL |
3349 | && !selection.rect |
3377 | && !selection.rect |
3350 | #endif |
3378 | #endif |
3351 | ) |
3379 | ) |
3352 | selection.beg.col = ncol; |
3380 | selection.beg.col = ncol; |
3353 | |
3381 | |
3354 | if ( |
3382 | if ( |
3355 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3383 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3356 | && !ROW(selection.end.row).is_longer () |
3384 | && !ROW(selection.end.row).is_longer () |
3357 | #if ENABLE_FRILLS |
3385 | #if !ENABLE_MINIMAL |
3358 | && !selection.rect |
3386 | && !selection.rect |
3359 | #endif |
3387 | #endif |
3360 | ) |
3388 | ) |
3361 | selection.end.col = ncol; |
3389 | selection.end.col = ncol; |
3362 | } |
3390 | } |
… | |
… | |
3379 | { |
3407 | { |
3380 | if (!ROW(end_row).is_longer ()) |
3408 | if (!ROW(end_row).is_longer ()) |
3381 | { |
3409 | { |
3382 | selection.end.row = end_row; |
3410 | selection.end.row = end_row; |
3383 | selection.end.col = ROW(end_row).l; |
3411 | selection.end.col = ROW(end_row).l; |
|
|
3412 | # if !ENABLE_MINIMAL |
3384 | selection_remove_trailing_spaces (); |
3413 | selection_remove_trailing_spaces (); |
|
|
3414 | # endif |
3385 | break; |
3415 | break; |
3386 | } |
3416 | } |
3387 | } |
3417 | } |
3388 | } |
3418 | } |
3389 | else |
3419 | else |
… | |
… | |
3418 | selection.mark.row = selection.beg.row; |
3448 | selection.mark.row = selection.beg.row; |
3419 | selection.mark.col = selection.beg.col; |
3449 | selection.mark.col = selection.beg.col; |
3420 | } |
3450 | } |
3421 | } |
3451 | } |
3422 | |
3452 | |
3423 | #if ENABLE_FRILLS |
3453 | #if !ENABLE_MINIMAL |
3424 | if (selection.rect && selection.beg.col > selection.end.col) |
3454 | if (selection.rect && selection.beg.col > selection.end.col) |
3425 | ::swap (selection.beg.col, selection.end.col); |
3455 | ::swap (selection.beg.col, selection.end.col); |
3426 | #endif |
3456 | #endif |
3427 | } |
3457 | } |
3428 | |
3458 | |
3429 | #if ENABLE_FRILLS |
3459 | #if !ENABLE_MINIMAL |
3430 | void |
3460 | void |
3431 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3461 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3432 | { |
3462 | { |
3433 | int32_t end_col, end_row; |
3463 | int32_t end_col, end_row; |
3434 | text_t *stp; |
3464 | text_t *stp; |
… | |
… | |
3489 | */ |
3519 | */ |
3490 | void |
3520 | void |
3491 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3521 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3492 | { |
3522 | { |
3493 | XSelectionEvent ev; |
3523 | XSelectionEvent ev; |
3494 | dDisp; |
|
|
3495 | |
3524 | |
3496 | ev.type = SelectionNotify; |
3525 | ev.type = SelectionNotify; |
3497 | ev.property = None; |
3526 | ev.property = None; |
3498 | ev.display = rq.display; |
3527 | ev.display = rq.display; |
3499 | ev.requestor = rq.requestor; |
3528 | ev.requestor = rq.requestor; |
… | |
… | |
3513 | *target++ = xa[XA_COMPOUND_TEXT]; |
3542 | *target++ = xa[XA_COMPOUND_TEXT]; |
3514 | #if X_HAVE_UTF8_STRING |
3543 | #if X_HAVE_UTF8_STRING |
3515 | *target++ = xa[XA_UTF8_STRING]; |
3544 | *target++ = xa[XA_UTF8_STRING]; |
3516 | #endif |
3545 | #endif |
3517 | |
3546 | |
3518 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3547 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3519 | 32, PropModeReplace, |
3548 | 32, PropModeReplace, |
3520 | (unsigned char *)target_list, target - target_list); |
3549 | (unsigned char *)target_list, target - target_list); |
3521 | ev.property = rq.property; |
3550 | ev.property = rq.property; |
3522 | } |
3551 | } |
3523 | #if TODO // TODO |
3552 | #if TODO // TODO |
… | |
… | |
3526 | /* TODO: Handle MULTIPLE */ |
3555 | /* TODO: Handle MULTIPLE */ |
3527 | } |
3556 | } |
3528 | #endif |
3557 | #endif |
3529 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3558 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3530 | { |
3559 | { |
3531 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3560 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3532 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3561 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3533 | ev.property = rq.property; |
3562 | ev.property = rq.property; |
3534 | } |
3563 | } |
3535 | else if (rq.target == XA_STRING |
3564 | else if (rq.target == XA_STRING |
3536 | || rq.target == xa[XA_TEXT] |
3565 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3560 | style = enc_string; |
3589 | style = enc_string; |
3561 | else if (target == xa[XA_TEXT]) |
3590 | else if (target == xa[XA_TEXT]) |
3562 | style = enc_text; |
3591 | style = enc_text; |
3563 | else if (target == xa[XA_COMPOUND_TEXT]) |
3592 | else if (target == xa[XA_COMPOUND_TEXT]) |
3564 | style = enc_compound_text; |
3593 | style = enc_compound_text; |
3565 | #if ENABLE_FRILLS |
3594 | #if !ENABLE_MINIMAL |
3566 | else if (target == xa[XA_UTF8_STRING]) |
3595 | else if (target == xa[XA_UTF8_STRING]) |
3567 | style = enc_utf8; |
3596 | style = enc_utf8; |
3568 | #endif |
3597 | #endif |
3569 | else |
3598 | else |
3570 | { |
3599 | { |
… | |
… | |
3581 | { |
3610 | { |
3582 | cl = L""; |
3611 | cl = L""; |
3583 | selectlen = 0; |
3612 | selectlen = 0; |
3584 | } |
3613 | } |
3585 | |
3614 | |
3586 | #if ENABLE_FRILLS |
3615 | #if !ENABLE_MINIMAL |
3587 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3616 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3588 | // so recode it manually |
3617 | // so recode it manually |
3589 | if (style == enc_utf8) |
3618 | if (style == enc_utf8) |
3590 | { |
3619 | { |
3591 | freect = 1; |
3620 | freect = 1; |
… | |
… | |
3594 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3623 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3595 | ct.nitems = strlen ((char *)ct.value); |
3624 | ct.nitems = strlen ((char *)ct.value); |
3596 | } |
3625 | } |
3597 | else |
3626 | else |
3598 | #endif |
3627 | #endif |
3599 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3628 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3600 | freect = 1; |
3629 | freect = 1; |
3601 | else |
3630 | else |
3602 | { |
3631 | { |
3603 | /* if we failed to convert then send it raw */ |
3632 | /* if we failed to convert then send it raw */ |
3604 | ct.value = (unsigned char *)cl; |
3633 | ct.value = (unsigned char *)cl; |
3605 | ct.nitems = selectlen; |
3634 | ct.nitems = selectlen; |
3606 | ct.encoding = target; |
3635 | ct.encoding = target; |
3607 | } |
3636 | } |
3608 | |
3637 | |
3609 | XChangeProperty (disp, rq.requestor, rq.property, |
3638 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3610 | ct.encoding, 8, PropModeReplace, |
3639 | ct.encoding, 8, PropModeReplace, |
3611 | ct.value, (int)ct.nitems); |
3640 | ct.value, (int)ct.nitems); |
3612 | ev.property = rq.property; |
3641 | ev.property = rq.property; |
3613 | |
3642 | |
3614 | if (freect) |
3643 | if (freect) |
3615 | XFree (ct.value); |
3644 | XFree (ct.value); |
3616 | } |
3645 | } |
3617 | |
3646 | |
3618 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3647 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3619 | } |
3648 | } |
3620 | |
3649 | |
3621 | /* ------------------------------------------------------------------------- * |
3650 | /* ------------------------------------------------------------------------- * |
3622 | * MOUSE ROUTINES * |
3651 | * MOUSE ROUTINES * |
3623 | * ------------------------------------------------------------------------- */ |
3652 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3639 | void |
3668 | void |
3640 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3669 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3641 | { |
3670 | { |
3642 | XWindowAttributes xwa; |
3671 | XWindowAttributes xwa; |
3643 | |
3672 | |
3644 | XGetWindowAttributes (display->display, vt, &xwa); |
3673 | XGetWindowAttributes (xdisp, vt, &xwa); |
3645 | |
3674 | |
3646 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3675 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3647 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3676 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3648 | } |
3677 | } |
3649 | #endif |
3678 | #endif |
… | |
… | |
3745 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3774 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3746 | { |
3775 | { |
3747 | while (*s) |
3776 | while (*s) |
3748 | { |
3777 | { |
3749 | text_t t = *s++; |
3778 | text_t t = *s++; |
3750 | int width = wcwidth (t); |
3779 | int width = WCWIDTH (t); |
3751 | |
3780 | |
3752 | while (width--) |
3781 | while (width--) |
3753 | { |
3782 | { |
3754 | scr_overlay_set (x++, y, t); |
3783 | scr_overlay_set (x++, y, t); |
3755 | t = NOCHAR; |
3784 | t = NOCHAR; |