1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
… | |
… | |
29 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvt.h" /* NECESSARY */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
31 | |
31 | |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
33 | |
33 | |
34 | #include <stdint.h> |
34 | #include <inttypes.h> |
35 | #include <wchar.h> |
35 | #include <wchar.h> |
36 | |
36 | |
37 | #include "salloc.C" // HACK, should be a seperate compile! |
37 | #include "salloc.C" // HACK, should be a seperate compile! |
38 | |
38 | |
39 | inline void fill_text (text_t *start, text_t value, int len) |
39 | inline void fill_text (text_t *start, text_t value, int len) |
… | |
… | |
48 | |
48 | |
49 | /* ------------------------------------------------------------------------- * |
49 | /* ------------------------------------------------------------------------- * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
51 | * ------------------------------------------------------------------------- */ |
51 | * ------------------------------------------------------------------------- */ |
52 | #define ZERO_SCROLLBACK() \ |
52 | #define ZERO_SCROLLBACK() \ |
53 | if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ |
53 | if (Options & Opt_scrollTtyOutput) \ |
54 | TermWin.view_start = 0 |
54 | TermWin.view_start = 0 |
55 | #define CLEAR_SELECTION() \ |
55 | #define CLEAR_SELECTION() \ |
56 | selection.beg.row = selection.beg.col \ |
56 | selection.beg.row = selection.beg.col \ |
57 | = selection.end.row = selection.end.col = 0 |
57 | = selection.end.row = selection.end.col = 0 |
58 | #define CLEAR_ALL_SELECTION() \ |
58 | #define CLEAR_ALL_SELECTION() \ |
59 | selection.beg.row = selection.beg.col \ |
59 | selection.beg.row = selection.beg.col \ |
60 | = selection.mark.row = selection.mark.col \ |
60 | = selection.mark.row = selection.mark.col \ |
61 | = selection.end.row = selection.end.col = 0 |
61 | = selection.end.row = selection.end.col = 0 |
62 | |
62 | |
63 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
63 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
64 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
64 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
65 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
65 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
66 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
66 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
67 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
67 | #define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ |
68 | (((A) == (C)) && ((B) > (D))) |
68 | (((A) == (C)) && ((B) > (D))) |
69 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
69 | #define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ |
70 | (((A) == (C)) && ((B) >= (D))) |
70 | (((A) == (C)) && ((B) >= (D))) |
71 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
71 | #define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ |
72 | (((A) == (C)) && ((B) < (D))) |
72 | (((A) == (C)) && ((B) < (D))) |
73 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
73 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
74 | (((A) == (C)) && ((B) <= (D))) |
74 | (((A) == (C)) && ((B) <= (D))) |
75 | |
75 | |
76 | /* these must be row_col_t */ |
76 | /* these must be row_col_t */ |
77 | #define ROWCOL_IS_AFTER(X, Y) \ |
77 | #define ROWCOL_IS_AFTER(X, Y) \ |
78 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
78 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
79 | #define ROWCOL_IS_BEFORE(X, Y) \ |
79 | #define ROWCOL_IS_BEFORE(X, Y) \ |
80 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
80 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
81 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
81 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
82 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
83 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
83 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
84 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
85 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
85 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
86 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
86 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
87 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
88 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
88 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
89 | |
89 | |
90 | /* |
90 | /* |
91 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
91 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
92 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
93 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
93 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
94 | */ |
94 | */ |
95 | #define drawBuffer TermWin.vt |
95 | #define drawBuffer TermWin.vt |
96 | |
96 | |
97 | #define CLEAR_ROWS(row, num) \ |
97 | #define CLEAR_ROWS(row, num) \ |
98 | if (TermWin.mapped) \ |
98 | if (TermWin.mapped) \ |
99 | XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ |
99 | XClearArea (display->display, drawBuffer, 0, \ |
100 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
100 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
101 | (unsigned int)Height2Pixel (num), False) |
101 | (unsigned int)Height2Pixel (num), False) |
102 | |
102 | |
103 | #define CLEAR_CHARS(x, y, num) \ |
103 | #define CLEAR_CHARS(x, y, num) \ |
104 | if (TermWin.mapped) \ |
104 | if (TermWin.mapped) \ |
105 | XClearArea (display->display, drawBuffer, x, y, \ |
105 | XClearArea (display->display, drawBuffer, x, y, \ |
106 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Width2Pixel (num), \ |
107 | (unsigned int)Height2Pixel (1), False) |
107 | (unsigned int)Height2Pixel (1), False) |
108 | |
108 | |
109 | #define ERASE_ROWS(row, num) \ |
109 | #define ERASE_ROWS(row, num) \ |
110 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
110 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
111 | TermWin.int_bwidth, Row2Pixel (row), \ |
111 | 0, Row2Pixel (row), \ |
112 | (unsigned int)TermWin.width, \ |
112 | (unsigned int)TermWin.width, \ |
113 | (unsigned int)Height2Pixel (num)) |
113 | (unsigned int)Height2Pixel (num)) |
114 | |
114 | |
115 | /* ------------------------------------------------------------------------- * |
115 | /* ------------------------------------------------------------------------- * |
116 | * SCREEN `COMMON' ROUTINES * |
116 | * SCREEN `COMMON' ROUTINES * |
117 | * ------------------------------------------------------------------------- */ |
117 | * ------------------------------------------------------------------------- */ |
118 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
119 | void |
119 | void |
120 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
121 | { |
121 | { |
122 | efs &= ~RS_baseattrMask; |
122 | efs &= ~RS_baseattrMask; |
123 | efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); |
123 | efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); |
124 | |
124 | |
125 | while (width--) |
125 | while (width--) |
126 | { |
126 | { |
127 | *et++ = ' '; |
127 | *et++ = ' '; |
128 | *er++ = efs; |
128 | *er++ = efs; |
… | |
… | |
189 | } |
189 | } |
190 | |
190 | |
191 | if (prev_nrow == 0) |
191 | if (prev_nrow == 0) |
192 | { |
192 | { |
193 | /* |
193 | /* |
194 | * first time called so just malloc everything : don't rely on realloc |
194 | * 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 |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
196 | */ |
196 | */ |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
… | |
… | |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
257 | |
257 | |
258 | for (p = nrow; p < prev_nrow; p++) |
258 | for (p = nrow; p < prev_nrow; p++) |
259 | { |
259 | { |
260 | q = p + TermWin.saveLines; |
260 | q = p + TermWin.saveLines; |
|
|
261 | |
261 | if (screen.text[q]) |
262 | if (screen.text[q]) |
262 | { |
263 | { |
263 | #ifdef DEBUG_STRICT |
264 | #ifdef DEBUG_STRICT |
264 | assert (screen.rend[q]); |
265 | assert (screen.rend[q]); |
265 | #endif |
266 | #endif |
266 | talloc->free (screen.text[q]); |
267 | talloc->free (screen.text[q]); |
267 | ralloc->free (screen.rend[q]); |
268 | ralloc->free (screen.rend[q]); |
268 | } |
269 | } |
|
|
270 | |
269 | if (swap.text[p]) |
271 | if (swap.text[p]) |
270 | { |
272 | { |
271 | #ifdef DEBUG_STRICT |
273 | #ifdef DEBUG_STRICT |
272 | assert (swap.rend[p]); |
274 | assert (swap.rend[p]); |
273 | #endif |
275 | #endif |
274 | talloc->free (swap.text[p]); |
276 | talloc->free (swap.text[p]); |
275 | ralloc->free (swap.rend[p]); |
277 | ralloc->free (swap.rend[p]); |
276 | } |
278 | } |
|
|
279 | |
277 | #ifdef DEBUG_STRICT |
280 | #ifdef DEBUG_STRICT |
278 | assert (drawn_text[p] && drawn_rend[p]); |
281 | assert (drawn_text[p] && drawn_rend[p]); |
279 | #endif |
282 | #endif |
280 | talloc->free (drawn_text[p]); |
283 | talloc->free (drawn_text[p]); |
281 | ralloc->free (drawn_rend[p]); |
284 | ralloc->free (drawn_rend[p]); |
… | |
… | |
311 | swap.tlen[p] = 0; |
314 | swap.tlen[p] = 0; |
312 | swap.text[p] = NULL; |
315 | swap.text[p] = NULL; |
313 | swap.rend[p] = NULL; |
316 | swap.rend[p] = NULL; |
314 | drawn_text[p] = NULL; |
317 | drawn_text[p] = NULL; |
315 | drawn_rend[p] = NULL; |
318 | drawn_rend[p] = NULL; |
316 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
319 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
317 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
320 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
318 | } |
321 | } |
319 | |
322 | |
320 | if (k > 0) |
323 | if (k > 0) |
321 | { |
324 | { |
… | |
… | |
336 | } |
339 | } |
337 | |
340 | |
338 | /* resize columns */ |
341 | /* resize columns */ |
339 | if (ncol != prev_ncol) |
342 | if (ncol != prev_ncol) |
340 | { |
343 | { |
341 | int common = min (prev_ncol, ncol); |
|
|
342 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
344 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
343 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
345 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
344 | |
346 | |
345 | for (p = 0; p < total_rows; p++) |
347 | for (p = 0; p < total_rows; p++) |
346 | { |
348 | { |
347 | if (screen.text[p]) |
349 | if (screen.text[p]) |
348 | { |
350 | { |
349 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
351 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
350 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
352 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
351 | |
353 | |
352 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
354 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
353 | |
355 | |
354 | if (ncol > prev_ncol) |
356 | if (ncol > prev_ncol) |
355 | scr_blank_line (& (screen.text[p][prev_ncol]), |
357 | scr_blank_line (&screen.text[p][prev_ncol], |
356 | & (screen.rend[p][prev_ncol]), |
358 | &screen.rend[p][prev_ncol], |
357 | ncol - prev_ncol, |
359 | ncol - prev_ncol, setrstyle); |
358 | setrstyle); |
|
|
359 | } |
360 | } |
360 | } |
361 | } |
361 | |
362 | |
362 | for (p = 0; p < nrow; p++) |
363 | for (p = 0; p < nrow; p++) |
363 | { |
364 | { |
364 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
365 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
365 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
366 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
366 | |
367 | |
367 | if (ncol > prev_ncol) |
368 | if (ncol > prev_ncol) |
368 | scr_blank_line (& (drawn_text[p][prev_ncol]), |
369 | scr_blank_line (&drawn_text[p][prev_ncol], |
369 | & (drawn_rend[p][prev_ncol]), |
370 | &drawn_rend[p][prev_ncol], |
370 | ncol - prev_ncol, setrstyle); |
371 | ncol - prev_ncol, setrstyle); |
371 | |
372 | |
372 | if (swap.text[p]) |
373 | if (swap.text[p]) |
373 | { |
374 | { |
374 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
375 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
375 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
376 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
376 | |
377 | |
377 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
378 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
378 | |
379 | |
379 | if (ncol > prev_ncol) |
380 | if (ncol > prev_ncol) |
380 | scr_blank_line (& (swap.text[p][prev_ncol]), |
381 | scr_blank_line (&swap.text[p][prev_ncol], |
381 | & (swap.rend[p][prev_ncol]), |
382 | &swap.rend[p][prev_ncol], |
382 | ncol - prev_ncol, setrstyle); |
383 | ncol - prev_ncol, setrstyle); |
383 | } |
384 | } |
384 | |
385 | |
385 | } |
386 | } |
386 | |
387 | |
… | |
… | |
438 | { |
439 | { |
439 | uint16_t total_rows; |
440 | uint16_t total_rows; |
440 | int i; |
441 | int i; |
441 | |
442 | |
442 | total_rows = TermWin.nrow + TermWin.saveLines; |
443 | total_rows = TermWin.nrow + TermWin.saveLines; |
443 | |
|
|
444 | #ifdef DEBUG_STRICT |
|
|
445 | for (i = 0; i < total_rows; i++) |
|
|
446 | { |
|
|
447 | if (screen.text[i]) |
|
|
448 | /* then so is screen.rend[i] */ |
|
|
449 | assert (screen.rend[i]); |
|
|
450 | } |
|
|
451 | #endif |
|
|
452 | |
444 | |
453 | delete talloc; talloc = 0; |
445 | delete talloc; talloc = 0; |
454 | delete ralloc; ralloc = 0; |
446 | delete ralloc; ralloc = 0; |
455 | |
447 | |
456 | free (screen.text); |
448 | free (screen.text); |
… | |
… | |
485 | |
477 | |
486 | scr_release (); |
478 | scr_release (); |
487 | prev_nrow = prev_ncol = 0; |
479 | prev_nrow = prev_ncol = 0; |
488 | scr_reset (); |
480 | scr_reset (); |
489 | |
481 | |
490 | scr_clear (); |
482 | scr_clear (true); |
491 | scr_refresh (SLOW_REFRESH); |
483 | scr_refresh (SLOW_REFRESH); |
492 | } |
484 | } |
493 | |
485 | |
494 | /* ------------------------------------------------------------------------- * |
486 | /* ------------------------------------------------------------------------- * |
495 | * PROCESS SCREEN COMMANDS * |
487 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
500 | * XTERM_SEQ: Restore cursor: ESC 8 |
492 | * XTERM_SEQ: Restore cursor: ESC 8 |
501 | */ |
493 | */ |
502 | void |
494 | void |
503 | rxvt_term::scr_cursor (int mode) |
495 | rxvt_term::scr_cursor (int mode) |
504 | { |
496 | { |
505 | screen_t *s; |
497 | screen_t *s; |
506 | |
498 | |
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
499 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
508 | |
500 | |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
501 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
510 | if (current_screen == SECONDARY) |
502 | if (current_screen == SECONDARY) |
511 | s = & (swap); |
503 | s = &swap; |
512 | else |
504 | else |
513 | #endif |
505 | #endif |
514 | s = & (screen); |
506 | s = &screen; |
|
|
507 | |
515 | switch (mode) |
508 | switch (mode) |
516 | { |
509 | { |
517 | case SAVE: |
510 | case SAVE: |
518 | s->s_cur.row = s->cur.row; |
511 | s->s_cur.row = s->cur.row; |
519 | s->s_cur.col = s->cur.col; |
512 | s->s_cur.col = s->cur.col; |
520 | s->s_rstyle = rstyle; |
513 | s->s_rstyle = rstyle; |
521 | s->s_charset = s->charset; |
514 | s->s_charset = s->charset; |
522 | s->s_charset_char = charsets[s->charset]; |
515 | s->s_charset_char = charsets[s->charset]; |
523 | break; |
516 | break; |
|
|
517 | |
524 | case RESTORE: |
518 | case RESTORE: |
525 | want_refresh = 1; |
519 | want_refresh = 1; |
526 | s->cur.row = s->s_cur.row; |
520 | s->cur.row = s->s_cur.row; |
527 | s->cur.col = s->s_cur.col; |
521 | s->cur.col = s->s_cur.col; |
528 | s->flags &= ~Screen_WrapNext; |
522 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
530 | s->charset = s->s_charset; |
524 | s->charset = s->s_charset; |
531 | charsets[s->charset] = s->s_charset_char; |
525 | charsets[s->charset] = s->s_charset_char; |
532 | set_font_style (); |
526 | set_font_style (); |
533 | break; |
527 | break; |
534 | } |
528 | } |
|
|
529 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
531 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
532 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
538 | #ifdef DEBUG_STRICT |
533 | #ifdef DEBUG_STRICT |
539 | assert (s->cur.row >= 0); |
534 | assert (s->cur.row >= 0); |
… | |
… | |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
546 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
552 | */ |
547 | */ |
553 | int |
548 | int |
554 | rxvt_term::scr_change_screen (int scrn) |
549 | rxvt_term::scr_change_screen (int scrn) |
555 | { |
550 | { |
556 | int i; |
551 | int i; |
557 | #if NSCREENS |
552 | #if NSCREENS |
558 | int offset; |
553 | int offset; |
559 | #endif |
554 | #endif |
560 | |
555 | |
561 | want_refresh = 1; |
556 | want_refresh = 1; |
562 | |
557 | |
563 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
558 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
564 | |
559 | |
565 | TermWin.view_start = 0; |
560 | TermWin.view_start = 0; |
566 | |
561 | |
567 | if (current_screen == scrn) |
562 | if (current_screen == scrn) |
568 | return current_screen; |
563 | return scrn; |
569 | |
564 | |
570 | selection_check (2); /* check for boundary cross */ |
565 | selection_check (2); /* check for boundary cross */ |
571 | |
566 | |
572 | SWAP_IT (current_screen, scrn, int); |
567 | SWAP_IT (current_screen, scrn, int); |
573 | #if NSCREENS |
568 | #if NSCREENS |
|
|
569 | if (Options & Opt_secondaryScreen) |
|
|
570 | { |
574 | num_scr = 0; |
571 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
572 | offset = TermWin.saveLines; |
576 | for (i = prev_nrow; i--;) |
573 | for (i = prev_nrow; i--;) |
577 | { |
574 | { |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
575 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
576 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
577 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
581 | } |
578 | } |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
579 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
580 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
584 | # ifdef DEBUG_STRICT |
581 | # ifdef DEBUG_STRICT |
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
582 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
583 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
587 | # else /* drive with your eyes closed */ |
584 | # else /* drive with your eyes closed */ |
588 | MAX_IT (screen.cur.row, 0); |
585 | MAX_IT (screen.cur.row, 0); |
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
586 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
590 | MAX_IT (screen.cur.col, 0); |
587 | MAX_IT (screen.cur.col, 0); |
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
588 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
592 | # endif |
589 | # endif |
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
590 | SWAP_IT (screen.charset, swap.charset, int16_t); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
591 | SWAP_IT (screen.flags, swap.flags, int); |
595 | screen.flags |= Screen_VisibleCursor; |
592 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
593 | swap.flags |= Screen_VisibleCursor; |
597 | #else |
594 | } |
598 | # ifdef SCROLL_ON_NO_SECONDARY |
595 | else |
|
|
596 | #endif |
|
|
597 | if (Options & Opt_secondaryScroll) |
599 | if (current_screen == PRIMARY) |
598 | //if (current_screen == PRIMARY) |
600 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
599 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
601 | # endif |
|
|
602 | #endif |
|
|
603 | return scrn; |
600 | return scrn; |
604 | } |
601 | } |
605 | |
602 | |
606 | /* ------------------------------------------------------------------------- */ |
603 | /* ------------------------------------------------------------------------- */ |
607 | /* |
604 | /* |
… | |
… | |
649 | return 0; |
646 | return 0; |
650 | |
647 | |
651 | want_refresh = 1; |
648 | want_refresh = 1; |
652 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
649 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
653 | |
650 | |
654 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
651 | if (row1 == 0 && count > 0 |
|
|
652 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
655 | { |
653 | { |
656 | nscrolled = (long)TermWin.nscrolled + (long)count; |
654 | nscrolled = (long)TermWin.nscrolled + (long)count; |
657 | |
655 | |
658 | if (nscrolled > (long)TermWin.saveLines) |
656 | if (nscrolled > (long)TermWin.saveLines) |
659 | TermWin.nscrolled = TermWin.saveLines; |
657 | TermWin.nscrolled = TermWin.saveLines; |
… | |
… | |
707 | if (j > 0) |
705 | if (j > 0) |
708 | { |
706 | { |
709 | /* A: scroll up */ |
707 | /* A: scroll up */ |
710 | |
708 | |
711 | /* A1: Copy lines that will get clobbered by the rotation */ |
709 | /* A1: Copy lines that will get clobbered by the rotation */ |
|
|
710 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
711 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
712 | |
|
|
713 | /* A2: Rotate lines */ |
|
|
714 | i = row2 - row1 - count + 1; |
|
|
715 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
716 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
717 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
718 | |
|
|
719 | j = row2 - count + 1, i = count; |
|
|
720 | } |
|
|
721 | else /* if (j < 0) */ |
|
|
722 | { |
|
|
723 | /* B: scroll down */ |
|
|
724 | |
|
|
725 | /* B1: Copy lines that will get clobbered by the rotation */ |
712 | for (i = 0, j = row1; i < count; i++, j++) |
726 | for (i = 0, j = row2; i < count; i++, j--) |
713 | { |
727 | { |
714 | buf_text[i] = screen.text[j]; |
728 | buf_text[i] = screen.text[j]; |
715 | buf_rend[i] = screen.rend[j]; |
729 | buf_rend[i] = screen.rend[j]; |
716 | } |
730 | } |
|
|
731 | |
717 | /* A2: Rotate lines */ |
732 | /* B2: Rotate lines */ |
718 | for (j = row1, i = j + count; i <= row2; i++, j++) |
733 | for (j = row2, i = j - count; i >= row1; i--, j--) |
719 | { |
734 | { |
720 | screen.tlen[j] = screen.tlen[i]; |
735 | screen.tlen[j] = screen.tlen[i]; |
721 | screen.text[j] = screen.text[i]; |
736 | screen.text[j] = screen.text[i]; |
722 | screen.rend[j] = screen.rend[i]; |
737 | screen.rend[j] = screen.rend[i]; |
723 | } |
738 | } |
724 | j = row2 - count + 1, i = count; |
|
|
725 | } |
|
|
726 | else /* if (j < 0) */ |
|
|
727 | { |
|
|
728 | /* B: scroll down */ |
|
|
729 | |
739 | |
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 | /* B2: Rotate lines */ |
|
|
737 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
738 | { |
|
|
739 | screen.tlen[j] = screen.tlen[i]; |
|
|
740 | screen.text[j] = screen.text[i]; |
|
|
741 | screen.rend[j] = screen.rend[i]; |
|
|
742 | } |
|
|
743 | j = row1, i = count; |
740 | j = row1, i = count; |
744 | count = -count; |
741 | count = -count; |
745 | } |
742 | } |
746 | |
743 | |
747 | /* C: Resurrect lines */ |
744 | /* C: Resurrect lines */ |
|
|
745 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
746 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
|
|
747 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
748 | if (!spec) /* line length may not equal TermWin.ncol */ |
748 | for (; i--; j++) |
749 | for (; i--; j++) |
749 | { |
|
|
750 | screen.tlen[j] = 0; |
|
|
751 | screen.text[j] = buf_text[i]; |
|
|
752 | screen.rend[j] = buf_rend[i]; |
|
|
753 | |
|
|
754 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
755 | scr_blank_screen_mem (screen.text, screen.rend, |
750 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
756 | (unsigned int)j, rstyle); |
|
|
757 | } |
|
|
758 | |
751 | |
759 | return count; |
752 | return count; |
760 | } |
753 | } |
761 | |
754 | |
762 | /* ------------------------------------------------------------------------- */ |
755 | /* ------------------------------------------------------------------------- */ |
763 | /* |
756 | /* |
764 | * Add text given in <str> of length <len> to screen struct |
757 | * Add text given in <str> of length <len> to screen struct |
765 | */ |
758 | */ |
766 | void |
759 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
760 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | { |
761 | { |
769 | unsigned char checksel, clearsel; |
762 | unsigned char checksel, clearsel; |
770 | uint32_t c; |
763 | unicode_t c; |
771 | int i, row, last_col; |
764 | int i, row, last_col; |
772 | text_t *stp; |
765 | text_t *stp; |
773 | rend_t *srp; |
766 | rend_t *srp; |
774 | |
767 | |
775 | if (len <= 0) /* sanity */ |
768 | if (len <= 0) /* sanity */ |
… | |
… | |
780 | |
773 | |
781 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
774 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
782 | ZERO_SCROLLBACK (); |
775 | ZERO_SCROLLBACK (); |
783 | if (nlines > 0) |
776 | if (nlines > 0) |
784 | { |
777 | { |
785 | nlines += (screen.cur.row - screen.bscroll); |
778 | nlines += screen.cur.row - screen.bscroll; |
786 | if ((nlines > 0) |
779 | if ((nlines > 0) |
787 | && (screen.tscroll == 0) |
780 | && (screen.tscroll == 0) |
788 | && (screen.bscroll == (TermWin.nrow - 1))) |
781 | && (screen.bscroll == (TermWin.nrow - 1))) |
789 | { |
782 | { |
790 | /* _at least_ this many lines need to be scrolled */ |
783 | /* _at least_ this many lines need to be scrolled */ |
… | |
… | |
793 | } |
786 | } |
794 | } |
787 | } |
795 | #ifdef DEBUG_STRICT |
788 | #ifdef DEBUG_STRICT |
796 | assert (screen.cur.col < last_col); |
789 | assert (screen.cur.col < last_col); |
797 | assert ((screen.cur.row < TermWin.nrow) |
790 | assert ((screen.cur.row < TermWin.nrow) |
798 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
791 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
799 | #else /* drive with your eyes closed */ |
792 | #else /* drive with your eyes closed */ |
800 | MIN_IT (screen.cur.col, last_col - 1); |
793 | MIN_IT (screen.cur.col, last_col - 1); |
801 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
794 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
802 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
795 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
803 | #endif |
796 | #endif |
804 | row = screen.cur.row + TermWin.saveLines; |
797 | row = screen.cur.row + TermWin.saveLines; |
805 | |
798 | |
806 | checksel = (selection.op |
799 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | && current_screen == selection.screen) ? 1 : 0; |
|
|
808 | clearsel = 0; |
800 | clearsel = 0; |
809 | |
801 | |
810 | stp = screen.text[row]; |
802 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
803 | srp = screen.rend[row]; |
812 | |
804 | |
813 | for (i = 0; i < len;) |
805 | while (len--) |
814 | { |
806 | { |
815 | c = str[i++]; |
807 | c = *str++; |
|
|
808 | |
|
|
809 | if (c < 0x20) |
816 | switch (c) |
810 | switch (c) |
817 | { |
811 | { |
818 | case '\t': |
812 | case C0_HT: |
819 | scr_tab (1); |
813 | scr_tab (1); |
820 | continue; |
814 | continue; |
821 | case '\n': |
815 | |
|
|
816 | case C0_LF: |
822 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
817 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
823 | MAX_IT (screen.tlen[row], screen.cur.col); |
818 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
819 | |
824 | screen.flags &= ~Screen_WrapNext; |
820 | screen.flags &= ~Screen_WrapNext; |
|
|
821 | |
825 | if (screen.cur.row == screen.bscroll) |
822 | if (screen.cur.row == screen.bscroll) |
826 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
823 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
827 | else if (screen.cur.row < (TermWin.nrow - 1)) |
824 | else if (screen.cur.row < (TermWin.nrow - 1)) |
828 | row = (++screen.cur.row) + TermWin.saveLines; |
825 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
826 | |
829 | stp = screen.text[row]; /* _must_ refresh */ |
827 | stp = screen.text[row]; /* _must_ refresh */ |
830 | srp = screen.rend[row]; /* _must_ refresh */ |
828 | srp = screen.rend[row]; /* _must_ refresh */ |
831 | continue; |
829 | continue; |
832 | case '\r': |
830 | |
|
|
831 | case C0_CR: |
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
832 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
833 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
834 | |
835 | screen.flags &= ~Screen_WrapNext; |
835 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
836 | screen.cur.col = 0; |
837 | continue; |
837 | continue; |
838 | default: |
|
|
839 | if (c == 127) |
|
|
840 | continue; /* yummmm..... */ |
|
|
841 | break; |
|
|
842 | } |
838 | } |
843 | |
839 | |
844 | if (checksel /* see if we're writing within selection */ |
840 | if (checksel /* see if we're writing within selection */ |
845 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
841 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
842 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | { |
843 | { |
… | |
… | |
864 | } |
860 | } |
865 | |
861 | |
866 | if (screen.flags & Screen_Insert) |
862 | if (screen.flags & Screen_Insert) |
867 | scr_insdel_chars (1, INSERT); |
863 | scr_insdel_chars (1, INSERT); |
868 | |
864 | |
869 | if (IS_COMPOSE (c)) |
|
|
870 | c = REPLACEMENT_CHAR; |
|
|
871 | |
|
|
872 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
865 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
873 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
866 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
874 | // characters have width -1 (DOH!) on gnu/linux sometimes. |
867 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
875 | int width = c < 256 ? 1 : wcwidth (c); |
868 | int width = c < 0x100 ? 1 : wcwidth (c); |
876 | |
869 | |
877 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
870 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
878 | switch (c) |
|
|
879 | { |
871 | { |
880 | // vt100 special graphics and line drawing |
872 | // vt100 special graphics and line drawing |
881 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
873 | static uint16_t vt100_0[32] = { // 5f .. 7e |
882 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
874 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
883 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
875 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
884 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
876 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
885 | case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; |
877 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
886 | case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; |
|
|
887 | case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; |
|
|
888 | case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; |
|
|
889 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
|
|
890 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
|
|
891 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
892 | } |
878 | }; |
|
|
879 | |
|
|
880 | if (c >= 0x5f && c <= 0x7e) |
|
|
881 | { |
|
|
882 | c = vt100_0[c - 0x5f]; |
|
|
883 | width = 1; |
|
|
884 | } |
893 | |
885 | } |
894 | |
886 | |
895 | if (width > 0) |
887 | if (width != 0) |
896 | { |
888 | { |
897 | #if !UNICODE_3 |
889 | #if !UNICODE_3 && ENABLE_COMBINING |
898 | // trim characters we can't store directly :( |
890 | // trim characters we can't store directly :( |
899 | if (c >= 0x10000) |
891 | if (c >= 0x10000) |
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
892 | c = rxvt_composite.compose (c); // map to lower 16 bits |
901 | #endif |
893 | #endif |
902 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
894 | bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
|
|
895 | rend_t rend = SET_FONT (rstyle, |
|
|
896 | c > 0x7f || bold || c < 0x20 |
|
|
897 | ? TermWin.fontset->find_font (c, bold) |
|
|
898 | : TermWin.ascii_map [c - 0x20]); |
903 | |
899 | |
904 | do |
900 | do |
905 | { |
901 | { |
906 | stp[screen.cur.col] = c; |
902 | stp[screen.cur.col] = c; |
907 | srp[screen.cur.col] = rend; |
903 | srp[screen.cur.col] = rend; |
… | |
… | |
927 | srp[c] = rend; |
923 | srp[c] = rend; |
928 | } |
924 | } |
929 | } |
925 | } |
930 | else if (width == 0) |
926 | else if (width == 0) |
931 | { |
927 | { |
932 | #if ENCODING_COMPOSE |
928 | #if ENABLE_COMBINING |
933 | // handle combining characters |
929 | // handle combining characters |
934 | // we just tag the accent on the previous on-screen character. |
930 | // we just tag the accent on the previous on-screen character. |
935 | // this is arguably not correct, but also arguably not wrong. |
931 | // this is arguably not correct, but also arguably not wrong. |
936 | // we don't handle double-width characters nicely yet. |
932 | // we don't handle double-width characters nicely yet. |
937 | |
933 | |
… | |
… | |
955 | // handle double-width-chars by making them look extremely ugly |
951 | // handle double-width-chars by making them look extremely ugly |
956 | if (*tp == NOCHAR) |
952 | if (*tp == NOCHAR) |
957 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
953 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
958 | |
954 | |
959 | // first try to find a precomposed character |
955 | // first try to find a precomposed character |
960 | uint32_t n = rxvt_compose (*tp, c); |
956 | unicode_t n = rxvt_compose (*tp, c); |
961 | if (n == NOCHAR) |
957 | if (n == NOCHAR) |
962 | n = rxvt_composite.compose (*tp, c); |
958 | n = rxvt_composite.compose (*tp, c); |
963 | |
959 | |
964 | *tp = n; |
960 | *tp = n; |
965 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
961 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
… | |
… | |
992 | */ |
988 | */ |
993 | void |
989 | void |
994 | rxvt_term::scr_backspace () |
990 | rxvt_term::scr_backspace () |
995 | { |
991 | { |
996 | want_refresh = 1; |
992 | want_refresh = 1; |
|
|
993 | |
997 | if (screen.cur.col == 0) |
994 | if (screen.cur.col == 0) |
998 | { |
995 | { |
999 | if (screen.cur.row > 0) |
996 | if (screen.cur.row > 0) |
1000 | { |
997 | { |
1001 | #ifdef TERMCAP_HAS_BW |
998 | #ifdef TERMCAP_HAS_BW |
… | |
… | |
1006 | |
1003 | |
1007 | } |
1004 | } |
1008 | } |
1005 | } |
1009 | else if ((screen.flags & Screen_WrapNext) == 0) |
1006 | else if ((screen.flags & Screen_WrapNext) == 0) |
1010 | scr_gotorc (0, -1, RELATIVE); |
1007 | scr_gotorc (0, -1, RELATIVE); |
|
|
1008 | |
1011 | screen.flags &= ~Screen_WrapNext; |
1009 | screen.flags &= ~Screen_WrapNext; |
1012 | } |
1010 | } |
1013 | |
1011 | |
1014 | /* ------------------------------------------------------------------------- */ |
1012 | /* ------------------------------------------------------------------------- */ |
1015 | /* |
1013 | /* |
… | |
… | |
1018 | * XTERM_SEQ: CTRL-I |
1016 | * XTERM_SEQ: CTRL-I |
1019 | */ |
1017 | */ |
1020 | void |
1018 | void |
1021 | rxvt_term::scr_tab (int count) |
1019 | rxvt_term::scr_tab (int count) |
1022 | { |
1020 | { |
1023 | int i, x; |
1021 | int i, x; |
1024 | |
1022 | |
1025 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1023 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1026 | want_refresh = 1; |
1024 | want_refresh = 1; |
1027 | i = x = screen.cur.col; |
1025 | i = x = screen.cur.col; |
|
|
1026 | |
1028 | if (count == 0) |
1027 | if (count == 0) |
1029 | return; |
1028 | return; |
1030 | else if (count > 0) |
1029 | else if (count > 0) |
1031 | { |
1030 | { |
1032 | for (; ++i < TermWin.ncol; ) |
1031 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
1034 | { |
1033 | { |
1035 | x = i; |
1034 | x = i; |
1036 | if (!--count) |
1035 | if (!--count) |
1037 | break; |
1036 | break; |
1038 | } |
1037 | } |
|
|
1038 | |
1039 | if (count) |
1039 | if (count) |
1040 | x = TermWin.ncol - 1; |
1040 | x = TermWin.ncol - 1; |
1041 | } |
1041 | } |
1042 | else /* if (count < 0) */ |
1042 | else /* if (count < 0) */ |
1043 | { |
1043 | { |
… | |
… | |
1046 | { |
1046 | { |
1047 | x = i; |
1047 | x = i; |
1048 | if (!++count) |
1048 | if (!++count) |
1049 | break; |
1049 | break; |
1050 | } |
1050 | } |
|
|
1051 | |
1051 | if (count) |
1052 | if (count) |
1052 | x = 0; |
1053 | x = 0; |
1053 | } |
1054 | } |
|
|
1055 | |
1054 | if (x != screen.cur.col) |
1056 | if (x != screen.cur.col) |
1055 | scr_gotorc (0, x, R_RELATIVE); |
1057 | scr_gotorc (0, x, R_RELATIVE); |
1056 | } |
1058 | } |
1057 | |
1059 | |
1058 | /* ------------------------------------------------------------------------- */ |
1060 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1115 | want_refresh = 1; |
1117 | want_refresh = 1; |
1116 | ZERO_SCROLLBACK (); |
1118 | ZERO_SCROLLBACK (); |
1117 | |
1119 | |
1118 | 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)); |
1120 | 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)); |
1119 | |
1121 | |
1120 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1122 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1121 | : col); |
|
|
1122 | MAX_IT (screen.cur.col, 0); |
1123 | MAX_IT (screen.cur.col, 0); |
1123 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1124 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1124 | |
1125 | |
1125 | screen.flags &= ~Screen_WrapNext; |
1126 | screen.flags &= ~Screen_WrapNext; |
1126 | if (relative & R_RELATIVE) |
1127 | if (relative & R_RELATIVE) |
… | |
… | |
1165 | * direction should be UP or DN |
1166 | * direction should be UP or DN |
1166 | */ |
1167 | */ |
1167 | void |
1168 | void |
1168 | rxvt_term::scr_index (enum page_dirn direction) |
1169 | rxvt_term::scr_index (enum page_dirn direction) |
1169 | { |
1170 | { |
1170 | int dirn; |
1171 | int dirn; |
1171 | |
1172 | |
1172 | want_refresh = 1; |
1173 | want_refresh = 1; |
1173 | dirn = ((direction == UP) ? 1 : -1); |
1174 | dirn = ((direction == UP) ? 1 : -1); |
1174 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1175 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1175 | |
1176 | |
… | |
… | |
1235 | default: |
1236 | default: |
1236 | return; |
1237 | return; |
1237 | } |
1238 | } |
1238 | |
1239 | |
1239 | if (screen.text[row]) |
1240 | if (screen.text[row]) |
1240 | scr_blank_line (& (screen.text[row][col]), |
1241 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1241 | & (screen.rend[row][col]), num, rstyle); |
|
|
1242 | else |
1242 | else |
1243 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1243 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1244 | } |
1244 | } |
1245 | |
1245 | |
1246 | /* ------------------------------------------------------------------------- */ |
1246 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1251 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1251 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1252 | */ |
1252 | */ |
1253 | void |
1253 | void |
1254 | rxvt_term::scr_erase_screen (int mode) |
1254 | rxvt_term::scr_erase_screen (int mode) |
1255 | { |
1255 | { |
1256 | int num; |
1256 | int num; |
1257 | int32_t row, row_offset; |
1257 | int32_t row, row_offset; |
1258 | rend_t ren; |
1258 | rend_t ren; |
1259 | XGCValues gcvalue; |
1259 | XGCValues gcvalue; |
1260 | |
1260 | |
1261 | want_refresh = 1; |
1261 | want_refresh = 1; |
1262 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1262 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1263 | ZERO_SCROLLBACK (); |
1263 | ZERO_SCROLLBACK (); |
1264 | row_offset = (int32_t)TermWin.saveLines; |
1264 | row_offset = (int32_t)TermWin.saveLines; |
… | |
… | |
1283 | num = TermWin.nrow; |
1283 | num = TermWin.nrow; |
1284 | break; |
1284 | break; |
1285 | default: |
1285 | default: |
1286 | return; |
1286 | return; |
1287 | } |
1287 | } |
1288 | refresh_type |= REFRESH_BOUNDS; |
1288 | |
1289 | if (selection.op && current_screen == selection.screen |
1289 | if (selection.op && current_screen == selection.screen |
1290 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1290 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1291 | || (selection.end.row >= row |
1291 | || (selection.end.row >= row |
1292 | && selection.end.row <= row + num))) |
1292 | && selection.end.row <= row + num))) |
1293 | CLEAR_SELECTION (); |
1293 | CLEAR_SELECTION (); |
|
|
1294 | |
1294 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1295 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1295 | return; |
1296 | return; |
|
|
1297 | |
1296 | MIN_IT (num, (TermWin.nrow - row)); |
1298 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1299 | |
1297 | if (rstyle & (RS_RVid | RS_Uline)) |
1300 | if (rstyle & (RS_RVid | RS_Uline)) |
1298 | ren = (rend_t) ~RS_None; |
1301 | ren = (rend_t) ~RS_None; |
1299 | else if (GET_BASEBG (rstyle) == Color_bg) |
1302 | else if (GET_BASEBG (rstyle) == Color_bg) |
1300 | { |
1303 | { |
1301 | ren = DEFAULT_RSTYLE; |
1304 | ren = DEFAULT_RSTYLE; |
… | |
… | |
1308 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1311 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1309 | ERASE_ROWS (row, num); |
1312 | ERASE_ROWS (row, num); |
1310 | gcvalue.foreground = PixColors[Color_fg]; |
1313 | gcvalue.foreground = PixColors[Color_fg]; |
1311 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1314 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1312 | } |
1315 | } |
|
|
1316 | |
1313 | for (; num--; row++) |
1317 | for (; num--; row++) |
1314 | { |
1318 | { |
1315 | scr_blank_screen_mem (screen.text, screen.rend, |
1319 | scr_blank_screen_mem (screen.text, screen.rend, |
1316 | (unsigned int) (row + row_offset), rstyle); |
1320 | (unsigned int) (row + row_offset), rstyle); |
1317 | screen.tlen[row + row_offset] = 0; |
1321 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1351 | * Insert/Delete <count> lines |
1355 | * Insert/Delete <count> lines |
1352 | */ |
1356 | */ |
1353 | void |
1357 | void |
1354 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1358 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1355 | { |
1359 | { |
1356 | int end; |
1360 | int end; |
1357 | |
1361 | |
1358 | ZERO_SCROLLBACK (); |
1362 | ZERO_SCROLLBACK (); |
1359 | |
1363 | |
1360 | selection_check (1); |
1364 | selection_check (1); |
1361 | |
1365 | |
… | |
… | |
1380 | * Insert/Delete <count> characters from the current position |
1384 | * Insert/Delete <count> characters from the current position |
1381 | */ |
1385 | */ |
1382 | void |
1386 | void |
1383 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1387 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1384 | { |
1388 | { |
1385 | int col, row; |
1389 | int col, row; |
1386 | rend_t tr; |
1390 | rend_t tr; |
1387 | text_t *stp; |
1391 | text_t *stp; |
1388 | rend_t *srp; |
1392 | rend_t *srp; |
1389 | int16_t *slp; |
1393 | int16_t *slp; |
1390 | |
1394 | |
1391 | want_refresh = 1; |
1395 | want_refresh = 1; |
1392 | ZERO_SCROLLBACK (); |
1396 | ZERO_SCROLLBACK (); |
1393 | |
1397 | |
1394 | if (count <= 0) |
1398 | if (count <= 0) |
… | |
… | |
1401 | screen.flags &= ~Screen_WrapNext; |
1405 | screen.flags &= ~Screen_WrapNext; |
1402 | |
1406 | |
1403 | stp = screen.text[row]; |
1407 | stp = screen.text[row]; |
1404 | srp = screen.rend[row]; |
1408 | srp = screen.rend[row]; |
1405 | slp = & (screen.tlen[row]); |
1409 | slp = & (screen.tlen[row]); |
|
|
1410 | |
1406 | switch (insdel) |
1411 | switch (insdel) |
1407 | { |
1412 | { |
1408 | case INSERT: |
1413 | case INSERT: |
1409 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1414 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1410 | col--) |
1415 | col--) |
1411 | { |
1416 | { |
1412 | stp[col] = stp[col - count]; |
1417 | stp[col] = stp[col - count]; |
1413 | srp[col] = srp[col - count]; |
1418 | srp[col] = srp[col - count]; |
1414 | } |
1419 | } |
|
|
1420 | |
1415 | if (*slp != -1) |
1421 | if (*slp != -1) |
1416 | { |
1422 | { |
1417 | *slp += count; |
1423 | *slp += count; |
1418 | MIN_IT (*slp, TermWin.ncol); |
1424 | MIN_IT (*slp, TermWin.ncol); |
1419 | } |
1425 | } |
|
|
1426 | |
1420 | if (selection.op && current_screen == selection.screen |
1427 | if (selection.op && current_screen == selection.screen |
1421 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1428 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1422 | { |
1429 | { |
1423 | if (selection.end.row != screen.cur.row |
1430 | if (selection.end.row != screen.cur.row |
1424 | || (selection.end.col + count >= TermWin.ncol)) |
1431 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1428 | selection.beg.col += count; |
1435 | selection.beg.col += count; |
1429 | selection.mark.col += count; /* XXX: yes? */ |
1436 | selection.mark.col += count; /* XXX: yes? */ |
1430 | selection.end.col += count; |
1437 | selection.end.col += count; |
1431 | } |
1438 | } |
1432 | } |
1439 | } |
|
|
1440 | |
1433 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1441 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1434 | (unsigned int)count, rstyle); |
1442 | (unsigned int)count, rstyle); |
1435 | break; |
1443 | break; |
|
|
1444 | |
1436 | case ERASE: |
1445 | case ERASE: |
1437 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1446 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1438 | selection_check (1); |
1447 | selection_check (1); |
1439 | screen.cur.col -= count; |
1448 | screen.cur.col -= count; |
1440 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1449 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1441 | (unsigned int)count, rstyle); |
1450 | (unsigned int)count, rstyle); |
1442 | break; |
1451 | break; |
|
|
1452 | |
1443 | case DELETE: |
1453 | case DELETE: |
1444 | tr = srp[TermWin.ncol - 1] |
|
|
1445 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1454 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1455 | |
1446 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1456 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1447 | { |
1457 | { |
1448 | stp[col] = stp[col + count]; |
1458 | stp[col] = stp[col + count]; |
1449 | srp[col] = srp[col + count]; |
1459 | srp[col] = srp[col + count]; |
1450 | } |
1460 | } |
|
|
1461 | |
1451 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1462 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1452 | & (srp[TermWin.ncol - count]), |
1463 | & (srp[TermWin.ncol - count]), |
1453 | (unsigned int)count, tr); |
1464 | (unsigned int)count, tr); |
|
|
1465 | |
1454 | if (*slp == -1) /* break line continuation */ |
1466 | if (*slp == -1) /* break line continuation */ |
1455 | *slp = TermWin.ncol; |
1467 | *slp = TermWin.ncol; |
|
|
1468 | |
1456 | *slp -= count; |
1469 | *slp -= count; |
1457 | MAX_IT (*slp, 0); |
1470 | MAX_IT (*slp, 0); |
|
|
1471 | |
1458 | if (selection.op && current_screen == selection.screen |
1472 | if (selection.op && current_screen == selection.screen |
1459 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1473 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1460 | { |
1474 | { |
1461 | if (selection.end.row != screen.cur.row |
1475 | if (selection.end.row != screen.cur.row |
1462 | || (screen.cur.col >= selection.beg.col - count) |
1476 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1468 | selection.beg.col -= count; |
1482 | selection.beg.col -= count; |
1469 | selection.mark.col -= count; /* XXX: yes? */ |
1483 | selection.mark.col -= count; /* XXX: yes? */ |
1470 | selection.end.col -= count; |
1484 | selection.end.col -= count; |
1471 | } |
1485 | } |
1472 | } |
1486 | } |
|
|
1487 | |
1473 | break; |
1488 | break; |
1474 | } |
1489 | } |
1475 | } |
1490 | } |
1476 | |
1491 | |
1477 | /* ------------------------------------------------------------------------- */ |
1492 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1482 | void |
1497 | void |
1483 | rxvt_term::scr_scroll_region (int top, int bot) |
1498 | rxvt_term::scr_scroll_region (int top, int bot) |
1484 | { |
1499 | { |
1485 | MAX_IT (top, 0); |
1500 | MAX_IT (top, 0); |
1486 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1501 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1502 | |
1487 | if (top > bot) |
1503 | if (top > bot) |
1488 | return; |
1504 | return; |
|
|
1505 | |
1489 | screen.tscroll = top; |
1506 | screen.tscroll = top; |
1490 | screen.bscroll = bot; |
1507 | screen.bscroll = bot; |
1491 | scr_gotorc (0, 0, 0); |
1508 | scr_gotorc (0, 0, 0); |
1492 | } |
1509 | } |
1493 | |
1510 | |
… | |
… | |
1499 | */ |
1516 | */ |
1500 | void |
1517 | void |
1501 | rxvt_term::scr_cursor_visible (int mode) |
1518 | rxvt_term::scr_cursor_visible (int mode) |
1502 | { |
1519 | { |
1503 | want_refresh = 1; |
1520 | want_refresh = 1; |
|
|
1521 | |
1504 | if (mode) |
1522 | if (mode) |
1505 | screen.flags |= Screen_VisibleCursor; |
1523 | screen.flags |= Screen_VisibleCursor; |
1506 | else |
1524 | else |
1507 | screen.flags &= ~Screen_VisibleCursor; |
1525 | screen.flags &= ~Screen_VisibleCursor; |
1508 | } |
1526 | } |
… | |
… | |
1722 | row_col_t rc[RC_COUNT]; |
1740 | row_col_t rc[RC_COUNT]; |
1723 | |
1741 | |
1724 | if (drawn_text == NULL) /* sanity check */ |
1742 | if (drawn_text == NULL) /* sanity check */ |
1725 | return; |
1743 | return; |
1726 | |
1744 | |
|
|
1745 | #ifndef NO_SLOW_LINK_SUPPORT |
|
|
1746 | if (refresh_type == FAST_REFRESH && !display->is_local) |
|
|
1747 | { |
|
|
1748 | y = 0; |
|
|
1749 | height = TermWin.height; |
|
|
1750 | } |
|
|
1751 | #endif |
|
|
1752 | |
1727 | #ifdef DEBUG_STRICT |
1753 | #ifdef DEBUG_STRICT |
1728 | x = max (x, (int)TermWin.int_bwidth); |
1754 | x = max (x, 0); |
1729 | x = min (x, (int)TermWin.width); |
1755 | x = min (x, (int)TermWin.width); |
1730 | y = max (y, (int)TermWin.int_bwidth); |
1756 | y = max (y, 0); |
1731 | y = min (y, (int)TermWin.height); |
1757 | y = min (y, (int)TermWin.height); |
1732 | #endif |
1758 | #endif |
1733 | |
1759 | |
1734 | /* round down */ |
1760 | /* round down */ |
1735 | rc[PART_BEG].col = Pixel2Col (x); |
1761 | rc[PART_BEG].col = Pixel2Col (x); |
… | |
… | |
1746 | } |
1772 | } |
1747 | |
1773 | |
1748 | 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)); |
1774 | 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)); |
1749 | |
1775 | |
1750 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1776 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1751 | fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, |
1777 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1752 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1753 | |
1778 | |
1754 | if (refresh) |
1779 | if (refresh) |
1755 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1780 | scr_refresh (SLOW_REFRESH); |
1756 | } |
1781 | } |
1757 | |
1782 | |
1758 | /* ------------------------------------------------------------------------- */ |
1783 | /* ------------------------------------------------------------------------- */ |
1759 | /* |
1784 | /* |
1760 | * Refresh the entire screen |
1785 | * Refresh the entire screen |
… | |
… | |
1795 | * direction should be UP or DN |
1820 | * direction should be UP or DN |
1796 | */ |
1821 | */ |
1797 | int |
1822 | int |
1798 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1823 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1799 | { |
1824 | { |
1800 | int n; |
1825 | int n; |
1801 | uint16_t oldviewstart; |
1826 | uint16_t oldviewstart; |
1802 | |
1827 | |
1803 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
1828 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
1804 | #ifdef DEBUG_STRICT |
1829 | #ifdef DEBUG_STRICT |
1805 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1830 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1806 | #endif |
1831 | #endif |
… | |
… | |
1824 | if (TermWin.view_start != oldviewstart) |
1849 | if (TermWin.view_start != oldviewstart) |
1825 | { |
1850 | { |
1826 | want_refresh = 1; |
1851 | want_refresh = 1; |
1827 | num_scr -= (TermWin.view_start - oldviewstart); |
1852 | num_scr -= (TermWin.view_start - oldviewstart); |
1828 | } |
1853 | } |
|
|
1854 | |
1829 | return (int) (TermWin.view_start - oldviewstart); |
1855 | return (int) (TermWin.view_start - oldviewstart); |
1830 | } |
1856 | } |
1831 | |
1857 | |
1832 | /* ------------------------------------------------------------------------- */ |
1858 | /* ------------------------------------------------------------------------- */ |
1833 | void |
1859 | void |
… | |
… | |
1901 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1927 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1902 | |
1928 | |
1903 | void |
1929 | void |
1904 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1930 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1905 | { |
1931 | { |
1906 | unsigned char clearfirst, /* first character writes before cell */ |
|
|
1907 | clearlast, /* last character writes beyond cell */ |
|
|
1908 | must_clear, /* use draw_string not draw_image_string */ |
1932 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1909 | rvid, /* reverse video this position */ |
1933 | rvid, /* reverse video this position */ |
1910 | showcursor; /* show the cursor */ |
1934 | showcursor; /* show the cursor */ |
1911 | int16_t col, row, /* column/row we're processing */ |
1935 | int16_t col, row, /* column/row we're processing */ |
1912 | ocrow; /* old cursor row */ |
1936 | ocrow; /* old cursor row */ |
1913 | int i, /* tmp */ |
1937 | int i, /* tmp */ |
… | |
… | |
1922 | return; |
1946 | return; |
1923 | |
1947 | |
1924 | /* |
1948 | /* |
1925 | * A: set up vars |
1949 | * A: set up vars |
1926 | */ |
1950 | */ |
1927 | clearfirst = clearlast = must_clear = 0; |
1951 | must_clear = 0; |
1928 | |
1952 | |
1929 | refresh_count = 0; |
1953 | refresh_count = 0; |
1930 | |
1954 | |
1931 | row_offset = TermWin.saveLines - TermWin.view_start; |
1955 | row_offset = TermWin.saveLines - TermWin.view_start; |
1932 | |
|
|
1933 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1934 | { |
|
|
1935 | clearfirst = clearlast = 1; |
|
|
1936 | refresh_type &= ~REFRESH_BOUNDS; |
|
|
1937 | } |
|
|
1938 | |
1956 | |
1939 | #ifdef XPM_BACKGROUND |
1957 | #ifdef XPM_BACKGROUND |
1940 | must_clear |= (bgPixmap.pixmap != None); |
1958 | must_clear |= (bgPixmap.pixmap != None); |
1941 | #endif |
1959 | #endif |
1942 | #ifdef TRANSPARENT |
1960 | #ifdef TRANSPARENT |
… | |
… | |
1951 | |
1969 | |
1952 | /* |
1970 | /* |
1953 | * C: set the cursor character (s) |
1971 | * C: set the cursor character (s) |
1954 | */ |
1972 | */ |
1955 | { |
1973 | { |
1956 | unsigned char setoldcursor; |
1974 | unsigned char setoldcursor; |
1957 | rend_t ccol1, /* Cursor colour */ |
1975 | rend_t ccol1, /* Cursor colour */ |
1958 | ccol2; /* Cursor colour2 */ |
1976 | ccol2; /* Cursor colour2 */ |
1959 | |
1977 | |
1960 | showcursor = (screen.flags & Screen_VisibleCursor); |
1978 | showcursor = (screen.flags & Screen_VisibleCursor); |
1961 | #ifdef CURSOR_BLINK |
1979 | #ifdef CURSOR_BLINK |
1962 | if (hidden_cursor) |
1980 | if (hidden_cursor) |
1963 | showcursor = 0; |
1981 | showcursor = 0; |
1964 | #endif |
1982 | #endif |
1965 | |
1983 | |
1966 | if (showcursor) |
1984 | if (showcursor) |
1967 | { |
1985 | { |
1968 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1986 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
1969 | [screen.cur.col]); |
|
|
1970 | |
1987 | |
1971 | if (showcursor && TermWin.focus) |
1988 | if (showcursor && TermWin.focus) |
1972 | { |
1989 | { |
1973 | *srp ^= RS_RVid; |
1990 | *srp ^= RS_RVid; |
1974 | #ifndef NO_CURSORCOLOR |
1991 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2002 | if (screen.cur.row + TermWin.view_start != ocrow |
2019 | if (screen.cur.row + TermWin.view_start != ocrow |
2003 | || screen.cur.col != oldcursor.col) |
2020 | || screen.cur.col != oldcursor.col) |
2004 | { |
2021 | { |
2005 | if (ocrow < TermWin.nrow |
2022 | if (ocrow < TermWin.nrow |
2006 | && oldcursor.col < TermWin.ncol) |
2023 | && oldcursor.col < TermWin.ncol) |
2007 | { |
|
|
2008 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2024 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2009 | } |
2025 | |
2010 | if (TermWin.focus || !showcursor) |
2026 | if (TermWin.focus || !showcursor) |
2011 | oldcursor.row = -1; |
2027 | oldcursor.row = -1; |
2012 | else |
2028 | else |
2013 | setoldcursor = 1; |
2029 | setoldcursor = 1; |
2014 | } |
2030 | } |
2015 | } |
2031 | } |
2016 | else if (!TermWin.focus) |
2032 | else if (!TermWin.focus) |
2017 | setoldcursor = 1; |
2033 | setoldcursor = 1; |
|
|
2034 | |
2018 | if (setoldcursor) |
2035 | if (setoldcursor) |
2019 | { |
2036 | { |
2020 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2037 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2021 | oldcursor.row = -1; |
2038 | oldcursor.row = -1; |
2022 | else |
2039 | else |
… | |
… | |
2031 | /* |
2048 | /* |
2032 | * D: CopyArea pass - very useful for slower links |
2049 | * D: CopyArea pass - very useful for slower links |
2033 | * This has been deliberately kept simple. |
2050 | * This has been deliberately kept simple. |
2034 | */ |
2051 | */ |
2035 | i = num_scr; |
2052 | i = num_scr; |
|
|
2053 | if (!display->is_local |
2036 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2054 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2037 | && abs (i) < TermWin.nrow && !must_clear) |
2055 | && abs (i) < TermWin.nrow && !must_clear) |
2038 | { |
2056 | { |
2039 | int16_t nits; |
2057 | int16_t nits; |
2040 | int j; |
2058 | int j; |
2041 | rend_t *drp2; |
2059 | rend_t *drp2; |
2042 | text_t *dtp2; |
2060 | text_t *dtp2; |
2043 | int len, wlen; |
2061 | int len, wlen; |
2044 | |
2062 | |
2045 | j = TermWin.nrow; |
2063 | j = TermWin.nrow; |
2046 | wlen = len = -1; |
2064 | wlen = len = -1; |
2047 | row = i > 0 ? 0 : j - 1; |
2065 | row = i > 0 ? 0 : j - 1; |
2048 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2066 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2183 | rend = GET_ATTR (rend); |
2201 | rend = GET_ATTR (rend); |
2184 | |
2202 | |
2185 | rvid = !!(rend & RS_RVid); |
2203 | rvid = !!(rend & RS_RVid); |
2186 | |
2204 | |
2187 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2205 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2188 | if (rend & RS_Bold && fore == Color_fg) |
2206 | if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) |
2189 | { |
2207 | { |
2190 | if (ISSET_PIXCOLOR (Color_BD)) |
2208 | if (ISSET_PIXCOLOR (Color_BD)) |
2191 | fore = Color_BD; |
2209 | fore = Color_BD; |
2192 | else |
2210 | else |
2193 | rvid = !rvid; |
2211 | rvid = !rvid; |
2194 | } |
2212 | } |
2195 | |
2213 | |
2196 | if (rend & RS_Uline) |
2214 | if (rend & RS_Uline) |
2197 | { |
|
|
2198 | if (ISSET_PIXCOLOR (Color_UL)) |
2215 | if (ISSET_PIXCOLOR (Color_UL)) |
2199 | fore = Color_UL; |
2216 | fore = Color_UL; |
2200 | } |
|
|
2201 | #endif |
2217 | #endif |
2202 | |
2218 | |
2203 | if (rvid) |
2219 | if (rvid) |
2204 | { |
2220 | { |
2205 | SWAP_IT (fore, back, int); |
2221 | SWAP_IT (fore, back, int); |
… | |
… | |
2213 | back = Color_RV; |
2229 | back = Color_RV; |
2214 | #endif |
2230 | #endif |
2215 | } |
2231 | } |
2216 | |
2232 | |
2217 | #ifdef TEXT_BLINK |
2233 | #ifdef TEXT_BLINK |
2218 | if (rend & RS_Blink && back == Color_bg) |
2234 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2219 | { |
2235 | { |
2220 | if (!text_blink_ev.active) |
2236 | if (!text_blink_ev.active) |
2221 | { |
2237 | { |
2222 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2238 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2223 | hidden_text = 0; |
2239 | hidden_text = 0; |
… | |
… | |
2253 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2269 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2254 | } |
2270 | } |
2255 | else |
2271 | else |
2256 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2272 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2257 | |
2273 | |
2258 | if ((rend & RS_Uline) && (font->descent > 1)) |
2274 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2259 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2275 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2260 | xpixel, ypixel + font->ascent + 1, |
2276 | xpixel, ypixel + font->ascent + 1, |
2261 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2277 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2262 | } /* for (col....) */ |
2278 | } /* for (col....) */ |
2263 | } /* for (row....) */ |
2279 | } /* for (row....) */ |
… | |
… | |
2298 | /* |
2314 | /* |
2299 | * H: cleanup selection |
2315 | * H: cleanup selection |
2300 | */ |
2316 | */ |
2301 | scr_reverse_selection (); |
2317 | scr_reverse_selection (); |
2302 | |
2318 | |
2303 | /* |
|
|
2304 | * I: other general cleanup |
|
|
2305 | */ |
|
|
2306 | if (clearfirst && TermWin.int_bwidth) |
|
|
2307 | /* |
|
|
2308 | * clear the whole screen height, note that width == 0 is treated |
|
|
2309 | * specially by XClearArea |
|
|
2310 | */ |
|
|
2311 | XClearArea (display->display, TermWin.vt, 0, 0, |
|
|
2312 | (unsigned int)TermWin.int_bwidth, |
|
|
2313 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2314 | |
|
|
2315 | if (clearlast && TermWin.int_bwidth) |
|
|
2316 | /* |
|
|
2317 | * clear the whole screen height, note that width == 0 is treated |
|
|
2318 | * specially by XClearArea |
|
|
2319 | */ |
|
|
2320 | XClearArea (display->display, TermWin.vt, |
|
|
2321 | TermWin.width + TermWin.int_bwidth, 0, |
|
|
2322 | (unsigned int)TermWin.int_bwidth, |
|
|
2323 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2324 | |
|
|
2325 | if (refresh_type & SMOOTH_REFRESH) |
2319 | if (refresh_type & SMOOTH_REFRESH) |
2326 | XSync (display->display, False); |
2320 | XFlush (display->display); |
2327 | |
2321 | |
2328 | num_scr = 0; |
2322 | num_scr = 0; |
2329 | num_scr_allow = 1; |
2323 | num_scr_allow = 1; |
2330 | want_refresh = 0; /* screen is current */ |
2324 | want_refresh = 0; /* screen is current */ |
2331 | } |
2325 | } |
… | |
… | |
2502 | { |
2496 | { |
2503 | n = min (len - i, PROP_SIZE); |
2497 | n = min (len - i, PROP_SIZE); |
2504 | MEMCPY (ds, data + i, n); |
2498 | MEMCPY (ds, data + i, n); |
2505 | |
2499 | |
2506 | for (j = 0; j < n; j++) |
2500 | for (j = 0; j < n; j++) |
2507 | if (ds[j] == '\n') |
2501 | if (ds[j] == C0_LF) |
2508 | ds[j] = '\r'; |
2502 | ds[j] = C0_CR; |
2509 | |
2503 | |
2510 | tt_write (ds, (int)n); |
2504 | tt_write (ds, (int)n); |
2511 | } |
2505 | } |
2512 | |
2506 | |
2513 | free (ds); |
2507 | free (ds); |
… | |
… | |
2594 | |
2588 | |
2595 | nread += ct.nitems; |
2589 | nread += ct.nitems; |
2596 | |
2590 | |
2597 | char **cl; |
2591 | char **cl; |
2598 | int cr; |
2592 | int cr; |
2599 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2593 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2600 | &cr) >= 0 && cl) |
|
|
2601 | { |
2594 | { |
2602 | for (int i = 0; i < cr; i++) |
2595 | for (int i = 0; i < cr; i++) |
2603 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2596 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2604 | |
2597 | |
2605 | XFreeStringList (cl); |
2598 | XFreeStringList (cl); |
… | |
… | |
2626 | void |
2619 | void |
2627 | rxvt_term::incr_cb (time_watcher &w) |
2620 | rxvt_term::incr_cb (time_watcher &w) |
2628 | { |
2621 | { |
2629 | selection_wait = Sel_none; |
2622 | selection_wait = Sel_none; |
2630 | |
2623 | |
2631 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2624 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2632 | } |
2625 | } |
2633 | |
2626 | |
2634 | /* |
2627 | /* |
2635 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2628 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2636 | */ |
2629 | */ |
… | |
… | |
2715 | { |
2708 | { |
2716 | int i; |
2709 | int i; |
2717 | |
2710 | |
2718 | selection_request_time = tm; |
2711 | selection_request_time = tm; |
2719 | selection_wait = Sel_normal; |
2712 | selection_wait = Sel_normal; |
|
|
2713 | |
2720 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2714 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2721 | { |
2715 | { |
2722 | #if X_HAVE_UTF8_STRING |
2716 | #if X_HAVE_UTF8_STRING |
2723 | selection_type = Sel_UTF8String; |
2717 | selection_type = Sel_UTF8String; |
2724 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2718 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2778 | want_refresh = 1; |
2772 | want_refresh = 1; |
2779 | free (selection.text); |
2773 | free (selection.text); |
2780 | selection.text = NULL; |
2774 | selection.text = NULL; |
2781 | selection.len = 0; |
2775 | selection.len = 0; |
2782 | CLEAR_SELECTION (); |
2776 | CLEAR_SELECTION (); |
|
|
2777 | |
|
|
2778 | if (display->selection_owner == this) |
|
|
2779 | display->selection_owner = 0; |
2783 | } |
2780 | } |
2784 | |
2781 | |
2785 | /* ------------------------------------------------------------------------- */ |
2782 | /* ------------------------------------------------------------------------- */ |
2786 | /* |
2783 | /* |
2787 | * Copy a selection into the cut buffer |
2784 | * Copy a selection into the cut buffer |
… | |
… | |
2838 | |
2835 | |
2839 | for (; col < end_col; col++) |
2836 | for (; col < end_col; col++) |
2840 | { |
2837 | { |
2841 | if (*t == NOCHAR) |
2838 | if (*t == NOCHAR) |
2842 | t++; |
2839 | t++; |
|
|
2840 | #if ENABLE_COMBINING |
2843 | else if (IS_COMPOSE (*t)) |
2841 | else if (IS_COMPOSE (*t)) |
2844 | { |
2842 | { |
2845 | int len = rxvt_composite.expand (*t, 0); |
2843 | int len = rxvt_composite.expand (*t, 0); |
2846 | |
2844 | |
2847 | extra -= (len - 1); |
2845 | extra -= (len - 1); |
… | |
… | |
2853 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2851 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2854 | } |
2852 | } |
2855 | |
2853 | |
2856 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2854 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2857 | } |
2855 | } |
|
|
2856 | #endif |
2858 | else |
2857 | else |
2859 | new_selection_text[ofs++] = *t++; |
2858 | new_selection_text[ofs++] = *t++; |
2860 | } |
2859 | } |
2861 | |
2860 | |
2862 | if (screen.tlen[row] != -1 && row != end_row) |
2861 | if (screen.tlen[row] != -1 && row != end_row) |
2863 | new_selection_text[ofs++] = L'\n'; |
2862 | new_selection_text[ofs++] = C0_LF; |
2864 | } |
2863 | } |
2865 | |
2864 | |
2866 | #ifndef NO_OLD_SELECTION |
|
|
2867 | if (selection_style == OLD_SELECT) |
|
|
2868 | if (end_col == TermWin.ncol) |
|
|
2869 | new_selection_text[ofs++] = L'\n'; |
|
|
2870 | #endif |
|
|
2871 | #ifndef NO_NEW_SELECTION |
|
|
2872 | if (selection_style != OLD_SELECT) |
|
|
2873 | if (end_col != selection.end.col) |
2865 | if (end_col != selection.end.col) |
2874 | new_selection_text[ofs++] = L'\n'; |
2866 | new_selection_text[ofs++] = C0_LF; |
2875 | #endif |
2867 | |
2876 | new_selection_text[ofs] = 0; |
2868 | new_selection_text[ofs] = 0; |
2877 | |
2869 | |
2878 | if (ofs == 0) |
2870 | if (ofs == 0) |
2879 | { |
2871 | { |
2880 | free (new_selection_text); |
2872 | free (new_selection_text); |
… | |
… | |
2889 | |
2881 | |
2890 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2882 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2891 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2883 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2892 | display->set_selection_owner (this); |
2884 | display->set_selection_owner (this); |
2893 | else |
2885 | else |
2894 | rxvt_print_error ("can't get primary selection"); |
2886 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2895 | |
2887 | |
2896 | #if 0 |
2888 | #if 0 |
2897 | XTextProperty ct; |
2889 | XTextProperty ct; |
2898 | |
2890 | |
2899 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2891 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
2939 | rxvt_term::selection_start_colrow (int col, int row) |
2931 | rxvt_term::selection_start_colrow (int col, int row) |
2940 | { |
2932 | { |
2941 | want_refresh = 1; |
2933 | want_refresh = 1; |
2942 | selection.mark.col = col; |
2934 | selection.mark.col = col; |
2943 | selection.mark.row = row - TermWin.view_start; |
2935 | selection.mark.row = row - TermWin.view_start; |
|
|
2936 | |
2944 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2937 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2945 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2938 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2946 | MAX_IT (selection.mark.col, 0); |
2939 | MAX_IT (selection.mark.col, 0); |
2947 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2940 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2948 | |
2941 | |
|
|
2942 | while (selection.mark.col > 0 |
|
|
2943 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2944 | --selection.mark.col; |
|
|
2945 | |
2949 | if (selection.op) |
2946 | if (selection.op) |
2950 | { /* clear the old selection */ |
2947 | { /* clear the old selection */ |
2951 | selection.beg.row = selection.end.row = selection.mark.row; |
2948 | selection.beg.row = selection.end.row = selection.mark.row; |
2952 | selection.beg.col = selection.end.col = selection.mark.col; |
2949 | selection.beg.col = selection.end.col = selection.mark.col; |
2953 | } |
2950 | } |
|
|
2951 | |
2954 | selection.op = SELECTION_INIT; |
2952 | selection.op = SELECTION_INIT; |
2955 | selection.screen = current_screen; |
2953 | selection.screen = current_screen; |
2956 | } |
2954 | } |
2957 | |
2955 | |
2958 | /* ------------------------------------------------------------------------- */ |
2956 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2960 | * Word select: select text for 2 clicks |
2958 | * Word select: select text for 2 clicks |
2961 | * We now only find out the boundary in one direction |
2959 | * We now only find out the boundary in one direction |
2962 | */ |
2960 | */ |
2963 | |
2961 | |
2964 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2962 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2965 | #define DELIMIT_TEXT(x) \ |
2963 | #define DELIMIT_TEXT(x) \ |
2966 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2964 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2967 | #define DELIMIT_REND(x) 1 |
2965 | #define DELIMIT_REND(x) 1 |
2968 | |
2966 | |
2969 | void |
2967 | void |
2970 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2968 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2971 | { |
2969 | { |
2972 | int col, row, dirnadd, tcol, trow, w1, w2; |
2970 | int col, row, dirnadd, tcol, trow, w1, w2; |
2973 | row_col_t bound; |
2971 | row_col_t bound; |
2974 | text_t *stp; |
2972 | text_t *stp; |
2975 | rend_t *srp; |
2973 | rend_t *srp; |
2976 | |
2974 | |
2977 | if (dirn == UP) |
2975 | if (dirn == UP) |
2978 | { |
2976 | { |
2979 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2977 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2980 | bound.col = 0; |
2978 | bound.col = 0; |
… | |
… | |
2984 | { |
2982 | { |
2985 | bound.row = TermWin.saveLines + TermWin.nrow; |
2983 | bound.row = TermWin.saveLines + TermWin.nrow; |
2986 | bound.col = TermWin.ncol - 1; |
2984 | bound.col = TermWin.ncol - 1; |
2987 | dirnadd = 1; |
2985 | dirnadd = 1; |
2988 | } |
2986 | } |
|
|
2987 | |
2989 | row = mark->row + TermWin.saveLines; |
2988 | row = mark->row + TermWin.saveLines; |
2990 | col = mark->col; |
2989 | col = mark->col; |
2991 | MAX_IT (col, 0); |
2990 | MAX_IT (col, 0); |
2992 | /* find the edge of a word */ |
2991 | /* find the edge of a word */ |
2993 | stp = & (screen.text[row][col]); |
2992 | stp = & (screen.text[row][col]); |
2994 | w1 = DELIMIT_TEXT (*stp); |
2993 | w1 = DELIMIT_TEXT (*stp); |
2995 | |
2994 | |
2996 | if (selection_style != NEW_SELECT) |
|
|
2997 | { |
|
|
2998 | if (w1 == 1) |
|
|
2999 | { |
|
|
3000 | stp += dirnadd; |
|
|
3001 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
3002 | goto Old_Word_Selection_You_Die; |
|
|
3003 | col += dirnadd; |
|
|
3004 | } |
|
|
3005 | w1 = 0; |
|
|
3006 | } |
|
|
3007 | srp = (&screen.rend[row][col]); |
2995 | srp = (&screen.rend[row][col]); |
3008 | w2 = DELIMIT_REND (*srp); |
2996 | w2 = DELIMIT_REND (*srp); |
3009 | |
2997 | |
3010 | for (;;) |
2998 | for (;;) |
3011 | { |
2999 | { |
3012 | for (; col != bound.col; col += dirnadd) |
3000 | for (; col != bound.col; col += dirnadd) |
3013 | { |
3001 | { |
3014 | stp += dirnadd; |
3002 | stp += dirnadd; |
|
|
3003 | srp += dirnadd; |
|
|
3004 | |
|
|
3005 | if (*stp == NOCHAR) |
|
|
3006 | continue; |
|
|
3007 | |
3015 | if (DELIMIT_TEXT (*stp) != w1) |
3008 | if (DELIMIT_TEXT (*stp) != w1) |
3016 | break; |
3009 | break; |
3017 | srp += dirnadd; |
|
|
3018 | if (DELIMIT_REND (*srp) != w2) |
3010 | if (DELIMIT_REND (*srp) != w2) |
3019 | break; |
3011 | break; |
3020 | } |
3012 | } |
|
|
3013 | |
3021 | if ((col == bound.col) && (row != bound.row)) |
3014 | if ((col == bound.col) && (row != bound.row)) |
3022 | { |
3015 | { |
3023 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3016 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3024 | { |
3017 | { |
3025 | trow = row + dirnadd; |
3018 | trow = row + dirnadd; |
3026 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3019 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3020 | |
3027 | if (screen.text[trow] == NULL) |
3021 | if (screen.text[trow] == NULL) |
3028 | break; |
3022 | break; |
|
|
3023 | |
3029 | stp = & (screen.text[trow][tcol]); |
3024 | stp = & (screen.text[trow][tcol]); |
3030 | srp = & (screen.rend[trow][tcol]); |
3025 | srp = & (screen.rend[trow][tcol]); |
|
|
3026 | |
3031 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3027 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3032 | break; |
3028 | break; |
|
|
3029 | |
3033 | row = trow; |
3030 | row = trow; |
3034 | col = tcol; |
3031 | col = tcol; |
3035 | continue; |
3032 | continue; |
3036 | } |
3033 | } |
3037 | } |
3034 | } |
3038 | break; |
3035 | break; |
3039 | } |
3036 | } |
|
|
3037 | |
3040 | Old_Word_Selection_You_Die: |
3038 | Old_Word_Selection_You_Die: |
3041 | 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)); |
3039 | 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)); |
3042 | |
3040 | |
3043 | if (dirn == DN) |
3041 | if (dirn == DN) |
3044 | col++; /* put us on one past the end */ |
3042 | col++; /* put us on one past the end */ |
… | |
… | |
3066 | MAX_IT (row, 0); |
3064 | MAX_IT (row, 0); |
3067 | MIN_IT (row, (int)TermWin.nrow - 1); |
3065 | MIN_IT (row, (int)TermWin.nrow - 1); |
3068 | MAX_IT (col, 0); |
3066 | MAX_IT (col, 0); |
3069 | MIN_IT (col, (int)TermWin.ncol); |
3067 | MIN_IT (col, (int)TermWin.ncol); |
3070 | |
3068 | |
3071 | #ifndef NO_NEW_SELECTION |
|
|
3072 | /* |
3069 | /* |
3073 | * If we're selecting characters (single click) then we must check first |
3070 | * If we're selecting characters (single click) then we must check first |
3074 | * if we are at the same place as the original mark. If we are then |
3071 | * if we are at the same place as the original mark. If we are then |
3075 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3072 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3076 | * be _past_ a character for it to be selected. |
3073 | * be _past_ a character for it to be selected. |
3077 | */ |
3074 | */ |
3078 | if (selection_style != OLD_SELECT) |
|
|
3079 | { |
|
|
3080 | if (((selection.clicks % 3) == 1) && !flag |
3075 | if (((selection.clicks % 3) == 1) && !flag |
3081 | && (col == selection.mark.col |
3076 | && (col == selection.mark.col |
3082 | && (row == selection.mark.row + TermWin.view_start))) |
3077 | && (row == selection.mark.row + TermWin.view_start))) |
3083 | { |
3078 | { |
3084 | /* select nothing */ |
3079 | /* select nothing */ |
3085 | selection.beg.row = selection.end.row = 0; |
3080 | selection.beg.row = selection.end.row = 0; |
3086 | selection.beg.col = selection.end.col = 0; |
3081 | selection.beg.col = selection.end.col = 0; |
3087 | selection.clicks = 4; |
3082 | selection.clicks = 4; |
3088 | want_refresh = 1; |
3083 | want_refresh = 1; |
3089 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3084 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3090 | return; |
3085 | return; |
3091 | } |
|
|
3092 | } |
3086 | } |
3093 | #endif |
3087 | |
3094 | if (selection.clicks == 4) |
3088 | if (selection.clicks == 4) |
3095 | selection.clicks = 1; |
3089 | selection.clicks = 1; |
3096 | |
3090 | |
3097 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3091 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3098 | flag == 1 ? 1 : 0, /* ? button press */ |
3092 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3104 | * Extend the selection to the specified col/row |
3098 | * Extend the selection to the specified col/row |
3105 | */ |
3099 | */ |
3106 | void |
3100 | void |
3107 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3101 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3108 | { |
3102 | { |
3109 | int16_t ncol = TermWin.ncol; |
3103 | int16_t ncol = TermWin.ncol; |
3110 | int end_col; |
3104 | int end_col; |
3111 | row_col_t pos; |
3105 | row_col_t pos; |
3112 | enum { |
3106 | enum { |
3113 | LEFT, RIGHT |
3107 | LEFT, RIGHT |
3114 | } closeto = RIGHT; |
3108 | } closeto = RIGHT; |
3115 | |
3109 | |
3116 | 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)); |
3110 | 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)); |
… | |
… | |
3152 | pos.col = col; |
3146 | pos.col = col; |
3153 | pos.row = row; |
3147 | pos.row = row; |
3154 | |
3148 | |
3155 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3149 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3156 | |
3150 | |
3157 | #ifndef NO_OLD_SELECTION |
|
|
3158 | /* |
|
|
3159 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3160 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3161 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3162 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3163 | */ |
|
|
3164 | if (selection_style == OLD_SELECT) |
|
|
3165 | { |
|
|
3166 | if (selection.clicks == 1 || button3) |
|
|
3167 | { |
|
|
3168 | if (hate_those_clicks) |
|
|
3169 | { |
|
|
3170 | hate_those_clicks = 0; |
|
|
3171 | if (selection.clicks == 1) |
|
|
3172 | { |
|
|
3173 | selection.beg.row = selection.mark.row; |
|
|
3174 | selection.beg.col = selection.mark.col; |
|
|
3175 | } |
|
|
3176 | else |
|
|
3177 | { |
|
|
3178 | selection.mark.row = selection.beg.row; |
|
|
3179 | selection.mark.col = selection.beg.col; |
|
|
3180 | } |
|
|
3181 | } |
|
|
3182 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3183 | { |
|
|
3184 | selection.end.row = selection.mark.row; |
|
|
3185 | selection.end.col = selection.mark.col + 1; |
|
|
3186 | selection.beg.row = pos.row; |
|
|
3187 | selection.beg.col = pos.col; |
|
|
3188 | } |
|
|
3189 | else |
|
|
3190 | { |
|
|
3191 | selection.beg.row = selection.mark.row; |
|
|
3192 | selection.beg.col = selection.mark.col; |
|
|
3193 | selection.end.row = pos.row; |
|
|
3194 | selection.end.col = pos.col + 1; |
|
|
3195 | } |
|
|
3196 | } |
|
|
3197 | else if (selection.clicks == 2) |
|
|
3198 | { |
|
|
3199 | selection_delimit_word (UP, & (selection.mark), |
|
|
3200 | & (selection.beg)); |
|
|
3201 | selection_delimit_word (DN, & (selection.mark), |
|
|
3202 | & (selection.end)); |
|
|
3203 | hate_those_clicks = 1; |
|
|
3204 | } |
|
|
3205 | else if (selection.clicks == 3) |
|
|
3206 | { |
|
|
3207 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3208 | selection.beg.col = 0; |
|
|
3209 | selection.end.col = ncol; |
|
|
3210 | hate_those_clicks = 1; |
|
|
3211 | } |
|
|
3212 | 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)); |
|
|
3213 | return; |
|
|
3214 | } |
|
|
3215 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3216 | #ifndef NO_NEW_SELECTION |
|
|
3217 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3218 | /* |
3151 | /* |
3219 | * This is mainly xterm style selection with a couple of differences, mainly |
3152 | * This is mainly xterm style selection with a couple of differences, mainly |
3220 | * in the way button3 drag extension works. |
3153 | * in the way button3 drag extension works. |
3221 | * We're either doing: button1 drag; button3 press; or button3 drag |
3154 | * We're either doing: button1 drag; button3 press; or button3 drag |
3222 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3155 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3227 | * a point/word/line which is either the start or end of the selection |
3160 | * a point/word/line which is either the start or end of the selection |
3228 | * and it was decided by whichever point/word/line was `fixed' at the |
3161 | * and it was decided by whichever point/word/line was `fixed' at the |
3229 | * time of the most recent button3 press |
3162 | * time of the most recent button3 press |
3230 | */ |
3163 | */ |
3231 | if (button3 && buttonpress) |
3164 | if (button3 && buttonpress) |
3232 | { /* button3 press */ |
3165 | { /* button3 press */ |
3233 | /* |
3166 | /* |
3234 | * first determine which edge of the selection we are closest to |
3167 | * first determine which edge of the selection we are closest to |
3235 | */ |
3168 | */ |
3236 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3169 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3237 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3170 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3238 | && (((pos.col - selection.beg.col) |
3171 | && (((pos.col - selection.beg.col) |
3239 | + ((pos.row - selection.beg.row) * ncol)) |
3172 | + ((pos.row - selection.beg.row) * ncol)) |
3240 | < ((selection.end.col - pos.col) |
3173 | < ((selection.end.col - pos.col) |
3241 | + ((selection.end.row - pos.row) * ncol))))) |
3174 | + ((selection.end.row - pos.row) * ncol))))) |
3242 | closeto = LEFT; |
3175 | closeto = LEFT; |
|
|
3176 | |
3243 | if (closeto == LEFT) |
3177 | if (closeto == LEFT) |
3244 | { |
3178 | { |
3245 | selection.beg.row = pos.row; |
3179 | selection.beg.row = pos.row; |
3246 | selection.beg.col = pos.col; |
3180 | selection.beg.col = pos.col; |
3247 | selection.mark.row = selection.end.row; |
3181 | selection.mark.row = selection.end.row; |
3248 | selection.mark.col = selection.end.col |
3182 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3249 | - (selection.clicks == 2); |
|
|
3250 | } |
3183 | } |
3251 | else |
3184 | else |
3252 | { |
3185 | { |
3253 | selection.end.row = pos.row; |
3186 | selection.end.row = pos.row; |
3254 | selection.end.col = pos.col; |
3187 | selection.end.col = pos.col; |
3255 | selection.mark.row = selection.beg.row; |
3188 | selection.mark.row = selection.beg.row; |
3256 | selection.mark.col = selection.beg.col; |
3189 | selection.mark.col = selection.beg.col; |
3257 | } |
3190 | } |
3258 | } |
3191 | } |
3259 | else |
3192 | else |
3260 | { /* button1 drag or button3 drag */ |
3193 | { /* button1 drag or button3 drag */ |
3261 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3194 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3262 | { |
3195 | { |
3263 | if ((selection.mark.row == selection.end.row) |
3196 | if ((selection.mark.row == selection.end.row) |
3264 | && (selection.mark.col == selection.end.col) |
3197 | && (selection.mark.col == selection.end.col) |
3265 | && clickchange && selection.clicks == 2) |
3198 | && clickchange && selection.clicks == 2) |
3266 | selection.mark.col--; |
3199 | selection.mark.col--; |
|
|
3200 | |
3267 | selection.beg.row = pos.row; |
3201 | selection.beg.row = pos.row; |
3268 | selection.beg.col = pos.col; |
3202 | selection.beg.col = pos.col; |
3269 | selection.end.row = selection.mark.row; |
3203 | selection.end.row = selection.mark.row; |
3270 | selection.end.col = selection.mark.col |
3204 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3271 | + (selection.clicks == 2); |
|
|
3272 | } |
3205 | } |
3273 | else |
3206 | else |
3274 | { |
3207 | { |
3275 | selection.beg.row = selection.mark.row; |
3208 | selection.beg.row = selection.mark.row; |
3276 | selection.beg.col = selection.mark.col; |
3209 | selection.beg.col = selection.mark.col; |
… | |
… | |
3280 | } |
3213 | } |
3281 | |
3214 | |
3282 | if (selection.clicks == 1) |
3215 | if (selection.clicks == 1) |
3283 | { |
3216 | { |
3284 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3217 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3218 | |
3285 | if (end_col != -1 && selection.beg.col > end_col) |
3219 | if (end_col != -1 && selection.beg.col > end_col) |
3286 | { |
3220 | { |
3287 | #if 1 |
3221 | #if 1 |
3288 | selection.beg.col = ncol; |
3222 | selection.beg.col = ncol; |
3289 | #else |
3223 | #else |
3290 | if (selection.beg.row != selection.end.row) |
3224 | if (selection.beg.row != selection.end.row) |
3291 | selection.beg.col = ncol; |
3225 | selection.beg.col = ncol; |
3292 | else |
3226 | else |
3293 | selection.beg.col = selection.mark.col; |
3227 | selection.beg.col = selection.mark.col; |
3294 | #endif |
3228 | #endif |
3295 | |
|
|
3296 | } |
3229 | } |
|
|
3230 | |
3297 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3231 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3232 | |
3298 | if (end_col != -1 && selection.end.col > end_col) |
3233 | if (end_col != -1 && selection.end.col > end_col) |
3299 | selection.end.col = ncol; |
3234 | selection.end.col = ncol; |
3300 | |
|
|
3301 | } |
3235 | } |
3302 | else if (selection.clicks == 2) |
3236 | else if (selection.clicks == 2) |
3303 | { |
3237 | { |
3304 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3238 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3305 | selection.end.col--; |
3239 | selection.end.col--; |
|
|
3240 | |
3306 | selection_delimit_word (UP, & (selection.beg), |
3241 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3307 | & (selection.beg)); |
|
|
3308 | selection_delimit_word (DN, & (selection.end), |
3242 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3309 | & (selection.end)); |
|
|
3310 | } |
3243 | } |
3311 | else if (selection.clicks == 3) |
3244 | else if (selection.clicks == 3) |
3312 | { |
3245 | { |
3313 | #ifndef NO_FRILLS |
3246 | #ifndef NO_FRILLS |
3314 | if ((Options & Opt_tripleclickwords)) |
3247 | if ((Options & Opt_tripleclickwords)) |
3315 | { |
3248 | { |
3316 | int end_row; |
3249 | int end_row; |
3317 | |
3250 | |
3318 | selection_delimit_word (UP, & (selection.beg), |
3251 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3319 | & (selection.beg)); |
|
|
3320 | end_row = screen.tlen[selection.mark.row |
3252 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3321 | + TermWin.saveLines]; |
3253 | |
3322 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3254 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3323 | end_row++) |
|
|
3324 | { |
3255 | { |
3325 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3256 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3257 | |
3326 | if (end_col != -1) |
3258 | if (end_col != -1) |
3327 | { |
3259 | { |
3328 | selection.end.row = end_row; |
3260 | selection.end.row = end_row; |
3329 | selection.end.col = end_col; |
3261 | selection.end.col = end_col; |
3330 | selection_remove_trailing_spaces (); |
3262 | selection_remove_trailing_spaces (); |
… | |
… | |
3332 | } |
3264 | } |
3333 | } |
3265 | } |
3334 | } |
3266 | } |
3335 | else |
3267 | else |
3336 | #endif |
3268 | #endif |
3337 | |
|
|
3338 | { |
3269 | { |
3339 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3270 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3340 | selection.mark.col++; |
3271 | selection.mark.col++; |
3341 | selection.beg.col = 0; |
3272 | selection.beg.col = 0; |
3342 | selection.end.col = ncol; |
3273 | selection.end.col = ncol; |
3343 | } |
3274 | } |
3344 | } |
3275 | } |
|
|
3276 | |
3345 | if (button3 && buttonpress) |
3277 | if (button3 && buttonpress) |
3346 | { /* mark may need to be changed */ |
3278 | { /* mark may need to be changed */ |
3347 | if (closeto == LEFT) |
3279 | if (closeto == LEFT) |
3348 | { |
3280 | { |
3349 | selection.mark.row = selection.end.row; |
3281 | selection.mark.row = selection.end.row; |
3350 | selection.mark.col = selection.end.col |
3282 | selection.mark.col = selection.end.col |
3351 | - (selection.clicks == 2); |
3283 | - (selection.clicks == 2); |
… | |
… | |
3355 | selection.mark.row = selection.beg.row; |
3287 | selection.mark.row = selection.beg.row; |
3356 | selection.mark.col = selection.beg.col; |
3288 | selection.mark.col = selection.beg.col; |
3357 | } |
3289 | } |
3358 | } |
3290 | } |
3359 | 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)); |
3291 | 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)); |
3360 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3361 | } |
3292 | } |
3362 | |
3293 | |
3363 | #ifndef NO_FRILLS |
3294 | #ifndef NO_FRILLS |
3364 | void |
3295 | void |
3365 | rxvt_term::selection_remove_trailing_spaces () |
3296 | rxvt_term::selection_remove_trailing_spaces () |
… | |
… | |
3464 | /* TODO: Handle MULTIPLE */ |
3395 | /* TODO: Handle MULTIPLE */ |
3465 | } |
3396 | } |
3466 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3397 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3467 | { |
3398 | { |
3468 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3399 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3469 | (8 * sizeof (Time)), PropModeReplace, |
3400 | (8 * sizeof (Time)), PropModeReplace, |
3470 | (unsigned char *)&selection_time, 1); |
3401 | (unsigned char *)&selection_time, 1); |
3471 | ev.property = rq.property; |
3402 | ev.property = rq.property; |
3472 | } |
3403 | } |
3473 | else if (rq.target == XA_STRING |
3404 | else if (rq.target == XA_STRING |
3474 | || rq.target == xa[XA_TEXT] |
3405 | || rq.target == xa[XA_TEXT] |
3475 | || rq.target == xa[XA_COMPOUND_TEXT] |
3406 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3562 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3493 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3563 | } |
3494 | } |
3564 | |
3495 | |
3565 | #endif |
3496 | #endif |
3566 | /* ------------------------------------------------------------------------- */ |
3497 | /* ------------------------------------------------------------------------- */ |
3567 | |
|
|
3568 | /* ------------------------------------------------------------------------- * |
|
|
3569 | * DEBUG ROUTINES * |
|
|
3570 | * ------------------------------------------------------------------------- */ |
|
|
3571 | #if 0 |
|
|
3572 | void |
|
|
3573 | rxvt_debug_colors (void) |
|
|
3574 | { |
|
|
3575 | int color; |
|
|
3576 | const char *name[] = |
|
|
3577 | { |
|
|
3578 | "fg", "bg", |
|
|
3579 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3580 | }; |
|
|
3581 | |
|
|
3582 | fprintf (stderr, "Color ( "); |
|
|
3583 | if (rstyle & RS_RVid) |
|
|
3584 | fprintf (stderr, "rvid "); |
|
|
3585 | if (rstyle & RS_Bold) |
|
|
3586 | fprintf (stderr, "bold "); |
|
|
3587 | if (rstyle & RS_Blink) |
|
|
3588 | fprintf (stderr, "blink "); |
|
|
3589 | if (rstyle & RS_Uline) |
|
|
3590 | fprintf (stderr, "uline "); |
|
|
3591 | fprintf (stderr, "): "); |
|
|
3592 | |
|
|
3593 | color = GET_FGCOLOR (rstyle); |
|
|
3594 | #ifndef NO_BRIGHTCOLOR |
|
|
3595 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3596 | { |
|
|
3597 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3598 | fprintf (stderr, "bright "); |
|
|
3599 | } |
|
|
3600 | #endif |
|
|
3601 | fprintf (stderr, "%s on ", name[color]); |
|
|
3602 | |
|
|
3603 | color = GET_BGCOLOR (rstyle); |
|
|
3604 | #ifndef NO_BRIGHTCOLOR |
|
|
3605 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3606 | { |
|
|
3607 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3608 | fprintf (stderr, "bright "); |
|
|
3609 | } |
|
|
3610 | #endif |
|
|
3611 | fprintf (stderr, "%s\n", name[color]); |
|
|
3612 | } |
|
|
3613 | #endif |
|
|