ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC

… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <stdint.h> 32#include <inttypes.h>
35#include <wchar.h> 33#include <wchar.h>
36 34
37#include "salloc.C" // HACK, should be a seperate compile! 35#include "salloc.C" // HACK, should be a seperate compile!
38 36
39inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
… …
48 46
49/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 52 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 58 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 59 = selection.end.row = selection.end.col = 0
62 60
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 62 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 64 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 66 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 68 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 70 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 72 (((A) == (C)) && ((B) <= (D)))
75 73
76/* these must be row_col_t */ 74/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 75#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 77#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 79#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#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) 84 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) \ 85#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) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 87
90/* 88/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * 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 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 92 */
95#define drawBuffer TermWin.vt 93#define drawBuffer TermWin.vt
96 94
97#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 96 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 97 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False) 99 (unsigned int)Height2Pixel (num), False)
102 100
103#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 102 if (TermWin.mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 104 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 105 (unsigned int)Height2Pixel (1), False)
108 106
109#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 109 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 110 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
114 112
115/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 173 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2)
180 {
181 TermWin.saveLines++;
182 prev_nrow--;
183 TermWin.nscrolled++;
184 }
185
177 want_refresh = 1; 186 want_refresh = 1;
178 187
188 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 189 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 190
182 screen.tscroll = 0; 191 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 192 screen.bscroll = nrow - 1;
184 193
185 if (!talloc) 194 if (!talloc)
186 { 195 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 198 }
190 199
191 if (prev_nrow == 0) 200 if (!screen.text)
192 { 201 {
193 /* 202 /*
194 * first time called so just malloc everything : don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 205 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 226 }
218 227
219 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 233 screen.charset = 0;
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 266
258 for (p = nrow; p < prev_nrow; p++) 267 for (p = nrow; p < prev_nrow; p++)
259 { 268 {
260 q = p + TermWin.saveLines; 269 q = p + TermWin.saveLines;
270
261 if (screen.text[q]) 271 if (screen.text[q])
262 { 272 {
263#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 274 assert (screen.rend[q]);
265#endif 275#endif
266 talloc->free (screen.text[q]); 276 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 277 ralloc->free (screen.rend[q]);
268 } 278 }
279
269 if (swap.text[p]) 280 if (swap.text[p])
270 { 281 {
271#ifdef DEBUG_STRICT 282#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 283 assert (swap.rend[p]);
273#endif 284#endif
274 talloc->free (swap.text[p]); 285 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 286 ralloc->free (swap.rend[p]);
276 } 287 }
288
277#ifdef DEBUG_STRICT 289#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 290 assert (drawn_text[p] && drawn_rend[p]);
279#endif 291#endif
280 talloc->free (drawn_text[p]); 292 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 323 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 324 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 325 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 326 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 327 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 330 }
319 331
320 if (k > 0) 332 if (k > 0)
321 { 333 {
… …
336 } 348 }
337 349
338 /* resize columns */ 350 /* resize columns */
339 if (ncol != prev_ncol) 351 if (ncol != prev_ncol)
340 { 352 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 353 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 354 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 355
345 for (p = 0; p < total_rows; p++) 356 for (p = 0; p < total_rows; p++)
346 { 357 {
347 if (screen.text[p]) 358 if (screen.text[p])
348 { 359 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 360 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; 361 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
351 362
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 363 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 364
354 if (ncol > prev_ncol) 365 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 366 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 367 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 368 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 369 }
360 } 370 }
361 371
362 for (p = 0; p < nrow; p++) 372 for (p = 0; p < nrow; p++)
363 { 373 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 374 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; 375 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
366 376
367 if (ncol > prev_ncol) 377 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 378 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 379 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 380 ncol - prev_ncol, setrstyle);
371 381
372 if (swap.text[p]) 382 if (swap.text[p])
373 { 383 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 384 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; 385 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
376 386
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 387 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 388
379 if (ncol > prev_ncol) 389 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 390 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 391 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 392 ncol - prev_ncol, setrstyle);
383 } 393 }
384 394
385 } 395 }
386 396
… …
407} 417}
408 418
409void 419void
410rxvt_term::scr_reset_realloc () 420rxvt_term::scr_reset_realloc ()
411{ 421{
412 uint16_t total_rows, nrow; 422 unsigned int total_rows, nrow;
413 423
414 nrow = TermWin.nrow; 424 nrow = TermWin.nrow;
415 total_rows = nrow + TermWin.saveLines; 425 total_rows = nrow + TermWin.saveLines;
416 /* *INDENT-OFF* */ 426 /* *INDENT-OFF* */
417 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
434 * Free everything. That way malloc debugging can find leakage. 444 * Free everything. That way malloc debugging can find leakage.
435 */ 445 */
436void 446void
437rxvt_term::scr_release () 447rxvt_term::scr_release ()
438{ 448{
439 uint16_t total_rows; 449 unsigned int total_rows;
440 int i; 450 int i;
441 451
442 total_rows = TermWin.nrow + TermWin.saveLines; 452 total_rows = TermWin.nrow + TermWin.saveLines;
443 453
444 delete talloc; talloc = 0; 454 delete talloc; talloc = 0;
… …
470 * Hard reset 480 * Hard reset
471 */ 481 */
472void 482void
473rxvt_term::scr_poweron () 483rxvt_term::scr_poweron ()
474{ 484{
475 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
476
477 scr_release (); 485 scr_release ();
478 prev_nrow = prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
479 scr_reset (); 487 scr_reset ();
480 488
481 scr_clear (); 489 scr_clear (true);
482 scr_refresh (SLOW_REFRESH); 490 scr_refresh (SLOW_REFRESH);
483} 491}
484 492
485/* ------------------------------------------------------------------------- * 493/* ------------------------------------------------------------------------- *
486 * PROCESS SCREEN COMMANDS * 494 * PROCESS SCREEN COMMANDS *
… …
492 */ 500 */
493void 501void
494rxvt_term::scr_cursor (int mode) 502rxvt_term::scr_cursor (int mode)
495{ 503{
496 screen_t *s; 504 screen_t *s;
497
498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
499 505
500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
501 if (current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
502 s = &swap; 508 s = &swap;
503 else 509 else
… …
505 s = &screen; 511 s = &screen;
506 512
507 switch (mode) 513 switch (mode)
508 { 514 {
509 case SAVE: 515 case SAVE:
510 s->s_cur.row = s->cur.row; 516 s->s_cur.row = screen.cur.row;
511 s->s_cur.col = s->cur.col; 517 s->s_cur.col = screen.cur.col;
512 s->s_rstyle = rstyle; 518 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 519 s->s_charset = screen.charset;
514 s->s_charset_char = charsets[s->charset]; 520 s->s_charset_char = charsets[screen.charset];
515 break; 521 break;
516 522
517 case RESTORE: 523 case RESTORE:
518 want_refresh = 1; 524 want_refresh = 1;
519 s->cur.row = s->s_cur.row; 525 screen.cur.row = s->s_cur.row;
520 s->cur.col = s->s_cur.col; 526 screen.cur.col = s->s_cur.col;
521 s->flags &= ~Screen_WrapNext; 527 screen.flags &= ~Screen_WrapNext;
522 rstyle = s->s_rstyle; 528 rstyle = s->s_rstyle;
523 s->charset = s->s_charset; 529 screen.charset = s->s_charset;
524 charsets[s->charset] = s->s_charset_char; 530 charsets[screen.charset] = s->s_charset_char;
525 set_font_style (); 531 set_font_style ();
526 break; 532 break;
527 } 533 }
528 534
529 /* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
552 int offset; 558 int offset;
553#endif 559#endif
554 560
555 want_refresh = 1; 561 want_refresh = 1;
556 562
557 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
558
559 TermWin.view_start = 0; 563 TermWin.view_start = 0;
560 564
561 if (current_screen == scrn) 565 if (current_screen == scrn)
562 return scrn; 566 return scrn;
563 567
564 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
565 569
566 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
571
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583
567#if NSCREENS 584#if NSCREENS
568 if (Options & Opt_secondaryScreen) 585 if (options & Opt_secondaryScreen)
569 { 586 {
570 num_scr = 0; 587 num_scr = 0;
571 offset = TermWin.saveLines; 588 offset = TermWin.saveLines;
589
572 for (i = prev_nrow; i--;) 590 for (i = prev_nrow; i--;)
573 { 591 {
574 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
575 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
576 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
577 } 595 }
578 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 596
579 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
580# ifdef DEBUG_STRICT
581 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
582 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
583# else /* drive with your eyes closed */
584 MAX_IT (screen.cur.row, 0);
585 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
586 MAX_IT (screen.cur.col, 0);
587 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
588# endif
589 SWAP_IT (screen.charset, swap.charset, int16_t); 597 SWAP_IT (screen.charset, swap.charset, int16_t);
590 SWAP_IT (screen.flags, swap.flags, int); 598 SWAP_IT (screen.flags, swap.flags, int);
591 screen.flags |= Screen_VisibleCursor; 599 screen.flags |= Screen_VisibleCursor;
592 swap.flags |= Screen_VisibleCursor; 600 swap.flags |= Screen_VisibleCursor;
593 } 601 }
594 else 602 else
595#endif 603#endif
596 if (Options & Opt_secondaryScroll) 604 if (options & Opt_secondaryScroll)
597 //if (current_screen == PRIMARY) 605 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
599 return scrn; 608 return scrn;
600} 609}
601 610
611// clear WrapNext indicator, solidifying position on next line
612void
613rxvt_term::scr_do_wrap ()
614{
615 if (!(screen.flags & Screen_WrapNext))
616 return;
617
618 screen.flags &= ~Screen_WrapNext;
619
620 screen.cur.col = 0;
621
622 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
624 else if (screen.cur.row < TermWin.nrow - 1)
625 screen.cur.row++;
626}
627
602/* ------------------------------------------------------------------------- */ 628/* ------------------------------------------------------------------------- */
603/* 629/*
604 * Change the colour for following text 630 * Change the colour for following text
605 */ 631 */
606void 632void
607rxvt_term::scr_color (unsigned int color, int fgbg) 633rxvt_term::scr_color (unsigned int color, int fgbg)
608{ 634{
609 color &= RS_fgMask; 635 if (color > maxTermCOLOR)
636 color = fgbg;
637
610 if (fgbg == Color_fg) 638 if (fgbg == Color_fg)
611 rstyle = SET_FGCOLOR (rstyle, color); 639 rstyle = SET_FGCOLOR (rstyle, color);
612 else 640 else
613 rstyle = SET_BGCOLOR (rstyle, color); 641 rstyle = SET_BGCOLOR (rstyle, color);
614} 642}
… …
643 671
644 if (count == 0 || (row1 > row2)) 672 if (count == 0 || (row1 > row2))
645 return 0; 673 return 0;
646 674
647 want_refresh = 1; 675 want_refresh = 1;
648 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
649 676
650 if (row1 == 0 && count > 0 677 if (row1 == 0 && count > 0
651 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 678 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
652 { 679 {
653 nscrolled = (long)TermWin.nscrolled + (long)count; 680 nscrolled = (long)TermWin.nscrolled + (long)count;
654 681
655 if (nscrolled > (long)TermWin.saveLines) 682 if (nscrolled > (long)TermWin.saveLines)
656 TermWin.nscrolled = TermWin.saveLines; 683 TermWin.nscrolled = TermWin.saveLines;
657 else 684 else
658 TermWin.nscrolled = (uint16_t)nscrolled; 685 TermWin.nscrolled = (unsigned int)nscrolled;
659 686
660 if ((Options & Opt_scrollWithBuffer) 687 if ((options & Opt_scrollWithBuffer)
661 && TermWin.view_start != 0 688 && TermWin.view_start != 0
662 && TermWin.view_start != TermWin.saveLines) 689 && TermWin.view_start != TermWin.saveLines)
663 scr_page (UP, count); 690 scr_page (UP, count);
664 } 691 }
665 else if (!spec) 692 else if (!spec)
… …
704 if (j > 0) 731 if (j > 0)
705 { 732 {
706 /* A: scroll up */ 733 /* A: scroll up */
707 734
708 /* A1: Copy lines that will get clobbered by the rotation */ 735 /* A1: Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738
739 /* A2: Rotate lines */
740 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744
745 j = row2 - count + 1, i = count;
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750
751 /* B1: Copy lines that will get clobbered by the rotation */
709 for (i = 0, j = row1; i < count; i++, j++) 752 for (i = 0, j = row2; i < count; i++, j--)
710 { 753 {
711 buf_text[i] = screen.text[j]; 754 buf_text[i] = screen.text[j];
712 buf_rend[i] = screen.rend[j]; 755 buf_rend[i] = screen.rend[j];
713 } 756 }
757
714 /* A2: Rotate lines */ 758 /* B2: Rotate lines */
715 for (j = row1, i = j + count; i <= row2; i++, j++) 759 for (j = row2, i = j - count; i >= row1; i--, j--)
716 { 760 {
717 screen.tlen[j] = screen.tlen[i]; 761 screen.tlen[j] = screen.tlen[i];
718 screen.text[j] = screen.text[i]; 762 screen.text[j] = screen.text[i];
719 screen.rend[j] = screen.rend[i]; 763 screen.rend[j] = screen.rend[i];
720 } 764 }
721 j = row2 - count + 1, i = count;
722 }
723 else /* if (j < 0) */
724 {
725 /* B: scroll down */
726 765
727 /* B1: Copy lines that will get clobbered by the rotation */
728 for (i = 0, j = row2; i < count; i++, j--)
729 {
730 buf_text[i] = screen.text[j];
731 buf_rend[i] = screen.rend[j];
732 }
733 /* B2: Rotate lines */
734 for (j = row2, i = j - count; i >= row1; i--, j--)
735 {
736 screen.tlen[j] = screen.tlen[i];
737 screen.text[j] = screen.text[i];
738 screen.rend[j] = screen.rend[i];
739 }
740 j = row1, i = count; 766 j = row1, i = count;
741 count = -count; 767 count = -count;
742 } 768 }
743 769
744 /* C: Resurrect lines */ 770 /* C: Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */
745 for (; i--; j++) 775 for (; i--; j++)
746 {
747 screen.tlen[j] = 0;
748 screen.text[j] = buf_text[i];
749 screen.rend[j] = buf_rend[i];
750
751 if (!spec) /* line length may not equal TermWin.ncol */
752 scr_blank_screen_mem (screen.text, screen.rend, 776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
753 (unsigned int)j, rstyle);
754 }
755 777
756 return count; 778 return count;
757} 779}
758 780
759/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
… …
761 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
762 */ 784 */
763void 785void
764rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 786rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
765{ 787{
766 unsigned char checksel, clearsel; 788 unsigned char checksel;
767 unicode_t c; 789 unicode_t c;
768 int i, row, last_col; 790 int i, row, last_col;
769 text_t *stp; 791 text_t *stp;
770 rend_t *srp; 792 rend_t *srp;
771 793
772 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
773 return; 795 return;
774 796
775 want_refresh = 1; 797 want_refresh = 1;
798 ZERO_SCROLLBACK ();
776 last_col = TermWin.ncol; 799 last_col = TermWin.ncol;
777 800
778 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
779 ZERO_SCROLLBACK ();
780 if (nlines > 0) 801 if (nlines > 0)
781 { 802 {
782 nlines += (screen.cur.row - screen.bscroll); 803 nlines += screen.cur.row - screen.bscroll;
783 if ((nlines > 0) 804 if ((nlines > 0)
784 && (screen.tscroll == 0) 805 && (screen.tscroll == 0)
785 && (screen.bscroll == (TermWin.nrow - 1))) 806 && (screen.bscroll == (TermWin.nrow - 1)))
786 { 807 {
787 /* _at least_ this many lines need to be scrolled */ 808 /* _at least_ this many lines need to be scrolled */
788 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
789 screen.cur.row -= nlines; 810 screen.cur.row -= nlines;
790 } 811 }
791 } 812 }
813
792#ifdef DEBUG_STRICT 814#ifdef DEBUG_STRICT
793 assert (screen.cur.col < last_col); 815 assert (screen.cur.col < last_col);
794 assert ((screen.cur.row < TermWin.nrow) 816 assert ((screen.cur.row < TermWin.nrow)
795 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
796#else /* drive with your eyes closed */ 818#else /* drive with your eyes closed */
797 MIN_IT (screen.cur.col, last_col - 1); 819 MIN_IT (screen.cur.col, last_col - 1);
798 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
799 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
800#endif 822#endif
801 row = screen.cur.row + TermWin.saveLines; 823 row = screen.cur.row + TermWin.saveLines;
802 824
803 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
804 clearsel = 0;
805 826
806 stp = screen.text[row]; 827 stp = screen.text[row];
807 srp = screen.rend[row]; 828 srp = screen.rend[row];
808 829
809 while (len--) 830 while (len--)
… …
812 833
813 if (c < 0x20) 834 if (c < 0x20)
814 switch (c) 835 switch (c)
815 { 836 {
816 case C0_HT: 837 case C0_HT:
817 scr_tab (1); 838 scr_tab (1, true);
818 continue; 839 continue;
819 840
820 case C0_LF: 841 case C0_LF:
821 if (screen.tlen[row] != -1) /* XXX: think about this */ 842 if (screen.tlen[row] != -1) /* XXX: think about this */
822 MAX_IT (screen.tlen[row], screen.cur.col); 843 MAX_IT (screen.tlen[row], screen.cur.col);
… …
844 if (checksel /* see if we're writing within selection */ 865 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 868 {
848 checksel = 0; 869 checksel = 0;
849 clearsel = 1; 870 /*
871 * If we wrote anywhere in the selected area, kill the selection
872 * XXX: should we kill the mark too? Possibly, but maybe that
873 * should be a similar check.
874 */
875 CLEAR_SELECTION ();
850 } 876 }
851 877
852 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
853 { 879 {
854 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
855 if (screen.cur.row == screen.bscroll) 881
856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
857 else if (screen.cur.row < (TermWin.nrow - 1))
858 row = (++screen.cur.row) + TermWin.saveLines; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
859 883
860 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
861 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
862 screen.cur.col = 0;
863 screen.flags &= ~Screen_WrapNext;
864 } 886 }
865
866 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT);
868 887
869 // rely on wcwidth to tell us the character width, at least for non-latin1 888 // rely on wcwidth to tell us the character width, at least for non-latin1
870 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
871 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
872 int width = c < 256 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
873 892
874 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
875 { 894 {
876 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars
877 static uint16_t vt100_0[32] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
878 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
879 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
880 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
881 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
882 }; 907 };
883 908
884 if (c >= 0x5f && c <= 0x7e) 909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
885 { 910 {
886 c = vt100_0[c - 0x5f]; 911 c = vt100_0[c - 0x40];
887 width = 1; 912 width = 1;
888 } 913 }
889 } 914 }
890 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
891 if (width > 0) 919 if (width != 0)
892 { 920 {
893#if !UNICODE_3 && ENABLE_COMBINING 921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3
894 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
895 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
896 c = rxvt_composite.compose (c); // map to lower 16 bits 929 c = rxvt_composite.compose (c); // map to lower 16 bits
930# else
931 c = 0xfffd;
897#endif 932# endif
933#endif
934
935 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR))
939 {
940 int col = screen.cur.col;
941
942 // find begin
943 while (col > 0 && stp[col] == NOCHAR)
944 col--;
945
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
947
948 // found begin, nuke
949 do {
950 stp[col] = ' ';
951 srp[col] = rend;
952 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 }
955
898 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899 957
900 do 958 do
901 { 959 {
902 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
903 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
915 c = NOCHAR; 973 c = NOCHAR;
916 } 974 }
917 while (--width > 0); 975 while (--width > 0);
918 976
919 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
921 { 980 {
922 stp[c] = ' '; 981 stp[c] = ' ';
923 srp[c] = rend; 982 srp[c] = rend;
924 } 983 }
925 } 984 }
926 else if (width == 0) 985 else if (width == 0)
927 { 986 {
928#if ENABLE_COMBINING 987#if ENABLE_COMBINING
929 // handle combining characters 988 // handle combining characters
… …
936 995
937 if (screen.cur.col > 0) 996 if (screen.cur.col > 0)
938 { 997 {
939 tp = stp + screen.cur.col - 1; 998 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1; 999 rp = srp + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
941 } 1003 }
942 else if (screen.cur.row > 0 1004 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 { 1006 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007 int line = screen.cur.row - 1 + TermWin.saveLines;
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1008
1009 tp = screen.text[line] + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
947 } 1014 }
948 else 1015 else
949 continue; 1016 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954 1017
955 // first try to find a precomposed character 1018 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c); 1019 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 1020 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 1021 n = rxvt_composite.compose (*tp, c);
959 1022
960 *tp = n; 1023 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962#endif 1025#endif
963 } 1026 }
964 } 1027 }
965 1028
966 if (screen.tlen[row] != -1) /* XXX: think about this */ 1029 if (screen.tlen[row] != -1) /* XXX: think about this */
967 MAX_IT (screen.tlen[row], screen.cur.col); 1030 MAX_IT (screen.tlen[row], screen.cur.col);
968
969 /*
970 * If we wrote anywhere in the selected area, kill the selection
971 * XXX: should we kill the mark too? Possibly, but maybe that
972 * should be a similar check.
973 */
974 if (clearsel)
975 CLEAR_SELECTION ();
976 1031
977#ifdef DEBUG_STRICT 1032#ifdef DEBUG_STRICT
978 assert (screen.cur.row >= 0); 1033 assert (screen.cur.row >= 0);
979#else /* drive with your eyes closed */ 1034#else /* drive with your eyes closed */
980 MAX_IT (screen.cur.row, 0); 1035 MAX_IT (screen.cur.row, 0);
… …
998#ifdef TERMCAP_HAS_BW 1053#ifdef TERMCAP_HAS_BW
999 screen.cur.col = TermWin.ncol - 1; 1054 screen.cur.col = TermWin.ncol - 1;
1000 screen.cur.row--; 1055 screen.cur.row--;
1001 return; 1056 return;
1002#endif 1057#endif
1003
1004 } 1058 }
1005 } 1059 }
1006 else if ((screen.flags & Screen_WrapNext) == 0) 1060 else if (!(screen.flags & Screen_WrapNext))
1007 scr_gotorc (0, -1, RELATIVE); 1061 scr_gotorc (0, -1, RELATIVE);
1008 1062
1009 screen.flags &= ~Screen_WrapNext; 1063 screen.flags &= ~Screen_WrapNext;
1010} 1064}
1011 1065
… …
1014 * Process Horizontal Tab 1068 * Process Horizontal Tab
1015 * count: +ve = forward; -ve = backwards 1069 * count: +ve = forward; -ve = backwards
1016 * XTERM_SEQ: CTRL-I 1070 * XTERM_SEQ: CTRL-I
1017 */ 1071 */
1018void 1072void
1019rxvt_term::scr_tab (int count) 1073rxvt_term::scr_tab (int count, bool ht)
1020{ 1074{
1021 int i, x; 1075 int i, x;
1022 1076
1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1024 want_refresh = 1; 1077 want_refresh = 1;
1025 i = x = screen.cur.col; 1078 i = x = screen.cur.col;
1026 1079
1027 if (count == 0) 1080 if (count == 0)
1028 return; 1081 return;
1029 else if (count > 0) 1082 else if (count > 0)
1030 { 1083 {
1084 int row = TermWin.saveLines + screen.cur.row;
1085 text_t *tp = screen.text[row];
1086 rend_t *rp = screen.rend[row];
1087 rend_t base_rend = rp[i];
1088 ht &= tp[i] == ' ';
1089
1031 for (; ++i < TermWin.ncol; ) 1090 for (; ++i < TermWin.ncol; )
1032 if (tabs[i]) 1091 if (tabs[i])
1033 { 1092 {
1034 x = i; 1093 x = i;
1035 if (!--count) 1094 if (!--count)
1036 break; 1095 break;
1037 } 1096 }
1097 else
1098 ht &= tp[i] == ' '
1099 && RS_SAME (rp[i], base_rend);
1038 1100
1039 if (count) 1101 if (count)
1040 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1103
1104 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs)
1107 {
1108 base_rend = SET_FONT (base_rend, 0);
1109
1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x);
1112
1113 i = screen.cur.col;
1114
1115 tp[i] = '\t';
1116 rp[i] = base_rend;
1117
1118 while (++i < x)
1119 {
1120 tp[i] = NOCHAR;
1121 rp[i] = base_rend;
1122 }
1123 }
1041 } 1124 }
1042 else /* if (count < 0) */ 1125 else /* if (count < 0) */
1043 { 1126 {
1044 for (; --i >= 0; ) 1127 for (; --i >= 0; )
1045 if (tabs[i]) 1128 if (tabs[i])
… …
1062 * Process DEC Back Index 1145 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1066 */ 1149 */
1067#ifndef NO_FRILLS 1150#if ENABLE_FRILLS
1068void 1151void
1069rxvt_term::scr_backindex () 1152rxvt_term::scr_backindex ()
1070{ 1153{
1071 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1156 else
1074 { 1157 {
1075 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1076 return; /* um, yeah? */ 1159 return; /* um, yeah? */
1160
1077 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
1078 } 1162 }
1079} 1163}
1080#endif 1164#endif
1081/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
… …
1083 * Process DEC Forward Index 1167 * Process DEC Forward Index
1084 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1085 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1086 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1087 */ 1171 */
1088#ifndef NO_FRILLS 1172#if ENABLE_FRILLS
1089void 1173void
1090rxvt_term::scr_forwardindex () 1174rxvt_term::scr_forwardindex ()
1091{ 1175{
1092 int row; 1176 int row;
1093 1177
1094 if (screen.cur.col < TermWin.ncol - 1) 1178 if (screen.cur.col < TermWin.ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1180 else
1097 { 1181 {
1098 row = screen.cur.row + TermWin.saveLines; 1182 row = screen.cur.row + TermWin.saveLines;
1183
1099 if (screen.tlen[row] == 0) 1184 if (screen.tlen[row] == 0)
1100 return; /* um, yeah? */ 1185 return; /* um, yeah? */
1101 else if (screen.tlen[row] == -1) 1186 else if (screen.tlen[row] == -1)
1102 screen.tlen[row] = TermWin.ncol; 1187 screen.tlen[row] = TermWin.ncol;
1188
1103 scr_gotorc (0, 0, R_RELATIVE); 1189 scr_gotorc (0, 0, R_RELATIVE);
1104 scr_insdel_chars (1, DELETE); 1190 scr_insdel_chars (1, DELETE);
1105 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1106 } 1192 }
1107} 1193}
… …
1115rxvt_term::scr_gotorc (int row, int col, int relative) 1201rxvt_term::scr_gotorc (int row, int col, int relative)
1116{ 1202{
1117 want_refresh = 1; 1203 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1119 1205
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));
1121
1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1123 MAX_IT (screen.cur.col, 0); 1207 MAX_IT (screen.cur.col, 0);
1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1125 1209
1126 screen.flags &= ~Screen_WrapNext; 1210 screen.flags &= ~Screen_WrapNext;
1211
1127 if (relative & R_RELATIVE) 1212 if (relative & R_RELATIVE)
1128 { 1213 {
1129 if (row > 0) 1214 if (row > 0)
1130 { 1215 {
1131 if (screen.cur.row <= screen.bscroll 1216 if (screen.cur.row <= screen.bscroll
… …
1151 MIN_IT (screen.cur.row, screen.bscroll); 1236 MIN_IT (screen.cur.row, screen.bscroll);
1152 } 1237 }
1153 else 1238 else
1154 screen.cur.row = row; 1239 screen.cur.row = row;
1155 } 1240 }
1241
1156 MAX_IT (screen.cur.row, 0); 1242 MAX_IT (screen.cur.row, 0);
1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1162} 1244}
1163 1245
1164/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1165/* 1247/*
1166 * direction should be UP or DN 1248 * direction should be UP or DN
1167 */ 1249 */
1168void 1250void
1169rxvt_term::scr_index (enum page_dirn direction) 1251rxvt_term::scr_index (enum page_dirn direction)
1170{ 1252{
1171 int dirn; 1253 int dirn;
1172 1254
1173 want_refresh = 1; 1255 want_refresh = 1;
1256 ZERO_SCROLLBACK ();
1257
1174 dirn = ((direction == UP) ? 1 : -1); 1258 dirn = ((direction == UP) ? 1 : -1);
1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1176
1177 ZERO_SCROLLBACK ();
1178 1259
1179 screen.flags &= ~Screen_WrapNext; 1260 screen.flags &= ~Screen_WrapNext;
1261
1180 if ((screen.cur.row == screen.bscroll && direction == UP) 1262 if ((screen.cur.row == screen.bscroll && direction == UP)
1181 || (screen.cur.row == screen.tscroll && direction == DN)) 1263 || (screen.cur.row == screen.tscroll && direction == DN))
1182 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1183 else 1265 else
1184 screen.cur.row += dirn; 1266 screen.cur.row += dirn;
1267
1185 MAX_IT (screen.cur.row, 0); 1268 MAX_IT (screen.cur.row, 0);
1186 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1187 selection_check (0); 1270 selection_check (0);
1188} 1271}
1189 1272
… …
1198rxvt_term::scr_erase_line (int mode) 1281rxvt_term::scr_erase_line (int mode)
1199{ 1282{
1200 unsigned int row, col, num; 1283 unsigned int row, col, num;
1201 1284
1202 want_refresh = 1; 1285 want_refresh = 1;
1203 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1204 ZERO_SCROLLBACK (); 1286 ZERO_SCROLLBACK ();
1205 1287
1206 selection_check (1); 1288 selection_check (1);
1207
1208 screen.flags &= ~Screen_WrapNext;
1209 1289
1210 row = TermWin.saveLines + screen.cur.row; 1290 row = TermWin.saveLines + screen.cur.row;
1211 switch (mode) 1291 switch (mode)
1212 { 1292 {
1213 case 0: /* erase to end of line */ 1293 case 0: /* erase to end of line */
… …
1236 default: 1316 default:
1237 return; 1317 return;
1238 } 1318 }
1239 1319
1240 if (screen.text[row]) 1320 if (screen.text[row])
1241 scr_blank_line (& (screen.text[row][col]), 1321 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1242 & (screen.rend[row][col]), num, rstyle);
1243 else 1322 else
1244 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1323 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1245} 1324}
1246 1325
1247/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
… …
1258 int32_t row, row_offset; 1337 int32_t row, row_offset;
1259 rend_t ren; 1338 rend_t ren;
1260 XGCValues gcvalue; 1339 XGCValues gcvalue;
1261 1340
1262 want_refresh = 1; 1341 want_refresh = 1;
1263 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1264 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1343
1265 row_offset = (int32_t)TermWin.saveLines; 1344 row_offset = (int32_t)TermWin.saveLines;
1266 1345
1267 switch (mode) 1346 switch (mode)
1268 { 1347 {
1269 case 0: /* erase to end of screen */ 1348 case 0: /* erase to end of screen */
… …
1285 break; 1364 break;
1286 default: 1365 default:
1287 return; 1366 return;
1288 } 1367 }
1289 1368
1290 refresh_type |= REFRESH_BOUNDS;
1291
1292 if (selection.op && current_screen == selection.screen 1369 if (selection.op && current_screen == selection.screen
1293 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1370 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1294 || (selection.end.row >= row 1371 || (selection.end.row >= row
1295 && selection.end.row <= row + num))) 1372 && selection.end.row <= row + num)))
1296 CLEAR_SELECTION (); 1373 CLEAR_SELECTION ();
… …
1307 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1308 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1309 } 1386 }
1310 else 1387 else
1311 { 1388 {
1312 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1313 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1315 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1316 gcvalue.foreground = PixColors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1318 } 1395 }
1319 1396
1320 for (; num--; row++) 1397 for (; num--; row++)
1321 { 1398 {
1322 scr_blank_screen_mem (screen.text, screen.rend, 1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1323 (unsigned int) (row + row_offset), rstyle);
1324 screen.tlen[row + row_offset] = 0; 1400 screen.tlen[row + row_offset] = 0;
1325 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1326 (unsigned int)TermWin.ncol, ren);
1327 } 1402 }
1328} 1403}
1329 1404
1330/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1331/* 1406/*
… …
1337{ 1412{
1338 int i, j, k; 1413 int i, j, k;
1339 rend_t *r1, fs; 1414 rend_t *r1, fs;
1340 1415
1341 want_refresh = 1; 1416 want_refresh = 1;
1417 ZERO_SCROLLBACK ();
1418
1342 num_scr_allow = 0; 1419 num_scr_allow = 0;
1343 ZERO_SCROLLBACK ();
1344 selection_check (3); 1420 selection_check (3);
1345 1421
1346 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1347 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1348 { 1424 {
1349 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1350 fill_text (screen.text[k], 'E', TermWin.ncol); 1426 fill_text (screen.text[k], 'E', TermWin.ncol);
1351 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1375 if (insdel == DELETE) 1451 if (insdel == DELETE)
1376 return; 1452 return;
1377 else if (insdel == INSERT) 1453 else if (insdel == INSERT)
1378 count = end; 1454 count = end;
1379 } 1455 }
1380 screen.flags &= ~Screen_WrapNext; 1456
1457 scr_do_wrap ();
1381 1458
1382 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1383} 1460}
1384 1461
1385/* ------------------------------------------------------------------------- */ 1462/* ------------------------------------------------------------------------- */
… …
1399 ZERO_SCROLLBACK (); 1476 ZERO_SCROLLBACK ();
1400 1477
1401 if (count <= 0) 1478 if (count <= 0)
1402 return; 1479 return;
1403 1480
1481 scr_do_wrap ();
1482
1404 selection_check (1); 1483 selection_check (1);
1405 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1484 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1406 1485
1407 row = screen.cur.row + TermWin.saveLines; 1486 row = screen.cur.row + TermWin.saveLines;
1408 screen.flags &= ~Screen_WrapNext;
1409 1487
1410 stp = screen.text[row]; 1488 stp = screen.text[row];
1411 srp = screen.rend[row]; 1489 srp = screen.rend[row];
1412 slp = & (screen.tlen[row]); 1490 slp = &screen.tlen[row];
1413 1491
1414 switch (insdel) 1492 switch (insdel)
1415 { 1493 {
1416 case INSERT: 1494 case INSERT:
1417 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1418 col--)
1419 { 1496 {
1420 stp[col] = stp[col - count]; 1497 stp[col] = stp[col - count];
1421 srp[col] = srp[col - count]; 1498 srp[col] = srp[col - count];
1422 } 1499 }
1423 1500
… …
1433 if (selection.end.row != screen.cur.row 1510 if (selection.end.row != screen.cur.row
1434 || (selection.end.col + count >= TermWin.ncol)) 1511 || (selection.end.col + count >= TermWin.ncol))
1435 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1436 else 1513 else
1437 { /* shift selection */ 1514 { /* shift selection */
1438 selection.beg.col += count; 1515 selection.beg.col += count;
1439 selection.mark.col += count; /* XXX: yes? */ 1516 selection.mark.col += count; /* XXX: yes? */
1440 selection.end.col += count; 1517 selection.end.col += count;
1441 } 1518 }
1442 } 1519 }
1443 1520
1444 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1445 (unsigned int)count, rstyle); 1522 (unsigned int)count, rstyle);
1446 break; 1523 break;
1447 1524
1448 case ERASE: 1525 case ERASE:
1449 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1450 selection_check (1); 1527 selection_check (1);
1451 screen.cur.col -= count; 1528 screen.cur.col -= count;
1452 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1453 (unsigned int)count, rstyle); 1530 (unsigned int)count, rstyle);
1454 break; 1531 break;
1455 1532
1456 case DELETE: 1533 case DELETE:
1457 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1460 { 1537 {
1461 stp[col] = stp[col + count]; 1538 stp[col] = stp[col + count];
1462 srp[col] = srp[col + count]; 1539 srp[col] = srp[col + count];
1463 } 1540 }
1464 1541
1465 scr_blank_line (& (stp[TermWin.ncol - count]), 1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1466 & (srp[TermWin.ncol - count]),
1467 (unsigned int)count, tr); 1543 (unsigned int)count, tr);
1468 1544
1469 if (*slp == -1) /* break line continuation */ 1545 if (*slp == -1) /* break line continuation */
1470 *slp = TermWin.ncol; 1546 *slp = TermWin.ncol;
1471 1547
… …
1480 || selection.end.col >= TermWin.ncol) 1556 || selection.end.col >= TermWin.ncol)
1481 CLEAR_SELECTION (); 1557 CLEAR_SELECTION ();
1482 else 1558 else
1483 { 1559 {
1484 /* shift selection */ 1560 /* shift selection */
1485 selection.beg.col -= count; 1561 selection.beg.col -= count;
1486 selection.mark.col -= count; /* XXX: yes? */ 1562 selection.mark.col -= count; /* XXX: yes? */
1487 selection.end.col -= count; 1563 selection.end.col -= count;
1488 } 1564 }
1489 } 1565 }
1490 1566
1491 break; 1567 break;
1492 } 1568 }
… …
1538rxvt_term::scr_autowrap (int mode) 1614rxvt_term::scr_autowrap (int mode)
1539{ 1615{
1540 if (mode) 1616 if (mode)
1541 screen.flags |= Screen_Autowrap; 1617 screen.flags |= Screen_Autowrap;
1542 else 1618 else
1543 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1544} 1620}
1545 1621
1546/* ------------------------------------------------------------------------- */ 1622/* ------------------------------------------------------------------------- */
1547/* 1623/*
1548 * Set/unset margin origin mode 1624 * Set/unset margin origin mode
… …
1558{ 1634{
1559 if (mode) 1635 if (mode)
1560 screen.flags |= Screen_Relative; 1636 screen.flags |= Screen_Relative;
1561 else 1637 else
1562 screen.flags &= ~Screen_Relative; 1638 screen.flags &= ~Screen_Relative;
1639
1563 scr_gotorc (0, 0, 0); 1640 scr_gotorc (0, 0, 0);
1564} 1641}
1565 1642
1566/* ------------------------------------------------------------------------- */ 1643/* ------------------------------------------------------------------------- */
1567/* 1644/*
… …
1587 */ 1664 */
1588void 1665void
1589rxvt_term::scr_set_tab (int mode) 1666rxvt_term::scr_set_tab (int mode)
1590{ 1667{
1591 if (mode < 0) 1668 if (mode < 0)
1592 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1669 memset (tabs, 0, TermWin.ncol * sizeof (char));
1593 else if (screen.cur.col < TermWin.ncol) 1670 else if (screen.cur.col < TermWin.ncol)
1594 tabs[screen.cur.col] = (mode ? 1 : 0); 1671 tabs[screen.cur.col] = (mode ? 1 : 0);
1595} 1672}
1596 1673
1597/* ------------------------------------------------------------------------- */ 1674/* ------------------------------------------------------------------------- */
… …
1601 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1602 */ 1679 */
1603void 1680void
1604rxvt_term::scr_rvideo_mode (int mode) 1681rxvt_term::scr_rvideo_mode (int mode)
1605{ 1682{
1606 XGCValues gcvalue; 1683 XGCValues gcvalue;
1607 1684
1608 if (rvideo != mode) 1685 if (rvideo != mode)
1609 { 1686 {
1610 rvideo = mode; 1687 rvideo = mode;
1611 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1612#if defined(XPM_BACKGROUND) 1689#if XPM_BACKGROUND
1613 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1614#endif 1691#endif
1615#if defined(TRANSPARENT) 1692#if TRANSPARENT
1616 if (! (Options & Opt_transparent) || am_transparent == 0) 1693 if (! (options & Opt_transparent) || am_transparent == 0)
1617#endif 1694#endif
1618 XSetWindowBackground (display->display, TermWin.vt, 1695 XSetWindowBackground (display->display, TermWin.vt,
1619 PixColors[Color_bg]); 1696 pix_colors[Color_bg]);
1620 1697
1621 gcvalue.foreground = PixColors[Color_fg]; 1698 gcvalue.foreground = pix_colors[Color_fg];
1622 gcvalue.background = PixColors[Color_bg]; 1699 gcvalue.background = pix_colors[Color_bg];
1623 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1624 &gcvalue); 1701 &gcvalue);
1625 scr_clear (); 1702 scr_clear ();
1626 scr_touch (true); 1703 scr_touch (true);
1627 } 1704 }
… …
1675 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1676 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1677 */ 1754 */
1678void 1755void
1679rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set)
1680 { 1757{
1681 screen.charset = set; 1758 screen.charset = set;
1682 set_font_style (); 1759 set_font_style ();
1683 } 1760}
1684 1761
1685/* ------------------------------------------------------------------------- */ 1762/* ------------------------------------------------------------------------- */
1686/* 1763/*
1687 * Set a font 1764 * Set a font
1688 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1765 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1691 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1692 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1693 */ 1770 */
1694void 1771void
1695rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch)
1696 { 1773{
1697 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1698 set_font_style (); 1775 set_font_style ();
1699 } 1776}
1700 1777
1701 1778
1702/* ------------------------------------------------------------------------- * 1779/* ------------------------------------------------------------------------- *
1703 * MAJOR SCREEN MANIPULATION * 1780 * MAJOR SCREEN MANIPULATION *
1704 * ------------------------------------------------------------------------- */ 1781 * ------------------------------------------------------------------------- */
… …
1743 row_col_t rc[RC_COUNT]; 1820 row_col_t rc[RC_COUNT];
1744 1821
1745 if (drawn_text == NULL) /* sanity check */ 1822 if (drawn_text == NULL) /* sanity check */
1746 return; 1823 return;
1747 1824
1825#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 {
1828 y = 0;
1829 height = TermWin.height;
1830 }
1831#endif
1832
1748#ifdef DEBUG_STRICT 1833#ifdef DEBUG_STRICT
1749 x = max (x, (int)TermWin.int_bwidth); 1834 x = max (x, 0);
1750 x = min (x, (int)TermWin.width); 1835 x = min (x, (int)TermWin.width);
1751 y = max (y, (int)TermWin.int_bwidth); 1836 y = max (y, 0);
1752 y = min (y, (int)TermWin.height); 1837 y = min (y, (int)TermWin.height);
1753#endif 1838#endif
1754 1839
1755 /* round down */ 1840 /* round down */
1756 rc[PART_BEG].col = Pixel2Col (x); 1841 rc[PART_BEG].col = Pixel2Col (x);
… …
1764 { 1849 {
1765 MIN_IT (rc[i].col, TermWin.ncol - 1); 1850 MIN_IT (rc[i].col, TermWin.ncol - 1);
1766 MIN_IT (rc[i].row, TermWin.nrow - 1); 1851 MIN_IT (rc[i].row, TermWin.nrow - 1);
1767 } 1852 }
1768 1853
1769 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));
1770
1771 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1772 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1773 (rc[PART_END].col - rc[PART_BEG].col + 1));
1774 1856
1775 if (refresh) 1857 if (refresh)
1776 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1858 scr_refresh (SLOW_REFRESH);
1777} 1859}
1778 1860
1779/* ------------------------------------------------------------------------- */ 1861/* ------------------------------------------------------------------------- */
1780/* 1862/*
1781 * Refresh the entire screen 1863 * Refresh the entire screen
… …
1793 */ 1875 */
1794int 1876int
1795rxvt_term::scr_move_to (int y, int len) 1877rxvt_term::scr_move_to (int y, int len)
1796{ 1878{
1797 long p = 0; 1879 long p = 0;
1798 uint16_t oldviewstart; 1880 unsigned int oldviewstart;
1799 1881
1800 oldviewstart = TermWin.view_start; 1882 oldviewstart = TermWin.view_start;
1883
1801 if (y < len) 1884 if (y < len)
1802 { 1885 {
1803 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1804 p -= (long) (TermWin.nrow - 1); 1887 p -= (long) (TermWin.nrow - 1);
1805 p = max (p, 0); 1888 p = max (p, 0);
1806 } 1889 }
1890
1807 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1808 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1809 1892
1810 return scr_changeview (oldviewstart); 1893 return scr_changeview (oldviewstart);
1811} 1894}
1812 1895
1813/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
… …
1816 * direction should be UP or DN 1899 * direction should be UP or DN
1817 */ 1900 */
1818int 1901int
1819rxvt_term::scr_page (enum page_dirn direction, int nlines) 1902rxvt_term::scr_page (enum page_dirn direction, int nlines)
1820{ 1903{
1821 int n; 1904 int n;
1822 uint16_t oldviewstart; 1905 unsigned int oldviewstart;
1823 1906
1824 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1825#ifdef DEBUG_STRICT 1907#ifdef DEBUG_STRICT
1826 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1827#endif 1909#endif
1828 oldviewstart = TermWin.view_start; 1910 oldviewstart = TermWin.view_start;
1829 if (direction == UP) 1911 if (direction == UP)
… …
1838 } 1920 }
1839 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1840} 1922}
1841 1923
1842int 1924int
1843rxvt_term::scr_changeview (uint16_t oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
1844{ 1926{
1845 if (TermWin.view_start != oldviewstart) 1927 if (TermWin.view_start != oldviewstart)
1846 { 1928 {
1847 want_refresh = 1; 1929 want_refresh = 1;
1848 num_scr -= (TermWin.view_start - oldviewstart); 1930 num_scr -= (TermWin.view_start - oldviewstart);
… …
1856rxvt_term::scr_bell () 1938rxvt_term::scr_bell ()
1857{ 1939{
1858#ifndef NO_BELL 1940#ifndef NO_BELL
1859# ifndef NO_MAPALERT 1941# ifndef NO_MAPALERT
1860# ifdef MAPALERT_OPTION 1942# ifdef MAPALERT_OPTION
1861 if (Options & Opt_mapAlert) 1943 if (options & Opt_mapAlert)
1862# endif 1944# endif
1863 XMapWindow (display->display, TermWin.parent[0]); 1945 XMapWindow (display->display, TermWin.parent[0]);
1864# endif 1946# endif
1865 if (Options & Opt_visualBell) 1947 if (options & Opt_visualBell)
1866 { 1948 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 scr_rvideo_mode (!rvideo); /* refresh also done */ 1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 } 1951 }
1870 else 1952 else
… …
1876/* ARGSUSED */ 1958/* ARGSUSED */
1877void 1959void
1878rxvt_term::scr_printscreen (int fullhist) 1960rxvt_term::scr_printscreen (int fullhist)
1879{ 1961{
1880#ifdef PRINTPIPE 1962#ifdef PRINTPIPE
1881 int i, r1, nrows, row_offset; 1963 int i, r1, nrows, row_offset;
1882 text_t *t; 1964 FILE *fd;
1883 FILE *fd;
1884 1965
1885 if ((fd = popen_printer ()) == NULL) 1966 if ((fd = popen_printer ()) == NULL)
1886 return; 1967 return;
1968
1887 nrows = TermWin.nrow; 1969 nrows = TermWin.nrow;
1888 row_offset = TermWin.saveLines; 1970 row_offset = TermWin.saveLines;
1971
1889 if (!fullhist) 1972 if (!fullhist)
1890 row_offset -= TermWin.view_start; 1973 row_offset -= TermWin.view_start;
1891 else 1974 else
1892 { 1975 {
1893 nrows += TermWin.nscrolled; 1976 nrows += TermWin.nscrolled;
1894 row_offset -= TermWin.nscrolled; 1977 row_offset -= TermWin.nscrolled;
1895 } 1978 }
1896 1979
1980 wctomb (0, 0);
1981
1897 for (r1 = 0; r1 < nrows; r1++) 1982 for (r1 = 0; r1 < nrows; r1++)
1898 { 1983 {
1899 t = screen.text[r1 + row_offset]; 1984 text_t *tp = screen.text[r1 + row_offset];
1900 for (i = TermWin.ncol - 1; i >= 0; i--) 1985 int len = screen.tlen[r1 + row_offset];
1901 if (!isspace (t[i])) 1986
1902 break; 1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1903 fprintf (fd, "%.*s\n", (i + 1), t); 1988 {
1989 char mb[MB_LEN_MAX];
1990 text_t t = *tp++;
1991 if (t == NOCHAR)
1992 continue;
1993
1994 len = wctomb (mb, t);
1995
1996 if (len <= 0)
1997 {
1998 mb[0] = ' ';
1999 len = 1;
2000 }
2001
2002 fwrite (mb, 1, len, fd);
2003 }
2004
2005 fputc ('\n', fd);
1904 } 2006 }
2007
1905 pclose_printer (fd); 2008 pclose_printer (fd);
1906#endif 2009#endif
1907} 2010}
1908 2011
1909/* ------------------------------------------------------------------------- */ 2012/* ------------------------------------------------------------------------- */
… …
1923 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1924 2027
1925void 2028void
1926rxvt_term::scr_refresh (unsigned char refresh_type) 2029rxvt_term::scr_refresh (unsigned char refresh_type)
1927{ 2030{
1928 unsigned char clearfirst, /* first character writes before cell */
1929 clearlast, /* last character writes beyond cell */
1930 must_clear, /* use draw_string not draw_image_string */ 2031 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 rvid, /* reverse video this position */
1932 showcursor; /* show the cursor */ 2032 showcursor; /* show the cursor */
1933 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1934 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1935 int i, /* tmp */ 2035 int i, /* tmp */
1936 row_offset; /* basic offset in screen structure */ 2036 row_offset; /* basic offset in screen structure */
1937#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
1938 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
1939#endif 2039#endif
1940 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2040 rend_t *crp; // cursor rendition pointer
1941 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2041
2042 want_refresh = 0; /* screen is current */
1942 2043
1943 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2044 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1944 return; 2045 return;
1945 2046
1946 /* 2047 /*
1947 * A: set up vars 2048 * A: set up vars
1948 */ 2049 */
1949 clearfirst = clearlast = must_clear = 0; 2050 must_clear = 0;
1950
1951 refresh_count = 0; 2051 refresh_count = 0;
1952 2052
1953 row_offset = TermWin.saveLines - TermWin.view_start; 2053 row_offset = TermWin.saveLines - TermWin.view_start;
1954 2054
1955 if ((refresh_type & REFRESH_BOUNDS))
1956 {
1957 clearfirst = clearlast = 1;
1958 refresh_type &= ~REFRESH_BOUNDS;
1959 }
1960
1961#ifdef XPM_BACKGROUND 2055#if XPM_BACKGROUND
1962 must_clear |= (bgPixmap.pixmap != None); 2056 must_clear |= (bgPixmap.pixmap != None);
1963#endif 2057#endif
1964#ifdef TRANSPARENT 2058#if TRANSPARENT
1965 must_clear |= ((Options & Opt_transparent) && am_transparent); 2059 must_clear |= ((options & Opt_transparent) && am_transparent);
1966#endif 2060#endif
1967 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1968 2062
1969 /* 2063 /*
1970 * B: reverse any characters which are selected 2064 * B: reverse any characters which are selected
… …
1985 showcursor = 0; 2079 showcursor = 0;
1986#endif 2080#endif
1987 2081
1988 if (showcursor) 2082 if (showcursor)
1989 { 2083 {
2084 int col = screen.cur.col;
2085
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2087 col--;
2088
1990 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1991 2090
1992 if (showcursor && TermWin.focus) 2091 if (showcursor && TermWin.focus)
1993 { 2092 {
1994 *srp ^= RS_RVid; 2093 *crp ^= RS_RVid;
1995#ifndef NO_CURSORCOLOR 2094#ifndef NO_CURSORCOLOR
1996 cc1 = *srp & (RS_fgMask | RS_bgMask); 2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
1997 if (ISSET_PIXCOLOR (Color_cursor)) 2096 if (ISSET_PIXCOLOR (Color_cursor))
1998 ccol1 = Color_cursor; 2097 ccol1 = Color_cursor;
1999 else 2098 else
2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2001 ccol1 = GET_FGCOLOR (rstyle); 2100 ccol1 = GET_FGCOLOR (rstyle);
… …
2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2009 ccol2 = GET_BGCOLOR (rstyle); 2108 ccol2 = GET_BGCOLOR (rstyle);
2010#else 2109#else
2011 ccol2 = Color_bg; 2110 ccol2 = Color_bg;
2012#endif 2111#endif
2013 *srp = SET_FGCOLOR (*srp, ccol1); 2112 *crp = SET_FGCOLOR (*crp, ccol1);
2014 *srp = SET_BGCOLOR (*srp, ccol2); 2113 *crp = SET_BGCOLOR (*crp, ccol2);
2015#endif 2114#endif
2016 } 2115 }
2017 } 2116 }
2018 2117
2019 /* make sure no outline cursor is left around */ 2118 /* make sure no outline cursor is left around */
… …
2046 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2047 } 2146 }
2048 } 2147 }
2049 } 2148 }
2050 2149
2150#if ENABLE_OVERLAY
2151 scr_swap_overlay ();
2152#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156
2051#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2052 /* 2158 /*
2053 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
2054 * This has been deliberately kept simple. 2160 * This has been deliberately kept simple.
2055 */ 2161 */
2056 i = num_scr; 2162 i = num_scr;
2163 if (!display->is_local
2057 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2164 && refresh_type == FAST_REFRESH && num_scr_allow && i
2058 && abs (i) < TermWin.nrow && !must_clear) 2165 && abs (i) < TermWin.nrow && !must_clear)
2059 { 2166 {
2060 int16_t nits; 2167 int16_t nits;
2061 int j; 2168 int j;
2062 rend_t *drp2;
2063 text_t *dtp2;
2064 int len, wlen; 2169 int len, wlen;
2065 2170
2066 j = TermWin.nrow; 2171 j = TermWin.nrow;
2067 wlen = len = -1; 2172 wlen = len = -1;
2068 row = i > 0 ? 0 : j - 1; 2173 row = i > 0 ? 0 : j - 1;
2069 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2070 { 2175 {
2071 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2072 { 2177 {
2073 stp = screen.text[row + row_offset]; 2178 text_t *stp = screen.text[row + row_offset];
2074 srp = screen.rend[row + row_offset]; 2179 rend_t *srp = screen.rend[row + row_offset];
2075 dtp = drawn_text[row]; 2180 text_t *dtp = drawn_text[row];
2076 dtp2 = drawn_text[row + i]; 2181 text_t *dtp2 = drawn_text[row + i];
2077 drp = drawn_rend[row]; 2182 rend_t *drp = drawn_rend[row];
2078 drp2 = drawn_rend[row + i]; 2183 rend_t *drp2 = drawn_rend[row + i];
2079 2184
2080 for (nits = 0, col = TermWin.ncol; col--; ) 2185 for (nits = 0, col = TermWin.ncol; col--; )
2081 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2082 nits--; 2187 nits--;
2083 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2188 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2103 { 2208 {
2104 /* also comes here at end if needed because of >= above */ 2209 /* also comes here at end if needed because of >= above */
2105 if (wlen < len) 2210 if (wlen < len)
2106 SWAP_IT (wlen, len, int); 2211 SWAP_IT (wlen, len, int);
2107 2212
2108 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2109 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2213 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2110 TermWin.gc, 0, Row2Pixel (len + i), 2214 TermWin.gc, 0, Row2Pixel (len + i),
2111 (unsigned int)TermWin_TotalWidth (), 2215 (unsigned int)TermWin_TotalWidth (),
2112 (unsigned int)Height2Pixel (wlen - len + 1), 2216 (unsigned int)Height2Pixel (wlen - len + 1),
2113 0, Row2Pixel (len)); 2217 0, Row2Pixel (len));
… …
2120 /* 2224 /*
2121 * E: main pass across every character 2225 * E: main pass across every character
2122 */ 2226 */
2123 for (row = 0; row < TermWin.nrow; row++) 2227 for (row = 0; row < TermWin.nrow; row++)
2124 { 2228 {
2125 stp = screen.text[row + row_offset]; 2229 text_t *stp = screen.text[row + row_offset];
2126 srp = screen.rend[row + row_offset]; 2230 rend_t *srp = screen.rend[row + row_offset];
2127 dtp = drawn_text[row]; 2231 text_t *dtp = drawn_text[row];
2128 drp = drawn_rend[row]; 2232 rend_t *drp = drawn_rend[row];
2129 2233
2130 /* 2234 /*
2131 * E2: OK, now the real pass 2235 * E2: OK, now the real pass
2132 */ 2236 */
2133 int ypixel = (int)Row2Pixel (row); 2237 int ypixel = (int)Row2Pixel (row);
2134 2238
2135 for (col = 0; col < TermWin.ncol; col++) 2239 for (col = 0; col < TermWin.ncol; col++)
2136 { 2240 {
2137 /* compare new text with old - if exactly the same then continue */ 2241 /* compare new text with old - if exactly the same then continue */
2138 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2242 if (stp[col] == dtp[col] /* Must match characters to skip. */
2139 && (srp[col] == drp[col] /* Either rendition the same or */ 2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2140 || (stp[col] == ' ' /* space w/ no background change */ 2244 || (stp[col] == ' ' /* space w/ no background change */
2141 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2142 continue; 2246 continue;
2143 2247
2144 // redraw one or more characters 2248 // redraw one or more characters
2145 2249
2146 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2147 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2148 --col; 2252 --col;
2149 2253
2150 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2151 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2154 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2155 drp[col] = rend; 2259 drp[col] = rend;
2156 2260
2157 int xpixel = Col2Pixel (col); 2261 int xpixel = Col2Pixel (col);
2158 2262
2159 // this loop looks very messy, it can probably be optimized
2160 // and cleaned a bit by you?
2161 for (i = 0; ++col < TermWin.ncol; ) 2263 for (i = 0; ++col < TermWin.ncol; )
2162 { 2264 {
2163 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2164 { 2266 {
2165 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2166 drp[col] = rend; 2268 drp[col] = rend;
2167 count++; 2269 count++;
2168
2169 if (i) // only possible skip if char unchanged
2170 i++; 2270 i++;
2171 2271
2172 continue; 2272 continue;
2173 } 2273 }
2174 2274
2175 if (rend != srp[col]) 2275 if (!RS_SAME (rend, srp[col]))
2176 break; 2276 break;
2177 2277
2178 count++; 2278 count++;
2179 2279
2180 if (stp[col] != dtp[col] 2280 if (stp[col] != dtp[col]
2181 || srp[col] != drp[col]) 2281 || !RS_SAME (srp[col], drp[col]))
2182 { 2282 {
2183 if (must_clear && (i++ > (count / 2))) 2283 if (must_clear && (i++ > count / 2))
2184 break; 2284 break;
2185 2285
2186 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2187 drp[col] = rend; 2287 drp[col] = rend;
2188 i = 0; 2288 i = 0;
2189 } 2289 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2290 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2191 break; 2291 break;
2192 } 2292 }
2193 2293
2194 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2195 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2296
2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR)
2299 count++, i--;
2300
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2196 2312
2197 /* 2313 /*
2198 * Determine the attributes for the string 2314 * Determine the attributes for the string
2199 */ 2315 */
2200 int fid = GET_FONT (rend);
2201 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2202 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2203 2318
2204 rend = GET_ATTR (rend); 2319 // only do special processing if ana attributes are set, which is rare
2205 2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2206 rvid = !!(rend & RS_RVid); 2321 {
2322 bool invert = rend & RS_RVid;
2207 2323
2208#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2209 if (rend & RS_Bold && fore == Color_fg) 2325 if (rend & RS_Bold
2326 && fore == Color_fg)
2210 { 2327 {
2211 if (ISSET_PIXCOLOR (Color_BD)) 2328 if (ISSET_PIXCOLOR (Color_BD))
2212 fore = Color_BD; 2329 fore = Color_BD;
2330# if !ENABLE_STYLES
2213 else 2331 else
2214 rvid = !rvid; 2332 invert = !invert;
2333# endif
2334 }
2335
2336 if (rend & RS_Italic
2337 && fore == Color_fg)
2338 {
2339 if (ISSET_PIXCOLOR (Color_IT))
2340 fore = Color_IT;
2341# if !ENABLE_STYLES
2342 else
2343 invert = !invert;
2344# endif
2345 }
2346
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL;
2349#endif
2350
2351 if (invert)
2352 {
2353 SWAP_IT (fore, back, int);
2354
2355#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV;
2358#endif
2359 }
2360
2361#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2363 {
2364 if (!text_blink_ev.active)
2365 {
2366 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2367 hidden_text = 0;
2368 }
2369 else if (hidden_text)
2370 fore = back;
2371 }
2372#endif
2215 } 2373 }
2216
2217 if (rend & RS_Uline)
2218 if (ISSET_PIXCOLOR (Color_UL))
2219 fore = Color_UL;
2220#endif
2221
2222 if (rvid)
2223 {
2224 SWAP_IT (fore, back, int);
2225
2226#ifndef NO_BOLD_UNDERLINE_REVERSE
2227 if (ISSET_PIXCOLOR (Color_RV)
2228# ifndef NO_CURSORCOLOR
2229 && !ISSET_PIXCOLOR (Color_cursor)
2230# endif
2231 )
2232 back = Color_RV;
2233#endif
2234 }
2235
2236#ifdef TEXT_BLINK
2237 if (rend & RS_Blink && back == Color_bg)
2238 {
2239 if (!text_blink_ev.active)
2240 {
2241 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2242 hidden_text = 0;
2243 }
2244 else if (hidden_text)
2245 fore = back;
2246 }
2247#endif
2248 2374
2249 /* 2375 /*
2250 * Actually do the drawing of the string here 2376 * Actually do the drawing of the string here
2251 */ 2377 */
2252 rxvt_font *font = (*TermWin.fontset)[fid]; 2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2253 2379
2254 if (back == fore) 2380 if (back == fore)
2255 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2256 TermWin.fwidth * count, TermWin.fheight, 2382 TermWin.fwidth * count, TermWin.fheight,
2257 back); 2383 back);
… …
2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2273 } 2399 }
2274 else 2400 else
2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2276 2402
2277 if ((rend & RS_Uline) && (font->descent > 1)) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2278 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2279 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2280 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2281 } /* for (col....) */ 2410 } /* for (col....) */
2282 } /* for (row....) */ 2411 } /* for (row....) */
2412
2413#if ENABLE_OVERLAY
2414 scr_swap_overlay ();
2415#endif
2283 2416
2284 /* 2417 /*
2285 * G: cleanup cursor and display outline cursor if necessary 2418 * G: cleanup cursor and display outline cursor if necessary
2286 */ 2419 */
2287 if (showcursor) 2420 if (showcursor)
2288 { 2421 {
2289 if (TermWin.focus) 2422 if (TermWin.focus)
2290 { 2423 {
2291 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2292 [screen.cur.col]);
2293 *srp ^= RS_RVid; 2424 *crp ^= RS_RVid;
2294#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2295 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2296#endif 2427#endif
2297 } 2428 }
2298 else if (oldcursor.row >= 0) 2429 else if (oldcursor.row >= 0)
2299 { 2430 {
2300#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2301 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2302 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2303#endif 2434#endif
2304 int cursorwidth = 1; 2435 int cursorwidth = 1;
2305 while (oldcursor.col + cursorwidth < TermWin.ncol 2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2306 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2307 cursorwidth++; 2438 cursorwidth++;
… …
2317 /* 2448 /*
2318 * H: cleanup selection 2449 * H: cleanup selection
2319 */ 2450 */
2320 scr_reverse_selection (); 2451 scr_reverse_selection ();
2321 2452
2322 /*
2323 * I: other general cleanup
2324 */
2325 if (clearfirst && TermWin.int_bwidth)
2326 /*
2327 * clear the whole screen height, note that width == 0 is treated
2328 * specially by XClearArea
2329 */
2330 XClearArea (display->display, TermWin.vt, 0, 0,
2331 (unsigned int)TermWin.int_bwidth,
2332 (unsigned int)TermWin_TotalHeight (), False);
2333
2334 if (clearlast && TermWin.int_bwidth)
2335 /*
2336 * clear the whole screen height, note that width == 0 is treated
2337 * specially by XClearArea
2338 */
2339 XClearArea (display->display, TermWin.vt,
2340 TermWin.width + TermWin.int_bwidth, 0,
2341 (unsigned int)TermWin.int_bwidth,
2342 (unsigned int)TermWin_TotalHeight (), False);
2343
2344 if (refresh_type & SMOOTH_REFRESH) 2453 if (refresh_type & SMOOTH_REFRESH)
2345 XSync (display->display, False); 2454 XFlush (display->display);
2346 2455
2347 num_scr = 0; 2456 num_scr = 0;
2348 num_scr_allow = 1; 2457 num_scr_allow = 1;
2349 want_refresh = 0; /* screen is current */
2350} 2458}
2351 2459
2352void 2460void
2353rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2354{ 2462{
2355 if (!rp || !tp) 2463 if (!rp || !tp)
2356 return; 2464 return;
2357 2465
2358 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2466 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2359 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2360} 2468}
2361 2469
2362void 2470void
2363rxvt_term::scr_remap_chars () 2471rxvt_term::scr_remap_chars ()
2364{ 2472{
… …
2370 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2478 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2371 scr_remap_chars (swap.text[i], swap.rend[i]); 2479 scr_remap_chars (swap.text[i], swap.rend[i]);
2372 } 2480 }
2373} 2481}
2374 2482
2483void
2484rxvt_term::scr_recolour ()
2485{
2486 if (1
2487#if TRANSPARENT
2488 && !am_transparent
2489#endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS
2499 if (scrollBar.win)
2500 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle ();
2503 scrollbar_show (0);
2504 }
2505#endif
2506 }
2507
2508 scr_clear ();
2509 scr_touch (true);
2510 want_refresh = 1;
2511}
2512
2375/* ------------------------------------------------------------------------- */ 2513/* ------------------------------------------------------------------------- */
2376void 2514void
2377rxvt_term::scr_clear (bool really) 2515rxvt_term::scr_clear (bool really)
2378{ 2516{
2379 if (!TermWin.mapped) 2517 if (!TermWin.mapped)
2380 return; 2518 return;
2381 2519
2382 num_scr_allow = 0; 2520 num_scr_allow = 0;
2383 want_refresh = 1; 2521 want_refresh = 1;
2384 2522
2385#ifdef TRANSPARENT 2523#if TRANSPARENT
2386 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2387 { 2525 {
2388 int i; 2526 int i;
2389 2527
2390 if (! (Options & Opt_transparent_all)) 2528 if (!(options & Opt_transparent_all))
2391 i = 0; 2529 i = 0;
2392 else 2530 else
2393 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2394 2532
2395 while (i--) 2533 while (i--)
… …
2411 int end_row = TermWin.saveLines - TermWin.view_start; 2549 int end_row = TermWin.saveLines - TermWin.view_start;
2412 int i = selection.beg.row + TermWin.saveLines; 2550 int i = selection.beg.row + TermWin.saveLines;
2413 int col, row = selection.end.row + TermWin.saveLines; 2551 int col, row = selection.end.row + TermWin.saveLines;
2414 rend_t *srp; 2552 rend_t *srp;
2415 2553
2416 if (i >= end_row) 2554#if ENABLE_FRILLS
2417 col = selection.beg.col; 2555 if (selection.rect)
2556 {
2557 end_row += TermWin.nrow;
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2418 else 2563 else
2564#endif
2565 {
2566 if (i >= end_row)
2567 col = selection.beg.col;
2568 else
2419 { 2569 {
2420 col = 0; 2570 col = 0;
2421 i = end_row; 2571 i = end_row;
2422 } 2572 }
2423 2573
2424 end_row += TermWin.nrow; 2574 end_row += TermWin.nrow;
2575
2425 for (; i < row && i < end_row; i++, col = 0) 2576 for (; i < row && i < end_row; i++, col = 0)
2426 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2427 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2428 2579
2429 if (i == row && i < end_row) 2580 if (i == row && i < end_row)
2430 for (srp = screen.rend[i]; col < selection.end.col; col++) 2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2431 srp[col] ^= RS_RVid; 2582 srp[col] ^= RS_RVid;
2583 }
2432 } 2584 }
2433} 2585}
2434 2586
2435/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2436/* 2588/*
… …
2472 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2473 */ 2625 */
2474void 2626void
2475rxvt_term::selection_check (int check_more) 2627rxvt_term::selection_check (int check_more)
2476{ 2628{
2477 row_col_t pos; 2629 row_col_t pos;
2478 2630
2479 if (!selection.op) 2631 if (!selection.op)
2480 return; 2632 return;
2481 2633
2482 pos.row = pos.col = 0; 2634 pos.row = pos.col = 0;
… …
2509rxvt_term::paste (const unsigned char *data, unsigned int len) 2661rxvt_term::paste (const unsigned char *data, unsigned int len)
2510{ 2662{
2511 unsigned int i, j, n; 2663 unsigned int i, j, n;
2512 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2513 2665
2514#if 0
2515 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2516 ZERO_SCROLLBACK (r);
2517#endif
2518
2519 /* convert normal newline chars into common keyboard Return key sequence */ 2666 /* convert normal newline chars into common keyboard Return key sequence */
2520 for (i = 0; i < len; i += PROP_SIZE) 2667 for (i = 0; i < len; i += PROP_SIZE)
2521 { 2668 {
2522 n = min (len - i, PROP_SIZE); 2669 n = min (len - i, PROP_SIZE);
2523 MEMCPY (ds, data + i, n); 2670 memcpy (ds, data + i, n);
2524 2671
2525 for (j = 0; j < n; j++) 2672 for (j = 0; j < n; j++)
2526 if (ds[j] == C0_LF) 2673 if (ds[j] == C0_LF)
2527 ds[j] = C0_CR; 2674 ds[j] = C0_CR;
2528 2675
… …
2541rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2542{ 2689{
2543 long nread = 0; 2690 long nread = 0;
2544 unsigned long bytes_after; 2691 unsigned long bytes_after;
2545 XTextProperty ct; 2692 XTextProperty ct;
2546
2547 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2548 2693
2549 if (prop == None) /* check for failed XConvertSelection */ 2694 if (prop == None) /* check for failed XConvertSelection */
2550 { 2695 {
2551 if ((selection_type & Sel_CompoundText)) 2696 if ((selection_type & Sel_CompoundText))
2552 { 2697 {
… …
2579 &ct.nitems, &bytes_after, 2724 &ct.nitems, &bytes_after,
2580 &ct.value) != Success) 2725 &ct.value) != Success)
2581 break; 2726 break;
2582 2727
2583 if (ct.encoding == 0) 2728 if (ct.encoding == 0)
2729 break;
2730
2731 if (ct.encoding == xa[XA_INCR])
2584 { 2732 {
2585 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2733 // INCR selection, start handshake
2734 XDeleteProperty (display->display, win, prop);
2735 selection_wait = Sel_incr;
2736 incr_ev.start (NOW + 10);
2586 break; 2737 break;
2587 } 2738 }
2588 2739
2589 if (ct.value == NULL) 2740 if (ct.value == NULL)
2590 {
2591 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2592 continue; 2741 continue;
2593 }
2594 2742
2595 if (ct.nitems == 0) 2743 if (ct.nitems == 0)
2596 { 2744 {
2597 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2598
2599 if (selection_wait == Sel_normal && nread == 0 2745 if (selection_wait == Sel_normal && nread == 0
2600 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2746 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2601 { 2747 {
2602 /* 2748 /*
2603 * pass through again trying CUT_BUFFER0 if we've come from 2749 * pass through again trying CUT_BUFFER0 if we've come from
2604 * XConvertSelection () but nothing was presented 2750 * XConvertSelection () but nothing was presented
2605 */ 2751 */
2606 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2607 selection_paste (display->root, XA_CUT_BUFFER0, False); 2752 selection_paste (display->root, XA_CUT_BUFFER0, False);
2608 } 2753 }
2609 2754
2610 nread = -1; /* discount any previous stuff */ 2755 nread = -1; /* discount any previous stuff */
2611 break; 2756 break;
… …
2613 2758
2614 nread += ct.nitems; 2759 nread += ct.nitems;
2615 2760
2616 char **cl; 2761 char **cl;
2617 int cr; 2762 int cr;
2763
2764#if ENABLE_FRILLS
2765 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2766 // so recode it manually
2767 if (ct.encoding == xa[XA_UTF8_STRING])
2768 {
2769 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2770 char *s = rxvt_wcstombs (w);
2771
2772 // TODO: strlen == only the first element will be converted. well...
2773 paste ((unsigned char *)s, strlen (s));
2774
2775 free (s);
2776 free (w);
2777 }
2778 else
2779#endif
2618 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2619 &cr) >= 0 && cl)
2620 { 2781 {
2621 for (int i = 0; i < cr; i++) 2782 for (int i = 0; i < cr; i++)
2622 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2783 paste ((unsigned char *)cl[i], strlen (cl[i]));
2623 2784
2624 XFreeStringList (cl); 2785 XFreeStringList (cl);
2625 } 2786 }
2626 else 2787 else
2627 paste (ct.value, ct.nitems); 2788 paste (ct.value, ct.nitems);
… …
2636 XFree (ct.value); 2797 XFree (ct.value);
2637 2798
2638 if (selection_wait == Sel_normal) 2799 if (selection_wait == Sel_normal)
2639 selection_wait = Sel_none; 2800 selection_wait = Sel_none;
2640 2801
2641 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2642 return (int)nread; 2802 return (int)nread;
2643} 2803}
2644 2804
2645void 2805void
2646rxvt_term::incr_cb (time_watcher &w) 2806rxvt_term::incr_cb (time_watcher &w)
… …
2654 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2814 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2655 */ 2815 */
2656void 2816void
2657rxvt_term::selection_property (Window win, Atom prop) 2817rxvt_term::selection_property (Window win, Atom prop)
2658{ 2818{
2659 int reget_time = 0; 2819 if (prop == None || selection_wait != Sel_incr)
2660
2661 if (prop == None)
2662 return; 2820 return;
2663 2821
2664 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2665 if (selection_wait == Sel_normal)
2666 {
2667 int a, afmt;
2668 Atom atype;
2669 unsigned long bytes_after, nitems;
2670 unsigned char *s = NULL;
2671
2672 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2673 xa[XA_INCR], &atype, &afmt, &nitems,
2674 &bytes_after, &s);
2675 if (s)
2676 XFree (s);
2677 if (a != Success)
2678 return;
2679
2680#ifndef __CYGWIN32__
2681 if (atype == xa[XA_INCR])
2682 { /* start an INCR transfer */
2683 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2684 XDeleteProperty (display->display, win, prop);
2685 XFlush (display->display);
2686 reget_time = 1;
2687 selection_wait = Sel_incr;
2688 }
2689#endif
2690
2691 }
2692 else if (selection_wait == Sel_incr)
2693 {
2694 reget_time = 1;
2695
2696 if (selection_paste (win, prop, True) == -1) 2822 if (selection_paste (win, prop, 1) > 0)
2697 {
2698 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2699 selection_wait = Sel_none;
2700 incr_ev.stop ();
2701 }
2702 }
2703 if (reget_time) /* received more data so reget time */
2704 incr_ev.start (NOW + 10); 2823 incr_ev.start (NOW + 10);
2824 else
2825 {
2826 selection_wait = Sel_none;
2827 incr_ev.stop ();
2828 }
2705} 2829}
2706 2830
2707/* ------------------------------------------------------------------------- */ 2831/* ------------------------------------------------------------------------- */
2708/* 2832/*
2709 * Request the current selection: 2833 * Request the current selection:
… …
2715 * EXT: button 2 release 2839 * EXT: button 2 release
2716 */ 2840 */
2717void 2841void
2718rxvt_term::selection_request (Time tm, int x, int y) 2842rxvt_term::selection_request (Time tm, int x, int y)
2719{ 2843{
2720 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2721
2722 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2844 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2723 return; /* outside window */ 2845 return; /* outside window */
2724 2846
2725 if (selection.text) 2847 if (selection.text)
2726 { /* internal selection */ 2848 { /* internal selection */
2727 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2728 char *str = rxvt_wcstombs (selection.text, selection.len); 2849 char *str = rxvt_wcstombs (selection.text, selection.len);
2729 paste ((unsigned char *)str, strlen (str)); 2850 paste ((unsigned char *)str, strlen (str));
2730 free (str); 2851 free (str);
2731 return; 2852 return;
2732 } 2853 }
… …
2746#else 2867#else
2747 selection_type = Sel_CompoundText; 2868 selection_type = Sel_CompoundText;
2748 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2869 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2749 return; 2870 return;
2750#endif 2871#endif
2751
2752 } 2872 }
2753 } 2873 }
2754 2874
2755 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2756 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2757 selection_paste (display->root, XA_CUT_BUFFER0, False); 2876 selection_paste (display->root, XA_CUT_BUFFER0, False);
2758} 2877}
2759 2878
2760int 2879int
2761rxvt_term::selection_request_other (Atom target, int selnum) 2880rxvt_term::selection_request_other (Atom target, int selnum)
… …
2774 else 2893 else
2775 sel = xa[XA_CLIPBOARD]; 2894 sel = xa[XA_CLIPBOARD];
2776 2895
2777 if (XGetSelectionOwner (display->display, sel) != None) 2896 if (XGetSelectionOwner (display->display, sel) != None)
2778 { 2897 {
2779 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2780 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2898 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2781 TermWin.vt, selection_request_time); 2899 TermWin.vt, selection_request_time);
2782 return 1; 2900 return 1;
2783 } 2901 }
2784 2902
… …
2791 * EXT: SelectionClear 2909 * EXT: SelectionClear
2792 */ 2910 */
2793void 2911void
2794rxvt_term::selection_clear () 2912rxvt_term::selection_clear ()
2795{ 2913{
2796 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2797
2798 want_refresh = 1; 2914 want_refresh = 1;
2799 free (selection.text); 2915 free (selection.text);
2800 selection.text = NULL; 2916 selection.text = NULL;
2801 selection.len = 0; 2917 selection.len = 0;
2802 CLEAR_SELECTION (); 2918 CLEAR_SELECTION ();
… …
2815{ 2931{
2816 int i, col, end_col, row, end_row; 2932 int i, col, end_col, row, end_row;
2817 wchar_t *new_selection_text; 2933 wchar_t *new_selection_text;
2818 text_t *t; 2934 text_t *t;
2819 2935
2820 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2821 switch (selection.op) 2936 switch (selection.op)
2822 { 2937 {
2823 case SELECTION_CONT: 2938 case SELECTION_CONT:
2824 break; 2939 break;
2825 case SELECTION_INIT: 2940 case SELECTION_INIT:
… …
2839 2954
2840 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2955 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2841 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2956 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2842 2957
2843 col = selection.beg.col; 2958 col = selection.beg.col;
2844 MAX_IT (col, 0);
2845 row = selection.beg.row + TermWin.saveLines; 2959 row = selection.beg.row + TermWin.saveLines;
2846 end_row = selection.end.row + TermWin.saveLines; 2960 end_row = selection.end.row + TermWin.saveLines;
2847 int ofs = 0; 2961 int ofs = 0;
2848 int extra = 0; 2962 int extra = 0;
2849 2963
2850 for (; row <= end_row; row++, col = 0) 2964 for (; row <= end_row; row++, col = 0)
2851 { 2965 {
2852 t = &(screen.text[row][col]);
2853
2854 end_col = screen.tlen[row]; 2966 end_col = screen.tlen[row];
2967
2968#if ENABLE_FRILLS
2969 if (selection.rect)
2970 {
2971 col = selection.beg.col;
2972 end_col = TermWin.ncol + 1;
2973 }
2974#endif
2975
2976 MAX_IT (col, 0);
2855 2977
2856 if (end_col == -1) 2978 if (end_col == -1)
2857 end_col = TermWin.ncol; 2979 end_col = TermWin.ncol;
2858 2980
2859 if (row == end_row) 2981 if (row == end_row || selection.rect)
2860 MIN_IT (end_col, selection.end.col); 2982 MIN_IT (end_col, selection.end.col);
2861 2983
2984 t = &screen.text[row][col];
2862 for (; col < end_col; col++) 2985 for (; col < end_col; col++)
2863 { 2986 {
2864 if (*t == NOCHAR) 2987 if (*t == NOCHAR)
2865 t++; 2988 t++;
2866#if ENABLE_COMBINING 2989#if ENABLE_COMBINING
… …
2914#if 0 3037#if 0
2915 XTextProperty ct; 3038 XTextProperty ct;
2916 3039
2917 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3040 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2918 { 3041 {
2919 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3042 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2920 PropModeReplace, ct.value, ct.nitems);
2921 XFree (ct.value); 3043 XFree (ct.value);
2922 } 3044 }
2923#endif 3045#endif
2924 3046
2925 selection_time = tm; 3047 selection_time = tm;
2926 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2927} 3048}
2928 3049
2929/* ------------------------------------------------------------------------- */ 3050/* ------------------------------------------------------------------------- */
2930/* 3051/*
2931 * Mark or select text based upon number of clicks: 1, 2, or 3 3052 * Mark or select text based upon number of clicks: 1, 2, or 3
2932 * EXT: button 1 press 3053 * EXT: button 1 press
2933 */ 3054 */
2934void 3055void
2935rxvt_term::selection_click (int clicks, int x, int y) 3056rxvt_term::selection_click (int clicks, int x, int y)
2936{ 3057{
2937 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2938
2939 clicks = ((clicks - 1) % 3) + 1; 3058 clicks = ((clicks - 1) % 3) + 1;
2940 selection.clicks = clicks; /* save clicks so extend will work */ 3059 selection.clicks = clicks; /* save clicks so extend will work */
2941 3060
2942 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3061 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2943 3062
… …
2985 * We now only find out the boundary in one direction 3104 * We now only find out the boundary in one direction
2986 */ 3105 */
2987 3106
2988/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3107/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2989#define DELIMIT_TEXT(x) \ 3108#define DELIMIT_TEXT(x) \
2990 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2991#define DELIMIT_REND(x) 1 3110#define DELIMIT_REND(x) 1
2992 3111
2993void 3112void
2994rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2995{ 3114{
… …
3013 3132
3014 row = mark->row + TermWin.saveLines; 3133 row = mark->row + TermWin.saveLines;
3015 col = mark->col; 3134 col = mark->col;
3016 MAX_IT (col, 0); 3135 MAX_IT (col, 0);
3017 /* find the edge of a word */ 3136 /* find the edge of a word */
3018 stp = & (screen.text[row][col]); 3137 stp = &screen.text[row][col];
3019 w1 = DELIMIT_TEXT (*stp); 3138 w1 = DELIMIT_TEXT (*stp);
3020 3139
3021 srp = (&screen.rend[row][col]); 3140 srp = &screen.rend[row][col];
3022 w2 = DELIMIT_REND (*srp); 3141 w2 = DELIMIT_REND (*srp);
3023 3142
3024 for (;;) 3143 for (;;)
3025 { 3144 {
3026 for (; col != bound.col; col += dirnadd) 3145 for (; col != bound.col; col += dirnadd)
… …
3060 } 3179 }
3061 break; 3180 break;
3062 } 3181 }
3063 3182
3064Old_Word_Selection_You_Die: 3183Old_Word_Selection_You_Die:
3065 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));
3066
3067 if (dirn == DN) 3184 if (dirn == DN)
3068 col++; /* put us on one past the end */ 3185 col++; /* put us on one past the end */
3069 3186
3070 /* Poke the values back in */ 3187 /* Poke the values back in */
3071 ret->row = row - TermWin.saveLines; 3188 ret->row = row - TermWin.saveLines;
… …
3105 /* select nothing */ 3222 /* select nothing */
3106 selection.beg.row = selection.end.row = 0; 3223 selection.beg.row = selection.end.row = 0;
3107 selection.beg.col = selection.end.col = 0; 3224 selection.beg.col = selection.end.col = 0;
3108 selection.clicks = 4; 3225 selection.clicks = 4;
3109 want_refresh = 1; 3226 want_refresh = 1;
3110 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3111 return; 3227 return;
3112 } 3228 }
3113 3229
3114 if (selection.clicks == 4) 3230 if (selection.clicks == 4)
3115 selection.clicks = 1; 3231 selection.clicks = 1;
… …
3131 row_col_t pos; 3247 row_col_t pos;
3132 enum { 3248 enum {
3133 LEFT, RIGHT 3249 LEFT, RIGHT
3134 } closeto = RIGHT; 3250 } closeto = RIGHT;
3135 3251
3136 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));
3137 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3138
3139 want_refresh = 1; 3252 want_refresh = 1;
3253
3140 switch (selection.op) 3254 switch (selection.op)
3141 { 3255 {
3142 case SELECTION_INIT: 3256 case SELECTION_INIT:
3143 CLEAR_SELECTION (); 3257 CLEAR_SELECTION ();
3144 selection.op = SELECTION_BEGIN; 3258 selection.op = SELECTION_BEGIN;
… …
3157 selection_start_colrow (col, row); 3271 selection_start_colrow (col, row);
3158 /* FALLTHROUGH */ 3272 /* FALLTHROUGH */
3159 default: 3273 default:
3160 return; 3274 return;
3161 } 3275 }
3276
3162 if (selection.beg.col == selection.end.col 3277 if (selection.beg.col == selection.end.col
3163 && selection.beg.col != selection.mark.col 3278 && selection.beg.col != selection.mark.col
3164 && selection.beg.row == selection.end.row 3279 && selection.beg.row == selection.end.row
3165 && selection.beg.row != selection.mark.row) 3280 && selection.beg.row != selection.mark.row)
3166 { 3281 {
3167 selection.beg.col = selection.end.col = selection.mark.col; 3282 selection.beg.col = selection.end.col = selection.mark.col;
3168 selection.beg.row = selection.end.row = selection.mark.row; 3283 selection.beg.row = selection.end.row = selection.mark.row;
3169 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3170 } 3284 }
3171 3285
3172 pos.col = col; 3286 pos.col = col;
3173 pos.row = row; 3287 pos.row = row;
3174 3288
… …
3217 } 3331 }
3218 else 3332 else
3219 { /* button1 drag or button3 drag */ 3333 { /* button1 drag or button3 drag */
3220 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3334 if (ROWCOL_IS_AFTER (selection.mark, pos))
3221 { 3335 {
3222 if ((selection.mark.row == selection.end.row) 3336 if (selection.mark.row == selection.end.row
3223 && (selection.mark.col == selection.end.col) 3337 && selection.mark.col == selection.end.col
3338 && clickchange
3224 && clickchange && selection.clicks == 2) 3339 && selection.clicks == 2)
3225 selection.mark.col--; 3340 selection.mark.col--;
3226 3341
3227 selection.beg.row = pos.row; 3342 selection.beg.row = pos.row;
3228 selection.beg.col = pos.col; 3343 selection.beg.col = pos.col;
3229 selection.end.row = selection.mark.row; 3344 selection.end.row = selection.mark.row;
… …
3240 3355
3241 if (selection.clicks == 1) 3356 if (selection.clicks == 1)
3242 { 3357 {
3243 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3358 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3244 3359
3245 if (end_col != -1 && selection.beg.col > end_col) 3360 if (selection.beg.col > end_col
3361 && end_col != -1
3362#if ENABLE_FRILLS
3363 && !selection.rect
3364#endif
3246 { 3365 )
3247#if 1
3248 selection.beg.col = ncol; 3366 selection.beg.col = ncol;
3249#else
3250 if (selection.beg.row != selection.end.row)
3251 selection.beg.col = ncol;
3252 else
3253 selection.beg.col = selection.mark.col;
3254#endif
3255 }
3256 3367
3257 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3368 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3258 3369
3259 if (end_col != -1 && selection.end.col > end_col) 3370 if (
3371 selection.end.col > end_col
3372 && end_col != -1
3373#if ENABLE_FRILLS
3374 && !selection.rect
3375#endif
3376 )
3260 selection.end.col = ncol; 3377 selection.end.col = ncol;
3261 } 3378 }
3262 else if (selection.clicks == 2) 3379 else if (selection.clicks == 2)
3263 { 3380 {
3264 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3381 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3265 selection.end.col--; 3382 selection.end.col--;
3266 3383
3267 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3268 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3384 selection_delimit_word (UP, &selection.beg, &selection.beg);
3385 selection_delimit_word (DN, &selection.end, &selection.end);
3269 } 3386 }
3270 else if (selection.clicks == 3) 3387 else if (selection.clicks == 3)
3271 { 3388 {
3272#ifndef NO_FRILLS 3389#if ENABLE_FRILLS
3273 if ((Options & Opt_tripleclickwords)) 3390 if ((options & Opt_tripleclickwords))
3274 { 3391 {
3275 int end_row; 3392 int end_row;
3276 3393
3277 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3394 selection_delimit_word (UP, &selection.beg, &selection.beg);
3278 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3395 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3279 3396
3280 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3397 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3281 { 3398 {
3282 end_col = screen.tlen[end_row + TermWin.saveLines]; 3399 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3293 else 3410 else
3294#endif 3411#endif
3295 { 3412 {
3296 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3413 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3297 selection.mark.col++; 3414 selection.mark.col++;
3415
3298 selection.beg.col = 0; 3416 selection.beg.col = 0;
3299 selection.end.col = ncol; 3417 selection.end.col = ncol;
3300 } 3418 }
3301 } 3419 }
3302 3420
3303 if (button3 && buttonpress) 3421 if (button3 && buttonpress)
3304 { /* mark may need to be changed */ 3422 { /* mark may need to be changed */
3305 if (closeto == LEFT) 3423 if (closeto == LEFT)
3306 { 3424 {
3307 selection.mark.row = selection.end.row; 3425 selection.mark.row = selection.end.row;
3308 selection.mark.col = selection.end.col 3426 selection.mark.col = selection.end.col - (selection.clicks == 2);
3309 - (selection.clicks == 2);
3310 } 3427 }
3311 else 3428 else
3312 { 3429 {
3313 selection.mark.row = selection.beg.row; 3430 selection.mark.row = selection.beg.row;
3314 selection.mark.col = selection.beg.col; 3431 selection.mark.col = selection.beg.col;
3315 } 3432 }
3316 } 3433 }
3317 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));
3318}
3319 3434
3320#ifndef NO_FRILLS 3435#if ENABLE_FRILLS
3436 if (selection.rect && selection.beg.col > selection.end.col)
3437 SWAP_IT (selection.beg.col, selection.end.col, int);
3438#endif
3439}
3440
3441#if ENABLE_FRILLS
3321void 3442void
3322rxvt_term::selection_remove_trailing_spaces () 3443rxvt_term::selection_remove_trailing_spaces ()
3323{ 3444{
3324 int32_t end_col, end_row; 3445 int32_t end_col, end_row;
3325 text_t *stp; 3446 text_t *stp;
3326 3447
3327 end_col = selection.end.col; 3448 end_col = selection.end.col;
3328 end_row = selection.end.row; 3449 end_row = selection.end.row;
3450
3329 for ( ; end_row >= selection.beg.row; ) 3451 for ( ; end_row >= selection.beg.row; )
3330 { 3452 {
3331 stp = screen.text[end_row + TermWin.saveLines]; 3453 stp = screen.text[end_row + TermWin.saveLines];
3454
3332 while (--end_col >= 0) 3455 while (--end_col >= 0)
3333 { 3456 {
3334 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3457 if (stp[end_col] != ' '
3458 && stp[end_col] != '\t'
3459 && stp[end_col] != NOCHAR)
3335 break; 3460 break;
3336 } 3461 }
3462
3337 if (end_col >= 0 3463 if (end_col >= 0
3338 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3464 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3339 { 3465 {
3340 selection.end.col = end_col + 1; 3466 selection.end.col = end_col + 1;
3341 selection.end.row = end_row; 3467 selection.end.row = end_row;
3342 break; 3468 break;
3343 } 3469 }
3470
3344 end_row--; 3471 end_row--;
3345 end_col = TermWin.ncol; 3472 end_col = TermWin.ncol;
3346 } 3473 }
3474
3347 if (selection.mark.row > selection.end.row) 3475 if (selection.mark.row > selection.end.row)
3348 { 3476 {
3349 selection.mark.row = selection.end.row; 3477 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col; 3478 selection.mark.col = selection.end.col;
3351 } 3479 }
… …
3367 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3495 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3368} 3496}
3369 3497
3370/* ------------------------------------------------------------------------- */ 3498/* ------------------------------------------------------------------------- */
3371/* 3499/*
3372 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3373 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3374 * the X11 protocol.
3375 */
3376typedef CARD32 Atom32;
3377
3378/* ------------------------------------------------------------------------- */
3379/*
3380 * Respond to a request for our current selection 3500 * Respond to a request for our current selection
3381 * EXT: SelectionRequest 3501 * EXT: SelectionRequest
3382 */ 3502 */
3383void 3503void
3384rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3504rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3385{ 3505{
3386 XSelectionEvent ev; 3506 XSelectionEvent ev;
3387 XTextProperty ct;
3388 XICCEncodingStyle style;
3389 Atom target;
3390 3507
3391 ev.type = SelectionNotify; 3508 ev.type = SelectionNotify;
3392 ev.property = None; 3509 ev.property = None;
3393 ev.display = rq.display; 3510 ev.display = rq.display;
3394 ev.requestor = rq.requestor; 3511 ev.requestor = rq.requestor;
… …
3396 ev.target = rq.target; 3513 ev.target = rq.target;
3397 ev.time = rq.time; 3514 ev.time = rq.time;
3398 3515
3399 if (rq.target == xa[XA_TARGETS]) 3516 if (rq.target == xa[XA_TARGETS])
3400 { 3517 {
3401 Atom32 target_list[6]; 3518 Atom target_list[6];
3402 Atom32 *target = target_list; 3519 Atom *target = target_list;
3403 3520
3404 *target++ = (Atom32) xa[XA_TARGETS]; 3521 *target++ = xa[XA_TARGETS];
3405 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3522 *target++ = xa[XA_TIMESTAMP];
3406 *target++ = (Atom32) XA_STRING; 3523 *target++ = XA_STRING;
3407 *target++ = (Atom32) xa[XA_TEXT]; 3524 *target++ = xa[XA_TEXT];
3408 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3525 *target++ = xa[XA_COMPOUND_TEXT];
3409#if X_HAVE_UTF8_STRING 3526#if X_HAVE_UTF8_STRING
3410 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3527 *target++ = xa[XA_UTF8_STRING];
3411#endif 3528#endif
3412 3529
3413 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3530 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3414 (8 * sizeof (target_list[0])), PropModeReplace, 3531 32, PropModeReplace,
3415 (unsigned char *)target_list, 3532 (unsigned char *)target_list, target - target_list);
3416 target - target_list);
3417 ev.property = rq.property; 3533 ev.property = rq.property;
3418 } 3534 }
3535#if TODO // TODO
3419 else if (rq.target == xa[XA_MULTIPLE]) 3536 else if (rq.target == xa[XA_MULTIPLE])
3420 { 3537 {
3421 /* TODO: Handle MULTIPLE */ 3538 /* TODO: Handle MULTIPLE */
3422 } 3539 }
3540#endif
3423 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3541 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3424 { 3542 {
3425 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3543 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3426 (8 * sizeof (Time)), PropModeReplace,
3427 (unsigned char *)&selection_time, 1); 3544 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3428 ev.property = rq.property; 3545 ev.property = rq.property;
3429 } 3546 }
3430 else if (rq.target == XA_STRING 3547 else if (rq.target == XA_STRING
3431 || rq.target == xa[XA_TEXT] 3548 || rq.target == xa[XA_TEXT]
3432 || rq.target == xa[XA_COMPOUND_TEXT] 3549 || rq.target == xa[XA_COMPOUND_TEXT]
3433 || rq.target == xa[XA_UTF8_STRING] 3550 || rq.target == xa[XA_UTF8_STRING]
3434 ) 3551 )
3435 { 3552 {
3553 XTextProperty ct;
3554 Atom target = rq.target;
3436 short freect = 0; 3555 short freect = 0;
3437 int selectlen; 3556 int selectlen;
3438 wchar_t *cl; 3557 wchar_t *cl;
3439 3558 enum {
3440 target = rq.target; 3559 enc_string = XStringStyle,
3560 enc_text = XStdICCTextStyle,
3561 enc_compound_text = XCompoundTextStyle,
3562#ifdef X_HAVE_UTF8_STRING
3563 enc_utf8 = XUTF8StringStyle,
3564#else
3565 enc_utf8 = -1,
3566#endif
3567 } style;
3441 3568
3442 if (target == XA_STRING) 3569 if (target == XA_STRING)
3443 // we actually don't do XA_STRING, but who cares, as i18n clients 3570 // we actually don't do XA_STRING, but who cares, as i18n clients
3444 // will ask for another format anyways. 3571 // will ask for another format anyways.
3445 style = XStringStyle; 3572 style = enc_string;
3446 else if (target == xa[XA_TEXT]) 3573 else if (target == xa[XA_TEXT])
3447 style = XStdICCTextStyle; 3574 style = enc_text;
3448 else if (target == xa[XA_COMPOUND_TEXT]) 3575 else if (target == xa[XA_COMPOUND_TEXT])
3449 style = XCompoundTextStyle; 3576 style = enc_compound_text;
3450#if X_HAVE_UTF8_STRING 3577#if ENABLE_FRILLS
3451 else if (target == xa[XA_UTF8_STRING]) 3578 else if (target == xa[XA_UTF8_STRING])
3452 style = XUTF8StringStyle; 3579 style = enc_utf8;
3453#endif 3580#endif
3454 else 3581 else
3455 { 3582 {
3456 target = xa[XA_COMPOUND_TEXT]; 3583 target = xa[XA_COMPOUND_TEXT];
3457 style = XCompoundTextStyle; 3584 style = enc_compound_text;
3458 } 3585 }
3459 3586
3460 if (selection.text) 3587 if (selection.text)
3461 { 3588 {
3462 cl = selection.text; 3589 cl = selection.text;
… …
3466 { 3593 {
3467 cl = L""; 3594 cl = L"";
3468 selectlen = 0; 3595 selectlen = 0;
3469 } 3596 }
3470 3597
3471 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3598#if ENABLE_FRILLS
3472 // manually for XUTF8StringStyle. 3599 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3600 // so recode it manually
3601 if (style == enc_utf8)
3602 {
3603 freect = 1;
3604 ct.encoding = target;
3605 ct.format = 8;
3606 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3607 ct.nitems = strlen ((char *)ct.value);
3608 }
3609 else
3610#endif
3473 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3474 freect = 1; 3612 freect = 1;
3475 else 3613 else
3476 { 3614 {
3477 /* if we failed to convert then send it raw */ 3615 /* if we failed to convert then send it raw */
3478 ct.value = (unsigned char *)cl; 3616 ct.value = (unsigned char *)cl;
3479 ct.nitems = selectlen; 3617 ct.nitems = selectlen;
3618 ct.encoding = target;
3480 } 3619 }
3481 3620
3482 XChangeProperty (display->display, rq.requestor, rq.property, 3621 XChangeProperty (display->display, rq.requestor, rq.property,
3483 target, 8, PropModeReplace, 3622 ct.encoding, 8, PropModeReplace,
3484 ct.value, (int)ct.nitems); 3623 ct.value, (int)ct.nitems);
3485 ev.property = rq.property; 3624 ev.property = rq.property;
3486 3625
3487 if (freect) 3626 if (freect)
3488 XFree (ct.value); 3627 XFree (ct.value);
… …
3508} 3647}
3509 3648
3510/* ------------------------------------------------------------------------- */ 3649/* ------------------------------------------------------------------------- */
3511#ifdef USE_XIM 3650#ifdef USE_XIM
3512void 3651void
3513rxvt_term::im_set_position (XPoint *pos) 3652rxvt_term::im_set_position (XPoint &pos)
3514{ 3653{
3515 XWindowAttributes xwa; 3654 XWindowAttributes xwa;
3516 3655
3517 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3656 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3657
3518 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3658 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3519 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3659 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3520} 3660}
3521
3522#endif 3661#endif
3523/* ------------------------------------------------------------------------- */ 3662
3524 3663#if ENABLE_OVERLAY
3664void
3665rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3666{
3667 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3668 return;
3669
3670 want_refresh = 1;
3671
3672 scr_overlay_off ();
3673
3674 if (x < 0) x = TermWin.ncol - w;
3675 if (y < 0) y = TermWin.nrow - h;
3676
3677 // make space for border
3678 w += 2; MIN_IT (w, TermWin.ncol);
3679 h += 2; MIN_IT (h, TermWin.nrow);
3680
3681 x -= 1; MAX_IT (x, 0);
3682 y -= 1; MAX_IT (y, 0);
3683
3684 MIN_IT (x, TermWin.ncol - w);
3685 MIN_IT (y, TermWin.nrow - h);
3686
3687 ov_x = x; ov_y = y;
3688 ov_w = w; ov_h = h;
3689
3690 ov_text = new text_t *[h];
3691 ov_rend = new rend_t *[h];
3692
3693 for (y = 0; y < h; y++)
3694 {
3695 text_t *tp = ov_text[y] = new text_t[w];
3696 rend_t *rp = ov_rend[y] = new rend_t[w];
3697
3698 text_t t0, t1, t2;
3699 rend_t r = OVERLAY_RSTYLE;
3700
3701 if (y == 0)
3702 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3703 else if (y < h - 1)
3704 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3705 else
3706 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3707
3708 *tp++ = t0;
3709 *rp++ = r;
3710
3711 for (x = w - 2; x > 0; --x)
3712 {
3713 *tp++ = t1;
3714 *rp++ = r;
3715 }
3716
3717 *tp = t2;
3718 *rp = r;
3719 }
3720}
3721
3722void
3723rxvt_term::scr_overlay_off ()
3724{
3725 if (!ov_text)
3726 return;
3727
3728 want_refresh = 1;
3729
3730 for (int y = 0; y < ov_h; y++)
3731 {
3732 delete [] ov_text[y];
3733 delete [] ov_rend[y];
3734 }
3735
3736 delete [] ov_text; ov_text = 0;
3737 delete [] ov_rend; ov_rend = 0;
3738}
3739
3740void
3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3742{
3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3744 return;
3745
3746 x++, y++;
3747
3748 ov_text[y][x] = text;
3749 ov_rend[y][x] = rend;
3750}
3751
3752void
3753rxvt_term::scr_overlay_set (int x, int y, const char *s)
3754{
3755 while (*s)
3756 scr_overlay_set (x++, y, *s++);
3757}
3758
3759void
3760rxvt_term::scr_swap_overlay ()
3761{
3762 if (!ov_text)
3763 return;
3764
3765 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3766
3767 // swap screen mem with overlay
3768 for (int y = ov_h; y--; )
3769 {
3770 text_t *t1 = ov_text[y];
3771 rend_t *r1 = ov_rend[y];
3772
3773 text_t *t2 = screen.text[y + row_offset] + ov_x;
3774 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3775
3776 for (int x = ov_w; x--; )
3777 {
3778 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3779 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3780 }
3781 }
3782}
3783
3784#endif
3525/* ------------------------------------------------------------------------- * 3785/* ------------------------------------------------------------------------- */
3526 * DEBUG ROUTINES *
3527 * ------------------------------------------------------------------------- */
3528#if 0
3529void
3530rxvt_debug_colors (void)
3531{
3532 int color;
3533 const char *name[] =
3534 {
3535 "fg", "bg",
3536 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3537 };
3538
3539 fprintf (stderr, "Color ( ");
3540 if (rstyle & RS_RVid)
3541 fprintf (stderr, "rvid ");
3542 if (rstyle & RS_Bold)
3543 fprintf (stderr, "bold ");
3544 if (rstyle & RS_Blink)
3545 fprintf (stderr, "blink ");
3546 if (rstyle & RS_Uline)
3547 fprintf (stderr, "uline ");
3548 fprintf (stderr, "): ");
3549
3550 color = GET_FGCOLOR (rstyle);
3551#ifndef NO_BRIGHTCOLOR
3552 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3553 {
3554 color -= (minBrightCOLOR - minCOLOR);
3555 fprintf (stderr, "bright ");
3556 }
3557#endif
3558 fprintf (stderr, "%s on ", name[color]);
3559
3560 color = GET_BGCOLOR (rstyle);
3561#ifndef NO_BRIGHTCOLOR
3562 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3563 {
3564 color -= (minBrightCOLOR - minCOLOR);
3565 fprintf (stderr, "bright ");
3566 }
3567#endif
3568 fprintf (stderr, "%s\n", name[color]);
3569}
3570#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines