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

Diff Legend

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