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.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.141 by root, Wed Dec 1 02:12:18 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 * 7 *
… …
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;
522
516 case RESTORE: 523 case RESTORE:
517 want_refresh = 1; 524 want_refresh = 1;
518 s->cur.row = s->s_cur.row; 525 screen.cur.row = s->s_cur.row;
519 s->cur.col = s->s_cur.col; 526 screen.cur.col = s->s_cur.col;
520 s->flags &= ~Screen_WrapNext; 527 screen.flags &= ~Screen_WrapNext;
521 rstyle = s->s_rstyle; 528 rstyle = s->s_rstyle;
522 s->charset = s->s_charset; 529 screen.charset = s->s_charset;
523 charsets[s->charset] = s->s_charset_char; 530 charsets[screen.charset] = s->s_charset_char;
524 set_font_style (); 531 set_font_style ();
525 break; 532 break;
526 } 533 }
527 534
528 /* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
551 int offset; 558 int offset;
552#endif 559#endif
553 560
554 want_refresh = 1; 561 want_refresh = 1;
555 562
556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
557
558 TermWin.view_start = 0; 563 TermWin.view_start = 0;
559 564
560 if (current_screen == scrn) 565 if (current_screen == scrn)
561 return scrn; 566 return scrn;
562 567
563 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
564 569
565 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
566#if NSCREENS 584#if NSCREENS
567 if (Options & Opt_secondaryScreen) 585 if (options & Opt_secondaryScreen)
568 { 586 {
569 num_scr = 0; 587 num_scr = 0;
570 offset = TermWin.saveLines; 588 offset = TermWin.saveLines;
589
571 for (i = prev_nrow; i--;) 590 for (i = prev_nrow; i--;)
572 { 591 {
573 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
574 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
575 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
576 } 595 }
577 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 596
578 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
579# ifdef DEBUG_STRICT
580 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
581 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
582# else /* drive with your eyes closed */
583 MAX_IT (screen.cur.row, 0);
584 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
585 MAX_IT (screen.cur.col, 0);
586 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
587# endif
588 SWAP_IT (screen.charset, swap.charset, int16_t); 597 SWAP_IT (screen.charset, swap.charset, int16_t);
589 SWAP_IT (screen.flags, swap.flags, int); 598 SWAP_IT (screen.flags, swap.flags, int);
590 screen.flags |= Screen_VisibleCursor; 599 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 600 swap.flags |= Screen_VisibleCursor;
592 } 601 }
593 else 602 else
594#endif 603#endif
595 if (Options & Opt_secondaryScroll) 604 if (options & Opt_secondaryScroll)
596 //if (current_screen == PRIMARY) 605 //if (current_screen == PRIMARY)
597 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
598 return scrn; 608 return scrn;
599} 609}
600 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
601/* ------------------------------------------------------------------------- */ 628/* ------------------------------------------------------------------------- */
602/* 629/*
603 * Change the colour for following text 630 * Change the colour for following text
604 */ 631 */
605void 632void
606rxvt_term::scr_color (unsigned int color, int fgbg) 633rxvt_term::scr_color (unsigned int color, int fgbg)
607{ 634{
608 color &= RS_fgMask; 635 if (color > maxTermCOLOR)
636 color = fgbg;
637
609 if (fgbg == Color_fg) 638 if (fgbg == Color_fg)
610 rstyle = SET_FGCOLOR (rstyle, color); 639 rstyle = SET_FGCOLOR (rstyle, color);
611 else 640 else
612 rstyle = SET_BGCOLOR (rstyle, color); 641 rstyle = SET_BGCOLOR (rstyle, color);
613} 642}
… …
642 671
643 if (count == 0 || (row1 > row2)) 672 if (count == 0 || (row1 > row2))
644 return 0; 673 return 0;
645 674
646 want_refresh = 1; 675 want_refresh = 1;
647 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
648 676
649 if (row1 == 0 && count > 0 677 if (row1 == 0 && count > 0
650 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 678 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
651 { 679 {
652 nscrolled = (long)TermWin.nscrolled + (long)count; 680 nscrolled = (long)TermWin.nscrolled + (long)count;
653 681
654 if (nscrolled > (long)TermWin.saveLines) 682 if (nscrolled > (long)TermWin.saveLines)
655 TermWin.nscrolled = TermWin.saveLines; 683 TermWin.nscrolled = TermWin.saveLines;
656 else 684 else
657 TermWin.nscrolled = (uint16_t)nscrolled; 685 TermWin.nscrolled = (unsigned int)nscrolled;
658 686
659 if ((Options & Opt_scrollWithBuffer) 687 if ((options & Opt_scrollWithBuffer)
660 && TermWin.view_start != 0 688 && TermWin.view_start != 0
661 && TermWin.view_start != TermWin.saveLines) 689 && TermWin.view_start != TermWin.saveLines)
662 scr_page (UP, count); 690 scr_page (UP, count);
663 } 691 }
664 else if (!spec) 692 else if (!spec)
… …
703 if (j > 0) 731 if (j > 0)
704 { 732 {
705 /* A: scroll up */ 733 /* A: scroll up */
706 734
707 /* 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 */
708 for (i = 0, j = row1; i < count; i++, j++) 752 for (i = 0, j = row2; i < count; i++, j--)
709 { 753 {
710 buf_text[i] = screen.text[j]; 754 buf_text[i] = screen.text[j];
711 buf_rend[i] = screen.rend[j]; 755 buf_rend[i] = screen.rend[j];
712 } 756 }
757
713 /* A2: Rotate lines */ 758 /* B2: Rotate lines */
714 for (j = row1, i = j + count; i <= row2; i++, j++) 759 for (j = row2, i = j - count; i >= row1; i--, j--)
715 { 760 {
716 screen.tlen[j] = screen.tlen[i]; 761 screen.tlen[j] = screen.tlen[i];
717 screen.text[j] = screen.text[i]; 762 screen.text[j] = screen.text[i];
718 screen.rend[j] = screen.rend[i]; 763 screen.rend[j] = screen.rend[i];
719 } 764 }
720 j = row2 - count + 1, i = count;
721 }
722 else /* if (j < 0) */
723 {
724 /* B: scroll down */
725 765
726 /* B1: Copy lines that will get clobbered by the rotation */
727 for (i = 0, j = row2; i < count; i++, j--)
728 {
729 buf_text[i] = screen.text[j];
730 buf_rend[i] = screen.rend[j];
731 }
732 /* B2: Rotate lines */
733 for (j = row2, i = j - count; i >= row1; i--, j--)
734 {
735 screen.tlen[j] = screen.tlen[i];
736 screen.text[j] = screen.text[i];
737 screen.rend[j] = screen.rend[i];
738 }
739 j = row1, i = count; 766 j = row1, i = count;
740 count = -count; 767 count = -count;
741 } 768 }
742 769
743 /* 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 */
744 for (; i--; j++) 775 for (; i--; j++)
745 {
746 screen.tlen[j] = 0;
747 screen.text[j] = buf_text[i];
748 screen.rend[j] = buf_rend[i];
749
750 if (!spec) /* line length may not equal TermWin.ncol */
751 scr_blank_screen_mem (screen.text, screen.rend, 776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
752 (unsigned int)j, rstyle);
753 }
754 777
755 return count; 778 return count;
756} 779}
757 780
758/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
… …
760 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
761 */ 784 */
762void 785void
763rxvt_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)
764{ 787{
765 unsigned char checksel, clearsel; 788 unsigned char checksel;
766 unicode_t c; 789 unicode_t c;
767 int i, row, last_col; 790 int i, row, last_col;
768 text_t *stp; 791 text_t *stp;
769 rend_t *srp; 792 rend_t *srp;
770 793
771 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
772 return; 795 return;
773 796
774 want_refresh = 1; 797 want_refresh = 1;
798 ZERO_SCROLLBACK ();
775 last_col = TermWin.ncol; 799 last_col = TermWin.ncol;
776 800
777 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
778 ZERO_SCROLLBACK ();
779 if (nlines > 0) 801 if (nlines > 0)
780 { 802 {
781 nlines += (screen.cur.row - screen.bscroll); 803 nlines += screen.cur.row - screen.bscroll;
782 if ((nlines > 0) 804 if ((nlines > 0)
783 && (screen.tscroll == 0) 805 && (screen.tscroll == 0)
784 && (screen.bscroll == (TermWin.nrow - 1))) 806 && (screen.bscroll == (TermWin.nrow - 1)))
785 { 807 {
786 /* _at least_ this many lines need to be scrolled */ 808 /* _at least_ this many lines need to be scrolled */
787 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
788 screen.cur.row -= nlines; 810 screen.cur.row -= nlines;
789 } 811 }
790 } 812 }
813
791#ifdef DEBUG_STRICT 814#ifdef DEBUG_STRICT
792 assert (screen.cur.col < last_col); 815 assert (screen.cur.col < last_col);
793 assert ((screen.cur.row < TermWin.nrow) 816 assert ((screen.cur.row < TermWin.nrow)
794 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
795#else /* drive with your eyes closed */ 818#else /* drive with your eyes closed */
796 MIN_IT (screen.cur.col, last_col - 1); 819 MIN_IT (screen.cur.col, last_col - 1);
797 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
798 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
799#endif 822#endif
800 row = screen.cur.row + TermWin.saveLines; 823 row = screen.cur.row + TermWin.saveLines;
801 824
802 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
803 clearsel = 0;
804 826
805 stp = screen.text[row]; 827 stp = screen.text[row];
806 srp = screen.rend[row]; 828 srp = screen.rend[row];
807 829
808 while (len--) 830 while (len--)
… …
810 c = *str++; 832 c = *str++;
811 833
812 if (c < 0x20) 834 if (c < 0x20)
813 switch (c) 835 switch (c)
814 { 836 {
815 case '\t': 837 case C0_HT:
816 scr_tab (1); 838 scr_tab (1, true);
817 continue; 839 continue;
818 840
819 case '\n': 841 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 842 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 843 MAX_IT (screen.tlen[row], screen.cur.col);
822 844
823 screen.flags &= ~Screen_WrapNext; 845 screen.flags &= ~Screen_WrapNext;
824 846
… …
829 851
830 stp = screen.text[row]; /* _must_ refresh */ 852 stp = screen.text[row]; /* _must_ refresh */
831 srp = screen.rend[row]; /* _must_ refresh */ 853 srp = screen.rend[row]; /* _must_ refresh */
832 continue; 854 continue;
833 855
834 case '\r': 856 case C0_CR:
835 if (screen.tlen[row] != -1) /* XXX: think about this */ 857 if (screen.tlen[row] != -1) /* XXX: think about this */
836 MAX_IT (screen.tlen[row], screen.cur.col); 858 MAX_IT (screen.tlen[row], screen.cur.col);
837 859
838 screen.flags &= ~Screen_WrapNext; 860 screen.flags &= ~Screen_WrapNext;
839 screen.cur.col = 0; 861 screen.cur.col = 0;
… …
843 if (checksel /* see if we're writing within selection */ 865 if (checksel /* see if we're writing within selection */
844 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
845 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
846 { 868 {
847 checksel = 0; 869 checksel = 0;
848 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 ();
849 } 876 }
850 877
851 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
852 { 879 {
853 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 881
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
858 883
859 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
860 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
861 screen.cur.col = 0;
862 screen.flags &= ~Screen_WrapNext;
863 } 886 }
864
865 if (screen.flags & Screen_Insert)
866 scr_insdel_chars (1, INSERT);
867 887
868 // 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
869 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
870 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
871 int width = c < 256 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
892
893 if (screen.flags & Screen_Insert)
894 scr_insdel_chars (width, INSERT);
872 895
873 if (charsets[screen.charset] == '0') // DEC SPECIAL 896 if (charsets[screen.charset] == '0') // DEC SPECIAL
874 { 897 {
875 // vt100 special graphics and line drawing 898 // vt100 special graphics and line drawing
899 // 5f-7e standard vt100
900 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[32] = { // 5f .. 7e 901 static uint16_t vt100_0[63] = { // 5f .. 7e
902 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
903 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
904 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
905 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
877 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 906 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
878 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 907 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
879 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 908 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
880 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 909 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
881 }; 910 };
882 911
883 if (c >= 0x5f && c <= 0x7e) 912 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
884 { 913 {
885 c = vt100_0[c - 0x5f]; 914 c = vt100_0[c - 0x40];
886 width = 1; 915 width = 1;
887 } 916 }
888 } 917 }
889 918
890 if (width > 0) 919 if (width != 0)
891 { 920 {
892#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
893 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
894 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
895 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;
896#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
897 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
898 957
899 do 958 do
900 { 959 {
901 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
902 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
935 994
936 if (screen.cur.col > 0) 995 if (screen.cur.col > 0)
937 { 996 {
938 tp = stp + screen.cur.col - 1; 997 tp = stp + screen.cur.col - 1;
939 rp = srp + screen.cur.col - 1; 998 rp = srp + screen.cur.col - 1;
999
1000 while (*tp == NOCHAR && tp > stp)
1001 tp--, rp--;
940 } 1002 }
941 else if (screen.cur.row > 0 1003 else if (screen.cur.row > 0
942 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1004 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
943 { 1005 {
944 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1006 int line = screen.cur.row - 1 + TermWin.saveLines;
945 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007
1008 tp = screen.text[line] + last_col - 1;
1009 rp = screen.rend[line] + last_col - 1;
1010
1011 while (*tp == NOCHAR && tp > screen.text[line])
1012 tp--, rp--;
946 } 1013 }
947 else 1014 else
948 continue; 1015 continue;
949
950 // handle double-width-chars by making them look extremely ugly
951 if (*tp == NOCHAR)
952 *tp = ' '; // hack //D //TODO //--tp, --rp;
953 1016
954 // first try to find a precomposed character 1017 // first try to find a precomposed character
955 unicode_t n = rxvt_compose (*tp, c); 1018 unicode_t n = rxvt_compose (*tp, c);
956 if (n == NOCHAR) 1019 if (n == NOCHAR)
957 n = rxvt_composite.compose (*tp, c); 1020 n = rxvt_composite.compose (*tp, c);
958 1021
959 *tp = n; 1022 *tp = n;
960 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1023 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
961#endif 1024#endif
962 } 1025 }
963 } 1026 }
964 1027
965 if (screen.tlen[row] != -1) /* XXX: think about this */ 1028 if (screen.tlen[row] != -1) /* XXX: think about this */
966 MAX_IT (screen.tlen[row], screen.cur.col); 1029 MAX_IT (screen.tlen[row], screen.cur.col);
967
968 /*
969 * If we wrote anywhere in the selected area, kill the selection
970 * XXX: should we kill the mark too? Possibly, but maybe that
971 * should be a similar check.
972 */
973 if (clearsel)
974 CLEAR_SELECTION ();
975 1030
976#ifdef DEBUG_STRICT 1031#ifdef DEBUG_STRICT
977 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
978#else /* drive with your eyes closed */ 1033#else /* drive with your eyes closed */
979 MAX_IT (screen.cur.row, 0); 1034 MAX_IT (screen.cur.row, 0);
… …
987 */ 1042 */
988void 1043void
989rxvt_term::scr_backspace () 1044rxvt_term::scr_backspace ()
990{ 1045{
991 want_refresh = 1; 1046 want_refresh = 1;
1047
992 if (screen.cur.col == 0) 1048 if (screen.cur.col == 0)
993 { 1049 {
994 if (screen.cur.row > 0) 1050 if (screen.cur.row > 0)
995 { 1051 {
996#ifdef TERMCAP_HAS_BW 1052#ifdef TERMCAP_HAS_BW
997 screen.cur.col = TermWin.ncol - 1; 1053 screen.cur.col = TermWin.ncol - 1;
998 screen.cur.row--; 1054 screen.cur.row--;
999 return; 1055 return;
1000#endif 1056#endif
1001
1002 } 1057 }
1003 } 1058 }
1004 else if ((screen.flags & Screen_WrapNext) == 0) 1059 else if (!(screen.flags & Screen_WrapNext))
1005 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1061
1006 screen.flags &= ~Screen_WrapNext; 1062 screen.flags &= ~Screen_WrapNext;
1007} 1063}
1008 1064
1009/* ------------------------------------------------------------------------- */ 1065/* ------------------------------------------------------------------------- */
1010/* 1066/*
1011 * Process Horizontal Tab 1067 * Process Horizontal Tab
1012 * count: +ve = forward; -ve = backwards 1068 * count: +ve = forward; -ve = backwards
1013 * XTERM_SEQ: CTRL-I 1069 * XTERM_SEQ: CTRL-I
1014 */ 1070 */
1015void 1071void
1016rxvt_term::scr_tab (int count) 1072rxvt_term::scr_tab (int count, bool ht)
1017{ 1073{
1018 int i, x; 1074 int i, x;
1019 1075
1020 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1021 want_refresh = 1; 1076 want_refresh = 1;
1022 i = x = screen.cur.col; 1077 i = x = screen.cur.col;
1023 1078
1024 if (count == 0) 1079 if (count == 0)
1025 return; 1080 return;
1026 else if (count > 0) 1081 else if (count > 0)
1027 { 1082 {
1083 int row = TermWin.saveLines + screen.cur.row;
1084 text_t *tp = screen.text[row];
1085 rend_t *rp = screen.rend[row];
1086 rend_t base_rend = rp[i];
1087 ht &= tp[i] == ' ';
1088
1028 for (; ++i < TermWin.ncol; ) 1089 for (; ++i < TermWin.ncol; )
1029 if (tabs[i]) 1090 if (tabs[i])
1030 { 1091 {
1031 x = i; 1092 x = i;
1032 if (!--count) 1093 if (!--count)
1033 break; 1094 break;
1034 } 1095 }
1096 else
1097 ht &= tp[i] == ' '
1098 && RS_SAME (rp[i], base_rend);
1035 1099
1036 if (count) 1100 if (count)
1037 x = TermWin.ncol - 1; 1101 x = TermWin.ncol - 1;
1102
1103 // store horizontal tab commands as characters inside the text
1104 // buffer so they can be selected and pasted.
1105 if (ht && options & Opt_pastableTabs)
1106 {
1107 base_rend = SET_FONT (base_rend, 0);
1108
1109 if (screen.tlen[row] != -1) /* XXX: think about this */
1110 MAX_IT (screen.tlen[row], x);
1111
1112 i = screen.cur.col;
1113
1114 tp[i] = '\t';
1115 rp[i] = base_rend;
1116
1117 while (++i < x)
1118 {
1119 tp[i] = NOCHAR;
1120 rp[i] = base_rend;
1121 }
1122 }
1038 } 1123 }
1039 else /* if (count < 0) */ 1124 else /* if (count < 0) */
1040 { 1125 {
1041 for (; --i >= 0; ) 1126 for (; --i >= 0; )
1042 if (tabs[i]) 1127 if (tabs[i])
… …
1059 * Process DEC Back Index 1144 * Process DEC Back Index
1060 * XTERM_SEQ: ESC 6 1145 * XTERM_SEQ: ESC 6
1061 * Move cursor left in row. If we're at the left boundary, shift everything 1146 * Move cursor left in row. If we're at the left boundary, shift everything
1062 * in that row right. Clear left column. 1147 * in that row right. Clear left column.
1063 */ 1148 */
1064#ifndef NO_FRILLS 1149#if ENABLE_FRILLS
1065void 1150void
1066rxvt_term::scr_backindex () 1151rxvt_term::scr_backindex ()
1067{ 1152{
1068 if (screen.cur.col > 0) 1153 if (screen.cur.col > 0)
1069 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1154 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1070 else 1155 else
1071 { 1156 {
1072 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1157 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1073 return; /* um, yeah? */ 1158 return; /* um, yeah? */
1159
1074 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
1075 } 1161 }
1076} 1162}
1077#endif 1163#endif
1078/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
… …
1080 * Process DEC Forward Index 1166 * Process DEC Forward Index
1081 * XTERM_SEQ: ESC 9 1167 * XTERM_SEQ: ESC 9
1082 * Move cursor right in row. If we're at the right boundary, shift everything 1168 * Move cursor right in row. If we're at the right boundary, shift everything
1083 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1084 */ 1170 */
1085#ifndef NO_FRILLS 1171#if ENABLE_FRILLS
1086void 1172void
1087rxvt_term::scr_forwardindex () 1173rxvt_term::scr_forwardindex ()
1088{ 1174{
1089 int row; 1175 int row;
1090 1176
1091 if (screen.cur.col < TermWin.ncol - 1) 1177 if (screen.cur.col < TermWin.ncol - 1)
1092 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1178 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1093 else 1179 else
1094 { 1180 {
1095 row = screen.cur.row + TermWin.saveLines; 1181 row = screen.cur.row + TermWin.saveLines;
1182
1096 if (screen.tlen[row] == 0) 1183 if (screen.tlen[row] == 0)
1097 return; /* um, yeah? */ 1184 return; /* um, yeah? */
1098 else if (screen.tlen[row] == -1) 1185 else if (screen.tlen[row] == -1)
1099 screen.tlen[row] = TermWin.ncol; 1186 screen.tlen[row] = TermWin.ncol;
1187
1100 scr_gotorc (0, 0, R_RELATIVE); 1188 scr_gotorc (0, 0, R_RELATIVE);
1101 scr_insdel_chars (1, DELETE); 1189 scr_insdel_chars (1, DELETE);
1102 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1190 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1103 } 1191 }
1104} 1192}
… …
1112rxvt_term::scr_gotorc (int row, int col, int relative) 1200rxvt_term::scr_gotorc (int row, int col, int relative)
1113{ 1201{
1114 want_refresh = 1; 1202 want_refresh = 1;
1115 ZERO_SCROLLBACK (); 1203 ZERO_SCROLLBACK ();
1116 1204
1117 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));
1118
1119 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1205 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1120 : col);
1121 MAX_IT (screen.cur.col, 0); 1206 MAX_IT (screen.cur.col, 0);
1122 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1207 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1123 1208
1124 screen.flags &= ~Screen_WrapNext; 1209 screen.flags &= ~Screen_WrapNext;
1210
1125 if (relative & R_RELATIVE) 1211 if (relative & R_RELATIVE)
1126 { 1212 {
1127 if (row > 0) 1213 if (row > 0)
1128 { 1214 {
1129 if (screen.cur.row <= screen.bscroll 1215 if (screen.cur.row <= screen.bscroll
… …
1149 MIN_IT (screen.cur.row, screen.bscroll); 1235 MIN_IT (screen.cur.row, screen.bscroll);
1150 } 1236 }
1151 else 1237 else
1152 screen.cur.row = row; 1238 screen.cur.row = row;
1153 } 1239 }
1240
1154 MAX_IT (screen.cur.row, 0); 1241 MAX_IT (screen.cur.row, 0);
1155 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1242 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1156
1157 while (screen.cur.col > 0
1158 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1159 screen.cur.col--;
1160} 1243}
1161 1244
1162/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1163/* 1246/*
1164 * direction should be UP or DN 1247 * direction should be UP or DN
1165 */ 1248 */
1166void 1249void
1167rxvt_term::scr_index (enum page_dirn direction) 1250rxvt_term::scr_index (enum page_dirn direction)
1168{ 1251{
1169 int dirn; 1252 int dirn;
1170 1253
1171 want_refresh = 1; 1254 want_refresh = 1;
1255 ZERO_SCROLLBACK ();
1256
1172 dirn = ((direction == UP) ? 1 : -1); 1257 dirn = ((direction == UP) ? 1 : -1);
1173 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1174
1175 ZERO_SCROLLBACK ();
1176 1258
1177 screen.flags &= ~Screen_WrapNext; 1259 screen.flags &= ~Screen_WrapNext;
1260
1178 if ((screen.cur.row == screen.bscroll && direction == UP) 1261 if ((screen.cur.row == screen.bscroll && direction == UP)
1179 || (screen.cur.row == screen.tscroll && direction == DN)) 1262 || (screen.cur.row == screen.tscroll && direction == DN))
1180 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1263 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1181 else 1264 else
1182 screen.cur.row += dirn; 1265 screen.cur.row += dirn;
1266
1183 MAX_IT (screen.cur.row, 0); 1267 MAX_IT (screen.cur.row, 0);
1184 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1268 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1185 selection_check (0); 1269 selection_check (0);
1186} 1270}
1187 1271
… …
1196rxvt_term::scr_erase_line (int mode) 1280rxvt_term::scr_erase_line (int mode)
1197{ 1281{
1198 unsigned int row, col, num; 1282 unsigned int row, col, num;
1199 1283
1200 want_refresh = 1; 1284 want_refresh = 1;
1201 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1202 ZERO_SCROLLBACK (); 1285 ZERO_SCROLLBACK ();
1203 1286
1204 selection_check (1); 1287 selection_check (1);
1205
1206 screen.flags &= ~Screen_WrapNext;
1207 1288
1208 row = TermWin.saveLines + screen.cur.row; 1289 row = TermWin.saveLines + screen.cur.row;
1209 switch (mode) 1290 switch (mode)
1210 { 1291 {
1211 case 0: /* erase to end of line */ 1292 case 0: /* erase to end of line */
… …
1234 default: 1315 default:
1235 return; 1316 return;
1236 } 1317 }
1237 1318
1238 if (screen.text[row]) 1319 if (screen.text[row])
1239 scr_blank_line (& (screen.text[row][col]), 1320 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1240 & (screen.rend[row][col]), num, rstyle);
1241 else 1321 else
1242 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1322 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1243} 1323}
1244 1324
1245/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
… …
1256 int32_t row, row_offset; 1336 int32_t row, row_offset;
1257 rend_t ren; 1337 rend_t ren;
1258 XGCValues gcvalue; 1338 XGCValues gcvalue;
1259 1339
1260 want_refresh = 1; 1340 want_refresh = 1;
1261 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1262 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1342
1263 row_offset = (int32_t)TermWin.saveLines; 1343 row_offset = (int32_t)TermWin.saveLines;
1264 1344
1265 switch (mode) 1345 switch (mode)
1266 { 1346 {
1267 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
… …
1283 break; 1363 break;
1284 default: 1364 default:
1285 return; 1365 return;
1286 } 1366 }
1287 1367
1288 refresh_type |= REFRESH_BOUNDS;
1289
1290 if (selection.op && current_screen == selection.screen 1368 if (selection.op && current_screen == selection.screen
1291 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1369 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1292 || (selection.end.row >= row 1370 || (selection.end.row >= row
1293 && selection.end.row <= row + num))) 1371 && selection.end.row <= row + num)))
1294 CLEAR_SELECTION (); 1372 CLEAR_SELECTION ();
… …
1305 ren = DEFAULT_RSTYLE; 1383 ren = DEFAULT_RSTYLE;
1306 CLEAR_ROWS (row, num); 1384 CLEAR_ROWS (row, num);
1307 } 1385 }
1308 else 1386 else
1309 { 1387 {
1310 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1311 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1389 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1390 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1313 ERASE_ROWS (row, num); 1391 ERASE_ROWS (row, num);
1314 gcvalue.foreground = PixColors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1315 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1316 } 1394 }
1317 1395
1318 for (; num--; row++) 1396 for (; num--; row++)
1319 { 1397 {
1320 scr_blank_screen_mem (screen.text, screen.rend, 1398 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1321 (unsigned int) (row + row_offset), rstyle);
1322 screen.tlen[row + row_offset] = 0; 1399 screen.tlen[row + row_offset] = 0;
1323 scr_blank_line (drawn_text[row], drawn_rend[row], 1400 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1324 (unsigned int)TermWin.ncol, ren);
1325 } 1401 }
1326} 1402}
1327 1403
1328/* ------------------------------------------------------------------------- */ 1404/* ------------------------------------------------------------------------- */
1329/* 1405/*
… …
1335{ 1411{
1336 int i, j, k; 1412 int i, j, k;
1337 rend_t *r1, fs; 1413 rend_t *r1, fs;
1338 1414
1339 want_refresh = 1; 1415 want_refresh = 1;
1416 ZERO_SCROLLBACK ();
1417
1340 num_scr_allow = 0; 1418 num_scr_allow = 0;
1341 ZERO_SCROLLBACK ();
1342 selection_check (3); 1419 selection_check (3);
1343 1420
1344 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1421 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1345 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1422 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1346 { 1423 {
1347 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1424 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1348 fill_text (screen.text[k], 'E', TermWin.ncol); 1425 fill_text (screen.text[k], 'E', TermWin.ncol);
1349 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1426 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1373 if (insdel == DELETE) 1450 if (insdel == DELETE)
1374 return; 1451 return;
1375 else if (insdel == INSERT) 1452 else if (insdel == INSERT)
1376 count = end; 1453 count = end;
1377 } 1454 }
1378 screen.flags &= ~Screen_WrapNext; 1455
1456 scr_do_wrap ();
1379 1457
1380 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1458 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1381} 1459}
1382 1460
1383/* ------------------------------------------------------------------------- */ 1461/* ------------------------------------------------------------------------- */
… …
1397 ZERO_SCROLLBACK (); 1475 ZERO_SCROLLBACK ();
1398 1476
1399 if (count <= 0) 1477 if (count <= 0)
1400 return; 1478 return;
1401 1479
1480 scr_do_wrap ();
1481
1402 selection_check (1); 1482 selection_check (1);
1403 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1483 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1404 1484
1405 row = screen.cur.row + TermWin.saveLines; 1485 row = screen.cur.row + TermWin.saveLines;
1406 screen.flags &= ~Screen_WrapNext;
1407 1486
1408 stp = screen.text[row]; 1487 stp = screen.text[row];
1409 srp = screen.rend[row]; 1488 srp = screen.rend[row];
1410 slp = & (screen.tlen[row]); 1489 slp = &screen.tlen[row];
1411 1490
1412 switch (insdel) 1491 switch (insdel)
1413 { 1492 {
1414 case INSERT: 1493 case INSERT:
1415 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1494 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1416 col--)
1417 { 1495 {
1418 stp[col] = stp[col - count]; 1496 stp[col] = stp[col - count];
1419 srp[col] = srp[col - count]; 1497 srp[col] = srp[col - count];
1420 } 1498 }
1421 1499
… …
1431 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
1432 || (selection.end.col + count >= TermWin.ncol)) 1510 || (selection.end.col + count >= TermWin.ncol))
1433 CLEAR_SELECTION (); 1511 CLEAR_SELECTION ();
1434 else 1512 else
1435 { /* shift selection */ 1513 { /* shift selection */
1436 selection.beg.col += count; 1514 selection.beg.col += count;
1437 selection.mark.col += count; /* XXX: yes? */ 1515 selection.mark.col += count; /* XXX: yes? */
1438 selection.end.col += count; 1516 selection.end.col += count;
1439 } 1517 }
1440 } 1518 }
1441 1519
1442 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1443 (unsigned int)count, rstyle); 1521 (unsigned int)count, rstyle);
1444 break; 1522 break;
1445 1523
1446 case ERASE: 1524 case ERASE:
1447 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1525 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1448 selection_check (1); 1526 selection_check (1);
1449 screen.cur.col -= count; 1527 screen.cur.col -= count;
1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1528 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1451 (unsigned int)count, rstyle); 1529 (unsigned int)count, rstyle);
1452 break; 1530 break;
1453 1531
1454 case DELETE: 1532 case DELETE:
1455 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1458 { 1536 {
1459 stp[col] = stp[col + count]; 1537 stp[col] = stp[col + count];
1460 srp[col] = srp[col + count]; 1538 srp[col] = srp[col + count];
1461 } 1539 }
1462 1540
1463 scr_blank_line (& (stp[TermWin.ncol - count]), 1541 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1464 & (srp[TermWin.ncol - count]),
1465 (unsigned int)count, tr); 1542 (unsigned int)count, tr);
1466 1543
1467 if (*slp == -1) /* break line continuation */ 1544 if (*slp == -1) /* break line continuation */
1468 *slp = TermWin.ncol; 1545 *slp = TermWin.ncol;
1469 1546
… …
1478 || selection.end.col >= TermWin.ncol) 1555 || selection.end.col >= TermWin.ncol)
1479 CLEAR_SELECTION (); 1556 CLEAR_SELECTION ();
1480 else 1557 else
1481 { 1558 {
1482 /* shift selection */ 1559 /* shift selection */
1483 selection.beg.col -= count; 1560 selection.beg.col -= count;
1484 selection.mark.col -= count; /* XXX: yes? */ 1561 selection.mark.col -= count; /* XXX: yes? */
1485 selection.end.col -= count; 1562 selection.end.col -= count;
1486 } 1563 }
1487 } 1564 }
1488 1565
1489 break; 1566 break;
1490 } 1567 }
… …
1517 */ 1594 */
1518void 1595void
1519rxvt_term::scr_cursor_visible (int mode) 1596rxvt_term::scr_cursor_visible (int mode)
1520{ 1597{
1521 want_refresh = 1; 1598 want_refresh = 1;
1599
1522 if (mode) 1600 if (mode)
1523 screen.flags |= Screen_VisibleCursor; 1601 screen.flags |= Screen_VisibleCursor;
1524 else 1602 else
1525 screen.flags &= ~Screen_VisibleCursor; 1603 screen.flags &= ~Screen_VisibleCursor;
1526} 1604}
… …
1535rxvt_term::scr_autowrap (int mode) 1613rxvt_term::scr_autowrap (int mode)
1536{ 1614{
1537 if (mode) 1615 if (mode)
1538 screen.flags |= Screen_Autowrap; 1616 screen.flags |= Screen_Autowrap;
1539 else 1617 else
1540 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1541} 1619}
1542 1620
1543/* ------------------------------------------------------------------------- */ 1621/* ------------------------------------------------------------------------- */
1544/* 1622/*
1545 * Set/unset margin origin mode 1623 * Set/unset margin origin mode
… …
1555{ 1633{
1556 if (mode) 1634 if (mode)
1557 screen.flags |= Screen_Relative; 1635 screen.flags |= Screen_Relative;
1558 else 1636 else
1559 screen.flags &= ~Screen_Relative; 1637 screen.flags &= ~Screen_Relative;
1638
1560 scr_gotorc (0, 0, 0); 1639 scr_gotorc (0, 0, 0);
1561} 1640}
1562 1641
1563/* ------------------------------------------------------------------------- */ 1642/* ------------------------------------------------------------------------- */
1564/* 1643/*
… …
1584 */ 1663 */
1585void 1664void
1586rxvt_term::scr_set_tab (int mode) 1665rxvt_term::scr_set_tab (int mode)
1587{ 1666{
1588 if (mode < 0) 1667 if (mode < 0)
1589 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1668 memset (tabs, 0, TermWin.ncol * sizeof (char));
1590 else if (screen.cur.col < TermWin.ncol) 1669 else if (screen.cur.col < TermWin.ncol)
1591 tabs[screen.cur.col] = (mode ? 1 : 0); 1670 tabs[screen.cur.col] = (mode ? 1 : 0);
1592} 1671}
1593 1672
1594/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
… …
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1678 */
1600void 1679void
1601rxvt_term::scr_rvideo_mode (int mode) 1680rxvt_term::scr_rvideo_mode (int mode)
1602{ 1681{
1603 XGCValues gcvalue; 1682 XGCValues gcvalue;
1604 1683
1605 if (rvideo != mode) 1684 if (rvideo != mode)
1606 { 1685 {
1607 rvideo = mode; 1686 rvideo = mode;
1608 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1687 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1609#if defined(XPM_BACKGROUND) 1688#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1689 if (bgPixmap.pixmap == None)
1611#endif 1690#endif
1612#if defined(TRANSPARENT) 1691#if TRANSPARENT
1613 if (! (Options & Opt_transparent) || am_transparent == 0) 1692 if (! (options & Opt_transparent) || am_transparent == 0)
1614#endif 1693#endif
1615 XSetWindowBackground (display->display, TermWin.vt, 1694 XSetWindowBackground (display->display, TermWin.vt,
1616 PixColors[Color_bg]); 1695 pix_colors[Color_bg]);
1617 1696
1618 gcvalue.foreground = PixColors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = PixColors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1621 &gcvalue); 1700 &gcvalue);
1622 scr_clear (); 1701 scr_clear ();
1623 scr_touch (true); 1702 scr_touch (true);
1624 } 1703 }
… …
1672 * XTERM_SEQ: Invoke G2 character set: ESC N 1751 * XTERM_SEQ: Invoke G2 character set: ESC N
1673 * XTERM_SEQ: Invoke G3 character set: ESC O 1752 * XTERM_SEQ: Invoke G3 character set: ESC O
1674 */ 1753 */
1675void 1754void
1676rxvt_term::scr_charset_choose (int set) 1755rxvt_term::scr_charset_choose (int set)
1677 { 1756{
1678 screen.charset = set; 1757 screen.charset = set;
1679 set_font_style (); 1758 set_font_style ();
1680 } 1759}
1681 1760
1682/* ------------------------------------------------------------------------- */ 1761/* ------------------------------------------------------------------------- */
1683/* 1762/*
1684 * Set a font 1763 * Set a font
1685 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1764 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1688 * XTERM_SEQ: Set G3 character set: ESC + <C> 1767 * XTERM_SEQ: Set G3 character set: ESC + <C>
1689 * See set_font_style for possible values for <C> 1768 * See set_font_style for possible values for <C>
1690 */ 1769 */
1691void 1770void
1692rxvt_term::scr_charset_set (int set, unsigned int ch) 1771rxvt_term::scr_charset_set (int set, unsigned int ch)
1693 { 1772{
1694 charsets[set] = (unsigned char)ch; 1773 charsets[set] = (unsigned char)ch;
1695 set_font_style (); 1774 set_font_style ();
1696 } 1775}
1697 1776
1698 1777
1699/* ------------------------------------------------------------------------- * 1778/* ------------------------------------------------------------------------- *
1700 * MAJOR SCREEN MANIPULATION * 1779 * MAJOR SCREEN MANIPULATION *
1701 * ------------------------------------------------------------------------- */ 1780 * ------------------------------------------------------------------------- */
… …
1740 row_col_t rc[RC_COUNT]; 1819 row_col_t rc[RC_COUNT];
1741 1820
1742 if (drawn_text == NULL) /* sanity check */ 1821 if (drawn_text == NULL) /* sanity check */
1743 return; 1822 return;
1744 1823
1824#ifndef NO_SLOW_LINK_SUPPORT
1825 if (refresh_type == FAST_REFRESH && !display->is_local)
1826 {
1827 y = 0;
1828 height = TermWin.height;
1829 }
1830#endif
1831
1745#ifdef DEBUG_STRICT 1832#ifdef DEBUG_STRICT
1746 x = max (x, (int)TermWin.int_bwidth); 1833 x = max (x, 0);
1747 x = min (x, (int)TermWin.width); 1834 x = min (x, (int)TermWin.width);
1748 y = max (y, (int)TermWin.int_bwidth); 1835 y = max (y, 0);
1749 y = min (y, (int)TermWin.height); 1836 y = min (y, (int)TermWin.height);
1750#endif 1837#endif
1751 1838
1752 /* round down */ 1839 /* round down */
1753 rc[PART_BEG].col = Pixel2Col (x); 1840 rc[PART_BEG].col = Pixel2Col (x);
… …
1761 { 1848 {
1762 MIN_IT (rc[i].col, TermWin.ncol - 1); 1849 MIN_IT (rc[i].col, TermWin.ncol - 1);
1763 MIN_IT (rc[i].row, TermWin.nrow - 1); 1850 MIN_IT (rc[i].row, TermWin.nrow - 1);
1764 } 1851 }
1765 1852
1766 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));
1767
1768 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1853 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1769 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1854 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1770 (rc[PART_END].col - rc[PART_BEG].col + 1));
1771 1855
1772 if (refresh) 1856 if (refresh)
1773 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1857 scr_refresh (SLOW_REFRESH);
1774} 1858}
1775 1859
1776/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1777/* 1861/*
1778 * Refresh the entire screen 1862 * Refresh the entire screen
… …
1790 */ 1874 */
1791int 1875int
1792rxvt_term::scr_move_to (int y, int len) 1876rxvt_term::scr_move_to (int y, int len)
1793{ 1877{
1794 long p = 0; 1878 long p = 0;
1795 uint16_t oldviewstart; 1879 unsigned int oldviewstart;
1796 1880
1797 oldviewstart = TermWin.view_start; 1881 oldviewstart = TermWin.view_start;
1882
1798 if (y < len) 1883 if (y < len)
1799 { 1884 {
1800 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1885 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1801 p -= (long) (TermWin.nrow - 1); 1886 p -= (long) (TermWin.nrow - 1);
1802 p = max (p, 0); 1887 p = max (p, 0);
1803 } 1888 }
1889
1804 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1890 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1805 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1806 1891
1807 return scr_changeview (oldviewstart); 1892 return scr_changeview (oldviewstart);
1808} 1893}
1809 1894
1810/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
… …
1813 * direction should be UP or DN 1898 * direction should be UP or DN
1814 */ 1899 */
1815int 1900int
1816rxvt_term::scr_page (enum page_dirn direction, int nlines) 1901rxvt_term::scr_page (enum page_dirn direction, int nlines)
1817{ 1902{
1818 int n; 1903 int n;
1819 uint16_t oldviewstart; 1904 unsigned int oldviewstart;
1820 1905
1821 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1822#ifdef DEBUG_STRICT 1906#ifdef DEBUG_STRICT
1823 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1824#endif 1908#endif
1825 oldviewstart = TermWin.view_start; 1909 oldviewstart = TermWin.view_start;
1826 if (direction == UP) 1910 if (direction == UP)
… …
1835 } 1919 }
1836 return scr_changeview (oldviewstart); 1920 return scr_changeview (oldviewstart);
1837} 1921}
1838 1922
1839int 1923int
1840rxvt_term::scr_changeview (uint16_t oldviewstart) 1924rxvt_term::scr_changeview (unsigned int oldviewstart)
1841{ 1925{
1842 if (TermWin.view_start != oldviewstart) 1926 if (TermWin.view_start != oldviewstart)
1843 { 1927 {
1844 want_refresh = 1; 1928 want_refresh = 1;
1845 num_scr -= (TermWin.view_start - oldviewstart); 1929 num_scr -= (TermWin.view_start - oldviewstart);
1846 } 1930 }
1931
1847 return (int) (TermWin.view_start - oldviewstart); 1932 return (int) (TermWin.view_start - oldviewstart);
1848} 1933}
1849 1934
1850/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1851void 1936void
1852rxvt_term::scr_bell () 1937rxvt_term::scr_bell ()
1853{ 1938{
1854#ifndef NO_BELL 1939#ifndef NO_BELL
1855# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1856# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1857 if (Options & Opt_mapAlert) 1942 if (options & Opt_mapAlert)
1858# endif 1943# endif
1859 XMapWindow (display->display, TermWin.parent[0]); 1944 XMapWindow (display->display, TermWin.parent[0]);
1860# endif 1945# endif
1861 if (Options & Opt_visualBell) 1946 if (options & Opt_visualBell)
1862 { 1947 {
1863 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 scr_rvideo_mode (!rvideo); /* refresh also done */
1864 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1865 } 1950 }
1866 else 1951 else
… …
1872/* ARGSUSED */ 1957/* ARGSUSED */
1873void 1958void
1874rxvt_term::scr_printscreen (int fullhist) 1959rxvt_term::scr_printscreen (int fullhist)
1875{ 1960{
1876#ifdef PRINTPIPE 1961#ifdef PRINTPIPE
1877 int i, r1, nrows, row_offset; 1962 int i, r1, nrows, row_offset;
1878 text_t *t; 1963 FILE *fd;
1879 FILE *fd;
1880 1964
1881 if ((fd = popen_printer ()) == NULL) 1965 if ((fd = popen_printer ()) == NULL)
1882 return; 1966 return;
1967
1883 nrows = TermWin.nrow; 1968 nrows = TermWin.nrow;
1884 row_offset = TermWin.saveLines; 1969 row_offset = TermWin.saveLines;
1970
1885 if (!fullhist) 1971 if (!fullhist)
1886 row_offset -= TermWin.view_start; 1972 row_offset -= TermWin.view_start;
1887 else 1973 else
1888 { 1974 {
1889 nrows += TermWin.nscrolled; 1975 nrows += TermWin.nscrolled;
1890 row_offset -= TermWin.nscrolled; 1976 row_offset -= TermWin.nscrolled;
1891 } 1977 }
1892 1978
1979 wctomb (0, 0);
1980
1893 for (r1 = 0; r1 < nrows; r1++) 1981 for (r1 = 0; r1 < nrows; r1++)
1894 { 1982 {
1895 t = screen.text[r1 + row_offset]; 1983 text_t *tp = screen.text[r1 + row_offset];
1896 for (i = TermWin.ncol - 1; i >= 0; i--) 1984 int len = screen.tlen[r1 + row_offset];
1897 if (!isspace (t[i])) 1985
1898 break; 1986 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1899 fprintf (fd, "%.*s\n", (i + 1), t); 1987 {
1988 char mb[MB_LEN_MAX];
1989 text_t t = *tp++;
1990 if (t == NOCHAR)
1991 continue;
1992
1993 len = wctomb (mb, t);
1994
1995 if (len <= 0)
1996 {
1997 mb[0] = ' ';
1998 len = 1;
1999 }
2000
2001 fwrite (mb, 1, len, fd);
2002 }
2003
2004 fputc ('\n', fd);
1900 } 2005 }
2006
1901 pclose_printer (fd); 2007 pclose_printer (fd);
1902#endif 2008#endif
1903} 2009}
1904 2010
1905/* ------------------------------------------------------------------------- */ 2011/* ------------------------------------------------------------------------- */
… …
1919 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2025 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1920 2026
1921void 2027void
1922rxvt_term::scr_refresh (unsigned char refresh_type) 2028rxvt_term::scr_refresh (unsigned char refresh_type)
1923{ 2029{
1924 unsigned char clearfirst, /* first character writes before cell */
1925 clearlast, /* last character writes beyond cell */
1926 must_clear, /* use draw_string not draw_image_string */ 2030 unsigned char must_clear, /* use draw_string not draw_image_string */
1927 rvid, /* reverse video this position */
1928 showcursor; /* show the cursor */ 2031 showcursor; /* show the cursor */
1929 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1930 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1931 int i, /* tmp */ 2034 int i, /* tmp */
1932 row_offset; /* basic offset in screen structure */ 2035 row_offset; /* basic offset in screen structure */
1933#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1934 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
1935#endif 2038#endif
1936 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2039 rend_t *crp; // cursor rendition pointer
1937 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2040
2041 want_refresh = 0; /* screen is current */
1938 2042
1939 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2043 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1940 return; 2044 return;
1941 2045
1942 /* 2046 /*
1943 * A: set up vars 2047 * A: set up vars
1944 */ 2048 */
1945 clearfirst = clearlast = must_clear = 0; 2049 must_clear = 0;
1946
1947 refresh_count = 0; 2050 refresh_count = 0;
1948 2051
1949 row_offset = TermWin.saveLines - TermWin.view_start; 2052 row_offset = TermWin.saveLines - TermWin.view_start;
1950 2053
1951 if ((refresh_type & REFRESH_BOUNDS))
1952 {
1953 clearfirst = clearlast = 1;
1954 refresh_type &= ~REFRESH_BOUNDS;
1955 }
1956
1957#ifdef XPM_BACKGROUND 2054#if XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 2055 must_clear |= (bgPixmap.pixmap != None);
1959#endif 2056#endif
1960#ifdef TRANSPARENT 2057#if TRANSPARENT
1961 must_clear |= ((Options & Opt_transparent) && am_transparent); 2058 must_clear |= ((options & Opt_transparent) && am_transparent);
1962#endif 2059#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2061
1965 /* 2062 /*
1966 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
1981 showcursor = 0; 2078 showcursor = 0;
1982#endif 2079#endif
1983 2080
1984 if (showcursor) 2081 if (showcursor)
1985 { 2082 {
2083 int col = screen.cur.col;
2084
2085 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2086 col--;
2087
1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2088 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1987 2089
1988 if (showcursor && TermWin.focus) 2090 if (showcursor && TermWin.focus)
1989 { 2091 {
1990 *srp ^= RS_RVid; 2092 *crp ^= RS_RVid;
1991#ifndef NO_CURSORCOLOR 2093#ifndef NO_CURSORCOLOR
1992 cc1 = *srp & (RS_fgMask | RS_bgMask); 2094 cc1 = *crp & (RS_fgMask | RS_bgMask);
1993 if (ISSET_PIXCOLOR (Color_cursor)) 2095 if (ISSET_PIXCOLOR (Color_cursor))
1994 ccol1 = Color_cursor; 2096 ccol1 = Color_cursor;
1995 else 2097 else
1996#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1997 ccol1 = GET_FGCOLOR (rstyle); 2099 ccol1 = GET_FGCOLOR (rstyle);
… …
2004#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2005 ccol2 = GET_BGCOLOR (rstyle); 2107 ccol2 = GET_BGCOLOR (rstyle);
2006#else 2108#else
2007 ccol2 = Color_bg; 2109 ccol2 = Color_bg;
2008#endif 2110#endif
2009 *srp = SET_FGCOLOR (*srp, ccol1); 2111 *crp = SET_FGCOLOR (*crp, ccol1);
2010 *srp = SET_BGCOLOR (*srp, ccol2); 2112 *crp = SET_BGCOLOR (*crp, ccol2);
2011#endif 2113#endif
2012 } 2114 }
2013 } 2115 }
2014 2116
2015 /* make sure no outline cursor is left around */ 2117 /* make sure no outline cursor is left around */
… …
2042 oldcursor.col = screen.cur.col; 2144 oldcursor.col = screen.cur.col;
2043 } 2145 }
2044 } 2146 }
2045 } 2147 }
2046 2148
2149#if ENABLE_OVERLAY
2150 scr_swap_overlay ();
2151#endif
2152
2153 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2154 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2155
2047#ifndef NO_SLOW_LINK_SUPPORT 2156#ifndef NO_SLOW_LINK_SUPPORT
2048 /* 2157 /*
2049 * D: CopyArea pass - very useful for slower links 2158 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2159 * This has been deliberately kept simple.
2051 */ 2160 */
2052 i = num_scr; 2161 i = num_scr;
2162 if (!display->is_local
2053 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2163 && refresh_type == FAST_REFRESH && num_scr_allow && i
2054 && abs (i) < TermWin.nrow && !must_clear) 2164 && abs (i) < TermWin.nrow && !must_clear)
2055 { 2165 {
2056 int16_t nits; 2166 int16_t nits;
2057 int j; 2167 int j;
2058 rend_t *drp2;
2059 text_t *dtp2;
2060 int len, wlen; 2168 int len, wlen;
2061 2169
2062 j = TermWin.nrow; 2170 j = TermWin.nrow;
2063 wlen = len = -1; 2171 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2173 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2174 {
2067 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2175 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2068 { 2176 {
2069 stp = screen.text[row + row_offset]; 2177 text_t *stp = screen.text[row + row_offset];
2070 srp = screen.rend[row + row_offset]; 2178 rend_t *srp = screen.rend[row + row_offset];
2071 dtp = drawn_text[row]; 2179 text_t *dtp = drawn_text[row];
2072 dtp2 = drawn_text[row + i]; 2180 text_t *dtp2 = drawn_text[row + i];
2073 drp = drawn_rend[row]; 2181 rend_t *drp = drawn_rend[row];
2074 drp2 = drawn_rend[row + i]; 2182 rend_t *drp2 = drawn_rend[row + i];
2075 2183
2076 for (nits = 0, col = TermWin.ncol; col--; ) 2184 for (nits = 0, col = TermWin.ncol; col--; )
2077 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2185 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2078 nits--; 2186 nits--;
2079 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2187 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2099 { 2207 {
2100 /* also comes here at end if needed because of >= above */ 2208 /* also comes here at end if needed because of >= above */
2101 if (wlen < len) 2209 if (wlen < len)
2102 SWAP_IT (wlen, len, int); 2210 SWAP_IT (wlen, len, int);
2103 2211
2104 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2105 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2212 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2106 TermWin.gc, 0, Row2Pixel (len + i), 2213 TermWin.gc, 0, Row2Pixel (len + i),
2107 (unsigned int)TermWin_TotalWidth (), 2214 (unsigned int)TermWin_TotalWidth (),
2108 (unsigned int)Height2Pixel (wlen - len + 1), 2215 (unsigned int)Height2Pixel (wlen - len + 1),
2109 0, Row2Pixel (len)); 2216 0, Row2Pixel (len));
… …
2116 /* 2223 /*
2117 * E: main pass across every character 2224 * E: main pass across every character
2118 */ 2225 */
2119 for (row = 0; row < TermWin.nrow; row++) 2226 for (row = 0; row < TermWin.nrow; row++)
2120 { 2227 {
2121 stp = screen.text[row + row_offset]; 2228 text_t *stp = screen.text[row + row_offset];
2122 srp = screen.rend[row + row_offset]; 2229 rend_t *srp = screen.rend[row + row_offset];
2123 dtp = drawn_text[row]; 2230 text_t *dtp = drawn_text[row];
2124 drp = drawn_rend[row]; 2231 rend_t *drp = drawn_rend[row];
2125 2232
2126 /* 2233 /*
2127 * E2: OK, now the real pass 2234 * E2: OK, now the real pass
2128 */ 2235 */
2129 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2130 2237
2131 for (col = 0; col < TermWin.ncol; col++) 2238 for (col = 0; col < TermWin.ncol; col++)
2132 { 2239 {
2133 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2134 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] /* Must match characters to skip. */
2135 && (srp[col] == drp[col] /* Either rendition the same or */ 2242 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2136 || (stp[col] == ' ' /* space w/ no background change */ 2243 || (stp[col] == ' ' /* space w/ no background change */
2137 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2244 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2138 continue; 2245 continue;
2139 2246
2140 // redraw one or more characters 2247 // redraw one or more characters
2141 2248
2142 // seek to the beginning if wide characters 2249 // seek to the beginning of wide characters
2143 while (stp[col] == NOCHAR && col > 0) 2250 while (stp[col] == NOCHAR && col > 0)
2144 --col; 2251 --col;
2145 2252
2146 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2147 text_t *text = stp + col; 2254 text_t *text = stp + col;
… …
2150 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2151 drp[col] = rend; 2258 drp[col] = rend;
2152 2259
2153 int xpixel = Col2Pixel (col); 2260 int xpixel = Col2Pixel (col);
2154 2261
2155 // this loop looks very messy, it can probably be optimized
2156 // and cleaned a bit by you?
2157 for (i = 0; ++col < TermWin.ncol; ) 2262 for (i = 0; ++col < TermWin.ncol; )
2158 { 2263 {
2159 if (stp[col] == NOCHAR) 2264 if (stp[col] == NOCHAR)
2160 { 2265 {
2161 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2162 drp[col] = rend; 2267 drp[col] = rend;
2163 count++; 2268 count++;
2164
2165 if (i) // only possible skip if char unchanged
2166 i++; 2269 i++;
2167 2270
2168 continue; 2271 continue;
2169 } 2272 }
2170 2273
2171 if (rend != srp[col]) 2274 if (!RS_SAME (rend, srp[col]))
2172 break; 2275 break;
2173 2276
2174 count++; 2277 count++;
2175 2278
2176 if (stp[col] != dtp[col] 2279 if (stp[col] != dtp[col]
2177 || srp[col] != drp[col]) 2280 || !RS_SAME (srp[col], drp[col]))
2178 { 2281 {
2179 if (must_clear && (i++ > (count / 2))) 2282 if (must_clear && (i++ > count / 2))
2180 break; 2283 break;
2181 2284
2182 dtp[col] = stp[col]; 2285 dtp[col] = stp[col];
2183 drp[col] = rend; 2286 drp[col] = rend;
2184 i = 0; 2287 i = 0;
2185 } 2288 }
2186 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2289 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2187 break; 2290 break;
2188 } 2291 }
2189 2292
2190 col--; /* went one too far. move back */ 2293 col--; /* went one too far. move back */
2191 count -= i; /* dump any matching trailing chars */ 2294 count -= i; /* dump any matching trailing chars */
2295
2296 // sometimes we optimize away the trailing NOCHAR's, add them back
2297 while (i && text[count] == NOCHAR)
2298 count++, i--;
2299
2300#if ENABLE_STYLES
2301 // force redraw after "careful" characters to avoid pixel droppings
2302 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2303 drp[col + 1] = ~srp[col + 1];
2304
2305 // include previous careful character(s) if possible, looks nicer (best effort...)
2306 while (text > stp
2307 && srp[text - stp - 1] & RS_Careful
2308 && RS_SAME (rend, srp[text - stp - 1]))
2309 text--, count++, xpixel -= TermWin.fwidth;
2310#endif
2192 2311
2193 /* 2312 /*
2194 * Determine the attributes for the string 2313 * Determine the attributes for the string
2195 */ 2314 */
2196 int fid = GET_FONT (rend);
2197 int fore = GET_FGCOLOR (rend); // desired foreground 2315 int fore = GET_FGCOLOR (rend); // desired foreground
2198 int back = GET_BGCOLOR (rend); // desired background 2316 int back = GET_BGCOLOR (rend); // desired background
2199 2317
2200 rend = GET_ATTR (rend); 2318 // only do special processing if ana attributes are set, which is rare
2201 2319 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2202 rvid = !!(rend & RS_RVid); 2320 {
2321 bool invert = rend & RS_RVid;
2203 2322
2204#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2205 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold
2325 && fore == Color_fg)
2206 { 2326 {
2207 if (ISSET_PIXCOLOR (Color_BD)) 2327 if (ISSET_PIXCOLOR (Color_BD))
2208 fore = Color_BD; 2328 fore = Color_BD;
2329# if !ENABLE_STYLES
2209 else 2330 else
2210 rvid = !rvid; 2331 invert = !invert;
2332# endif
2333 }
2334
2335 if (rend & RS_Italic
2336 && fore == Color_fg)
2337 {
2338 if (ISSET_PIXCOLOR (Color_IT))
2339 fore = Color_IT;
2340# if !ENABLE_STYLES
2341 else
2342 invert = !invert;
2343# endif
2344 }
2345
2346 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2347 fore = Color_UL;
2348#endif
2349
2350 if (invert)
2351 {
2352 SWAP_IT (fore, back, int);
2353
2354#ifndef NO_BOLD_UNDERLINE_REVERSE
2355 if (ISSET_PIXCOLOR (Color_RV))
2356 back = Color_RV;
2357#endif
2358 }
2359
2360#ifdef TEXT_BLINK
2361 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2362 {
2363 if (!text_blink_ev.active)
2364 {
2365 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2366 hidden_text = 0;
2367 }
2368 else if (hidden_text)
2369 fore = back;
2370 }
2371#endif
2211 } 2372 }
2212
2213 if (rend & RS_Uline)
2214 if (ISSET_PIXCOLOR (Color_UL))
2215 fore = Color_UL;
2216#endif
2217
2218 if (rvid)
2219 {
2220 SWAP_IT (fore, back, int);
2221
2222#ifndef NO_BOLD_UNDERLINE_REVERSE
2223 if (ISSET_PIXCOLOR (Color_RV)
2224# ifndef NO_CURSORCOLOR
2225 && !ISSET_PIXCOLOR (Color_cursor)
2226# endif
2227 )
2228 back = Color_RV;
2229#endif
2230 }
2231
2232#ifdef TEXT_BLINK
2233 if (rend & RS_Blink && back == Color_bg)
2234 {
2235 if (!text_blink_ev.active)
2236 {
2237 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2238 hidden_text = 0;
2239 }
2240 else if (hidden_text)
2241 fore = back;
2242 }
2243#endif
2244 2373
2245 /* 2374 /*
2246 * Actually do the drawing of the string here 2375 * Actually do the drawing of the string here
2247 */ 2376 */
2248 rxvt_font *font = (*TermWin.fontset)[fid]; 2377 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2249 2378
2250 if (back == fore) 2379 if (back == fore)
2251 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2380 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2252 TermWin.fwidth * count, TermWin.fheight, 2381 TermWin.fwidth * count, TermWin.fheight,
2253 back); 2382 back);
… …
2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2269 } 2398 }
2270 else 2399 else
2271 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2272 2401
2273 if ((rend & RS_Uline) && (font->descent > 1)) 2402 if (rend & RS_Uline && font->descent > 1 && fore != back)
2274 XDrawLine (display->display, drawBuffer, TermWin.gc, 2403 XDrawLine (display->display, drawBuffer, TermWin.gc,
2275 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2276 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2277 } /* for (col....) */ 2406 } /* for (col....) */
2278 } /* for (row....) */ 2407 } /* for (row....) */
2279 2408
2409#if ENABLE_OVERLAY
2410 scr_swap_overlay ();
2411#endif
2412
2280 /* 2413 /*
2281 * G: cleanup cursor and display outline cursor if necessary 2414 * G: cleanup cursor and display outline cursor if necessary
2282 */ 2415 */
2283 if (showcursor) 2416 if (showcursor)
2284 { 2417 {
2285 if (TermWin.focus) 2418 if (TermWin.focus)
2286 { 2419 {
2287 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2288 [screen.cur.col]);
2289 *srp ^= RS_RVid; 2420 *crp ^= RS_RVid;
2290#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2291 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2422 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2292#endif 2423#endif
2293 } 2424 }
2294 else if (oldcursor.row >= 0) 2425 else if (oldcursor.row >= 0)
2295 { 2426 {
2296#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
2297 if (ISSET_PIXCOLOR (Color_cursor)) 2428 if (ISSET_PIXCOLOR (Color_cursor))
2298 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2429 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2299#endif 2430#endif
2300 int cursorwidth = 1; 2431 int cursorwidth = 1;
2301 while (oldcursor.col + cursorwidth < TermWin.ncol 2432 while (oldcursor.col + cursorwidth < TermWin.ncol
2302 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2433 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2303 cursorwidth++; 2434 cursorwidth++;
… …
2313 /* 2444 /*
2314 * H: cleanup selection 2445 * H: cleanup selection
2315 */ 2446 */
2316 scr_reverse_selection (); 2447 scr_reverse_selection ();
2317 2448
2318 /*
2319 * I: other general cleanup
2320 */
2321 if (clearfirst && TermWin.int_bwidth)
2322 /*
2323 * clear the whole screen height, note that width == 0 is treated
2324 * specially by XClearArea
2325 */
2326 XClearArea (display->display, TermWin.vt, 0, 0,
2327 (unsigned int)TermWin.int_bwidth,
2328 (unsigned int)TermWin_TotalHeight (), False);
2329
2330 if (clearlast && TermWin.int_bwidth)
2331 /*
2332 * clear the whole screen height, note that width == 0 is treated
2333 * specially by XClearArea
2334 */
2335 XClearArea (display->display, TermWin.vt,
2336 TermWin.width + TermWin.int_bwidth, 0,
2337 (unsigned int)TermWin.int_bwidth,
2338 (unsigned int)TermWin_TotalHeight (), False);
2339
2340 if (refresh_type & SMOOTH_REFRESH) 2449 if (refresh_type & SMOOTH_REFRESH)
2341 XSync (display->display, False); 2450 XFlush (display->display);
2342 2451
2343 num_scr = 0; 2452 num_scr = 0;
2344 num_scr_allow = 1; 2453 num_scr_allow = 1;
2345 want_refresh = 0; /* screen is current */
2346} 2454}
2347 2455
2348void 2456void
2349rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2457rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2350{ 2458{
2351 if (!rp || !tp) 2459 if (!rp || !tp)
2352 return; 2460 return;
2353 2461
2354 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2462 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2355 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2463 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2356} 2464}
2357 2465
2358void 2466void
2359rxvt_term::scr_remap_chars () 2467rxvt_term::scr_remap_chars ()
2360{ 2468{
… …
2366 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2474 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2367 scr_remap_chars (swap.text[i], swap.rend[i]); 2475 scr_remap_chars (swap.text[i], swap.rend[i]);
2368 } 2476 }
2369} 2477}
2370 2478
2479void
2480rxvt_term::scr_recolour ()
2481{
2482 if (1
2483#if TRANSPARENT
2484 && !am_transparent
2485#endif
2486#if XPM_BACKGROUND
2487 && !bgPixmap.pixmap
2488#endif
2489 )
2490 {
2491 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2492 XClearWindow (display->display, TermWin.parent[0]);
2493 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2494#if HAVE_SCROLLBARS
2495 if (scrollBar.win)
2496 {
2497 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2498 scrollBar.setIdle ();
2499 scrollbar_show (0);
2500 }
2501#endif
2502 }
2503
2504 scr_clear ();
2505 scr_touch (true);
2506 want_refresh = 1;
2507}
2508
2371/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2372void 2510void
2373rxvt_term::scr_clear (bool really) 2511rxvt_term::scr_clear (bool really)
2374{ 2512{
2375 if (!TermWin.mapped) 2513 if (!TermWin.mapped)
2376 return; 2514 return;
2377 2515
2378 num_scr_allow = 0; 2516 num_scr_allow = 0;
2379 want_refresh = 1; 2517 want_refresh = 1;
2380 2518
2381#ifdef TRANSPARENT 2519#if TRANSPARENT
2382 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2520 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2383 { 2521 {
2384 int i; 2522 int i;
2385 2523
2386 if (! (Options & Opt_transparent_all)) 2524 if (!(options & Opt_transparent_all))
2387 i = 0; 2525 i = 0;
2388 else 2526 else
2389 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2527 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2390 2528
2391 while (i--) 2529 while (i--)
… …
2407 int end_row = TermWin.saveLines - TermWin.view_start; 2545 int end_row = TermWin.saveLines - TermWin.view_start;
2408 int i = selection.beg.row + TermWin.saveLines; 2546 int i = selection.beg.row + TermWin.saveLines;
2409 int col, row = selection.end.row + TermWin.saveLines; 2547 int col, row = selection.end.row + TermWin.saveLines;
2410 rend_t *srp; 2548 rend_t *srp;
2411 2549
2412 if (i >= end_row) 2550#if ENABLE_FRILLS
2413 col = selection.beg.col; 2551 if (selection.rect)
2552 {
2553 end_row += TermWin.nrow;
2554
2555 for (; i <= row && i <= end_row; i++)
2556 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2557 srp[col] ^= RS_RVid;
2558 }
2414 else 2559 else
2560#endif
2561 {
2562 if (i >= end_row)
2563 col = selection.beg.col;
2564 else
2415 { 2565 {
2416 col = 0; 2566 col = 0;
2417 i = end_row; 2567 i = end_row;
2418 } 2568 }
2419 2569
2420 end_row += TermWin.nrow; 2570 end_row += TermWin.nrow;
2571
2421 for (; i < row && i < end_row; i++, col = 0) 2572 for (; i < row && i < end_row; i++, col = 0)
2422 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2573 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2423 srp[col] ^= RS_RVid; 2574 srp[col] ^= RS_RVid;
2424 2575
2425 if (i == row && i < end_row) 2576 if (i == row && i < end_row)
2426 for (srp = screen.rend[i]; col < selection.end.col; col++) 2577 for (srp = screen.rend[i]; col < selection.end.col; col++)
2427 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2579 }
2428 } 2580 }
2429} 2581}
2430 2582
2431/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2432/* 2584/*
… …
2468 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2620 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2469 */ 2621 */
2470void 2622void
2471rxvt_term::selection_check (int check_more) 2623rxvt_term::selection_check (int check_more)
2472{ 2624{
2473 row_col_t pos; 2625 row_col_t pos;
2474 2626
2475 if (!selection.op) 2627 if (!selection.op)
2476 return; 2628 return;
2477 2629
2478 pos.row = pos.col = 0; 2630 pos.row = pos.col = 0;
… …
2505rxvt_term::paste (const unsigned char *data, unsigned int len) 2657rxvt_term::paste (const unsigned char *data, unsigned int len)
2506{ 2658{
2507 unsigned int i, j, n; 2659 unsigned int i, j, n;
2508 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2509 2661
2510#if 0
2511 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2512 ZERO_SCROLLBACK (r);
2513#endif
2514
2515 /* convert normal newline chars into common keyboard Return key sequence */ 2662 /* convert normal newline chars into common keyboard Return key sequence */
2516 for (i = 0; i < len; i += PROP_SIZE) 2663 for (i = 0; i < len; i += PROP_SIZE)
2517 { 2664 {
2518 n = min (len - i, PROP_SIZE); 2665 n = min (len - i, PROP_SIZE);
2519 MEMCPY (ds, data + i, n); 2666 memcpy (ds, data + i, n);
2520 2667
2521 for (j = 0; j < n; j++) 2668 for (j = 0; j < n; j++)
2522 if (ds[j] == '\n') 2669 if (ds[j] == C0_LF)
2523 ds[j] = '\r'; 2670 ds[j] = C0_CR;
2524 2671
2525 tt_write (ds, (int)n); 2672 tt_write (ds, (int)n);
2526 } 2673 }
2527 2674
2528 free (ds); 2675 free (ds);
… …
2537rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2538{ 2685{
2539 long nread = 0; 2686 long nread = 0;
2540 unsigned long bytes_after; 2687 unsigned long bytes_after;
2541 XTextProperty ct; 2688 XTextProperty ct;
2542
2543 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2544 2689
2545 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2546 { 2691 {
2547 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2548 { 2693 {
… …
2575 &ct.nitems, &bytes_after, 2720 &ct.nitems, &bytes_after,
2576 &ct.value) != Success) 2721 &ct.value) != Success)
2577 break; 2722 break;
2578 2723
2579 if (ct.encoding == 0) 2724 if (ct.encoding == 0)
2725 break;
2726
2727 if (ct.encoding == xa[XA_INCR])
2580 { 2728 {
2581 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2729 // INCR selection, start handshake
2730 XDeleteProperty (display->display, win, prop);
2731 selection_wait = Sel_incr;
2732 incr_ev.start (NOW + 10);
2582 break; 2733 break;
2583 } 2734 }
2584 2735
2585 if (ct.value == NULL) 2736 if (ct.value == NULL)
2586 {
2587 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2588 continue; 2737 continue;
2589 }
2590 2738
2591 if (ct.nitems == 0) 2739 if (ct.nitems == 0)
2592 { 2740 {
2593 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2594
2595 if (selection_wait == Sel_normal && nread == 0 2741 if (selection_wait == Sel_normal && nread == 0
2596 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2597 { 2743 {
2598 /* 2744 /*
2599 * pass through again trying CUT_BUFFER0 if we've come from 2745 * pass through again trying CUT_BUFFER0 if we've come from
2600 * XConvertSelection () but nothing was presented 2746 * XConvertSelection () but nothing was presented
2601 */ 2747 */
2602 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2603 selection_paste (display->root, XA_CUT_BUFFER0, False); 2748 selection_paste (display->root, XA_CUT_BUFFER0, False);
2604 } 2749 }
2605 2750
2606 nread = -1; /* discount any previous stuff */ 2751 nread = -1; /* discount any previous stuff */
2607 break; 2752 break;
… …
2609 2754
2610 nread += ct.nitems; 2755 nread += ct.nitems;
2611 2756
2612 char **cl; 2757 char **cl;
2613 int cr; 2758 int cr;
2614 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2615 &cr) >= 0 && cl)
2616 { 2760 {
2617 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2618 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2762 paste ((unsigned char *)cl[i], strlen (cl[i]));
2619 2763
2620 XFreeStringList (cl); 2764 XFreeStringList (cl);
2621 } 2765 }
2622 else 2766 else
2623 paste (ct.value, ct.nitems); 2767 paste (ct.value, ct.nitems);
… …
2632 XFree (ct.value); 2776 XFree (ct.value);
2633 2777
2634 if (selection_wait == Sel_normal) 2778 if (selection_wait == Sel_normal)
2635 selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2636 2780
2637 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2638 return (int)nread; 2781 return (int)nread;
2639} 2782}
2640 2783
2641void 2784void
2642rxvt_term::incr_cb (time_watcher &w) 2785rxvt_term::incr_cb (time_watcher &w)
… …
2650 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2651 */ 2794 */
2652void 2795void
2653rxvt_term::selection_property (Window win, Atom prop) 2796rxvt_term::selection_property (Window win, Atom prop)
2654{ 2797{
2655 int reget_time = 0; 2798 if (prop == None || selection_wait != Sel_incr)
2656
2657 if (prop == None)
2658 return; 2799 return;
2659 2800
2660 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2661 if (selection_wait == Sel_normal)
2662 {
2663 int a, afmt;
2664 Atom atype;
2665 unsigned long bytes_after, nitems;
2666 unsigned char *s = NULL;
2667
2668 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2669 xa[XA_INCR], &atype, &afmt, &nitems,
2670 &bytes_after, &s);
2671 if (s)
2672 XFree (s);
2673 if (a != Success)
2674 return;
2675
2676#ifndef __CYGWIN32__
2677 if (atype == xa[XA_INCR])
2678 { /* start an INCR transfer */
2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2680 XDeleteProperty (display->display, win, prop);
2681 XFlush (display->display);
2682 reget_time = 1;
2683 selection_wait = Sel_incr;
2684 }
2685#endif
2686
2687 }
2688 else if (selection_wait == Sel_incr)
2689 {
2690 reget_time = 1;
2691
2692 if (selection_paste (win, prop, True) == -1) 2801 if (selection_paste (win, prop, 1) > 0)
2693 {
2694 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2695 selection_wait = Sel_none;
2696 incr_ev.stop ();
2697 }
2698 }
2699 if (reget_time) /* received more data so reget time */
2700 incr_ev.start (NOW + 10); 2802 incr_ev.start (NOW + 10);
2803 else
2804 {
2805 selection_wait = Sel_none;
2806 incr_ev.stop ();
2807 }
2701} 2808}
2702 2809
2703/* ------------------------------------------------------------------------- */ 2810/* ------------------------------------------------------------------------- */
2704/* 2811/*
2705 * Request the current selection: 2812 * Request the current selection:
… …
2711 * EXT: button 2 release 2818 * EXT: button 2 release
2712 */ 2819 */
2713void 2820void
2714rxvt_term::selection_request (Time tm, int x, int y) 2821rxvt_term::selection_request (Time tm, int x, int y)
2715{ 2822{
2716 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2717
2718 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2823 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2719 return; /* outside window */ 2824 return; /* outside window */
2720 2825
2721 if (selection.text) 2826 if (selection.text)
2722 { /* internal selection */ 2827 { /* internal selection */
2723 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2724 char *str = rxvt_wcstombs (selection.text, selection.len); 2828 char *str = rxvt_wcstombs (selection.text, selection.len);
2725 paste ((unsigned char *)str, strlen (str)); 2829 paste ((unsigned char *)str, strlen (str));
2726 free (str); 2830 free (str);
2727 return; 2831 return;
2728 } 2832 }
… …
2747 2851
2748 } 2852 }
2749 } 2853 }
2750 2854
2751 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2752 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2753 selection_paste (display->root, XA_CUT_BUFFER0, False); 2856 selection_paste (display->root, XA_CUT_BUFFER0, False);
2754} 2857}
2755 2858
2756int 2859int
2757rxvt_term::selection_request_other (Atom target, int selnum) 2860rxvt_term::selection_request_other (Atom target, int selnum)
… …
2770 else 2873 else
2771 sel = xa[XA_CLIPBOARD]; 2874 sel = xa[XA_CLIPBOARD];
2772 2875
2773 if (XGetSelectionOwner (display->display, sel) != None) 2876 if (XGetSelectionOwner (display->display, sel) != None)
2774 { 2877 {
2775 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2776 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2878 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2777 TermWin.vt, selection_request_time); 2879 TermWin.vt, selection_request_time);
2778 return 1; 2880 return 1;
2779 } 2881 }
2780 2882
… …
2787 * EXT: SelectionClear 2889 * EXT: SelectionClear
2788 */ 2890 */
2789void 2891void
2790rxvt_term::selection_clear () 2892rxvt_term::selection_clear ()
2791{ 2893{
2792 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2793
2794 want_refresh = 1; 2894 want_refresh = 1;
2795 free (selection.text); 2895 free (selection.text);
2796 selection.text = NULL; 2896 selection.text = NULL;
2797 selection.len = 0; 2897 selection.len = 0;
2798 CLEAR_SELECTION (); 2898 CLEAR_SELECTION ();
… …
2811{ 2911{
2812 int i, col, end_col, row, end_row; 2912 int i, col, end_col, row, end_row;
2813 wchar_t *new_selection_text; 2913 wchar_t *new_selection_text;
2814 text_t *t; 2914 text_t *t;
2815 2915
2816 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2817 switch (selection.op) 2916 switch (selection.op)
2818 { 2917 {
2819 case SELECTION_CONT: 2918 case SELECTION_CONT:
2820 break; 2919 break;
2821 case SELECTION_INIT: 2920 case SELECTION_INIT:
… …
2835 2934
2836 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2935 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2837 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2936 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2838 2937
2839 col = selection.beg.col; 2938 col = selection.beg.col;
2840 MAX_IT (col, 0);
2841 row = selection.beg.row + TermWin.saveLines; 2939 row = selection.beg.row + TermWin.saveLines;
2842 end_row = selection.end.row + TermWin.saveLines; 2940 end_row = selection.end.row + TermWin.saveLines;
2843 int ofs = 0; 2941 int ofs = 0;
2844 int extra = 0; 2942 int extra = 0;
2845 2943
2846 for (; row <= end_row; row++, col = 0) 2944 for (; row <= end_row; row++, col = 0)
2847 { 2945 {
2848 t = &(screen.text[row][col]);
2849
2850 end_col = screen.tlen[row]; 2946 end_col = screen.tlen[row];
2947
2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 col = selection.beg.col;
2952 end_col = TermWin.ncol + 1;
2953 }
2954#endif
2955
2956 MAX_IT (col, 0);
2851 2957
2852 if (end_col == -1) 2958 if (end_col == -1)
2853 end_col = TermWin.ncol; 2959 end_col = TermWin.ncol;
2854 2960
2855 if (row == end_row) 2961 if (row == end_row || selection.rect)
2856 MIN_IT (end_col, selection.end.col); 2962 MIN_IT (end_col, selection.end.col);
2857 2963
2964 t = &screen.text[row][col];
2858 for (; col < end_col; col++) 2965 for (; col < end_col; col++)
2859 { 2966 {
2860 if (*t == NOCHAR) 2967 if (*t == NOCHAR)
2861 t++; 2968 t++;
2862#if ENABLE_COMBINING 2969#if ENABLE_COMBINING
… …
2879 else 2986 else
2880 new_selection_text[ofs++] = *t++; 2987 new_selection_text[ofs++] = *t++;
2881 } 2988 }
2882 2989
2883 if (screen.tlen[row] != -1 && row != end_row) 2990 if (screen.tlen[row] != -1 && row != end_row)
2884 new_selection_text[ofs++] = L'\n'; 2991 new_selection_text[ofs++] = C0_LF;
2885 } 2992 }
2886 2993
2887 if (end_col != selection.end.col) 2994 if (end_col != selection.end.col)
2888 new_selection_text[ofs++] = L'\n'; 2995 new_selection_text[ofs++] = C0_LF;
2889 2996
2890 new_selection_text[ofs] = 0; 2997 new_selection_text[ofs] = 0;
2891 2998
2892 if (ofs == 0) 2999 if (ofs == 0)
2893 { 3000 {
… …
2917 XFree (ct.value); 3024 XFree (ct.value);
2918 } 3025 }
2919#endif 3026#endif
2920 3027
2921 selection_time = tm; 3028 selection_time = tm;
2922 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2923} 3029}
2924 3030
2925/* ------------------------------------------------------------------------- */ 3031/* ------------------------------------------------------------------------- */
2926/* 3032/*
2927 * Mark or select text based upon number of clicks: 1, 2, or 3 3033 * Mark or select text based upon number of clicks: 1, 2, or 3
2928 * EXT: button 1 press 3034 * EXT: button 1 press
2929 */ 3035 */
2930void 3036void
2931rxvt_term::selection_click (int clicks, int x, int y) 3037rxvt_term::selection_click (int clicks, int x, int y)
2932{ 3038{
2933 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2934
2935 clicks = ((clicks - 1) % 3) + 1; 3039 clicks = ((clicks - 1) % 3) + 1;
2936 selection.clicks = clicks; /* save clicks so extend will work */ 3040 selection.clicks = clicks; /* save clicks so extend will work */
2937 3041
2938 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3042 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2939 3043
… …
2981 * We now only find out the boundary in one direction 3085 * We now only find out the boundary in one direction
2982 */ 3086 */
2983 3087
2984/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3088/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2985#define DELIMIT_TEXT(x) \ 3089#define DELIMIT_TEXT(x) \
2986 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3090 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2987#define DELIMIT_REND(x) 1 3091#define DELIMIT_REND(x) 1
2988 3092
2989void 3093void
2990rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3094rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2991{ 3095{
… …
3009 3113
3010 row = mark->row + TermWin.saveLines; 3114 row = mark->row + TermWin.saveLines;
3011 col = mark->col; 3115 col = mark->col;
3012 MAX_IT (col, 0); 3116 MAX_IT (col, 0);
3013 /* find the edge of a word */ 3117 /* find the edge of a word */
3014 stp = & (screen.text[row][col]); 3118 stp = &screen.text[row][col];
3015 w1 = DELIMIT_TEXT (*stp); 3119 w1 = DELIMIT_TEXT (*stp);
3016 3120
3017 srp = (&screen.rend[row][col]); 3121 srp = &screen.rend[row][col];
3018 w2 = DELIMIT_REND (*srp); 3122 w2 = DELIMIT_REND (*srp);
3019 3123
3020 for (;;) 3124 for (;;)
3021 { 3125 {
3022 for (; col != bound.col; col += dirnadd) 3126 for (; col != bound.col; col += dirnadd)
… …
3056 } 3160 }
3057 break; 3161 break;
3058 } 3162 }
3059 3163
3060Old_Word_Selection_You_Die: 3164Old_Word_Selection_You_Die:
3061 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));
3062
3063 if (dirn == DN) 3165 if (dirn == DN)
3064 col++; /* put us on one past the end */ 3166 col++; /* put us on one past the end */
3065 3167
3066 /* Poke the values back in */ 3168 /* Poke the values back in */
3067 ret->row = row - TermWin.saveLines; 3169 ret->row = row - TermWin.saveLines;
… …
3101 /* select nothing */ 3203 /* select nothing */
3102 selection.beg.row = selection.end.row = 0; 3204 selection.beg.row = selection.end.row = 0;
3103 selection.beg.col = selection.end.col = 0; 3205 selection.beg.col = selection.end.col = 0;
3104 selection.clicks = 4; 3206 selection.clicks = 4;
3105 want_refresh = 1; 3207 want_refresh = 1;
3106 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3107 return; 3208 return;
3108 } 3209 }
3109 3210
3110 if (selection.clicks == 4) 3211 if (selection.clicks == 4)
3111 selection.clicks = 1; 3212 selection.clicks = 1;
… …
3120 * Extend the selection to the specified col/row 3221 * Extend the selection to the specified col/row
3121 */ 3222 */
3122void 3223void
3123rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3224rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3124{ 3225{
3125 int16_t ncol = TermWin.ncol; 3226 int16_t ncol = TermWin.ncol;
3126 int end_col; 3227 int end_col;
3127 row_col_t pos; 3228 row_col_t pos;
3128 enum { 3229 enum {
3129 LEFT, RIGHT 3230 LEFT, RIGHT
3130 } closeto = RIGHT; 3231 } closeto = RIGHT;
3131 3232
3132 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));
3133 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));
3134
3135 want_refresh = 1; 3233 want_refresh = 1;
3234
3136 switch (selection.op) 3235 switch (selection.op)
3137 { 3236 {
3138 case SELECTION_INIT: 3237 case SELECTION_INIT:
3139 CLEAR_SELECTION (); 3238 CLEAR_SELECTION ();
3140 selection.op = SELECTION_BEGIN; 3239 selection.op = SELECTION_BEGIN;
… …
3153 selection_start_colrow (col, row); 3252 selection_start_colrow (col, row);
3154 /* FALLTHROUGH */ 3253 /* FALLTHROUGH */
3155 default: 3254 default:
3156 return; 3255 return;
3157 } 3256 }
3257
3158 if (selection.beg.col == selection.end.col 3258 if (selection.beg.col == selection.end.col
3159 && selection.beg.col != selection.mark.col 3259 && selection.beg.col != selection.mark.col
3160 && selection.beg.row == selection.end.row 3260 && selection.beg.row == selection.end.row
3161 && selection.beg.row != selection.mark.row) 3261 && selection.beg.row != selection.mark.row)
3162 { 3262 {
3163 selection.beg.col = selection.end.col = selection.mark.col; 3263 selection.beg.col = selection.end.col = selection.mark.col;
3164 selection.beg.row = selection.end.row = selection.mark.row; 3264 selection.beg.row = selection.end.row = selection.mark.row;
3165 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));
3166 } 3265 }
3167 3266
3168 pos.col = col; 3267 pos.col = col;
3169 pos.row = row; 3268 pos.row = row;
3170 3269
… …
3213 } 3312 }
3214 else 3313 else
3215 { /* button1 drag or button3 drag */ 3314 { /* button1 drag or button3 drag */
3216 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3315 if (ROWCOL_IS_AFTER (selection.mark, pos))
3217 { 3316 {
3218 if ((selection.mark.row == selection.end.row) 3317 if (selection.mark.row == selection.end.row
3219 && (selection.mark.col == selection.end.col) 3318 && selection.mark.col == selection.end.col
3319 && clickchange
3220 && clickchange && selection.clicks == 2) 3320 && selection.clicks == 2)
3221 selection.mark.col--; 3321 selection.mark.col--;
3222 3322
3223 selection.beg.row = pos.row; 3323 selection.beg.row = pos.row;
3224 selection.beg.col = pos.col; 3324 selection.beg.col = pos.col;
3225 selection.end.row = selection.mark.row; 3325 selection.end.row = selection.mark.row;
… …
3236 3336
3237 if (selection.clicks == 1) 3337 if (selection.clicks == 1)
3238 { 3338 {
3239 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3339 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3240 3340
3241 if (end_col != -1 && selection.beg.col > end_col) 3341 if (selection.beg.col > end_col
3342 && end_col != -1
3343#if ENABLE_FRILLS
3344 && !selection.rect
3345#endif
3242 { 3346 )
3243#if 1
3244 selection.beg.col = ncol; 3347 selection.beg.col = ncol;
3245#else
3246 if (selection.beg.row != selection.end.row)
3247 selection.beg.col = ncol;
3248 else
3249 selection.beg.col = selection.mark.col;
3250#endif
3251 }
3252 3348
3253 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3349 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3254 3350
3255 if (end_col != -1 && selection.end.col > end_col) 3351 if (
3352 selection.end.col > end_col
3353 && end_col != -1
3354#if ENABLE_FRILLS
3355 && !selection.rect
3356#endif
3357 )
3256 selection.end.col = ncol; 3358 selection.end.col = ncol;
3257 } 3359 }
3258 else if (selection.clicks == 2) 3360 else if (selection.clicks == 2)
3259 { 3361 {
3260 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3362 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3261 selection.end.col--; 3363 selection.end.col--;
3262 3364
3263 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3264 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3365 selection_delimit_word (UP, &selection.beg, &selection.beg);
3366 selection_delimit_word (DN, &selection.end, &selection.end);
3265 } 3367 }
3266 else if (selection.clicks == 3) 3368 else if (selection.clicks == 3)
3267 { 3369 {
3268#ifndef NO_FRILLS 3370#if ENABLE_FRILLS
3269 if ((Options & Opt_tripleclickwords)) 3371 if ((options & Opt_tripleclickwords))
3270 { 3372 {
3271 int end_row; 3373 int end_row;
3272 3374
3273 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3375 selection_delimit_word (UP, &selection.beg, &selection.beg);
3274 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3275 3377
3276 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3378 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3277 { 3379 {
3278 end_col = screen.tlen[end_row + TermWin.saveLines]; 3380 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3289 else 3391 else
3290#endif 3392#endif
3291 { 3393 {
3292 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3293 selection.mark.col++; 3395 selection.mark.col++;
3396
3294 selection.beg.col = 0; 3397 selection.beg.col = 0;
3295 selection.end.col = ncol; 3398 selection.end.col = ncol;
3296 } 3399 }
3297 } 3400 }
3298 3401
3299 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
3300 { /* mark may need to be changed */ 3403 { /* mark may need to be changed */
3301 if (closeto == LEFT) 3404 if (closeto == LEFT)
3302 { 3405 {
3303 selection.mark.row = selection.end.row; 3406 selection.mark.row = selection.end.row;
3304 selection.mark.col = selection.end.col 3407 selection.mark.col = selection.end.col - (selection.clicks == 2);
3305 - (selection.clicks == 2);
3306 } 3408 }
3307 else 3409 else
3308 { 3410 {
3309 selection.mark.row = selection.beg.row; 3411 selection.mark.row = selection.beg.row;
3310 selection.mark.col = selection.beg.col; 3412 selection.mark.col = selection.beg.col;
3311 } 3413 }
3312 } 3414 }
3313 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));
3314}
3315 3415
3316#ifndef NO_FRILLS 3416#if ENABLE_FRILLS
3417 if (selection.rect && selection.beg.col > selection.end.col)
3418 SWAP_IT (selection.beg.col, selection.end.col, int);
3419#endif
3420}
3421
3422#if ENABLE_FRILLS
3317void 3423void
3318rxvt_term::selection_remove_trailing_spaces () 3424rxvt_term::selection_remove_trailing_spaces ()
3319{ 3425{
3320 int32_t end_col, end_row; 3426 int32_t end_col, end_row;
3321 text_t *stp; 3427 text_t *stp;
3322 3428
3323 end_col = selection.end.col; 3429 end_col = selection.end.col;
3324 end_row = selection.end.row; 3430 end_row = selection.end.row;
3431
3325 for ( ; end_row >= selection.beg.row; ) 3432 for ( ; end_row >= selection.beg.row; )
3326 { 3433 {
3327 stp = screen.text[end_row + TermWin.saveLines]; 3434 stp = screen.text[end_row + TermWin.saveLines];
3435
3328 while (--end_col >= 0) 3436 while (--end_col >= 0)
3329 { 3437 {
3330 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3438 if (stp[end_col] != ' '
3439 && stp[end_col] != '\t'
3440 && stp[end_col] != NOCHAR)
3331 break; 3441 break;
3332 } 3442 }
3443
3333 if (end_col >= 0 3444 if (end_col >= 0
3334 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3445 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3335 { 3446 {
3336 selection.end.col = end_col + 1; 3447 selection.end.col = end_col + 1;
3337 selection.end.row = end_row; 3448 selection.end.row = end_row;
3338 break; 3449 break;
3339 } 3450 }
3451
3340 end_row--; 3452 end_row--;
3341 end_col = TermWin.ncol; 3453 end_col = TermWin.ncol;
3342 } 3454 }
3455
3343 if (selection.mark.row > selection.end.row) 3456 if (selection.mark.row > selection.end.row)
3344 { 3457 {
3345 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
3346 selection.mark.col = selection.end.col; 3459 selection.mark.col = selection.end.col;
3347 } 3460 }
… …
3360rxvt_term::selection_rotate (int x, int y) 3473rxvt_term::selection_rotate (int x, int y)
3361{ 3474{
3362 selection.clicks = selection.clicks % 3 + 1; 3475 selection.clicks = selection.clicks % 3 + 1;
3363 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3476 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3364} 3477}
3365
3366/* ------------------------------------------------------------------------- */
3367/*
3368 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3369 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3370 * the X11 protocol.
3371 */
3372typedef CARD32 Atom32;
3373 3478
3374/* ------------------------------------------------------------------------- */ 3479/* ------------------------------------------------------------------------- */
3375/* 3480/*
3376 * Respond to a request for our current selection 3481 * Respond to a request for our current selection
3377 * EXT: SelectionRequest 3482 * EXT: SelectionRequest
… …
3392 ev.target = rq.target; 3497 ev.target = rq.target;
3393 ev.time = rq.time; 3498 ev.time = rq.time;
3394 3499
3395 if (rq.target == xa[XA_TARGETS]) 3500 if (rq.target == xa[XA_TARGETS])
3396 { 3501 {
3397 Atom32 target_list[6]; 3502 Atom target_list[6];
3398 Atom32 *target = target_list; 3503 Atom *target = target_list;
3399 3504
3400 *target++ = (Atom32) xa[XA_TARGETS]; 3505 *target++ = xa[XA_TARGETS];
3401 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3506 *target++ = xa[XA_TIMESTAMP];
3402 *target++ = (Atom32) XA_STRING; 3507 *target++ = XA_STRING;
3403 *target++ = (Atom32) xa[XA_TEXT]; 3508 *target++ = xa[XA_TEXT];
3404 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3509 *target++ = xa[XA_COMPOUND_TEXT];
3405#if X_HAVE_UTF8_STRING 3510#if X_HAVE_UTF8_STRING
3406 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3511 *target++ = xa[XA_UTF8_STRING];
3407#endif 3512#endif
3408 3513
3409 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3410 (8 * sizeof (target_list[0])), PropModeReplace, 3515 32, PropModeReplace,
3411 (unsigned char *)target_list, 3516 (unsigned char *)target_list, target - target_list);
3412 target - target_list);
3413 ev.property = rq.property; 3517 ev.property = rq.property;
3414 } 3518 }
3519#if TODO // TODO
3415 else if (rq.target == xa[XA_MULTIPLE]) 3520 else if (rq.target == xa[XA_MULTIPLE])
3416 { 3521 {
3417 /* TODO: Handle MULTIPLE */ 3522 /* TODO: Handle MULTIPLE */
3418 } 3523 }
3524#endif
3419 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3420 { 3526 {
3421 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3422 (8 * sizeof (Time)), PropModeReplace,
3423 (unsigned char *)&selection_time, 1); 3528 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3424 ev.property = rq.property; 3529 ev.property = rq.property;
3425 } 3530 }
3426 else if (rq.target == XA_STRING 3531 else if (rq.target == XA_STRING
3427 || rq.target == xa[XA_TEXT] 3532 || rq.target == xa[XA_TEXT]
3428 || rq.target == xa[XA_COMPOUND_TEXT] 3533 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3504} 3609}
3505 3610
3506/* ------------------------------------------------------------------------- */ 3611/* ------------------------------------------------------------------------- */
3507#ifdef USE_XIM 3612#ifdef USE_XIM
3508void 3613void
3509rxvt_term::im_set_position (XPoint *pos) 3614rxvt_term::im_set_position (XPoint &pos)
3510{ 3615{
3511 XWindowAttributes xwa; 3616 XWindowAttributes xwa;
3512 3617
3513 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3618 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3619
3514 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3620 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3515 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3621 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3516} 3622}
3517
3518#endif 3623#endif
3519/* ------------------------------------------------------------------------- */ 3624
3520 3625#if ENABLE_OVERLAY
3626void
3627rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3628{
3629 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3630 return;
3631
3632 want_refresh = 1;
3633
3634 scr_overlay_off ();
3635
3636 if (x < 0) x = TermWin.ncol - w;
3637 if (y < 0) y = TermWin.nrow - h;
3638
3639 // make space for border
3640 w += 2; MIN_IT (w, TermWin.ncol);
3641 h += 2; MIN_IT (h, TermWin.nrow);
3642
3643 x -= 1; MAX_IT (x, 0);
3644 y -= 1; MAX_IT (y, 0);
3645
3646 MIN_IT (x, TermWin.ncol - w);
3647 MIN_IT (y, TermWin.nrow - h);
3648
3649 ov_x = x; ov_y = y;
3650 ov_w = w; ov_h = h;
3651
3652 ov_text = new text_t *[h];
3653 ov_rend = new rend_t *[h];
3654
3655 for (y = 0; y < h; y++)
3656 {
3657 text_t *tp = ov_text[y] = new text_t[w];
3658 rend_t *rp = ov_rend[y] = new rend_t[w];
3659
3660 text_t t0, t1, t2;
3661 rend_t r = OVERLAY_RSTYLE;
3662
3663 if (y == 0)
3664 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3665 else if (y < h - 1)
3666 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3667 else
3668 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3669
3670 *tp++ = t0;
3671 *rp++ = r;
3672
3673 for (x = w - 2; x > 0; --x)
3674 {
3675 *tp++ = t1;
3676 *rp++ = r;
3677 }
3678
3679 *tp = t2;
3680 *rp = r;
3681 }
3682}
3683
3684void
3685rxvt_term::scr_overlay_off ()
3686{
3687 if (!ov_text)
3688 return;
3689
3690 want_refresh = 1;
3691
3692 for (int y = 0; y < ov_h; y++)
3693 {
3694 delete [] ov_text[y];
3695 delete [] ov_rend[y];
3696 }
3697
3698 delete [] ov_text; ov_text = 0;
3699 delete [] ov_rend; ov_rend = 0;
3700}
3701
3702void
3703rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3704{
3705 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3706 return;
3707
3708 x++, y++;
3709
3710 ov_text[y][x] = text;
3711 ov_rend[y][x] = rend;
3712}
3713
3714void
3715rxvt_term::scr_overlay_set (int x, int y, const char *s)
3716{
3717 while (*s)
3718 scr_overlay_set (x++, y, *s++);
3719}
3720
3721void
3722rxvt_term::scr_swap_overlay ()
3723{
3724 if (!ov_text)
3725 return;
3726
3727 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3728
3729 // swap screen mem with overlay
3730 for (int y = ov_h; y--; )
3731 {
3732 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y];
3734
3735 text_t *t2 = screen.text[y + row_offset] + ov_x;
3736 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3737
3738 for (int x = ov_w; x--; )
3739 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3742 }
3743 }
3744}
3745
3746#endif
3521/* ------------------------------------------------------------------------- * 3747/* ------------------------------------------------------------------------- */
3522 * DEBUG ROUTINES *
3523 * ------------------------------------------------------------------------- */
3524#if 0
3525void
3526rxvt_debug_colors (void)
3527{
3528 int color;
3529 const char *name[] =
3530 {
3531 "fg", "bg",
3532 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3533 };
3534
3535 fprintf (stderr, "Color ( ");
3536 if (rstyle & RS_RVid)
3537 fprintf (stderr, "rvid ");
3538 if (rstyle & RS_Bold)
3539 fprintf (stderr, "bold ");
3540 if (rstyle & RS_Blink)
3541 fprintf (stderr, "blink ");
3542 if (rstyle & RS_Uline)
3543 fprintf (stderr, "uline ");
3544 fprintf (stderr, "): ");
3545
3546 color = GET_FGCOLOR (rstyle);
3547#ifndef NO_BRIGHTCOLOR
3548 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3549 {
3550 color -= (minBrightCOLOR - minCOLOR);
3551 fprintf (stderr, "bright ");
3552 }
3553#endif
3554 fprintf (stderr, "%s on ", name[color]);
3555
3556 color = GET_BGCOLOR (rstyle);
3557#ifndef NO_BRIGHTCOLOR
3558 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3559 {
3560 color -= (minBrightCOLOR - minCOLOR);
3561 fprintf (stderr, "bright ");
3562 }
3563#endif
3564 fprintf (stderr, "%s\n", name[color]);
3565}
3566#endif

Diff Legend

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