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

Diff Legend

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