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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC

… …
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 450
444 delete talloc; talloc = 0; 451 delete talloc; talloc = 0;
… …
470 * Hard reset 477 * Hard reset
471 */ 478 */
472void 479void
473rxvt_term::scr_poweron () 480rxvt_term::scr_poweron ()
474{ 481{
475 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
476
477 scr_release (); 482 scr_release ();
478 prev_nrow = prev_ncol = 0; 483 prev_nrow = prev_ncol = 0;
479 scr_reset (); 484 scr_reset ();
480 485
481 scr_clear (); 486 scr_clear (true);
482 scr_refresh (SLOW_REFRESH); 487 scr_refresh (SLOW_REFRESH);
483} 488}
484 489
485/* ------------------------------------------------------------------------- * 490/* ------------------------------------------------------------------------- *
486 * PROCESS SCREEN COMMANDS * 491 * PROCESS SCREEN COMMANDS *
… …
492 */ 497 */
493void 498void
494rxvt_term::scr_cursor (int mode) 499rxvt_term::scr_cursor (int mode)
495{ 500{
496 screen_t *s; 501 screen_t *s;
497
498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
499 502
500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 503#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
501 if (current_screen == SECONDARY) 504 if (current_screen == SECONDARY)
502 s = &swap; 505 s = &swap;
503 else 506 else
… …
505 s = &screen; 508 s = &screen;
506 509
507 switch (mode) 510 switch (mode)
508 { 511 {
509 case SAVE: 512 case SAVE:
510 s->s_cur.row = s->cur.row; 513 s->s_cur.row = screen.cur.row;
511 s->s_cur.col = s->cur.col; 514 s->s_cur.col = screen.cur.col;
512 s->s_rstyle = rstyle; 515 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 516 s->s_charset = screen.charset;
514 s->s_charset_char = charsets[s->charset]; 517 s->s_charset_char = charsets[screen.charset];
515 break; 518 break;
516 519
517 case RESTORE: 520 case RESTORE:
518 want_refresh = 1; 521 want_refresh = 1;
519 s->cur.row = s->s_cur.row; 522 screen.cur.row = s->s_cur.row;
520 s->cur.col = s->s_cur.col; 523 screen.cur.col = s->s_cur.col;
521 s->flags &= ~Screen_WrapNext; 524 screen.flags &= ~Screen_WrapNext;
522 rstyle = s->s_rstyle; 525 rstyle = s->s_rstyle;
523 s->charset = s->s_charset; 526 screen.charset = s->s_charset;
524 charsets[s->charset] = s->s_charset_char; 527 charsets[screen.charset] = s->s_charset_char;
525 set_font_style (); 528 set_font_style ();
526 break; 529 break;
527 } 530 }
528 531
529 /* boundary check in case screen size changed between SAVE and RESTORE */ 532 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
552 int offset; 555 int offset;
553#endif 556#endif
554 557
555 want_refresh = 1; 558 want_refresh = 1;
556 559
557 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
558
559 TermWin.view_start = 0; 560 TermWin.view_start = 0;
560 561
561 if (current_screen == scrn) 562 if (current_screen == scrn)
562 return scrn; 563 return scrn;
563 564
564 selection_check (2); /* check for boundary cross */ 565 selection_check (2); /* check for boundary cross */
565 566
566 SWAP_IT (current_screen, scrn, int); 567 i = current_screen; current_screen = scrn; scrn = i;
568
569 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
570 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
571 MAX_IT (screen.cur.row, 0);
572 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
573 MAX_IT (screen.cur.col, 0);
574 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
575
567#if NSCREENS 576#if NSCREENS
568 if (Options & Opt_secondaryScreen) 577 if (options & Opt_secondaryScreen)
569 { 578 {
570 num_scr = 0; 579 num_scr = 0;
571 offset = TermWin.saveLines; 580 offset = TermWin.saveLines;
581
572 for (i = prev_nrow; i--;) 582 for (i = prev_nrow; i--;)
573 { 583 {
574 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 584 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
575 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 585 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
576 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 586 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
577 } 587 }
578 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 588
579 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
580# ifdef DEBUG_STRICT
581 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
582 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
583# else /* drive with your eyes closed */
584 MAX_IT (screen.cur.row, 0);
585 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
586 MAX_IT (screen.cur.col, 0);
587 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
588# endif
589 SWAP_IT (screen.charset, swap.charset, int16_t); 589 SWAP_IT (screen.charset, swap.charset, int16_t);
590 SWAP_IT (screen.flags, swap.flags, int); 590 SWAP_IT (screen.flags, swap.flags, int);
591 screen.flags |= Screen_VisibleCursor; 591 screen.flags |= Screen_VisibleCursor;
592 swap.flags |= Screen_VisibleCursor; 592 swap.flags |= Screen_VisibleCursor;
593 } 593 }
594 else 594 else
595#endif 595#endif
596 if (Options & Opt_secondaryScroll) 596 if (options & Opt_secondaryScroll)
597 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 597 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
598
599 return scrn; 599 return scrn;
600} 600}
601 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
602/* ------------------------------------------------------------------------- */ 619/* ------------------------------------------------------------------------- */
603/* 620/*
604 * Change the colour for following text 621 * Change the colour for following text
605 */ 622 */
606void 623void
607rxvt_term::scr_color (unsigned int color, int fgbg) 624rxvt_term::scr_color (unsigned int color, int fgbg)
608{ 625{
609 color &= RS_fgMask; 626 if (color > maxTermCOLOR)
627 color = fgbg;
628
610 if (fgbg == Color_fg) 629 if (fgbg == Color_fg)
611 rstyle = SET_FGCOLOR (rstyle, color); 630 rstyle = SET_FGCOLOR (rstyle, color);
612 else 631 else
613 rstyle = SET_BGCOLOR (rstyle, color); 632 rstyle = SET_BGCOLOR (rstyle, color);
614} 633}
… …
643 662
644 if (count == 0 || (row1 > row2)) 663 if (count == 0 || (row1 > row2))
645 return 0; 664 return 0;
646 665
647 want_refresh = 1; 666 want_refresh = 1;
648 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
649 667
650 if (row1 == 0 && count > 0 668 if (row1 == 0 && count > 0
651 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 669 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
652 { 670 {
653 nscrolled = (long)TermWin.nscrolled + (long)count; 671 nscrolled = (long)TermWin.nscrolled + (long)count;
654 672
655 if (nscrolled > (long)TermWin.saveLines) 673 if (nscrolled > (long)TermWin.saveLines)
656 TermWin.nscrolled = TermWin.saveLines; 674 TermWin.nscrolled = TermWin.saveLines;
657 else 675 else
658 TermWin.nscrolled = (uint16_t)nscrolled; 676 TermWin.nscrolled = (unsigned int)nscrolled;
659 677
660 if ((Options & Opt_scrollWithBuffer) 678 if ((options & Opt_scrollWithBuffer)
661 && TermWin.view_start != 0 679 && TermWin.view_start != 0
662 && TermWin.view_start != TermWin.saveLines) 680 && TermWin.view_start != TermWin.saveLines)
663 scr_page (UP, count); 681 scr_page (UP, count);
664 } 682 }
665 else if (!spec) 683 else if (!spec)
… …
704 if (j > 0) 722 if (j > 0)
705 { 723 {
706 /* A: scroll up */ 724 /* A: scroll up */
707 725
708 /* 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 */
709 for (i = 0, j = row1; i < count; i++, j++) 743 for (i = 0, j = row2; i < count; i++, j--)
710 { 744 {
711 buf_text[i] = screen.text[j]; 745 buf_text[i] = screen.text[j];
712 buf_rend[i] = screen.rend[j]; 746 buf_rend[i] = screen.rend[j];
713 } 747 }
748
714 /* A2: Rotate lines */ 749 /* B2: Rotate lines */
715 for (j = row1, i = j + count; i <= row2; i++, j++) 750 for (j = row2, i = j - count; i >= row1; i--, j--)
716 { 751 {
717 screen.tlen[j] = screen.tlen[i]; 752 screen.tlen[j] = screen.tlen[i];
718 screen.text[j] = screen.text[i]; 753 screen.text[j] = screen.text[i];
719 screen.rend[j] = screen.rend[i]; 754 screen.rend[j] = screen.rend[i];
720 } 755 }
721 j = row2 - count + 1, i = count;
722 }
723 else /* if (j < 0) */
724 {
725 /* B: scroll down */
726 756
727 /* B1: Copy lines that will get clobbered by the rotation */
728 for (i = 0, j = row2; i < count; i++, j--)
729 {
730 buf_text[i] = screen.text[j];
731 buf_rend[i] = screen.rend[j];
732 }
733 /* B2: Rotate lines */
734 for (j = row2, i = j - count; i >= row1; i--, j--)
735 {
736 screen.tlen[j] = screen.tlen[i];
737 screen.text[j] = screen.text[i];
738 screen.rend[j] = screen.rend[i];
739 }
740 j = row1, i = count; 757 j = row1, i = count;
741 count = -count; 758 count = -count;
742 } 759 }
743 760
744 /* 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 */
745 for (; i--; j++) 766 for (; i--; j++)
746 {
747 screen.tlen[j] = 0;
748 screen.text[j] = buf_text[i];
749 screen.rend[j] = buf_rend[i];
750
751 if (!spec) /* line length may not equal TermWin.ncol */
752 scr_blank_screen_mem (screen.text, screen.rend, 767 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
753 (unsigned int)j, rstyle);
754 }
755 768
756 return count; 769 return count;
757} 770}
758 771
759/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
… …
761 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
762 */ 775 */
763void 776void
764rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 777rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
765{ 778{
766 unsigned char checksel, clearsel; 779 unsigned char checksel;
767 unicode_t c; 780 unicode_t c;
768 int i, row, last_col; 781 int i, row, last_col;
769 text_t *stp; 782 text_t *stp;
770 rend_t *srp; 783 rend_t *srp;
771 784
772 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
773 return; 786 return;
774 787
775 want_refresh = 1; 788 want_refresh = 1;
789 ZERO_SCROLLBACK ();
776 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
777 791
778 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
779 ZERO_SCROLLBACK ();
780 if (nlines > 0) 792 if (nlines > 0)
781 { 793 {
782 nlines += (screen.cur.row - screen.bscroll); 794 nlines += screen.cur.row - screen.bscroll;
783 if ((nlines > 0) 795 if ((nlines > 0)
784 && (screen.tscroll == 0) 796 && (screen.tscroll == 0)
785 && (screen.bscroll == (TermWin.nrow - 1))) 797 && (screen.bscroll == (TermWin.nrow - 1)))
786 { 798 {
787 /* _at least_ this many lines need to be scrolled */ 799 /* _at least_ this many lines need to be scrolled */
788 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
789 screen.cur.row -= nlines; 801 screen.cur.row -= nlines;
790 } 802 }
791 } 803 }
804
792#ifdef DEBUG_STRICT 805#ifdef DEBUG_STRICT
793 assert (screen.cur.col < last_col); 806 assert (screen.cur.col < last_col);
794 assert ((screen.cur.row < TermWin.nrow) 807 assert ((screen.cur.row < TermWin.nrow)
795 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
796#else /* drive with your eyes closed */ 809#else /* drive with your eyes closed */
797 MIN_IT (screen.cur.col, last_col - 1); 810 MIN_IT (screen.cur.col, last_col - 1);
798 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
799 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
800#endif 813#endif
801 row = screen.cur.row + TermWin.saveLines; 814 row = screen.cur.row + TermWin.saveLines;
802 815
803 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
804 clearsel = 0;
805 817
806 stp = screen.text[row]; 818 stp = screen.text[row];
807 srp = screen.rend[row]; 819 srp = screen.rend[row];
808 820
809 while (len--) 821 while (len--)
… …
812 824
813 if (c < 0x20) 825 if (c < 0x20)
814 switch (c) 826 switch (c)
815 { 827 {
816 case C0_HT: 828 case C0_HT:
817 scr_tab (1); 829 scr_tab (1, true);
818 continue; 830 continue;
819 831
820 case C0_LF: 832 case C0_LF:
821 if (screen.tlen[row] != -1) /* XXX: think about this */ 833 if (screen.tlen[row] != -1) /* XXX: think about this */
822 MAX_IT (screen.tlen[row], screen.cur.col); 834 MAX_IT (screen.tlen[row], screen.cur.col);
… …
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 878
869 // 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
870 // do wcwidth before further replacements, as wcwidth says that line-drawing 880 // do wcwidth before further replacements, as wcwidth says that line-drawing
871 // characters have width -1 (DOH!) on GNU/Linux sometimes. 881 // characters have width -1 (DOH!) on GNU/Linux sometimes.
872 int width = c < 256 ? 1 : wcwidth (c); 882 int width = c < 0x100 ? 1 : wcwidth (c);
873 883
874 if (charsets[screen.charset] == '0') // DEC SPECIAL 884 if (charsets[screen.charset] == '0') // DEC SPECIAL
875 { 885 {
876 // vt100 special graphics and line drawing 886 // vt100 special graphics and line drawing
887 // 5f-7e standard vt100
888 // 40-5e rxvt extension for extra curses acs chars
877 static uint16_t vt100_0[32] = { // 5f .. 7e 889 static uint16_t vt100_0[63] = { // 40 .. 7e
890 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
893 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
878 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 894 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
879 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 895 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
880 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 896 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
881 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 897 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
882 }; 898 };
883 899
884 if (c >= 0x5f && c <= 0x7e) 900 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
885 { 901 {
886 c = vt100_0[c - 0x5f]; 902 c = vt100_0[c - 0x40];
887 width = 1; 903 width = 1;
888 } 904 }
889 } 905 }
890 906
907 if (screen.flags & Screen_Insert)
908 scr_insdel_chars (width, INSERT);
909
891 if (width > 0) 910 if (width != 0)
892 { 911 {
893#if !UNICODE_3 && ENABLE_COMBINING 912 // some utf-8 decoders decode surrogate characters.
913 if (0xd800 <= c && c <= 0xdfff)
914 c = 0xfffd;
915
916#if !UNICODE_3
894 // trim characters we can't store directly :( 917 // trim characters we can't store directly :(
895 if (c >= 0x10000) 918 if (c >= 0x10000)
919# if ENABLE_COMBINING
896 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;
897#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
898 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 947 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899 948
900 do 949 do
901 { 950 {
902 stp[screen.cur.col] = c; 951 stp[screen.cur.col] = c;
903 srp[screen.cur.col] = rend; 952 srp[screen.cur.col] = rend;
… …
915 c = NOCHAR; 964 c = NOCHAR;
916 } 965 }
917 while (--width > 0); 966 while (--width > 0);
918 967
919 // pad with spaces when overwriting wide character with smaller one 968 // pad with spaces when overwriting wide character with smaller one
969 if (!width)
920 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++)
921 { 971 {
922 stp[c] = ' '; 972 stp[c] = ' ';
923 srp[c] = rend; 973 srp[c] = rend;
924 } 974 }
925 } 975 }
926 else if (width == 0) 976 else if (width == 0)
927 { 977 {
928#if ENABLE_COMBINING 978#if ENABLE_COMBINING
929 // handle combining characters 979 // handle combining characters
… …
936 986
937 if (screen.cur.col > 0) 987 if (screen.cur.col > 0)
938 { 988 {
939 tp = stp + screen.cur.col - 1; 989 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1; 990 rp = srp + screen.cur.col - 1;
991
992 while (*tp == NOCHAR && tp > stp)
993 tp--, rp--;
941 } 994 }
942 else if (screen.cur.row > 0 995 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 { 997 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 998 int line = screen.cur.row - 1 + TermWin.saveLines;
946 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--;
947 } 1005 }
948 else 1006 else
949 continue; 1007 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954 1008
955 // first try to find a precomposed character 1009 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c); 1010 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 1011 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 1012 n = rxvt_composite.compose (*tp, c);
959 1013
960 *tp = n; 1014 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1015 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962#endif 1016#endif
963 } 1017 }
964 } 1018 }
965 1019
966 if (screen.tlen[row] != -1) /* XXX: think about this */ 1020 if (screen.tlen[row] != -1) /* XXX: think about this */
967 MAX_IT (screen.tlen[row], screen.cur.col); 1021 MAX_IT (screen.tlen[row], screen.cur.col);
968
969 /*
970 * If we wrote anywhere in the selected area, kill the selection
971 * XXX: should we kill the mark too? Possibly, but maybe that
972 * should be a similar check.
973 */
974 if (clearsel)
975 CLEAR_SELECTION ();
976 1022
977#ifdef DEBUG_STRICT 1023#ifdef DEBUG_STRICT
978 assert (screen.cur.row >= 0); 1024 assert (screen.cur.row >= 0);
979#else /* drive with your eyes closed */ 1025#else /* drive with your eyes closed */
980 MAX_IT (screen.cur.row, 0); 1026 MAX_IT (screen.cur.row, 0);
… …
998#ifdef TERMCAP_HAS_BW 1044#ifdef TERMCAP_HAS_BW
999 screen.cur.col = TermWin.ncol - 1; 1045 screen.cur.col = TermWin.ncol - 1;
1000 screen.cur.row--; 1046 screen.cur.row--;
1001 return; 1047 return;
1002#endif 1048#endif
1003
1004 } 1049 }
1005 } 1050 }
1006 else if ((screen.flags & Screen_WrapNext) == 0) 1051 else if (!(screen.flags & Screen_WrapNext))
1007 scr_gotorc (0, -1, RELATIVE); 1052 scr_gotorc (0, -1, RELATIVE);
1008 1053
1009 screen.flags &= ~Screen_WrapNext; 1054 screen.flags &= ~Screen_WrapNext;
1010} 1055}
1011 1056
… …
1014 * Process Horizontal Tab 1059 * Process Horizontal Tab
1015 * count: +ve = forward; -ve = backwards 1060 * count: +ve = forward; -ve = backwards
1016 * XTERM_SEQ: CTRL-I 1061 * XTERM_SEQ: CTRL-I
1017 */ 1062 */
1018void 1063void
1019rxvt_term::scr_tab (int count) 1064rxvt_term::scr_tab (int count, bool ht)
1020{ 1065{
1021 int i, x; 1066 int i, x;
1022 1067
1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1024 want_refresh = 1; 1068 want_refresh = 1;
1025 i = x = screen.cur.col; 1069 i = x = screen.cur.col;
1026 1070
1027 if (count == 0) 1071 if (count == 0)
1028 return; 1072 return;
1029 else if (count > 0) 1073 else if (count > 0)
1030 { 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
1031 for (; ++i < TermWin.ncol; ) 1081 for (; ++i < TermWin.ncol; )
1032 if (tabs[i]) 1082 if (tabs[i])
1033 { 1083 {
1034 x = i; 1084 x = i;
1035 if (!--count) 1085 if (!--count)
1036 break; 1086 break;
1037 } 1087 }
1088 else
1089 ht &= tp[i] == ' '
1090 && RS_SAME (rp[i], base_rend);
1038 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])
… …
1062 * Process DEC Back Index 1136 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1064 * 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
1065 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1066 */ 1140 */
1067#ifndef NO_FRILLS 1141#if ENABLE_FRILLS
1068void 1142void
1069rxvt_term::scr_backindex () 1143rxvt_term::scr_backindex ()
1070{ 1144{
1071 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1147 else
1074 { 1148 {
1075 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1149 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1076 return; /* um, yeah? */ 1150 return; /* um, yeah? */
1151
1077 scr_insdel_chars (1, INSERT); 1152 scr_insdel_chars (1, INSERT);
1078 } 1153 }
1079} 1154}
1080#endif 1155#endif
1081/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
… …
1083 * Process DEC Forward Index 1158 * Process DEC Forward Index
1084 * XTERM_SEQ: ESC 9 1159 * XTERM_SEQ: ESC 9
1085 * 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
1086 * in that row left. Clear right column. 1161 * in that row left. Clear right column.
1087 */ 1162 */
1088#ifndef NO_FRILLS 1163#if ENABLE_FRILLS
1089void 1164void
1090rxvt_term::scr_forwardindex () 1165rxvt_term::scr_forwardindex ()
1091{ 1166{
1092 int row; 1167 int row;
1093 1168
1094 if (screen.cur.col < TermWin.ncol - 1) 1169 if (screen.cur.col < TermWin.ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1170 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1171 else
1097 { 1172 {
1098 row = screen.cur.row + TermWin.saveLines; 1173 row = screen.cur.row + TermWin.saveLines;
1174
1099 if (screen.tlen[row] == 0) 1175 if (screen.tlen[row] == 0)
1100 return; /* um, yeah? */ 1176 return; /* um, yeah? */
1101 else if (screen.tlen[row] == -1) 1177 else if (screen.tlen[row] == -1)
1102 screen.tlen[row] = TermWin.ncol; 1178 screen.tlen[row] = TermWin.ncol;
1179
1103 scr_gotorc (0, 0, R_RELATIVE); 1180 scr_gotorc (0, 0, R_RELATIVE);
1104 scr_insdel_chars (1, DELETE); 1181 scr_insdel_chars (1, DELETE);
1105 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1182 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1106 } 1183 }
1107} 1184}
… …
1115rxvt_term::scr_gotorc (int row, int col, int relative) 1192rxvt_term::scr_gotorc (int row, int col, int relative)
1116{ 1193{
1117 want_refresh = 1; 1194 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1119 1196
1120 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));
1121
1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1197 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1123 MAX_IT (screen.cur.col, 0); 1198 MAX_IT (screen.cur.col, 0);
1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1199 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1125 1200
1126 screen.flags &= ~Screen_WrapNext; 1201 screen.flags &= ~Screen_WrapNext;
1202
1127 if (relative & R_RELATIVE) 1203 if (relative & R_RELATIVE)
1128 { 1204 {
1129 if (row > 0) 1205 if (row > 0)
1130 { 1206 {
1131 if (screen.cur.row <= screen.bscroll 1207 if (screen.cur.row <= screen.bscroll
… …
1151 MIN_IT (screen.cur.row, screen.bscroll); 1227 MIN_IT (screen.cur.row, screen.bscroll);
1152 } 1228 }
1153 else 1229 else
1154 screen.cur.row = row; 1230 screen.cur.row = row;
1155 } 1231 }
1232
1156 MAX_IT (screen.cur.row, 0); 1233 MAX_IT (screen.cur.row, 0);
1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1234 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1162} 1235}
1163 1236
1164/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1165/* 1238/*
1166 * direction should be UP or DN 1239 * direction should be UP or DN
1167 */ 1240 */
1168void 1241void
1169rxvt_term::scr_index (enum page_dirn direction) 1242rxvt_term::scr_index (enum page_dirn direction)
1170{ 1243{
1171 int dirn; 1244 int dirn;
1172 1245
1173 want_refresh = 1; 1246 want_refresh = 1;
1247 ZERO_SCROLLBACK ();
1248
1174 dirn = ((direction == UP) ? 1 : -1); 1249 dirn = ((direction == UP) ? 1 : -1);
1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1176
1177 ZERO_SCROLLBACK ();
1178 1250
1179 screen.flags &= ~Screen_WrapNext; 1251 screen.flags &= ~Screen_WrapNext;
1252
1180 if ((screen.cur.row == screen.bscroll && direction == UP) 1253 if ((screen.cur.row == screen.bscroll && direction == UP)
1181 || (screen.cur.row == screen.tscroll && direction == DN)) 1254 || (screen.cur.row == screen.tscroll && direction == DN))
1182 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1255 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1183 else 1256 else
1184 screen.cur.row += dirn; 1257 screen.cur.row += dirn;
1258
1185 MAX_IT (screen.cur.row, 0); 1259 MAX_IT (screen.cur.row, 0);
1186 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1260 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1187 selection_check (0); 1261 selection_check (0);
1188} 1262}
1189 1263
… …
1198rxvt_term::scr_erase_line (int mode) 1272rxvt_term::scr_erase_line (int mode)
1199{ 1273{
1200 unsigned int row, col, num; 1274 unsigned int row, col, num;
1201 1275
1202 want_refresh = 1; 1276 want_refresh = 1;
1203 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1204 ZERO_SCROLLBACK (); 1277 ZERO_SCROLLBACK ();
1205 1278
1206 selection_check (1); 1279 selection_check (1);
1207
1208 screen.flags &= ~Screen_WrapNext;
1209 1280
1210 row = TermWin.saveLines + screen.cur.row; 1281 row = TermWin.saveLines + screen.cur.row;
1211 switch (mode) 1282 switch (mode)
1212 { 1283 {
1213 case 0: /* erase to end of line */ 1284 case 0: /* erase to end of line */
… …
1236 default: 1307 default:
1237 return; 1308 return;
1238 } 1309 }
1239 1310
1240 if (screen.text[row]) 1311 if (screen.text[row])
1241 scr_blank_line (& (screen.text[row][col]), 1312 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1242 & (screen.rend[row][col]), num, rstyle);
1243 else 1313 else
1244 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1314 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1245} 1315}
1246 1316
1247/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
… …
1258 int32_t row, row_offset; 1328 int32_t row, row_offset;
1259 rend_t ren; 1329 rend_t ren;
1260 XGCValues gcvalue; 1330 XGCValues gcvalue;
1261 1331
1262 want_refresh = 1; 1332 want_refresh = 1;
1263 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1264 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1334
1265 row_offset = (int32_t)TermWin.saveLines; 1335 row_offset = (int32_t)TermWin.saveLines;
1266 1336
1267 switch (mode) 1337 switch (mode)
1268 { 1338 {
1269 case 0: /* erase to end of screen */ 1339 case 0: /* erase to end of screen */
… …
1285 break; 1355 break;
1286 default: 1356 default:
1287 return; 1357 return;
1288 } 1358 }
1289 1359
1290 refresh_type |= REFRESH_BOUNDS;
1291
1292 if (selection.op && current_screen == selection.screen 1360 if (selection.op && current_screen == selection.screen
1293 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1361 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1294 || (selection.end.row >= row 1362 || (selection.end.row >= row
1295 && selection.end.row <= row + num))) 1363 && selection.end.row <= row + num)))
1296 CLEAR_SELECTION (); 1364 CLEAR_SELECTION ();
… …
1307 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1308 CLEAR_ROWS (row, num); 1376 CLEAR_ROWS (row, num);
1309 } 1377 }
1310 else 1378 else
1311 { 1379 {
1312 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1313 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1382 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1315 ERASE_ROWS (row, num); 1383 ERASE_ROWS (row, num);
1316 gcvalue.foreground = PixColors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1318 } 1386 }
1319 1387
1320 for (; num--; row++) 1388 for (; num--; row++)
1321 { 1389 {
1322 scr_blank_screen_mem (screen.text, screen.rend, 1390 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1323 (unsigned int) (row + row_offset), rstyle);
1324 screen.tlen[row + row_offset] = 0; 1391 screen.tlen[row + row_offset] = 0;
1325 scr_blank_line (drawn_text[row], drawn_rend[row], 1392 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1326 (unsigned int)TermWin.ncol, ren);
1327 } 1393 }
1328} 1394}
1329 1395
1330/* ------------------------------------------------------------------------- */ 1396/* ------------------------------------------------------------------------- */
1331/* 1397/*
… …
1337{ 1403{
1338 int i, j, k; 1404 int i, j, k;
1339 rend_t *r1, fs; 1405 rend_t *r1, fs;
1340 1406
1341 want_refresh = 1; 1407 want_refresh = 1;
1408 ZERO_SCROLLBACK ();
1409
1342 num_scr_allow = 0; 1410 num_scr_allow = 0;
1343 ZERO_SCROLLBACK ();
1344 selection_check (3); 1411 selection_check (3);
1345 1412
1346 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1347 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1414 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1348 { 1415 {
1349 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1416 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1350 fill_text (screen.text[k], 'E', TermWin.ncol); 1417 fill_text (screen.text[k], 'E', TermWin.ncol);
1351 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1418 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1375 if (insdel == DELETE) 1442 if (insdel == DELETE)
1376 return; 1443 return;
1377 else if (insdel == INSERT) 1444 else if (insdel == INSERT)
1378 count = end; 1445 count = end;
1379 } 1446 }
1380 screen.flags &= ~Screen_WrapNext; 1447
1448 scr_do_wrap ();
1381 1449
1382 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1450 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1383} 1451}
1384 1452
1385/* ------------------------------------------------------------------------- */ 1453/* ------------------------------------------------------------------------- */
… …
1399 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1400 1468
1401 if (count <= 0) 1469 if (count <= 0)
1402 return; 1470 return;
1403 1471
1472 scr_do_wrap ();
1473
1404 selection_check (1); 1474 selection_check (1);
1405 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1475 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1406 1476
1407 row = screen.cur.row + TermWin.saveLines; 1477 row = screen.cur.row + TermWin.saveLines;
1408 screen.flags &= ~Screen_WrapNext;
1409 1478
1410 stp = screen.text[row]; 1479 stp = screen.text[row];
1411 srp = screen.rend[row]; 1480 srp = screen.rend[row];
1412 slp = & (screen.tlen[row]); 1481 slp = &screen.tlen[row];
1413 1482
1414 switch (insdel) 1483 switch (insdel)
1415 { 1484 {
1416 case INSERT: 1485 case INSERT:
1417 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1486 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1418 col--)
1419 { 1487 {
1420 stp[col] = stp[col - count]; 1488 stp[col] = stp[col - count];
1421 srp[col] = srp[col - count]; 1489 srp[col] = srp[col - count];
1422 } 1490 }
1423 1491
… …
1433 if (selection.end.row != screen.cur.row 1501 if (selection.end.row != screen.cur.row
1434 || (selection.end.col + count >= TermWin.ncol)) 1502 || (selection.end.col + count >= TermWin.ncol))
1435 CLEAR_SELECTION (); 1503 CLEAR_SELECTION ();
1436 else 1504 else
1437 { /* shift selection */ 1505 { /* shift selection */
1438 selection.beg.col += count; 1506 selection.beg.col += count;
1439 selection.mark.col += count; /* XXX: yes? */ 1507 selection.mark.col += count; /* XXX: yes? */
1440 selection.end.col += count; 1508 selection.end.col += count;
1441 } 1509 }
1442 } 1510 }
1443 1511
1444 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1512 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1445 (unsigned int)count, rstyle); 1513 (unsigned int)count, rstyle);
1446 break; 1514 break;
1447 1515
1448 case ERASE: 1516 case ERASE:
1449 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1517 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1450 selection_check (1); 1518 selection_check (1);
1451 screen.cur.col -= count; 1519 screen.cur.col -= count;
1452 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1453 (unsigned int)count, rstyle); 1521 (unsigned int)count, rstyle);
1454 break; 1522 break;
1455 1523
1456 case DELETE: 1524 case DELETE:
1457 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1460 { 1528 {
1461 stp[col] = stp[col + count]; 1529 stp[col] = stp[col + count];
1462 srp[col] = srp[col + count]; 1530 srp[col] = srp[col + count];
1463 } 1531 }
1464 1532
1465 scr_blank_line (& (stp[TermWin.ncol - count]), 1533 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1466 & (srp[TermWin.ncol - count]),
1467 (unsigned int)count, tr); 1534 (unsigned int)count, tr);
1468 1535
1469 if (*slp == -1) /* break line continuation */ 1536 if (*slp == -1) /* break line continuation */
1470 *slp = TermWin.ncol; 1537 *slp = TermWin.ncol;
1471 1538
… …
1480 || selection.end.col >= TermWin.ncol) 1547 || selection.end.col >= TermWin.ncol)
1481 CLEAR_SELECTION (); 1548 CLEAR_SELECTION ();
1482 else 1549 else
1483 { 1550 {
1484 /* shift selection */ 1551 /* shift selection */
1485 selection.beg.col -= count; 1552 selection.beg.col -= count;
1486 selection.mark.col -= count; /* XXX: yes? */ 1553 selection.mark.col -= count; /* XXX: yes? */
1487 selection.end.col -= count; 1554 selection.end.col -= count;
1488 } 1555 }
1489 } 1556 }
1490 1557
1491 break; 1558 break;
1492 } 1559 }
… …
1538rxvt_term::scr_autowrap (int mode) 1605rxvt_term::scr_autowrap (int mode)
1539{ 1606{
1540 if (mode) 1607 if (mode)
1541 screen.flags |= Screen_Autowrap; 1608 screen.flags |= Screen_Autowrap;
1542 else 1609 else
1543 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1610 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1544} 1611}
1545 1612
1546/* ------------------------------------------------------------------------- */ 1613/* ------------------------------------------------------------------------- */
1547/* 1614/*
1548 * Set/unset margin origin mode 1615 * Set/unset margin origin mode
… …
1558{ 1625{
1559 if (mode) 1626 if (mode)
1560 screen.flags |= Screen_Relative; 1627 screen.flags |= Screen_Relative;
1561 else 1628 else
1562 screen.flags &= ~Screen_Relative; 1629 screen.flags &= ~Screen_Relative;
1630
1563 scr_gotorc (0, 0, 0); 1631 scr_gotorc (0, 0, 0);
1564} 1632}
1565 1633
1566/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
1567/* 1635/*
… …
1587 */ 1655 */
1588void 1656void
1589rxvt_term::scr_set_tab (int mode) 1657rxvt_term::scr_set_tab (int mode)
1590{ 1658{
1591 if (mode < 0) 1659 if (mode < 0)
1592 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1660 memset (tabs, 0, TermWin.ncol * sizeof (char));
1593 else if (screen.cur.col < TermWin.ncol) 1661 else if (screen.cur.col < TermWin.ncol)
1594 tabs[screen.cur.col] = (mode ? 1 : 0); 1662 tabs[screen.cur.col] = (mode ? 1 : 0);
1595} 1663}
1596 1664
1597/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
… …
1601 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1669 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1602 */ 1670 */
1603void 1671void
1604rxvt_term::scr_rvideo_mode (int mode) 1672rxvt_term::scr_rvideo_mode (int mode)
1605{ 1673{
1606 XGCValues gcvalue; 1674 XGCValues gcvalue;
1607 1675
1608 if (rvideo != mode) 1676 if (rvideo != mode)
1609 { 1677 {
1610 rvideo = mode; 1678 rvideo = mode;
1611 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1679 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1612#if defined(XPM_BACKGROUND) 1680#if XPM_BACKGROUND
1613 if (bgPixmap.pixmap == None) 1681 if (bgPixmap.pixmap == None)
1614#endif 1682#endif
1615#if defined(TRANSPARENT) 1683#if TRANSPARENT
1616 if (! (Options & Opt_transparent) || am_transparent == 0) 1684 if (! (options & Opt_transparent) || am_transparent == 0)
1617#endif 1685#endif
1618 XSetWindowBackground (display->display, TermWin.vt, 1686 XSetWindowBackground (display->display, TermWin.vt,
1619 PixColors[Color_bg]); 1687 pix_colors[Color_bg]);
1620 1688
1621 gcvalue.foreground = PixColors[Color_fg]; 1689 gcvalue.foreground = pix_colors[Color_fg];
1622 gcvalue.background = PixColors[Color_bg]; 1690 gcvalue.background = pix_colors[Color_bg];
1623 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1691 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1624 &gcvalue); 1692 &gcvalue);
1625 scr_clear (); 1693 scr_clear ();
1626 scr_touch (true); 1694 scr_touch (true);
1627 } 1695 }
… …
1675 * XTERM_SEQ: Invoke G2 character set: ESC N 1743 * XTERM_SEQ: Invoke G2 character set: ESC N
1676 * XTERM_SEQ: Invoke G3 character set: ESC O 1744 * XTERM_SEQ: Invoke G3 character set: ESC O
1677 */ 1745 */
1678void 1746void
1679rxvt_term::scr_charset_choose (int set) 1747rxvt_term::scr_charset_choose (int set)
1680 { 1748{
1681 screen.charset = set; 1749 screen.charset = set;
1682 set_font_style (); 1750 set_font_style ();
1683 } 1751}
1684 1752
1685/* ------------------------------------------------------------------------- */ 1753/* ------------------------------------------------------------------------- */
1686/* 1754/*
1687 * Set a font 1755 * Set a font
1688 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1756 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1691 * XTERM_SEQ: Set G3 character set: ESC + <C> 1759 * XTERM_SEQ: Set G3 character set: ESC + <C>
1692 * See set_font_style for possible values for <C> 1760 * See set_font_style for possible values for <C>
1693 */ 1761 */
1694void 1762void
1695rxvt_term::scr_charset_set (int set, unsigned int ch) 1763rxvt_term::scr_charset_set (int set, unsigned int ch)
1696 { 1764{
1697 charsets[set] = (unsigned char)ch; 1765 charsets[set] = (unsigned char)ch;
1698 set_font_style (); 1766 set_font_style ();
1699 } 1767}
1700 1768
1701 1769
1702/* ------------------------------------------------------------------------- * 1770/* ------------------------------------------------------------------------- *
1703 * MAJOR SCREEN MANIPULATION * 1771 * MAJOR SCREEN MANIPULATION *
1704 * ------------------------------------------------------------------------- */ 1772 * ------------------------------------------------------------------------- */
… …
1743 row_col_t rc[RC_COUNT]; 1811 row_col_t rc[RC_COUNT];
1744 1812
1745 if (drawn_text == NULL) /* sanity check */ 1813 if (drawn_text == NULL) /* sanity check */
1746 return; 1814 return;
1747 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
1748#ifdef DEBUG_STRICT 1824#ifdef DEBUG_STRICT
1749 x = max (x, (int)TermWin.int_bwidth); 1825 x = max (x, 0);
1750 x = min (x, (int)TermWin.width); 1826 x = min (x, (int)TermWin.width);
1751 y = max (y, (int)TermWin.int_bwidth); 1827 y = max (y, 0);
1752 y = min (y, (int)TermWin.height); 1828 y = min (y, (int)TermWin.height);
1753#endif 1829#endif
1754 1830
1755 /* round down */ 1831 /* round down */
1756 rc[PART_BEG].col = Pixel2Col (x); 1832 rc[PART_BEG].col = Pixel2Col (x);
… …
1764 { 1840 {
1765 MIN_IT (rc[i].col, TermWin.ncol - 1); 1841 MIN_IT (rc[i].col, TermWin.ncol - 1);
1766 MIN_IT (rc[i].row, TermWin.nrow - 1); 1842 MIN_IT (rc[i].row, TermWin.nrow - 1);
1767 } 1843 }
1768 1844
1769 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));
1770
1771 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++)
1772 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);
1773 (rc[PART_END].col - rc[PART_BEG].col + 1));
1774 1847
1775 if (refresh) 1848 if (refresh)
1776 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1849 scr_refresh (SLOW_REFRESH);
1777} 1850}
1778 1851
1779/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1780/* 1853/*
1781 * Refresh the entire screen 1854 * Refresh the entire screen
… …
1793 */ 1866 */
1794int 1867int
1795rxvt_term::scr_move_to (int y, int len) 1868rxvt_term::scr_move_to (int y, int len)
1796{ 1869{
1797 long p = 0; 1870 long p = 0;
1798 uint16_t oldviewstart; 1871 unsigned int oldviewstart;
1799 1872
1800 oldviewstart = TermWin.view_start; 1873 oldviewstart = TermWin.view_start;
1874
1801 if (y < len) 1875 if (y < len)
1802 { 1876 {
1803 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1877 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1804 p -= (long) (TermWin.nrow - 1); 1878 p -= (long) (TermWin.nrow - 1);
1805 p = max (p, 0); 1879 p = max (p, 0);
1806 } 1880 }
1881
1807 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1882 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1808 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1809 1883
1810 return scr_changeview (oldviewstart); 1884 return scr_changeview (oldviewstart);
1811} 1885}
1812 1886
1813/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
… …
1816 * direction should be UP or DN 1890 * direction should be UP or DN
1817 */ 1891 */
1818int 1892int
1819rxvt_term::scr_page (enum page_dirn direction, int nlines) 1893rxvt_term::scr_page (enum page_dirn direction, int nlines)
1820{ 1894{
1821 int n; 1895 int n;
1822 uint16_t oldviewstart; 1896 unsigned int oldviewstart;
1823 1897
1824 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1825#ifdef DEBUG_STRICT 1898#ifdef DEBUG_STRICT
1826 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1899 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1827#endif 1900#endif
1828 oldviewstart = TermWin.view_start; 1901 oldviewstart = TermWin.view_start;
1829 if (direction == UP) 1902 if (direction == UP)
… …
1838 } 1911 }
1839 return scr_changeview (oldviewstart); 1912 return scr_changeview (oldviewstart);
1840} 1913}
1841 1914
1842int 1915int
1843rxvt_term::scr_changeview (uint16_t oldviewstart) 1916rxvt_term::scr_changeview (unsigned int oldviewstart)
1844{ 1917{
1845 if (TermWin.view_start != oldviewstart) 1918 if (TermWin.view_start != oldviewstart)
1846 { 1919 {
1847 want_refresh = 1; 1920 want_refresh = 1;
1848 num_scr -= (TermWin.view_start - oldviewstart); 1921 num_scr -= (TermWin.view_start - oldviewstart);
… …
1856rxvt_term::scr_bell () 1929rxvt_term::scr_bell ()
1857{ 1930{
1858#ifndef NO_BELL 1931#ifndef NO_BELL
1859# ifndef NO_MAPALERT 1932# ifndef NO_MAPALERT
1860# ifdef MAPALERT_OPTION 1933# ifdef MAPALERT_OPTION
1861 if (Options & Opt_mapAlert) 1934 if (options & Opt_mapAlert)
1862# endif 1935# endif
1863 XMapWindow (display->display, TermWin.parent[0]); 1936 XMapWindow (display->display, TermWin.parent[0]);
1864# endif 1937# endif
1865 if (Options & Opt_visualBell) 1938 if (options & Opt_visualBell)
1866 { 1939 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1940 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 scr_rvideo_mode (!rvideo); /* refresh also done */ 1941 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 } 1942 }
1870 else 1943 else
… …
1876/* ARGSUSED */ 1949/* ARGSUSED */
1877void 1950void
1878rxvt_term::scr_printscreen (int fullhist) 1951rxvt_term::scr_printscreen (int fullhist)
1879{ 1952{
1880#ifdef PRINTPIPE 1953#ifdef PRINTPIPE
1881 int i, r1, nrows, row_offset; 1954 int i, r1, nrows, row_offset;
1882 text_t *t; 1955 FILE *fd;
1883 FILE *fd;
1884 1956
1885 if ((fd = popen_printer ()) == NULL) 1957 if ((fd = popen_printer ()) == NULL)
1886 return; 1958 return;
1959
1887 nrows = TermWin.nrow; 1960 nrows = TermWin.nrow;
1888 row_offset = TermWin.saveLines; 1961 row_offset = TermWin.saveLines;
1962
1889 if (!fullhist) 1963 if (!fullhist)
1890 row_offset -= TermWin.view_start; 1964 row_offset -= TermWin.view_start;
1891 else 1965 else
1892 { 1966 {
1893 nrows += TermWin.nscrolled; 1967 nrows += TermWin.nscrolled;
1894 row_offset -= TermWin.nscrolled; 1968 row_offset -= TermWin.nscrolled;
1895 } 1969 }
1896 1970
1971 wctomb (0, 0);
1972
1897 for (r1 = 0; r1 < nrows; r1++) 1973 for (r1 = 0; r1 < nrows; r1++)
1898 { 1974 {
1899 t = screen.text[r1 + row_offset]; 1975 text_t *tp = screen.text[r1 + row_offset];
1900 for (i = TermWin.ncol - 1; i >= 0; i--) 1976 int len = screen.tlen[r1 + row_offset];
1901 if (!isspace (t[i])) 1977
1902 break; 1978 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1903 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);
1904 } 1997 }
1998
1905 pclose_printer (fd); 1999 pclose_printer (fd);
1906#endif 2000#endif
1907} 2001}
1908 2002
1909/* ------------------------------------------------------------------------- */ 2003/* ------------------------------------------------------------------------- */
… …
1923 ((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)
1924 2018
1925void 2019void
1926rxvt_term::scr_refresh (unsigned char refresh_type) 2020rxvt_term::scr_refresh (unsigned char refresh_type)
1927{ 2021{
1928 unsigned char clearfirst, /* first character writes before cell */
1929 clearlast, /* last character writes beyond cell */
1930 must_clear, /* use draw_string not draw_image_string */ 2022 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 rvid, /* reverse video this position */
1932 showcursor; /* show the cursor */ 2023 showcursor; /* show the cursor */
1933 int16_t col, row, /* column/row we're processing */ 2024 int16_t col, row, /* column/row we're processing */
1934 ocrow; /* old cursor row */ 2025 ocrow; /* old cursor row */
1935 int i, /* tmp */ 2026 int i, /* tmp */
1936 row_offset; /* basic offset in screen structure */ 2027 row_offset; /* basic offset in screen structure */
1937#ifndef NO_CURSORCOLOR 2028#ifndef NO_CURSORCOLOR
1938 rend_t cc1; /* store colours at cursor position (s) */ 2029 rend_t cc1; /* store colours at cursor position (s) */
1939#endif 2030#endif
1940 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2031 rend_t *crp; // cursor rendition pointer
1941 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2032
2033 want_refresh = 0; /* screen is current */
1942 2034
1943 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2035 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1944 return; 2036 return;
1945 2037
1946 /* 2038 /*
1947 * A: set up vars 2039 * A: set up vars
1948 */ 2040 */
1949 clearfirst = clearlast = must_clear = 0; 2041 must_clear = 0;
1950
1951 refresh_count = 0; 2042 refresh_count = 0;
1952 2043
1953 row_offset = TermWin.saveLines - TermWin.view_start; 2044 row_offset = TermWin.saveLines - TermWin.view_start;
1954 2045
1955 if ((refresh_type & REFRESH_BOUNDS))
1956 {
1957 clearfirst = clearlast = 1;
1958 refresh_type &= ~REFRESH_BOUNDS;
1959 }
1960
1961#ifdef XPM_BACKGROUND 2046#if XPM_BACKGROUND
1962 must_clear |= (bgPixmap.pixmap != None); 2047 must_clear |= (bgPixmap.pixmap != None);
1963#endif 2048#endif
1964#ifdef TRANSPARENT 2049#if TRANSPARENT
1965 must_clear |= ((Options & Opt_transparent) && am_transparent); 2050 must_clear |= ((options & Opt_transparent) && am_transparent);
1966#endif 2051#endif
1967 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1968 2053
1969 /* 2054 /*
1970 * B: reverse any characters which are selected 2055 * B: reverse any characters which are selected
… …
1985 showcursor = 0; 2070 showcursor = 0;
1986#endif 2071#endif
1987 2072
1988 if (showcursor) 2073 if (showcursor)
1989 { 2074 {
2075 int col = screen.cur.col;
2076
2077 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2078 col--;
2079
1990 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2080 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1991 2081
1992 if (showcursor && TermWin.focus) 2082 if (showcursor && TermWin.focus)
1993 { 2083 {
1994 *srp ^= RS_RVid; 2084 *crp ^= RS_RVid;
1995#ifndef NO_CURSORCOLOR 2085#ifndef NO_CURSORCOLOR
1996 cc1 = *srp & (RS_fgMask | RS_bgMask); 2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
1997 if (ISSET_PIXCOLOR (Color_cursor)) 2087 if (ISSET_PIXCOLOR (Color_cursor))
1998 ccol1 = Color_cursor; 2088 ccol1 = Color_cursor;
1999 else 2089 else
2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2001 ccol1 = GET_FGCOLOR (rstyle); 2091 ccol1 = GET_FGCOLOR (rstyle);
… …
2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2009 ccol2 = GET_BGCOLOR (rstyle); 2099 ccol2 = GET_BGCOLOR (rstyle);
2010#else 2100#else
2011 ccol2 = Color_bg; 2101 ccol2 = Color_bg;
2012#endif 2102#endif
2013 *srp = SET_FGCOLOR (*srp, ccol1); 2103 *crp = SET_FGCOLOR (*crp, ccol1);
2014 *srp = SET_BGCOLOR (*srp, ccol2); 2104 *crp = SET_BGCOLOR (*crp, ccol2);
2015#endif 2105#endif
2016 } 2106 }
2017 } 2107 }
2018 2108
2019 /* make sure no outline cursor is left around */ 2109 /* make sure no outline cursor is left around */
… …
2046 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2047 } 2137 }
2048 } 2138 }
2049 } 2139 }
2050 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
2051#ifndef NO_SLOW_LINK_SUPPORT 2148#ifndef NO_SLOW_LINK_SUPPORT
2052 /* 2149 /*
2053 * D: CopyArea pass - very useful for slower links 2150 * D: CopyArea pass - very useful for slower links
2054 * This has been deliberately kept simple. 2151 * This has been deliberately kept simple.
2055 */ 2152 */
2056 i = num_scr; 2153 i = num_scr;
2154 if (!display->is_local
2057 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2155 && refresh_type == FAST_REFRESH && num_scr_allow && i
2058 && abs (i) < TermWin.nrow && !must_clear) 2156 && abs (i) < TermWin.nrow && !must_clear)
2059 { 2157 {
2060 int16_t nits; 2158 int16_t nits;
2061 int j; 2159 int j;
2062 rend_t *drp2;
2063 text_t *dtp2;
2064 int len, wlen; 2160 int len, wlen;
2065 2161
2066 j = TermWin.nrow; 2162 j = TermWin.nrow;
2067 wlen = len = -1; 2163 wlen = len = -1;
2068 row = i > 0 ? 0 : j - 1; 2164 row = i > 0 ? 0 : j - 1;
2069 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2165 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2070 { 2166 {
2071 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2167 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2072 { 2168 {
2073 stp = screen.text[row + row_offset]; 2169 text_t *stp = screen.text[row + row_offset];
2074 srp = screen.rend[row + row_offset]; 2170 rend_t *srp = screen.rend[row + row_offset];
2075 dtp = drawn_text[row]; 2171 text_t *dtp = drawn_text[row];
2076 dtp2 = drawn_text[row + i]; 2172 text_t *dtp2 = drawn_text[row + i];
2077 drp = drawn_rend[row]; 2173 rend_t *drp = drawn_rend[row];
2078 drp2 = drawn_rend[row + i]; 2174 rend_t *drp2 = drawn_rend[row + i];
2079 2175
2080 for (nits = 0, col = TermWin.ncol; col--; ) 2176 for (nits = 0, col = TermWin.ncol; col--; )
2081 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2177 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2082 nits--; 2178 nits--;
2083 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2179 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2103 { 2199 {
2104 /* also comes here at end if needed because of >= above */ 2200 /* also comes here at end if needed because of >= above */
2105 if (wlen < len) 2201 if (wlen < len)
2106 SWAP_IT (wlen, len, int); 2202 SWAP_IT (wlen, len, int);
2107 2203
2108 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2109 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2204 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2110 TermWin.gc, 0, Row2Pixel (len + i), 2205 TermWin.gc, 0, Row2Pixel (len + i),
2111 (unsigned int)TermWin_TotalWidth (), 2206 (unsigned int)TermWin_TotalWidth (),
2112 (unsigned int)Height2Pixel (wlen - len + 1), 2207 (unsigned int)Height2Pixel (wlen - len + 1),
2113 0, Row2Pixel (len)); 2208 0, Row2Pixel (len));
… …
2120 /* 2215 /*
2121 * E: main pass across every character 2216 * E: main pass across every character
2122 */ 2217 */
2123 for (row = 0; row < TermWin.nrow; row++) 2218 for (row = 0; row < TermWin.nrow; row++)
2124 { 2219 {
2125 stp = screen.text[row + row_offset]; 2220 text_t *stp = screen.text[row + row_offset];
2126 srp = screen.rend[row + row_offset]; 2221 rend_t *srp = screen.rend[row + row_offset];
2127 dtp = drawn_text[row]; 2222 text_t *dtp = drawn_text[row];
2128 drp = drawn_rend[row]; 2223 rend_t *drp = drawn_rend[row];
2129 2224
2130 /* 2225 /*
2131 * E2: OK, now the real pass 2226 * E2: OK, now the real pass
2132 */ 2227 */
2133 int ypixel = (int)Row2Pixel (row); 2228 int ypixel = (int)Row2Pixel (row);
2134 2229
2135 for (col = 0; col < TermWin.ncol; col++) 2230 for (col = 0; col < TermWin.ncol; col++)
2136 { 2231 {
2137 /* compare new text with old - if exactly the same then continue */ 2232 /* compare new text with old - if exactly the same then continue */
2138 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2233 if (stp[col] == dtp[col] /* Must match characters to skip. */
2139 && (srp[col] == drp[col] /* Either rendition the same or */ 2234 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2140 || (stp[col] == ' ' /* space w/ no background change */ 2235 || (stp[col] == ' ' /* space w/ no background change */
2141 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2236 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2142 continue; 2237 continue;
2143 2238
2144 // redraw one or more characters 2239 // redraw one or more characters
2145 2240
2146 // seek to the beginning if wide characters 2241 // seek to the beginning of wide characters
2147 while (stp[col] == NOCHAR && col > 0) 2242 while (stp[col] == NOCHAR && col > 0)
2148 --col; 2243 --col;
2149 2244
2150 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2245 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2151 text_t *text = stp + col; 2246 text_t *text = stp + col;
… …
2154 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2155 drp[col] = rend; 2250 drp[col] = rend;
2156 2251
2157 int xpixel = Col2Pixel (col); 2252 int xpixel = Col2Pixel (col);
2158 2253
2159 // this loop looks very messy, it can probably be optimized
2160 // and cleaned a bit by you?
2161 for (i = 0; ++col < TermWin.ncol; ) 2254 for (i = 0; ++col < TermWin.ncol; )
2162 { 2255 {
2163 if (stp[col] == NOCHAR) 2256 if (stp[col] == NOCHAR)
2164 { 2257 {
2165 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2166 drp[col] = rend; 2259 drp[col] = rend;
2167 count++; 2260 count++;
2168
2169 if (i) // only possible skip if char unchanged
2170 i++; 2261 i++;
2171 2262
2172 continue; 2263 continue;
2173 } 2264 }
2174 2265
2175 if (rend != srp[col]) 2266 if (!RS_SAME (rend, srp[col]))
2176 break; 2267 break;
2177 2268
2178 count++; 2269 count++;
2179 2270
2180 if (stp[col] != dtp[col] 2271 if (stp[col] != dtp[col]
2181 || srp[col] != drp[col]) 2272 || !RS_SAME (srp[col], drp[col]))
2182 { 2273 {
2183 if (must_clear && (i++ > (count / 2))) 2274 if (must_clear && (i++ > count / 2))
2184 break; 2275 break;
2185 2276
2186 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2187 drp[col] = rend; 2278 drp[col] = rend;
2188 i = 0; 2279 i = 0;
2189 } 2280 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2281 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2191 break; 2282 break;
2192 } 2283 }
2193 2284
2194 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2195 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
2196 2303
2197 /* 2304 /*
2198 * Determine the attributes for the string 2305 * Determine the attributes for the string
2199 */ 2306 */
2200 int fid = GET_FONT (rend);
2201 int fore = GET_FGCOLOR (rend); // desired foreground 2307 int fore = GET_FGCOLOR (rend); // desired foreground
2202 int back = GET_BGCOLOR (rend); // desired background 2308 int back = GET_BGCOLOR (rend); // desired background
2203 2309
2204 rend = GET_ATTR (rend); 2310 // only do special processing if ana attributes are set, which is rare
2205 2311 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2206 rvid = !!(rend & RS_RVid); 2312 {
2313 bool invert = rend & RS_RVid;
2207 2314
2208#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2209 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold
2317 && fore == Color_fg)
2210 { 2318 {
2211 if (ISSET_PIXCOLOR (Color_BD)) 2319 if (ISSET_PIXCOLOR (Color_BD))
2212 fore = Color_BD; 2320 fore = Color_BD;
2321# if !ENABLE_STYLES
2213 else 2322 else
2214 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
2215 } 2364 }
2216
2217 if (rend & RS_Uline)
2218 if (ISSET_PIXCOLOR (Color_UL))
2219 fore = Color_UL;
2220#endif
2221
2222 if (rvid)
2223 {
2224 SWAP_IT (fore, back, int);
2225
2226#ifndef NO_BOLD_UNDERLINE_REVERSE
2227 if (ISSET_PIXCOLOR (Color_RV)
2228# ifndef NO_CURSORCOLOR
2229 && !ISSET_PIXCOLOR (Color_cursor)
2230# endif
2231 )
2232 back = Color_RV;
2233#endif
2234 }
2235
2236#ifdef TEXT_BLINK
2237 if (rend & RS_Blink && back == Color_bg)
2238 {
2239 if (!text_blink_ev.active)
2240 {
2241 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2242 hidden_text = 0;
2243 }
2244 else if (hidden_text)
2245 fore = back;
2246 }
2247#endif
2248 2365
2249 /* 2366 /*
2250 * Actually do the drawing of the string here 2367 * Actually do the drawing of the string here
2251 */ 2368 */
2252 rxvt_font *font = (*TermWin.fontset)[fid]; 2369 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2253 2370
2254 if (back == fore) 2371 if (back == fore)
2255 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2372 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2256 TermWin.fwidth * count, TermWin.fheight, 2373 TermWin.fwidth * count, TermWin.fheight,
2257 back); 2374 back);
… …
2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2389 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2273 } 2390 }
2274 else 2391 else
2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2276 2393
2277 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
2278 XDrawLine (display->display, drawBuffer, TermWin.gc, 2403 XDrawLine (display->display, drawBuffer, TermWin.gc,
2279 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2280 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 }
2281 } /* for (col....) */ 2407 } /* for (col....) */
2282 } /* for (row....) */ 2408 } /* for (row....) */
2409
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2283 2413
2284 /* 2414 /*
2285 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2286 */ 2416 */
2287 if (showcursor) 2417 if (showcursor)
2288 { 2418 {
2289 if (TermWin.focus) 2419 if (TermWin.focus)
2290 { 2420 {
2291 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2292 [screen.cur.col]);
2293 *srp ^= RS_RVid; 2421 *crp ^= RS_RVid;
2294#ifndef NO_CURSORCOLOR 2422#ifndef NO_CURSORCOLOR
2295 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2423 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2296#endif 2424#endif
2297 } 2425 }
2298 else if (oldcursor.row >= 0) 2426 else if (oldcursor.row >= 0)
2299 { 2427 {
2300#ifndef NO_CURSORCOLOR 2428#ifndef NO_CURSORCOLOR
2301 if (ISSET_PIXCOLOR (Color_cursor)) 2429 if (ISSET_PIXCOLOR (Color_cursor))
2302 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2430 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2303#endif 2431#endif
2304 int cursorwidth = 1; 2432 int cursorwidth = 1;
2305 while (oldcursor.col + cursorwidth < TermWin.ncol 2433 while (oldcursor.col + cursorwidth < TermWin.ncol
2306 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2434 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2307 cursorwidth++; 2435 cursorwidth++;
… …
2317 /* 2445 /*
2318 * H: cleanup selection 2446 * H: cleanup selection
2319 */ 2447 */
2320 scr_reverse_selection (); 2448 scr_reverse_selection ();
2321 2449
2322 /*
2323 * I: other general cleanup
2324 */
2325 if (clearfirst && TermWin.int_bwidth)
2326 /*
2327 * clear the whole screen height, note that width == 0 is treated
2328 * specially by XClearArea
2329 */
2330 XClearArea (display->display, TermWin.vt, 0, 0,
2331 (unsigned int)TermWin.int_bwidth,
2332 (unsigned int)TermWin_TotalHeight (), False);
2333
2334 if (clearlast && TermWin.int_bwidth)
2335 /*
2336 * clear the whole screen height, note that width == 0 is treated
2337 * specially by XClearArea
2338 */
2339 XClearArea (display->display, TermWin.vt,
2340 TermWin.width + TermWin.int_bwidth, 0,
2341 (unsigned int)TermWin.int_bwidth,
2342 (unsigned int)TermWin_TotalHeight (), False);
2343
2344 if (refresh_type & SMOOTH_REFRESH) 2450 if (refresh_type & SMOOTH_REFRESH)
2345 XSync (display->display, False); 2451 XFlush (display->display);
2346 2452
2347 num_scr = 0; 2453 num_scr = 0;
2348 num_scr_allow = 1; 2454 num_scr_allow = 1;
2349 want_refresh = 0; /* screen is current */
2350} 2455}
2351 2456
2352void 2457void
2353rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2458rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2354{ 2459{
2355 if (!rp || !tp) 2460 if (!rp || !tp)
2356 return; 2461 return;
2357 2462
2358 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2463 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2359 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2464 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2360} 2465}
2361 2466
2362void 2467void
2363rxvt_term::scr_remap_chars () 2468rxvt_term::scr_remap_chars ()
2364{ 2469{
… …
2370 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2475 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2371 scr_remap_chars (swap.text[i], swap.rend[i]); 2476 scr_remap_chars (swap.text[i], swap.rend[i]);
2372 } 2477 }
2373} 2478}
2374 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
2375/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2376void 2511void
2377rxvt_term::scr_clear (bool really) 2512rxvt_term::scr_clear (bool really)
2378{ 2513{
2379 if (!TermWin.mapped) 2514 if (!TermWin.mapped)
2380 return; 2515 return;
2381 2516
2382 num_scr_allow = 0; 2517 num_scr_allow = 0;
2383 want_refresh = 1; 2518 want_refresh = 1;
2384 2519
2385#ifdef TRANSPARENT 2520#if TRANSPARENT
2386 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2521 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2387 { 2522 {
2388 int i; 2523 int i;
2389 2524
2390 if (! (Options & Opt_transparent_all)) 2525 if (!(options & Opt_transparent_all))
2391 i = 0; 2526 i = 0;
2392 else 2527 else
2393 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2528 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2394 2529
2395 while (i--) 2530 while (i--)
… …
2411 int end_row = TermWin.saveLines - TermWin.view_start; 2546 int end_row = TermWin.saveLines - TermWin.view_start;
2412 int i = selection.beg.row + TermWin.saveLines; 2547 int i = selection.beg.row + TermWin.saveLines;
2413 int col, row = selection.end.row + TermWin.saveLines; 2548 int col, row = selection.end.row + TermWin.saveLines;
2414 rend_t *srp; 2549 rend_t *srp;
2415 2550
2416 if (i >= end_row) 2551#if ENABLE_FRILLS
2417 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 }
2418 else 2560 else
2561#endif
2562 {
2563 if (i >= end_row)
2564 col = selection.beg.col;
2565 else
2419 { 2566 {
2420 col = 0; 2567 col = 0;
2421 i = end_row; 2568 i = end_row;
2422 } 2569 }
2423 2570
2424 end_row += TermWin.nrow; 2571 end_row += TermWin.nrow;
2572
2425 for (; i < row && i < end_row; i++, col = 0) 2573 for (; i < row && i < end_row; i++, col = 0)
2426 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2574 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2427 srp[col] ^= RS_RVid; 2575 srp[col] ^= RS_RVid;
2428 2576
2429 if (i == row && i < end_row) 2577 if (i == row && i < end_row)
2430 for (srp = screen.rend[i]; col < selection.end.col; col++) 2578 for (srp = screen.rend[i]; col < selection.end.col; col++)
2431 srp[col] ^= RS_RVid; 2579 srp[col] ^= RS_RVid;
2580 }
2432 } 2581 }
2433} 2582}
2434 2583
2435/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2436/* 2585/*
… …
2472 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2621 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2473 */ 2622 */
2474void 2623void
2475rxvt_term::selection_check (int check_more) 2624rxvt_term::selection_check (int check_more)
2476{ 2625{
2477 row_col_t pos; 2626 row_col_t pos;
2478 2627
2479 if (!selection.op) 2628 if (!selection.op)
2480 return; 2629 return;
2481 2630
2482 pos.row = pos.col = 0; 2631 pos.row = pos.col = 0;
… …
2504/* ------------------------------------------------------------------------- */ 2653/* ------------------------------------------------------------------------- */
2505/* 2654/*
2506 * Paste a selection direct to the command fd 2655 * Paste a selection direct to the command fd
2507 */ 2656 */
2508void 2657void
2509rxvt_term::paste (const unsigned char *data, unsigned int len) 2658rxvt_term::paste (unsigned char *data, unsigned int len)
2510{ 2659{
2511 unsigned int i, j, n;
2512 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2513
2514#if 0
2515 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2516 ZERO_SCROLLBACK (r);
2517#endif
2518
2519 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2520 for (i = 0; i < len; i += PROP_SIZE) 2661 for (unsigned int i = 0; i < len; i++)
2521 {
2522 n = min (len - i, PROP_SIZE);
2523 MEMCPY (ds, data + i, n);
2524
2525 for (j = 0; j < n; j++)
2526 if (ds[j] == C0_LF) 2662 if (data[i] == C0_LF)
2527 ds[j] = C0_CR; 2663 data[i] = C0_CR;
2528 2664
2529 tt_write (ds, (int)n); 2665 tt_write (data, len);
2530 }
2531
2532 free (ds);
2533} 2666}
2534 2667
2535/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2536/* 2669/*
2537 * Respond to a notification that a primary selection has been sent 2670 * Respond to a notification that a primary selection has been sent
2538 * EXT: SelectionNotify 2671 * EXT: SelectionNotify
2539 */ 2672 */
2540int 2673void
2541rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2674rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2542{ 2675{
2543 long nread = 0;
2544 unsigned long bytes_after;
2545 XTextProperty ct;
2546
2547 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2548
2549 if (prop == None) /* check for failed XConvertSelection */ 2676 if (prop == None) /* check for failed XConvertSelection */
2550 { 2677 {
2551 if ((selection_type & Sel_CompoundText)) 2678 if ((selection_type & Sel_CompoundText))
2552 { 2679 {
2553 int selnum = selection_type & Sel_whereMask; 2680 int selnum = selection_type & Sel_whereMask;
… …
2566 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2693 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2567 else 2694 else
2568 selection_type = 0; 2695 selection_type = 0;
2569 } 2696 }
2570 2697
2571 return 0; 2698 return;
2572 }
2573
2574 for (;;)
2575 { 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
2576 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2723 if (XGetWindowProperty (display->display, win, prop,
2577 (long) (PROP_SIZE / 4), delete_prop, 2724 ct.nitems / 4, (bytes_after + 3) / 4,
2725 delete_prop, AnyPropertyType,
2578 AnyPropertyType, &ct.encoding, &ct.format, 2726 &ct2.encoding, &ct2.format,
2579 &ct.nitems, &bytes_after, 2727 &ct2.nitems, &bytes_after,
2580 &ct.value) != Success) 2728 &ct2.value) != Success)
2581 break; 2729 goto bailout;
2582 2730
2583 if (ct.encoding == 0) 2731 // realloc should be compatible to XFree, here, and elsewhere, too
2584 { 2732 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2585 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2733 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2586 break; 2734 ct.nitems += ct2.nitems;
2587 }
2588 2735
2736 XFree (ct2.value);
2737 }
2738
2589 if (ct.value == NULL) 2739 if (ct.value == 0)
2590 { 2740 goto bailout;
2591 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2592 continue;
2593 }
2594 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
2595 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 ();
2596 { 2768 }
2597 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2769 else
2598 2770 {
2599 if (selection_wait == Sel_normal && nread == 0 2771 if (selection_wait == Sel_normal
2600 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2772 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2601 { 2773 {
2602 /* 2774 /*
2603 * pass through again trying CUT_BUFFER0 if we've come from 2775 * pass through again trying CUT_BUFFER0 if we've come from
2604 * XConvertSelection () but nothing was presented 2776 * XConvertSelection () but nothing was presented
2605 */ 2777 */
2606 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2607 selection_paste (display->root, XA_CUT_BUFFER0, False); 2778 selection_paste (display->root, XA_CUT_BUFFER0, False);
2608 } 2779 }
2609 2780
2610 nread = -1; /* discount any previous stuff */ 2781 goto bailout;
2611 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)
2612 } 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 }
2613 2793
2794 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2614 nread += ct.nitems; 2795 incr_buf_fill += ct.nitems;
2615 2796
2797 goto bailout;
2798 }
2799
2616 char **cl; 2800 char **cl;
2617 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
2618 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2817 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2619 &cr) >= 0 && cl) 2818 && cl)
2620 { 2819 {
2621 for (int i = 0; i < cr; i++) 2820 for (int i = 0; i < cr; i++)
2622 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2821 paste ((unsigned char *)cl[i], strlen (cl[i]));
2623 2822
2624 XFreeStringList (cl); 2823 XFreeStringList (cl);
2625 } 2824 }
2626 else 2825 else
2627 paste (ct.value, ct.nitems); 2826 paste (ct.value, ct.nitems); // paste raw
2628 2827
2629 if (bytes_after == 0) 2828bailout:
2630 break;
2631
2632 XFree (ct.value);
2633 }
2634
2635 if (ct.value)
2636 XFree (ct.value); 2829 XFree (ct.value);
2637 2830
2638 if (selection_wait == Sel_normal) 2831 if (selection_wait == Sel_normal)
2639 selection_wait = Sel_none; 2832 selection_wait = Sel_none;
2640
2641 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2642 return (int)nread;
2643} 2833}
2644 2834
2645void 2835void
2646rxvt_term::incr_cb (time_watcher &w) 2836rxvt_term::incr_cb (time_watcher &w)
2647{ 2837{
2648 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2649 2839
2840 incr_buf_size = 0;
2841 free (incr_buf);
2842
2650 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2843 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2651} 2844}
2652 2845
2653/*
2654 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2655 */
2656void 2846void
2657rxvt_term::selection_property (Window win, Atom prop) 2847rxvt_term::selection_property (Window win, Atom prop)
2658{ 2848{
2659 int reget_time = 0; 2849 if (prop == None || selection_wait != Sel_incr)
2660
2661 if (prop == None)
2662 return; 2850 return;
2663 2851
2664 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2665 if (selection_wait == Sel_normal)
2666 {
2667 int a, afmt;
2668 Atom atype;
2669 unsigned long bytes_after, nitems;
2670 unsigned char *s = NULL;
2671
2672 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2673 xa[XA_INCR], &atype, &afmt, &nitems,
2674 &bytes_after, &s);
2675 if (s)
2676 XFree (s);
2677 if (a != Success)
2678 return;
2679
2680#ifndef __CYGWIN32__
2681 if (atype == xa[XA_INCR])
2682 { /* start an INCR transfer */
2683 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2684 XDeleteProperty (display->display, win, prop);
2685 XFlush (display->display);
2686 reget_time = 1;
2687 selection_wait = Sel_incr;
2688 }
2689#endif
2690
2691 }
2692 else if (selection_wait == Sel_incr)
2693 {
2694 reget_time = 1;
2695
2696 if (selection_paste (win, prop, True) == -1) 2852 selection_paste (win, prop, true);
2697 {
2698 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2699 selection_wait = Sel_none;
2700 incr_ev.stop ();
2701 }
2702 }
2703 if (reget_time) /* received more data so reget time */
2704 incr_ev.start (NOW + 10);
2705} 2853}
2706 2854
2707/* ------------------------------------------------------------------------- */ 2855/* ------------------------------------------------------------------------- */
2708/* 2856/*
2709 * Request the current selection: 2857 * Request the current selection:
… …
2715 * EXT: button 2 release 2863 * EXT: button 2 release
2716 */ 2864 */
2717void 2865void
2718rxvt_term::selection_request (Time tm, int x, int y) 2866rxvt_term::selection_request (Time tm, int x, int y)
2719{ 2867{
2720 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2721
2722 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2868 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2723 return; /* outside window */ 2869 return; /* outside window */
2724 2870
2725 if (selection.text) 2871 if (selection.text)
2726 { /* internal selection */ 2872 { /* internal selection */
2727 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2728 char *str = rxvt_wcstombs (selection.text, selection.len); 2873 char *str = rxvt_wcstombs (selection.text, selection.len);
2729 paste ((unsigned char *)str, strlen (str)); 2874 paste ((unsigned char *)str, strlen (str));
2730 free (str); 2875 free (str);
2731 return; 2876 return;
2732 } 2877 }
… …
2746#else 2891#else
2747 selection_type = Sel_CompoundText; 2892 selection_type = Sel_CompoundText;
2748 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2749 return; 2894 return;
2750#endif 2895#endif
2751
2752 } 2896 }
2753 } 2897 }
2754 2898
2755 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2899 selection_wait = Sel_none; /* don't loop in selection_paste () */
2756 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2757 selection_paste (display->root, XA_CUT_BUFFER0, False); 2900 selection_paste (display->root, XA_CUT_BUFFER0, false);
2758} 2901}
2759 2902
2760int 2903int
2761rxvt_term::selection_request_other (Atom target, int selnum) 2904rxvt_term::selection_request_other (Atom target, int selnum)
2762{ 2905{
… …
2774 else 2917 else
2775 sel = xa[XA_CLIPBOARD]; 2918 sel = xa[XA_CLIPBOARD];
2776 2919
2777 if (XGetSelectionOwner (display->display, sel) != None) 2920 if (XGetSelectionOwner (display->display, sel) != None)
2778 { 2921 {
2779 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2780 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2922 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2781 TermWin.vt, selection_request_time); 2923 TermWin.vt, selection_request_time);
2782 return 1; 2924 return 1;
2783 } 2925 }
2784 2926
… …
2791 * EXT: SelectionClear 2933 * EXT: SelectionClear
2792 */ 2934 */
2793void 2935void
2794rxvt_term::selection_clear () 2936rxvt_term::selection_clear ()
2795{ 2937{
2796 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2797
2798 want_refresh = 1; 2938 want_refresh = 1;
2799 free (selection.text); 2939 free (selection.text);
2800 selection.text = NULL; 2940 selection.text = NULL;
2801 selection.len = 0; 2941 selection.len = 0;
2802 CLEAR_SELECTION (); 2942 CLEAR_SELECTION ();
… …
2815{ 2955{
2816 int i, col, end_col, row, end_row; 2956 int i, col, end_col, row, end_row;
2817 wchar_t *new_selection_text; 2957 wchar_t *new_selection_text;
2818 text_t *t; 2958 text_t *t;
2819 2959
2820 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2821 switch (selection.op) 2960 switch (selection.op)
2822 { 2961 {
2823 case SELECTION_CONT: 2962 case SELECTION_CONT:
2824 break; 2963 break;
2825 case SELECTION_INIT: 2964 case SELECTION_INIT:
… …
2839 2978
2840 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2979 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2841 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));
2842 2981
2843 col = selection.beg.col; 2982 col = selection.beg.col;
2844 MAX_IT (col, 0);
2845 row = selection.beg.row + TermWin.saveLines; 2983 row = selection.beg.row + TermWin.saveLines;
2846 end_row = selection.end.row + TermWin.saveLines; 2984 end_row = selection.end.row + TermWin.saveLines;
2847 int ofs = 0; 2985 int ofs = 0;
2848 int extra = 0; 2986 int extra = 0;
2849 2987
2850 for (; row <= end_row; row++, col = 0) 2988 for (; row <= end_row; row++, col = 0)
2851 { 2989 {
2852 t = &(screen.text[row][col]);
2853
2854 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);
2855 3001
2856 if (end_col == -1) 3002 if (end_col == -1)
2857 end_col = TermWin.ncol; 3003 end_col = TermWin.ncol;
2858 3004
2859 if (row == end_row) 3005 if (row == end_row || selection.rect)
2860 MIN_IT (end_col, selection.end.col); 3006 MIN_IT (end_col, selection.end.col);
2861 3007
3008 t = &screen.text[row][col];
2862 for (; col < end_col; col++) 3009 for (; col < end_col; col++)
2863 { 3010 {
2864 if (*t == NOCHAR) 3011 if (*t == NOCHAR)
2865 t++; 3012 t++;
2866#if ENABLE_COMBINING 3013#if ENABLE_COMBINING
… …
2914#if 0 3061#if 0
2915 XTextProperty ct; 3062 XTextProperty ct;
2916 3063
2917 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3064 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2918 { 3065 {
2919 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2920 PropModeReplace, ct.value, ct.nitems);
2921 XFree (ct.value); 3067 XFree (ct.value);
2922 } 3068 }
2923#endif 3069#endif
2924 3070
2925 selection_time = tm; 3071 selection_time = tm;
2926 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2927} 3072}
2928 3073
2929/* ------------------------------------------------------------------------- */ 3074/* ------------------------------------------------------------------------- */
2930/* 3075/*
2931 * 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
2932 * EXT: button 1 press 3077 * EXT: button 1 press
2933 */ 3078 */
2934void 3079void
2935rxvt_term::selection_click (int clicks, int x, int y) 3080rxvt_term::selection_click (int clicks, int x, int y)
2936{ 3081{
2937 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2938
2939 clicks = ((clicks - 1) % 3) + 1; 3082 clicks = ((clicks - 1) % 3) + 1;
2940 selection.clicks = clicks; /* save clicks so extend will work */ 3083 selection.clicks = clicks; /* save clicks so extend will work */
2941 3084
2942 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3085 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2943 3086
… …
2985 * We now only find out the boundary in one direction 3128 * We now only find out the boundary in one direction
2986 */ 3129 */
2987 3130
2988/* 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 */
2989#define DELIMIT_TEXT(x) \ 3132#define DELIMIT_TEXT(x) \
2990 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3133 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2991#define DELIMIT_REND(x) 1 3134#define DELIMIT_REND(x) 1
2992 3135
2993void 3136void
2994rxvt_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)
2995{ 3138{
… …
3013 3156
3014 row = mark->row + TermWin.saveLines; 3157 row = mark->row + TermWin.saveLines;
3015 col = mark->col; 3158 col = mark->col;
3016 MAX_IT (col, 0); 3159 MAX_IT (col, 0);
3017 /* find the edge of a word */ 3160 /* find the edge of a word */
3018 stp = & (screen.text[row][col]); 3161 stp = &screen.text[row][col];
3019 w1 = DELIMIT_TEXT (*stp); 3162 w1 = DELIMIT_TEXT (*stp);
3020 3163
3021 srp = (&screen.rend[row][col]); 3164 srp = &screen.rend[row][col];
3022 w2 = DELIMIT_REND (*srp); 3165 w2 = DELIMIT_REND (*srp);
3023 3166
3024 for (;;) 3167 for (;;)
3025 { 3168 {
3026 for (; col != bound.col; col += dirnadd) 3169 for (; col != bound.col; col += dirnadd)
… …
3060 } 3203 }
3061 break; 3204 break;
3062 } 3205 }
3063 3206
3064Old_Word_Selection_You_Die: 3207Old_Word_Selection_You_Die:
3065 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));
3066
3067 if (dirn == DN) 3208 if (dirn == DN)
3068 col++; /* put us on one past the end */ 3209 col++; /* put us on one past the end */
3069 3210
3070 /* Poke the values back in */ 3211 /* Poke the values back in */
3071 ret->row = row - TermWin.saveLines; 3212 ret->row = row - TermWin.saveLines;
… …
3105 /* select nothing */ 3246 /* select nothing */
3106 selection.beg.row = selection.end.row = 0; 3247 selection.beg.row = selection.end.row = 0;
3107 selection.beg.col = selection.end.col = 0; 3248 selection.beg.col = selection.end.col = 0;
3108 selection.clicks = 4; 3249 selection.clicks = 4;
3109 want_refresh = 1; 3250 want_refresh = 1;
3110 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3111 return; 3251 return;
3112 } 3252 }
3113 3253
3114 if (selection.clicks == 4) 3254 if (selection.clicks == 4)
3115 selection.clicks = 1; 3255 selection.clicks = 1;
… …
3131 row_col_t pos; 3271 row_col_t pos;
3132 enum { 3272 enum {
3133 LEFT, RIGHT 3273 LEFT, RIGHT
3134 } closeto = RIGHT; 3274 } closeto = RIGHT;
3135 3275
3136 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));
3137 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));
3138
3139 want_refresh = 1; 3276 want_refresh = 1;
3277
3140 switch (selection.op) 3278 switch (selection.op)
3141 { 3279 {
3142 case SELECTION_INIT: 3280 case SELECTION_INIT:
3143 CLEAR_SELECTION (); 3281 CLEAR_SELECTION ();
3144 selection.op = SELECTION_BEGIN; 3282 selection.op = SELECTION_BEGIN;
… …
3157 selection_start_colrow (col, row); 3295 selection_start_colrow (col, row);
3158 /* FALLTHROUGH */ 3296 /* FALLTHROUGH */
3159 default: 3297 default:
3160 return; 3298 return;
3161 } 3299 }
3300
3162 if (selection.beg.col == selection.end.col 3301 if (selection.beg.col == selection.end.col
3163 && selection.beg.col != selection.mark.col 3302 && selection.beg.col != selection.mark.col
3164 && selection.beg.row == selection.end.row 3303 && selection.beg.row == selection.end.row
3165 && selection.beg.row != selection.mark.row) 3304 && selection.beg.row != selection.mark.row)
3166 { 3305 {
3167 selection.beg.col = selection.end.col = selection.mark.col; 3306 selection.beg.col = selection.end.col = selection.mark.col;
3168 selection.beg.row = selection.end.row = selection.mark.row; 3307 selection.beg.row = selection.end.row = selection.mark.row;
3169 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));
3170 } 3308 }
3171 3309
3172 pos.col = col; 3310 pos.col = col;
3173 pos.row = row; 3311 pos.row = row;
3174 3312
… …
3217 } 3355 }
3218 else 3356 else
3219 { /* button1 drag or button3 drag */ 3357 { /* button1 drag or button3 drag */
3220 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3358 if (ROWCOL_IS_AFTER (selection.mark, pos))
3221 { 3359 {
3222 if ((selection.mark.row == selection.end.row) 3360 if (selection.mark.row == selection.end.row
3223 && (selection.mark.col == selection.end.col) 3361 && selection.mark.col == selection.end.col
3362 && clickchange
3224 && clickchange && selection.clicks == 2) 3363 && selection.clicks == 2)
3225 selection.mark.col--; 3364 selection.mark.col--;
3226 3365
3227 selection.beg.row = pos.row; 3366 selection.beg.row = pos.row;
3228 selection.beg.col = pos.col; 3367 selection.beg.col = pos.col;
3229 selection.end.row = selection.mark.row; 3368 selection.end.row = selection.mark.row;
… …
3240 3379
3241 if (selection.clicks == 1) 3380 if (selection.clicks == 1)
3242 { 3381 {
3243 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3382 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3244 3383
3245 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
3246 { 3389 )
3247#if 1
3248 selection.beg.col = ncol; 3390 selection.beg.col = ncol;
3249#else
3250 if (selection.beg.row != selection.end.row)
3251 selection.beg.col = ncol;
3252 else
3253 selection.beg.col = selection.mark.col;
3254#endif
3255 }
3256 3391
3257 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3392 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3258 3393
3259 if (end_col != -1 && selection.end.col > end_col) 3394 if (
3395 selection.end.col > end_col
3396 && end_col != -1
3397#if ENABLE_FRILLS
3398 && !selection.rect
3399#endif
3400 )
3260 selection.end.col = ncol; 3401 selection.end.col = ncol;
3261 } 3402 }
3262 else if (selection.clicks == 2) 3403 else if (selection.clicks == 2)
3263 { 3404 {
3264 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3405 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3265 selection.end.col--; 3406 selection.end.col--;
3266 3407
3267 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3268 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3408 selection_delimit_word (UP, &selection.beg, &selection.beg);
3409 selection_delimit_word (DN, &selection.end, &selection.end);
3269 } 3410 }
3270 else if (selection.clicks == 3) 3411 else if (selection.clicks == 3)
3271 { 3412 {
3272#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
3273 if ((Options & Opt_tripleclickwords)) 3414 if ((options & Opt_tripleclickwords))
3274 { 3415 {
3275 int end_row; 3416 int end_row;
3276 3417
3277 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3418 selection_delimit_word (UP, &selection.beg, &selection.beg);
3278 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3419 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3279 3420
3280 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3421 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3281 { 3422 {
3282 end_col = screen.tlen[end_row + TermWin.saveLines]; 3423 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3293 else 3434 else
3294#endif 3435#endif
3295 { 3436 {
3296 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3437 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3297 selection.mark.col++; 3438 selection.mark.col++;
3439
3298 selection.beg.col = 0; 3440 selection.beg.col = 0;
3299 selection.end.col = ncol; 3441 selection.end.col = ncol;
3300 } 3442 }
3301 } 3443 }
3302 3444
3303 if (button3 && buttonpress) 3445 if (button3 && buttonpress)
3304 { /* mark may need to be changed */ 3446 { /* mark may need to be changed */
3305 if (closeto == LEFT) 3447 if (closeto == LEFT)
3306 { 3448 {
3307 selection.mark.row = selection.end.row; 3449 selection.mark.row = selection.end.row;
3308 selection.mark.col = selection.end.col 3450 selection.mark.col = selection.end.col - (selection.clicks == 2);
3309 - (selection.clicks == 2);
3310 } 3451 }
3311 else 3452 else
3312 { 3453 {
3313 selection.mark.row = selection.beg.row; 3454 selection.mark.row = selection.beg.row;
3314 selection.mark.col = selection.beg.col; 3455 selection.mark.col = selection.beg.col;
3315 } 3456 }
3316 } 3457 }
3317 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));
3318}
3319 3458
3320#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
3321void 3466void
3322rxvt_term::selection_remove_trailing_spaces () 3467rxvt_term::selection_remove_trailing_spaces ()
3323{ 3468{
3324 int32_t end_col, end_row; 3469 int32_t end_col, end_row;
3325 text_t *stp; 3470 text_t *stp;
3326 3471
3327 end_col = selection.end.col; 3472 end_col = selection.end.col;
3328 end_row = selection.end.row; 3473 end_row = selection.end.row;
3474
3329 for ( ; end_row >= selection.beg.row; ) 3475 for ( ; end_row >= selection.beg.row; )
3330 { 3476 {
3331 stp = screen.text[end_row + TermWin.saveLines]; 3477 stp = screen.text[end_row + TermWin.saveLines];
3478
3332 while (--end_col >= 0) 3479 while (--end_col >= 0)
3333 { 3480 {
3334 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3481 if (stp[end_col] != ' '
3482 && stp[end_col] != '\t'
3483 && stp[end_col] != NOCHAR)
3335 break; 3484 break;
3336 } 3485 }
3486
3337 if (end_col >= 0 3487 if (end_col >= 0
3338 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3488 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3339 { 3489 {
3340 selection.end.col = end_col + 1; 3490 selection.end.col = end_col + 1;
3341 selection.end.row = end_row; 3491 selection.end.row = end_row;
3342 break; 3492 break;
3343 } 3493 }
3494
3344 end_row--; 3495 end_row--;
3345 end_col = TermWin.ncol; 3496 end_col = TermWin.ncol;
3346 } 3497 }
3498
3347 if (selection.mark.row > selection.end.row) 3499 if (selection.mark.row > selection.end.row)
3348 { 3500 {
3349 selection.mark.row = selection.end.row; 3501 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col; 3502 selection.mark.col = selection.end.col;
3351 } 3503 }
… …
3367 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3519 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3368} 3520}
3369 3521
3370/* ------------------------------------------------------------------------- */ 3522/* ------------------------------------------------------------------------- */
3371/* 3523/*
3372 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3373 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3374 * the X11 protocol.
3375 */
3376typedef CARD32 Atom32;
3377
3378/* ------------------------------------------------------------------------- */
3379/*
3380 * Respond to a request for our current selection 3524 * Respond to a request for our current selection
3381 * EXT: SelectionRequest 3525 * EXT: SelectionRequest
3382 */ 3526 */
3383void 3527void
3384rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3528rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3385{ 3529{
3386 XSelectionEvent ev; 3530 XSelectionEvent ev;
3387 XTextProperty ct;
3388 XICCEncodingStyle style;
3389 Atom target;
3390 3531
3391 ev.type = SelectionNotify; 3532 ev.type = SelectionNotify;
3392 ev.property = None; 3533 ev.property = None;
3393 ev.display = rq.display; 3534 ev.display = rq.display;
3394 ev.requestor = rq.requestor; 3535 ev.requestor = rq.requestor;
… …
3396 ev.target = rq.target; 3537 ev.target = rq.target;
3397 ev.time = rq.time; 3538 ev.time = rq.time;
3398 3539
3399 if (rq.target == xa[XA_TARGETS]) 3540 if (rq.target == xa[XA_TARGETS])
3400 { 3541 {
3401 Atom32 target_list[6]; 3542 Atom target_list[6];
3402 Atom32 *target = target_list; 3543 Atom *target = target_list;
3403 3544
3404 *target++ = (Atom32) xa[XA_TARGETS]; 3545 *target++ = xa[XA_TARGETS];
3405 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3546 *target++ = xa[XA_TIMESTAMP];
3406 *target++ = (Atom32) XA_STRING; 3547 *target++ = XA_STRING;
3407 *target++ = (Atom32) xa[XA_TEXT]; 3548 *target++ = xa[XA_TEXT];
3408 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3549 *target++ = xa[XA_COMPOUND_TEXT];
3409#if X_HAVE_UTF8_STRING 3550#if X_HAVE_UTF8_STRING
3410 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3551 *target++ = xa[XA_UTF8_STRING];
3411#endif 3552#endif
3412 3553
3413 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3554 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3414 (8 * sizeof (target_list[0])), PropModeReplace, 3555 32, PropModeReplace,
3415 (unsigned char *)target_list, 3556 (unsigned char *)target_list, target - target_list);
3416 target - target_list);
3417 ev.property = rq.property; 3557 ev.property = rq.property;
3418 } 3558 }
3559#if TODO // TODO
3419 else if (rq.target == xa[XA_MULTIPLE]) 3560 else if (rq.target == xa[XA_MULTIPLE])
3420 { 3561 {
3421 /* TODO: Handle MULTIPLE */ 3562 /* TODO: Handle MULTIPLE */
3422 } 3563 }
3564#endif
3423 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3565 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3424 { 3566 {
3425 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3567 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3426 (8 * sizeof (Time)), PropModeReplace,
3427 (unsigned char *)&selection_time, 1); 3568 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3428 ev.property = rq.property; 3569 ev.property = rq.property;
3429 } 3570 }
3430 else if (rq.target == XA_STRING 3571 else if (rq.target == XA_STRING
3431 || rq.target == xa[XA_TEXT] 3572 || rq.target == xa[XA_TEXT]
3432 || rq.target == xa[XA_COMPOUND_TEXT] 3573 || rq.target == xa[XA_COMPOUND_TEXT]
3433 || rq.target == xa[XA_UTF8_STRING] 3574 || rq.target == xa[XA_UTF8_STRING]
3434 ) 3575 )
3435 { 3576 {
3577 XTextProperty ct;
3578 Atom target = rq.target;
3436 short freect = 0; 3579 short freect = 0;
3437 int selectlen; 3580 int selectlen;
3438 wchar_t *cl; 3581 wchar_t *cl;
3439 3582 enum {
3440 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;
3441 3592
3442 if (target == XA_STRING) 3593 if (target == XA_STRING)
3443 // 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
3444 // will ask for another format anyways. 3595 // will ask for another format anyways.
3445 style = XStringStyle; 3596 style = enc_string;
3446 else if (target == xa[XA_TEXT]) 3597 else if (target == xa[XA_TEXT])
3447 style = XStdICCTextStyle; 3598 style = enc_text;
3448 else if (target == xa[XA_COMPOUND_TEXT]) 3599 else if (target == xa[XA_COMPOUND_TEXT])
3449 style = XCompoundTextStyle; 3600 style = enc_compound_text;
3450#if X_HAVE_UTF8_STRING 3601#if ENABLE_FRILLS
3451 else if (target == xa[XA_UTF8_STRING]) 3602 else if (target == xa[XA_UTF8_STRING])
3452 style = XUTF8StringStyle; 3603 style = enc_utf8;
3453#endif 3604#endif
3454 else 3605 else
3455 { 3606 {
3456 target = xa[XA_COMPOUND_TEXT]; 3607 target = xa[XA_COMPOUND_TEXT];
3457 style = XCompoundTextStyle; 3608 style = enc_compound_text;
3458 } 3609 }
3459 3610
3460 if (selection.text) 3611 if (selection.text)
3461 { 3612 {
3462 cl = selection.text; 3613 cl = selection.text;
… …
3466 { 3617 {
3467 cl = L""; 3618 cl = L"";
3468 selectlen = 0; 3619 selectlen = 0;
3469 } 3620 }
3470 3621
3471 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3622#if ENABLE_FRILLS
3472 // 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
3473 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3635 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3474 freect = 1; 3636 freect = 1;
3475 else 3637 else
3476 { 3638 {
3477 /* if we failed to convert then send it raw */ 3639 /* if we failed to convert then send it raw */
3478 ct.value = (unsigned char *)cl; 3640 ct.value = (unsigned char *)cl;
3479 ct.nitems = selectlen; 3641 ct.nitems = selectlen;
3642 ct.encoding = target;
3480 } 3643 }
3481 3644
3482 XChangeProperty (display->display, rq.requestor, rq.property, 3645 XChangeProperty (display->display, rq.requestor, rq.property,
3483 target, 8, PropModeReplace, 3646 ct.encoding, 8, PropModeReplace,
3484 ct.value, (int)ct.nitems); 3647 ct.value, (int)ct.nitems);
3485 ev.property = rq.property; 3648 ev.property = rq.property;
3486 3649
3487 if (freect) 3650 if (freect)
3488 XFree (ct.value); 3651 XFree (ct.value);
… …
3508} 3671}
3509 3672
3510/* ------------------------------------------------------------------------- */ 3673/* ------------------------------------------------------------------------- */
3511#ifdef USE_XIM 3674#ifdef USE_XIM
3512void 3675void
3513rxvt_term::im_set_position (XPoint *pos) 3676rxvt_term::im_set_position (XPoint &pos)
3514{ 3677{
3515 XWindowAttributes xwa; 3678 XWindowAttributes xwa;
3516 3679
3517 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3680 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3681
3518 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3682 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3519 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3683 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3520} 3684}
3521
3522#endif 3685#endif
3523/* ------------------------------------------------------------------------- */ 3686
3524 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
3525/* ------------------------------------------------------------------------- * 3809/* ------------------------------------------------------------------------- */
3526 * DEBUG ROUTINES *
3527 * ------------------------------------------------------------------------- */
3528#if 0
3529void
3530rxvt_debug_colors (void)
3531{
3532 int color;
3533 const char *name[] =
3534 {
3535 "fg", "bg",
3536 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3537 };
3538
3539 fprintf (stderr, "Color ( ");
3540 if (rstyle & RS_RVid)
3541 fprintf (stderr, "rvid ");
3542 if (rstyle & RS_Bold)
3543 fprintf (stderr, "bold ");
3544 if (rstyle & RS_Blink)
3545 fprintf (stderr, "blink ");
3546 if (rstyle & RS_Uline)
3547 fprintf (stderr, "uline ");
3548 fprintf (stderr, "): ");
3549
3550 color = GET_FGCOLOR (rstyle);
3551#ifndef NO_BRIGHTCOLOR
3552 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3553 {
3554 color -= (minBrightCOLOR - minCOLOR);
3555 fprintf (stderr, "bright ");
3556 }
3557#endif
3558 fprintf (stderr, "%s on ", name[color]);
3559
3560 color = GET_BGCOLOR (rstyle);
3561#ifndef NO_BRIGHTCOLOR
3562 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3563 {
3564 color -= (minBrightCOLOR - minCOLOR);
3565 fprintf (stderr, "bright ");
3566 }
3567#endif
3568 fprintf (stderr, "%s\n", name[color]);
3569}
3570#endif

Diff Legend

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