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.54 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC

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

Diff Legend

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