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.104 by root, Tue Aug 17 01:29:12 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 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
28#include "screen.intpro" /* PROTOS for internal routines */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <stdint.h> 33#include <inttypes.h>
33#include <wchar.h> 34#include <wchar.h>
34 35
35#include "salloc.C" // HACK!! 36#include "salloc.C" // HACK, should be a seperate compile!
36 37
37inline void fill_text (text_t *start, text_t value, int len) 38inline void fill_text (text_t *start, text_t value, int len)
38{ 39{
39 while (len--) 40 while (len--)
40 *start++ = value; 41 *start++ = value;
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 52 if (options & Opt_scrollTtyOutput) \
52 TermWin.view_start = 0 53 TermWin.view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
58 = selection.mark.row = selection.mark.col \ 59 = selection.mark.row = selection.mark.col \
59 = selection.end.row = selection.end.col = 0 60 = selection.end.row = selection.end.col = 0
60 61
61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
62 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 63 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
64 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 65 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
66 (((A) == (C)) && ((B) > (D))) 67 (((A) == (C)) && ((B) > (D)))
67#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) >= (D))) 69 (((A) == (C)) && ((B) >= (D)))
69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 70#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
70 (((A) == (C)) && ((B) < (D))) 71 (((A) == (C)) && ((B) < (D)))
71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 72#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) <= (D))) 73 (((A) == (C)) && ((B) <= (D)))
73 74
74/* these must be row_col_t */ 75/* these must be row_col_t */
75#define ROWCOL_IS_AFTER(X, Y) \ 76#define ROWCOL_IS_AFTER(X, Y) \
76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
77#define ROWCOL_IS_BEFORE(X, Y) \ 78#define ROWCOL_IS_BEFORE(X, Y) \
78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IN_ROW_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AFTER(X, Y) \
80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_BEFORE(X, Y) \
82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#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) 85 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) \ 86#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) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * 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 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer TermWin.vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (TermWin.mapped) \
97 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)TermWin.width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (TermWin.mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
109 TermWin.int_bwidth, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)TermWin.width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
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, TermWin.ascii_map [' ' - 0x20]);
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
… …
436{ 448{
437 uint16_t total_rows; 449 uint16_t 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 = s->cur.row;
517 s->s_cur.col = s->cur.col; 517 s->s_cur.col = s->cur.col;
518 s->s_rstyle = rstyle; 518 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 519 s->s_charset = s->charset;
520 s->s_charset_char = charsets[s->charset]; 520 s->s_charset_char = charsets[s->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 s->cur.row = s->s_cur.row;
525 s->cur.col = s->s_cur.col; 526 s->cur.col = s->s_cur.col;
526 s->flags &= ~Screen_WrapNext; 527 s->flags &= ~Screen_WrapNext;
… …
528 s->charset = s->s_charset; 529 s->charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 530 charsets[s->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;
604}
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++;
602} 621}
603 622
604/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
605/* 624/*
606 * Change the colour for following text 625 * Change the colour for following text
… …
645 664
646 if (count == 0 || (row1 > row2)) 665 if (count == 0 || (row1 > row2))
647 return 0; 666 return 0;
648 667
649 want_refresh = 1; 668 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 669
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 670 if (row1 == 0 && count > 0
671 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 672 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 673 nscrolled = (long)TermWin.nscrolled + (long)count;
655 674
656 if (nscrolled > (long)TermWin.saveLines) 675 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 676 TermWin.nscrolled = TermWin.saveLines;
658 else 677 else
659 TermWin.nscrolled = (uint16_t)nscrolled; 678 TermWin.nscrolled = (uint16_t)nscrolled;
660 679
661 if ((Options & Opt_scrollWithBuffer) 680 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 681 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 682 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count); 683 scr_page (UP, count);
665 } 684 }
666 else if (!spec) 685 else if (!spec)
… …
705 if (j > 0) 724 if (j > 0)
706 { 725 {
707 /* A: scroll up */ 726 /* A: scroll up */
708 727
709 /* A1: Copy lines that will get clobbered by the rotation */ 728 /* A1: Copy lines that will get clobbered by the rotation */
729 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
730 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
731
732 /* A2: Rotate lines */
733 i = row2 - row1 - count + 1;
734 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
735 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
736 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
737
738 j = row2 - count + 1, i = count;
739 }
740 else /* if (j < 0) */
741 {
742 /* B: scroll down */
743
744 /* B1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++) 745 for (i = 0, j = row2; i < count; i++, j--)
711 { 746 {
712 buf_text[i] = screen.text[j]; 747 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 748 buf_rend[i] = screen.rend[j];
714 } 749 }
750
715 /* A2: Rotate lines */ 751 /* B2: Rotate lines */
716 for (j = row1, i = j + count; i <= row2; i++, j++) 752 for (j = row2, i = j - count; i >= row1; i--, j--)
717 { 753 {
718 screen.tlen[j] = screen.tlen[i]; 754 screen.tlen[j] = screen.tlen[i];
719 screen.text[j] = screen.text[i]; 755 screen.text[j] = screen.text[i];
720 screen.rend[j] = screen.rend[i]; 756 screen.rend[j] = screen.rend[i];
721 } 757 }
722 j = row2 - count + 1, i = count;
723 }
724 else /* if (j < 0) */
725 {
726 /* B: scroll down */
727 758
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; 759 j = row1, i = count;
742 count = -count; 760 count = -count;
743 } 761 }
744 762
745 /* C: Resurrect lines */ 763 /* C: Resurrect lines */
764 memset (screen.tlen + j, 0, i * sizeof (int16_t));
765 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
766 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
767 if (!spec) /* line length may not equal TermWin.ncol */
746 for (; i--; j++) 768 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, 769 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
754 (unsigned int)j, rstyle);
755 }
756 770
757 return count; 771 return count;
758} 772}
759 773
760/* ------------------------------------------------------------------------- */ 774/* ------------------------------------------------------------------------- */
761/* 775/*
762 * Add text given in <str> of length <len> to screen struct 776 * Add text given in <str> of length <len> to screen struct
763 */ 777 */
764void 778void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 779rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
766{ 780{
767 unsigned char checksel, clearsel; 781 unsigned char checksel;
768 uint32_t c; 782 unicode_t c;
769 int i, row, last_col; 783 int i, row, last_col;
770 text_t *stp; 784 text_t *stp;
771 rend_t *srp; 785 rend_t *srp;
772 786
773 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
774 return; 788 return;
775 789
776 want_refresh = 1; 790 want_refresh = 1;
791 ZERO_SCROLLBACK ();
777 last_col = TermWin.ncol; 792 last_col = TermWin.ncol;
778 793
779 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
780 ZERO_SCROLLBACK ();
781 if (nlines > 0) 794 if (nlines > 0)
782 { 795 {
783 nlines += (screen.cur.row - screen.bscroll); 796 nlines += screen.cur.row - screen.bscroll;
784 if ((nlines > 0) 797 if ((nlines > 0)
785 && (screen.tscroll == 0) 798 && (screen.tscroll == 0)
786 && (screen.bscroll == (TermWin.nrow - 1))) 799 && (screen.bscroll == (TermWin.nrow - 1)))
787 { 800 {
788 /* _at least_ this many lines need to be scrolled */ 801 /* _at least_ this many lines need to be scrolled */
789 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 802 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
790 screen.cur.row -= nlines; 803 screen.cur.row -= nlines;
791 } 804 }
792 } 805 }
806
793#ifdef DEBUG_STRICT 807#ifdef DEBUG_STRICT
794 assert (screen.cur.col < last_col); 808 assert (screen.cur.col < last_col);
795 assert ((screen.cur.row < TermWin.nrow) 809 assert ((screen.cur.row < TermWin.nrow)
796 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 810 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
797#else /* drive with your eyes closed */ 811#else /* drive with your eyes closed */
798 MIN_IT (screen.cur.col, last_col - 1); 812 MIN_IT (screen.cur.col, last_col - 1);
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 813 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 814 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 815#endif
802 row = screen.cur.row + TermWin.saveLines; 816 row = screen.cur.row + TermWin.saveLines;
803 817
804 checksel = (selection.op 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0;
807 819
808 stp = screen.text[row]; 820 stp = screen.text[row];
809 srp = screen.rend[row]; 821 srp = screen.rend[row];
810 822
811 for (i = 0; i < len;) 823 while (len--)
812 { 824 {
813 c = str[i++]; 825 c = *str++;
826
827 if (c < 0x20)
814 switch (c) 828 switch (c)
815 { 829 {
816 case '\t': 830 case C0_HT:
817 scr_tab (1); 831 scr_tab (1);
818 continue; 832 continue;
819 case '\n': 833
834 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 835 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 836 MAX_IT (screen.tlen[row], screen.cur.col);
837
822 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
839
823 if (screen.cur.row == screen.bscroll) 840 if (screen.cur.row == screen.bscroll)
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 841 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1)) 842 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines; 843 row = (++screen.cur.row) + TermWin.saveLines;
844
827 stp = screen.text[row]; /* _must_ refresh */ 845 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 846 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 847 continue;
830 case '\r': 848
849 case C0_CR:
831 if (screen.tlen[row] != -1) /* XXX: think about this */ 850 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col); 851 MAX_IT (screen.tlen[row], screen.cur.col);
852
833 screen.flags &= ~Screen_WrapNext; 853 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 854 screen.cur.col = 0;
835 continue; 855 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 856 }
841 857
842 if (checksel /* see if we're writing within selection */ 858 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 861 {
846 checksel = 0; 862 checksel = 0;
847 clearsel = 1;
848 } 863 /*
864 * If we wrote anywhere in the selected area, kill the selection
865 * XXX: should we kill the mark too? Possibly, but maybe that
866 * should be a similar check.
867 */
868 CLEAR_SELECTION ();
869 }
870
849 if (screen.flags & Screen_WrapNext) 871 if (screen.flags & Screen_WrapNext)
850 { 872 {
851 screen.tlen[row] = -1; 873 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 874
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; 875 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
876
856 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext;
860 } 879 }
880
861 if (screen.flags & Screen_Insert) 881 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 882 scr_insdel_chars (1, INSERT);
863 883
884 // rely on wcwidth to tell us the character width, at least for non-latin1
885 // do wcwidth before further replacements, as wcwidth says that line-drawing
886 // characters have width -1 (DOH!) on GNU/Linux sometimes.
887 int width = c < 0x100 ? 1 : wcwidth (c);
888
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 889 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 { 890 {
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 891 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 892 static uint16_t vt100_0[32] = { // 5f .. 7e
874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 893 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 894 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 895 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
877 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 896 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
878 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
879 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
880 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
881 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
882 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
883 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
884 } 897 };
885 898
886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 899 if (c >= 0x5f && c <= 0x7e)
887 // rely on wcwidth to tell us the character width, at least for non-ascii 900 {
888 int width = c <= 128 ? 1 : wcwidth (c); 901 c = vt100_0[c - 0x5f];
902 width = 1;
903 }
904 }
889 905
890 // width -1 characters (e.g. combining chars) are ignored currently.
891 if (width > 0) 906 if (width != 0)
907 {
908#if !UNICODE_3
909 // trim characters we can't store directly :(
910 if (c >= 0x10000)
911# if ENABLE_COMBINING
912 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else
914 c = 0xfffd;
915# endif
916#endif
917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
918 rend_t rend = SET_FONT (rstyle,
919 c > 0x7f || bold || c < 0x20
920 ? TermWin.fontset->find_font (c, bold)
921 : TermWin.ascii_map [c - 0x20]);
922
892 do 923 do
893 { 924 {
894 stp[screen.cur.col] = c; 925 stp[screen.cur.col] = c;
895 srp[screen.cur.col] = rend; 926 srp[screen.cur.col] = rend;
896 927
897 if (screen.cur.col < last_col - 1) 928 if (screen.cur.col < last_col - 1)
898 screen.cur.col++; 929 screen.cur.col++;
899 else 930 else
900 { 931 {
901 screen.tlen[row] = last_col; 932 screen.tlen[row] = last_col;
902 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
903 screen.flags |= Screen_WrapNext; 934 screen.flags |= Screen_WrapNext;
904 break; 935 break;
905 } 936 }
906 937
907 c = NOCHAR; 938 c = NOCHAR;
908 } 939 }
909 while (--width > 0); 940 while (--width > 0);
941
942 // pad with spaces when overwriting wide character with smaller one
943 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
944 {
945 stp[c] = ' ';
946 srp[c] = rend;
947 }
948 }
949 else if (width == 0)
950 {
951#if ENABLE_COMBINING
952 // handle combining characters
953 // we just tag the accent on the previous on-screen character.
954 // this is arguably not correct, but also arguably not wrong.
955 // we don't handle double-width characters nicely yet.
956
957 text_t *tp;
958 rend_t *rp;
959
960 if (screen.cur.col > 0)
961 {
962 tp = stp + screen.cur.col - 1;
963 rp = srp + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967 {
968 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
969 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
970 }
910 else 971 else
911 (void)0; /* handle combining character etc. here. */ 972 continue;
973
974 // handle double-width-chars by making them look extremely ugly
975 if (*tp == NOCHAR)
976 *tp = ' '; // hack //D //TODO //--tp, --rp;
977
978 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c);
982
983 *tp = n;
984 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
985#endif
986 }
912 } 987 }
913 988
914 if (screen.tlen[row] != -1) /* XXX: think about this */ 989 if (screen.tlen[row] != -1) /* XXX: think about this */
915 MAX_IT (screen.tlen[row], screen.cur.col); 990 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 991
925#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
926 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
927#else /* drive with your eyes closed */ 994#else /* drive with your eyes closed */
928 MAX_IT (screen.cur.row, 0); 995 MAX_IT (screen.cur.row, 0);
… …
936 */ 1003 */
937void 1004void
938rxvt_term::scr_backspace () 1005rxvt_term::scr_backspace ()
939{ 1006{
940 want_refresh = 1; 1007 want_refresh = 1;
1008
941 if (screen.cur.col == 0) 1009 if (screen.cur.col == 0)
942 { 1010 {
943 if (screen.cur.row > 0) 1011 if (screen.cur.row > 0)
944 { 1012 {
945#ifdef TERMCAP_HAS_BW 1013#ifdef TERMCAP_HAS_BW
946 screen.cur.col = TermWin.ncol - 1; 1014 screen.cur.col = TermWin.ncol - 1;
947 screen.cur.row--; 1015 screen.cur.row--;
948 return; 1016 return;
949#endif 1017#endif
950
951 } 1018 }
952 } 1019 }
953 else if ((screen.flags & Screen_WrapNext) == 0) 1020 else if (!(screen.flags & Screen_WrapNext))
954 scr_gotorc (0, -1, RELATIVE); 1021 scr_gotorc (0, -1, RELATIVE);
1022
955 screen.flags &= ~Screen_WrapNext; 1023 screen.flags &= ~Screen_WrapNext;
956} 1024}
957 1025
958/* ------------------------------------------------------------------------- */ 1026/* ------------------------------------------------------------------------- */
959/* 1027/*
… …
962 * XTERM_SEQ: CTRL-I 1030 * XTERM_SEQ: CTRL-I
963 */ 1031 */
964void 1032void
965rxvt_term::scr_tab (int count) 1033rxvt_term::scr_tab (int count)
966{ 1034{
967 int i, x; 1035 int i, x;
968 1036
969 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
970 want_refresh = 1; 1037 want_refresh = 1;
971 i = x = screen.cur.col; 1038 i = x = screen.cur.col;
1039
972 if (count == 0) 1040 if (count == 0)
973 return; 1041 return;
974 else if (count > 0) 1042 else if (count > 0)
975 { 1043 {
976 for (; ++i < TermWin.ncol; ) 1044 for (; ++i < TermWin.ncol; )
… …
978 { 1046 {
979 x = i; 1047 x = i;
980 if (!--count) 1048 if (!--count)
981 break; 1049 break;
982 } 1050 }
1051
983 if (count) 1052 if (count)
984 x = TermWin.ncol - 1; 1053 x = TermWin.ncol - 1;
985 } 1054 }
986 else /* if (count < 0) */ 1055 else /* if (count < 0) */
987 { 1056 {
… …
990 { 1059 {
991 x = i; 1060 x = i;
992 if (!++count) 1061 if (!++count)
993 break; 1062 break;
994 } 1063 }
1064
995 if (count) 1065 if (count)
996 x = 0; 1066 x = 0;
997 } 1067 }
1068
998 if (x != screen.cur.col) 1069 if (x != screen.cur.col)
999 scr_gotorc (0, x, R_RELATIVE); 1070 scr_gotorc (0, x, R_RELATIVE);
1000} 1071}
1001 1072
1002/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
… …
1004 * Process DEC Back Index 1075 * Process DEC Back Index
1005 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1006 * Move cursor left in row. If we're at the left boundary, shift everything 1077 * Move cursor left in row. If we're at the left boundary, shift everything
1007 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1008 */ 1079 */
1009#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1010void 1081void
1011rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1012{ 1083{
1013 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1014 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1015 else 1086 else
1016 { 1087 {
1017 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1088 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1018 return; /* um, yeah? */ 1089 return; /* um, yeah? */
1090
1019 scr_insdel_chars (1, INSERT); 1091 scr_insdel_chars (1, INSERT);
1020 } 1092 }
1021} 1093}
1022#endif 1094#endif
1023/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1025 * Process DEC Forward Index 1097 * Process DEC Forward Index
1026 * XTERM_SEQ: ESC 9 1098 * XTERM_SEQ: ESC 9
1027 * Move cursor right in row. If we're at the right boundary, shift everything 1099 * Move cursor right in row. If we're at the right boundary, shift everything
1028 * in that row left. Clear right column. 1100 * in that row left. Clear right column.
1029 */ 1101 */
1030#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1031void 1103void
1032rxvt_term::scr_forwardindex () 1104rxvt_term::scr_forwardindex ()
1033{ 1105{
1034 int row; 1106 int row;
1035 1107
1036 if (screen.cur.col < TermWin.ncol - 1) 1108 if (screen.cur.col < TermWin.ncol - 1)
1037 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1038 else 1110 else
1039 { 1111 {
1040 row = screen.cur.row + TermWin.saveLines; 1112 row = screen.cur.row + TermWin.saveLines;
1113
1041 if (screen.tlen[row] == 0) 1114 if (screen.tlen[row] == 0)
1042 return; /* um, yeah? */ 1115 return; /* um, yeah? */
1043 else if (screen.tlen[row] == -1) 1116 else if (screen.tlen[row] == -1)
1044 screen.tlen[row] = TermWin.ncol; 1117 screen.tlen[row] = TermWin.ncol;
1118
1045 scr_gotorc (0, 0, R_RELATIVE); 1119 scr_gotorc (0, 0, R_RELATIVE);
1046 scr_insdel_chars (1, DELETE); 1120 scr_insdel_chars (1, DELETE);
1047 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1121 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1048 } 1122 }
1049} 1123}
… …
1057rxvt_term::scr_gotorc (int row, int col, int relative) 1131rxvt_term::scr_gotorc (int row, int col, int relative)
1058{ 1132{
1059 want_refresh = 1; 1133 want_refresh = 1;
1060 ZERO_SCROLLBACK (); 1134 ZERO_SCROLLBACK ();
1061 1135
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) 1136 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1065 : col);
1066 MAX_IT (screen.cur.col, 0); 1137 MAX_IT (screen.cur.col, 0);
1067 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1138 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1068 1139
1069 screen.flags &= ~Screen_WrapNext; 1140 screen.flags &= ~Screen_WrapNext;
1141
1070 if (relative & R_RELATIVE) 1142 if (relative & R_RELATIVE)
1071 { 1143 {
1072 if (row > 0) 1144 if (row > 0)
1073 { 1145 {
1074 if (screen.cur.row <= screen.bscroll 1146 if (screen.cur.row <= screen.bscroll
… …
1094 MIN_IT (screen.cur.row, screen.bscroll); 1166 MIN_IT (screen.cur.row, screen.bscroll);
1095 } 1167 }
1096 else 1168 else
1097 screen.cur.row = row; 1169 screen.cur.row = row;
1098 } 1170 }
1171
1099 MAX_IT (screen.cur.row, 0); 1172 MAX_IT (screen.cur.row, 0);
1100 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1173 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1101} 1174}
1102 1175
1103/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1104/* 1177/*
1105 * direction should be UP or DN 1178 * direction should be UP or DN
1106 */ 1179 */
1107void 1180void
1108rxvt_term::scr_index (enum page_dirn direction) 1181rxvt_term::scr_index (enum page_dirn direction)
1109{ 1182{
1110 int dirn; 1183 int dirn;
1111 1184
1112 want_refresh = 1; 1185 want_refresh = 1;
1186 ZERO_SCROLLBACK ();
1187
1113 dirn = ((direction == UP) ? 1 : -1); 1188 dirn = ((direction == UP) ? 1 : -1);
1114 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1115
1116 ZERO_SCROLLBACK ();
1117 1189
1118 screen.flags &= ~Screen_WrapNext; 1190 screen.flags &= ~Screen_WrapNext;
1191
1119 if ((screen.cur.row == screen.bscroll && direction == UP) 1192 if ((screen.cur.row == screen.bscroll && direction == UP)
1120 || (screen.cur.row == screen.tscroll && direction == DN)) 1193 || (screen.cur.row == screen.tscroll && direction == DN))
1121 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1194 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1122 else 1195 else
1123 screen.cur.row += dirn; 1196 screen.cur.row += dirn;
1197
1124 MAX_IT (screen.cur.row, 0); 1198 MAX_IT (screen.cur.row, 0);
1125 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1199 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1126 selection_check (0); 1200 selection_check (0);
1127} 1201}
1128 1202
… …
1137rxvt_term::scr_erase_line (int mode) 1211rxvt_term::scr_erase_line (int mode)
1138{ 1212{
1139 unsigned int row, col, num; 1213 unsigned int row, col, num;
1140 1214
1141 want_refresh = 1; 1215 want_refresh = 1;
1142 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1143 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
1144 1217
1145 selection_check (1); 1218 selection_check (1);
1146
1147 screen.flags &= ~Screen_WrapNext;
1148 1219
1149 row = TermWin.saveLines + screen.cur.row; 1220 row = TermWin.saveLines + screen.cur.row;
1150 switch (mode) 1221 switch (mode)
1151 { 1222 {
1152 case 0: /* erase to end of line */ 1223 case 0: /* erase to end of line */
… …
1175 default: 1246 default:
1176 return; 1247 return;
1177 } 1248 }
1178 1249
1179 if (screen.text[row]) 1250 if (screen.text[row])
1180 scr_blank_line (& (screen.text[row][col]), 1251 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1181 & (screen.rend[row][col]), num, rstyle);
1182 else 1252 else
1183 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1253 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1184} 1254}
1185 1255
1186/* ------------------------------------------------------------------------- */ 1256/* ------------------------------------------------------------------------- */
… …
1191 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1261 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1192 */ 1262 */
1193void 1263void
1194rxvt_term::scr_erase_screen (int mode) 1264rxvt_term::scr_erase_screen (int mode)
1195{ 1265{
1196 int num; 1266 int num;
1197 int32_t row, row_offset; 1267 int32_t row, row_offset;
1198 rend_t ren; 1268 rend_t ren;
1199 XGCValues gcvalue; 1269 XGCValues gcvalue;
1200 1270
1201 want_refresh = 1; 1271 want_refresh = 1;
1202 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1203 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1273
1204 row_offset = (int32_t)TermWin.saveLines; 1274 row_offset = (int32_t)TermWin.saveLines;
1205 1275
1206 switch (mode) 1276 switch (mode)
1207 { 1277 {
1208 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
… …
1223 num = TermWin.nrow; 1293 num = TermWin.nrow;
1224 break; 1294 break;
1225 default: 1295 default:
1226 return; 1296 return;
1227 } 1297 }
1228 refresh_type |= REFRESH_BOUNDS; 1298
1229 if (selection.op && current_screen == selection.screen 1299 if (selection.op && current_screen == selection.screen
1230 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1300 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1231 || (selection.end.row >= row 1301 || (selection.end.row >= row
1232 && selection.end.row <= row + num))) 1302 && selection.end.row <= row + num)))
1233 CLEAR_SELECTION (); 1303 CLEAR_SELECTION ();
1304
1234 if (row >= TermWin.nrow) /* Out Of Bounds */ 1305 if (row >= TermWin.nrow) /* Out Of Bounds */
1235 return; 1306 return;
1307
1236 MIN_IT (num, (TermWin.nrow - row)); 1308 MIN_IT (num, (TermWin.nrow - row));
1309
1237 if (rstyle & (RS_RVid | RS_Uline)) 1310 if (rstyle & (RS_RVid | RS_Uline))
1238 ren = (rend_t) ~RS_None; 1311 ren = (rend_t) ~RS_None;
1239 else if (GET_BASEBG (rstyle) == Color_bg) 1312 else if (GET_BASEBG (rstyle) == Color_bg)
1240 { 1313 {
1241 ren = DEFAULT_RSTYLE; 1314 ren = DEFAULT_RSTYLE;
1242 CLEAR_ROWS (row, num); 1315 CLEAR_ROWS (row, num);
1243 } 1316 }
1244 else 1317 else
1245 { 1318 {
1246 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1319 ren = (rstyle & (RS_fgMask | RS_bgMask));
1247 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1248 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1322 ERASE_ROWS (row, num);
1250 gcvalue.foreground = PixColors[Color_fg]; 1323 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1252 } 1325 }
1326
1253 for (; num--; row++) 1327 for (; num--; row++)
1254 { 1328 {
1255 scr_blank_screen_mem (screen.text, screen.rend, 1329 scr_blank_screen_mem (screen.text, screen.rend,
1256 (unsigned int) (row + row_offset), rstyle); 1330 (unsigned int) (row + row_offset), rstyle);
1257 screen.tlen[row + row_offset] = 0; 1331 screen.tlen[row + row_offset] = 0;
… …
1270{ 1344{
1271 int i, j, k; 1345 int i, j, k;
1272 rend_t *r1, fs; 1346 rend_t *r1, fs;
1273 1347
1274 want_refresh = 1; 1348 want_refresh = 1;
1349 ZERO_SCROLLBACK ();
1350
1275 num_scr_allow = 0; 1351 num_scr_allow = 0;
1276 ZERO_SCROLLBACK ();
1277 selection_check (3); 1352 selection_check (3);
1278 1353
1279 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1280 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1281 { 1356 {
… …
1291 * Insert/Delete <count> lines 1366 * Insert/Delete <count> lines
1292 */ 1367 */
1293void 1368void
1294rxvt_term::scr_insdel_lines (int count, int insdel) 1369rxvt_term::scr_insdel_lines (int count, int insdel)
1295{ 1370{
1296 int end; 1371 int end;
1297 1372
1298 ZERO_SCROLLBACK (); 1373 ZERO_SCROLLBACK ();
1299 1374
1300 selection_check (1); 1375 selection_check (1);
1301 1376
… …
1308 if (insdel == DELETE) 1383 if (insdel == DELETE)
1309 return; 1384 return;
1310 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1311 count = end; 1386 count = end;
1312 } 1387 }
1313 screen.flags &= ~Screen_WrapNext; 1388
1389 scr_do_wrap ();
1314 1390
1315 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1316} 1392}
1317 1393
1318/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
… …
1320 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
1321 */ 1397 */
1322void 1398void
1323rxvt_term::scr_insdel_chars (int count, int insdel) 1399rxvt_term::scr_insdel_chars (int count, int insdel)
1324{ 1400{
1325 int col, row; 1401 int col, row;
1326 rend_t tr; 1402 rend_t tr;
1327 text_t *stp; 1403 text_t *stp;
1328 rend_t *srp; 1404 rend_t *srp;
1329 int16_t *slp; 1405 int16_t *slp;
1330 1406
1331 want_refresh = 1; 1407 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1333 1409
1334 if (count <= 0) 1410 if (count <= 0)
1335 return; 1411 return;
1336 1412
1413 scr_do_wrap ();
1414
1337 selection_check (1); 1415 selection_check (1);
1338 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1416 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1339 1417
1340 row = screen.cur.row + TermWin.saveLines; 1418 row = screen.cur.row + TermWin.saveLines;
1341 screen.flags &= ~Screen_WrapNext;
1342 1419
1343 stp = screen.text[row]; 1420 stp = screen.text[row];
1344 srp = screen.rend[row]; 1421 srp = screen.rend[row];
1345 slp = & (screen.tlen[row]); 1422 slp = &screen.tlen[row];
1423
1346 switch (insdel) 1424 switch (insdel)
1347 { 1425 {
1348 case INSERT: 1426 case INSERT:
1349 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1350 col--) 1428 col--)
1351 { 1429 {
1352 stp[col] = stp[col - count]; 1430 stp[col] = stp[col - count];
1353 srp[col] = srp[col - count]; 1431 srp[col] = srp[col - count];
1354 } 1432 }
1433
1355 if (*slp != -1) 1434 if (*slp != -1)
1356 { 1435 {
1357 *slp += count; 1436 *slp += count;
1358 MIN_IT (*slp, TermWin.ncol); 1437 MIN_IT (*slp, TermWin.ncol);
1359 } 1438 }
1439
1360 if (selection.op && current_screen == selection.screen 1440 if (selection.op && current_screen == selection.screen
1361 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1441 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1362 { 1442 {
1363 if (selection.end.row != screen.cur.row 1443 if (selection.end.row != screen.cur.row
1364 || (selection.end.col + count >= TermWin.ncol)) 1444 || (selection.end.col + count >= TermWin.ncol))
… …
1368 selection.beg.col += count; 1448 selection.beg.col += count;
1369 selection.mark.col += count; /* XXX: yes? */ 1449 selection.mark.col += count; /* XXX: yes? */
1370 selection.end.col += count; 1450 selection.end.col += count;
1371 } 1451 }
1372 } 1452 }
1453
1373 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1454 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1374 (unsigned int)count, rstyle); 1455 (unsigned int)count, rstyle);
1375 break; 1456 break;
1457
1376 case ERASE: 1458 case ERASE:
1377 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1459 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1378 selection_check (1); 1460 selection_check (1);
1379 screen.cur.col -= count; 1461 screen.cur.col -= count;
1380 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1462 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1381 (unsigned int)count, rstyle); 1463 (unsigned int)count, rstyle);
1382 break; 1464 break;
1465
1383 case DELETE: 1466 case DELETE:
1384 tr = srp[TermWin.ncol - 1]
1385 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1467 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1468
1386 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1469 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1387 { 1470 {
1388 stp[col] = stp[col + count]; 1471 stp[col] = stp[col + count];
1389 srp[col] = srp[col + count]; 1472 srp[col] = srp[col + count];
1390 } 1473 }
1474
1391 scr_blank_line (& (stp[TermWin.ncol - count]), 1475 scr_blank_line (& (stp[TermWin.ncol - count]),
1392 & (srp[TermWin.ncol - count]), 1476 & (srp[TermWin.ncol - count]),
1393 (unsigned int)count, tr); 1477 (unsigned int)count, tr);
1478
1394 if (*slp == -1) /* break line continuation */ 1479 if (*slp == -1) /* break line continuation */
1395 *slp = TermWin.ncol; 1480 *slp = TermWin.ncol;
1481
1396 *slp -= count; 1482 *slp -= count;
1397 MAX_IT (*slp, 0); 1483 MAX_IT (*slp, 0);
1484
1398 if (selection.op && current_screen == selection.screen 1485 if (selection.op && current_screen == selection.screen
1399 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1400 { 1487 {
1401 if (selection.end.row != screen.cur.row 1488 if (selection.end.row != screen.cur.row
1402 || (screen.cur.col >= selection.beg.col - count) 1489 || (screen.cur.col >= selection.beg.col - count)
… …
1408 selection.beg.col -= count; 1495 selection.beg.col -= count;
1409 selection.mark.col -= count; /* XXX: yes? */ 1496 selection.mark.col -= count; /* XXX: yes? */
1410 selection.end.col -= count; 1497 selection.end.col -= count;
1411 } 1498 }
1412 } 1499 }
1500
1413 break; 1501 break;
1414 } 1502 }
1415} 1503}
1416 1504
1417/* ------------------------------------------------------------------------- */ 1505/* ------------------------------------------------------------------------- */
… …
1422void 1510void
1423rxvt_term::scr_scroll_region (int top, int bot) 1511rxvt_term::scr_scroll_region (int top, int bot)
1424{ 1512{
1425 MAX_IT (top, 0); 1513 MAX_IT (top, 0);
1426 MIN_IT (bot, (int)TermWin.nrow - 1); 1514 MIN_IT (bot, (int)TermWin.nrow - 1);
1515
1427 if (top > bot) 1516 if (top > bot)
1428 return; 1517 return;
1518
1429 screen.tscroll = top; 1519 screen.tscroll = top;
1430 screen.bscroll = bot; 1520 screen.bscroll = bot;
1431 scr_gotorc (0, 0, 0); 1521 scr_gotorc (0, 0, 0);
1432} 1522}
1433 1523
… …
1439 */ 1529 */
1440void 1530void
1441rxvt_term::scr_cursor_visible (int mode) 1531rxvt_term::scr_cursor_visible (int mode)
1442{ 1532{
1443 want_refresh = 1; 1533 want_refresh = 1;
1534
1444 if (mode) 1535 if (mode)
1445 screen.flags |= Screen_VisibleCursor; 1536 screen.flags |= Screen_VisibleCursor;
1446 else 1537 else
1447 screen.flags &= ~Screen_VisibleCursor; 1538 screen.flags &= ~Screen_VisibleCursor;
1448} 1539}
… …
1457rxvt_term::scr_autowrap (int mode) 1548rxvt_term::scr_autowrap (int mode)
1458{ 1549{
1459 if (mode) 1550 if (mode)
1460 screen.flags |= Screen_Autowrap; 1551 screen.flags |= Screen_Autowrap;
1461 else 1552 else
1462 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1463} 1554}
1464 1555
1465/* ------------------------------------------------------------------------- */ 1556/* ------------------------------------------------------------------------- */
1466/* 1557/*
1467 * Set/unset margin origin mode 1558 * Set/unset margin origin mode
… …
1506 */ 1597 */
1507void 1598void
1508rxvt_term::scr_set_tab (int mode) 1599rxvt_term::scr_set_tab (int mode)
1509{ 1600{
1510 if (mode < 0) 1601 if (mode < 0)
1511 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1602 memset (tabs, 0, TermWin.ncol * sizeof (char));
1512 else if (screen.cur.col < TermWin.ncol) 1603 else if (screen.cur.col < TermWin.ncol)
1513 tabs[screen.cur.col] = (mode ? 1 : 0); 1604 tabs[screen.cur.col] = (mode ? 1 : 0);
1514} 1605}
1515 1606
1516/* ------------------------------------------------------------------------- */ 1607/* ------------------------------------------------------------------------- */
… …
1520 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1611 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1521 */ 1612 */
1522void 1613void
1523rxvt_term::scr_rvideo_mode (int mode) 1614rxvt_term::scr_rvideo_mode (int mode)
1524{ 1615{
1525 XGCValues gcvalue; 1616 XGCValues gcvalue;
1526 1617
1527 if (rvideo != mode) 1618 if (rvideo != mode)
1528 { 1619 {
1529 rvideo = mode; 1620 rvideo = mode;
1530 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1531#if defined(XPM_BACKGROUND) 1622#if defined(XPM_BACKGROUND)
1532 if (bgPixmap.pixmap == None) 1623 if (bgPixmap.pixmap == None)
1533#endif 1624#endif
1534#if defined(TRANSPARENT) 1625#if defined(TRANSPARENT)
1535 if (! (Options & Opt_transparent) || am_transparent == 0) 1626 if (! (options & Opt_transparent) || am_transparent == 0)
1536#endif 1627#endif
1537 XSetWindowBackground (display->display, TermWin.vt, 1628 XSetWindowBackground (display->display, TermWin.vt,
1538 PixColors[Color_bg]); 1629 pix_colors[Color_bg]);
1539 1630
1540 gcvalue.foreground = PixColors[Color_fg]; 1631 gcvalue.foreground = pix_colors[Color_fg];
1541 gcvalue.background = PixColors[Color_bg]; 1632 gcvalue.background = pix_colors[Color_bg];
1542 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1633 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1543 &gcvalue); 1634 &gcvalue);
1544 scr_clear (); 1635 scr_clear ();
1545 scr_touch (true); 1636 scr_touch (true);
1546 } 1637 }
… …
1662 row_col_t rc[RC_COUNT]; 1753 row_col_t rc[RC_COUNT];
1663 1754
1664 if (drawn_text == NULL) /* sanity check */ 1755 if (drawn_text == NULL) /* sanity check */
1665 return; 1756 return;
1666 1757
1758#ifndef NO_SLOW_LINK_SUPPORT
1759 if (refresh_type == FAST_REFRESH && !display->is_local)
1760 {
1761 y = 0;
1762 height = TermWin.height;
1763 }
1764#endif
1765
1667#ifdef DEBUG_STRICT 1766#ifdef DEBUG_STRICT
1668 x = max (x, (int)TermWin.int_bwidth); 1767 x = max (x, 0);
1669 x = min (x, (int)TermWin.width); 1768 x = min (x, (int)TermWin.width);
1670 y = max (y, (int)TermWin.int_bwidth); 1769 y = max (y, 0);
1671 y = min (y, (int)TermWin.height); 1770 y = min (y, (int)TermWin.height);
1672#endif 1771#endif
1673 1772
1674 /* round down */ 1773 /* round down */
1675 rc[PART_BEG].col = Pixel2Col (x); 1774 rc[PART_BEG].col = Pixel2Col (x);
… …
1683 { 1782 {
1684 MIN_IT (rc[i].col, TermWin.ncol - 1); 1783 MIN_IT (rc[i].col, TermWin.ncol - 1);
1685 MIN_IT (rc[i].row, TermWin.nrow - 1); 1784 MIN_IT (rc[i].row, TermWin.nrow - 1);
1686 } 1785 }
1687 1786
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++) 1787 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1691 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1788 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 1789
1694 if (refresh) 1790 if (refresh)
1695 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1791 scr_refresh (SLOW_REFRESH);
1696} 1792}
1697 1793
1698/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
1699/* 1795/*
1700 * Refresh the entire screen 1796 * Refresh the entire screen
… …
1715{ 1811{
1716 long p = 0; 1812 long p = 0;
1717 uint16_t oldviewstart; 1813 uint16_t oldviewstart;
1718 1814
1719 oldviewstart = TermWin.view_start; 1815 oldviewstart = TermWin.view_start;
1816
1720 if (y < len) 1817 if (y < len)
1721 { 1818 {
1722 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1723 p -= (long) (TermWin.nrow - 1); 1820 p -= (long) (TermWin.nrow - 1);
1724 p = max (p, 0); 1821 p = max (p, 0);
1725 } 1822 }
1823
1726 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1727 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1728 1825
1729 return scr_changeview (oldviewstart); 1826 return scr_changeview (oldviewstart);
1730} 1827}
1731 1828
1732/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
… …
1735 * direction should be UP or DN 1832 * direction should be UP or DN
1736 */ 1833 */
1737int 1834int
1738rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines)
1739{ 1836{
1740 int n; 1837 int n;
1741 uint16_t oldviewstart; 1838 uint16_t oldviewstart;
1742 1839
1743 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1744#ifdef DEBUG_STRICT 1840#ifdef DEBUG_STRICT
1745 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1746#endif 1842#endif
1747 oldviewstart = TermWin.view_start; 1843 oldviewstart = TermWin.view_start;
1748 if (direction == UP) 1844 if (direction == UP)
… …
1764 if (TermWin.view_start != oldviewstart) 1860 if (TermWin.view_start != oldviewstart)
1765 { 1861 {
1766 want_refresh = 1; 1862 want_refresh = 1;
1767 num_scr -= (TermWin.view_start - oldviewstart); 1863 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1864 }
1865
1769 return (int) (TermWin.view_start - oldviewstart); 1866 return (int) (TermWin.view_start - oldviewstart);
1770} 1867}
1771 1868
1772/* ------------------------------------------------------------------------- */ 1869/* ------------------------------------------------------------------------- */
1773void 1870void
1774rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1775{ 1872{
1776#ifndef NO_BELL 1873#ifndef NO_BELL
1777# ifndef NO_MAPALERT 1874# ifndef NO_MAPALERT
1778# ifdef MAPALERT_OPTION 1875# ifdef MAPALERT_OPTION
1779 if (Options & Opt_mapAlert) 1876 if (options & Opt_mapAlert)
1780# endif 1877# endif
1781 XMapWindow (display->display, TermWin.parent[0]); 1878 XMapWindow (display->display, TermWin.parent[0]);
1782# endif 1879# endif
1783 if (Options & Opt_visualBell) 1880 if (options & Opt_visualBell)
1784 { 1881 {
1785 scr_rvideo_mode (!rvideo); /* refresh also done */ 1882 scr_rvideo_mode (!rvideo); /* refresh also done */
1786 scr_rvideo_mode (!rvideo); /* refresh also done */ 1883 scr_rvideo_mode (!rvideo); /* refresh also done */
1787 } 1884 }
1788 else 1885 else
… …
1794/* ARGSUSED */ 1891/* ARGSUSED */
1795void 1892void
1796rxvt_term::scr_printscreen (int fullhist) 1893rxvt_term::scr_printscreen (int fullhist)
1797{ 1894{
1798#ifdef PRINTPIPE 1895#ifdef PRINTPIPE
1799 int i, r1, nrows, row_offset; 1896 int i, r1, nrows, row_offset;
1800 text_t *t; 1897 FILE *fd;
1801 FILE *fd;
1802 1898
1803 if ((fd = popen_printer ()) == NULL) 1899 if ((fd = popen_printer ()) == NULL)
1804 return; 1900 return;
1901
1805 nrows = TermWin.nrow; 1902 nrows = TermWin.nrow;
1806 row_offset = TermWin.saveLines; 1903 row_offset = TermWin.saveLines;
1904
1807 if (!fullhist) 1905 if (!fullhist)
1808 row_offset -= TermWin.view_start; 1906 row_offset -= TermWin.view_start;
1809 else 1907 else
1810 { 1908 {
1811 nrows += TermWin.nscrolled; 1909 nrows += TermWin.nscrolled;
1812 row_offset -= TermWin.nscrolled; 1910 row_offset -= TermWin.nscrolled;
1813 } 1911 }
1814 1912
1913 wctomb (0, 0);
1914
1815 for (r1 = 0; r1 < nrows; r1++) 1915 for (r1 = 0; r1 < nrows; r1++)
1816 { 1916 {
1817 t = screen.text[r1 + row_offset]; 1917 text_t *tp = screen.text[r1 + row_offset];
1818 for (i = TermWin.ncol - 1; i >= 0; i--) 1918 int len = screen.tlen[r1 + row_offset];
1819 if (!isspace (t[i])) 1919
1820 break; 1920 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1821 fprintf (fd, "%.*s\n", (i + 1), t); 1921 {
1922 char mb[MB_LEN_MAX];
1923 text_t t = *tp++;
1924 if (t == NOCHAR)
1925 continue;
1926
1927 len = wctomb (mb, t);
1928
1929 if (len <= 0)
1930 {
1931 mb[0] = ' ';
1932 len = 1;
1933 }
1934
1935 fwrite (mb, 1, len, fd);
1936 }
1937
1938 fputc ('\n', fd);
1822 } 1939 }
1940
1823 pclose_printer (fd); 1941 pclose_printer (fd);
1824#endif 1942#endif
1825} 1943}
1826 1944
1827/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
… …
1841 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1959 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1842 1960
1843void 1961void
1844rxvt_term::scr_refresh (unsigned char refresh_type) 1962rxvt_term::scr_refresh (unsigned char refresh_type)
1845{ 1963{
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 */ 1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1849 rvid, /* reverse video this position */ 1965 rvid, /* reverse video this position */
1850 showcursor; /* show the cursor */ 1966 showcursor; /* show the cursor */
1851 int16_t col, row, /* column/row we're processing */ 1967 int16_t col, row, /* column/row we're processing */
1852 ocrow; /* old cursor row */ 1968 ocrow; /* old cursor row */
1853 int i, /* tmp */ 1969 int i, /* tmp */
1854 row_offset; /* basic offset in screen structure */ 1970 row_offset; /* basic offset in screen structure */
1855#ifndef NO_CURSORCOLOR 1971#ifndef NO_CURSORCOLOR
1856 rend_t cc1; /* store colours at cursor position (s) */ 1972 rend_t cc1; /* store colours at cursor position (s) */
1857#endif 1973#endif
1858 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1974 rend_t *crp; // cursor rendition pointer
1859 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1860 1975
1861 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1976 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1862 return; 1977 return;
1863 1978
1864 /* 1979 /*
1865 * A: set up vars 1980 * A: set up vars
1866 */ 1981 */
1867 clearfirst = clearlast = must_clear = 0; 1982 must_clear = 0;
1868
1869 refresh_count = 0; 1983 refresh_count = 0;
1870 1984
1871 row_offset = TermWin.saveLines - TermWin.view_start; 1985 row_offset = TermWin.saveLines - TermWin.view_start;
1872
1873 if ((refresh_type & REFRESH_BOUNDS))
1874 {
1875 clearfirst = clearlast = 1;
1876 refresh_type &= ~REFRESH_BOUNDS;
1877 }
1878 1986
1879#ifdef XPM_BACKGROUND 1987#ifdef XPM_BACKGROUND
1880 must_clear |= (bgPixmap.pixmap != None); 1988 must_clear |= (bgPixmap.pixmap != None);
1881#endif 1989#endif
1882#ifdef TRANSPARENT 1990#ifdef TRANSPARENT
1883 must_clear |= ((Options & Opt_transparent) && am_transparent); 1991 must_clear |= ((options & Opt_transparent) && am_transparent);
1884#endif 1992#endif
1885 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1886 1994
1887 /* 1995 /*
1888 * B: reverse any characters which are selected 1996 * B: reverse any characters which are selected
1889 */ 1997 */
1890 scr_reverse_selection (); 1998 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
1891 2002
1892 /* 2003 /*
1893 * C: set the cursor character (s) 2004 * C: set the cursor character (s)
1894 */ 2005 */
1895 { 2006 {
1896 unsigned char setoldcursor; 2007 unsigned char setoldcursor;
1897 rend_t ccol1, /* Cursor colour */ 2008 rend_t ccol1, /* Cursor colour */
1898 ccol2; /* Cursor colour2 */ 2009 ccol2; /* Cursor colour2 */
1899 2010
1900 showcursor = (screen.flags & Screen_VisibleCursor); 2011 showcursor = (screen.flags & Screen_VisibleCursor);
1901#ifdef CURSOR_BLINK 2012#ifdef CURSOR_BLINK
1902 if (hidden_cursor) 2013 if (hidden_cursor)
1903 showcursor = 0; 2014 showcursor = 0;
1904#endif 2015#endif
1905 2016
1906 if (showcursor) 2017 if (showcursor)
1907 { 2018 {
2019 int col = screen.cur.col;
2020
2021 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2022 col--;
2023
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1909 [screen.cur.col]);
1910 2025
1911 if (showcursor && TermWin.focus) 2026 if (showcursor && TermWin.focus)
1912 { 2027 {
1913 *srp ^= RS_RVid; 2028 *crp ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1915 cc1 = *srp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
1916 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
1917 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
1918 else 2033 else
1919#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1920 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = GET_FGCOLOR (rstyle);
… …
1927#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1928 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = GET_BGCOLOR (rstyle);
1929#else 2044#else
1930 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
1931#endif 2046#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
1934#endif 2049#endif
1935 } 2050 }
1936 } 2051 }
1937 2052
1938 /* make sure no outline cursor is left around */ 2053 /* make sure no outline cursor is left around */
… …
1942 if (screen.cur.row + TermWin.view_start != ocrow 2057 if (screen.cur.row + TermWin.view_start != ocrow
1943 || screen.cur.col != oldcursor.col) 2058 || screen.cur.col != oldcursor.col)
1944 { 2059 {
1945 if (ocrow < TermWin.nrow 2060 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) 2061 && oldcursor.col < TermWin.ncol)
1947 {
1948 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2062 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1949 } 2063
1950 if (TermWin.focus || !showcursor) 2064 if (TermWin.focus || !showcursor)
1951 oldcursor.row = -1; 2065 oldcursor.row = -1;
1952 else 2066 else
1953 setoldcursor = 1; 2067 setoldcursor = 1;
1954 } 2068 }
1955 } 2069 }
1956 else if (!TermWin.focus) 2070 else if (!TermWin.focus)
1957 setoldcursor = 1; 2071 setoldcursor = 1;
2072
1958 if (setoldcursor) 2073 if (setoldcursor)
1959 { 2074 {
1960 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2075 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1961 oldcursor.row = -1; 2076 oldcursor.row = -1;
1962 else 2077 else
… …
1965 oldcursor.col = screen.cur.col; 2080 oldcursor.col = screen.cur.col;
1966 } 2081 }
1967 } 2082 }
1968 } 2083 }
1969 2084
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1970#ifndef NO_SLOW_LINK_SUPPORT 2087#ifndef NO_SLOW_LINK_SUPPORT
1971 /* 2088 /*
1972 * D: CopyArea pass - very useful for slower links 2089 * D: CopyArea pass - very useful for slower links
1973 * This has been deliberately kept simple. 2090 * This has been deliberately kept simple.
1974 */ 2091 */
1975 i = num_scr; 2092 i = num_scr;
2093 if (!display->is_local
1976 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2094 && refresh_type == FAST_REFRESH && num_scr_allow && i
1977 && abs (i) < TermWin.nrow && !must_clear) 2095 && abs (i) < TermWin.nrow && !must_clear)
1978 { 2096 {
1979 int16_t nits; 2097 int16_t nits;
1980 int j; 2098 int j;
1981 rend_t *drp2;
1982 text_t *dtp2;
1983 int len, wlen; 2099 int len, wlen;
1984 2100
1985 j = TermWin.nrow; 2101 j = TermWin.nrow;
1986 wlen = len = -1; 2102 wlen = len = -1;
1987 row = i > 0 ? 0 : j - 1; 2103 row = i > 0 ? 0 : j - 1;
1988 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2104 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1989 { 2105 {
1990 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2106 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
1991 { 2107 {
1992 stp = screen.text[row + row_offset]; 2108 text_t *stp = screen.text[row + row_offset];
1993 srp = screen.rend[row + row_offset]; 2109 rend_t *srp = screen.rend[row + row_offset];
1994 dtp = drawn_text[row]; 2110 text_t *dtp = drawn_text[row];
1995 dtp2 = drawn_text[row + i]; 2111 text_t *dtp2 = drawn_text[row + i];
1996 drp = drawn_rend[row]; 2112 rend_t *drp = drawn_rend[row];
1997 drp2 = drawn_rend[row + i]; 2113 rend_t *drp2 = drawn_rend[row + i];
1998 2114
1999 for (nits = 0, col = TermWin.ncol; col--; ) 2115 for (nits = 0, col = TermWin.ncol; col--; )
2000 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2116 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2001 nits--; 2117 nits--;
2002 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2118 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2022 { 2138 {
2023 /* also comes here at end if needed because of >= above */ 2139 /* also comes here at end if needed because of >= above */
2024 if (wlen < len) 2140 if (wlen < len)
2025 SWAP_IT (wlen, len, int); 2141 SWAP_IT (wlen, len, int);
2026 2142
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, 2143 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2029 TermWin.gc, 0, Row2Pixel (len + i), 2144 TermWin.gc, 0, Row2Pixel (len + i),
2030 (unsigned int)TermWin_TotalWidth (), 2145 (unsigned int)TermWin_TotalWidth (),
2031 (unsigned int)Height2Pixel (wlen - len + 1), 2146 (unsigned int)Height2Pixel (wlen - len + 1),
2032 0, Row2Pixel (len)); 2147 0, Row2Pixel (len));
… …
2039 /* 2154 /*
2040 * E: main pass across every character 2155 * E: main pass across every character
2041 */ 2156 */
2042 for (row = 0; row < TermWin.nrow; row++) 2157 for (row = 0; row < TermWin.nrow; row++)
2043 { 2158 {
2044 stp = screen.text[row + row_offset]; 2159 text_t *stp = screen.text[row + row_offset];
2045 srp = screen.rend[row + row_offset]; 2160 rend_t *srp = screen.rend[row + row_offset];
2046 dtp = drawn_text[row]; 2161 text_t *dtp = drawn_text[row];
2047 drp = drawn_rend[row]; 2162 rend_t *drp = drawn_rend[row];
2048 2163
2049 /* 2164 /*
2050 * E2: OK, now the real pass 2165 * E2: OK, now the real pass
2051 */ 2166 */
2052 int ypixel = (int)Row2Pixel (row); 2167 int ypixel = (int)Row2Pixel (row);
2053 2168
2054 for (col = 0; col < TermWin.ncol; col++) 2169 for (col = 0; col < TermWin.ncol; col++)
2055 { 2170 {
2056 /* compare new text with old - if exactly the same then continue */ 2171 /* compare new text with old - if exactly the same then continue */
2172 if (stp[col] == dtp[col] /* Must match characters to skip. */
2173 && (srp[col] == drp[col] /* Either rendition the same or */
2174 || (stp[col] == ' ' /* space w/ no background change */
2175 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2176 continue;
2177
2178 // redraw one or more characters
2179
2180 // seek to the beginning if wide characters
2181 while (stp[col] == NOCHAR && col > 0)
2182 --col;
2183
2057 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2184 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; 2185 text_t *text = stp + col;
2066 int count = 1; 2186 int count = 1;
2067 2187
2068 /* redraw one or more characters */
2069
2070 dtp[col] = stp[col]; 2188 dtp[col] = stp[col];
2071 drp[col] = rend; 2189 drp[col] = rend;
2072
2073 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2074 continue;
2075 2190
2076 int xpixel = Col2Pixel (col); 2191 int xpixel = Col2Pixel (col);
2077 2192
2078 // this loop looks very messy, it can probably be optimized 2193 // this loop looks very messy, it can probably be optimized
2079 // and cleaned a bit by you? 2194 // and cleaned a bit by you?
… …
2082 if (stp[col] == NOCHAR) 2197 if (stp[col] == NOCHAR)
2083 { 2198 {
2084 dtp[col] = stp[col]; 2199 dtp[col] = stp[col];
2085 drp[col] = rend; 2200 drp[col] = rend;
2086 count++; 2201 count++;
2087
2088 if (i) // only possible skip if char unchanged
2089 i++; 2202 i++;
2090 2203
2091 continue; 2204 continue;
2092 } 2205 }
2093 2206
2094 if (rend != srp[col]) 2207 if (rend != srp[col])
… …
2097 count++; 2210 count++;
2098 2211
2099 if (stp[col] != dtp[col] 2212 if (stp[col] != dtp[col]
2100 || srp[col] != drp[col]) 2213 || srp[col] != drp[col])
2101 { 2214 {
2102 if (must_clear && (i++ > (count / 2))) 2215 if (must_clear && (i++ > count / 2))
2103 break; 2216 break;
2104 2217
2105 dtp[col] = stp[col]; 2218 dtp[col] = stp[col];
2106 drp[col] = rend; 2219 drp[col] = rend;
2107 i = 0; 2220 i = 0;
2108 } 2221 }
2109 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2222 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2110 break; 2223 break;
2111 } 2224 }
2112 2225
2113 col--; /* went one too far. move back */ 2226 col--; /* went one too far. move back */
2114 count -= i; /* dump any matching trailing chars */ 2227 count -= i; /* dump any matching trailing chars */
2228
2229 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR)
2231 count++, i--;
2115 2232
2116 /* 2233 /*
2117 * Determine the attributes for the string 2234 * Determine the attributes for the string
2118 */ 2235 */
2119 int fid = GET_FONT (rend); 2236 int fid = GET_FONT (rend);
… …
2123 rend = GET_ATTR (rend); 2240 rend = GET_ATTR (rend);
2124 2241
2125 rvid = !!(rend & RS_RVid); 2242 rvid = !!(rend & RS_RVid);
2126 2243
2127#ifndef NO_BOLD_UNDERLINE_REVERSE 2244#ifndef NO_BOLD_UNDERLINE_REVERSE
2128 if (rend & RS_Bold && fore == Color_fg) 2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))
2129 { 2246 {
2130 if (ISSET_PIXCOLOR (Color_BD)) 2247 if (ISSET_PIXCOLOR (Color_BD))
2131 fore = Color_BD; 2248 fore = Color_BD;
2132 else 2249 else
2133 rvid = !rvid; 2250 rvid = !rvid;
2134 } 2251 }
2135 2252
2136 if (rend & RS_Uline) 2253 if (rend & RS_Uline)
2137 {
2138 if (ISSET_PIXCOLOR (Color_UL)) 2254 if (ISSET_PIXCOLOR (Color_UL))
2139 fore = Color_UL; 2255 fore = Color_UL;
2140 }
2141#endif 2256#endif
2142 2257
2143 if (rvid) 2258 if (rvid)
2144 { 2259 {
2145 SWAP_IT (fore, back, int); 2260 SWAP_IT (fore, back, int);
… …
2153 back = Color_RV; 2268 back = Color_RV;
2154#endif 2269#endif
2155 } 2270 }
2156 2271
2157#ifdef TEXT_BLINK 2272#ifdef TEXT_BLINK
2158 if (rend & RS_Blink) 2273 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2159 { 2274 {
2160 if (!text_blink_ev.active) 2275 if (!text_blink_ev.active)
2161 { 2276 {
2162 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2277 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2163 hidden_text = 0; 2278 hidden_text = 0;
… …
2193 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2308 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2194 } 2309 }
2195 else 2310 else
2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2311 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2197 2312
2198 if ((rend & RS_Uline) && (font->descent > 1)) 2313 if (rend & RS_Uline && font->descent > 1 && fore != back)
2199 XDrawLine (display->display, drawBuffer, TermWin.gc, 2314 XDrawLine (display->display, drawBuffer, TermWin.gc,
2200 xpixel, ypixel + font->ascent + 1, 2315 xpixel, ypixel + font->ascent + 1,
2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2316 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2202 } /* for (col....) */ 2317 } /* for (col....) */
2203 } /* for (row....) */ 2318 } /* for (row....) */
2204 2319
2205 /* 2320 /*
2206 * G: cleanup cursor and display outline cursor if necessary 2321 * G: cleanup cursor and display outline cursor if necessary
2207 */ 2322 */
2208 if (showcursor) 2323 if (showcursor)
2209 { 2324 {
2210 if (TermWin.focus) 2325 if (TermWin.focus)
2211 { 2326 {
2212 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2213 [screen.cur.col]);
2214 *srp ^= RS_RVid; 2327 *crp ^= RS_RVid;
2215#ifndef NO_CURSORCOLOR 2328#ifndef NO_CURSORCOLOR
2216 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2217#endif 2330#endif
2218 } 2331 }
2219 else if (oldcursor.row >= 0) 2332 else if (oldcursor.row >= 0)
2220 { 2333 {
2221#ifndef NO_CURSORCOLOR 2334#ifndef NO_CURSORCOLOR
2222 if (ISSET_PIXCOLOR (Color_cursor)) 2335 if (ISSET_PIXCOLOR (Color_cursor))
2223 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2224#endif 2337#endif
2225 int cursorwidth = 1; 2338 int cursorwidth = 1;
2226 while (oldcursor.col + cursorwidth < TermWin.ncol 2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++; 2341 cursorwidth++;
2229 2342
2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2343 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2231 Col2Pixel (oldcursor.col), 2344 Col2Pixel (oldcursor.col),
2232 Row2Pixel (oldcursor.row), 2345 Row2Pixel (oldcursor.row),
2233 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2346 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2347 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2235 } 2348 }
2236 } 2349 }
2237 2350
2238 /* 2351 /*
2239 * H: cleanup selection 2352 * H: cleanup selection
2240 */ 2353 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2241 scr_reverse_selection (); 2357 scr_reverse_selection ();
2242 2358
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) 2359 if (refresh_type & SMOOTH_REFRESH)
2264 XSync (display->display, False); 2360 XFlush (display->display);
2265 2361
2266 num_scr = 0; 2362 num_scr = 0;
2267 num_scr_allow = 1; 2363 num_scr_allow = 1;
2268 want_refresh = 0; /* screen is current */ 2364 want_refresh = 0; /* screen is current */
2269} 2365}
… …
2291 } 2387 }
2292} 2388}
2293 2389
2294/* ------------------------------------------------------------------------- */ 2390/* ------------------------------------------------------------------------- */
2295void 2391void
2296rxvt_term::scr_clear () 2392rxvt_term::scr_clear (bool really)
2297{ 2393{
2298 if (!TermWin.mapped) 2394 if (!TermWin.mapped)
2299 return; 2395 return;
2300 2396
2301 num_scr_allow = 0; 2397 num_scr_allow = 0;
2302 want_refresh = 1; 2398 want_refresh = 1;
2399
2303#ifdef TRANSPARENT 2400#ifdef TRANSPARENT
2304 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2305 { 2402 {
2306 int i; 2403 int i;
2307 2404
2308 if (! (Options & Opt_transparent_all)) 2405 if (! (options & Opt_transparent_all))
2309 i = 0; 2406 i = 0;
2310 else 2407 else
2311 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2312 2409
2313 while (i--) 2410 while (i--)
2314 if (TermWin.parent[i] != None) 2411 if (TermWin.parent[i] != None)
2315 XClearWindow (display->display, TermWin.parent[i]); 2412 XClearWindow (display->display, TermWin.parent[i]);
2316 } 2413 }
2317#endif 2414#endif
2318 2415
2416 if (really)
2319 XClearWindow (display->display, TermWin.vt); 2417 XClearWindow (display->display, TermWin.vt);
2320} 2418}
2321 2419
2322/* ------------------------------------------------------------------------- */ 2420/* ------------------------------------------------------------------------- */
2323void 2421void
2324rxvt_term::scr_reverse_selection () 2422rxvt_term::scr_reverse_selection ()
2325{ 2423{
2326 int i, col, row, end_row;
2327 rend_t *srp;
2328
2329 if (selection.op && current_screen == selection.screen) 2424 if (selection.op && current_screen == selection.screen)
2330 { 2425 {
2331 end_row = TermWin.saveLines - TermWin.view_start; 2426 int end_row = TermWin.saveLines - TermWin.view_start;
2332 i = selection.beg.row + TermWin.saveLines; 2427 int i = selection.beg.row + TermWin.saveLines;
2333 row = selection.end.row + TermWin.saveLines; 2428 int col, row = selection.end.row + TermWin.saveLines;
2429 rend_t *srp;
2430
2334 if (i >= end_row) 2431 if (i >= end_row)
2335 col = selection.beg.col; 2432 col = selection.beg.col;
2336 else 2433 else
2337 { 2434 {
2338 col = 0; 2435 col = 0;
2339 i = end_row; 2436 i = end_row;
2340 } 2437 }
2438
2341 end_row += TermWin.nrow; 2439 end_row += TermWin.nrow;
2342 for (; i < row && i < end_row; i++, col = 0) 2440 for (; i < row && i < end_row; i++, col = 0)
2343 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2441 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2344 srp[col] ^= RS_RVid; 2442 srp[col] ^= RS_RVid;
2443
2345 if (i == row && i < end_row) 2444 if (i == row && i < end_row)
2346 for (srp = screen.rend[i]; col < selection.end.col; col++) 2445 for (srp = screen.rend[i]; col < selection.end.col; col++)
2347 srp[col] ^= RS_RVid; 2446 srp[col] ^= RS_RVid;
2348 } 2447 }
2349} 2448}
… …
2388 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2487 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2389 */ 2488 */
2390void 2489void
2391rxvt_term::selection_check (int check_more) 2490rxvt_term::selection_check (int check_more)
2392{ 2491{
2393 row_col_t pos; 2492 row_col_t pos;
2394 2493
2395 if (!selection.op) 2494 if (!selection.op)
2396 return; 2495 return;
2397 2496
2398 pos.row = pos.col = 0; 2497 pos.row = pos.col = 0;
… …
2425rxvt_term::paste (const unsigned char *data, unsigned int len) 2524rxvt_term::paste (const unsigned char *data, unsigned int len)
2426{ 2525{
2427 unsigned int i, j, n; 2526 unsigned int i, j, n;
2428 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2429 2528
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 */ 2529 /* convert normal newline chars into common keyboard Return key sequence */
2436 for (i = 0; i < len; i += PROP_SIZE) 2530 for (i = 0; i < len; i += PROP_SIZE)
2437 { 2531 {
2438 n = min (len - i, PROP_SIZE); 2532 n = min (len - i, PROP_SIZE);
2439 MEMCPY (ds, data + i, n); 2533 memcpy (ds, data + i, n);
2440 2534
2441 for (j = 0; j < n; j++) 2535 for (j = 0; j < n; j++)
2442 if (ds[j] == '\n') 2536 if (ds[j] == C0_LF)
2443 ds[j] = '\r'; 2537 ds[j] = C0_CR;
2444 2538
2445 tt_write (ds, (int)n); 2539 tt_write (ds, (int)n);
2446 } 2540 }
2447 2541
2448 free (ds); 2542 free (ds);
… …
2457rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2458{ 2552{
2459 long nread = 0; 2553 long nread = 0;
2460 unsigned long bytes_after; 2554 unsigned long bytes_after;
2461 XTextProperty ct; 2555 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 2556
2465 if (prop == None) /* check for failed XConvertSelection */ 2557 if (prop == None) /* check for failed XConvertSelection */
2466 { 2558 {
2467 if ((selection_type & Sel_CompoundText)) 2559 if ((selection_type & Sel_CompoundText))
2468 { 2560 {
… …
2488 } 2580 }
2489 2581
2490 for (;;) 2582 for (;;)
2491 { 2583 {
2492 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2584 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2493 (long) (PROP_SIZE / 4), delete_prop, 2585 (long) (PROP_SIZE / 4), delete_prop,
2494 AnyPropertyType, &ct.encoding, &ct.format, 2586 AnyPropertyType, &ct.encoding, &ct.format,
2495 &ct.nitems, &bytes_after, 2587 &ct.nitems, &bytes_after,
2496 &ct.value) != Success) 2588 &ct.value) != Success)
2497 break; 2589 break;
2498 2590
2499 if (ct.encoding == 0) 2591 if (ct.encoding == 0)
2592 break;
2593
2594 if (ct.encoding == xa[XA_INCR])
2500 { 2595 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2596 // INCR selection, start handshake
2597 XDeleteProperty (display->display, win, prop);
2598 selection_wait = Sel_incr;
2599 incr_ev.start (NOW + 10);
2502 break; 2600 break;
2503 } 2601 }
2504 2602
2505 if (ct.value == NULL) 2603 if (ct.value == NULL)
2506 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2508 continue; 2604 continue;
2509 }
2510 2605
2511 if (ct.nitems == 0) 2606 if (ct.nitems == 0)
2512 { 2607 {
2513 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2514 if (selection_wait == Sel_normal && nread == 0) 2608 if (selection_wait == Sel_normal && nread == 0
2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2515 { 2610 {
2516 /* 2611 /*
2517 * pass through again trying CUT_BUFFER0 if we've come from 2612 * pass through again trying CUT_BUFFER0 if we've come from
2518 * XConvertSelection () but nothing was presented 2613 * XConvertSelection () but nothing was presented
2519 */ 2614 */
2520 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2521 selection_paste (display->root, XA_CUT_BUFFER0, False); 2615 selection_paste (display->root, XA_CUT_BUFFER0, False);
2522 } 2616 }
2523 2617
2524 nread = -1; /* discount any previous stuff */ 2618 nread = -1; /* discount any previous stuff */
2525 break; 2619 break;
… …
2527 2621
2528 nread += ct.nitems; 2622 nread += ct.nitems;
2529 2623
2530 char **cl; 2624 char **cl;
2531 int cr; 2625 int cr;
2532 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2533 &cr) >= 0 && cl)
2534 { 2627 {
2535 for (int i = 0; i < cr; i++) 2628 for (int i = 0; i < cr; i++)
2536 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2629 paste ((unsigned char *)cl[i], strlen (cl[i]));
2537 2630
2538 XFreeStringList (cl); 2631 XFreeStringList (cl);
2539 } 2632 }
2540 else 2633 else
2541 paste (ct.value, ct.nitems); 2634 paste (ct.value, ct.nitems);
… …
2550 XFree (ct.value); 2643 XFree (ct.value);
2551 2644
2552 if (selection_wait == Sel_normal) 2645 if (selection_wait == Sel_normal)
2553 selection_wait = Sel_none; 2646 selection_wait = Sel_none;
2554 2647
2555 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2556 return (int)nread; 2648 return (int)nread;
2557} 2649}
2558 2650
2559void 2651void
2560rxvt_term::incr_cb (time_watcher &w) 2652rxvt_term::incr_cb (time_watcher &w)
2561{ 2653{
2562 selection_wait = Sel_none; 2654 selection_wait = Sel_none;
2563 2655
2564 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2656 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2565} 2657}
2566 2658
2567/* 2659/*
2568 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2569 */ 2661 */
2570void 2662void
2571rxvt_term::selection_property (Window win, Atom prop) 2663rxvt_term::selection_property (Window win, Atom prop)
2572{ 2664{
2573 int reget_time = 0; 2665 if (prop == None || selection_wait != Sel_incr)
2574
2575 if (prop == None)
2576 return; 2666 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 2667
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) 2668 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); 2669 incr_ev.start (NOW + 10);
2670 else
2671 {
2672 selection_wait = Sel_none;
2673 incr_ev.stop ();
2674 }
2616} 2675}
2676
2617/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2618/* 2678/*
2619 * Request the current selection: 2679 * Request the current selection:
2620 * Order: > internal selection if available 2680 * Order: > internal selection if available
2621 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2681 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2625 * EXT: button 2 release 2685 * EXT: button 2 release
2626 */ 2686 */
2627void 2687void
2628rxvt_term::selection_request (Time tm, int x, int y) 2688rxvt_term::selection_request (Time tm, int x, int y)
2629{ 2689{
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) 2690 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2632 return; /* outside window */ 2691 return; /* outside window */
2633 2692
2634 if (selection.text != NULL) 2693 if (selection.text)
2635 { /* internal selection */ 2694 { /* internal selection */
2636 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2637 paste (selection.text, selection.len); 2695 char *str = rxvt_wcstombs (selection.text, selection.len);
2696 paste ((unsigned char *)str, strlen (str));
2697 free (str);
2638 return; 2698 return;
2639 } 2699 }
2640 else 2700 else
2641 { 2701 {
2642 int i; 2702 int i;
2643 2703
2644 selection_request_time = tm; 2704 selection_request_time = tm;
2645 selection_wait = Sel_normal; 2705 selection_wait = Sel_normal;
2706
2646 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2707 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2647 { 2708 {
2648#if X_HAVE_UTF8_STRING 2709#if X_HAVE_UTF8_STRING
2649 selection_type = Sel_UTF8String; 2710 selection_type = Sel_UTF8String;
2650 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2711 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2655 return; 2716 return;
2656#endif 2717#endif
2657 2718
2658 } 2719 }
2659 } 2720 }
2721
2660 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2722 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); 2723 selection_paste (display->root, XA_CUT_BUFFER0, False);
2663} 2724}
2664 2725
2665int 2726int
2666rxvt_term::selection_request_other (Atom target, int selnum) 2727rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2728{
2668 Atom sel; 2729 Atom sel;
2669#ifdef DEBUG_SELECT 2730#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2731 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif 2732#endif
2672 2733
2673 selection_type |= selnum; 2734 selection_type |= selnum;
2735
2674 if (selnum == Sel_Primary) 2736 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2737 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2738 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2739 sel = XA_SECONDARY;
2678 else 2740 else
2679 sel = xa[XA_CLIPBOARD]; 2741 sel = xa[XA_CLIPBOARD];
2742
2680 if (XGetSelectionOwner (display->display, sel) != None) 2743 if (XGetSelectionOwner (display->display, sel) != None)
2681 { 2744 {
2682 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2683 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2745 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2684 TermWin.vt, selection_request_time); 2746 TermWin.vt, selection_request_time);
2685 return 1; 2747 return 1;
2686 } 2748 }
2749
2687 return 0; 2750 return 0;
2688} 2751}
2689 2752
2690/* ------------------------------------------------------------------------- */ 2753/* ------------------------------------------------------------------------- */
2691/* 2754/*
… …
2693 * EXT: SelectionClear 2756 * EXT: SelectionClear
2694 */ 2757 */
2695void 2758void
2696rxvt_term::selection_clear () 2759rxvt_term::selection_clear ()
2697{ 2760{
2698 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2699
2700 want_refresh = 1; 2761 want_refresh = 1;
2701 free (selection.text); 2762 free (selection.text);
2702 selection.text = NULL; 2763 selection.text = NULL;
2703 selection.len = 0; 2764 selection.len = 0;
2704 CLEAR_SELECTION (); 2765 CLEAR_SELECTION ();
2766
2767 if (display->selection_owner == this)
2768 display->selection_owner = 0;
2705} 2769}
2706 2770
2707/* ------------------------------------------------------------------------- */ 2771/* ------------------------------------------------------------------------- */
2708/* 2772/*
2709 * Copy a selection into the cut buffer 2773 * Copy a selection into the cut buffer
2710 * EXT: button 1 or 3 release 2774 * EXT: button 1 or 3 release
2711 */ 2775 */
2712void 2776void
2713rxvt_term::selection_make (Time tm) 2777rxvt_term::selection_make (Time tm)
2714{ 2778{
2715 int i, col, end_col, row, end_row; 2779 int i, col, end_col, row, end_row;
2716 unsigned char *new_selection_text; 2780 wchar_t *new_selection_text;
2717 char *str;
2718 text_t *t; 2781 text_t *t;
2719#ifdef ACS_ASCII
2720 rend_t *re;
2721#endif
2722 2782
2723 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2724 switch (selection.op) 2783 switch (selection.op)
2725 { 2784 {
2726 case SELECTION_CONT: 2785 case SELECTION_CONT:
2727 break; 2786 break;
2728 case SELECTION_INIT: 2787 case SELECTION_INIT:
… …
2732 selection.op = SELECTION_DONE; 2791 selection.op = SELECTION_DONE;
2733 /* FALLTHROUGH */ 2792 /* FALLTHROUGH */
2734 default: 2793 default:
2735 return; 2794 return;
2736 } 2795 }
2796
2737 selection.op = SELECTION_DONE; 2797 selection.op = SELECTION_DONE;
2738 2798
2739 if (selection.clicks == 4) 2799 if (selection.clicks == 4)
2740 return; /* nothing selected, go away */ 2800 return; /* nothing selected, go away */
2741 2801
2742 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2802 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2743 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2803 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2744
2745 new_selection_text = (unsigned char *)str;
2746 2804
2747 col = selection.beg.col; 2805 col = selection.beg.col;
2748 MAX_IT (col, 0); 2806 MAX_IT (col, 0);
2749 row = selection.beg.row + TermWin.saveLines; 2807 row = selection.beg.row + TermWin.saveLines;
2750 end_row = selection.end.row + TermWin.saveLines; 2808 end_row = selection.end.row + TermWin.saveLines;
2809 int ofs = 0;
2810 int extra = 0;
2751 2811
2752 for (; row <= end_row; row++, col = 0) 2812 for (; row <= end_row; row++, col = 0)
2753 { 2813 {
2754 t = & (screen.text[row][col]); 2814 t = &screen.text[row][col];
2755 2815
2756 end_col = screen.tlen[row]; 2816 end_col = screen.tlen[row];
2757 2817
2758 if (end_col == -1) 2818 if (end_col == -1)
2759 end_col = TermWin.ncol; 2819 end_col = TermWin.ncol;
2760 2820
2761 if (row == end_row) 2821 if (row == end_row)
2762 MIN_IT (end_col, selection.end.col); 2822 MIN_IT (end_col, selection.end.col);
2763 2823
2764 for (; col < end_col; col++) 2824 for (; col < end_col; col++)
2825 {
2765 if (*t == NOCHAR) 2826 if (*t == NOCHAR)
2766 t++; 2827 t++;
2828#if ENABLE_COMBINING
2829 else if (IS_COMPOSE (*t))
2830 {
2831 int len = rxvt_composite.expand (*t, 0);
2832
2833 extra -= (len - 1);
2834
2835 if (extra < 0)
2836 {
2837 extra += i;
2838 i += i;
2839 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2840 }
2841
2842 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2843 }
2844#endif
2767 else 2845 else
2768 { 2846 new_selection_text[ofs++] = *t++;
2769 int len = wctomb (str, *t++);
2770 if (len > 0)
2771 str += len;
2772 } 2847 }
2773 2848
2774 if (screen.tlen[row] != -1 && row != end_row) 2849 if (screen.tlen[row] != -1 && row != end_row)
2775 *str++ = '\n'; 2850 new_selection_text[ofs++] = C0_LF;
2776 } 2851 }
2777 2852
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) 2853 if (end_col != selection.end.col)
2786 *str++ = '\n'; 2854 new_selection_text[ofs++] = C0_LF;
2787#endif
2788 *str = '\0';
2789 2855
2790 i = str - (char *)new_selection_text; 2856 new_selection_text[ofs] = 0;
2857
2791 if (i == 0) 2858 if (ofs == 0)
2792 { 2859 {
2793 free (new_selection_text); 2860 free (new_selection_text);
2794 return; 2861 return;
2795 } 2862 }
2796 2863
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); 2864 free (selection.text);
2805 2865
2806 selection.text = new_selection_text; 2866 // we usually allocate much more than necessary, so realloc it smaller again
2867 selection.len = ofs;
2868 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2807 2869
2808 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2870 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2809 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2871 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2810 display->set_selection_owner (this); 2872 display->set_selection_owner (this);
2811 else 2873 else
2812 rxvt_print_error ("can't get primary selection"); 2874 rxvt_warn ("can't get primary selection, ignoring.\n");
2813 2875
2814 { 2876#if 0
2815 XTextProperty ct; 2877 XTextProperty ct;
2816 char *cl = (char *)selection.text;
2817 2878
2818 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2879 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2819 { 2880 {
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, 2881 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2826 PropModeReplace, selection.text, (int)selection.len); 2882 PropModeReplace, ct.value, ct.nitems);
2883 XFree (ct.value);
2827 } 2884 }
2885#endif
2828 2886
2829 selection_time = tm; 2887 selection_time = tm;
2830 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2831} 2888}
2832 2889
2833/* ------------------------------------------------------------------------- */ 2890/* ------------------------------------------------------------------------- */
2834/* 2891/*
2835 * Mark or select text based upon number of clicks: 1, 2, or 3 2892 * Mark or select text based upon number of clicks: 1, 2, or 3
2836 * EXT: button 1 press 2893 * EXT: button 1 press
2837 */ 2894 */
2838void 2895void
2839rxvt_term::selection_click (int clicks, int x, int y) 2896rxvt_term::selection_click (int clicks, int x, int y)
2840{ 2897{
2841 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2842
2843 clicks = ((clicks - 1) % 3) + 1; 2898 clicks = ((clicks - 1) % 3) + 1;
2844 selection.clicks = clicks; /* save clicks so extend will work */ 2899 selection.clicks = clicks; /* save clicks so extend will work */
2845 2900
2846 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2901 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2847 2902
… …
2861rxvt_term::selection_start_colrow (int col, int row) 2916rxvt_term::selection_start_colrow (int col, int row)
2862{ 2917{
2863 want_refresh = 1; 2918 want_refresh = 1;
2864 selection.mark.col = col; 2919 selection.mark.col = col;
2865 selection.mark.row = row - TermWin.view_start; 2920 selection.mark.row = row - TermWin.view_start;
2921
2866 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2922 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2867 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2923 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2868 MAX_IT (selection.mark.col, 0); 2924 MAX_IT (selection.mark.col, 0);
2869 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2925 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2870 2926
2927 while (selection.mark.col > 0
2928 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2929 --selection.mark.col;
2930
2871 if (selection.op) 2931 if (selection.op)
2872 { /* clear the old selection */ 2932 { /* clear the old selection */
2873 selection.beg.row = selection.end.row = selection.mark.row; 2933 selection.beg.row = selection.end.row = selection.mark.row;
2874 selection.beg.col = selection.end.col = selection.mark.col; 2934 selection.beg.col = selection.end.col = selection.mark.col;
2875 } 2935 }
2936
2876 selection.op = SELECTION_INIT; 2937 selection.op = SELECTION_INIT;
2877 selection.screen = current_screen; 2938 selection.screen = current_screen;
2878} 2939}
2879 2940
2880/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
… …
2882 * Word select: select text for 2 clicks 2943 * Word select: select text for 2 clicks
2883 * We now only find out the boundary in one direction 2944 * We now only find out the boundary in one direction
2884 */ 2945 */
2885 2946
2886/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2947/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2887#define DELIMIT_TEXT(x) \ 2948#define DELIMIT_TEXT(x) \
2888 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2949 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2889#define DELIMIT_REND(x) 1 2950#define DELIMIT_REND(x) 1
2890 2951
2891void 2952void
2892rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2953rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2893{ 2954{
2894 int col, row, dirnadd, tcol, trow, w1, w2; 2955 int col, row, dirnadd, tcol, trow, w1, w2;
2895 row_col_t bound; 2956 row_col_t bound;
2896 text_t *stp; 2957 text_t *stp;
2897 rend_t *srp; 2958 rend_t *srp;
2898 2959
2899 if (dirn == UP) 2960 if (dirn == UP)
2900 { 2961 {
2901 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2962 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2902 bound.col = 0; 2963 bound.col = 0;
… …
2906 { 2967 {
2907 bound.row = TermWin.saveLines + TermWin.nrow; 2968 bound.row = TermWin.saveLines + TermWin.nrow;
2908 bound.col = TermWin.ncol - 1; 2969 bound.col = TermWin.ncol - 1;
2909 dirnadd = 1; 2970 dirnadd = 1;
2910 } 2971 }
2972
2911 row = mark->row + TermWin.saveLines; 2973 row = mark->row + TermWin.saveLines;
2912 col = mark->col; 2974 col = mark->col;
2913 MAX_IT (col, 0); 2975 MAX_IT (col, 0);
2914 /* find the edge of a word */ 2976 /* find the edge of a word */
2915 stp = & (screen.text[row][col]); 2977 stp = &screen.text[row][col];
2916 w1 = DELIMIT_TEXT (*stp); 2978 w1 = DELIMIT_TEXT (*stp);
2917 2979
2918 if (selection_style != NEW_SELECT) 2980 srp = &screen.rend[row][col];
2981 w2 = DELIMIT_REND (*srp);
2982
2983 for (;;)
2919 { 2984 {
2920 if (w1 == 1) 2985 for (; col != bound.col; col += dirnadd)
2921 { 2986 {
2922 stp += dirnadd; 2987 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; 2988 srp += dirnadd;
2989
2990 if (*stp == NOCHAR)
2991 continue;
2992
2937 if (DELIMIT_TEXT (*stp) != w1) 2993 if (DELIMIT_TEXT (*stp) != w1)
2938 break; 2994 break;
2939 srp += dirnadd;
2940 if (DELIMIT_REND (*srp) != w2) 2995 if (DELIMIT_REND (*srp) != w2)
2941 break; 2996 break;
2942 } 2997 }
2998
2943 if ((col == bound.col) && (row != bound.row)) 2999 if ((col == bound.col) && (row != bound.row))
2944 { 3000 {
2945 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3001 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2946 { 3002 {
2947 trow = row + dirnadd; 3003 trow = row + dirnadd;
2948 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3004 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3005
2949 if (screen.text[trow] == NULL) 3006 if (screen.text[trow] == NULL)
2950 break; 3007 break;
3008
2951 stp = & (screen.text[trow][tcol]); 3009 stp = & (screen.text[trow][tcol]);
2952 srp = & (screen.rend[trow][tcol]); 3010 srp = & (screen.rend[trow][tcol]);
3011
2953 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3012 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2954 break; 3013 break;
3014
2955 row = trow; 3015 row = trow;
2956 col = tcol; 3016 col = tcol;
2957 continue; 3017 continue;
2958 } 3018 }
2959 } 3019 }
2960 break; 3020 break;
2961 } 3021 }
3022
2962Old_Word_Selection_You_Die: 3023Old_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) 3024 if (dirn == DN)
2966 col++; /* put us on one past the end */ 3025 col++; /* put us on one past the end */
2967 3026
2968 /* Poke the values back in */ 3027 /* Poke the values back in */
2969 ret->row = row - TermWin.saveLines; 3028 ret->row = row - TermWin.saveLines;
… …
2988 MAX_IT (row, 0); 3047 MAX_IT (row, 0);
2989 MIN_IT (row, (int)TermWin.nrow - 1); 3048 MIN_IT (row, (int)TermWin.nrow - 1);
2990 MAX_IT (col, 0); 3049 MAX_IT (col, 0);
2991 MIN_IT (col, (int)TermWin.ncol); 3050 MIN_IT (col, (int)TermWin.ncol);
2992 3051
2993#ifndef NO_NEW_SELECTION
2994 /* 3052 /*
2995 * If we're selecting characters (single click) then we must check first 3053 * 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 3054 * 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 3055 * 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. 3056 * be _past_ a character for it to be selected.
2999 */ 3057 */
3000 if (selection_style != OLD_SELECT)
3001 {
3002 if (((selection.clicks % 3) == 1) && !flag 3058 if (((selection.clicks % 3) == 1) && !flag
3003 && (col == selection.mark.col 3059 && (col == selection.mark.col
3004 && (row == selection.mark.row + TermWin.view_start))) 3060 && (row == selection.mark.row + TermWin.view_start)))
3005 { 3061 {
3006 /* select nothing */ 3062 /* select nothing */
3007 selection.beg.row = selection.end.row = 0; 3063 selection.beg.row = selection.end.row = 0;
3008 selection.beg.col = selection.end.col = 0; 3064 selection.beg.col = selection.end.col = 0;
3009 selection.clicks = 4; 3065 selection.clicks = 4;
3010 want_refresh = 1; 3066 want_refresh = 1;
3011 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3012 return; 3067 return;
3013 }
3014 } 3068 }
3015#endif 3069
3016 if (selection.clicks == 4) 3070 if (selection.clicks == 4)
3017 selection.clicks = 1; 3071 selection.clicks = 1;
3018 3072
3019 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3073 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3020 flag == 1 ? 1 : 0, /* ? button press */ 3074 flag == 1 ? 1 : 0, /* ? button press */
… …
3026 * Extend the selection to the specified col/row 3080 * Extend the selection to the specified col/row
3027 */ 3081 */
3028void 3082void
3029rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3083rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3030{ 3084{
3031 int16_t ncol = TermWin.ncol; 3085 int16_t ncol = TermWin.ncol;
3032 int end_col; 3086 int end_col;
3033 row_col_t pos; 3087 row_col_t pos;
3034 enum { 3088 enum {
3035 LEFT, RIGHT 3089 LEFT, RIGHT
3036 } closeto = RIGHT; 3090 } 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 3091
3041 want_refresh = 1; 3092 want_refresh = 1;
3042 switch (selection.op) 3093 switch (selection.op)
3043 { 3094 {
3044 case SELECTION_INIT: 3095 case SELECTION_INIT:
… …
3066 && selection.beg.row == selection.end.row 3117 && selection.beg.row == selection.end.row
3067 && selection.beg.row != selection.mark.row) 3118 && selection.beg.row != selection.mark.row)
3068 { 3119 {
3069 selection.beg.col = selection.end.col = selection.mark.col; 3120 selection.beg.col = selection.end.col = selection.mark.col;
3070 selection.beg.row = selection.end.row = selection.mark.row; 3121 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 } 3122 }
3073 3123
3074 pos.col = col; 3124 pos.col = col;
3075 pos.row = row; 3125 pos.row = row;
3076 3126
3077 pos.row -= TermWin.view_start; /* adjust for scroll */ 3127 pos.row -= TermWin.view_start; /* adjust for scroll */
3078 3128
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 /* 3129 /*
3141 * This is mainly xterm style selection with a couple of differences, mainly 3130 * This is mainly xterm style selection with a couple of differences, mainly
3142 * in the way button3 drag extension works. 3131 * in the way button3 drag extension works.
3143 * We're either doing: button1 drag; button3 press; or button3 drag 3132 * 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 3133 * 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 3138 * 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 3139 * and it was decided by whichever point/word/line was `fixed' at the
3151 * time of the most recent button3 press 3140 * time of the most recent button3 press
3152 */ 3141 */
3153 if (button3 && buttonpress) 3142 if (button3 && buttonpress)
3154 { /* button3 press */ 3143 { /* button3 press */
3155 /* 3144 /*
3156 * first determine which edge of the selection we are closest to 3145 * first determine which edge of the selection we are closest to
3157 */ 3146 */
3158 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3147 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3159 || (!ROWCOL_IS_AFTER (pos, selection.end) 3148 || (!ROWCOL_IS_AFTER (pos, selection.end)
3160 && (((pos.col - selection.beg.col) 3149 && (((pos.col - selection.beg.col)
3161 + ((pos.row - selection.beg.row) * ncol)) 3150 + ((pos.row - selection.beg.row) * ncol))
3162 < ((selection.end.col - pos.col) 3151 < ((selection.end.col - pos.col)
3163 + ((selection.end.row - pos.row) * ncol))))) 3152 + ((selection.end.row - pos.row) * ncol)))))
3164 closeto = LEFT; 3153 closeto = LEFT;
3154
3165 if (closeto == LEFT) 3155 if (closeto == LEFT)
3166 { 3156 {
3167 selection.beg.row = pos.row; 3157 selection.beg.row = pos.row;
3168 selection.beg.col = pos.col; 3158 selection.beg.col = pos.col;
3169 selection.mark.row = selection.end.row; 3159 selection.mark.row = selection.end.row;
3170 selection.mark.col = selection.end.col 3160 selection.mark.col = selection.end.col - (selection.clicks == 2);
3171 - (selection.clicks == 2);
3172 } 3161 }
3173 else 3162 else
3174 { 3163 {
3175 selection.end.row = pos.row; 3164 selection.end.row = pos.row;
3176 selection.end.col = pos.col; 3165 selection.end.col = pos.col;
3177 selection.mark.row = selection.beg.row; 3166 selection.mark.row = selection.beg.row;
3178 selection.mark.col = selection.beg.col; 3167 selection.mark.col = selection.beg.col;
3179 } 3168 }
3180 } 3169 }
3181 else 3170 else
3182 { /* button1 drag or button3 drag */ 3171 { /* button1 drag or button3 drag */
3183 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3172 if (ROWCOL_IS_AFTER (selection.mark, pos))
3184 { 3173 {
3185 if ((selection.mark.row == selection.end.row) 3174 if ((selection.mark.row == selection.end.row)
3186 && (selection.mark.col == selection.end.col) 3175 && (selection.mark.col == selection.end.col)
3187 && clickchange && selection.clicks == 2) 3176 && clickchange && selection.clicks == 2)
3188 selection.mark.col--; 3177 selection.mark.col--;
3178
3189 selection.beg.row = pos.row; 3179 selection.beg.row = pos.row;
3190 selection.beg.col = pos.col; 3180 selection.beg.col = pos.col;
3191 selection.end.row = selection.mark.row; 3181 selection.end.row = selection.mark.row;
3192 selection.end.col = selection.mark.col 3182 selection.end.col = selection.mark.col + (selection.clicks == 2);
3193 + (selection.clicks == 2);
3194 } 3183 }
3195 else 3184 else
3196 { 3185 {
3197 selection.beg.row = selection.mark.row; 3186 selection.beg.row = selection.mark.row;
3198 selection.beg.col = selection.mark.col; 3187 selection.beg.col = selection.mark.col;
… …
3202 } 3191 }
3203 3192
3204 if (selection.clicks == 1) 3193 if (selection.clicks == 1)
3205 { 3194 {
3206 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3195 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196
3207 if (end_col != -1 && selection.beg.col > end_col) 3197 if (end_col != -1 && selection.beg.col > end_col)
3208 { 3198 {
3209#if 1 3199#if 1
3210 selection.beg.col = ncol; 3200 selection.beg.col = ncol;
3211#else 3201#else
3212 if (selection.beg.row != selection.end.row) 3202 if (selection.beg.row != selection.end.row)
3213 selection.beg.col = ncol; 3203 selection.beg.col = ncol;
3214 else 3204 else
3215 selection.beg.col = selection.mark.col; 3205 selection.beg.col = selection.mark.col;
3216#endif 3206#endif
3217
3218 } 3207 }
3208
3219 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3209 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210
3220 if (end_col != -1 && selection.end.col > end_col) 3211 if (end_col != -1 && selection.end.col > end_col)
3221 selection.end.col = ncol; 3212 selection.end.col = ncol;
3222
3223 } 3213 }
3224 else if (selection.clicks == 2) 3214 else if (selection.clicks == 2)
3225 { 3215 {
3226 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3216 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3227 selection.end.col--; 3217 selection.end.col--;
3218
3228 selection_delimit_word (UP, & (selection.beg), 3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3229 & (selection.beg));
3230 selection_delimit_word (DN, & (selection.end), 3220 selection_delimit_word (DN, & (selection.end), & (selection.end));
3231 & (selection.end));
3232 } 3221 }
3233 else if (selection.clicks == 3) 3222 else if (selection.clicks == 3)
3234 { 3223 {
3235#ifndef NO_FRILLS 3224#if ENABLE_FRILLS
3236 if ((Options & Opt_tripleclickwords)) 3225 if ((options & Opt_tripleclickwords))
3237 { 3226 {
3238 int end_row; 3227 int end_row;
3239 3228
3240 selection_delimit_word (UP, & (selection.beg), 3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3241 & (selection.beg));
3242 end_row = screen.tlen[selection.mark.row 3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3243 + TermWin.saveLines]; 3231
3244 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3232 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3245 end_row++)
3246 { 3233 {
3247 end_col = screen.tlen[end_row + TermWin.saveLines]; 3234 end_col = screen.tlen[end_row + TermWin.saveLines];
3235
3248 if (end_col != -1) 3236 if (end_col != -1)
3249 { 3237 {
3250 selection.end.row = end_row; 3238 selection.end.row = end_row;
3251 selection.end.col = end_col; 3239 selection.end.col = end_col;
3252 selection_remove_trailing_spaces (); 3240 selection_remove_trailing_spaces ();
… …
3254 } 3242 }
3255 } 3243 }
3256 } 3244 }
3257 else 3245 else
3258#endif 3246#endif
3259
3260 { 3247 {
3261 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3248 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3262 selection.mark.col++; 3249 selection.mark.col++;
3263 selection.beg.col = 0; 3250 selection.beg.col = 0;
3264 selection.end.col = ncol; 3251 selection.end.col = ncol;
3265 } 3252 }
3266 } 3253 }
3254
3267 if (button3 && buttonpress) 3255 if (button3 && buttonpress)
3268 { /* mark may need to be changed */ 3256 { /* mark may need to be changed */
3269 if (closeto == LEFT) 3257 if (closeto == LEFT)
3270 { 3258 {
3271 selection.mark.row = selection.end.row; 3259 selection.mark.row = selection.end.row;
3272 selection.mark.col = selection.end.col 3260 selection.mark.col = selection.end.col - (selection.clicks == 2);
3273 - (selection.clicks == 2);
3274 } 3261 }
3275 else 3262 else
3276 { 3263 {
3277 selection.mark.row = selection.beg.row; 3264 selection.mark.row = selection.beg.row;
3278 selection.mark.col = selection.beg.col; 3265 selection.mark.col = selection.beg.col;
3279 } 3266 }
3280 } 3267 }
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} 3268}
3284 3269
3285#ifndef NO_FRILLS 3270#if ENABLE_FRILLS
3286void 3271void
3287rxvt_term::selection_remove_trailing_spaces () 3272rxvt_term::selection_remove_trailing_spaces ()
3288{ 3273{
3289 int32_t end_col, end_row; 3274 int32_t end_col, end_row;
3290 text_t *stp; 3275 text_t *stp;
… …
3361 ev.target = rq.target; 3346 ev.target = rq.target;
3362 ev.time = rq.time; 3347 ev.time = rq.time;
3363 3348
3364 if (rq.target == xa[XA_TARGETS]) 3349 if (rq.target == xa[XA_TARGETS])
3365 { 3350 {
3366 Atom32 target_list[5]; 3351 Atom32 target_list[6];
3367 Atom32 *target = target_list; 3352 Atom32 *target = target_list;
3368 3353
3369 *target++ = (Atom32) xa[XA_TARGETS]; 3354 *target++ = (Atom32) xa[XA_TARGETS];
3355 *target++ = (Atom32) xa[XA_TIMESTAMP];
3370 *target++ = (Atom32) XA_STRING; 3356 *target++ = (Atom32) XA_STRING;
3371 *target++ = (Atom32) xa[XA_TEXT]; 3357 *target++ = (Atom32) xa[XA_TEXT];
3372 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3358 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3373#if X_HAVE_UTF8_STRING 3359#if X_HAVE_UTF8_STRING
3374 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3360 *target++ = (Atom32) xa[XA_UTF8_STRING];
3375#endif 3361#endif
3362
3376 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3363 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3377 (8 * sizeof (target_list[0])), PropModeReplace, 3364 (8 * sizeof (target_list[0])), PropModeReplace,
3378 (unsigned char *)target_list, 3365 (unsigned char *)target_list,
3379 target - target_list); 3366 target - target_list);
3380 ev.property = rq.property; 3367 ev.property = rq.property;
3381 } 3368 }
3369#if TODO // TODO
3382 else if (rq.target == xa[XA_MULTIPLE]) 3370 else if (rq.target == xa[XA_MULTIPLE])
3383 { 3371 {
3384 /* TODO: Handle MULTIPLE */ 3372 /* TODO: Handle MULTIPLE */
3385 } 3373 }
3374#endif
3386 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3387 { 3376 {
3388 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3389 (8 * sizeof (Time)), PropModeReplace, 3378 (8 * sizeof (Time)), PropModeReplace,
3390 (unsigned char *)&selection_time, 1); 3379 (unsigned char *)&selection_time, 1);
3391 ev.property = rq.property; 3380 ev.property = rq.property;
3392 } 3381 }
3393 else if (rq.target == XA_STRING 3382 else if (rq.target == XA_STRING
3394 || rq.target == xa[XA_TEXT] 3383 || rq.target == xa[XA_TEXT]
3395 || rq.target == xa[XA_COMPOUND_TEXT] 3384 || rq.target == xa[XA_COMPOUND_TEXT]
3396 || rq.target == xa[XA_UTF8_STRING] 3385 || rq.target == xa[XA_UTF8_STRING]
3397 ) 3386 )
3398 { 3387 {
3399 short freect = 0; 3388 short freect = 0;
3400 int selectlen; 3389 int selectlen;
3401 char *cl; 3390 wchar_t *cl;
3402 3391
3403 target = rq.target; 3392 target = rq.target;
3404 3393
3405 if (target == XA_STRING) 3394 if (target == XA_STRING)
3406 // we actually don't do XA_STRING, but who cares, as i18n clients 3395 // we actually don't do XA_STRING, but who cares, as i18n clients
3407 // will ask for another format anyways. 3396 // will ask for another format anyways.
3408 style = XStringStyle; 3397 style = XStringStyle;
3409 else if (target == xa[XA_TEXT]) 3398 else if (target == xa[XA_TEXT])
3410 style = XTextStyle; 3399 style = XStdICCTextStyle;
3411 else if (target == xa[XA_COMPOUND_TEXT]) 3400 else if (target == xa[XA_COMPOUND_TEXT])
3412 style = XCompoundTextStyle; 3401 style = XCompoundTextStyle;
3413#if X_HAVE_UTF8_STRING 3402#if X_HAVE_UTF8_STRING
3414 else if (target == xa[XA_UTF8_STRING]) 3403 else if (target == xa[XA_UTF8_STRING])
3415 style = XUTF8StringStyle; 3404 style = XUTF8StringStyle;
… …
3420 style = XCompoundTextStyle; 3409 style = XCompoundTextStyle;
3421 } 3410 }
3422 3411
3423 if (selection.text) 3412 if (selection.text)
3424 { 3413 {
3425 cl = (char *)selection.text; 3414 cl = selection.text;
3426 selectlen = selection.len; 3415 selectlen = selection.len;
3427 } 3416 }
3428 else 3417 else
3429 { 3418 {
3430 cl = ""; 3419 cl = L"";
3431 selectlen = 0; 3420 selectlen = 0;
3432 } 3421 }
3433 3422
3423 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3424 // manually for XUTF8StringStyle.
3434 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3425 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3435 freect = 1; 3426 freect = 1;
3436 else 3427 else
3437 { 3428 {
3438 /* if we failed to convert then send it raw */ 3429 /* if we failed to convert then send it raw */
3439 ct.value = (unsigned char *)cl; 3430 ct.value = (unsigned char *)cl;
… …
3446 ev.property = rq.property; 3437 ev.property = rq.property;
3447 3438
3448 if (freect) 3439 if (freect)
3449 XFree (ct.value); 3440 XFree (ct.value);
3450 } 3441 }
3442
3451 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3443 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3452} 3444}
3453 3445
3454/* ------------------------------------------------------------------------- * 3446/* ------------------------------------------------------------------------- *
3455 * MOUSE ROUTINES * 3447 * MOUSE ROUTINES *
… …
3468} 3460}
3469 3461
3470/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3471#ifdef USE_XIM 3463#ifdef USE_XIM
3472void 3464void
3473rxvt_term::im_set_position (XPoint *pos) 3465rxvt_term::im_set_position (XPoint &pos)
3474{ 3466{
3475 XWindowAttributes xwa; 3467 XWindowAttributes xwa;
3476 3468
3477 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3469 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3470
3478 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3471 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3479 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3472 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3480} 3473}
3481
3482#endif 3474#endif
3483/* ------------------------------------------------------------------------- */ 3475
3484 3476#if ENABLE_OVERLAY
3477void
3478rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3479{
3480 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3481 return;
3482
3483 want_refresh = 1;
3484
3485 scr_overlay_off ();
3486
3487 if (x < 0) x = TermWin.ncol - w;
3488 if (y < 0) y = TermWin.nrow - h;
3489
3490 // make space for border
3491 w += 2; MIN_IT (w, TermWin.ncol);
3492 h += 2; MIN_IT (h, TermWin.nrow);
3493
3494 x -= 1; MAX_IT (x, 0);
3495 y -= 1; MAX_IT (y, 0);
3496
3497 MIN_IT (x, TermWin.ncol - w);
3498 MIN_IT (y, TermWin.nrow - h);
3499
3500 ov_x = x; ov_y = y;
3501 ov_w = w; ov_h = h;
3502
3503 ov_text = new text_t *[h];
3504 ov_rend = new rend_t *[h];
3505
3506 for (y = 0; y < h; y++)
3507 {
3508 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w];
3510
3511 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);
3513
3514 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3518 else
3519 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3520
3521 *tp++ = t0;
3522 *rp++ = r;
3523
3524 for (x = w - 2; x > 0; --x)
3525 {
3526 *tp++ = t1;
3527 *rp++ = r;
3528 }
3529
3530 *tp = t2;
3531 *rp = r;
3532 }
3533}
3534
3535void
3536rxvt_term::scr_overlay_off ()
3537{
3538 if (!ov_text)
3539 return;
3540
3541 want_refresh = 1;
3542
3543 for (int y = 0; y < ov_h; y++)
3544 {
3545 delete [] ov_text[y];
3546 delete [] ov_rend[y];
3547 }
3548
3549 delete [] ov_text; ov_text = 0;
3550 delete [] ov_rend; ov_rend = 0;
3551}
3552
3553void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h)
3557 return;
3558
3559 x++, y++;
3560
3561 ov_text[y][x] = text;
3562 ov_rend[y][x] = rend;
3563}
3564
3565void
3566rxvt_term::scr_overlay_set (int x, int y, const char *s)
3567{
3568 while (*s)
3569 scr_overlay_set (x++, y, *s++);
3570}
3571
3572void
3573rxvt_term::scr_swap_overlay ()
3574{
3575 if (!ov_text)
3576 return;
3577
3578 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3579
3580 // swap screen mem with overlay
3581 for (int y = ov_h; y--; )
3582 {
3583 text_t *t1 = ov_text[y];
3584 rend_t *r1 = ov_rend[y];
3585
3586 text_t *t2 = screen.text[y + row_offset] + ov_x;
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588
3589 for (int x = ov_w; x--; )
3590 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false));
3593 }
3594 }
3595}
3596
3597#endif
3485/* ------------------------------------------------------------------------- * 3598/* ------------------------------------------------------------------------- */
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