… | |
… | |
23 | /* |
23 | /* |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #define INTERN_SCREEN |
|
|
29 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
|
|
31 | |
29 | |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
33 | |
31 | |
34 | #include <inttypes.h> |
32 | #include <inttypes.h> |
35 | #include <wchar.h> |
|
|
36 | |
33 | |
37 | #include "salloc.C" // HACK, should be a seperate compile! |
34 | #include "salloc.C" // HACK, should be a seperate compile! |
38 | |
35 | |
39 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline void fill_text (text_t *start, text_t value, int len) |
40 | { |
37 | { |
41 | while (len--) |
38 | while (len--) |
42 | *start++ = value; |
39 | *start++ = value; |
43 | } |
40 | } |
44 | |
41 | |
45 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
46 | #define PROP_SIZE 16384 |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
47 | #define TABSIZE 8 /* default tab size */ |
45 | #define TABSIZE 8 /* default tab size */ |
48 | |
46 | |
49 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
51 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
52 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
53 | if (Options & Opt_scrollTtyOutput) \ |
51 | if (options & Opt_scrollTtyOutput) \ |
54 | TermWin.view_start = 0 |
52 | TermWin.view_start = 0 |
55 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
56 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
57 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
58 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
113 | (unsigned int)Height2Pixel (num)) |
111 | (unsigned int)Height2Pixel (num)) |
114 | |
112 | |
115 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
116 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
117 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
|
|
116 | |
118 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
119 | void |
118 | void |
120 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
121 | { |
120 | { |
122 | efs &= ~RS_baseattrMask; |
121 | efs &= ~RS_baseattrMask; |
123 | efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
124 | |
123 | |
125 | while (width--) |
124 | while (width--) |
126 | { |
125 | { |
127 | *et++ = ' '; |
126 | *et++ = ' '; |
128 | *er++ = efs; |
127 | *er++ = efs; |
… | |
… | |
155 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
156 | unsigned int p, q; |
155 | unsigned int p, q; |
157 | int k; |
156 | int k; |
158 | rend_t setrstyle; |
157 | rend_t setrstyle; |
159 | |
158 | |
160 | D_SCREEN ((stderr, "rxvt_scr_reset ()")); |
159 | #if ENABLE_OVERLAY |
|
|
160 | scr_overlay_off (); |
|
|
161 | #endif |
161 | |
162 | |
162 | TermWin.view_start = 0; |
163 | TermWin.view_start = 0; |
163 | num_scr = 0; |
164 | num_scr = 0; |
164 | |
165 | |
165 | if (TermWin.ncol == 0) |
166 | if (TermWin.ncol == 0) |
… | |
… | |
172 | nrow = TermWin.nrow; |
173 | nrow = TermWin.nrow; |
173 | |
174 | |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | return; |
176 | return; |
176 | |
177 | |
|
|
178 | // we need at least two lines for wrapping to work correctly |
|
|
179 | if (nrow + TermWin.saveLines < 2) |
|
|
180 | { |
|
|
181 | TermWin.saveLines++; |
|
|
182 | prev_nrow--; |
|
|
183 | TermWin.nscrolled++; |
|
|
184 | } |
|
|
185 | |
177 | want_refresh = 1; |
186 | want_refresh = 1; |
178 | |
187 | |
|
|
188 | prev_total_rows = prev_nrow + TermWin.saveLines; |
179 | total_rows = nrow + TermWin.saveLines; |
189 | total_rows = nrow + TermWin.saveLines; |
180 | prev_total_rows = prev_nrow + TermWin.saveLines; |
|
|
181 | |
190 | |
182 | screen.tscroll = 0; |
191 | screen.tscroll = 0; |
183 | screen.bscroll = nrow - 1; |
192 | screen.bscroll = nrow - 1; |
184 | |
193 | |
185 | if (!talloc) |
194 | if (!talloc) |
186 | { |
195 | { |
187 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
188 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
189 | } |
198 | } |
190 | |
199 | |
191 | if (prev_nrow == 0) |
200 | if (!screen.text) |
192 | { |
201 | { |
193 | /* |
202 | /* |
194 | * first time called so just malloc everything: don't rely on realloc |
203 | * first time called so just malloc everything: don't rely on realloc |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
196 | */ |
205 | */ |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
200 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
201 | |
210 | |
202 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
203 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
204 | |
213 | |
205 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
206 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
215 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
207 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
216 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
208 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
217 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
209 | |
218 | |
210 | for (p = 0; p < nrow; p++) |
219 | for (p = 0; p < nrow; p++) |
211 | { |
220 | { |
212 | q = p + TermWin.saveLines; |
221 | q = p + TermWin.saveLines; |
213 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
222 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
215 | screen.tlen[q] = swap.tlen[p] = 0; |
224 | screen.tlen[q] = swap.tlen[p] = 0; |
216 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
225 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
217 | } |
226 | } |
218 | |
227 | |
219 | MEMSET (charsets, 'B', sizeof (charsets)); |
228 | memset (charsets, 'B', sizeof (charsets)); |
220 | TermWin.nscrolled = 0; /* no saved lines */ |
229 | TermWin.nscrolled = 0; /* no saved lines */ |
221 | rstyle = DEFAULT_RSTYLE; |
230 | rstyle = DEFAULT_RSTYLE; |
222 | screen.flags = Screen_DefaultFlags; |
231 | screen.flags = Screen_DefaultFlags; |
223 | screen.cur.row = screen.cur.col = 0; |
232 | screen.cur.row = screen.cur.col = 0; |
224 | screen.charset = 0; |
233 | screen.charset = 0; |
… | |
… | |
284 | ralloc->free (drawn_rend[p]); |
293 | ralloc->free (drawn_rend[p]); |
285 | } |
294 | } |
286 | |
295 | |
287 | /* we have fewer rows so fix up cursor position */ |
296 | /* we have fewer rows so fix up cursor position */ |
288 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
289 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
|
|
290 | |
298 | |
291 | scr_reset_realloc (); /* realloc _last_ */ |
299 | scr_reset_realloc (); /* realloc _last_ */ |
292 | } |
300 | } |
293 | else if (nrow > prev_nrow) |
301 | else if (nrow > prev_nrow) |
294 | { |
302 | { |
… | |
… | |
325 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
326 | screen.cur.row += k; |
334 | screen.cur.row += k; |
327 | screen.s_cur.row += k; |
335 | screen.s_cur.row += k; |
328 | TermWin.nscrolled -= k; |
336 | TermWin.nscrolled -= k; |
329 | } |
337 | } |
|
|
338 | |
330 | #ifdef DEBUG_STRICT |
339 | #ifdef DEBUG_STRICT |
331 | assert (screen.cur.row < TermWin.nrow); |
340 | assert (screen.cur.row < TermWin.nrow); |
332 | assert (swap.cur.row < TermWin.nrow); |
|
|
333 | #else /* drive with your eyes closed */ |
341 | #else /* drive with your eyes closed */ |
334 | |
|
|
335 | MIN_IT (screen.cur.row, nrow - 1); |
342 | MIN_IT (screen.cur.row, nrow - 1); |
336 | MIN_IT (swap.cur.row, nrow - 1); |
|
|
337 | #endif |
343 | #endif |
338 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
344 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
339 | } |
345 | } |
340 | |
346 | |
341 | /* resize columns */ |
347 | /* resize columns */ |
… | |
… | |
384 | } |
390 | } |
385 | |
391 | |
386 | } |
392 | } |
387 | |
393 | |
388 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
394 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
389 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
|
|
390 | |
395 | |
391 | delete talloc; talloc = ta; |
396 | delete talloc; talloc = ta; |
392 | delete ralloc; ralloc = ra; |
397 | delete ralloc; ralloc = ra; |
393 | } |
398 | } |
394 | |
399 | |
… | |
… | |
408 | } |
413 | } |
409 | |
414 | |
410 | void |
415 | void |
411 | rxvt_term::scr_reset_realloc () |
416 | rxvt_term::scr_reset_realloc () |
412 | { |
417 | { |
413 | uint16_t total_rows, nrow; |
418 | unsigned int total_rows, nrow; |
414 | |
419 | |
415 | nrow = TermWin.nrow; |
420 | nrow = TermWin.nrow; |
416 | total_rows = nrow + TermWin.saveLines; |
421 | total_rows = nrow + TermWin.saveLines; |
417 | /* *INDENT-OFF* */ |
422 | /* *INDENT-OFF* */ |
418 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
423 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
… | |
… | |
435 | * Free everything. That way malloc debugging can find leakage. |
440 | * Free everything. That way malloc debugging can find leakage. |
436 | */ |
441 | */ |
437 | void |
442 | void |
438 | rxvt_term::scr_release () |
443 | rxvt_term::scr_release () |
439 | { |
444 | { |
440 | uint16_t total_rows; |
445 | unsigned int total_rows; |
441 | int i; |
446 | int i; |
442 | |
447 | |
443 | total_rows = TermWin.nrow + TermWin.saveLines; |
448 | total_rows = TermWin.nrow + TermWin.saveLines; |
444 | |
449 | |
445 | delete talloc; talloc = 0; |
450 | delete talloc; talloc = 0; |
… | |
… | |
471 | * Hard reset |
476 | * Hard reset |
472 | */ |
477 | */ |
473 | void |
478 | void |
474 | rxvt_term::scr_poweron () |
479 | rxvt_term::scr_poweron () |
475 | { |
480 | { |
476 | D_SCREEN ((stderr, "rxvt_scr_poweron ()")); |
|
|
477 | |
|
|
478 | scr_release (); |
481 | scr_release (); |
479 | prev_nrow = prev_ncol = 0; |
482 | prev_nrow = prev_ncol = 0; |
480 | scr_reset (); |
483 | scr_reset (); |
481 | |
484 | |
482 | scr_clear (true); |
485 | scr_clear (true); |
… | |
… | |
493 | */ |
496 | */ |
494 | void |
497 | void |
495 | rxvt_term::scr_cursor (int mode) |
498 | rxvt_term::scr_cursor (int mode) |
496 | { |
499 | { |
497 | screen_t *s; |
500 | screen_t *s; |
498 | |
|
|
499 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
|
|
500 | |
501 | |
501 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
502 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
502 | if (current_screen == SECONDARY) |
503 | if (current_screen == SECONDARY) |
503 | s = &swap; |
504 | s = &swap; |
504 | else |
505 | else |
… | |
… | |
506 | s = &screen; |
507 | s = &screen; |
507 | |
508 | |
508 | switch (mode) |
509 | switch (mode) |
509 | { |
510 | { |
510 | case SAVE: |
511 | case SAVE: |
511 | s->s_cur.row = s->cur.row; |
512 | s->s_cur.row = screen.cur.row; |
512 | s->s_cur.col = s->cur.col; |
513 | s->s_cur.col = screen.cur.col; |
513 | s->s_rstyle = rstyle; |
514 | s->s_rstyle = rstyle; |
514 | s->s_charset = s->charset; |
515 | s->s_charset = screen.charset; |
515 | s->s_charset_char = charsets[s->charset]; |
516 | s->s_charset_char = charsets[screen.charset]; |
516 | break; |
517 | break; |
517 | |
518 | |
518 | case RESTORE: |
519 | case RESTORE: |
519 | want_refresh = 1; |
520 | want_refresh = 1; |
520 | s->cur.row = s->s_cur.row; |
521 | screen.cur.row = s->s_cur.row; |
521 | s->cur.col = s->s_cur.col; |
522 | screen.cur.col = s->s_cur.col; |
522 | s->flags &= ~Screen_WrapNext; |
523 | screen.flags &= ~Screen_WrapNext; |
523 | rstyle = s->s_rstyle; |
524 | rstyle = s->s_rstyle; |
524 | s->charset = s->s_charset; |
525 | screen.charset = s->s_charset; |
525 | charsets[s->charset] = s->s_charset_char; |
526 | charsets[screen.charset] = s->s_charset_char; |
526 | set_font_style (); |
527 | set_font_style (); |
527 | break; |
528 | break; |
528 | } |
529 | } |
529 | |
530 | |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
531 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
… | |
… | |
553 | int offset; |
554 | int offset; |
554 | #endif |
555 | #endif |
555 | |
556 | |
556 | want_refresh = 1; |
557 | want_refresh = 1; |
557 | |
558 | |
558 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
|
|
559 | |
|
|
560 | TermWin.view_start = 0; |
559 | TermWin.view_start = 0; |
561 | |
560 | |
562 | if (current_screen == scrn) |
561 | if (current_screen == scrn) |
563 | return scrn; |
562 | return scrn; |
564 | |
563 | |
565 | selection_check (2); /* check for boundary cross */ |
564 | selection_check (2); /* check for boundary cross */ |
566 | |
565 | |
567 | SWAP_IT (current_screen, scrn, int); |
566 | i = current_screen; current_screen = scrn; scrn = i; |
|
|
567 | |
|
|
568 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
|
|
569 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
570 | MAX_IT (screen.cur.row, 0); |
|
|
571 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
572 | MAX_IT (screen.cur.col, 0); |
|
|
573 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
574 | |
568 | #if NSCREENS |
575 | #if NSCREENS |
569 | if (Options & Opt_secondaryScreen) |
576 | if (options & Opt_secondaryScreen) |
570 | { |
577 | { |
571 | num_scr = 0; |
578 | num_scr = 0; |
572 | offset = TermWin.saveLines; |
579 | offset = TermWin.saveLines; |
|
|
580 | |
573 | for (i = prev_nrow; i--;) |
581 | for (i = prev_nrow; i--;) |
574 | { |
582 | { |
575 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
583 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
576 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
584 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
577 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
585 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
578 | } |
586 | } |
579 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
587 | |
580 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
581 | # ifdef DEBUG_STRICT |
|
|
582 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
|
|
583 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
|
|
584 | # else /* drive with your eyes closed */ |
|
|
585 | MAX_IT (screen.cur.row, 0); |
|
|
586 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
587 | MAX_IT (screen.cur.col, 0); |
|
|
588 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
589 | # endif |
|
|
590 | SWAP_IT (screen.charset, swap.charset, int16_t); |
588 | SWAP_IT (screen.charset, swap.charset, int16_t); |
591 | SWAP_IT (screen.flags, swap.flags, int); |
589 | SWAP_IT (screen.flags, swap.flags, int); |
592 | screen.flags |= Screen_VisibleCursor; |
590 | screen.flags |= Screen_VisibleCursor; |
593 | swap.flags |= Screen_VisibleCursor; |
591 | swap.flags |= Screen_VisibleCursor; |
594 | } |
592 | } |
595 | else |
593 | else |
596 | #endif |
594 | #endif |
597 | if (Options & Opt_secondaryScroll) |
595 | if (options & Opt_secondaryScroll) |
598 | //if (current_screen == PRIMARY) |
|
|
599 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
596 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
|
|
597 | |
600 | return scrn; |
598 | return scrn; |
601 | } |
599 | } |
602 | |
600 | |
|
|
601 | // clear WrapNext indicator, solidifying position on next line |
|
|
602 | void |
|
|
603 | rxvt_term::scr_do_wrap () |
|
|
604 | { |
|
|
605 | if (!(screen.flags & Screen_WrapNext)) |
|
|
606 | return; |
|
|
607 | |
|
|
608 | screen.flags &= ~Screen_WrapNext; |
|
|
609 | |
|
|
610 | screen.cur.col = 0; |
|
|
611 | |
|
|
612 | if (screen.cur.row == screen.bscroll) |
|
|
613 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
614 | else if (screen.cur.row < TermWin.nrow - 1) |
|
|
615 | screen.cur.row++; |
|
|
616 | } |
|
|
617 | |
603 | /* ------------------------------------------------------------------------- */ |
618 | /* ------------------------------------------------------------------------- */ |
604 | /* |
619 | /* |
605 | * Change the colour for following text |
620 | * Change the colour for following text |
606 | */ |
621 | */ |
607 | void |
622 | void |
608 | rxvt_term::scr_color (unsigned int color, int fgbg) |
623 | rxvt_term::scr_color (unsigned int color, int fgbg) |
609 | { |
624 | { |
610 | color &= RS_fgMask; |
625 | if (color > maxTermCOLOR) |
|
|
626 | color = fgbg; |
|
|
627 | |
611 | if (fgbg == Color_fg) |
628 | if (fgbg == Color_fg) |
612 | rstyle = SET_FGCOLOR (rstyle, color); |
629 | rstyle = SET_FGCOLOR (rstyle, color); |
613 | else |
630 | else |
614 | rstyle = SET_BGCOLOR (rstyle, color); |
631 | rstyle = SET_BGCOLOR (rstyle, color); |
615 | } |
632 | } |
… | |
… | |
644 | |
661 | |
645 | if (count == 0 || (row1 > row2)) |
662 | if (count == 0 || (row1 > row2)) |
646 | return 0; |
663 | return 0; |
647 | |
664 | |
648 | want_refresh = 1; |
665 | want_refresh = 1; |
649 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
|
|
650 | |
666 | |
651 | if (row1 == 0 && count > 0 |
667 | if (row1 == 0 && count > 0 |
652 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
668 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
653 | { |
669 | { |
654 | nscrolled = (long)TermWin.nscrolled + (long)count; |
670 | nscrolled = (long)TermWin.nscrolled + (long)count; |
655 | |
671 | |
656 | if (nscrolled > (long)TermWin.saveLines) |
672 | if (nscrolled > (long)TermWin.saveLines) |
657 | TermWin.nscrolled = TermWin.saveLines; |
673 | TermWin.nscrolled = TermWin.saveLines; |
658 | else |
674 | else |
659 | TermWin.nscrolled = (uint16_t)nscrolled; |
675 | TermWin.nscrolled = (unsigned int)nscrolled; |
660 | |
676 | |
661 | if ((Options & Opt_scrollWithBuffer) |
677 | if ((options & Opt_scrollWithBuffer) |
662 | && TermWin.view_start != 0 |
678 | && TermWin.view_start != 0 |
663 | && TermWin.view_start != TermWin.saveLines) |
679 | && TermWin.view_start != TermWin.saveLines) |
664 | scr_page (UP, count); |
680 | scr_page (UP, count); |
665 | } |
681 | } |
666 | else if (!spec) |
682 | else if (!spec) |
… | |
… | |
683 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
699 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
684 | } |
700 | } |
685 | else if (j >= row1 && j <= row2) |
701 | else if (j >= row1 && j <= row2) |
686 | { |
702 | { |
687 | /* move selected region too */ |
703 | /* move selected region too */ |
688 | selection.beg.row -= count; |
704 | selection.beg.row -= count; |
689 | selection.end.row -= count; |
705 | selection.end.row -= count; |
690 | selection.mark.row -= count; |
706 | selection.mark.row -= count; |
691 | } |
707 | } |
692 | } |
708 | } |
693 | |
709 | |
694 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
710 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
… | |
… | |
702 | i = row2 - row1 + 1; |
718 | i = row2 - row1 + 1; |
703 | MIN_IT (count, i); |
719 | MIN_IT (count, i); |
704 | |
720 | |
705 | if (j > 0) |
721 | if (j > 0) |
706 | { |
722 | { |
707 | /* A: scroll up */ |
723 | /* scroll up */ |
708 | |
724 | |
709 | /* A1: Copy lines that will get clobbered by the rotation */ |
725 | /* Copy lines that will get clobbered by the rotation */ |
|
|
726 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
727 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
728 | |
|
|
729 | /* Rotate lines */ |
|
|
730 | i = row2 - row1 - count + 1; |
|
|
731 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
732 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
733 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
734 | |
|
|
735 | j = row2 - count + 1, i = count; |
|
|
736 | } |
|
|
737 | else /* if (j < 0) */ |
|
|
738 | { |
|
|
739 | /* scroll down */ |
|
|
740 | |
|
|
741 | /* Copy lines that will get clobbered by the rotation */ |
710 | for (i = 0, j = row1; i < count; i++, j++) |
742 | for (i = 0, j = row2; i < count; i++, j--) |
711 | { |
743 | { |
712 | buf_text[i] = screen.text[j]; |
744 | buf_text[i] = screen.text[j]; |
713 | buf_rend[i] = screen.rend[j]; |
745 | buf_rend[i] = screen.rend[j]; |
714 | } |
746 | } |
715 | |
747 | |
716 | /* A2: Rotate lines */ |
748 | /* Rotate lines */ |
717 | for (j = row1, i = j + count; i <= row2; i++, j++) |
749 | for (j = row2, i = j - count; i >= row1; i--, j--) |
718 | { |
750 | { |
719 | screen.tlen[j] = screen.tlen[i]; |
751 | screen.tlen[j] = screen.tlen[i]; |
720 | screen.text[j] = screen.text[i]; |
752 | screen.text[j] = screen.text[i]; |
721 | screen.rend[j] = screen.rend[i]; |
753 | screen.rend[j] = screen.rend[i]; |
722 | } |
754 | } |
723 | |
755 | |
724 | j = row2 - count + 1, i = count; |
|
|
725 | } |
|
|
726 | else /* if (j < 0) */ |
|
|
727 | { |
|
|
728 | /* B: scroll down */ |
|
|
729 | |
|
|
730 | /* B1: Copy lines that will get clobbered by the rotation */ |
|
|
731 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
732 | { |
|
|
733 | buf_text[i] = screen.text[j]; |
|
|
734 | buf_rend[i] = screen.rend[j]; |
|
|
735 | } |
|
|
736 | |
|
|
737 | /* B2: Rotate lines */ |
|
|
738 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
739 | { |
|
|
740 | screen.tlen[j] = screen.tlen[i]; |
|
|
741 | screen.text[j] = screen.text[i]; |
|
|
742 | screen.rend[j] = screen.rend[i]; |
|
|
743 | } |
|
|
744 | |
|
|
745 | j = row1, i = count; |
756 | j = row1, i = count; |
746 | count = -count; |
757 | count = -count; |
747 | } |
758 | } |
748 | |
759 | |
749 | /* C: Resurrect lines */ |
760 | /* Resurrect lines */ |
|
|
761 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
762 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
|
|
763 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
764 | if (!spec) /* line length may not equal TermWin.ncol */ |
750 | for (; i--; j++) |
765 | for (; i--; j++) |
751 | { |
|
|
752 | screen.tlen[j] = 0; |
|
|
753 | screen.text[j] = buf_text[i]; |
|
|
754 | screen.rend[j] = buf_rend[i]; |
|
|
755 | |
|
|
756 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
757 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
766 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
758 | } |
|
|
759 | |
767 | |
760 | return count; |
768 | return count; |
761 | } |
769 | } |
762 | |
770 | |
763 | /* ------------------------------------------------------------------------- */ |
771 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
765 | * Add text given in <str> of length <len> to screen struct |
773 | * Add text given in <str> of length <len> to screen struct |
766 | */ |
774 | */ |
767 | void |
775 | void |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
776 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
769 | { |
777 | { |
|
|
778 | if (len <= 0) /* sanity */ |
|
|
779 | return; |
|
|
780 | |
770 | unsigned char checksel, clearsel; |
781 | unsigned char checksel; |
771 | unicode_t c; |
782 | unicode_t c; |
772 | int i, row, last_col; |
783 | int i, row, last_col; |
773 | text_t *stp; |
784 | text_t *stp; |
774 | rend_t *srp; |
785 | rend_t *srp; |
775 | |
786 | const unicode_t *strend = str + len; |
776 | if (len <= 0) /* sanity */ |
|
|
777 | return; |
|
|
778 | |
787 | |
779 | want_refresh = 1; |
788 | want_refresh = 1; |
|
|
789 | ZERO_SCROLLBACK (); |
780 | last_col = TermWin.ncol; |
790 | last_col = TermWin.ncol; |
781 | |
791 | |
782 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
|
|
783 | ZERO_SCROLLBACK (); |
|
|
784 | if (nlines > 0) |
792 | if (nlines > 0) |
785 | { |
793 | { |
786 | nlines += (screen.cur.row - screen.bscroll); |
794 | nlines += screen.cur.row - screen.bscroll; |
787 | if ((nlines > 0) |
795 | if ((nlines > 0) |
788 | && (screen.tscroll == 0) |
796 | && (screen.tscroll == 0) |
789 | && (screen.bscroll == (TermWin.nrow - 1))) |
797 | && (screen.bscroll == (TermWin.nrow - 1))) |
790 | { |
798 | { |
791 | /* _at least_ this many lines need to be scrolled */ |
799 | /* _at least_ this many lines need to be scrolled */ |
792 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
800 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
793 | screen.cur.row -= nlines; |
801 | screen.cur.row -= nlines; |
794 | } |
802 | } |
795 | } |
803 | } |
|
|
804 | |
796 | #ifdef DEBUG_STRICT |
805 | #ifdef DEBUG_STRICT |
797 | assert (screen.cur.col < last_col); |
806 | assert (screen.cur.col < last_col); |
798 | assert ((screen.cur.row < TermWin.nrow) |
807 | assert ((screen.cur.row < TermWin.nrow) |
799 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
808 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
800 | #else /* drive with your eyes closed */ |
809 | #else /* drive with your eyes closed */ |
… | |
… | |
803 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
812 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
804 | #endif |
813 | #endif |
805 | row = screen.cur.row + TermWin.saveLines; |
814 | row = screen.cur.row + TermWin.saveLines; |
806 | |
815 | |
807 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
816 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
808 | clearsel = 0; |
|
|
809 | |
817 | |
810 | stp = screen.text[row]; |
818 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
819 | srp = screen.rend[row]; |
812 | |
820 | |
813 | while (len--) |
821 | while (str < strend) |
814 | { |
822 | { |
815 | c = *str++; |
823 | c = *str++; |
816 | |
824 | |
817 | if (c < 0x20) |
825 | if (c < 0x20) |
818 | switch (c) |
826 | if (c == C0_LF) |
|
|
827 | { |
|
|
828 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
829 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
830 | |
|
|
831 | screen.flags &= ~Screen_WrapNext; |
|
|
832 | |
|
|
833 | if (screen.cur.row == screen.bscroll) |
|
|
834 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
835 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
836 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
837 | |
|
|
838 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
839 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
840 | continue; |
|
|
841 | } |
|
|
842 | else if (c == C0_CR) |
819 | { |
843 | { |
820 | case C0_HT: |
|
|
821 | scr_tab (1); |
|
|
822 | continue; |
|
|
823 | |
|
|
824 | case C0_LF: |
|
|
825 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
844 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
826 | MAX_IT (screen.tlen[row], screen.cur.col); |
845 | MAX_IT (screen.tlen[row], screen.cur.col); |
827 | |
846 | |
828 | screen.flags &= ~Screen_WrapNext; |
847 | screen.flags &= ~Screen_WrapNext; |
829 | |
|
|
830 | if (screen.cur.row == screen.bscroll) |
|
|
831 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
832 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
833 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
834 | |
|
|
835 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
836 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
837 | continue; |
|
|
838 | |
|
|
839 | case C0_CR: |
|
|
840 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
841 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
842 | |
|
|
843 | screen.flags &= ~Screen_WrapNext; |
|
|
844 | screen.cur.col = 0; |
848 | screen.cur.col = 0; |
845 | continue; |
849 | continue; |
|
|
850 | } |
|
|
851 | else if (c == C0_HT) |
|
|
852 | { |
|
|
853 | scr_tab (1, true); |
|
|
854 | continue; |
846 | } |
855 | } |
847 | |
856 | |
848 | if (checksel /* see if we're writing within selection */ |
857 | if (checksel /* see if we're writing within selection */ |
849 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
858 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
850 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
859 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
851 | { |
860 | { |
852 | checksel = 0; |
861 | checksel = 0; |
853 | clearsel = 1; |
862 | /* |
|
|
863 | * If we wrote anywhere in the selected area, kill the selection |
|
|
864 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
865 | * should be a similar check. |
|
|
866 | */ |
|
|
867 | CLEAR_SELECTION (); |
854 | } |
868 | } |
855 | |
869 | |
856 | if (screen.flags & Screen_WrapNext) |
870 | if (screen.flags & Screen_WrapNext) |
857 | { |
871 | { |
858 | screen.tlen[row] = -1; |
872 | screen.tlen[row] = -1; |
859 | if (screen.cur.row == screen.bscroll) |
873 | |
860 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
874 | scr_do_wrap (); |
861 | else if (screen.cur.row < (TermWin.nrow - 1)) |
875 | |
862 | row = (++screen.cur.row) + TermWin.saveLines; |
876 | row = screen.cur.row + TermWin.saveLines; |
863 | |
|
|
864 | stp = screen.text[row]; /* _must_ refresh */ |
877 | stp = screen.text[row]; /* _must_ refresh */ |
865 | srp = screen.rend[row]; /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
866 | screen.cur.col = 0; |
879 | } |
867 | screen.flags &= ~Screen_WrapNext; |
880 | |
|
|
881 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
882 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
|
|
883 | c = 0xfffd; |
|
|
884 | |
|
|
885 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
|
|
886 | // do wcwidth before further replacements, as wcwidth might return -1 |
|
|
887 | // for the line drawing characters below as they might be invalid in the current |
|
|
888 | // locale. |
|
|
889 | int width = c < 0x100 ? 1 : wcwidth (c); |
|
|
890 | |
|
|
891 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
|
|
892 | { |
|
|
893 | // vt100 special graphics and line drawing |
|
|
894 | // 5f-7e standard vt100 |
|
|
895 | // 40-5e rxvt extension for extra curses acs chars |
|
|
896 | static uint16_t vt100_0[62] = { // 41 .. 7e |
|
|
897 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
|
|
898 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
|
|
899 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
|
|
900 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
|
|
901 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
|
|
902 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
|
|
903 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
|
|
904 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
|
|
905 | }; |
|
|
906 | |
|
|
907 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
|
|
908 | { |
|
|
909 | c = vt100_0[c - 0x41]; |
|
|
910 | width = 1; // vt100 line drawing characters are always single-width |
|
|
911 | } |
868 | } |
912 | } |
869 | |
913 | |
870 | if (screen.flags & Screen_Insert) |
914 | if (screen.flags & Screen_Insert) |
871 | scr_insdel_chars (1, INSERT); |
915 | scr_insdel_chars (width, INSERT); |
872 | |
|
|
873 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
|
|
874 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
|
|
875 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
|
|
876 | int width = c < 256 ? 1 : wcwidth (c); |
|
|
877 | |
|
|
878 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
|
|
879 | { |
|
|
880 | // vt100 special graphics and line drawing |
|
|
881 | static uint16_t vt100_0[32] = { // 5f .. 7e |
|
|
882 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
|
|
883 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
|
|
884 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
|
|
885 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
|
|
886 | }; |
|
|
887 | |
|
|
888 | if (c >= 0x5f && c <= 0x7e) |
|
|
889 | { |
|
|
890 | c = vt100_0[c - 0x5f]; |
|
|
891 | width = 1; |
|
|
892 | } |
|
|
893 | } |
|
|
894 | |
916 | |
895 | if (width != 0) |
917 | if (width != 0) |
896 | { |
918 | { |
897 | #if !UNICODE_3 && ENABLE_COMBINING |
919 | #if !UNICODE_3 |
898 | // trim characters we can't store directly :( |
920 | // trim characters we can't store directly :( |
899 | if (c >= 0x10000) |
921 | if (c >= 0x10000) |
|
|
922 | # if ENABLE_COMBINING |
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
923 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
924 | # else |
|
|
925 | c = 0xfffd; |
901 | #endif |
926 | # endif |
902 | bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
927 | #endif |
903 | rend_t rend = SET_FONT (rstyle, |
928 | |
904 | c > 0x7f || bold || c < 0x20 |
929 | // nuke the character at this position, if required |
905 | ? TermWin.fontset->find_font (c, bold) |
930 | if (stp[screen.cur.col] == NOCHAR |
906 | : TermWin.ascii_map [c - 0x20]); |
931 | || (screen.cur.col < TermWin.ncol - 1 |
|
|
932 | && stp[screen.cur.col + 1] == NOCHAR)) |
|
|
933 | { |
|
|
934 | int col = screen.cur.col; |
|
|
935 | |
|
|
936 | // find begin |
|
|
937 | while (col > 0 && stp[col] == NOCHAR) |
|
|
938 | col--; |
|
|
939 | |
|
|
940 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
|
|
941 | |
|
|
942 | // found begin, nuke |
|
|
943 | do { |
|
|
944 | stp[col] = ' '; |
|
|
945 | srp[col] = rend; |
|
|
946 | col++; |
|
|
947 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
|
|
948 | } |
|
|
949 | |
|
|
950 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
951 | |
|
|
952 | // if the character doesn't fit into the remaining columns... |
|
|
953 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
954 | { |
|
|
955 | // ...output spaces |
|
|
956 | c = ' '; |
|
|
957 | // and try the same character next loop iteration |
|
|
958 | --str; |
|
|
959 | } |
907 | |
960 | |
908 | do |
961 | do |
909 | { |
962 | { |
910 | stp[screen.cur.col] = c; |
963 | stp[screen.cur.col] = c; |
911 | srp[screen.cur.col] = rend; |
964 | srp[screen.cur.col] = rend; |
… | |
… | |
923 | c = NOCHAR; |
976 | c = NOCHAR; |
924 | } |
977 | } |
925 | while (--width > 0); |
978 | while (--width > 0); |
926 | |
979 | |
927 | // pad with spaces when overwriting wide character with smaller one |
980 | // pad with spaces when overwriting wide character with smaller one |
|
|
981 | if (!width) |
928 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
982 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
929 | { |
983 | { |
930 | stp[c] = ' '; |
984 | stp[c] = ' '; |
931 | srp[c] = rend; |
985 | srp[c] = rend; |
932 | } |
986 | } |
933 | } |
987 | } |
934 | else if (width == 0) |
988 | else // width == 0 |
935 | { |
989 | { |
936 | #if ENABLE_COMBINING |
990 | #if ENABLE_COMBINING |
937 | // handle combining characters |
991 | // handle combining characters |
938 | // we just tag the accent on the previous on-screen character. |
992 | // we just tag the accent on the previous on-screen character. |
939 | // this is arguably not correct, but also arguably not wrong. |
993 | // this is arguably not correct, but also arguably not wrong. |
940 | // we don't handle double-width characters nicely yet. |
994 | // we don't handle double-width characters nicely yet. |
941 | |
|
|
942 | text_t *tp; |
995 | text_t *tp; |
943 | rend_t *rp; |
996 | rend_t *rp; |
944 | |
997 | |
945 | if (screen.cur.col > 0) |
998 | if (screen.cur.col > 0) |
946 | { |
999 | { |
947 | tp = stp + screen.cur.col - 1; |
1000 | tp = stp + screen.cur.col - 1; |
948 | rp = srp + screen.cur.col - 1; |
1001 | rp = srp + screen.cur.col - 1; |
|
|
1002 | |
|
|
1003 | while (*tp == NOCHAR && tp > stp) |
|
|
1004 | tp--, rp--; |
949 | } |
1005 | } |
950 | else if (screen.cur.row > 0 |
1006 | else if (screen.cur.row > 0 |
951 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
1007 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
952 | { |
1008 | { |
953 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
1009 | int line = screen.cur.row - 1 + TermWin.saveLines; |
954 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
1010 | |
|
|
1011 | tp = screen.text[line] + last_col - 1; |
|
|
1012 | rp = screen.rend[line] + last_col - 1; |
|
|
1013 | |
|
|
1014 | while (*tp == NOCHAR && tp > screen.text[line]) |
|
|
1015 | tp--, rp--; |
955 | } |
1016 | } |
956 | else |
1017 | else |
957 | continue; |
1018 | continue; |
958 | |
|
|
959 | // handle double-width-chars by making them look extremely ugly |
|
|
960 | if (*tp == NOCHAR) |
|
|
961 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
962 | |
1019 | |
963 | // first try to find a precomposed character |
1020 | // first try to find a precomposed character |
964 | unicode_t n = rxvt_compose (*tp, c); |
1021 | unicode_t n = rxvt_compose (*tp, c); |
965 | if (n == NOCHAR) |
1022 | if (n == NOCHAR) |
966 | n = rxvt_composite.compose (*tp, c); |
1023 | n = rxvt_composite.compose (*tp, c); |
967 | |
1024 | |
968 | *tp = n; |
1025 | *tp = n; |
969 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
1026 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
970 | #endif |
1027 | #endif |
971 | } |
1028 | } |
972 | } |
1029 | } |
973 | |
1030 | |
974 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1031 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
975 | MAX_IT (screen.tlen[row], screen.cur.col); |
1032 | MAX_IT (screen.tlen[row], screen.cur.col); |
976 | |
|
|
977 | /* |
|
|
978 | * If we wrote anywhere in the selected area, kill the selection |
|
|
979 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
980 | * should be a similar check. |
|
|
981 | */ |
|
|
982 | if (clearsel) |
|
|
983 | CLEAR_SELECTION (); |
|
|
984 | |
1033 | |
985 | #ifdef DEBUG_STRICT |
1034 | #ifdef DEBUG_STRICT |
986 | assert (screen.cur.row >= 0); |
1035 | assert (screen.cur.row >= 0); |
987 | #else /* drive with your eyes closed */ |
1036 | #else /* drive with your eyes closed */ |
988 | MAX_IT (screen.cur.row, 0); |
1037 | MAX_IT (screen.cur.row, 0); |
… | |
… | |
1006 | #ifdef TERMCAP_HAS_BW |
1055 | #ifdef TERMCAP_HAS_BW |
1007 | screen.cur.col = TermWin.ncol - 1; |
1056 | screen.cur.col = TermWin.ncol - 1; |
1008 | screen.cur.row--; |
1057 | screen.cur.row--; |
1009 | return; |
1058 | return; |
1010 | #endif |
1059 | #endif |
1011 | |
|
|
1012 | } |
1060 | } |
1013 | } |
1061 | } |
1014 | else if ((screen.flags & Screen_WrapNext) == 0) |
1062 | else if (!(screen.flags & Screen_WrapNext)) |
1015 | scr_gotorc (0, -1, RELATIVE); |
1063 | scr_gotorc (0, -1, RELATIVE); |
1016 | |
1064 | |
1017 | screen.flags &= ~Screen_WrapNext; |
1065 | screen.flags &= ~Screen_WrapNext; |
1018 | } |
1066 | } |
1019 | |
1067 | |
… | |
… | |
1022 | * Process Horizontal Tab |
1070 | * Process Horizontal Tab |
1023 | * count: +ve = forward; -ve = backwards |
1071 | * count: +ve = forward; -ve = backwards |
1024 | * XTERM_SEQ: CTRL-I |
1072 | * XTERM_SEQ: CTRL-I |
1025 | */ |
1073 | */ |
1026 | void |
1074 | void |
1027 | rxvt_term::scr_tab (int count) |
1075 | rxvt_term::scr_tab (int count, bool ht) |
1028 | { |
1076 | { |
1029 | int i, x; |
1077 | int i, x; |
1030 | |
1078 | |
1031 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
|
|
1032 | want_refresh = 1; |
1079 | want_refresh = 1; |
1033 | i = x = screen.cur.col; |
1080 | i = x = screen.cur.col; |
1034 | |
1081 | |
1035 | if (count == 0) |
1082 | if (count == 0) |
1036 | return; |
1083 | return; |
1037 | else if (count > 0) |
1084 | else if (count > 0) |
1038 | { |
1085 | { |
|
|
1086 | int row = TermWin.saveLines + screen.cur.row; |
|
|
1087 | text_t *tp = screen.text[row]; |
|
|
1088 | rend_t *rp = screen.rend[row]; |
|
|
1089 | rend_t base_rend = rp[i]; |
|
|
1090 | ht &= tp[i] == ' '; |
|
|
1091 | |
1039 | for (; ++i < TermWin.ncol; ) |
1092 | for (; ++i < TermWin.ncol; ) |
1040 | if (tabs[i]) |
1093 | if (tabs[i]) |
1041 | { |
1094 | { |
1042 | x = i; |
1095 | x = i; |
1043 | if (!--count) |
1096 | if (!--count) |
1044 | break; |
1097 | break; |
1045 | } |
1098 | } |
|
|
1099 | else |
|
|
1100 | ht &= tp[i] == ' ' |
|
|
1101 | && RS_SAME (rp[i], base_rend); |
1046 | |
1102 | |
1047 | if (count) |
1103 | if (count) |
1048 | x = TermWin.ncol - 1; |
1104 | x = TermWin.ncol - 1; |
|
|
1105 | |
|
|
1106 | // store horizontal tab commands as characters inside the text |
|
|
1107 | // buffer so they can be selected and pasted. |
|
|
1108 | if (ht && options & Opt_pastableTabs) |
|
|
1109 | { |
|
|
1110 | base_rend = SET_FONT (base_rend, 0); |
|
|
1111 | |
|
|
1112 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
1113 | MAX_IT (screen.tlen[row], x); |
|
|
1114 | |
|
|
1115 | i = screen.cur.col; |
|
|
1116 | |
|
|
1117 | tp[i] = '\t'; |
|
|
1118 | rp[i] = base_rend; |
|
|
1119 | |
|
|
1120 | while (++i < x) |
|
|
1121 | { |
|
|
1122 | tp[i] = NOCHAR; |
|
|
1123 | rp[i] = base_rend; |
|
|
1124 | } |
|
|
1125 | } |
1049 | } |
1126 | } |
1050 | else /* if (count < 0) */ |
1127 | else /* if (count < 0) */ |
1051 | { |
1128 | { |
1052 | for (; --i >= 0; ) |
1129 | for (; --i >= 0; ) |
1053 | if (tabs[i]) |
1130 | if (tabs[i]) |
… | |
… | |
1070 | * Process DEC Back Index |
1147 | * Process DEC Back Index |
1071 | * XTERM_SEQ: ESC 6 |
1148 | * XTERM_SEQ: ESC 6 |
1072 | * Move cursor left in row. If we're at the left boundary, shift everything |
1149 | * Move cursor left in row. If we're at the left boundary, shift everything |
1073 | * in that row right. Clear left column. |
1150 | * in that row right. Clear left column. |
1074 | */ |
1151 | */ |
1075 | #ifndef NO_FRILLS |
1152 | #if ENABLE_FRILLS |
1076 | void |
1153 | void |
1077 | rxvt_term::scr_backindex () |
1154 | rxvt_term::scr_backindex () |
1078 | { |
1155 | { |
1079 | if (screen.cur.col > 0) |
1156 | if (screen.cur.col > 0) |
1080 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1157 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1081 | else |
1158 | else |
1082 | { |
1159 | { |
1083 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1160 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1084 | return; /* um, yeah? */ |
1161 | return; /* um, yeah? */ |
|
|
1162 | |
1085 | scr_insdel_chars (1, INSERT); |
1163 | scr_insdel_chars (1, INSERT); |
1086 | } |
1164 | } |
1087 | } |
1165 | } |
1088 | #endif |
1166 | #endif |
1089 | /* ------------------------------------------------------------------------- */ |
1167 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1091 | * Process DEC Forward Index |
1169 | * Process DEC Forward Index |
1092 | * XTERM_SEQ: ESC 9 |
1170 | * XTERM_SEQ: ESC 9 |
1093 | * Move cursor right in row. If we're at the right boundary, shift everything |
1171 | * Move cursor right in row. If we're at the right boundary, shift everything |
1094 | * in that row left. Clear right column. |
1172 | * in that row left. Clear right column. |
1095 | */ |
1173 | */ |
1096 | #ifndef NO_FRILLS |
1174 | #if ENABLE_FRILLS |
1097 | void |
1175 | void |
1098 | rxvt_term::scr_forwardindex () |
1176 | rxvt_term::scr_forwardindex () |
1099 | { |
1177 | { |
1100 | int row; |
1178 | int row; |
1101 | |
1179 | |
1102 | if (screen.cur.col < TermWin.ncol - 1) |
1180 | if (screen.cur.col < TermWin.ncol - 1) |
1103 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1181 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1104 | else |
1182 | else |
1105 | { |
1183 | { |
1106 | row = screen.cur.row + TermWin.saveLines; |
1184 | row = screen.cur.row + TermWin.saveLines; |
|
|
1185 | |
1107 | if (screen.tlen[row] == 0) |
1186 | if (screen.tlen[row] == 0) |
1108 | return; /* um, yeah? */ |
1187 | return; /* um, yeah? */ |
1109 | else if (screen.tlen[row] == -1) |
1188 | else if (screen.tlen[row] == -1) |
1110 | screen.tlen[row] = TermWin.ncol; |
1189 | screen.tlen[row] = TermWin.ncol; |
|
|
1190 | |
1111 | scr_gotorc (0, 0, R_RELATIVE); |
1191 | scr_gotorc (0, 0, R_RELATIVE); |
1112 | scr_insdel_chars (1, DELETE); |
1192 | scr_insdel_chars (1, DELETE); |
1113 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1193 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1114 | } |
1194 | } |
1115 | } |
1195 | } |
… | |
… | |
1123 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1203 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1124 | { |
1204 | { |
1125 | want_refresh = 1; |
1205 | want_refresh = 1; |
1126 | ZERO_SCROLLBACK (); |
1206 | ZERO_SCROLLBACK (); |
1127 | |
1207 | |
1128 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
|
|
1129 | |
|
|
1130 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1208 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1131 | MAX_IT (screen.cur.col, 0); |
1209 | MAX_IT (screen.cur.col, 0); |
1132 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1210 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1133 | |
1211 | |
1134 | screen.flags &= ~Screen_WrapNext; |
1212 | screen.flags &= ~Screen_WrapNext; |
|
|
1213 | |
1135 | if (relative & R_RELATIVE) |
1214 | if (relative & R_RELATIVE) |
1136 | { |
1215 | { |
1137 | if (row > 0) |
1216 | if (row > 0) |
1138 | { |
1217 | { |
1139 | if (screen.cur.row <= screen.bscroll |
1218 | if (screen.cur.row <= screen.bscroll |
… | |
… | |
1159 | MIN_IT (screen.cur.row, screen.bscroll); |
1238 | MIN_IT (screen.cur.row, screen.bscroll); |
1160 | } |
1239 | } |
1161 | else |
1240 | else |
1162 | screen.cur.row = row; |
1241 | screen.cur.row = row; |
1163 | } |
1242 | } |
|
|
1243 | |
1164 | MAX_IT (screen.cur.row, 0); |
1244 | MAX_IT (screen.cur.row, 0); |
1165 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1245 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1166 | |
|
|
1167 | while (screen.cur.col > 0 |
|
|
1168 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1169 | screen.cur.col--; |
|
|
1170 | } |
1246 | } |
1171 | |
1247 | |
1172 | /* ------------------------------------------------------------------------- */ |
1248 | /* ------------------------------------------------------------------------- */ |
1173 | /* |
1249 | /* |
1174 | * direction should be UP or DN |
1250 | * direction should be UP or DN |
1175 | */ |
1251 | */ |
1176 | void |
1252 | void |
1177 | rxvt_term::scr_index (enum page_dirn direction) |
1253 | rxvt_term::scr_index (enum page_dirn direction) |
1178 | { |
1254 | { |
1179 | int dirn; |
1255 | int dirn; |
1180 | |
1256 | |
1181 | want_refresh = 1; |
1257 | want_refresh = 1; |
|
|
1258 | ZERO_SCROLLBACK (); |
|
|
1259 | |
1182 | dirn = ((direction == UP) ? 1 : -1); |
1260 | dirn = ((direction == UP) ? 1 : -1); |
1183 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
|
|
1184 | |
|
|
1185 | ZERO_SCROLLBACK (); |
|
|
1186 | |
1261 | |
1187 | screen.flags &= ~Screen_WrapNext; |
1262 | screen.flags &= ~Screen_WrapNext; |
|
|
1263 | |
1188 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1264 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1189 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1265 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1190 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1266 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1191 | else |
1267 | else |
1192 | screen.cur.row += dirn; |
1268 | screen.cur.row += dirn; |
|
|
1269 | |
1193 | MAX_IT (screen.cur.row, 0); |
1270 | MAX_IT (screen.cur.row, 0); |
1194 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1271 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1195 | selection_check (0); |
1272 | selection_check (0); |
1196 | } |
1273 | } |
1197 | |
1274 | |
… | |
… | |
1206 | rxvt_term::scr_erase_line (int mode) |
1283 | rxvt_term::scr_erase_line (int mode) |
1207 | { |
1284 | { |
1208 | unsigned int row, col, num; |
1285 | unsigned int row, col, num; |
1209 | |
1286 | |
1210 | want_refresh = 1; |
1287 | want_refresh = 1; |
1211 | D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1212 | ZERO_SCROLLBACK (); |
1288 | ZERO_SCROLLBACK (); |
1213 | |
1289 | |
1214 | selection_check (1); |
1290 | selection_check (1); |
1215 | |
|
|
1216 | screen.flags &= ~Screen_WrapNext; |
|
|
1217 | |
1291 | |
1218 | row = TermWin.saveLines + screen.cur.row; |
1292 | row = TermWin.saveLines + screen.cur.row; |
1219 | switch (mode) |
1293 | switch (mode) |
1220 | { |
1294 | { |
1221 | case 0: /* erase to end of line */ |
1295 | case 0: /* erase to end of line */ |
… | |
… | |
1265 | int32_t row, row_offset; |
1339 | int32_t row, row_offset; |
1266 | rend_t ren; |
1340 | rend_t ren; |
1267 | XGCValues gcvalue; |
1341 | XGCValues gcvalue; |
1268 | |
1342 | |
1269 | want_refresh = 1; |
1343 | want_refresh = 1; |
1270 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1271 | ZERO_SCROLLBACK (); |
1344 | ZERO_SCROLLBACK (); |
|
|
1345 | |
1272 | row_offset = (int32_t)TermWin.saveLines; |
1346 | row_offset = (int32_t)TermWin.saveLines; |
1273 | |
1347 | |
1274 | switch (mode) |
1348 | switch (mode) |
1275 | { |
1349 | { |
1276 | case 0: /* erase to end of screen */ |
1350 | case 0: /* erase to end of screen */ |
… | |
… | |
1292 | break; |
1366 | break; |
1293 | default: |
1367 | default: |
1294 | return; |
1368 | return; |
1295 | } |
1369 | } |
1296 | |
1370 | |
1297 | refresh_type |= REFRESH_BOUNDS; |
|
|
1298 | |
|
|
1299 | if (selection.op && current_screen == selection.screen |
1371 | if (selection.op && current_screen == selection.screen |
1300 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1372 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1301 | || (selection.end.row >= row |
1373 | || (selection.end.row >= row |
1302 | && selection.end.row <= row + num))) |
1374 | && selection.end.row <= row + num))) |
1303 | CLEAR_SELECTION (); |
1375 | CLEAR_SELECTION (); |
… | |
… | |
1314 | ren = DEFAULT_RSTYLE; |
1386 | ren = DEFAULT_RSTYLE; |
1315 | CLEAR_ROWS (row, num); |
1387 | CLEAR_ROWS (row, num); |
1316 | } |
1388 | } |
1317 | else |
1389 | else |
1318 | { |
1390 | { |
1319 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1391 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1320 | gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; |
1392 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1321 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1393 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1322 | ERASE_ROWS (row, num); |
1394 | ERASE_ROWS (row, num); |
1323 | gcvalue.foreground = PixColors[Color_fg]; |
1395 | gcvalue.foreground = pix_colors[Color_fg]; |
1324 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1396 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1325 | } |
1397 | } |
1326 | |
1398 | |
1327 | for (; num--; row++) |
1399 | for (; num--; row++) |
1328 | { |
1400 | { |
1329 | scr_blank_screen_mem (screen.text, screen.rend, |
1401 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1330 | (unsigned int) (row + row_offset), rstyle); |
|
|
1331 | screen.tlen[row + row_offset] = 0; |
1402 | screen.tlen[row + row_offset] = 0; |
1332 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1403 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1333 | (unsigned int)TermWin.ncol, ren); |
|
|
1334 | } |
1404 | } |
1335 | } |
1405 | } |
|
|
1406 | |
|
|
1407 | #if ENABLE_FRILLS |
|
|
1408 | void |
|
|
1409 | rxvt_term::scr_erase_savelines () |
|
|
1410 | { |
|
|
1411 | want_refresh = 1; |
|
|
1412 | ZERO_SCROLLBACK (); |
|
|
1413 | |
|
|
1414 | TermWin.nscrolled = 0; |
|
|
1415 | } |
|
|
1416 | #endif |
1336 | |
1417 | |
1337 | /* ------------------------------------------------------------------------- */ |
1418 | /* ------------------------------------------------------------------------- */ |
1338 | /* |
1419 | /* |
1339 | * Fill the screen with `E's |
1420 | * Fill the screen with `E's |
1340 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1421 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1341 | */ |
1422 | */ |
1342 | void |
1423 | void |
1343 | rxvt_term::scr_E () |
1424 | rxvt_term::scr_E () |
1344 | { |
1425 | { |
1345 | int i, j, k; |
1426 | int i, j, k; |
1346 | rend_t *r1, fs; |
1427 | rend_t *r1, fs; |
1347 | |
1428 | |
1348 | want_refresh = 1; |
1429 | want_refresh = 1; |
|
|
1430 | ZERO_SCROLLBACK (); |
|
|
1431 | |
1349 | num_scr_allow = 0; |
1432 | num_scr_allow = 0; |
1350 | ZERO_SCROLLBACK (); |
|
|
1351 | selection_check (3); |
1433 | selection_check (3); |
1352 | |
1434 | |
1353 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1435 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1354 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1436 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1355 | { |
1437 | { |
1356 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1438 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1357 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1439 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1358 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1440 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
… | |
… | |
1382 | if (insdel == DELETE) |
1464 | if (insdel == DELETE) |
1383 | return; |
1465 | return; |
1384 | else if (insdel == INSERT) |
1466 | else if (insdel == INSERT) |
1385 | count = end; |
1467 | count = end; |
1386 | } |
1468 | } |
1387 | screen.flags &= ~Screen_WrapNext; |
1469 | |
|
|
1470 | scr_do_wrap (); |
1388 | |
1471 | |
1389 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1472 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1390 | } |
1473 | } |
1391 | |
1474 | |
1392 | /* ------------------------------------------------------------------------- */ |
1475 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1406 | ZERO_SCROLLBACK (); |
1489 | ZERO_SCROLLBACK (); |
1407 | |
1490 | |
1408 | if (count <= 0) |
1491 | if (count <= 0) |
1409 | return; |
1492 | return; |
1410 | |
1493 | |
|
|
1494 | scr_do_wrap (); |
|
|
1495 | |
1411 | selection_check (1); |
1496 | selection_check (1); |
1412 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1497 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1413 | |
1498 | |
1414 | row = screen.cur.row + TermWin.saveLines; |
1499 | row = screen.cur.row + TermWin.saveLines; |
1415 | screen.flags &= ~Screen_WrapNext; |
|
|
1416 | |
1500 | |
1417 | stp = screen.text[row]; |
1501 | stp = screen.text[row]; |
1418 | srp = screen.rend[row]; |
1502 | srp = screen.rend[row]; |
1419 | slp = & (screen.tlen[row]); |
1503 | slp = &screen.tlen[row]; |
1420 | |
1504 | |
1421 | switch (insdel) |
1505 | switch (insdel) |
1422 | { |
1506 | { |
1423 | case INSERT: |
1507 | case INSERT: |
1424 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1508 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1425 | col--) |
|
|
1426 | { |
1509 | { |
1427 | stp[col] = stp[col - count]; |
1510 | stp[col] = stp[col - count]; |
1428 | srp[col] = srp[col - count]; |
1511 | srp[col] = srp[col - count]; |
1429 | } |
1512 | } |
1430 | |
1513 | |
… | |
… | |
1440 | if (selection.end.row != screen.cur.row |
1523 | if (selection.end.row != screen.cur.row |
1441 | || (selection.end.col + count >= TermWin.ncol)) |
1524 | || (selection.end.col + count >= TermWin.ncol)) |
1442 | CLEAR_SELECTION (); |
1525 | CLEAR_SELECTION (); |
1443 | else |
1526 | else |
1444 | { /* shift selection */ |
1527 | { /* shift selection */ |
1445 | selection.beg.col += count; |
1528 | selection.beg.col += count; |
1446 | selection.mark.col += count; /* XXX: yes? */ |
1529 | selection.mark.col += count; /* XXX: yes? */ |
1447 | selection.end.col += count; |
1530 | selection.end.col += count; |
1448 | } |
1531 | } |
1449 | } |
1532 | } |
1450 | |
1533 | |
1451 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1534 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1452 | (unsigned int)count, rstyle); |
1535 | (unsigned int)count, rstyle); |
1453 | break; |
1536 | break; |
1454 | |
1537 | |
1455 | case ERASE: |
1538 | case ERASE: |
1456 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1539 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1457 | selection_check (1); |
1540 | selection_check (1); |
1458 | screen.cur.col -= count; |
1541 | screen.cur.col -= count; |
1459 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1542 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1460 | (unsigned int)count, rstyle); |
1543 | (unsigned int)count, rstyle); |
1461 | break; |
1544 | break; |
1462 | |
1545 | |
1463 | case DELETE: |
1546 | case DELETE: |
1464 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1547 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1467 | { |
1550 | { |
1468 | stp[col] = stp[col + count]; |
1551 | stp[col] = stp[col + count]; |
1469 | srp[col] = srp[col + count]; |
1552 | srp[col] = srp[col + count]; |
1470 | } |
1553 | } |
1471 | |
1554 | |
1472 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1555 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1473 | & (srp[TermWin.ncol - count]), |
|
|
1474 | (unsigned int)count, tr); |
1556 | (unsigned int)count, tr); |
1475 | |
1557 | |
1476 | if (*slp == -1) /* break line continuation */ |
1558 | if (*slp == -1) /* break line continuation */ |
1477 | *slp = TermWin.ncol; |
1559 | *slp = TermWin.ncol; |
1478 | |
1560 | |
… | |
… | |
1487 | || selection.end.col >= TermWin.ncol) |
1569 | || selection.end.col >= TermWin.ncol) |
1488 | CLEAR_SELECTION (); |
1570 | CLEAR_SELECTION (); |
1489 | else |
1571 | else |
1490 | { |
1572 | { |
1491 | /* shift selection */ |
1573 | /* shift selection */ |
1492 | selection.beg.col -= count; |
1574 | selection.beg.col -= count; |
1493 | selection.mark.col -= count; /* XXX: yes? */ |
1575 | selection.mark.col -= count; /* XXX: yes? */ |
1494 | selection.end.col -= count; |
1576 | selection.end.col -= count; |
1495 | } |
1577 | } |
1496 | } |
1578 | } |
1497 | |
1579 | |
1498 | break; |
1580 | break; |
1499 | } |
1581 | } |
… | |
… | |
1545 | rxvt_term::scr_autowrap (int mode) |
1627 | rxvt_term::scr_autowrap (int mode) |
1546 | { |
1628 | { |
1547 | if (mode) |
1629 | if (mode) |
1548 | screen.flags |= Screen_Autowrap; |
1630 | screen.flags |= Screen_Autowrap; |
1549 | else |
1631 | else |
1550 | screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); |
1632 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1551 | } |
1633 | } |
1552 | |
1634 | |
1553 | /* ------------------------------------------------------------------------- */ |
1635 | /* ------------------------------------------------------------------------- */ |
1554 | /* |
1636 | /* |
1555 | * Set/unset margin origin mode |
1637 | * Set/unset margin origin mode |
… | |
… | |
1565 | { |
1647 | { |
1566 | if (mode) |
1648 | if (mode) |
1567 | screen.flags |= Screen_Relative; |
1649 | screen.flags |= Screen_Relative; |
1568 | else |
1650 | else |
1569 | screen.flags &= ~Screen_Relative; |
1651 | screen.flags &= ~Screen_Relative; |
|
|
1652 | |
1570 | scr_gotorc (0, 0, 0); |
1653 | scr_gotorc (0, 0, 0); |
1571 | } |
1654 | } |
1572 | |
1655 | |
1573 | /* ------------------------------------------------------------------------- */ |
1656 | /* ------------------------------------------------------------------------- */ |
1574 | /* |
1657 | /* |
… | |
… | |
1594 | */ |
1677 | */ |
1595 | void |
1678 | void |
1596 | rxvt_term::scr_set_tab (int mode) |
1679 | rxvt_term::scr_set_tab (int mode) |
1597 | { |
1680 | { |
1598 | if (mode < 0) |
1681 | if (mode < 0) |
1599 | MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); |
1682 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1600 | else if (screen.cur.col < TermWin.ncol) |
1683 | else if (screen.cur.col < TermWin.ncol) |
1601 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1684 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1602 | } |
1685 | } |
1603 | |
1686 | |
1604 | /* ------------------------------------------------------------------------- */ |
1687 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1608 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1691 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1609 | */ |
1692 | */ |
1610 | void |
1693 | void |
1611 | rxvt_term::scr_rvideo_mode (int mode) |
1694 | rxvt_term::scr_rvideo_mode (int mode) |
1612 | { |
1695 | { |
1613 | XGCValues gcvalue; |
1696 | XGCValues gcvalue; |
1614 | |
1697 | |
1615 | if (rvideo != mode) |
1698 | if (rvideo != mode) |
1616 | { |
1699 | { |
1617 | rvideo = mode; |
1700 | rvideo = mode; |
1618 | SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1701 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1619 | #if defined(XPM_BACKGROUND) |
1702 | #if XPM_BACKGROUND |
1620 | if (bgPixmap.pixmap == None) |
1703 | if (bgPixmap.pixmap == None) |
1621 | #endif |
1704 | #endif |
1622 | #if defined(TRANSPARENT) |
1705 | #if TRANSPARENT |
1623 | if (! (Options & Opt_transparent) || am_transparent == 0) |
1706 | if (! (options & Opt_transparent) || am_transparent == 0) |
1624 | #endif |
1707 | #endif |
1625 | XSetWindowBackground (display->display, TermWin.vt, |
1708 | XSetWindowBackground (display->display, TermWin.vt, |
1626 | PixColors[Color_bg]); |
1709 | pix_colors[Color_bg]); |
1627 | |
1710 | |
1628 | gcvalue.foreground = PixColors[Color_fg]; |
1711 | gcvalue.foreground = pix_colors[Color_fg]; |
1629 | gcvalue.background = PixColors[Color_bg]; |
1712 | gcvalue.background = pix_colors[Color_bg]; |
1630 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1713 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1631 | &gcvalue); |
1714 | &gcvalue); |
1632 | scr_clear (); |
1715 | scr_clear (); |
1633 | scr_touch (true); |
1716 | scr_touch (true); |
1634 | } |
1717 | } |
… | |
… | |
1682 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1765 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1683 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1766 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1684 | */ |
1767 | */ |
1685 | void |
1768 | void |
1686 | rxvt_term::scr_charset_choose (int set) |
1769 | rxvt_term::scr_charset_choose (int set) |
1687 | { |
1770 | { |
1688 | screen.charset = set; |
1771 | screen.charset = set; |
1689 | set_font_style (); |
1772 | set_font_style (); |
1690 | } |
1773 | } |
1691 | |
1774 | |
1692 | /* ------------------------------------------------------------------------- */ |
1775 | /* ------------------------------------------------------------------------- */ |
1693 | /* |
1776 | /* |
1694 | * Set a font |
1777 | * Set a font |
1695 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
1778 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
… | |
… | |
1698 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1781 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1699 | * See set_font_style for possible values for <C> |
1782 | * See set_font_style for possible values for <C> |
1700 | */ |
1783 | */ |
1701 | void |
1784 | void |
1702 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1785 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1703 | { |
1786 | { |
1704 | charsets[set] = (unsigned char)ch; |
1787 | charsets[set] = (unsigned char)ch; |
1705 | set_font_style (); |
1788 | set_font_style (); |
1706 | } |
1789 | } |
1707 | |
1790 | |
1708 | |
1791 | |
1709 | /* ------------------------------------------------------------------------- * |
1792 | /* ------------------------------------------------------------------------- * |
1710 | * MAJOR SCREEN MANIPULATION * |
1793 | * MAJOR SCREEN MANIPULATION * |
1711 | * ------------------------------------------------------------------------- */ |
1794 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1779 | { |
1862 | { |
1780 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1863 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1781 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1864 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1782 | } |
1865 | } |
1783 | |
1866 | |
1784 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
|
|
1785 | |
|
|
1786 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1867 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1787 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1868 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1788 | |
1869 | |
1789 | if (refresh) |
1870 | if (refresh) |
1790 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1871 | scr_refresh (SLOW_REFRESH); |
1791 | } |
1872 | } |
1792 | |
1873 | |
1793 | /* ------------------------------------------------------------------------- */ |
1874 | /* ------------------------------------------------------------------------- */ |
1794 | /* |
1875 | /* |
1795 | * Refresh the entire screen |
1876 | * Refresh the entire screen |
… | |
… | |
1807 | */ |
1888 | */ |
1808 | int |
1889 | int |
1809 | rxvt_term::scr_move_to (int y, int len) |
1890 | rxvt_term::scr_move_to (int y, int len) |
1810 | { |
1891 | { |
1811 | long p = 0; |
1892 | long p = 0; |
1812 | uint16_t oldviewstart; |
1893 | unsigned int oldviewstart; |
1813 | |
1894 | |
1814 | oldviewstart = TermWin.view_start; |
1895 | oldviewstart = TermWin.view_start; |
|
|
1896 | |
1815 | if (y < len) |
1897 | if (y < len) |
1816 | { |
1898 | { |
1817 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1899 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1818 | p -= (long) (TermWin.nrow - 1); |
1900 | p -= (long) (TermWin.nrow - 1); |
1819 | p = max (p, 0); |
1901 | p = max (p, 0); |
1820 | } |
1902 | } |
|
|
1903 | |
1821 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1904 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1822 | D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); |
|
|
1823 | |
1905 | |
1824 | return scr_changeview (oldviewstart); |
1906 | return scr_changeview (oldviewstart); |
1825 | } |
1907 | } |
1826 | |
1908 | |
1827 | /* ------------------------------------------------------------------------- */ |
1909 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1830 | * direction should be UP or DN |
1912 | * direction should be UP or DN |
1831 | */ |
1913 | */ |
1832 | int |
1914 | int |
1833 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1915 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1834 | { |
1916 | { |
1835 | int n; |
1917 | int n; |
1836 | uint16_t oldviewstart; |
1918 | unsigned int oldviewstart; |
1837 | |
1919 | |
1838 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
|
|
1839 | #ifdef DEBUG_STRICT |
|
|
1840 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1841 | #endif |
|
|
1842 | oldviewstart = TermWin.view_start; |
1920 | oldviewstart = TermWin.view_start; |
|
|
1921 | |
1843 | if (direction == UP) |
1922 | if (direction == UP) |
1844 | { |
1923 | { |
1845 | n = TermWin.view_start + nlines; |
1924 | n = TermWin.view_start + nlines; |
1846 | TermWin.view_start = min (n, TermWin.nscrolled); |
1925 | TermWin.view_start = min (n, TermWin.nscrolled); |
1847 | } |
1926 | } |
1848 | else |
1927 | else |
1849 | { |
1928 | { |
1850 | n = TermWin.view_start - nlines; |
1929 | n = TermWin.view_start - nlines; |
1851 | TermWin.view_start = max (n, 0); |
1930 | TermWin.view_start = max (n, 0); |
1852 | } |
1931 | } |
|
|
1932 | |
1853 | return scr_changeview (oldviewstart); |
1933 | return scr_changeview (oldviewstart); |
1854 | } |
1934 | } |
1855 | |
1935 | |
1856 | int |
1936 | int |
1857 | rxvt_term::scr_changeview (uint16_t oldviewstart) |
1937 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1858 | { |
1938 | { |
1859 | if (TermWin.view_start != oldviewstart) |
1939 | if (TermWin.view_start != oldviewstart) |
1860 | { |
1940 | { |
1861 | want_refresh = 1; |
1941 | want_refresh = 1; |
1862 | num_scr -= (TermWin.view_start - oldviewstart); |
1942 | num_scr -= (TermWin.view_start - oldviewstart); |
… | |
… | |
1870 | rxvt_term::scr_bell () |
1950 | rxvt_term::scr_bell () |
1871 | { |
1951 | { |
1872 | #ifndef NO_BELL |
1952 | #ifndef NO_BELL |
1873 | # ifndef NO_MAPALERT |
1953 | # ifndef NO_MAPALERT |
1874 | # ifdef MAPALERT_OPTION |
1954 | # ifdef MAPALERT_OPTION |
1875 | if (Options & Opt_mapAlert) |
1955 | if (options & Opt_mapAlert) |
1876 | # endif |
1956 | # endif |
1877 | XMapWindow (display->display, TermWin.parent[0]); |
1957 | XMapWindow (display->display, TermWin.parent[0]); |
1878 | # endif |
1958 | # endif |
1879 | if (Options & Opt_visualBell) |
1959 | if (options & Opt_visualBell) |
1880 | { |
1960 | { |
1881 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1961 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1882 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1962 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1883 | } |
1963 | } |
1884 | else |
1964 | else |
… | |
… | |
1890 | /* ARGSUSED */ |
1970 | /* ARGSUSED */ |
1891 | void |
1971 | void |
1892 | rxvt_term::scr_printscreen (int fullhist) |
1972 | rxvt_term::scr_printscreen (int fullhist) |
1893 | { |
1973 | { |
1894 | #ifdef PRINTPIPE |
1974 | #ifdef PRINTPIPE |
1895 | int i, r1, nrows, row_offset; |
1975 | int i, r1, nrows, row_offset; |
1896 | text_t *t; |
1976 | FILE *fd; |
1897 | FILE *fd; |
|
|
1898 | |
1977 | |
1899 | if ((fd = popen_printer ()) == NULL) |
1978 | if ((fd = popen_printer ()) == NULL) |
1900 | return; |
1979 | return; |
|
|
1980 | |
1901 | nrows = TermWin.nrow; |
1981 | nrows = TermWin.nrow; |
1902 | row_offset = TermWin.saveLines; |
1982 | row_offset = TermWin.saveLines; |
|
|
1983 | |
1903 | if (!fullhist) |
1984 | if (!fullhist) |
1904 | row_offset -= TermWin.view_start; |
1985 | row_offset -= TermWin.view_start; |
1905 | else |
1986 | else |
1906 | { |
1987 | { |
1907 | nrows += TermWin.nscrolled; |
1988 | nrows += TermWin.nscrolled; |
1908 | row_offset -= TermWin.nscrolled; |
1989 | row_offset -= TermWin.nscrolled; |
1909 | } |
1990 | } |
1910 | |
1991 | |
|
|
1992 | wctomb (0, 0); |
|
|
1993 | |
1911 | for (r1 = 0; r1 < nrows; r1++) |
1994 | for (r1 = 0; r1 < nrows; r1++) |
1912 | { |
1995 | { |
1913 | t = screen.text[r1 + row_offset]; |
1996 | text_t *tp = screen.text[r1 + row_offset]; |
1914 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1997 | int len = screen.tlen[r1 + row_offset]; |
1915 | if (!isspace (t[i])) |
1998 | |
1916 | break; |
1999 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1917 | fprintf (fd, "%.*s\n", (i + 1), t); |
2000 | { |
|
|
2001 | char mb[MB_LEN_MAX]; |
|
|
2002 | text_t t = *tp++; |
|
|
2003 | if (t == NOCHAR) |
|
|
2004 | continue; |
|
|
2005 | |
|
|
2006 | len = wctomb (mb, t); |
|
|
2007 | |
|
|
2008 | if (len <= 0) |
|
|
2009 | { |
|
|
2010 | mb[0] = ' '; |
|
|
2011 | len = 1; |
|
|
2012 | } |
|
|
2013 | |
|
|
2014 | fwrite (mb, 1, len, fd); |
|
|
2015 | } |
|
|
2016 | |
|
|
2017 | fputc ('\n', fd); |
1918 | } |
2018 | } |
|
|
2019 | |
1919 | pclose_printer (fd); |
2020 | pclose_printer (fd); |
1920 | #endif |
2021 | #endif |
1921 | } |
2022 | } |
1922 | |
2023 | |
1923 | /* ------------------------------------------------------------------------- */ |
2024 | /* ------------------------------------------------------------------------- */ |
1924 | /* |
2025 | /* |
1925 | * Refresh the screen |
2026 | * Refresh the screen |
1926 | * drawn_text/drawn_rend contain the screen information before the update. |
2027 | * drawn_text/drawn_rend contain the screen information before the update. |
1927 | * screen.text/screen.rend contain what the screen will change to. |
2028 | * screen.text/screen.rend contain what the screen will change to. |
1928 | */ |
2029 | */ |
1929 | |
|
|
1930 | #define FONT_WIDTH(X, Y) \ |
|
|
1931 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
1932 | #define FONT_RBEAR(X, Y) \ |
|
|
1933 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
1934 | #define FONT_LBEAR(X, Y) \ |
|
|
1935 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
1936 | #define IS_FONT_CHAR(X, Y) \ |
|
|
1937 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
1938 | |
|
|
1939 | void |
2030 | void |
1940 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2031 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1941 | { |
2032 | { |
1942 | unsigned char clearfirst, /* first character writes before cell */ |
|
|
1943 | clearlast, /* last character writes beyond cell */ |
|
|
1944 | must_clear, /* use draw_string not draw_image_string */ |
2033 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1945 | rvid, /* reverse video this position */ |
|
|
1946 | showcursor; /* show the cursor */ |
2034 | showcursor; /* show the cursor */ |
1947 | int16_t col, row, /* column/row we're processing */ |
2035 | int16_t col, row, /* column/row we're processing */ |
1948 | ocrow; /* old cursor row */ |
2036 | ocrow; /* old cursor row */ |
1949 | int i, /* tmp */ |
2037 | int i, /* tmp */ |
1950 | row_offset; /* basic offset in screen structure */ |
2038 | row_offset; /* basic offset in screen structure */ |
1951 | #ifndef NO_CURSORCOLOR |
2039 | #ifndef NO_CURSORCOLOR |
1952 | rend_t cc1; /* store colours at cursor position (s) */ |
2040 | rend_t cc1; /* store colours at cursor position (s) */ |
1953 | #endif |
2041 | #endif |
1954 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
2042 | rend_t *crp; // cursor rendition pointer |
1955 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
2043 | |
|
|
2044 | want_refresh = 0; /* screen is current */ |
1956 | |
2045 | |
1957 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2046 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1958 | return; |
2047 | return; |
1959 | |
2048 | |
1960 | /* |
2049 | /* |
1961 | * A: set up vars |
2050 | * A: set up vars |
1962 | */ |
2051 | */ |
1963 | clearfirst = clearlast = must_clear = 0; |
2052 | must_clear = 0; |
1964 | |
|
|
1965 | refresh_count = 0; |
2053 | refresh_count = 0; |
1966 | |
2054 | |
1967 | row_offset = TermWin.saveLines - TermWin.view_start; |
2055 | row_offset = TermWin.saveLines - TermWin.view_start; |
1968 | |
2056 | |
1969 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1970 | { |
|
|
1971 | clearfirst = clearlast = 1; |
|
|
1972 | refresh_type &= ~REFRESH_BOUNDS; |
|
|
1973 | } |
|
|
1974 | |
|
|
1975 | #ifdef XPM_BACKGROUND |
2057 | #if XPM_BACKGROUND |
1976 | must_clear |= (bgPixmap.pixmap != None); |
2058 | must_clear |= bgPixmap.pixmap != None; |
1977 | #endif |
2059 | #endif |
1978 | #ifdef TRANSPARENT |
2060 | #if TRANSPARENT |
1979 | must_clear |= ((Options & Opt_transparent) && am_transparent); |
2061 | must_clear |= (options & Opt_transparent) && am_transparent; |
1980 | #endif |
2062 | #endif |
1981 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2063 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1982 | |
2064 | |
1983 | /* |
2065 | /* |
1984 | * B: reverse any characters which are selected |
2066 | * B: reverse any characters which are selected |
… | |
… | |
1999 | showcursor = 0; |
2081 | showcursor = 0; |
2000 | #endif |
2082 | #endif |
2001 | |
2083 | |
2002 | if (showcursor) |
2084 | if (showcursor) |
2003 | { |
2085 | { |
|
|
2086 | int col = screen.cur.col; |
|
|
2087 | |
|
|
2088 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2089 | col--; |
|
|
2090 | |
2004 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
2091 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2005 | |
2092 | |
2006 | if (showcursor && TermWin.focus) |
2093 | if (showcursor && TermWin.focus) |
2007 | { |
2094 | { |
|
|
2095 | if (options & Opt_cursorUnderline) |
|
|
2096 | *crp ^= RS_Uline; |
|
|
2097 | else |
|
|
2098 | { |
2008 | *srp ^= RS_RVid; |
2099 | *crp ^= RS_RVid; |
|
|
2100 | |
2009 | #ifndef NO_CURSORCOLOR |
2101 | #ifndef NO_CURSORCOLOR |
2010 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
2102 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2011 | if (ISSET_PIXCOLOR (Color_cursor)) |
2103 | if (ISSET_PIXCOLOR (Color_cursor)) |
2012 | ccol1 = Color_cursor; |
2104 | ccol1 = Color_cursor; |
2013 | else |
2105 | else |
2014 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2106 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2015 | ccol1 = GET_FGCOLOR (rstyle); |
2107 | ccol1 = GET_FGCOLOR (rstyle); |
2016 | #else |
2108 | #else |
2017 | ccol1 = Color_fg; |
2109 | ccol1 = Color_fg; |
2018 | #endif |
2110 | #endif |
2019 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2111 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2020 | ccol2 = Color_cursor2; |
2112 | ccol2 = Color_cursor2; |
2021 | else |
2113 | else |
2022 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2114 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2023 | ccol2 = GET_BGCOLOR (rstyle); |
2115 | ccol2 = GET_BGCOLOR (rstyle); |
2024 | #else |
2116 | #else |
2025 | ccol2 = Color_bg; |
2117 | ccol2 = Color_bg; |
2026 | #endif |
2118 | #endif |
2027 | *srp = SET_FGCOLOR (*srp, ccol1); |
2119 | *crp = SET_FGCOLOR (*crp, ccol1); |
2028 | *srp = SET_BGCOLOR (*srp, ccol2); |
2120 | *crp = SET_BGCOLOR (*crp, ccol2); |
2029 | #endif |
2121 | #endif |
|
|
2122 | } |
2030 | } |
2123 | } |
2031 | } |
2124 | } |
2032 | |
2125 | |
2033 | /* make sure no outline cursor is left around */ |
2126 | /* make sure no outline cursor is left around */ |
2034 | setoldcursor = 0; |
2127 | setoldcursor = 0; |
… | |
… | |
2060 | oldcursor.col = screen.cur.col; |
2153 | oldcursor.col = screen.cur.col; |
2061 | } |
2154 | } |
2062 | } |
2155 | } |
2063 | } |
2156 | } |
2064 | |
2157 | |
|
|
2158 | #if ENABLE_OVERLAY |
|
|
2159 | scr_swap_overlay (); |
|
|
2160 | #endif |
|
|
2161 | |
|
|
2162 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2163 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2164 | |
2065 | #ifndef NO_SLOW_LINK_SUPPORT |
2165 | #ifndef NO_SLOW_LINK_SUPPORT |
2066 | /* |
2166 | /* |
2067 | * D: CopyArea pass - very useful for slower links |
2167 | * D: CopyArea pass - very useful for slower links |
2068 | * This has been deliberately kept simple. |
2168 | * This has been deliberately kept simple. |
2069 | */ |
2169 | */ |
… | |
… | |
2072 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2172 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2073 | && abs (i) < TermWin.nrow && !must_clear) |
2173 | && abs (i) < TermWin.nrow && !must_clear) |
2074 | { |
2174 | { |
2075 | int16_t nits; |
2175 | int16_t nits; |
2076 | int j; |
2176 | int j; |
2077 | rend_t *drp2; |
|
|
2078 | text_t *dtp2; |
|
|
2079 | int len, wlen; |
2177 | int len, wlen; |
2080 | |
2178 | |
2081 | j = TermWin.nrow; |
2179 | j = TermWin.nrow; |
2082 | wlen = len = -1; |
2180 | wlen = len = -1; |
2083 | row = i > 0 ? 0 : j - 1; |
2181 | row = i > 0 ? 0 : j - 1; |
2084 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2182 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2085 | { |
2183 | { |
2086 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2184 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2087 | { |
2185 | { |
2088 | stp = screen.text[row + row_offset]; |
2186 | text_t *stp = screen.text[row + row_offset]; |
2089 | srp = screen.rend[row + row_offset]; |
2187 | rend_t *srp = screen.rend[row + row_offset]; |
2090 | dtp = drawn_text[row]; |
2188 | text_t *dtp = drawn_text[row]; |
2091 | dtp2 = drawn_text[row + i]; |
2189 | text_t *dtp2 = drawn_text[row + i]; |
2092 | drp = drawn_rend[row]; |
2190 | rend_t *drp = drawn_rend[row]; |
2093 | drp2 = drawn_rend[row + i]; |
2191 | rend_t *drp2 = drawn_rend[row + i]; |
2094 | |
2192 | |
2095 | for (nits = 0, col = TermWin.ncol; col--; ) |
2193 | for (nits = 0, col = TermWin.ncol; col--; ) |
2096 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2194 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2097 | nits--; |
2195 | nits--; |
2098 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2196 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
… | |
… | |
2118 | { |
2216 | { |
2119 | /* also comes here at end if needed because of >= above */ |
2217 | /* also comes here at end if needed because of >= above */ |
2120 | if (wlen < len) |
2218 | if (wlen < len) |
2121 | SWAP_IT (wlen, len, int); |
2219 | SWAP_IT (wlen, len, int); |
2122 | |
2220 | |
2123 | D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
|
|
2124 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2221 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2125 | TermWin.gc, 0, Row2Pixel (len + i), |
2222 | TermWin.gc, 0, Row2Pixel (len + i), |
2126 | (unsigned int)TermWin_TotalWidth (), |
2223 | (unsigned int)TermWin_TotalWidth (), |
2127 | (unsigned int)Height2Pixel (wlen - len + 1), |
2224 | (unsigned int)Height2Pixel (wlen - len + 1), |
2128 | 0, Row2Pixel (len)); |
2225 | 0, Row2Pixel (len)); |
… | |
… | |
2135 | /* |
2232 | /* |
2136 | * E: main pass across every character |
2233 | * E: main pass across every character |
2137 | */ |
2234 | */ |
2138 | for (row = 0; row < TermWin.nrow; row++) |
2235 | for (row = 0; row < TermWin.nrow; row++) |
2139 | { |
2236 | { |
2140 | stp = screen.text[row + row_offset]; |
2237 | text_t *stp = screen.text[row + row_offset]; |
2141 | srp = screen.rend[row + row_offset]; |
2238 | rend_t *srp = screen.rend[row + row_offset]; |
2142 | dtp = drawn_text[row]; |
2239 | text_t *dtp = drawn_text[row]; |
2143 | drp = drawn_rend[row]; |
2240 | rend_t *drp = drawn_rend[row]; |
2144 | |
2241 | |
2145 | /* |
2242 | /* |
2146 | * E2: OK, now the real pass |
2243 | * E2: OK, now the real pass |
2147 | */ |
2244 | */ |
2148 | int ypixel = (int)Row2Pixel (row); |
2245 | int ypixel = (int)Row2Pixel (row); |
2149 | |
2246 | |
2150 | for (col = 0; col < TermWin.ncol; col++) |
2247 | for (col = 0; col < TermWin.ncol; col++) |
2151 | { |
2248 | { |
2152 | /* compare new text with old - if exactly the same then continue */ |
2249 | /* compare new text with old - if exactly the same then continue */ |
2153 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2250 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2154 | && (srp[col] == drp[col] /* Either rendition the same or */ |
2251 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2155 | || (stp[col] == ' ' /* space w/ no background change */ |
2252 | || (stp[col] == ' ' /* space w/ no background change */ |
2156 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2253 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2157 | continue; |
2254 | continue; |
2158 | |
2255 | |
2159 | // redraw one or more characters |
2256 | // redraw one or more characters |
2160 | |
2257 | |
2161 | // seek to the beginning if wide characters |
2258 | // seek to the beginning of wide characters |
2162 | while (stp[col] == NOCHAR && col > 0) |
2259 | while (stp[col] == NOCHAR && col > 0) |
2163 | --col; |
2260 | --col; |
2164 | |
2261 | |
2165 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2262 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2166 | text_t *text = stp + col; |
2263 | text_t *text = stp + col; |
… | |
… | |
2169 | dtp[col] = stp[col]; |
2266 | dtp[col] = stp[col]; |
2170 | drp[col] = rend; |
2267 | drp[col] = rend; |
2171 | |
2268 | |
2172 | int xpixel = Col2Pixel (col); |
2269 | int xpixel = Col2Pixel (col); |
2173 | |
2270 | |
2174 | // this loop looks very messy, it can probably be optimized |
|
|
2175 | // and cleaned a bit by you? |
|
|
2176 | for (i = 0; ++col < TermWin.ncol; ) |
2271 | for (i = 0; ++col < TermWin.ncol; ) |
2177 | { |
2272 | { |
2178 | if (stp[col] == NOCHAR) |
2273 | if (stp[col] == NOCHAR) |
2179 | { |
2274 | { |
2180 | dtp[col] = stp[col]; |
2275 | dtp[col] = stp[col]; |
2181 | drp[col] = rend; |
2276 | drp[col] = rend; |
2182 | count++; |
2277 | count++; |
2183 | |
|
|
2184 | if (i) // only possible skip if char unchanged |
|
|
2185 | i++; |
2278 | i++; |
2186 | |
2279 | |
2187 | continue; |
2280 | continue; |
2188 | } |
2281 | } |
2189 | |
2282 | |
2190 | if (rend != srp[col]) |
2283 | if (!RS_SAME (rend, srp[col])) |
2191 | break; |
2284 | break; |
2192 | |
2285 | |
2193 | count++; |
2286 | count++; |
2194 | |
2287 | |
2195 | if (stp[col] != dtp[col] |
2288 | if (stp[col] != dtp[col] |
2196 | || srp[col] != drp[col]) |
2289 | || !RS_SAME (srp[col], drp[col])) |
2197 | { |
2290 | { |
2198 | if (must_clear && (i++ > (count / 2))) |
2291 | if (must_clear && (i++ > count / 2)) |
2199 | break; |
2292 | break; |
2200 | |
2293 | |
2201 | dtp[col] = stp[col]; |
2294 | dtp[col] = stp[col]; |
2202 | drp[col] = rend; |
2295 | drp[col] = rend; |
2203 | i = 0; |
2296 | i = 0; |
2204 | } |
2297 | } |
2205 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2298 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2206 | break; |
2299 | break; |
2207 | } |
2300 | } |
2208 | |
2301 | |
2209 | col--; /* went one too far. move back */ |
2302 | col--; /* went one too far. move back */ |
2210 | count -= i; /* dump any matching trailing chars */ |
2303 | count -= i; /* dump any matching trailing chars */ |
|
|
2304 | |
|
|
2305 | // sometimes we optimize away the trailing NOCHAR's, add them back |
|
|
2306 | while (i && text[count] == NOCHAR) |
|
|
2307 | count++, i--; |
|
|
2308 | |
|
|
2309 | #if ENABLE_STYLES |
|
|
2310 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2311 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2312 | drp[col + 1] = ~srp[col + 1]; |
|
|
2313 | |
|
|
2314 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2315 | while (text > stp |
|
|
2316 | && srp[text - stp - 1] & RS_Careful |
|
|
2317 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2318 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2319 | #endif |
2211 | |
2320 | |
2212 | /* |
2321 | /* |
2213 | * Determine the attributes for the string |
2322 | * Determine the attributes for the string |
2214 | */ |
2323 | */ |
2215 | int fid = GET_FONT (rend); |
|
|
2216 | int fore = GET_FGCOLOR (rend); // desired foreground |
2324 | int fore = GET_FGCOLOR (rend); // desired foreground |
2217 | int back = GET_BGCOLOR (rend); // desired background |
2325 | int back = GET_BGCOLOR (rend); // desired background |
2218 | |
2326 | |
2219 | rend = GET_ATTR (rend); |
2327 | // only do special processing if ana attributes are set, which is rare |
2220 | |
2328 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2221 | rvid = !!(rend & RS_RVid); |
2329 | { |
|
|
2330 | bool invert = rend & RS_RVid; |
2222 | |
2331 | |
2223 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2224 | if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) |
2333 | if (rend & RS_Bold |
|
|
2334 | && fore == Color_fg) |
2225 | { |
2335 | { |
2226 | if (ISSET_PIXCOLOR (Color_BD)) |
2336 | if (ISSET_PIXCOLOR (Color_BD)) |
2227 | fore = Color_BD; |
2337 | fore = Color_BD; |
|
|
2338 | # if !ENABLE_STYLES |
2228 | else |
2339 | else |
2229 | rvid = !rvid; |
2340 | invert = !invert; |
|
|
2341 | # endif |
|
|
2342 | } |
|
|
2343 | |
|
|
2344 | if (rend & RS_Italic |
|
|
2345 | && fore == Color_fg) |
|
|
2346 | { |
|
|
2347 | if (ISSET_PIXCOLOR (Color_IT)) |
|
|
2348 | fore = Color_IT; |
|
|
2349 | # if !ENABLE_STYLES |
|
|
2350 | else |
|
|
2351 | invert = !invert; |
|
|
2352 | # endif |
|
|
2353 | } |
|
|
2354 | |
|
|
2355 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
|
|
2356 | fore = Color_UL; |
|
|
2357 | #endif |
|
|
2358 | |
|
|
2359 | if (invert) |
|
|
2360 | { |
|
|
2361 | SWAP_IT (fore, back, int); |
|
|
2362 | |
|
|
2363 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2364 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2365 | back = Color_RV; |
|
|
2366 | #endif |
|
|
2367 | } |
|
|
2368 | |
|
|
2369 | #ifdef TEXT_BLINK |
|
|
2370 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
|
|
2371 | { |
|
|
2372 | if (!text_blink_ev.active) |
|
|
2373 | { |
|
|
2374 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
2375 | hidden_text = 0; |
|
|
2376 | } |
|
|
2377 | else if (hidden_text) |
|
|
2378 | fore = back; |
|
|
2379 | } |
|
|
2380 | #endif |
2230 | } |
2381 | } |
2231 | |
|
|
2232 | if (rend & RS_Uline) |
|
|
2233 | if (ISSET_PIXCOLOR (Color_UL)) |
|
|
2234 | fore = Color_UL; |
|
|
2235 | #endif |
|
|
2236 | |
|
|
2237 | if (rvid) |
|
|
2238 | { |
|
|
2239 | SWAP_IT (fore, back, int); |
|
|
2240 | |
|
|
2241 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2242 | if (ISSET_PIXCOLOR (Color_RV) |
|
|
2243 | # ifndef NO_CURSORCOLOR |
|
|
2244 | && !ISSET_PIXCOLOR (Color_cursor) |
|
|
2245 | # endif |
|
|
2246 | ) |
|
|
2247 | back = Color_RV; |
|
|
2248 | #endif |
|
|
2249 | } |
|
|
2250 | |
|
|
2251 | #ifdef TEXT_BLINK |
|
|
2252 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
|
|
2253 | { |
|
|
2254 | if (!text_blink_ev.active) |
|
|
2255 | { |
|
|
2256 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
2257 | hidden_text = 0; |
|
|
2258 | } |
|
|
2259 | else if (hidden_text) |
|
|
2260 | fore = back; |
|
|
2261 | } |
|
|
2262 | #endif |
|
|
2263 | |
2382 | |
2264 | /* |
2383 | /* |
2265 | * Actually do the drawing of the string here |
2384 | * Actually do the drawing of the string here |
2266 | */ |
2385 | */ |
2267 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2386 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2268 | |
2387 | |
2269 | if (back == fore) |
2388 | if (back == fore) |
2270 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2389 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2271 | TermWin.fwidth * count, TermWin.fheight, |
2390 | TermWin.fwidth * count, TermWin.fheight, |
2272 | back); |
2391 | back); |
… | |
… | |
2288 | } |
2407 | } |
2289 | else |
2408 | else |
2290 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2409 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2291 | |
2410 | |
2292 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2411 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
|
|
2412 | { |
|
|
2413 | #if ENABLE_FRILLS |
|
|
2414 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2415 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2416 | else |
|
|
2417 | #endif |
|
|
2418 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2419 | |
2293 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2420 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2294 | xpixel, ypixel + font->ascent + 1, |
2421 | xpixel, ypixel + font->ascent + 1, |
2295 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2422 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
|
|
2423 | } |
2296 | } /* for (col....) */ |
2424 | } /* for (col....) */ |
2297 | } /* for (row....) */ |
2425 | } /* for (row....) */ |
|
|
2426 | |
|
|
2427 | #if ENABLE_OVERLAY |
|
|
2428 | scr_swap_overlay (); |
|
|
2429 | #endif |
2298 | |
2430 | |
2299 | /* |
2431 | /* |
2300 | * G: cleanup cursor and display outline cursor if necessary |
2432 | * G: cleanup cursor and display outline cursor if necessary |
2301 | */ |
2433 | */ |
2302 | if (showcursor) |
2434 | if (showcursor) |
2303 | { |
2435 | { |
2304 | if (TermWin.focus) |
2436 | if (TermWin.focus) |
2305 | { |
2437 | { |
2306 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
2438 | if (options & Opt_cursorUnderline) |
2307 | [screen.cur.col]); |
2439 | *crp ^= RS_Uline; |
|
|
2440 | else |
|
|
2441 | { |
2308 | *srp ^= RS_RVid; |
2442 | *crp ^= RS_RVid; |
2309 | #ifndef NO_CURSORCOLOR |
2443 | #ifndef NO_CURSORCOLOR |
2310 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2444 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2311 | #endif |
2445 | #endif |
|
|
2446 | } |
2312 | } |
2447 | } |
2313 | else if (oldcursor.row >= 0) |
2448 | else if (oldcursor.row >= 0) |
2314 | { |
2449 | { |
|
|
2450 | int cursorwidth = 1; |
|
|
2451 | int col = oldcursor.col; |
|
|
2452 | |
|
|
2453 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2454 | col--; |
|
|
2455 | |
|
|
2456 | while (col + cursorwidth < TermWin.ncol |
|
|
2457 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
|
|
2458 | cursorwidth++; |
|
|
2459 | |
2315 | #ifndef NO_CURSORCOLOR |
2460 | #ifndef NO_CURSORCOLOR |
2316 | if (ISSET_PIXCOLOR (Color_cursor)) |
2461 | if (ISSET_PIXCOLOR (Color_cursor)) |
2317 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2462 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2318 | #endif |
2463 | #endif |
2319 | int cursorwidth = 1; |
|
|
2320 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2321 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2322 | cursorwidth++; |
|
|
2323 | |
2464 | |
2324 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2465 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2325 | Col2Pixel (oldcursor.col), |
2466 | Col2Pixel (col), |
2326 | Row2Pixel (oldcursor.row), |
2467 | Row2Pixel (oldcursor.row), |
2327 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2468 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2328 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2469 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2329 | } |
2470 | } |
2330 | } |
2471 | } |
… | |
… | |
2332 | /* |
2473 | /* |
2333 | * H: cleanup selection |
2474 | * H: cleanup selection |
2334 | */ |
2475 | */ |
2335 | scr_reverse_selection (); |
2476 | scr_reverse_selection (); |
2336 | |
2477 | |
2337 | /* |
|
|
2338 | * I: other general cleanup |
|
|
2339 | */ |
|
|
2340 | #if 0 |
|
|
2341 | if (clearfirst && TermWin.int_bwidth) |
|
|
2342 | /* |
|
|
2343 | * clear the whole screen height, note that width == 0 is treated |
|
|
2344 | * specially by XClearArea |
|
|
2345 | */ |
|
|
2346 | XClearArea (display->display, TermWin.vt, 0, 0, |
|
|
2347 | (unsigned int)TermWin.int_bwidth, |
|
|
2348 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2349 | |
|
|
2350 | if (clearlast && TermWin.int_bwidth) |
|
|
2351 | /* |
|
|
2352 | * clear the whole screen height, note that width == 0 is treated |
|
|
2353 | * specially by XClearArea |
|
|
2354 | */ |
|
|
2355 | XClearArea (display->display, TermWin.vt, |
|
|
2356 | TermWin.width + TermWin.int_bwidth, 0, |
|
|
2357 | (unsigned int)TermWin.int_bwidth, |
|
|
2358 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2359 | #endif |
|
|
2360 | |
|
|
2361 | if (refresh_type & SMOOTH_REFRESH) |
2478 | if (refresh_type & SMOOTH_REFRESH) |
2362 | XFlush (display->display); |
2479 | XFlush (display->display); |
2363 | |
2480 | |
2364 | num_scr = 0; |
2481 | num_scr = 0; |
2365 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2366 | want_refresh = 0; /* screen is current */ |
|
|
2367 | } |
2483 | } |
2368 | |
2484 | |
2369 | void |
2485 | void |
2370 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2486 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2371 | { |
2487 | { |
2372 | if (!rp || !tp) |
2488 | if (!rp || !tp) |
2373 | return; |
2489 | return; |
2374 | |
2490 | |
2375 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2491 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2376 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
2492 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2377 | } |
2493 | } |
2378 | |
2494 | |
2379 | void |
2495 | void |
2380 | rxvt_term::scr_remap_chars () |
2496 | rxvt_term::scr_remap_chars () |
2381 | { |
2497 | { |
… | |
… | |
2387 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2503 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2388 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2504 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2389 | } |
2505 | } |
2390 | } |
2506 | } |
2391 | |
2507 | |
|
|
2508 | void |
|
|
2509 | rxvt_term::scr_recolour () |
|
|
2510 | { |
|
|
2511 | if (1 |
|
|
2512 | #if TRANSPARENT |
|
|
2513 | && !am_transparent |
|
|
2514 | #endif |
|
|
2515 | #if XPM_BACKGROUND |
|
|
2516 | && !bgPixmap.pixmap |
|
|
2517 | #endif |
|
|
2518 | ) |
|
|
2519 | { |
|
|
2520 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
|
|
2521 | XClearWindow (display->display, TermWin.parent[0]); |
|
|
2522 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
|
|
2523 | #if HAVE_SCROLLBARS |
|
|
2524 | if (scrollBar.win) |
|
|
2525 | { |
|
|
2526 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
|
|
2527 | scrollBar.setIdle (); |
|
|
2528 | scrollbar_show (0); |
|
|
2529 | } |
|
|
2530 | #endif |
|
|
2531 | } |
|
|
2532 | |
|
|
2533 | scr_clear (); |
|
|
2534 | scr_touch (true); |
|
|
2535 | want_refresh = 1; |
|
|
2536 | } |
|
|
2537 | |
2392 | /* ------------------------------------------------------------------------- */ |
2538 | /* ------------------------------------------------------------------------- */ |
2393 | void |
2539 | void |
2394 | rxvt_term::scr_clear (bool really) |
2540 | rxvt_term::scr_clear (bool really) |
2395 | { |
2541 | { |
2396 | if (!TermWin.mapped) |
2542 | if (!TermWin.mapped) |
2397 | return; |
2543 | return; |
2398 | |
2544 | |
2399 | num_scr_allow = 0; |
2545 | num_scr_allow = 0; |
2400 | want_refresh = 1; |
2546 | want_refresh = 1; |
2401 | |
2547 | |
2402 | #ifdef TRANSPARENT |
2548 | #if TRANSPARENT |
2403 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2549 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2404 | { |
2550 | { |
2405 | int i; |
2551 | int i; |
2406 | |
2552 | |
2407 | if (! (Options & Opt_transparent_all)) |
2553 | if (!(options & Opt_transparent_all)) |
2408 | i = 0; |
2554 | i = 0; |
2409 | else |
2555 | else |
2410 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2556 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2411 | |
2557 | |
2412 | while (i--) |
2558 | while (i--) |
… | |
… | |
2428 | int end_row = TermWin.saveLines - TermWin.view_start; |
2574 | int end_row = TermWin.saveLines - TermWin.view_start; |
2429 | int i = selection.beg.row + TermWin.saveLines; |
2575 | int i = selection.beg.row + TermWin.saveLines; |
2430 | int col, row = selection.end.row + TermWin.saveLines; |
2576 | int col, row = selection.end.row + TermWin.saveLines; |
2431 | rend_t *srp; |
2577 | rend_t *srp; |
2432 | |
2578 | |
2433 | if (i >= end_row) |
2579 | #if ENABLE_FRILLS |
2434 | col = selection.beg.col; |
2580 | if (selection.rect) |
|
|
2581 | { |
|
|
2582 | end_row += TermWin.nrow; |
|
|
2583 | |
|
|
2584 | for (; i <= row && i <= end_row; i++) |
|
|
2585 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
|
|
2586 | srp[col] ^= RS_RVid; |
|
|
2587 | } |
2435 | else |
2588 | else |
|
|
2589 | #endif |
|
|
2590 | { |
|
|
2591 | if (i >= end_row) |
|
|
2592 | col = selection.beg.col; |
|
|
2593 | else |
2436 | { |
2594 | { |
2437 | col = 0; |
2595 | col = 0; |
2438 | i = end_row; |
2596 | i = end_row; |
2439 | } |
2597 | } |
2440 | |
2598 | |
2441 | end_row += TermWin.nrow; |
2599 | end_row += TermWin.nrow; |
|
|
2600 | |
2442 | for (; i < row && i < end_row; i++, col = 0) |
2601 | for (; i < row && i < end_row; i++, col = 0) |
2443 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2602 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2444 | srp[col] ^= RS_RVid; |
2603 | srp[col] ^= RS_RVid; |
2445 | |
2604 | |
2446 | if (i == row && i < end_row) |
2605 | if (i == row && i < end_row) |
2447 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2606 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2448 | srp[col] ^= RS_RVid; |
2607 | srp[col] ^= RS_RVid; |
|
|
2608 | } |
2449 | } |
2609 | } |
2450 | } |
2610 | } |
2451 | |
2611 | |
2452 | /* ------------------------------------------------------------------------- */ |
2612 | /* ------------------------------------------------------------------------- */ |
2453 | /* |
2613 | /* |
… | |
… | |
2489 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2649 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2490 | */ |
2650 | */ |
2491 | void |
2651 | void |
2492 | rxvt_term::selection_check (int check_more) |
2652 | rxvt_term::selection_check (int check_more) |
2493 | { |
2653 | { |
2494 | row_col_t pos; |
2654 | row_col_t pos; |
2495 | |
2655 | |
2496 | if (!selection.op) |
2656 | if (!selection.op) |
2497 | return; |
2657 | return; |
2498 | |
2658 | |
2499 | pos.row = pos.col = 0; |
2659 | pos.row = pos.col = 0; |
… | |
… | |
2521 | /* ------------------------------------------------------------------------- */ |
2681 | /* ------------------------------------------------------------------------- */ |
2522 | /* |
2682 | /* |
2523 | * Paste a selection direct to the command fd |
2683 | * Paste a selection direct to the command fd |
2524 | */ |
2684 | */ |
2525 | void |
2685 | void |
2526 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2686 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2527 | { |
2687 | { |
2528 | unsigned int i, j, n; |
|
|
2529 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
|
|
2530 | |
|
|
2531 | #if 0 |
|
|
2532 | /* a paste should act like the user is typing, so check scrollTtyKeypress */ |
|
|
2533 | ZERO_SCROLLBACK (r); |
|
|
2534 | #endif |
|
|
2535 | |
|
|
2536 | /* convert normal newline chars into common keyboard Return key sequence */ |
2688 | /* convert normal newline chars into common keyboard Return key sequence */ |
2537 | for (i = 0; i < len; i += PROP_SIZE) |
2689 | for (unsigned int i = 0; i < len; i++) |
2538 | { |
|
|
2539 | n = min (len - i, PROP_SIZE); |
|
|
2540 | MEMCPY (ds, data + i, n); |
|
|
2541 | |
|
|
2542 | for (j = 0; j < n; j++) |
|
|
2543 | if (ds[j] == C0_LF) |
2690 | if (data[i] == C0_LF) |
2544 | ds[j] = C0_CR; |
2691 | data[i] = C0_CR; |
2545 | |
2692 | |
2546 | tt_write (ds, (int)n); |
2693 | tt_write (data, len); |
2547 | } |
|
|
2548 | |
|
|
2549 | free (ds); |
|
|
2550 | } |
2694 | } |
2551 | |
2695 | |
2552 | /* ------------------------------------------------------------------------- */ |
2696 | /* ------------------------------------------------------------------------- */ |
2553 | /* |
2697 | /* |
2554 | * Respond to a notification that a primary selection has been sent |
2698 | * Respond to a notification that a primary selection has been sent |
2555 | * EXT: SelectionNotify |
2699 | * EXT: SelectionNotify |
2556 | */ |
2700 | */ |
2557 | int |
2701 | void |
2558 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2702 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2559 | { |
2703 | { |
2560 | long nread = 0; |
|
|
2561 | unsigned long bytes_after; |
|
|
2562 | XTextProperty ct; |
|
|
2563 | |
|
|
2564 | D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
|
|
2565 | |
|
|
2566 | if (prop == None) /* check for failed XConvertSelection */ |
2704 | if (prop == None) /* check for failed XConvertSelection */ |
2567 | { |
2705 | { |
2568 | if ((selection_type & Sel_CompoundText)) |
2706 | if ((selection_type & Sel_CompoundText)) |
2569 | { |
2707 | { |
2570 | int selnum = selection_type & Sel_whereMask; |
2708 | int selnum = selection_type & Sel_whereMask; |
… | |
… | |
2583 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2721 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2584 | else |
2722 | else |
2585 | selection_type = 0; |
2723 | selection_type = 0; |
2586 | } |
2724 | } |
2587 | |
2725 | |
2588 | return 0; |
2726 | return; |
2589 | } |
|
|
2590 | |
|
|
2591 | for (;;) |
|
|
2592 | { |
2727 | } |
|
|
2728 | |
|
|
2729 | unsigned long bytes_after; |
|
|
2730 | XTextProperty ct; |
|
|
2731 | |
|
|
2732 | if (XGetWindowProperty (display->display, win, prop, |
|
|
2733 | 0, PROP_SIZE / 4, |
|
|
2734 | delete_prop, AnyPropertyType, |
|
|
2735 | &ct.encoding, &ct.format, |
|
|
2736 | &ct.nitems, &bytes_after, |
|
|
2737 | &ct.value) != Success) |
|
|
2738 | { |
|
|
2739 | ct.value = 0; |
|
|
2740 | goto bailout; |
|
|
2741 | } |
|
|
2742 | |
|
|
2743 | if (ct.encoding == None) |
|
|
2744 | goto bailout; |
|
|
2745 | |
|
|
2746 | if (bytes_after) |
|
|
2747 | { |
|
|
2748 | // fetch and append remaining data |
|
|
2749 | XTextProperty ct2; |
|
|
2750 | |
2593 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2751 | if (XGetWindowProperty (display->display, win, prop, |
2594 | (long) (PROP_SIZE / 4), delete_prop, |
2752 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2753 | delete_prop, AnyPropertyType, |
2595 | AnyPropertyType, &ct.encoding, &ct.format, |
2754 | &ct2.encoding, &ct2.format, |
2596 | &ct.nitems, &bytes_after, |
2755 | &ct2.nitems, &bytes_after, |
2597 | &ct.value) != Success) |
2756 | &ct2.value) != Success) |
2598 | break; |
2757 | goto bailout; |
2599 | |
2758 | |
2600 | if (ct.encoding == 0) |
2759 | // realloc should be compatible to XFree, here, and elsewhere, too |
2601 | { |
2760 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2602 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2761 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2603 | break; |
2762 | ct.nitems += ct2.nitems; |
2604 | } |
|
|
2605 | |
2763 | |
|
|
2764 | XFree (ct2.value); |
|
|
2765 | } |
|
|
2766 | |
2606 | if (ct.value == NULL) |
2767 | if (ct.value == 0) |
2607 | { |
2768 | goto bailout; |
2608 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
|
|
2609 | continue; |
|
|
2610 | } |
|
|
2611 | |
2769 | |
|
|
2770 | if (ct.encoding == xa[XA_INCR]) |
|
|
2771 | { |
|
|
2772 | // INCR selection, start handshake |
|
|
2773 | if (!delete_prop) |
|
|
2774 | XDeleteProperty (display->display, win, prop); |
|
|
2775 | |
|
|
2776 | selection_wait = Sel_incr; |
|
|
2777 | incr_buf_fill = 0; |
|
|
2778 | incr_ev.start (NOW + 10); |
|
|
2779 | |
|
|
2780 | goto bailout; |
|
|
2781 | } |
|
|
2782 | |
2612 | if (ct.nitems == 0) |
2783 | if (ct.nitems == 0) |
|
|
2784 | { |
|
|
2785 | if (selection_wait == Sel_incr) |
|
|
2786 | { |
|
|
2787 | XFree (ct.value); |
|
|
2788 | |
|
|
2789 | // finally complete, now paste the whole thing |
|
|
2790 | selection_wait = Sel_normal; |
|
|
2791 | ct.value = (unsigned char *)incr_buf; |
|
|
2792 | ct.nitems = incr_buf_fill; |
|
|
2793 | incr_buf = 0; |
|
|
2794 | incr_buf_size = 0; |
|
|
2795 | incr_ev.stop (); |
2613 | { |
2796 | } |
2614 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2797 | else |
2615 | |
2798 | { |
2616 | if (selection_wait == Sel_normal && nread == 0 |
2799 | if (selection_wait == Sel_normal |
2617 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2800 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2618 | { |
2801 | { |
2619 | /* |
2802 | /* |
2620 | * pass through again trying CUT_BUFFER0 if we've come from |
2803 | * pass through again trying CUT_BUFFER0 if we've come from |
2621 | * XConvertSelection () but nothing was presented |
2804 | * XConvertSelection () but nothing was presented |
2622 | */ |
2805 | */ |
2623 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2624 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2806 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2625 | } |
2807 | } |
2626 | |
2808 | |
2627 | nread = -1; /* discount any previous stuff */ |
2809 | goto bailout; |
2628 | break; |
2810 | } |
|
|
2811 | } |
|
|
2812 | else if (selection_wait == Sel_incr) |
|
|
2813 | { |
|
|
2814 | incr_ev.start (NOW + 10); |
|
|
2815 | |
|
|
2816 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2629 | } |
2817 | { |
|
|
2818 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2819 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2820 | } |
2630 | |
2821 | |
|
|
2822 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2631 | nread += ct.nitems; |
2823 | incr_buf_fill += ct.nitems; |
2632 | |
2824 | |
|
|
2825 | goto bailout; |
|
|
2826 | } |
|
|
2827 | |
2633 | char **cl; |
2828 | char **cl; |
2634 | int cr; |
2829 | int cr; |
|
|
2830 | |
|
|
2831 | #if ENABLE_FRILLS |
|
|
2832 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2833 | // so recode it manually |
|
|
2834 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2835 | { |
|
|
2836 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2837 | char *s = rxvt_wcstombs (w); |
|
|
2838 | free (w); |
|
|
2839 | // TODO: strlen == only the first element will be converted. well... |
|
|
2840 | paste ((unsigned char *)s, strlen (s)); |
|
|
2841 | free (s); |
|
|
2842 | } |
|
|
2843 | else |
|
|
2844 | #endif |
2635 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2845 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2636 | { |
2846 | && cl) |
|
|
2847 | { |
2637 | for (int i = 0; i < cr; i++) |
2848 | for (int i = 0; i < cr; i++) |
2638 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2849 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2639 | |
2850 | |
2640 | XFreeStringList (cl); |
2851 | XFreeStringList (cl); |
2641 | } |
2852 | } |
2642 | else |
2853 | else |
2643 | paste (ct.value, ct.nitems); |
2854 | paste (ct.value, ct.nitems); // paste raw |
2644 | |
2855 | |
2645 | if (bytes_after == 0) |
2856 | bailout: |
2646 | break; |
|
|
2647 | |
|
|
2648 | XFree (ct.value); |
|
|
2649 | } |
|
|
2650 | |
|
|
2651 | if (ct.value) |
|
|
2652 | XFree (ct.value); |
2857 | XFree (ct.value); |
2653 | |
2858 | |
2654 | if (selection_wait == Sel_normal) |
2859 | if (selection_wait == Sel_normal) |
2655 | selection_wait = Sel_none; |
2860 | selection_wait = Sel_none; |
2656 | |
|
|
2657 | D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
|
|
2658 | return (int)nread; |
|
|
2659 | } |
2861 | } |
2660 | |
2862 | |
2661 | void |
2863 | void |
2662 | rxvt_term::incr_cb (time_watcher &w) |
2864 | rxvt_term::incr_cb (time_watcher &w) |
2663 | { |
2865 | { |
2664 | selection_wait = Sel_none; |
2866 | selection_wait = Sel_none; |
2665 | |
2867 | |
|
|
2868 | incr_buf_size = 0; |
|
|
2869 | free (incr_buf); |
|
|
2870 | |
2666 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2871 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2667 | } |
2872 | } |
2668 | |
2873 | |
2669 | /* |
|
|
2670 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
|
|
2671 | */ |
|
|
2672 | void |
2874 | void |
2673 | rxvt_term::selection_property (Window win, Atom prop) |
2875 | rxvt_term::selection_property (Window win, Atom prop) |
2674 | { |
2876 | { |
2675 | int reget_time = 0; |
2877 | if (prop == None || selection_wait != Sel_incr) |
2676 | |
|
|
2677 | if (prop == None) |
|
|
2678 | return; |
2878 | return; |
2679 | |
2879 | |
2680 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
|
|
2681 | if (selection_wait == Sel_normal) |
|
|
2682 | { |
|
|
2683 | int a, afmt; |
|
|
2684 | Atom atype; |
|
|
2685 | unsigned long bytes_after, nitems; |
|
|
2686 | unsigned char *s = NULL; |
|
|
2687 | |
|
|
2688 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
|
|
2689 | xa[XA_INCR], &atype, &afmt, &nitems, |
|
|
2690 | &bytes_after, &s); |
|
|
2691 | if (s) |
|
|
2692 | XFree (s); |
|
|
2693 | if (a != Success) |
|
|
2694 | return; |
|
|
2695 | |
|
|
2696 | #ifndef __CYGWIN32__ |
|
|
2697 | if (atype == xa[XA_INCR]) |
|
|
2698 | { /* start an INCR transfer */ |
|
|
2699 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
|
|
2700 | XDeleteProperty (display->display, win, prop); |
|
|
2701 | XFlush (display->display); |
|
|
2702 | reget_time = 1; |
|
|
2703 | selection_wait = Sel_incr; |
|
|
2704 | } |
|
|
2705 | #endif |
|
|
2706 | |
|
|
2707 | } |
|
|
2708 | else if (selection_wait == Sel_incr) |
|
|
2709 | { |
|
|
2710 | reget_time = 1; |
|
|
2711 | |
|
|
2712 | if (selection_paste (win, prop, True) == -1) |
2880 | selection_paste (win, prop, true); |
2713 | { |
|
|
2714 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
|
|
2715 | selection_wait = Sel_none; |
|
|
2716 | incr_ev.stop (); |
|
|
2717 | } |
|
|
2718 | } |
|
|
2719 | if (reget_time) /* received more data so reget time */ |
|
|
2720 | incr_ev.start (NOW + 10); |
|
|
2721 | } |
2881 | } |
2722 | |
2882 | |
2723 | /* ------------------------------------------------------------------------- */ |
2883 | /* ------------------------------------------------------------------------- */ |
2724 | /* |
2884 | /* |
2725 | * Request the current selection: |
2885 | * Request the current selection: |
… | |
… | |
2731 | * EXT: button 2 release |
2891 | * EXT: button 2 release |
2732 | */ |
2892 | */ |
2733 | void |
2893 | void |
2734 | rxvt_term::selection_request (Time tm, int x, int y) |
2894 | rxvt_term::selection_request (Time tm, int x, int y) |
2735 | { |
2895 | { |
2736 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2737 | |
|
|
2738 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2896 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2739 | return; /* outside window */ |
2897 | return; /* outside window */ |
2740 | |
2898 | |
2741 | if (selection.text) |
2899 | if (selection.text) |
2742 | { /* internal selection */ |
2900 | { /* internal selection */ |
2743 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
|
|
2744 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2901 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2745 | paste ((unsigned char *)str, strlen (str)); |
2902 | paste ((unsigned char *)str, strlen (str)); |
2746 | free (str); |
2903 | free (str); |
2747 | return; |
2904 | return; |
2748 | } |
2905 | } |
… | |
… | |
2762 | #else |
2919 | #else |
2763 | selection_type = Sel_CompoundText; |
2920 | selection_type = Sel_CompoundText; |
2764 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2921 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2765 | return; |
2922 | return; |
2766 | #endif |
2923 | #endif |
2767 | |
|
|
2768 | } |
2924 | } |
2769 | } |
2925 | } |
2770 | |
2926 | |
2771 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2927 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2772 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2773 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2928 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2774 | } |
2929 | } |
2775 | |
2930 | |
2776 | int |
2931 | int |
2777 | rxvt_term::selection_request_other (Atom target, int selnum) |
2932 | rxvt_term::selection_request_other (Atom target, int selnum) |
2778 | { |
2933 | { |
2779 | Atom sel; |
2934 | Atom sel; |
2780 | #ifdef DEBUG_SELECT |
|
|
2781 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
|
|
2782 | #endif |
|
|
2783 | |
2935 | |
2784 | selection_type |= selnum; |
2936 | selection_type |= selnum; |
2785 | |
2937 | |
2786 | if (selnum == Sel_Primary) |
2938 | if (selnum == Sel_Primary) |
2787 | sel = XA_PRIMARY; |
2939 | sel = XA_PRIMARY; |
… | |
… | |
2790 | else |
2942 | else |
2791 | sel = xa[XA_CLIPBOARD]; |
2943 | sel = xa[XA_CLIPBOARD]; |
2792 | |
2944 | |
2793 | if (XGetSelectionOwner (display->display, sel) != None) |
2945 | if (XGetSelectionOwner (display->display, sel) != None) |
2794 | { |
2946 | { |
2795 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
|
|
2796 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2947 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2797 | TermWin.vt, selection_request_time); |
2948 | TermWin.vt, selection_request_time); |
2798 | return 1; |
2949 | return 1; |
2799 | } |
2950 | } |
2800 | |
2951 | |
… | |
… | |
2807 | * EXT: SelectionClear |
2958 | * EXT: SelectionClear |
2808 | */ |
2959 | */ |
2809 | void |
2960 | void |
2810 | rxvt_term::selection_clear () |
2961 | rxvt_term::selection_clear () |
2811 | { |
2962 | { |
2812 | D_SELECT ((stderr, "rxvt_selection_clear ()")); |
|
|
2813 | |
|
|
2814 | want_refresh = 1; |
2963 | want_refresh = 1; |
2815 | free (selection.text); |
2964 | free (selection.text); |
2816 | selection.text = NULL; |
2965 | selection.text = NULL; |
2817 | selection.len = 0; |
2966 | selection.len = 0; |
2818 | CLEAR_SELECTION (); |
2967 | CLEAR_SELECTION (); |
… | |
… | |
2831 | { |
2980 | { |
2832 | int i, col, end_col, row, end_row; |
2981 | int i, col, end_col, row, end_row; |
2833 | wchar_t *new_selection_text; |
2982 | wchar_t *new_selection_text; |
2834 | text_t *t; |
2983 | text_t *t; |
2835 | |
2984 | |
2836 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
|
|
2837 | switch (selection.op) |
2985 | switch (selection.op) |
2838 | { |
2986 | { |
2839 | case SELECTION_CONT: |
2987 | case SELECTION_CONT: |
2840 | break; |
2988 | break; |
2841 | case SELECTION_INIT: |
2989 | case SELECTION_INIT: |
… | |
… | |
2855 | |
3003 | |
2856 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
3004 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2857 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3005 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2858 | |
3006 | |
2859 | col = selection.beg.col; |
3007 | col = selection.beg.col; |
2860 | MAX_IT (col, 0); |
|
|
2861 | row = selection.beg.row + TermWin.saveLines; |
3008 | row = selection.beg.row + TermWin.saveLines; |
2862 | end_row = selection.end.row + TermWin.saveLines; |
3009 | end_row = selection.end.row + TermWin.saveLines; |
2863 | int ofs = 0; |
3010 | int ofs = 0; |
2864 | int extra = 0; |
3011 | int extra = 0; |
2865 | |
3012 | |
2866 | for (; row <= end_row; row++, col = 0) |
3013 | for (; row <= end_row; row++, col = 0) |
2867 | { |
3014 | { |
2868 | t = &(screen.text[row][col]); |
|
|
2869 | |
|
|
2870 | end_col = screen.tlen[row]; |
3015 | end_col = screen.tlen[row]; |
|
|
3016 | |
|
|
3017 | #if ENABLE_FRILLS |
|
|
3018 | if (selection.rect) |
|
|
3019 | { |
|
|
3020 | col = selection.beg.col; |
|
|
3021 | end_col = TermWin.ncol + 1; |
|
|
3022 | } |
|
|
3023 | #endif |
|
|
3024 | |
|
|
3025 | MAX_IT (col, 0); |
2871 | |
3026 | |
2872 | if (end_col == -1) |
3027 | if (end_col == -1) |
2873 | end_col = TermWin.ncol; |
3028 | end_col = TermWin.ncol; |
2874 | |
3029 | |
2875 | if (row == end_row) |
3030 | if (row == end_row || selection.rect) |
2876 | MIN_IT (end_col, selection.end.col); |
3031 | MIN_IT (end_col, selection.end.col); |
2877 | |
3032 | |
|
|
3033 | t = &screen.text[row][col]; |
2878 | for (; col < end_col; col++) |
3034 | for (; col < end_col; col++) |
2879 | { |
3035 | { |
2880 | if (*t == NOCHAR) |
3036 | if (*t == NOCHAR) |
2881 | t++; |
3037 | t++; |
2882 | #if ENABLE_COMBINING |
3038 | #if ENABLE_COMBINING |
… | |
… | |
2930 | #if 0 |
3086 | #if 0 |
2931 | XTextProperty ct; |
3087 | XTextProperty ct; |
2932 | |
3088 | |
2933 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3089 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2934 | { |
3090 | { |
2935 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
3091 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2936 | PropModeReplace, ct.value, ct.nitems); |
|
|
2937 | XFree (ct.value); |
3092 | XFree (ct.value); |
2938 | } |
3093 | } |
2939 | #endif |
3094 | #endif |
2940 | |
3095 | |
2941 | selection_time = tm; |
3096 | selection_time = tm; |
2942 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
|
|
2943 | } |
3097 | } |
2944 | |
3098 | |
2945 | /* ------------------------------------------------------------------------- */ |
3099 | /* ------------------------------------------------------------------------- */ |
2946 | /* |
3100 | /* |
2947 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3101 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2948 | * EXT: button 1 press |
3102 | * EXT: button 1 press |
2949 | */ |
3103 | */ |
2950 | void |
3104 | void |
2951 | rxvt_term::selection_click (int clicks, int x, int y) |
3105 | rxvt_term::selection_click (int clicks, int x, int y) |
2952 | { |
3106 | { |
2953 | D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); |
|
|
2954 | |
|
|
2955 | clicks = ((clicks - 1) % 3) + 1; |
3107 | clicks = ((clicks - 1) % 3) + 1; |
2956 | selection.clicks = clicks; /* save clicks so extend will work */ |
3108 | selection.clicks = clicks; /* save clicks so extend will work */ |
2957 | |
3109 | |
2958 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3110 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2959 | |
3111 | |
… | |
… | |
3001 | * We now only find out the boundary in one direction |
3153 | * We now only find out the boundary in one direction |
3002 | */ |
3154 | */ |
3003 | |
3155 | |
3004 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3156 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3005 | #define DELIMIT_TEXT(x) \ |
3157 | #define DELIMIT_TEXT(x) \ |
3006 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
3158 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3007 | #define DELIMIT_REND(x) 1 |
3159 | #define DELIMIT_REND(x) 1 |
3008 | |
3160 | |
3009 | void |
3161 | void |
3010 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3162 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3011 | { |
3163 | { |
… | |
… | |
3029 | |
3181 | |
3030 | row = mark->row + TermWin.saveLines; |
3182 | row = mark->row + TermWin.saveLines; |
3031 | col = mark->col; |
3183 | col = mark->col; |
3032 | MAX_IT (col, 0); |
3184 | MAX_IT (col, 0); |
3033 | /* find the edge of a word */ |
3185 | /* find the edge of a word */ |
3034 | stp = & (screen.text[row][col]); |
3186 | stp = &screen.text[row][col]; |
3035 | w1 = DELIMIT_TEXT (*stp); |
3187 | w1 = DELIMIT_TEXT (*stp); |
3036 | |
3188 | |
3037 | srp = (&screen.rend[row][col]); |
3189 | srp = &screen.rend[row][col]; |
3038 | w2 = DELIMIT_REND (*srp); |
3190 | w2 = DELIMIT_REND (*srp); |
3039 | |
3191 | |
3040 | for (;;) |
3192 | for (;;) |
3041 | { |
3193 | { |
3042 | for (; col != bound.col; col += dirnadd) |
3194 | for (; col != bound.col; col += dirnadd) |
… | |
… | |
3076 | } |
3228 | } |
3077 | break; |
3229 | break; |
3078 | } |
3230 | } |
3079 | |
3231 | |
3080 | Old_Word_Selection_You_Die: |
3232 | Old_Word_Selection_You_Die: |
3081 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
|
|
3082 | |
|
|
3083 | if (dirn == DN) |
3233 | if (dirn == DN) |
3084 | col++; /* put us on one past the end */ |
3234 | col++; /* put us on one past the end */ |
3085 | |
3235 | |
3086 | /* Poke the values back in */ |
3236 | /* Poke the values back in */ |
3087 | ret->row = row - TermWin.saveLines; |
3237 | ret->row = row - TermWin.saveLines; |
… | |
… | |
3121 | /* select nothing */ |
3271 | /* select nothing */ |
3122 | selection.beg.row = selection.end.row = 0; |
3272 | selection.beg.row = selection.end.row = 0; |
3123 | selection.beg.col = selection.end.col = 0; |
3273 | selection.beg.col = selection.end.col = 0; |
3124 | selection.clicks = 4; |
3274 | selection.clicks = 4; |
3125 | want_refresh = 1; |
3275 | want_refresh = 1; |
3126 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
|
|
3127 | return; |
3276 | return; |
3128 | } |
3277 | } |
3129 | |
3278 | |
3130 | if (selection.clicks == 4) |
3279 | if (selection.clicks == 4) |
3131 | selection.clicks = 1; |
3280 | selection.clicks = 1; |
… | |
… | |
3147 | row_col_t pos; |
3296 | row_col_t pos; |
3148 | enum { |
3297 | enum { |
3149 | LEFT, RIGHT |
3298 | LEFT, RIGHT |
3150 | } closeto = RIGHT; |
3299 | } closeto = RIGHT; |
3151 | |
3300 | |
3152 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
|
|
3153 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3154 | |
|
|
3155 | want_refresh = 1; |
3301 | want_refresh = 1; |
|
|
3302 | |
3156 | switch (selection.op) |
3303 | switch (selection.op) |
3157 | { |
3304 | { |
3158 | case SELECTION_INIT: |
3305 | case SELECTION_INIT: |
3159 | CLEAR_SELECTION (); |
3306 | CLEAR_SELECTION (); |
3160 | selection.op = SELECTION_BEGIN; |
3307 | selection.op = SELECTION_BEGIN; |
… | |
… | |
3173 | selection_start_colrow (col, row); |
3320 | selection_start_colrow (col, row); |
3174 | /* FALLTHROUGH */ |
3321 | /* FALLTHROUGH */ |
3175 | default: |
3322 | default: |
3176 | return; |
3323 | return; |
3177 | } |
3324 | } |
|
|
3325 | |
3178 | if (selection.beg.col == selection.end.col |
3326 | if (selection.beg.col == selection.end.col |
3179 | && selection.beg.col != selection.mark.col |
3327 | && selection.beg.col != selection.mark.col |
3180 | && selection.beg.row == selection.end.row |
3328 | && selection.beg.row == selection.end.row |
3181 | && selection.beg.row != selection.mark.row) |
3329 | && selection.beg.row != selection.mark.row) |
3182 | { |
3330 | { |
3183 | selection.beg.col = selection.end.col = selection.mark.col; |
3331 | selection.beg.col = selection.end.col = selection.mark.col; |
3184 | selection.beg.row = selection.end.row = selection.mark.row; |
3332 | selection.beg.row = selection.end.row = selection.mark.row; |
3185 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3186 | } |
3333 | } |
3187 | |
3334 | |
3188 | pos.col = col; |
3335 | pos.col = col; |
3189 | pos.row = row; |
3336 | pos.row = row; |
3190 | |
3337 | |
… | |
… | |
3233 | } |
3380 | } |
3234 | else |
3381 | else |
3235 | { /* button1 drag or button3 drag */ |
3382 | { /* button1 drag or button3 drag */ |
3236 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3383 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3237 | { |
3384 | { |
3238 | if ((selection.mark.row == selection.end.row) |
3385 | if (selection.mark.row == selection.end.row |
3239 | && (selection.mark.col == selection.end.col) |
3386 | && selection.mark.col == selection.end.col |
|
|
3387 | && clickchange |
3240 | && clickchange && selection.clicks == 2) |
3388 | && selection.clicks == 2) |
3241 | selection.mark.col--; |
3389 | selection.mark.col--; |
3242 | |
3390 | |
3243 | selection.beg.row = pos.row; |
3391 | selection.beg.row = pos.row; |
3244 | selection.beg.col = pos.col; |
3392 | selection.beg.col = pos.col; |
3245 | selection.end.row = selection.mark.row; |
3393 | selection.end.row = selection.mark.row; |
… | |
… | |
3256 | |
3404 | |
3257 | if (selection.clicks == 1) |
3405 | if (selection.clicks == 1) |
3258 | { |
3406 | { |
3259 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3407 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3260 | |
3408 | |
3261 | if (end_col != -1 && selection.beg.col > end_col) |
3409 | if (selection.beg.col > end_col |
|
|
3410 | && end_col != -1 |
|
|
3411 | #if ENABLE_FRILLS |
|
|
3412 | && !selection.rect |
|
|
3413 | #endif |
3262 | { |
3414 | ) |
3263 | #if 1 |
|
|
3264 | selection.beg.col = ncol; |
3415 | selection.beg.col = ncol; |
3265 | #else |
|
|
3266 | if (selection.beg.row != selection.end.row) |
|
|
3267 | selection.beg.col = ncol; |
|
|
3268 | else |
|
|
3269 | selection.beg.col = selection.mark.col; |
|
|
3270 | #endif |
|
|
3271 | } |
|
|
3272 | |
3416 | |
3273 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3417 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3274 | |
3418 | |
3275 | if (end_col != -1 && selection.end.col > end_col) |
3419 | if ( |
|
|
3420 | selection.end.col > end_col |
|
|
3421 | && end_col != -1 |
|
|
3422 | #if ENABLE_FRILLS |
|
|
3423 | && !selection.rect |
|
|
3424 | #endif |
|
|
3425 | ) |
3276 | selection.end.col = ncol; |
3426 | selection.end.col = ncol; |
3277 | } |
3427 | } |
3278 | else if (selection.clicks == 2) |
3428 | else if (selection.clicks == 2) |
3279 | { |
3429 | { |
3280 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3430 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3281 | selection.end.col--; |
3431 | selection.end.col--; |
3282 | |
3432 | |
3283 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
|
|
3284 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3433 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
|
|
3434 | selection_delimit_word (DN, &selection.end, &selection.end); |
3285 | } |
3435 | } |
3286 | else if (selection.clicks == 3) |
3436 | else if (selection.clicks == 3) |
3287 | { |
3437 | { |
3288 | #ifndef NO_FRILLS |
3438 | #if ENABLE_FRILLS |
3289 | if ((Options & Opt_tripleclickwords)) |
3439 | if (options & Opt_tripleclickwords) |
3290 | { |
3440 | { |
3291 | int end_row; |
3441 | int end_row; |
3292 | |
3442 | |
3293 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3443 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3294 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3444 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3295 | |
3445 | |
3296 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3446 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3297 | { |
3447 | { |
3298 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3448 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
… | |
… | |
3309 | else |
3459 | else |
3310 | #endif |
3460 | #endif |
3311 | { |
3461 | { |
3312 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3462 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3313 | selection.mark.col++; |
3463 | selection.mark.col++; |
|
|
3464 | |
3314 | selection.beg.col = 0; |
3465 | selection.beg.col = 0; |
3315 | selection.end.col = ncol; |
3466 | selection.end.col = ncol; |
|
|
3467 | |
|
|
3468 | // select a complete logical line |
|
|
3469 | while (selection.beg.row > -TermWin.saveLines |
|
|
3470 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
|
|
3471 | selection.beg.row--; |
|
|
3472 | |
|
|
3473 | while (selection.end.row < TermWin.nrow |
|
|
3474 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
|
|
3475 | selection.end.row++; |
3316 | } |
3476 | } |
3317 | } |
3477 | } |
3318 | |
3478 | |
3319 | if (button3 && buttonpress) |
3479 | if (button3 && buttonpress) |
3320 | { /* mark may need to be changed */ |
3480 | { /* mark may need to be changed */ |
3321 | if (closeto == LEFT) |
3481 | if (closeto == LEFT) |
3322 | { |
3482 | { |
3323 | selection.mark.row = selection.end.row; |
3483 | selection.mark.row = selection.end.row; |
3324 | selection.mark.col = selection.end.col |
3484 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3325 | - (selection.clicks == 2); |
|
|
3326 | } |
3485 | } |
3327 | else |
3486 | else |
3328 | { |
3487 | { |
3329 | selection.mark.row = selection.beg.row; |
3488 | selection.mark.row = selection.beg.row; |
3330 | selection.mark.col = selection.beg.col; |
3489 | selection.mark.col = selection.beg.col; |
3331 | } |
3490 | } |
3332 | } |
3491 | } |
3333 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3334 | } |
|
|
3335 | |
3492 | |
3336 | #ifndef NO_FRILLS |
3493 | #if ENABLE_FRILLS |
|
|
3494 | if (selection.rect && selection.beg.col > selection.end.col) |
|
|
3495 | SWAP_IT (selection.beg.col, selection.end.col, int); |
|
|
3496 | #endif |
|
|
3497 | } |
|
|
3498 | |
|
|
3499 | #if ENABLE_FRILLS |
3337 | void |
3500 | void |
3338 | rxvt_term::selection_remove_trailing_spaces () |
3501 | rxvt_term::selection_remove_trailing_spaces () |
3339 | { |
3502 | { |
3340 | int32_t end_col, end_row; |
3503 | int32_t end_col, end_row; |
3341 | text_t *stp; |
3504 | text_t *stp; |
3342 | |
3505 | |
3343 | end_col = selection.end.col; |
3506 | end_col = selection.end.col; |
3344 | end_row = selection.end.row; |
3507 | end_row = selection.end.row; |
|
|
3508 | |
3345 | for ( ; end_row >= selection.beg.row; ) |
3509 | for ( ; end_row >= selection.beg.row; ) |
3346 | { |
3510 | { |
3347 | stp = screen.text[end_row + TermWin.saveLines]; |
3511 | stp = screen.text[end_row + TermWin.saveLines]; |
|
|
3512 | |
3348 | while (--end_col >= 0) |
3513 | while (--end_col >= 0) |
3349 | { |
3514 | { |
3350 | if (stp[end_col] != ' ' && stp[end_col] != '\t') |
3515 | if (stp[end_col] != ' ' |
|
|
3516 | && stp[end_col] != '\t' |
|
|
3517 | && stp[end_col] != NOCHAR) |
3351 | break; |
3518 | break; |
3352 | } |
3519 | } |
|
|
3520 | |
3353 | if (end_col >= 0 |
3521 | if (end_col >= 0 |
3354 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3522 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3355 | { |
3523 | { |
3356 | selection.end.col = end_col + 1; |
3524 | selection.end.col = end_col + 1; |
3357 | selection.end.row = end_row; |
3525 | selection.end.row = end_row; |
3358 | break; |
3526 | break; |
3359 | } |
3527 | } |
|
|
3528 | |
3360 | end_row--; |
3529 | end_row--; |
3361 | end_col = TermWin.ncol; |
3530 | end_col = TermWin.ncol; |
3362 | } |
3531 | } |
|
|
3532 | |
3363 | if (selection.mark.row > selection.end.row) |
3533 | if (selection.mark.row > selection.end.row) |
3364 | { |
3534 | { |
3365 | selection.mark.row = selection.end.row; |
3535 | selection.mark.row = selection.end.row; |
3366 | selection.mark.col = selection.end.col; |
3536 | selection.mark.col = selection.end.col; |
3367 | } |
3537 | } |
… | |
… | |
3383 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3553 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3384 | } |
3554 | } |
3385 | |
3555 | |
3386 | /* ------------------------------------------------------------------------- */ |
3556 | /* ------------------------------------------------------------------------- */ |
3387 | /* |
3557 | /* |
3388 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
|
|
3389 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
|
|
3390 | * the X11 protocol. |
|
|
3391 | */ |
|
|
3392 | typedef CARD32 Atom32; |
|
|
3393 | |
|
|
3394 | /* ------------------------------------------------------------------------- */ |
|
|
3395 | /* |
|
|
3396 | * Respond to a request for our current selection |
3558 | * Respond to a request for our current selection |
3397 | * EXT: SelectionRequest |
3559 | * EXT: SelectionRequest |
3398 | */ |
3560 | */ |
3399 | void |
3561 | void |
3400 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3562 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3401 | { |
3563 | { |
3402 | XSelectionEvent ev; |
3564 | XSelectionEvent ev; |
3403 | XTextProperty ct; |
3565 | dDisp; |
3404 | XICCEncodingStyle style; |
|
|
3405 | Atom target; |
|
|
3406 | |
3566 | |
3407 | ev.type = SelectionNotify; |
3567 | ev.type = SelectionNotify; |
3408 | ev.property = None; |
3568 | ev.property = None; |
3409 | ev.display = rq.display; |
3569 | ev.display = rq.display; |
3410 | ev.requestor = rq.requestor; |
3570 | ev.requestor = rq.requestor; |
… | |
… | |
3412 | ev.target = rq.target; |
3572 | ev.target = rq.target; |
3413 | ev.time = rq.time; |
3573 | ev.time = rq.time; |
3414 | |
3574 | |
3415 | if (rq.target == xa[XA_TARGETS]) |
3575 | if (rq.target == xa[XA_TARGETS]) |
3416 | { |
3576 | { |
3417 | Atom32 target_list[6]; |
3577 | Atom target_list[6]; |
3418 | Atom32 *target = target_list; |
3578 | Atom *target = target_list; |
3419 | |
3579 | |
3420 | *target++ = (Atom32) xa[XA_TARGETS]; |
3580 | *target++ = xa[XA_TARGETS]; |
3421 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3581 | *target++ = xa[XA_TIMESTAMP]; |
3422 | *target++ = (Atom32) XA_STRING; |
3582 | *target++ = XA_STRING; |
3423 | *target++ = (Atom32) xa[XA_TEXT]; |
3583 | *target++ = xa[XA_TEXT]; |
3424 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3584 | *target++ = xa[XA_COMPOUND_TEXT]; |
3425 | #if X_HAVE_UTF8_STRING |
3585 | #if X_HAVE_UTF8_STRING |
3426 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3586 | *target++ = xa[XA_UTF8_STRING]; |
3427 | #endif |
3587 | #endif |
3428 | |
3588 | |
3429 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3589 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3430 | (8 * sizeof (target_list[0])), PropModeReplace, |
3590 | 32, PropModeReplace, |
3431 | (unsigned char *)target_list, |
3591 | (unsigned char *)target_list, target - target_list); |
3432 | target - target_list); |
|
|
3433 | ev.property = rq.property; |
3592 | ev.property = rq.property; |
3434 | } |
3593 | } |
|
|
3594 | #if TODO // TODO |
3435 | else if (rq.target == xa[XA_MULTIPLE]) |
3595 | else if (rq.target == xa[XA_MULTIPLE]) |
3436 | { |
3596 | { |
3437 | /* TODO: Handle MULTIPLE */ |
3597 | /* TODO: Handle MULTIPLE */ |
3438 | } |
3598 | } |
|
|
3599 | #endif |
3439 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3600 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3440 | { |
3601 | { |
3441 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3602 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3442 | (8 * sizeof (Time)), PropModeReplace, |
|
|
3443 | (unsigned char *)&selection_time, 1); |
3603 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3444 | ev.property = rq.property; |
3604 | ev.property = rq.property; |
3445 | } |
3605 | } |
3446 | else if (rq.target == XA_STRING |
3606 | else if (rq.target == XA_STRING |
3447 | || rq.target == xa[XA_TEXT] |
3607 | || rq.target == xa[XA_TEXT] |
3448 | || rq.target == xa[XA_COMPOUND_TEXT] |
3608 | || rq.target == xa[XA_COMPOUND_TEXT] |
3449 | || rq.target == xa[XA_UTF8_STRING] |
3609 | || rq.target == xa[XA_UTF8_STRING] |
3450 | ) |
3610 | ) |
3451 | { |
3611 | { |
|
|
3612 | XTextProperty ct; |
|
|
3613 | Atom target = rq.target; |
3452 | short freect = 0; |
3614 | short freect = 0; |
3453 | int selectlen; |
3615 | int selectlen; |
3454 | wchar_t *cl; |
3616 | wchar_t *cl; |
3455 | |
3617 | enum { |
3456 | target = rq.target; |
3618 | enc_string = XStringStyle, |
|
|
3619 | enc_text = XStdICCTextStyle, |
|
|
3620 | enc_compound_text = XCompoundTextStyle, |
|
|
3621 | #ifdef X_HAVE_UTF8_STRING |
|
|
3622 | enc_utf8 = XUTF8StringStyle, |
|
|
3623 | #else |
|
|
3624 | enc_utf8 = -1, |
|
|
3625 | #endif |
|
|
3626 | } style; |
3457 | |
3627 | |
3458 | if (target == XA_STRING) |
3628 | if (target == XA_STRING) |
3459 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3629 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3460 | // will ask for another format anyways. |
3630 | // will ask for another format anyways. |
3461 | style = XStringStyle; |
3631 | style = enc_string; |
3462 | else if (target == xa[XA_TEXT]) |
3632 | else if (target == xa[XA_TEXT]) |
3463 | style = XStdICCTextStyle; |
3633 | style = enc_text; |
3464 | else if (target == xa[XA_COMPOUND_TEXT]) |
3634 | else if (target == xa[XA_COMPOUND_TEXT]) |
3465 | style = XCompoundTextStyle; |
3635 | style = enc_compound_text; |
3466 | #if X_HAVE_UTF8_STRING |
3636 | #if ENABLE_FRILLS |
3467 | else if (target == xa[XA_UTF8_STRING]) |
3637 | else if (target == xa[XA_UTF8_STRING]) |
3468 | style = XUTF8StringStyle; |
3638 | style = enc_utf8; |
3469 | #endif |
3639 | #endif |
3470 | else |
3640 | else |
3471 | { |
3641 | { |
3472 | target = xa[XA_COMPOUND_TEXT]; |
3642 | target = xa[XA_COMPOUND_TEXT]; |
3473 | style = XCompoundTextStyle; |
3643 | style = enc_compound_text; |
3474 | } |
3644 | } |
3475 | |
3645 | |
3476 | if (selection.text) |
3646 | if (selection.text) |
3477 | { |
3647 | { |
3478 | cl = selection.text; |
3648 | cl = selection.text; |
… | |
… | |
3482 | { |
3652 | { |
3483 | cl = L""; |
3653 | cl = L""; |
3484 | selectlen = 0; |
3654 | selectlen = 0; |
3485 | } |
3655 | } |
3486 | |
3656 | |
3487 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
3657 | #if ENABLE_FRILLS |
3488 | // manually for XUTF8StringStyle. |
3658 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
3659 | // so recode it manually |
|
|
3660 | if (style == enc_utf8) |
|
|
3661 | { |
|
|
3662 | freect = 1; |
|
|
3663 | ct.encoding = target; |
|
|
3664 | ct.format = 8; |
|
|
3665 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
|
|
3666 | ct.nitems = strlen ((char *)ct.value); |
|
|
3667 | } |
|
|
3668 | else |
|
|
3669 | #endif |
3489 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3670 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3490 | freect = 1; |
3671 | freect = 1; |
3491 | else |
3672 | else |
3492 | { |
3673 | { |
3493 | /* if we failed to convert then send it raw */ |
3674 | /* if we failed to convert then send it raw */ |
3494 | ct.value = (unsigned char *)cl; |
3675 | ct.value = (unsigned char *)cl; |
3495 | ct.nitems = selectlen; |
3676 | ct.nitems = selectlen; |
|
|
3677 | ct.encoding = target; |
3496 | } |
3678 | } |
3497 | |
3679 | |
3498 | XChangeProperty (display->display, rq.requestor, rq.property, |
3680 | XChangeProperty (disp, rq.requestor, rq.property, |
3499 | target, 8, PropModeReplace, |
3681 | ct.encoding, 8, PropModeReplace, |
3500 | ct.value, (int)ct.nitems); |
3682 | ct.value, (int)ct.nitems); |
3501 | ev.property = rq.property; |
3683 | ev.property = rq.property; |
3502 | |
3684 | |
3503 | if (freect) |
3685 | if (freect) |
3504 | XFree (ct.value); |
3686 | XFree (ct.value); |
3505 | } |
3687 | } |
3506 | |
3688 | |
3507 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3689 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3508 | } |
3690 | } |
3509 | |
3691 | |
3510 | /* ------------------------------------------------------------------------- * |
3692 | /* ------------------------------------------------------------------------- * |
3511 | * MOUSE ROUTINES * |
3693 | * MOUSE ROUTINES * |
3512 | * ------------------------------------------------------------------------- */ |
3694 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3524 | } |
3706 | } |
3525 | |
3707 | |
3526 | /* ------------------------------------------------------------------------- */ |
3708 | /* ------------------------------------------------------------------------- */ |
3527 | #ifdef USE_XIM |
3709 | #ifdef USE_XIM |
3528 | void |
3710 | void |
3529 | rxvt_term::im_set_position (XPoint *pos) |
3711 | rxvt_term::im_set_position (XPoint &pos) |
3530 | { |
3712 | { |
3531 | XWindowAttributes xwa; |
3713 | XWindowAttributes xwa; |
3532 | |
3714 | |
3533 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3715 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
|
|
3716 | |
3534 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3717 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3535 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3718 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3536 | } |
3719 | } |
3537 | |
|
|
3538 | #endif |
3720 | #endif |
|
|
3721 | |
|
|
3722 | #if ENABLE_OVERLAY |
|
|
3723 | void |
|
|
3724 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
|
|
3725 | { |
|
|
3726 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
|
|
3727 | return; |
|
|
3728 | |
|
|
3729 | want_refresh = 1; |
|
|
3730 | |
|
|
3731 | scr_overlay_off (); |
|
|
3732 | |
|
|
3733 | if (x < 0) x = TermWin.ncol - w; |
|
|
3734 | if (y < 0) y = TermWin.nrow - h; |
|
|
3735 | |
|
|
3736 | // make space for border |
|
|
3737 | w += 2; MIN_IT (w, TermWin.ncol); |
|
|
3738 | h += 2; MIN_IT (h, TermWin.nrow); |
|
|
3739 | |
|
|
3740 | x -= 1; MAX_IT (x, 0); |
|
|
3741 | y -= 1; MAX_IT (y, 0); |
|
|
3742 | |
|
|
3743 | MIN_IT (x, TermWin.ncol - w); |
|
|
3744 | MIN_IT (y, TermWin.nrow - h); |
|
|
3745 | |
|
|
3746 | ov_x = x; ov_y = y; |
|
|
3747 | ov_w = w; ov_h = h; |
|
|
3748 | |
|
|
3749 | ov_text = new text_t *[h]; |
|
|
3750 | ov_rend = new rend_t *[h]; |
|
|
3751 | |
|
|
3752 | for (y = 0; y < h; y++) |
|
|
3753 | { |
|
|
3754 | text_t *tp = ov_text[y] = new text_t[w]; |
|
|
3755 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
|
|
3756 | |
|
|
3757 | text_t t0, t1, t2; |
|
|
3758 | rend_t r = OVERLAY_RSTYLE; |
|
|
3759 | |
|
|
3760 | if (y == 0) |
|
|
3761 | t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; |
|
|
3762 | else if (y < h - 1) |
|
|
3763 | t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; |
|
|
3764 | else |
|
|
3765 | t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; |
|
|
3766 | |
|
|
3767 | *tp++ = t0; |
|
|
3768 | *rp++ = r; |
|
|
3769 | |
|
|
3770 | for (x = w - 2; x > 0; --x) |
|
|
3771 | { |
|
|
3772 | *tp++ = t1; |
|
|
3773 | *rp++ = r; |
|
|
3774 | } |
|
|
3775 | |
|
|
3776 | *tp = t2; |
|
|
3777 | *rp = r; |
|
|
3778 | } |
|
|
3779 | } |
|
|
3780 | |
|
|
3781 | void |
|
|
3782 | rxvt_term::scr_overlay_off () |
|
|
3783 | { |
|
|
3784 | if (!ov_text) |
|
|
3785 | return; |
|
|
3786 | |
|
|
3787 | want_refresh = 1; |
|
|
3788 | |
|
|
3789 | for (int y = 0; y < ov_h; y++) |
|
|
3790 | { |
|
|
3791 | delete [] ov_text[y]; |
|
|
3792 | delete [] ov_rend[y]; |
|
|
3793 | } |
|
|
3794 | |
|
|
3795 | delete [] ov_text; ov_text = 0; |
|
|
3796 | delete [] ov_rend; ov_rend = 0; |
|
|
3797 | } |
|
|
3798 | |
|
|
3799 | void |
|
|
3800 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
|
|
3801 | { |
|
|
3802 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
|
|
3803 | return; |
|
|
3804 | |
|
|
3805 | x++, y++; |
|
|
3806 | |
|
|
3807 | ov_text[y][x] = text; |
|
|
3808 | ov_rend[y][x] = rend; |
|
|
3809 | } |
|
|
3810 | |
|
|
3811 | void |
|
|
3812 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
|
|
3813 | { |
|
|
3814 | while (*s) |
|
|
3815 | scr_overlay_set (x++, y, *s++); |
|
|
3816 | } |
|
|
3817 | |
|
|
3818 | void |
|
|
3819 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3820 | { |
|
|
3821 | while (*s) |
|
|
3822 | { |
|
|
3823 | text_t t = *s++; |
|
|
3824 | int width = wcwidth (t); |
|
|
3825 | |
|
|
3826 | while (width--) |
|
|
3827 | { |
|
|
3828 | scr_overlay_set (x++, y, t); |
|
|
3829 | t = NOCHAR; |
|
|
3830 | } |
|
|
3831 | } |
|
|
3832 | } |
|
|
3833 | |
|
|
3834 | void |
|
|
3835 | rxvt_term::scr_swap_overlay () |
|
|
3836 | { |
|
|
3837 | if (!ov_text) |
|
|
3838 | return; |
|
|
3839 | |
|
|
3840 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3841 | |
|
|
3842 | // swap screen mem with overlay |
|
|
3843 | for (int y = ov_h; y--; ) |
|
|
3844 | { |
|
|
3845 | text_t *t1 = ov_text[y]; |
|
|
3846 | rend_t *r1 = ov_rend[y]; |
|
|
3847 | |
|
|
3848 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
|
|
3849 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
|
|
3850 | |
|
|
3851 | for (int x = ov_w; x--; ) |
|
|
3852 | { |
|
|
3853 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
|
|
3854 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
|
|
3855 | } |
|
|
3856 | } |
|
|
3857 | } |
|
|
3858 | |
|
|
3859 | #endif |
3539 | /* ------------------------------------------------------------------------- */ |
3860 | /* ------------------------------------------------------------------------- */ |