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.37 by pcg, Tue Feb 24 23:58:13 2004 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 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 // dunno where these come from
868#if 0
869 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
870 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
871#endif
872 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 894 // 5f-7e standard vt100
874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 895 // 40-5e rxvt extension for extra curses acs chars
875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 896 static uint16_t vt100_0[63] = { // 5f .. 7e
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
877 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
878 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; 899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
879 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; 900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
880 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; 901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
881 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; 902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
882 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; 903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
883 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
884 } 905 };
885 906
886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 907 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
887 // rely on wcwidth to tell us the character width, at least for non-ascii 908 {
888 int width = c <= 128 ? 1 : wcwidth (c); 909 c = vt100_0[c - 0x40];
910 width = 1;
911 }
912 }
889 913
890 // width -1 characters (e.g. combining chars) are ignored currently.
891 if (width > 0) 914 if (width != 0)
892 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))
893 { 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 {
894 stp[screen.cur.col] = c; 955 stp[screen.cur.col] = c;
895 srp[screen.cur.col] = rend; 956 srp[screen.cur.col] = rend;
896 957
897 if (screen.cur.col < last_col - 1) 958 if (screen.cur.col < last_col - 1)
898 screen.cur.col++; 959 screen.cur.col++;
899 else 960 else
900 { 961 {
901 screen.tlen[row] = last_col; 962 screen.tlen[row] = last_col;
902 if (screen.flags & Screen_Autowrap) 963 if (screen.flags & Screen_Autowrap)
903 screen.flags |= Screen_WrapNext; 964 screen.flags |= Screen_WrapNext;
904 break; 965 break;
905 } 966 }
906 967
907 c = NOCHAR; 968 c = NOCHAR;
908 } 969 }
909 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 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
997 {
998 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
999 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
1000 }
910 else 1001 else
911 (void)0; /* handle combining character etc. here. */ 1002 continue;
1003
1004 // handle double-width-chars by making them look extremely ugly
1005 if (*tp == NOCHAR)
1006 {
1007 // hack //D //TODO //--tp, --rp;
1008 *tp = ' ';
1009 *rp &= ~RS_baseattrMask;
1010 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1011 }
1012
1013 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c);
1017
1018 *tp = n;
1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1020#endif
1021 }
912 } 1022 }
913 1023
914 if (screen.tlen[row] != -1) /* XXX: think about this */ 1024 if (screen.tlen[row] != -1) /* XXX: think about this */
915 MAX_IT (screen.tlen[row], screen.cur.col); 1025 MAX_IT (screen.tlen[row], screen.cur.col);
916
917 /*
918 * If we wrote anywhere in the selected area, kill the selection
919 * XXX: should we kill the mark too? Possibly, but maybe that
920 * should be a similar check.
921 */
922 if (clearsel)
923 CLEAR_SELECTION ();
924 1026
925#ifdef DEBUG_STRICT 1027#ifdef DEBUG_STRICT
926 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
927#else /* drive with your eyes closed */ 1029#else /* drive with your eyes closed */
928 MAX_IT (screen.cur.row, 0); 1030 MAX_IT (screen.cur.row, 0);
… …
936 */ 1038 */
937void 1039void
938rxvt_term::scr_backspace () 1040rxvt_term::scr_backspace ()
939{ 1041{
940 want_refresh = 1; 1042 want_refresh = 1;
1043
941 if (screen.cur.col == 0) 1044 if (screen.cur.col == 0)
942 { 1045 {
943 if (screen.cur.row > 0) 1046 if (screen.cur.row > 0)
944 { 1047 {
945#ifdef TERMCAP_HAS_BW 1048#ifdef TERMCAP_HAS_BW
946 screen.cur.col = TermWin.ncol - 1; 1049 screen.cur.col = TermWin.ncol - 1;
947 screen.cur.row--; 1050 screen.cur.row--;
948 return; 1051 return;
949#endif 1052#endif
950
951 } 1053 }
952 } 1054 }
953 else if ((screen.flags & Screen_WrapNext) == 0) 1055 else if (!(screen.flags & Screen_WrapNext))
954 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1057
955 screen.flags &= ~Screen_WrapNext; 1058 screen.flags &= ~Screen_WrapNext;
956} 1059}
957 1060
958/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
959/* 1062/*
960 * Process Horizontal Tab 1063 * Process Horizontal Tab
961 * count: +ve = forward; -ve = backwards 1064 * count: +ve = forward; -ve = backwards
962 * XTERM_SEQ: CTRL-I 1065 * XTERM_SEQ: CTRL-I
963 */ 1066 */
964void 1067void
965rxvt_term::scr_tab (int count) 1068rxvt_term::scr_tab (int count, bool ht)
966{ 1069{
967 int i, x; 1070 int i, x;
968 1071
969 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
970 want_refresh = 1; 1072 want_refresh = 1;
971 i = x = screen.cur.col; 1073 i = x = screen.cur.col;
1074
972 if (count == 0) 1075 if (count == 0)
973 return; 1076 return;
974 else if (count > 0) 1077 else if (count > 0)
975 { 1078 {
1079 int row = TermWin.saveLines + screen.cur.row;
1080 text_t *tp = screen.text[row];
1081 rend_t *rp = screen.rend[row];
1082 rend_t base_rend = rp[i];
1083 ht &= tp[i] == ' ';
1084
976 for (; ++i < TermWin.ncol; ) 1085 for (; ++i < TermWin.ncol; )
977 if (tabs[i]) 1086 if (tabs[i])
978 { 1087 {
979 x = i; 1088 x = i;
980 if (!--count) 1089 if (!--count)
981 break; 1090 break;
982 } 1091 }
1092 else
1093 ht &= tp[i] == ' '
1094 && RS_SAME (rp[i], base_rend);
1095
983 if (count) 1096 if (count)
984 x = TermWin.ncol - 1; 1097 x = TermWin.ncol - 1;
1098
1099 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted.
1101 if (ht)
1102 {
1103 base_rend = SET_FONT (base_rend, 0);
1104
1105 if (screen.tlen[row] != -1) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x);
1107
1108 i = screen.cur.col;
1109
1110 tp[i] = '\t';
1111 rp[i] = base_rend;
1112
1113 while (++i < x)
1114 {
1115 tp[i] = NOCHAR;
1116 rp[i] = base_rend;
1117 }
1118 }
985 } 1119 }
986 else /* if (count < 0) */ 1120 else /* if (count < 0) */
987 { 1121 {
988 for (; --i >= 0; ) 1122 for (; --i >= 0; )
989 if (tabs[i]) 1123 if (tabs[i])
990 { 1124 {
991 x = i; 1125 x = i;
992 if (!++count) 1126 if (!++count)
993 break; 1127 break;
994 } 1128 }
1129
995 if (count) 1130 if (count)
996 x = 0; 1131 x = 0;
997 } 1132 }
1133
998 if (x != screen.cur.col) 1134 if (x != screen.cur.col)
999 scr_gotorc (0, x, R_RELATIVE); 1135 scr_gotorc (0, x, R_RELATIVE);
1000} 1136}
1001 1137
1002/* ------------------------------------------------------------------------- */ 1138/* ------------------------------------------------------------------------- */
… …
1004 * Process DEC Back Index 1140 * Process DEC Back Index
1005 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1006 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1007 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1008 */ 1144 */
1009#ifndef NO_FRILLS 1145#if ENABLE_FRILLS
1010void 1146void
1011rxvt_term::scr_backindex () 1147rxvt_term::scr_backindex ()
1012{ 1148{
1013 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1014 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1015 else 1151 else
1016 { 1152 {
1017 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1153 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1018 return; /* um, yeah? */ 1154 return; /* um, yeah? */
1155
1019 scr_insdel_chars (1, INSERT); 1156 scr_insdel_chars (1, INSERT);
1020 } 1157 }
1021} 1158}
1022#endif 1159#endif
1023/* ------------------------------------------------------------------------- */ 1160/* ------------------------------------------------------------------------- */
… …
1025 * Process DEC Forward Index 1162 * Process DEC Forward Index
1026 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1027 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1028 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1029 */ 1166 */
1030#ifndef NO_FRILLS 1167#if ENABLE_FRILLS
1031void 1168void
1032rxvt_term::scr_forwardindex () 1169rxvt_term::scr_forwardindex ()
1033{ 1170{
1034 int row; 1171 int row;
1035 1172
1036 if (screen.cur.col < TermWin.ncol - 1) 1173 if (screen.cur.col < TermWin.ncol - 1)
1037 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1038 else 1175 else
1039 { 1176 {
1040 row = screen.cur.row + TermWin.saveLines; 1177 row = screen.cur.row + TermWin.saveLines;
1178
1041 if (screen.tlen[row] == 0) 1179 if (screen.tlen[row] == 0)
1042 return; /* um, yeah? */ 1180 return; /* um, yeah? */
1043 else if (screen.tlen[row] == -1) 1181 else if (screen.tlen[row] == -1)
1044 screen.tlen[row] = TermWin.ncol; 1182 screen.tlen[row] = TermWin.ncol;
1183
1045 scr_gotorc (0, 0, R_RELATIVE); 1184 scr_gotorc (0, 0, R_RELATIVE);
1046 scr_insdel_chars (1, DELETE); 1185 scr_insdel_chars (1, DELETE);
1047 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1186 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1048 } 1187 }
1049} 1188}
… …
1057rxvt_term::scr_gotorc (int row, int col, int relative) 1196rxvt_term::scr_gotorc (int row, int col, int relative)
1058{ 1197{
1059 want_refresh = 1; 1198 want_refresh = 1;
1060 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1061 1200
1062 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));
1063
1064 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1065 : col);
1066 MAX_IT (screen.cur.col, 0); 1202 MAX_IT (screen.cur.col, 0);
1067 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1203 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1068 1204
1069 screen.flags &= ~Screen_WrapNext; 1205 screen.flags &= ~Screen_WrapNext;
1206
1070 if (relative & R_RELATIVE) 1207 if (relative & R_RELATIVE)
1071 { 1208 {
1072 if (row > 0) 1209 if (row > 0)
1073 { 1210 {
1074 if (screen.cur.row <= screen.bscroll 1211 if (screen.cur.row <= screen.bscroll
… …
1094 MIN_IT (screen.cur.row, screen.bscroll); 1231 MIN_IT (screen.cur.row, screen.bscroll);
1095 } 1232 }
1096 else 1233 else
1097 screen.cur.row = row; 1234 screen.cur.row = row;
1098 } 1235 }
1236
1099 MAX_IT (screen.cur.row, 0); 1237 MAX_IT (screen.cur.row, 0);
1100 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1238 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1101} 1239}
1102 1240
1103/* ------------------------------------------------------------------------- */ 1241/* ------------------------------------------------------------------------- */
1104/* 1242/*
1105 * direction should be UP or DN 1243 * direction should be UP or DN
1106 */ 1244 */
1107void 1245void
1108rxvt_term::scr_index (enum page_dirn direction) 1246rxvt_term::scr_index (enum page_dirn direction)
1109{ 1247{
1110 int dirn; 1248 int dirn;
1111 1249
1112 want_refresh = 1; 1250 want_refresh = 1;
1251 ZERO_SCROLLBACK ();
1252
1113 dirn = ((direction == UP) ? 1 : -1); 1253 dirn = ((direction == UP) ? 1 : -1);
1114 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1115
1116 ZERO_SCROLLBACK ();
1117 1254
1118 screen.flags &= ~Screen_WrapNext; 1255 screen.flags &= ~Screen_WrapNext;
1256
1119 if ((screen.cur.row == screen.bscroll && direction == UP) 1257 if ((screen.cur.row == screen.bscroll && direction == UP)
1120 || (screen.cur.row == screen.tscroll && direction == DN)) 1258 || (screen.cur.row == screen.tscroll && direction == DN))
1121 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1259 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1122 else 1260 else
1123 screen.cur.row += dirn; 1261 screen.cur.row += dirn;
1262
1124 MAX_IT (screen.cur.row, 0); 1263 MAX_IT (screen.cur.row, 0);
1125 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1264 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1126 selection_check (0); 1265 selection_check (0);
1127} 1266}
1128 1267
… …
1137rxvt_term::scr_erase_line (int mode) 1276rxvt_term::scr_erase_line (int mode)
1138{ 1277{
1139 unsigned int row, col, num; 1278 unsigned int row, col, num;
1140 1279
1141 want_refresh = 1; 1280 want_refresh = 1;
1142 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1143 ZERO_SCROLLBACK (); 1281 ZERO_SCROLLBACK ();
1144 1282
1145 selection_check (1); 1283 selection_check (1);
1146
1147 screen.flags &= ~Screen_WrapNext;
1148 1284
1149 row = TermWin.saveLines + screen.cur.row; 1285 row = TermWin.saveLines + screen.cur.row;
1150 switch (mode) 1286 switch (mode)
1151 { 1287 {
1152 case 0: /* erase to end of line */ 1288 case 0: /* erase to end of line */
… …
1175 default: 1311 default:
1176 return; 1312 return;
1177 } 1313 }
1178 1314
1179 if (screen.text[row]) 1315 if (screen.text[row])
1180 scr_blank_line (& (screen.text[row][col]), 1316 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1181 & (screen.rend[row][col]), num, rstyle);
1182 else 1317 else
1183 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1318 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1184} 1319}
1185 1320
1186/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
… …
1191 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1192 */ 1327 */
1193void 1328void
1194rxvt_term::scr_erase_screen (int mode) 1329rxvt_term::scr_erase_screen (int mode)
1195{ 1330{
1196 int num; 1331 int num;
1197 int32_t row, row_offset; 1332 int32_t row, row_offset;
1198 rend_t ren; 1333 rend_t ren;
1199 XGCValues gcvalue; 1334 XGCValues gcvalue;
1200 1335
1201 want_refresh = 1; 1336 want_refresh = 1;
1202 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1203 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1338
1204 row_offset = (int32_t)TermWin.saveLines; 1339 row_offset = (int32_t)TermWin.saveLines;
1205 1340
1206 switch (mode) 1341 switch (mode)
1207 { 1342 {
1208 case 0: /* erase to end of screen */ 1343 case 0: /* erase to end of screen */
… …
1223 num = TermWin.nrow; 1358 num = TermWin.nrow;
1224 break; 1359 break;
1225 default: 1360 default:
1226 return; 1361 return;
1227 } 1362 }
1228 refresh_type |= REFRESH_BOUNDS; 1363
1229 if (selection.op && current_screen == selection.screen 1364 if (selection.op && current_screen == selection.screen
1230 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1365 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1231 || (selection.end.row >= row 1366 || (selection.end.row >= row
1232 && selection.end.row <= row + num))) 1367 && selection.end.row <= row + num)))
1233 CLEAR_SELECTION (); 1368 CLEAR_SELECTION ();
1369
1234 if (row >= TermWin.nrow) /* Out Of Bounds */ 1370 if (row >= TermWin.nrow) /* Out Of Bounds */
1235 return; 1371 return;
1372
1236 MIN_IT (num, (TermWin.nrow - row)); 1373 MIN_IT (num, (TermWin.nrow - row));
1374
1237 if (rstyle & (RS_RVid | RS_Uline)) 1375 if (rstyle & (RS_RVid | RS_Uline))
1238 ren = (rend_t) ~RS_None; 1376 ren = (rend_t) ~RS_None;
1239 else if (GET_BASEBG (rstyle) == Color_bg) 1377 else if (GET_BASEBG (rstyle) == Color_bg)
1240 { 1378 {
1241 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1242 CLEAR_ROWS (row, num); 1380 CLEAR_ROWS (row, num);
1243 } 1381 }
1244 else 1382 else
1245 { 1383 {
1246 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1384 ren = (rstyle & (RS_fgMask | RS_bgMask));
1247 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1248 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1387 ERASE_ROWS (row, num);
1250 gcvalue.foreground = PixColors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1252 } 1390 }
1391
1253 for (; num--; row++) 1392 for (; num--; row++)
1254 { 1393 {
1255 scr_blank_screen_mem (screen.text, screen.rend, 1394 scr_blank_screen_mem (screen.text, screen.rend,
1256 (unsigned int) (row + row_offset), rstyle); 1395 (unsigned int) (row + row_offset), rstyle);
1257 screen.tlen[row + row_offset] = 0; 1396 screen.tlen[row + row_offset] = 0;
… …
1270{ 1409{
1271 int i, j, k; 1410 int i, j, k;
1272 rend_t *r1, fs; 1411 rend_t *r1, fs;
1273 1412
1274 want_refresh = 1; 1413 want_refresh = 1;
1414 ZERO_SCROLLBACK ();
1415
1275 num_scr_allow = 0; 1416 num_scr_allow = 0;
1276 ZERO_SCROLLBACK ();
1277 selection_check (3); 1417 selection_check (3);
1278 1418
1279 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1419 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1280 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1420 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1281 { 1421 {
1282 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1422 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1283 fill_text (screen.text[k], 'E', TermWin.ncol); 1423 fill_text (screen.text[k], 'E', TermWin.ncol);
1284 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1424 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1291 * Insert/Delete <count> lines 1431 * Insert/Delete <count> lines
1292 */ 1432 */
1293void 1433void
1294rxvt_term::scr_insdel_lines (int count, int insdel) 1434rxvt_term::scr_insdel_lines (int count, int insdel)
1295{ 1435{
1296 int end; 1436 int end;
1297 1437
1298 ZERO_SCROLLBACK (); 1438 ZERO_SCROLLBACK ();
1299 1439
1300 selection_check (1); 1440 selection_check (1);
1301 1441
… …
1308 if (insdel == DELETE) 1448 if (insdel == DELETE)
1309 return; 1449 return;
1310 else if (insdel == INSERT) 1450 else if (insdel == INSERT)
1311 count = end; 1451 count = end;
1312 } 1452 }
1313 screen.flags &= ~Screen_WrapNext; 1453
1454 scr_do_wrap ();
1314 1455
1315 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1456 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1316} 1457}
1317 1458
1318/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
… …
1320 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1321 */ 1462 */
1322void 1463void
1323rxvt_term::scr_insdel_chars (int count, int insdel) 1464rxvt_term::scr_insdel_chars (int count, int insdel)
1324{ 1465{
1325 int col, row; 1466 int col, row;
1326 rend_t tr; 1467 rend_t tr;
1327 text_t *stp; 1468 text_t *stp;
1328 rend_t *srp; 1469 rend_t *srp;
1329 int16_t *slp; 1470 int16_t *slp;
1330 1471
1331 want_refresh = 1; 1472 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1473 ZERO_SCROLLBACK ();
1333 1474
1334 if (count <= 0) 1475 if (count <= 0)
1335 return; 1476 return;
1336 1477
1478 scr_do_wrap ();
1479
1337 selection_check (1); 1480 selection_check (1);
1338 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1481 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1339 1482
1340 row = screen.cur.row + TermWin.saveLines; 1483 row = screen.cur.row + TermWin.saveLines;
1341 screen.flags &= ~Screen_WrapNext;
1342 1484
1343 stp = screen.text[row]; 1485 stp = screen.text[row];
1344 srp = screen.rend[row]; 1486 srp = screen.rend[row];
1345 slp = & (screen.tlen[row]); 1487 slp = &screen.tlen[row];
1488
1346 switch (insdel) 1489 switch (insdel)
1347 { 1490 {
1348 case INSERT: 1491 case INSERT:
1349 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1350 col--) 1493 col--)
1351 { 1494 {
1352 stp[col] = stp[col - count]; 1495 stp[col] = stp[col - count];
1353 srp[col] = srp[col - count]; 1496 srp[col] = srp[col - count];
1354 } 1497 }
1498
1355 if (*slp != -1) 1499 if (*slp != -1)
1356 { 1500 {
1357 *slp += count; 1501 *slp += count;
1358 MIN_IT (*slp, TermWin.ncol); 1502 MIN_IT (*slp, TermWin.ncol);
1359 } 1503 }
1504
1360 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1361 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1362 { 1507 {
1363 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
1364 || (selection.end.col + count >= TermWin.ncol)) 1509 || (selection.end.col + count >= TermWin.ncol))
… …
1368 selection.beg.col += count; 1513 selection.beg.col += count;
1369 selection.mark.col += count; /* XXX: yes? */ 1514 selection.mark.col += count; /* XXX: yes? */
1370 selection.end.col += count; 1515 selection.end.col += count;
1371 } 1516 }
1372 } 1517 }
1518
1373 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1519 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1374 (unsigned int)count, rstyle); 1520 (unsigned int)count, rstyle);
1375 break; 1521 break;
1522
1376 case ERASE: 1523 case ERASE:
1377 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1524 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1378 selection_check (1); 1525 selection_check (1);
1379 screen.cur.col -= count; 1526 screen.cur.col -= count;
1380 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1527 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1381 (unsigned int)count, rstyle); 1528 (unsigned int)count, rstyle);
1382 break; 1529 break;
1530
1383 case DELETE: 1531 case DELETE:
1384 tr = srp[TermWin.ncol - 1]
1385 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1533
1386 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1534 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1387 { 1535 {
1388 stp[col] = stp[col + count]; 1536 stp[col] = stp[col + count];
1389 srp[col] = srp[col + count]; 1537 srp[col] = srp[col + count];
1390 } 1538 }
1539
1391 scr_blank_line (& (stp[TermWin.ncol - count]), 1540 scr_blank_line (& (stp[TermWin.ncol - count]),
1392 & (srp[TermWin.ncol - count]), 1541 & (srp[TermWin.ncol - count]),
1393 (unsigned int)count, tr); 1542 (unsigned int)count, tr);
1543
1394 if (*slp == -1) /* break line continuation */ 1544 if (*slp == -1) /* break line continuation */
1395 *slp = TermWin.ncol; 1545 *slp = TermWin.ncol;
1546
1396 *slp -= count; 1547 *slp -= count;
1397 MAX_IT (*slp, 0); 1548 MAX_IT (*slp, 0);
1549
1398 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1399 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1400 { 1552 {
1401 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
1402 || (screen.cur.col >= selection.beg.col - count) 1554 || (screen.cur.col >= selection.beg.col - count)
… …
1408 selection.beg.col -= count; 1560 selection.beg.col -= count;
1409 selection.mark.col -= count; /* XXX: yes? */ 1561 selection.mark.col -= count; /* XXX: yes? */
1410 selection.end.col -= count; 1562 selection.end.col -= count;
1411 } 1563 }
1412 } 1564 }
1565
1413 break; 1566 break;
1414 } 1567 }
1415} 1568}
1416 1569
1417/* ------------------------------------------------------------------------- */ 1570/* ------------------------------------------------------------------------- */
… …
1422void 1575void
1423rxvt_term::scr_scroll_region (int top, int bot) 1576rxvt_term::scr_scroll_region (int top, int bot)
1424{ 1577{
1425 MAX_IT (top, 0); 1578 MAX_IT (top, 0);
1426 MIN_IT (bot, (int)TermWin.nrow - 1); 1579 MIN_IT (bot, (int)TermWin.nrow - 1);
1580
1427 if (top > bot) 1581 if (top > bot)
1428 return; 1582 return;
1583
1429 screen.tscroll = top; 1584 screen.tscroll = top;
1430 screen.bscroll = bot; 1585 screen.bscroll = bot;
1431 scr_gotorc (0, 0, 0); 1586 scr_gotorc (0, 0, 0);
1432} 1587}
1433 1588
… …
1439 */ 1594 */
1440void 1595void
1441rxvt_term::scr_cursor_visible (int mode) 1596rxvt_term::scr_cursor_visible (int mode)
1442{ 1597{
1443 want_refresh = 1; 1598 want_refresh = 1;
1599
1444 if (mode) 1600 if (mode)
1445 screen.flags |= Screen_VisibleCursor; 1601 screen.flags |= Screen_VisibleCursor;
1446 else 1602 else
1447 screen.flags &= ~Screen_VisibleCursor; 1603 screen.flags &= ~Screen_VisibleCursor;
1448} 1604}
… …
1457rxvt_term::scr_autowrap (int mode) 1613rxvt_term::scr_autowrap (int mode)
1458{ 1614{
1459 if (mode) 1615 if (mode)
1460 screen.flags |= Screen_Autowrap; 1616 screen.flags |= Screen_Autowrap;
1461 else 1617 else
1462 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1463} 1619}
1464 1620
1465/* ------------------------------------------------------------------------- */ 1621/* ------------------------------------------------------------------------- */
1466/* 1622/*
1467 * Set/unset margin origin mode 1623 * Set/unset margin origin mode
… …
1477{ 1633{
1478 if (mode) 1634 if (mode)
1479 screen.flags |= Screen_Relative; 1635 screen.flags |= Screen_Relative;
1480 else 1636 else
1481 screen.flags &= ~Screen_Relative; 1637 screen.flags &= ~Screen_Relative;
1638
1482 scr_gotorc (0, 0, 0); 1639 scr_gotorc (0, 0, 0);
1483} 1640}
1484 1641
1485/* ------------------------------------------------------------------------- */ 1642/* ------------------------------------------------------------------------- */
1486/* 1643/*
… …
1506 */ 1663 */
1507void 1664void
1508rxvt_term::scr_set_tab (int mode) 1665rxvt_term::scr_set_tab (int mode)
1509{ 1666{
1510 if (mode < 0) 1667 if (mode < 0)
1511 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1668 memset (tabs, 0, TermWin.ncol * sizeof (char));
1512 else if (screen.cur.col < TermWin.ncol) 1669 else if (screen.cur.col < TermWin.ncol)
1513 tabs[screen.cur.col] = (mode ? 1 : 0); 1670 tabs[screen.cur.col] = (mode ? 1 : 0);
1514} 1671}
1515 1672
1516/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
… …
1520 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1521 */ 1678 */
1522void 1679void
1523rxvt_term::scr_rvideo_mode (int mode) 1680rxvt_term::scr_rvideo_mode (int mode)
1524{ 1681{
1525 XGCValues gcvalue; 1682 XGCValues gcvalue;
1526 1683
1527 if (rvideo != mode) 1684 if (rvideo != mode)
1528 { 1685 {
1529 rvideo = mode; 1686 rvideo = mode;
1530 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1687 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1531#if defined(XPM_BACKGROUND) 1688#if XPM_BACKGROUND
1532 if (bgPixmap.pixmap == None) 1689 if (bgPixmap.pixmap == None)
1533#endif 1690#endif
1534#if defined(TRANSPARENT) 1691#if TRANSPARENT
1535 if (! (Options & Opt_transparent) || am_transparent == 0) 1692 if (! (options & Opt_transparent) || am_transparent == 0)
1536#endif 1693#endif
1537 XSetWindowBackground (display->display, TermWin.vt, 1694 XSetWindowBackground (display->display, TermWin.vt,
1538 PixColors[Color_bg]); 1695 pix_colors[Color_bg]);
1539 1696
1540 gcvalue.foreground = PixColors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1541 gcvalue.background = PixColors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1542 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1543 &gcvalue); 1700 &gcvalue);
1544 scr_clear (); 1701 scr_clear ();
1545 scr_touch (true); 1702 scr_touch (true);
1546 } 1703 }
… …
1662 row_col_t rc[RC_COUNT]; 1819 row_col_t rc[RC_COUNT];
1663 1820
1664 if (drawn_text == NULL) /* sanity check */ 1821 if (drawn_text == NULL) /* sanity check */
1665 return; 1822 return;
1666 1823
1824#ifndef NO_SLOW_LINK_SUPPORT
1825 if (refresh_type == FAST_REFRESH && !display->is_local)
1826 {
1827 y = 0;
1828 height = TermWin.height;
1829 }
1830#endif
1831
1667#ifdef DEBUG_STRICT 1832#ifdef DEBUG_STRICT
1668 x = max (x, (int)TermWin.int_bwidth); 1833 x = max (x, 0);
1669 x = min (x, (int)TermWin.width); 1834 x = min (x, (int)TermWin.width);
1670 y = max (y, (int)TermWin.int_bwidth); 1835 y = max (y, 0);
1671 y = min (y, (int)TermWin.height); 1836 y = min (y, (int)TermWin.height);
1672#endif 1837#endif
1673 1838
1674 /* round down */ 1839 /* round down */
1675 rc[PART_BEG].col = Pixel2Col (x); 1840 rc[PART_BEG].col = Pixel2Col (x);
… …
1683 { 1848 {
1684 MIN_IT (rc[i].col, TermWin.ncol - 1); 1849 MIN_IT (rc[i].col, TermWin.ncol - 1);
1685 MIN_IT (rc[i].row, TermWin.nrow - 1); 1850 MIN_IT (rc[i].row, TermWin.nrow - 1);
1686 } 1851 }
1687 1852
1688 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));
1689
1690 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1853 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1691 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1854 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1692 (rc[PART_END].col - rc[PART_BEG].col + 1));
1693 1855
1694 if (refresh) 1856 if (refresh)
1695 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1857 scr_refresh (SLOW_REFRESH);
1696} 1858}
1697 1859
1698/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1699/* 1861/*
1700 * Refresh the entire screen 1862 * Refresh the entire screen
… …
1712 */ 1874 */
1713int 1875int
1714rxvt_term::scr_move_to (int y, int len) 1876rxvt_term::scr_move_to (int y, int len)
1715{ 1877{
1716 long p = 0; 1878 long p = 0;
1717 uint16_t oldviewstart; 1879 unsigned int oldviewstart;
1718 1880
1719 oldviewstart = TermWin.view_start; 1881 oldviewstart = TermWin.view_start;
1882
1720 if (y < len) 1883 if (y < len)
1721 { 1884 {
1722 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1885 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1723 p -= (long) (TermWin.nrow - 1); 1886 p -= (long) (TermWin.nrow - 1);
1724 p = max (p, 0); 1887 p = max (p, 0);
1725 } 1888 }
1889
1726 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1890 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1727 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1728 1891
1729 return scr_changeview (oldviewstart); 1892 return scr_changeview (oldviewstart);
1730} 1893}
1731 1894
1732/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
… …
1735 * direction should be UP or DN 1898 * direction should be UP or DN
1736 */ 1899 */
1737int 1900int
1738rxvt_term::scr_page (enum page_dirn direction, int nlines) 1901rxvt_term::scr_page (enum page_dirn direction, int nlines)
1739{ 1902{
1740 int n; 1903 int n;
1741 uint16_t oldviewstart; 1904 unsigned int oldviewstart;
1742 1905
1743 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1744#ifdef DEBUG_STRICT 1906#ifdef DEBUG_STRICT
1745 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1746#endif 1908#endif
1747 oldviewstart = TermWin.view_start; 1909 oldviewstart = TermWin.view_start;
1748 if (direction == UP) 1910 if (direction == UP)
… …
1757 } 1919 }
1758 return scr_changeview (oldviewstart); 1920 return scr_changeview (oldviewstart);
1759} 1921}
1760 1922
1761int 1923int
1762rxvt_term::scr_changeview (uint16_t oldviewstart) 1924rxvt_term::scr_changeview (unsigned int oldviewstart)
1763{ 1925{
1764 if (TermWin.view_start != oldviewstart) 1926 if (TermWin.view_start != oldviewstart)
1765 { 1927 {
1766 want_refresh = 1; 1928 want_refresh = 1;
1767 num_scr -= (TermWin.view_start - oldviewstart); 1929 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1930 }
1931
1769 return (int) (TermWin.view_start - oldviewstart); 1932 return (int) (TermWin.view_start - oldviewstart);
1770} 1933}
1771 1934
1772/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1773void 1936void
1774rxvt_term::scr_bell () 1937rxvt_term::scr_bell ()
1775{ 1938{
1776#ifndef NO_BELL 1939#ifndef NO_BELL
1777# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1778# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1779 if (Options & Opt_mapAlert) 1942 if (options & Opt_mapAlert)
1780# endif 1943# endif
1781 XMapWindow (display->display, TermWin.parent[0]); 1944 XMapWindow (display->display, TermWin.parent[0]);
1782# endif 1945# endif
1783 if (Options & Opt_visualBell) 1946 if (options & Opt_visualBell)
1784 { 1947 {
1785 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 scr_rvideo_mode (!rvideo); /* refresh also done */
1786 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1787 } 1950 }
1788 else 1951 else
… …
1794/* ARGSUSED */ 1957/* ARGSUSED */
1795void 1958void
1796rxvt_term::scr_printscreen (int fullhist) 1959rxvt_term::scr_printscreen (int fullhist)
1797{ 1960{
1798#ifdef PRINTPIPE 1961#ifdef PRINTPIPE
1799 int i, r1, nrows, row_offset; 1962 int i, r1, nrows, row_offset;
1800 text_t *t; 1963 FILE *fd;
1801 FILE *fd;
1802 1964
1803 if ((fd = popen_printer ()) == NULL) 1965 if ((fd = popen_printer ()) == NULL)
1804 return; 1966 return;
1967
1805 nrows = TermWin.nrow; 1968 nrows = TermWin.nrow;
1806 row_offset = TermWin.saveLines; 1969 row_offset = TermWin.saveLines;
1970
1807 if (!fullhist) 1971 if (!fullhist)
1808 row_offset -= TermWin.view_start; 1972 row_offset -= TermWin.view_start;
1809 else 1973 else
1810 { 1974 {
1811 nrows += TermWin.nscrolled; 1975 nrows += TermWin.nscrolled;
1812 row_offset -= TermWin.nscrolled; 1976 row_offset -= TermWin.nscrolled;
1813 } 1977 }
1814 1978
1979 wctomb (0, 0);
1980
1815 for (r1 = 0; r1 < nrows; r1++) 1981 for (r1 = 0; r1 < nrows; r1++)
1816 { 1982 {
1817 t = screen.text[r1 + row_offset]; 1983 text_t *tp = screen.text[r1 + row_offset];
1818 for (i = TermWin.ncol - 1; i >= 0; i--) 1984 int len = screen.tlen[r1 + row_offset];
1819 if (!isspace (t[i])) 1985
1820 break; 1986 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1821 fprintf (fd, "%.*s\n", (i + 1), t); 1987 {
1988 char mb[MB_LEN_MAX];
1989 text_t t = *tp++;
1990 if (t == NOCHAR)
1991 continue;
1992
1993 len = wctomb (mb, t);
1994
1995 if (len <= 0)
1996 {
1997 mb[0] = ' ';
1998 len = 1;
1999 }
2000
2001 fwrite (mb, 1, len, fd);
2002 }
2003
2004 fputc ('\n', fd);
1822 } 2005 }
2006
1823 pclose_printer (fd); 2007 pclose_printer (fd);
1824#endif 2008#endif
1825} 2009}
1826 2010
1827/* ------------------------------------------------------------------------- */ 2011/* ------------------------------------------------------------------------- */
… …
1841 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2025 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1842 2026
1843void 2027void
1844rxvt_term::scr_refresh (unsigned char refresh_type) 2028rxvt_term::scr_refresh (unsigned char refresh_type)
1845{ 2029{
1846 unsigned char clearfirst, /* first character writes before cell */
1847 clearlast, /* last character writes beyond cell */
1848 must_clear, /* use draw_string not draw_image_string */ 2030 unsigned char must_clear, /* use draw_string not draw_image_string */
1849 rvid, /* reverse video this position */
1850 showcursor; /* show the cursor */ 2031 showcursor; /* show the cursor */
1851 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1852 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1853 int i, /* tmp */ 2034 int i, /* tmp */
1854 row_offset; /* basic offset in screen structure */ 2035 row_offset; /* basic offset in screen structure */
1855#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1856 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
1857#endif 2038#endif
1858 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2039 rend_t *crp; // cursor rendition pointer
1859 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1860 2040
1861 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2041 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1862 return; 2042 return;
1863 2043
1864 /* 2044 /*
1865 * A: set up vars 2045 * A: set up vars
1866 */ 2046 */
1867 clearfirst = clearlast = must_clear = 0; 2047 must_clear = 0;
1868
1869 refresh_count = 0; 2048 refresh_count = 0;
1870 2049
1871 row_offset = TermWin.saveLines - TermWin.view_start; 2050 row_offset = TermWin.saveLines - TermWin.view_start;
1872 2051
1873 if ((refresh_type & REFRESH_BOUNDS))
1874 {
1875 clearfirst = clearlast = 1;
1876 refresh_type &= ~REFRESH_BOUNDS;
1877 }
1878
1879#ifdef XPM_BACKGROUND 2052#if XPM_BACKGROUND
1880 must_clear |= (bgPixmap.pixmap != None); 2053 must_clear |= (bgPixmap.pixmap != None);
1881#endif 2054#endif
1882#ifdef TRANSPARENT 2055#if TRANSPARENT
1883 must_clear |= ((Options & Opt_transparent) && am_transparent); 2056 must_clear |= ((options & Opt_transparent) && am_transparent);
1884#endif 2057#endif
1885 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1886 2059
1887 /* 2060 /*
1888 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
… …
1891 2064
1892 /* 2065 /*
1893 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
1894 */ 2067 */
1895 { 2068 {
1896 unsigned char setoldcursor; 2069 unsigned char setoldcursor;
1897 rend_t ccol1, /* Cursor colour */ 2070 rend_t ccol1, /* Cursor colour */
1898 ccol2; /* Cursor colour2 */ 2071 ccol2; /* Cursor colour2 */
1899 2072
1900 showcursor = (screen.flags & Screen_VisibleCursor); 2073 showcursor = (screen.flags & Screen_VisibleCursor);
1901#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
1902 if (hidden_cursor) 2075 if (hidden_cursor)
1903 showcursor = 0; 2076 showcursor = 0;
1904#endif 2077#endif
1905 2078
1906 if (showcursor) 2079 if (showcursor)
1907 { 2080 {
2081 int col = screen.cur.col;
2082
2083 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2084 col--;
2085
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2086 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1909 [screen.cur.col]);
1910 2087
1911 if (showcursor && TermWin.focus) 2088 if (showcursor && TermWin.focus)
1912 { 2089 {
1913 *srp ^= RS_RVid; 2090 *crp ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR 2091#ifndef NO_CURSORCOLOR
1915 cc1 = *srp & (RS_fgMask | RS_bgMask); 2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
1916 if (ISSET_PIXCOLOR (Color_cursor)) 2093 if (ISSET_PIXCOLOR (Color_cursor))
1917 ccol1 = Color_cursor; 2094 ccol1 = Color_cursor;
1918 else 2095 else
1919#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1920 ccol1 = GET_FGCOLOR (rstyle); 2097 ccol1 = GET_FGCOLOR (rstyle);
… …
1927#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1928 ccol2 = GET_BGCOLOR (rstyle); 2105 ccol2 = GET_BGCOLOR (rstyle);
1929#else 2106#else
1930 ccol2 = Color_bg; 2107 ccol2 = Color_bg;
1931#endif 2108#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 2109 *crp = SET_FGCOLOR (*crp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 2110 *crp = SET_BGCOLOR (*crp, ccol2);
1934#endif 2111#endif
1935 } 2112 }
1936 } 2113 }
1937 2114
1938 /* make sure no outline cursor is left around */ 2115 /* make sure no outline cursor is left around */
… …
1942 if (screen.cur.row + TermWin.view_start != ocrow 2119 if (screen.cur.row + TermWin.view_start != ocrow
1943 || screen.cur.col != oldcursor.col) 2120 || screen.cur.col != oldcursor.col)
1944 { 2121 {
1945 if (ocrow < TermWin.nrow 2122 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) 2123 && oldcursor.col < TermWin.ncol)
1947 {
1948 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2124 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1949 } 2125
1950 if (TermWin.focus || !showcursor) 2126 if (TermWin.focus || !showcursor)
1951 oldcursor.row = -1; 2127 oldcursor.row = -1;
1952 else 2128 else
1953 setoldcursor = 1; 2129 setoldcursor = 1;
1954 } 2130 }
1955 } 2131 }
1956 else if (!TermWin.focus) 2132 else if (!TermWin.focus)
1957 setoldcursor = 1; 2133 setoldcursor = 1;
2134
1958 if (setoldcursor) 2135 if (setoldcursor)
1959 { 2136 {
1960 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2137 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1961 oldcursor.row = -1; 2138 oldcursor.row = -1;
1962 else 2139 else
… …
1965 oldcursor.col = screen.cur.col; 2142 oldcursor.col = screen.cur.col;
1966 } 2143 }
1967 } 2144 }
1968 } 2145 }
1969 2146
2147#if ENABLE_OVERLAY
2148 scr_swap_overlay ();
2149#endif
2150
2151 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2152 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2153
1970#ifndef NO_SLOW_LINK_SUPPORT 2154#ifndef NO_SLOW_LINK_SUPPORT
1971 /* 2155 /*
1972 * D: CopyArea pass - very useful for slower links 2156 * D: CopyArea pass - very useful for slower links
1973 * This has been deliberately kept simple. 2157 * This has been deliberately kept simple.
1974 */ 2158 */
1975 i = num_scr; 2159 i = num_scr;
2160 if (!display->is_local
1976 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2161 && refresh_type == FAST_REFRESH && num_scr_allow && i
1977 && abs (i) < TermWin.nrow && !must_clear) 2162 && abs (i) < TermWin.nrow && !must_clear)
1978 { 2163 {
1979 int16_t nits; 2164 int16_t nits;
1980 int j; 2165 int j;
1981 rend_t *drp2;
1982 text_t *dtp2;
1983 int len, wlen; 2166 int len, wlen;
1984 2167
1985 j = TermWin.nrow; 2168 j = TermWin.nrow;
1986 wlen = len = -1; 2169 wlen = len = -1;
1987 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
1988 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2171 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1989 { 2172 {
1990 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2173 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
1991 { 2174 {
1992 stp = screen.text[row + row_offset]; 2175 text_t *stp = screen.text[row + row_offset];
1993 srp = screen.rend[row + row_offset]; 2176 rend_t *srp = screen.rend[row + row_offset];
1994 dtp = drawn_text[row]; 2177 text_t *dtp = drawn_text[row];
1995 dtp2 = drawn_text[row + i]; 2178 text_t *dtp2 = drawn_text[row + i];
1996 drp = drawn_rend[row]; 2179 rend_t *drp = drawn_rend[row];
1997 drp2 = drawn_rend[row + i]; 2180 rend_t *drp2 = drawn_rend[row + i];
1998 2181
1999 for (nits = 0, col = TermWin.ncol; col--; ) 2182 for (nits = 0, col = TermWin.ncol; col--; )
2000 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2183 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2001 nits--; 2184 nits--;
2002 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2185 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2022 { 2205 {
2023 /* also comes here at end if needed because of >= above */ 2206 /* also comes here at end if needed because of >= above */
2024 if (wlen < len) 2207 if (wlen < len)
2025 SWAP_IT (wlen, len, int); 2208 SWAP_IT (wlen, len, int);
2026 2209
2027 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2028 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2210 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2029 TermWin.gc, 0, Row2Pixel (len + i), 2211 TermWin.gc, 0, Row2Pixel (len + i),
2030 (unsigned int)TermWin_TotalWidth (), 2212 (unsigned int)TermWin_TotalWidth (),
2031 (unsigned int)Height2Pixel (wlen - len + 1), 2213 (unsigned int)Height2Pixel (wlen - len + 1),
2032 0, Row2Pixel (len)); 2214 0, Row2Pixel (len));
… …
2039 /* 2221 /*
2040 * E: main pass across every character 2222 * E: main pass across every character
2041 */ 2223 */
2042 for (row = 0; row < TermWin.nrow; row++) 2224 for (row = 0; row < TermWin.nrow; row++)
2043 { 2225 {
2044 stp = screen.text[row + row_offset]; 2226 text_t *stp = screen.text[row + row_offset];
2045 srp = screen.rend[row + row_offset]; 2227 rend_t *srp = screen.rend[row + row_offset];
2046 dtp = drawn_text[row]; 2228 text_t *dtp = drawn_text[row];
2047 drp = drawn_rend[row]; 2229 rend_t *drp = drawn_rend[row];
2048 2230
2049 /* 2231 /*
2050 * E2: OK, now the real pass 2232 * E2: OK, now the real pass
2051 */ 2233 */
2052 int ypixel = (int)Row2Pixel (row); 2234 int ypixel = (int)Row2Pixel (row);
2053 2235
2054 for (col = 0; col < TermWin.ncol; col++) 2236 for (col = 0; col < TermWin.ncol; col++)
2055 { 2237 {
2056 /* compare new text with old - if exactly the same then continue */ 2238 /* compare new text with old - if exactly the same then continue */
2239 if (stp[col] == dtp[col] /* Must match characters to skip. */
2240 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2241 || (stp[col] == ' ' /* space w/ no background change */
2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2243 continue;
2244
2245 // redraw one or more characters
2246
2247 // seek to the beginning if wide characters
2248 while (stp[col] == NOCHAR && col > 0)
2249 --col;
2250
2057 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2251 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2058
2059 if (stp[col] == dtp[col] /* Must match characters to skip. */
2060 && (rend == drp[col] /* Either rendition the same or */
2061 || (stp[col] == ' ' /* space w/ no background change */
2062 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2063 continue;
2064
2065 text_t *text = stp + col; 2252 text_t *text = stp + col;
2066 int count = 1; 2253 int count = 1;
2067 2254
2068 /* redraw one or more characters */
2069
2070 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2071 drp[col] = rend; 2256 drp[col] = rend;
2072 2257
2073 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2074 continue;
2075
2076 int xpixel = Col2Pixel (col); 2258 int xpixel = Col2Pixel (col);
2077 2259
2078 // this loop looks very messy, it can probably be optimized
2079 // and cleaned a bit by you?
2080 for (i = 0; ++col < TermWin.ncol; ) 2260 for (i = 0; ++col < TermWin.ncol; )
2081 { 2261 {
2082 if (stp[col] == NOCHAR) 2262 if (stp[col] == NOCHAR)
2083 { 2263 {
2084 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2085 drp[col] = rend; 2265 drp[col] = rend;
2086 count++; 2266 count++;
2087
2088 if (i) // only possible skip if char unchanged
2089 i++; 2267 i++;
2090 2268
2091 continue; 2269 continue;
2092 } 2270 }
2093 2271
2094 if (rend != srp[col]) 2272 if (!RS_SAME (rend, srp[col]))
2095 break; 2273 break;
2096 2274
2097 count++; 2275 count++;
2098 2276
2099 if (stp[col] != dtp[col] 2277 if (stp[col] != dtp[col]
2100 || srp[col] != drp[col]) 2278 || !RS_SAME (srp[col], drp[col]))
2101 { 2279 {
2102 if (must_clear && (i++ > (count / 2))) 2280 if (must_clear && (i++ > count / 2))
2103 break; 2281 break;
2104 2282
2105 dtp[col] = stp[col]; 2283 dtp[col] = stp[col];
2106 drp[col] = rend; 2284 drp[col] = rend;
2107 i = 0; 2285 i = 0;
2108 } 2286 }
2109 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2287 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2110 break; 2288 break;
2111 } 2289 }
2112 2290
2113 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2114 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2293
2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2295 while (i && text[count] == NOCHAR)
2296 count++, i--;
2297
2298#if ENABLE_STYLES
2299 // force redraw after "careful" characters to avoid pixel droppings
2300 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2301 drp[col + 1] = ~srp[col + 1];
2302
2303 // include previous careful character(s) if possible, looks nicer (best effort...)
2304 while (text > stp
2305 && srp[text - stp - 1] & RS_Careful
2306 && RS_SAME (rend, srp[text - stp - 1]))
2307 text--, count++, xpixel -= TermWin.fwidth;
2308#endif
2115 2309
2116 /* 2310 /*
2117 * Determine the attributes for the string 2311 * Determine the attributes for the string
2118 */ 2312 */
2119 int fid = GET_FONT (rend);
2120 int fore = GET_FGCOLOR (rend); // desired foreground 2313 int fore = GET_FGCOLOR (rend); // desired foreground
2121 int back = GET_BGCOLOR (rend); // desired background 2314 int back = GET_BGCOLOR (rend); // desired background
2122 2315
2123 rend = GET_ATTR (rend); 2316 // only do special processing if ana attributes are set, which is rare
2124 2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2125 rvid = !!(rend & RS_RVid); 2318 {
2319 bool invert = rend & RS_RVid;
2126 2320
2127#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2128 if (rend & RS_Bold && fore == Color_fg) 2322 if (rend & RS_Bold
2323 && fore == Color_fg)
2129 { 2324 {
2130 if (ISSET_PIXCOLOR (Color_BD)) 2325 if (ISSET_PIXCOLOR (Color_BD))
2131 fore = Color_BD; 2326 fore = Color_BD;
2327# if !ENABLE_STYLES
2132 else 2328 else
2133 rvid = !rvid; 2329 invert = !invert;
2330# endif
2331 }
2332
2333 if (rend & RS_Italic
2334 && fore == Color_fg)
2335 {
2336 if (ISSET_PIXCOLOR (Color_IT))
2337 fore = Color_IT;
2338# if !ENABLE_STYLES
2339 else
2340 invert = !invert;
2341# endif
2342 }
2343
2344 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2345 fore = Color_UL;
2346#endif
2347
2348 if (invert)
2349 {
2350 SWAP_IT (fore, back, int);
2351
2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2353 if (ISSET_PIXCOLOR (Color_RV))
2354 back = Color_RV;
2355#endif
2356 }
2357
2358#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2360 {
2361 if (!text_blink_ev.active)
2362 {
2363 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2364 hidden_text = 0;
2365 }
2366 else if (hidden_text)
2367 fore = back;
2368 }
2369#endif
2134 } 2370 }
2135
2136 if (rend & RS_Uline)
2137 {
2138 if (ISSET_PIXCOLOR (Color_UL))
2139 fore = Color_UL;
2140 }
2141#endif
2142
2143 if (rvid)
2144 {
2145 SWAP_IT (fore, back, int);
2146
2147#ifndef NO_BOLD_UNDERLINE_REVERSE
2148 if (ISSET_PIXCOLOR (Color_RV)
2149# ifndef NO_CURSORCOLOR
2150 && !ISSET_PIXCOLOR (Color_cursor)
2151# endif
2152 )
2153 back = Color_RV;
2154#endif
2155 }
2156
2157#ifdef TEXT_BLINK
2158 if (rend & RS_Blink)
2159 {
2160 if (!text_blink_ev.active)
2161 {
2162 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2163 hidden_text = 0;
2164 }
2165 else if (hidden_text)
2166 fore = back;
2167 }
2168#endif
2169 2371
2170 /* 2372 /*
2171 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2172 */ 2374 */
2173 rxvt_font *font = (*TermWin.fontset)[fid]; 2375 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2174 2376
2175 if (back == fore) 2377 if (back == fore)
2176 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2378 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2177 TermWin.fwidth * count, TermWin.fheight, 2379 TermWin.fwidth * count, TermWin.fheight,
2178 back); 2380 back);
… …
2193 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2395 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2194 } 2396 }
2195 else 2397 else
2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2197 2399
2198 if ((rend & RS_Uline) && (font->descent > 1)) 2400 if (rend & RS_Uline && font->descent > 1 && fore != back)
2199 XDrawLine (display->display, drawBuffer, TermWin.gc, 2401 XDrawLine (display->display, drawBuffer, TermWin.gc,
2200 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2202 } /* for (col....) */ 2404 } /* for (col....) */
2203 } /* for (row....) */ 2405 } /* for (row....) */
2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2204 2410
2205 /* 2411 /*
2206 * G: cleanup cursor and display outline cursor if necessary 2412 * G: cleanup cursor and display outline cursor if necessary
2207 */ 2413 */
2208 if (showcursor) 2414 if (showcursor)
2209 { 2415 {
2210 if (TermWin.focus) 2416 if (TermWin.focus)
2211 { 2417 {
2212 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2213 [screen.cur.col]);
2214 *srp ^= RS_RVid; 2418 *crp ^= RS_RVid;
2215#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2216 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2420 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2217#endif 2421#endif
2218 } 2422 }
2219 else if (oldcursor.row >= 0) 2423 else if (oldcursor.row >= 0)
2220 { 2424 {
2221#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2222 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2223 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2427 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2224#endif 2428#endif
2225 int cursorwidth = 1; 2429 int cursorwidth = 1;
2226 while (oldcursor.col + cursorwidth < TermWin.ncol 2430 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2431 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++; 2432 cursorwidth++;
2229 2433
2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2434 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2231 Col2Pixel (oldcursor.col), 2435 Col2Pixel (oldcursor.col),
2232 Row2Pixel (oldcursor.row), 2436 Row2Pixel (oldcursor.row),
2233 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2437 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2438 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2235 } 2439 }
2236 } 2440 }
2237 2441
2238 /* 2442 /*
2239 * H: cleanup selection 2443 * H: cleanup selection
2240 */ 2444 */
2241 scr_reverse_selection (); 2445 scr_reverse_selection ();
2242 2446
2243 /*
2244 * I: other general cleanup
2245 */
2246 if (clearfirst && TermWin.int_bwidth)
2247 /*
2248 * clear the whole screen height, note that width == 0 is treated
2249 * specially by XClearArea
2250 */
2251 XClearArea (display->display, TermWin.vt, 0, 0,
2252 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False);
2254 if (clearlast && TermWin.int_bwidth)
2255 /*
2256 * clear the whole screen height, note that width == 0 is treated
2257 * specially by XClearArea
2258 */
2259 XClearArea (display->display, TermWin.vt,
2260 TermWin.width + TermWin.int_bwidth, 0,
2261 (unsigned int)TermWin.int_bwidth,
2262 (unsigned int)TermWin_TotalHeight (), False);
2263 if (refresh_type & SMOOTH_REFRESH) 2447 if (refresh_type & SMOOTH_REFRESH)
2264 XSync (display->display, False); 2448 XFlush (display->display);
2265 2449
2266 num_scr = 0; 2450 num_scr = 0;
2267 num_scr_allow = 1; 2451 num_scr_allow = 1;
2268 want_refresh = 0; /* screen is current */ 2452 want_refresh = 0; /* screen is current */
2269} 2453}
… …
2273{ 2457{
2274 if (!rp || !tp) 2458 if (!rp || !tp)
2275 return; 2459 return;
2276 2460
2277 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2461 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2278 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2462 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2279} 2463}
2280 2464
2281void 2465void
2282rxvt_term::scr_remap_chars () 2466rxvt_term::scr_remap_chars ()
2283{ 2467{
… …
2289 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2473 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2290 scr_remap_chars (swap.text[i], swap.rend[i]); 2474 scr_remap_chars (swap.text[i], swap.rend[i]);
2291 } 2475 }
2292} 2476}
2293 2477
2294/* ------------------------------------------------------------------------- */
2295void 2478void
2296rxvt_term::scr_clear () 2479rxvt_term::scr_recolour ()
2480{
2481 if (1
2482#if TRANSPARENT
2483 && !am_transparent
2484#endif
2485#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap
2487#endif
2488 )
2489 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS
2494 if (scrollBar.win)
2495 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle ();
2498 scrollbar_show (0);
2499 }
2500#endif
2501 }
2502
2503 scr_clear ();
2504 scr_touch (true);
2505 want_refresh = 1;
2506}
2507
2508/* ------------------------------------------------------------------------- */
2509void
2510rxvt_term::scr_clear (bool really)
2297{ 2511{
2298 if (!TermWin.mapped) 2512 if (!TermWin.mapped)
2299 return; 2513 return;
2300 2514
2301 num_scr_allow = 0; 2515 num_scr_allow = 0;
2302 want_refresh = 1; 2516 want_refresh = 1;
2517
2303#ifdef TRANSPARENT 2518#if TRANSPARENT
2304 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2305 { 2520 {
2306 int i; 2521 int i;
2307 2522
2308 if (! (Options & Opt_transparent_all)) 2523 if (!(options & Opt_transparent_all))
2309 i = 0; 2524 i = 0;
2310 else 2525 else
2311 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2312 2527
2313 while (i--) 2528 while (i--)
2314 if (TermWin.parent[i] != None) 2529 if (TermWin.parent[i] != None)
2315 XClearWindow (display->display, TermWin.parent[i]); 2530 XClearWindow (display->display, TermWin.parent[i]);
2316 } 2531 }
2317#endif 2532#endif
2318 2533
2534 if (really)
2319 XClearWindow (display->display, TermWin.vt); 2535 XClearWindow (display->display, TermWin.vt);
2320} 2536}
2321 2537
2322/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2323void 2539void
2324rxvt_term::scr_reverse_selection () 2540rxvt_term::scr_reverse_selection ()
2325{ 2541{
2326 int i, col, row, end_row;
2327 rend_t *srp;
2328
2329 if (selection.op && current_screen == selection.screen) 2542 if (selection.op && current_screen == selection.screen)
2330 { 2543 {
2331 end_row = TermWin.saveLines - TermWin.view_start; 2544 int end_row = TermWin.saveLines - TermWin.view_start;
2332 i = selection.beg.row + TermWin.saveLines; 2545 int i = selection.beg.row + TermWin.saveLines;
2333 row = selection.end.row + TermWin.saveLines; 2546 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp;
2548
2334 if (i >= end_row) 2549 if (i >= end_row)
2335 col = selection.beg.col; 2550 col = selection.beg.col;
2336 else 2551 else
2337 { 2552 {
2338 col = 0; 2553 col = 0;
2339 i = end_row; 2554 i = end_row;
2340 } 2555 }
2556
2341 end_row += TermWin.nrow; 2557 end_row += TermWin.nrow;
2342 for (; i < row && i < end_row; i++, col = 0) 2558 for (; i < row && i < end_row; i++, col = 0)
2343 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2559 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2344 srp[col] ^= RS_RVid; 2560 srp[col] ^= RS_RVid;
2561
2345 if (i == row && i < end_row) 2562 if (i == row && i < end_row)
2346 for (srp = screen.rend[i]; col < selection.end.col; col++) 2563 for (srp = screen.rend[i]; col < selection.end.col; col++)
2347 srp[col] ^= RS_RVid; 2564 srp[col] ^= RS_RVid;
2348 } 2565 }
2349} 2566}
… …
2388 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2605 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2389 */ 2606 */
2390void 2607void
2391rxvt_term::selection_check (int check_more) 2608rxvt_term::selection_check (int check_more)
2392{ 2609{
2393 row_col_t pos; 2610 row_col_t pos;
2394 2611
2395 if (!selection.op) 2612 if (!selection.op)
2396 return; 2613 return;
2397 2614
2398 pos.row = pos.col = 0; 2615 pos.row = pos.col = 0;
… …
2425rxvt_term::paste (const unsigned char *data, unsigned int len) 2642rxvt_term::paste (const unsigned char *data, unsigned int len)
2426{ 2643{
2427 unsigned int i, j, n; 2644 unsigned int i, j, n;
2428 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2429 2646
2430#if 0
2431 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2432 ZERO_SCROLLBACK (r);
2433#endif
2434
2435 /* convert normal newline chars into common keyboard Return key sequence */ 2647 /* convert normal newline chars into common keyboard Return key sequence */
2436 for (i = 0; i < len; i += PROP_SIZE) 2648 for (i = 0; i < len; i += PROP_SIZE)
2437 { 2649 {
2438 n = min (len - i, PROP_SIZE); 2650 n = min (len - i, PROP_SIZE);
2439 MEMCPY (ds, data + i, n); 2651 memcpy (ds, data + i, n);
2440 2652
2441 for (j = 0; j < n; j++) 2653 for (j = 0; j < n; j++)
2442 if (ds[j] == '\n') 2654 if (ds[j] == C0_LF)
2443 ds[j] = '\r'; 2655 ds[j] = C0_CR;
2444 2656
2445 tt_write (ds, (int)n); 2657 tt_write (ds, (int)n);
2446 } 2658 }
2447 2659
2448 free (ds); 2660 free (ds);
… …
2457rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2458{ 2670{
2459 long nread = 0; 2671 long nread = 0;
2460 unsigned long bytes_after; 2672 unsigned long bytes_after;
2461 XTextProperty ct; 2673 XTextProperty ct;
2462
2463 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2464 2674
2465 if (prop == None) /* check for failed XConvertSelection */ 2675 if (prop == None) /* check for failed XConvertSelection */
2466 { 2676 {
2467 if ((selection_type & Sel_CompoundText)) 2677 if ((selection_type & Sel_CompoundText))
2468 { 2678 {
… …
2488 } 2698 }
2489 2699
2490 for (;;) 2700 for (;;)
2491 { 2701 {
2492 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2702 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2493 (long) (PROP_SIZE / 4), delete_prop, 2703 (long) (PROP_SIZE / 4), delete_prop,
2494 AnyPropertyType, &ct.encoding, &ct.format, 2704 AnyPropertyType, &ct.encoding, &ct.format,
2495 &ct.nitems, &bytes_after, 2705 &ct.nitems, &bytes_after,
2496 &ct.value) != Success) 2706 &ct.value) != Success)
2497 break; 2707 break;
2498 2708
2499 if (ct.encoding == 0) 2709 if (ct.encoding == 0)
2710 break;
2711
2712 if (ct.encoding == xa[XA_INCR])
2500 { 2713 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2714 // INCR selection, start handshake
2715 XDeleteProperty (display->display, win, prop);
2716 selection_wait = Sel_incr;
2717 incr_ev.start (NOW + 10);
2502 break; 2718 break;
2503 } 2719 }
2504 2720
2505 if (ct.value == NULL) 2721 if (ct.value == NULL)
2506 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2508 continue; 2722 continue;
2509 }
2510 2723
2511 if (ct.nitems == 0) 2724 if (ct.nitems == 0)
2512 { 2725 {
2513 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2514 if (selection_wait == Sel_normal && nread == 0) 2726 if (selection_wait == Sel_normal && nread == 0
2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2515 { 2728 {
2516 /* 2729 /*
2517 * pass through again trying CUT_BUFFER0 if we've come from 2730 * pass through again trying CUT_BUFFER0 if we've come from
2518 * XConvertSelection () but nothing was presented 2731 * XConvertSelection () but nothing was presented
2519 */ 2732 */
2520 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2521 selection_paste (display->root, XA_CUT_BUFFER0, False); 2733 selection_paste (display->root, XA_CUT_BUFFER0, False);
2522 } 2734 }
2523 2735
2524 nread = -1; /* discount any previous stuff */ 2736 nread = -1; /* discount any previous stuff */
2525 break; 2737 break;
… …
2527 2739
2528 nread += ct.nitems; 2740 nread += ct.nitems;
2529 2741
2530 char **cl; 2742 char **cl;
2531 int cr; 2743 int cr;
2532 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2533 &cr) >= 0 && cl)
2534 { 2745 {
2535 for (int i = 0; i < cr; i++) 2746 for (int i = 0; i < cr; i++)
2536 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2747 paste ((unsigned char *)cl[i], strlen (cl[i]));
2537 2748
2538 XFreeStringList (cl); 2749 XFreeStringList (cl);
2539 } 2750 }
2540 else 2751 else
2541 paste (ct.value, ct.nitems); 2752 paste (ct.value, ct.nitems);
… …
2550 XFree (ct.value); 2761 XFree (ct.value);
2551 2762
2552 if (selection_wait == Sel_normal) 2763 if (selection_wait == Sel_normal)
2553 selection_wait = Sel_none; 2764 selection_wait = Sel_none;
2554 2765
2555 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2556 return (int)nread; 2766 return (int)nread;
2557} 2767}
2558 2768
2559void 2769void
2560rxvt_term::incr_cb (time_watcher &w) 2770rxvt_term::incr_cb (time_watcher &w)
2561{ 2771{
2562 selection_wait = Sel_none; 2772 selection_wait = Sel_none;
2563 2773
2564 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2565} 2775}
2566 2776
2567/* 2777/*
2568 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2569 */ 2779 */
2570void 2780void
2571rxvt_term::selection_property (Window win, Atom prop) 2781rxvt_term::selection_property (Window win, Atom prop)
2572{ 2782{
2573 int reget_time = 0; 2783 if (prop == None || selection_wait != Sel_incr)
2574
2575 if (prop == None)
2576 return; 2784 return;
2577 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2578 if (selection_wait == Sel_normal)
2579 {
2580 int a, afmt;
2581 Atom atype;
2582 unsigned long bytes_after, nitems;
2583 unsigned char *s = NULL;
2584 2785
2585 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2586 xa[XA_INCR], &atype, &afmt, &nitems,
2587 &bytes_after, &s);
2588 if (s)
2589 XFree (s);
2590 if (a != Success)
2591 return;
2592#ifndef __CYGWIN32__
2593 if (atype == xa[XA_INCR])
2594 { /* start an INCR transfer */
2595 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2596 XDeleteProperty (display->display, win, prop);
2597 XFlush (display->display);
2598 reget_time = 1;
2599 selection_wait = Sel_incr;
2600 }
2601#endif
2602
2603 }
2604 else if (selection_wait == Sel_incr)
2605 {
2606 reget_time = 1;
2607 if (selection_paste (win, prop, True) == -1) 2786 if (selection_paste (win, prop, 1) > 0)
2608 {
2609 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2610 selection_wait = Sel_none;
2611 incr_ev.stop ();
2612 }
2613 }
2614 if (reget_time) /* received more data so reget time */
2615 incr_ev.start (NOW + 10); 2787 incr_ev.start (NOW + 10);
2788 else
2789 {
2790 selection_wait = Sel_none;
2791 incr_ev.stop ();
2792 }
2616} 2793}
2794
2617/* ------------------------------------------------------------------------- */ 2795/* ------------------------------------------------------------------------- */
2618/* 2796/*
2619 * Request the current selection: 2797 * Request the current selection:
2620 * Order: > internal selection if available 2798 * Order: > internal selection if available
2621 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2799 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2625 * EXT: button 2 release 2803 * EXT: button 2 release
2626 */ 2804 */
2627void 2805void
2628rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm, int x, int y)
2629{ 2807{
2630 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2631 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2808 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2632 return; /* outside window */ 2809 return; /* outside window */
2633 2810
2634 if (selection.text != NULL) 2811 if (selection.text)
2635 { /* internal selection */ 2812 { /* internal selection */
2636 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2637 paste (selection.text, selection.len); 2813 char *str = rxvt_wcstombs (selection.text, selection.len);
2814 paste ((unsigned char *)str, strlen (str));
2815 free (str);
2638 return; 2816 return;
2639 } 2817 }
2640 else 2818 else
2641 { 2819 {
2642 int i; 2820 int i;
2643 2821
2644 selection_request_time = tm; 2822 selection_request_time = tm;
2645 selection_wait = Sel_normal; 2823 selection_wait = Sel_normal;
2824
2646 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2825 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2647 { 2826 {
2648#if X_HAVE_UTF8_STRING 2827#if X_HAVE_UTF8_STRING
2649 selection_type = Sel_UTF8String; 2828 selection_type = Sel_UTF8String;
2650 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2829 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2655 return; 2834 return;
2656#endif 2835#endif
2657 2836
2658 } 2837 }
2659 } 2838 }
2839
2660 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2661 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2662 selection_paste (display->root, XA_CUT_BUFFER0, False); 2841 selection_paste (display->root, XA_CUT_BUFFER0, False);
2663} 2842}
2664 2843
2665int 2844int
2666rxvt_term::selection_request_other (Atom target, int selnum) 2845rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2846{
2668 Atom sel; 2847 Atom sel;
2669#ifdef DEBUG_SELECT 2848#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2849 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif 2850#endif
2672 2851
2673 selection_type |= selnum; 2852 selection_type |= selnum;
2853
2674 if (selnum == Sel_Primary) 2854 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2855 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2856 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2857 sel = XA_SECONDARY;
2678 else 2858 else
2679 sel = xa[XA_CLIPBOARD]; 2859 sel = xa[XA_CLIPBOARD];
2860
2680 if (XGetSelectionOwner (display->display, sel) != None) 2861 if (XGetSelectionOwner (display->display, sel) != None)
2681 { 2862 {
2682 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2683 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2863 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2684 TermWin.vt, selection_request_time); 2864 TermWin.vt, selection_request_time);
2685 return 1; 2865 return 1;
2686 } 2866 }
2867
2687 return 0; 2868 return 0;
2688} 2869}
2689 2870
2690/* ------------------------------------------------------------------------- */ 2871/* ------------------------------------------------------------------------- */
2691/* 2872/*
… …
2693 * EXT: SelectionClear 2874 * EXT: SelectionClear
2694 */ 2875 */
2695void 2876void
2696rxvt_term::selection_clear () 2877rxvt_term::selection_clear ()
2697{ 2878{
2698 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2699
2700 want_refresh = 1; 2879 want_refresh = 1;
2701 free (selection.text); 2880 free (selection.text);
2702 selection.text = NULL; 2881 selection.text = NULL;
2703 selection.len = 0; 2882 selection.len = 0;
2704 CLEAR_SELECTION (); 2883 CLEAR_SELECTION ();
2884
2885 if (display->selection_owner == this)
2886 display->selection_owner = 0;
2705} 2887}
2706 2888
2707/* ------------------------------------------------------------------------- */ 2889/* ------------------------------------------------------------------------- */
2708/* 2890/*
2709 * Copy a selection into the cut buffer 2891 * Copy a selection into the cut buffer
2710 * EXT: button 1 or 3 release 2892 * EXT: button 1 or 3 release
2711 */ 2893 */
2712void 2894void
2713rxvt_term::selection_make (Time tm) 2895rxvt_term::selection_make (Time tm)
2714{ 2896{
2715 int i, col, end_col, row, end_row; 2897 int i, col, end_col, row, end_row;
2716 unsigned char *new_selection_text; 2898 wchar_t *new_selection_text;
2717 char *str;
2718 text_t *t; 2899 text_t *t;
2719#ifdef ACS_ASCII
2720 rend_t *re;
2721#endif
2722 2900
2723 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2724 switch (selection.op) 2901 switch (selection.op)
2725 { 2902 {
2726 case SELECTION_CONT: 2903 case SELECTION_CONT:
2727 break; 2904 break;
2728 case SELECTION_INIT: 2905 case SELECTION_INIT:
… …
2732 selection.op = SELECTION_DONE; 2909 selection.op = SELECTION_DONE;
2733 /* FALLTHROUGH */ 2910 /* FALLTHROUGH */
2734 default: 2911 default:
2735 return; 2912 return;
2736 } 2913 }
2914
2737 selection.op = SELECTION_DONE; 2915 selection.op = SELECTION_DONE;
2738 2916
2739 if (selection.clicks == 4) 2917 if (selection.clicks == 4)
2740 return; /* nothing selected, go away */ 2918 return; /* nothing selected, go away */
2741 2919
2742 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2920 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2743 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2921 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2744
2745 new_selection_text = (unsigned char *)str;
2746 2922
2747 col = selection.beg.col; 2923 col = selection.beg.col;
2748 MAX_IT (col, 0); 2924 MAX_IT (col, 0);
2749 row = selection.beg.row + TermWin.saveLines; 2925 row = selection.beg.row + TermWin.saveLines;
2750 end_row = selection.end.row + TermWin.saveLines; 2926 end_row = selection.end.row + TermWin.saveLines;
2927 int ofs = 0;
2928 int extra = 0;
2751 2929
2752 for (; row <= end_row; row++, col = 0) 2930 for (; row <= end_row; row++, col = 0)
2753 { 2931 {
2754 t = & (screen.text[row][col]); 2932 t = &screen.text[row][col];
2755 2933
2756 end_col = screen.tlen[row]; 2934 end_col = screen.tlen[row];
2757 2935
2758 if (end_col == -1) 2936 if (end_col == -1)
2759 end_col = TermWin.ncol; 2937 end_col = TermWin.ncol;
2760 2938
2761 if (row == end_row) 2939 if (row == end_row)
2762 MIN_IT (end_col, selection.end.col); 2940 MIN_IT (end_col, selection.end.col);
2763 2941
2764 for (; col < end_col; col++) 2942 for (; col < end_col; col++)
2943 {
2765 if (*t == NOCHAR) 2944 if (*t == NOCHAR)
2766 t++; 2945 t++;
2946#if ENABLE_COMBINING
2947 else if (IS_COMPOSE (*t))
2948 {
2949 int len = rxvt_composite.expand (*t, 0);
2950
2951 extra -= (len - 1);
2952
2953 if (extra < 0)
2954 {
2955 extra += i;
2956 i += i;
2957 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2958 }
2959
2960 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2961 }
2962#endif
2767 else 2963 else
2768 { 2964 new_selection_text[ofs++] = *t++;
2769 int len = wctomb (str, *t++);
2770 if (len > 0)
2771 str += len;
2772 } 2965 }
2773 2966
2774 if (screen.tlen[row] != -1 && row != end_row) 2967 if (screen.tlen[row] != -1 && row != end_row)
2775 *str++ = '\n'; 2968 new_selection_text[ofs++] = C0_LF;
2776 } 2969 }
2777 2970
2778#ifndef NO_OLD_SELECTION
2779 if (selection_style == OLD_SELECT)
2780 if (end_col == TermWin.ncol)
2781 *str++ = '\n';
2782#endif
2783#ifndef NO_NEW_SELECTION
2784 if (selection_style != OLD_SELECT)
2785 if (end_col != selection.end.col) 2971 if (end_col != selection.end.col)
2786 *str++ = '\n'; 2972 new_selection_text[ofs++] = C0_LF;
2787#endif
2788 *str = '\0';
2789 2973
2790 i = str - (char *)new_selection_text; 2974 new_selection_text[ofs] = 0;
2975
2791 if (i == 0) 2976 if (ofs == 0)
2792 { 2977 {
2793 free (new_selection_text); 2978 free (new_selection_text);
2794 return; 2979 return;
2795 } 2980 }
2796 2981
2797 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2798 if (str - (char *)new_selection_text > 1024)
2799 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2800
2801 selection.len = i;
2802
2803 if (selection.text)
2804 free (selection.text); 2982 free (selection.text);
2805 2983
2806 selection.text = new_selection_text; 2984 // we usually allocate much more than necessary, so realloc it smaller again
2985 selection.len = ofs;
2986 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2807 2987
2808 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2988 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2809 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2989 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2810 display->set_selection_owner (this); 2990 display->set_selection_owner (this);
2811 else 2991 else
2812 rxvt_print_error ("can't get primary selection"); 2992 rxvt_warn ("can't get primary selection, ignoring.\n");
2813 2993
2814 { 2994#if 0
2815 XTextProperty ct; 2995 XTextProperty ct;
2816 char *cl = (char *)selection.text;
2817 2996
2818 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2997 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2819 { 2998 {
2820 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2821 PropModeReplace, ct.value, ct.nitems);
2822 XFree (ct.value);
2823 }
2824 else
2825 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2999 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2826 PropModeReplace, selection.text, (int)selection.len); 3000 PropModeReplace, ct.value, ct.nitems);
3001 XFree (ct.value);
2827 } 3002 }
3003#endif
2828 3004
2829 selection_time = tm; 3005 selection_time = tm;
2830 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2831} 3006}
2832 3007
2833/* ------------------------------------------------------------------------- */ 3008/* ------------------------------------------------------------------------- */
2834/* 3009/*
2835 * Mark or select text based upon number of clicks: 1, 2, or 3 3010 * Mark or select text based upon number of clicks: 1, 2, or 3
2836 * EXT: button 1 press 3011 * EXT: button 1 press
2837 */ 3012 */
2838void 3013void
2839rxvt_term::selection_click (int clicks, int x, int y) 3014rxvt_term::selection_click (int clicks, int x, int y)
2840{ 3015{
2841 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2842
2843 clicks = ((clicks - 1) % 3) + 1; 3016 clicks = ((clicks - 1) % 3) + 1;
2844 selection.clicks = clicks; /* save clicks so extend will work */ 3017 selection.clicks = clicks; /* save clicks so extend will work */
2845 3018
2846 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3019 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2847 3020
… …
2861rxvt_term::selection_start_colrow (int col, int row) 3034rxvt_term::selection_start_colrow (int col, int row)
2862{ 3035{
2863 want_refresh = 1; 3036 want_refresh = 1;
2864 selection.mark.col = col; 3037 selection.mark.col = col;
2865 selection.mark.row = row - TermWin.view_start; 3038 selection.mark.row = row - TermWin.view_start;
3039
2866 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3040 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2867 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3041 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2868 MAX_IT (selection.mark.col, 0); 3042 MAX_IT (selection.mark.col, 0);
2869 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3043 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2870 3044
3045 while (selection.mark.col > 0
3046 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
3047 --selection.mark.col;
3048
2871 if (selection.op) 3049 if (selection.op)
2872 { /* clear the old selection */ 3050 { /* clear the old selection */
2873 selection.beg.row = selection.end.row = selection.mark.row; 3051 selection.beg.row = selection.end.row = selection.mark.row;
2874 selection.beg.col = selection.end.col = selection.mark.col; 3052 selection.beg.col = selection.end.col = selection.mark.col;
2875 } 3053 }
3054
2876 selection.op = SELECTION_INIT; 3055 selection.op = SELECTION_INIT;
2877 selection.screen = current_screen; 3056 selection.screen = current_screen;
2878} 3057}
2879 3058
2880/* ------------------------------------------------------------------------- */ 3059/* ------------------------------------------------------------------------- */
… …
2882 * Word select: select text for 2 clicks 3061 * Word select: select text for 2 clicks
2883 * We now only find out the boundary in one direction 3062 * We now only find out the boundary in one direction
2884 */ 3063 */
2885 3064
2886/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3065/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2887#define DELIMIT_TEXT(x) \ 3066#define DELIMIT_TEXT(x) \
2888 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3067 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2889#define DELIMIT_REND(x) 1 3068#define DELIMIT_REND(x) 1
2890 3069
2891void 3070void
2892rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3071rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2893{ 3072{
2894 int col, row, dirnadd, tcol, trow, w1, w2; 3073 int col, row, dirnadd, tcol, trow, w1, w2;
2895 row_col_t bound; 3074 row_col_t bound;
2896 text_t *stp; 3075 text_t *stp;
2897 rend_t *srp; 3076 rend_t *srp;
2898 3077
2899 if (dirn == UP) 3078 if (dirn == UP)
2900 { 3079 {
2901 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3080 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2902 bound.col = 0; 3081 bound.col = 0;
… …
2906 { 3085 {
2907 bound.row = TermWin.saveLines + TermWin.nrow; 3086 bound.row = TermWin.saveLines + TermWin.nrow;
2908 bound.col = TermWin.ncol - 1; 3087 bound.col = TermWin.ncol - 1;
2909 dirnadd = 1; 3088 dirnadd = 1;
2910 } 3089 }
3090
2911 row = mark->row + TermWin.saveLines; 3091 row = mark->row + TermWin.saveLines;
2912 col = mark->col; 3092 col = mark->col;
2913 MAX_IT (col, 0); 3093 MAX_IT (col, 0);
2914 /* find the edge of a word */ 3094 /* find the edge of a word */
2915 stp = & (screen.text[row][col]); 3095 stp = &screen.text[row][col];
2916 w1 = DELIMIT_TEXT (*stp); 3096 w1 = DELIMIT_TEXT (*stp);
2917 3097
2918 if (selection_style != NEW_SELECT) 3098 srp = &screen.rend[row][col];
3099 w2 = DELIMIT_REND (*srp);
3100
3101 for (;;)
2919 { 3102 {
2920 if (w1 == 1) 3103 for (; col != bound.col; col += dirnadd)
2921 { 3104 {
2922 stp += dirnadd; 3105 stp += dirnadd;
2923 if (DELIMIT_TEXT (*stp) == 1)
2924 goto Old_Word_Selection_You_Die;
2925 col += dirnadd;
2926 }
2927 w1 = 0;
2928 }
2929 srp = (&screen.rend[row][col]);
2930 w2 = DELIMIT_REND (*srp);
2931
2932 for (;;)
2933 {
2934 for (; col != bound.col; col += dirnadd)
2935 {
2936 stp += dirnadd; 3106 srp += dirnadd;
3107
3108 if (*stp == NOCHAR)
3109 continue;
3110
2937 if (DELIMIT_TEXT (*stp) != w1) 3111 if (DELIMIT_TEXT (*stp) != w1)
2938 break; 3112 break;
2939 srp += dirnadd;
2940 if (DELIMIT_REND (*srp) != w2) 3113 if (DELIMIT_REND (*srp) != w2)
2941 break; 3114 break;
2942 } 3115 }
3116
2943 if ((col == bound.col) && (row != bound.row)) 3117 if ((col == bound.col) && (row != bound.row))
2944 { 3118 {
2945 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3119 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2946 { 3120 {
2947 trow = row + dirnadd; 3121 trow = row + dirnadd;
2948 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3122 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3123
2949 if (screen.text[trow] == NULL) 3124 if (screen.text[trow] == NULL)
2950 break; 3125 break;
3126
2951 stp = & (screen.text[trow][tcol]); 3127 stp = & (screen.text[trow][tcol]);
2952 srp = & (screen.rend[trow][tcol]); 3128 srp = & (screen.rend[trow][tcol]);
3129
2953 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2954 break; 3131 break;
3132
2955 row = trow; 3133 row = trow;
2956 col = tcol; 3134 col = tcol;
2957 continue; 3135 continue;
2958 } 3136 }
2959 } 3137 }
2960 break; 3138 break;
2961 } 3139 }
3140
2962Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
2963 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));
2964
2965 if (dirn == DN) 3142 if (dirn == DN)
2966 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
2967 3144
2968 /* Poke the values back in */ 3145 /* Poke the values back in */
2969 ret->row = row - TermWin.saveLines; 3146 ret->row = row - TermWin.saveLines;
… …
2988 MAX_IT (row, 0); 3165 MAX_IT (row, 0);
2989 MIN_IT (row, (int)TermWin.nrow - 1); 3166 MIN_IT (row, (int)TermWin.nrow - 1);
2990 MAX_IT (col, 0); 3167 MAX_IT (col, 0);
2991 MIN_IT (col, (int)TermWin.ncol); 3168 MIN_IT (col, (int)TermWin.ncol);
2992 3169
2993#ifndef NO_NEW_SELECTION
2994 /* 3170 /*
2995 * If we're selecting characters (single click) then we must check first 3171 * If we're selecting characters (single click) then we must check first
2996 * if we are at the same place as the original mark. If we are then 3172 * if we are at the same place as the original mark. If we are then
2997 * select nothing. Otherwise, if we're to the right of the mark, you have to 3173 * select nothing. Otherwise, if we're to the right of the mark, you have to
2998 * be _past_ a character for it to be selected. 3174 * be _past_ a character for it to be selected.
2999 */ 3175 */
3000 if (selection_style != OLD_SELECT)
3001 {
3002 if (((selection.clicks % 3) == 1) && !flag 3176 if (((selection.clicks % 3) == 1) && !flag
3003 && (col == selection.mark.col 3177 && (col == selection.mark.col
3004 && (row == selection.mark.row + TermWin.view_start))) 3178 && (row == selection.mark.row + TermWin.view_start)))
3005 { 3179 {
3006 /* select nothing */ 3180 /* select nothing */
3007 selection.beg.row = selection.end.row = 0; 3181 selection.beg.row = selection.end.row = 0;
3008 selection.beg.col = selection.end.col = 0; 3182 selection.beg.col = selection.end.col = 0;
3009 selection.clicks = 4; 3183 selection.clicks = 4;
3010 want_refresh = 1; 3184 want_refresh = 1;
3011 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3012 return; 3185 return;
3013 }
3014 } 3186 }
3015#endif 3187
3016 if (selection.clicks == 4) 3188 if (selection.clicks == 4)
3017 selection.clicks = 1; 3189 selection.clicks = 1;
3018 3190
3019 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3191 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3020 flag == 1 ? 1 : 0, /* ? button press */ 3192 flag == 1 ? 1 : 0, /* ? button press */
… …
3026 * Extend the selection to the specified col/row 3198 * Extend the selection to the specified col/row
3027 */ 3199 */
3028void 3200void
3029rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3201rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3030{ 3202{
3031 int16_t ncol = TermWin.ncol; 3203 int16_t ncol = TermWin.ncol;
3032 int end_col; 3204 int end_col;
3033 row_col_t pos; 3205 row_col_t pos;
3034 enum { 3206 enum {
3035 LEFT, RIGHT 3207 LEFT, RIGHT
3036 } closeto = RIGHT; 3208 } closeto = RIGHT;
3037
3038 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));
3039 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));
3040 3209
3041 want_refresh = 1; 3210 want_refresh = 1;
3042 switch (selection.op) 3211 switch (selection.op)
3043 { 3212 {
3044 case SELECTION_INIT: 3213 case SELECTION_INIT:
… …
3066 && selection.beg.row == selection.end.row 3235 && selection.beg.row == selection.end.row
3067 && selection.beg.row != selection.mark.row) 3236 && selection.beg.row != selection.mark.row)
3068 { 3237 {
3069 selection.beg.col = selection.end.col = selection.mark.col; 3238 selection.beg.col = selection.end.col = selection.mark.col;
3070 selection.beg.row = selection.end.row = selection.mark.row; 3239 selection.beg.row = selection.end.row = selection.mark.row;
3071 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));
3072 } 3240 }
3073 3241
3074 pos.col = col; 3242 pos.col = col;
3075 pos.row = row; 3243 pos.row = row;
3076 3244
3077 pos.row -= TermWin.view_start; /* adjust for scroll */ 3245 pos.row -= TermWin.view_start; /* adjust for scroll */
3078 3246
3079#ifndef NO_OLD_SELECTION
3080 /*
3081 * This mimics some of the selection behaviour of version 2.20 and before.
3082 * There are no ``selection modes'', button3 is always character extension.
3083 * Note: button3 drag is always available, c.f. v2.20
3084 * Selection always terminates (left or right as appropriate) at the mark.
3085 */
3086 if (selection_style == OLD_SELECT)
3087 {
3088 if (selection.clicks == 1 || button3)
3089 {
3090 if (hate_those_clicks)
3091 {
3092 hate_those_clicks = 0;
3093 if (selection.clicks == 1)
3094 {
3095 selection.beg.row = selection.mark.row;
3096 selection.beg.col = selection.mark.col;
3097 }
3098 else
3099 {
3100 selection.mark.row = selection.beg.row;
3101 selection.mark.col = selection.beg.col;
3102 }
3103 }
3104 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3105 {
3106 selection.end.row = selection.mark.row;
3107 selection.end.col = selection.mark.col + 1;
3108 selection.beg.row = pos.row;
3109 selection.beg.col = pos.col;
3110 }
3111 else
3112 {
3113 selection.beg.row = selection.mark.row;
3114 selection.beg.col = selection.mark.col;
3115 selection.end.row = pos.row;
3116 selection.end.col = pos.col + 1;
3117 }
3118 }
3119 else if (selection.clicks == 2)
3120 {
3121 selection_delimit_word (UP, & (selection.mark),
3122 & (selection.beg));
3123 selection_delimit_word (DN, & (selection.mark),
3124 & (selection.end));
3125 hate_those_clicks = 1;
3126 }
3127 else if (selection.clicks == 3)
3128 {
3129 selection.beg.row = selection.end.row = selection.mark.row;
3130 selection.beg.col = 0;
3131 selection.end.col = ncol;
3132 hate_those_clicks = 1;
3133 }
3134 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));
3135 return;
3136 }
3137#endif /* ! NO_OLD_SELECTION */
3138#ifndef NO_NEW_SELECTION
3139 /* selection_style must not be OLD_SELECT to get here */
3140 /* 3247 /*
3141 * This is mainly xterm style selection with a couple of differences, mainly 3248 * This is mainly xterm style selection with a couple of differences, mainly
3142 * in the way button3 drag extension works. 3249 * in the way button3 drag extension works.
3143 * We're either doing: button1 drag; button3 press; or button3 drag 3250 * We're either doing: button1 drag; button3 press; or button3 drag
3144 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3251 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3149 * a point/word/line which is either the start or end of the selection 3256 * a point/word/line which is either the start or end of the selection
3150 * and it was decided by whichever point/word/line was `fixed' at the 3257 * and it was decided by whichever point/word/line was `fixed' at the
3151 * time of the most recent button3 press 3258 * time of the most recent button3 press
3152 */ 3259 */
3153 if (button3 && buttonpress) 3260 if (button3 && buttonpress)
3154 { /* button3 press */ 3261 { /* button3 press */
3155 /* 3262 /*
3156 * first determine which edge of the selection we are closest to 3263 * first determine which edge of the selection we are closest to
3157 */ 3264 */
3158 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3265 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3159 || (!ROWCOL_IS_AFTER (pos, selection.end) 3266 || (!ROWCOL_IS_AFTER (pos, selection.end)
3160 && (((pos.col - selection.beg.col) 3267 && (((pos.col - selection.beg.col)
3161 + ((pos.row - selection.beg.row) * ncol)) 3268 + ((pos.row - selection.beg.row) * ncol))
3162 < ((selection.end.col - pos.col) 3269 < ((selection.end.col - pos.col)
3163 + ((selection.end.row - pos.row) * ncol))))) 3270 + ((selection.end.row - pos.row) * ncol)))))
3164 closeto = LEFT; 3271 closeto = LEFT;
3272
3165 if (closeto == LEFT) 3273 if (closeto == LEFT)
3166 { 3274 {
3167 selection.beg.row = pos.row; 3275 selection.beg.row = pos.row;
3168 selection.beg.col = pos.col; 3276 selection.beg.col = pos.col;
3169 selection.mark.row = selection.end.row; 3277 selection.mark.row = selection.end.row;
3170 selection.mark.col = selection.end.col 3278 selection.mark.col = selection.end.col - (selection.clicks == 2);
3171 - (selection.clicks == 2);
3172 } 3279 }
3173 else 3280 else
3174 { 3281 {
3175 selection.end.row = pos.row; 3282 selection.end.row = pos.row;
3176 selection.end.col = pos.col; 3283 selection.end.col = pos.col;
3177 selection.mark.row = selection.beg.row; 3284 selection.mark.row = selection.beg.row;
3178 selection.mark.col = selection.beg.col; 3285 selection.mark.col = selection.beg.col;
3179 } 3286 }
3180 } 3287 }
3181 else 3288 else
3182 { /* button1 drag or button3 drag */ 3289 { /* button1 drag or button3 drag */
3183 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3290 if (ROWCOL_IS_AFTER (selection.mark, pos))
3184 { 3291 {
3185 if ((selection.mark.row == selection.end.row) 3292 if ((selection.mark.row == selection.end.row)
3186 && (selection.mark.col == selection.end.col) 3293 && (selection.mark.col == selection.end.col)
3187 && clickchange && selection.clicks == 2) 3294 && clickchange && selection.clicks == 2)
3188 selection.mark.col--; 3295 selection.mark.col--;
3296
3189 selection.beg.row = pos.row; 3297 selection.beg.row = pos.row;
3190 selection.beg.col = pos.col; 3298 selection.beg.col = pos.col;
3191 selection.end.row = selection.mark.row; 3299 selection.end.row = selection.mark.row;
3192 selection.end.col = selection.mark.col 3300 selection.end.col = selection.mark.col + (selection.clicks == 2);
3193 + (selection.clicks == 2);
3194 } 3301 }
3195 else 3302 else
3196 { 3303 {
3197 selection.beg.row = selection.mark.row; 3304 selection.beg.row = selection.mark.row;
3198 selection.beg.col = selection.mark.col; 3305 selection.beg.col = selection.mark.col;
… …
3202 } 3309 }
3203 3310
3204 if (selection.clicks == 1) 3311 if (selection.clicks == 1)
3205 { 3312 {
3206 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3313 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3314
3207 if (end_col != -1 && selection.beg.col > end_col) 3315 if (end_col != -1 && selection.beg.col > end_col)
3208 { 3316 {
3209#if 1 3317#if 1
3210 selection.beg.col = ncol; 3318 selection.beg.col = ncol;
3211#else 3319#else
3212 if (selection.beg.row != selection.end.row) 3320 if (selection.beg.row != selection.end.row)
3213 selection.beg.col = ncol; 3321 selection.beg.col = ncol;
3214 else 3322 else
3215 selection.beg.col = selection.mark.col; 3323 selection.beg.col = selection.mark.col;
3216#endif 3324#endif
3217
3218 } 3325 }
3326
3219 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3327 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3328
3220 if (end_col != -1 && selection.end.col > end_col) 3329 if (end_col != -1 && selection.end.col > end_col)
3221 selection.end.col = ncol; 3330 selection.end.col = ncol;
3222
3223 } 3331 }
3224 else if (selection.clicks == 2) 3332 else if (selection.clicks == 2)
3225 { 3333 {
3226 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3334 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3227 selection.end.col--; 3335 selection.end.col--;
3336
3228 selection_delimit_word (UP, & (selection.beg), 3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3229 & (selection.beg));
3230 selection_delimit_word (DN, & (selection.end), 3338 selection_delimit_word (DN, & (selection.end), & (selection.end));
3231 & (selection.end));
3232 } 3339 }
3233 else if (selection.clicks == 3) 3340 else if (selection.clicks == 3)
3234 { 3341 {
3235#ifndef NO_FRILLS 3342#if ENABLE_FRILLS
3236 if ((Options & Opt_tripleclickwords)) 3343 if ((options & Opt_tripleclickwords))
3237 { 3344 {
3238 int end_row; 3345 int end_row;
3239 3346
3240 selection_delimit_word (UP, & (selection.beg), 3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3241 & (selection.beg));
3242 end_row = screen.tlen[selection.mark.row 3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3243 + TermWin.saveLines]; 3349
3244 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3350 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3245 end_row++)
3246 { 3351 {
3247 end_col = screen.tlen[end_row + TermWin.saveLines]; 3352 end_col = screen.tlen[end_row + TermWin.saveLines];
3353
3248 if (end_col != -1) 3354 if (end_col != -1)
3249 { 3355 {
3250 selection.end.row = end_row; 3356 selection.end.row = end_row;
3251 selection.end.col = end_col; 3357 selection.end.col = end_col;
3252 selection_remove_trailing_spaces (); 3358 selection_remove_trailing_spaces ();
… …
3254 } 3360 }
3255 } 3361 }
3256 } 3362 }
3257 else 3363 else
3258#endif 3364#endif
3259
3260 { 3365 {
3261 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3366 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3262 selection.mark.col++; 3367 selection.mark.col++;
3263 selection.beg.col = 0; 3368 selection.beg.col = 0;
3264 selection.end.col = ncol; 3369 selection.end.col = ncol;
3265 } 3370 }
3266 } 3371 }
3372
3267 if (button3 && buttonpress) 3373 if (button3 && buttonpress)
3268 { /* mark may need to be changed */ 3374 { /* mark may need to be changed */
3269 if (closeto == LEFT) 3375 if (closeto == LEFT)
3270 { 3376 {
3271 selection.mark.row = selection.end.row; 3377 selection.mark.row = selection.end.row;
3272 selection.mark.col = selection.end.col 3378 selection.mark.col = selection.end.col - (selection.clicks == 2);
3273 - (selection.clicks == 2);
3274 } 3379 }
3275 else 3380 else
3276 { 3381 {
3277 selection.mark.row = selection.beg.row; 3382 selection.mark.row = selection.beg.row;
3278 selection.mark.col = selection.beg.col; 3383 selection.mark.col = selection.beg.col;
3279 } 3384 }
3280 } 3385 }
3281 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));
3282#endif /* ! NO_NEW_SELECTION */
3283} 3386}
3284 3387
3285#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3286void 3389void
3287rxvt_term::selection_remove_trailing_spaces () 3390rxvt_term::selection_remove_trailing_spaces ()
3288{ 3391{
3289 int32_t end_col, end_row; 3392 int32_t end_col, end_row;
3290 text_t *stp; 3393 text_t *stp;
… …
3361 ev.target = rq.target; 3464 ev.target = rq.target;
3362 ev.time = rq.time; 3465 ev.time = rq.time;
3363 3466
3364 if (rq.target == xa[XA_TARGETS]) 3467 if (rq.target == xa[XA_TARGETS])
3365 { 3468 {
3366 Atom32 target_list[5]; 3469 Atom32 target_list[6];
3367 Atom32 *target = target_list; 3470 Atom32 *target = target_list;
3368 3471
3369 *target++ = (Atom32) xa[XA_TARGETS]; 3472 *target++ = (Atom32) xa[XA_TARGETS];
3473 *target++ = (Atom32) xa[XA_TIMESTAMP];
3370 *target++ = (Atom32) XA_STRING; 3474 *target++ = (Atom32) XA_STRING;
3371 *target++ = (Atom32) xa[XA_TEXT]; 3475 *target++ = (Atom32) xa[XA_TEXT];
3372 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3476 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3373#if X_HAVE_UTF8_STRING 3477#if X_HAVE_UTF8_STRING
3374 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3478 *target++ = (Atom32) xa[XA_UTF8_STRING];
3375#endif 3479#endif
3480
3376 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3481 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3377 (8 * sizeof (target_list[0])), PropModeReplace, 3482 (8 * sizeof (target_list[0])), PropModeReplace,
3378 (unsigned char *)target_list, 3483 (unsigned char *)target_list,
3379 target - target_list); 3484 target - target_list);
3380 ev.property = rq.property; 3485 ev.property = rq.property;
3381 } 3486 }
3487#if TODO // TODO
3382 else if (rq.target == xa[XA_MULTIPLE]) 3488 else if (rq.target == xa[XA_MULTIPLE])
3383 { 3489 {
3384 /* TODO: Handle MULTIPLE */ 3490 /* TODO: Handle MULTIPLE */
3385 } 3491 }
3492#endif
3386 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3387 { 3494 {
3388 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3389 (8 * sizeof (Time)), PropModeReplace, 3496 (8 * sizeof (Time)), PropModeReplace,
3390 (unsigned char *)&selection_time, 1); 3497 (unsigned char *)&selection_time, 1);
3391 ev.property = rq.property; 3498 ev.property = rq.property;
3392 } 3499 }
3393 else if (rq.target == XA_STRING 3500 else if (rq.target == XA_STRING
3394 || rq.target == xa[XA_TEXT] 3501 || rq.target == xa[XA_TEXT]
3395 || rq.target == xa[XA_COMPOUND_TEXT] 3502 || rq.target == xa[XA_COMPOUND_TEXT]
3396 || rq.target == xa[XA_UTF8_STRING] 3503 || rq.target == xa[XA_UTF8_STRING]
3397 ) 3504 )
3398 { 3505 {
3399 short freect = 0; 3506 short freect = 0;
3400 int selectlen; 3507 int selectlen;
3401 char *cl; 3508 wchar_t *cl;
3402 3509
3403 target = rq.target; 3510 target = rq.target;
3404 3511
3405 if (target == XA_STRING) 3512 if (target == XA_STRING)
3406 // we actually don't do XA_STRING, but who cares, as i18n clients 3513 // we actually don't do XA_STRING, but who cares, as i18n clients
3407 // will ask for another format anyways. 3514 // will ask for another format anyways.
3408 style = XStringStyle; 3515 style = XStringStyle;
3409 else if (target == xa[XA_TEXT]) 3516 else if (target == xa[XA_TEXT])
3410 style = XTextStyle; 3517 style = XStdICCTextStyle;
3411 else if (target == xa[XA_COMPOUND_TEXT]) 3518 else if (target == xa[XA_COMPOUND_TEXT])
3412 style = XCompoundTextStyle; 3519 style = XCompoundTextStyle;
3413#if X_HAVE_UTF8_STRING 3520#if X_HAVE_UTF8_STRING
3414 else if (target == xa[XA_UTF8_STRING]) 3521 else if (target == xa[XA_UTF8_STRING])
3415 style = XUTF8StringStyle; 3522 style = XUTF8StringStyle;
… …
3420 style = XCompoundTextStyle; 3527 style = XCompoundTextStyle;
3421 } 3528 }
3422 3529
3423 if (selection.text) 3530 if (selection.text)
3424 { 3531 {
3425 cl = (char *)selection.text; 3532 cl = selection.text;
3426 selectlen = selection.len; 3533 selectlen = selection.len;
3427 } 3534 }
3428 else 3535 else
3429 { 3536 {
3430 cl = ""; 3537 cl = L"";
3431 selectlen = 0; 3538 selectlen = 0;
3432 } 3539 }
3433 3540
3541 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3542 // manually for XUTF8StringStyle.
3434 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3543 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3435 freect = 1; 3544 freect = 1;
3436 else 3545 else
3437 { 3546 {
3438 /* if we failed to convert then send it raw */ 3547 /* if we failed to convert then send it raw */
3439 ct.value = (unsigned char *)cl; 3548 ct.value = (unsigned char *)cl;
… …
3446 ev.property = rq.property; 3555 ev.property = rq.property;
3447 3556
3448 if (freect) 3557 if (freect)
3449 XFree (ct.value); 3558 XFree (ct.value);
3450 } 3559 }
3560
3451 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3561 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3452} 3562}
3453 3563
3454/* ------------------------------------------------------------------------- * 3564/* ------------------------------------------------------------------------- *
3455 * MOUSE ROUTINES * 3565 * MOUSE ROUTINES *
… …
3468} 3578}
3469 3579
3470/* ------------------------------------------------------------------------- */ 3580/* ------------------------------------------------------------------------- */
3471#ifdef USE_XIM 3581#ifdef USE_XIM
3472void 3582void
3473rxvt_term::im_set_position (XPoint *pos) 3583rxvt_term::im_set_position (XPoint &pos)
3474{ 3584{
3475 XWindowAttributes xwa; 3585 XWindowAttributes xwa;
3476 3586
3477 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3587 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3588
3478 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3589 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3479 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3590 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3480} 3591}
3481
3482#endif 3592#endif
3483/* ------------------------------------------------------------------------- */ 3593
3484 3594#if ENABLE_OVERLAY
3595void
3596rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3597{
3598 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3599 return;
3600
3601 want_refresh = 1;
3602
3603 scr_overlay_off ();
3604
3605 if (x < 0) x = TermWin.ncol - w;
3606 if (y < 0) y = TermWin.nrow - h;
3607
3608 // make space for border
3609 w += 2; MIN_IT (w, TermWin.ncol);
3610 h += 2; MIN_IT (h, TermWin.nrow);
3611
3612 x -= 1; MAX_IT (x, 0);
3613 y -= 1; MAX_IT (y, 0);
3614
3615 MIN_IT (x, TermWin.ncol - w);
3616 MIN_IT (y, TermWin.nrow - h);
3617
3618 ov_x = x; ov_y = y;
3619 ov_w = w; ov_h = h;
3620
3621 ov_text = new text_t *[h];
3622 ov_rend = new rend_t *[h];
3623
3624 for (y = 0; y < h; y++)
3625 {
3626 text_t *tp = ov_text[y] = new text_t[w];
3627 rend_t *rp = ov_rend[y] = new rend_t[w];
3628
3629 text_t t0, t1, t2;
3630 rend_t r = OVERLAY_RSTYLE;
3631
3632 if (y == 0)
3633 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3634 else if (y < h - 1)
3635 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3636 else
3637 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3638
3639 *tp++ = t0;
3640 *rp++ = r;
3641
3642 for (x = w - 2; x > 0; --x)
3643 {
3644 *tp++ = t1;
3645 *rp++ = r;
3646 }
3647
3648 *tp = t2;
3649 *rp = r;
3650 }
3651}
3652
3653void
3654rxvt_term::scr_overlay_off ()
3655{
3656 if (!ov_text)
3657 return;
3658
3659 want_refresh = 1;
3660
3661 for (int y = 0; y < ov_h; y++)
3662 {
3663 delete [] ov_text[y];
3664 delete [] ov_rend[y];
3665 }
3666
3667 delete [] ov_text; ov_text = 0;
3668 delete [] ov_rend; ov_rend = 0;
3669}
3670
3671void
3672rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3673{
3674 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3675 return;
3676
3677 x++, y++;
3678
3679 ov_text[y][x] = text;
3680 ov_rend[y][x] = rend;
3681}
3682
3683void
3684rxvt_term::scr_overlay_set (int x, int y, const char *s)
3685{
3686 while (*s)
3687 scr_overlay_set (x++, y, *s++);
3688}
3689
3690void
3691rxvt_term::scr_swap_overlay ()
3692{
3693 if (!ov_text)
3694 return;
3695
3696 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3697
3698 // swap screen mem with overlay
3699 for (int y = ov_h; y--; )
3700 {
3701 text_t *t1 = ov_text[y];
3702 rend_t *r1 = ov_rend[y];
3703
3704 text_t *t2 = screen.text[y + row_offset] + ov_x;
3705 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3706
3707 for (int x = ov_w; x--; )
3708 {
3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3711 }
3712 }
3713}
3714
3715#endif
3485/* ------------------------------------------------------------------------- * 3716/* ------------------------------------------------------------------------- */
3486 * DEBUG ROUTINES *
3487 * ------------------------------------------------------------------------- */
3488#if 0
3489void
3490rxvt_debug_colors (void)
3491{
3492 int color;
3493 const char *name[] =
3494 {
3495 "fg", "bg",
3496 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3497 };
3498
3499 fprintf (stderr, "Color ( ");
3500 if (rstyle & RS_RVid)
3501 fprintf (stderr, "rvid ");
3502 if (rstyle & RS_Bold)
3503 fprintf (stderr, "bold ");
3504 if (rstyle & RS_Blink)
3505 fprintf (stderr, "blink ");
3506 if (rstyle & RS_Uline)
3507 fprintf (stderr, "uline ");
3508 fprintf (stderr, "): ");
3509
3510 color = GET_FGCOLOR (rstyle);
3511#ifndef NO_BRIGHTCOLOR
3512 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3513 {
3514 color -= (minBrightCOLOR - minCOLOR);
3515 fprintf (stderr, "bright ");
3516 }
3517#endif
3518 fprintf (stderr, "%s on ", name[color]);
3519
3520 color = GET_BGCOLOR (rstyle);
3521#ifndef NO_BRIGHTCOLOR
3522 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3523 {
3524 color -= (minBrightCOLOR - minCOLOR);
3525 fprintf (stderr, "bright ");
3526 }
3527#endif
3528 fprintf (stderr, "%s\n", name[color]);
3529}
3530#endif

Diff Legend

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