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.147 by root, Sun Dec 12 15:13:37 2004 UTC vs.
Revision 1.207 by root, Wed Jan 4 04:42:45 2006 UTC

… …
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#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33#include <wchar.h>
34 34
35#include "salloc.C" // HACK, should be a seperate compile! 35#include "salloc.C" // HACK, should be a seperate compile!
36 36
37inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
38{ 38{
39 while (len--) 39 while (len--)
40 *start++ = value; 40 *start++ = value;
41} 41}
42 42
43/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 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, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 131
132 text_t *et = l.t + col;
133 rend_t *er = l.r + col;
134
124 while (width--) 135 while (width--)
125 { 136 {
126 *et++ = ' '; 137 *et++ = ' ';
127 *er++ = efs; 138 *er++ = efs;
128 } 139 }
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 unsigned int 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 unsigned int 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
… …
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;
571 530
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 531 ::swap (screen.cur.row, swap.cur.row);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 532 ::swap (screen.cur.col, swap.cur.col);
574# ifdef DEBUG_STRICT 533
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583 536
584#if NSCREENS 537#if NSCREENS
585 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
586 { 539 {
587 num_scr = 0; 540 num_scr = 0;
588 offset = TermWin.saveLines;
589 541
590 for (i = prev_nrow; i--;) 542 for (int i = prev_nrow; i--; )
591 { 543 ::swap (ROW(i), swap_buf [i]);
592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
595 }
596 544
597 SWAP_IT (screen.charset, swap.charset, int16_t); 545 ::swap (screen.charset, swap.charset);
598 SWAP_IT (screen.flags, swap.flags, int); 546 ::swap (screen.flags, swap.flags);
599 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
600 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
601 } 549 }
602 else 550 else
603#endif 551#endif
604 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
605 //if (current_screen == PRIMARY)
606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
607 554
608 return scrn; 555 return scrn;
609} 556}
610 557
611// clear WrapNext indicator, solidifying position on next line 558// clear WrapNext indicator, solidifying position on next line
… …
618 screen.flags &= ~Screen_WrapNext; 565 screen.flags &= ~Screen_WrapNext;
619 566
620 screen.cur.col = 0; 567 screen.cur.col = 0;
621 568
622 if (screen.cur.row == screen.bscroll) 569 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 570 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
624 else if (screen.cur.row < TermWin.nrow - 1) 571 else if (screen.cur.row < nrow - 1)
625 screen.cur.row++; 572 screen.cur.row++;
626} 573}
627 574
628/* ------------------------------------------------------------------------- */ 575/* ------------------------------------------------------------------------- */
629/* 576/*
… …
659/* ------------------------------------------------------------------------- */ 606/* ------------------------------------------------------------------------- */
660/* 607/*
661 * Scroll text between <row1> and <row2> inclusive, by <count> lines 608 * Scroll text between <row1> and <row2> inclusive, by <count> lines
662 * count positive ==> scroll up 609 * count positive ==> scroll up
663 * count negative ==> scroll down 610 * count negative ==> scroll down
664 * spec == 0 for normal routines
665 */ 611 */
666int 612int
667rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 613rxvt_term::scr_scroll_text (int row1, int row2, int count)
668{ 614{
669 int i, j;
670 long nscrolled;
671
672 if (count == 0 || (row1 > row2)) 615 if (count == 0 || (row1 > row2))
673 return 0; 616 return 0;
674 617
675 want_refresh = 1; 618 want_refresh = 1;
619 num_scr += count;
676 620
677 if (row1 == 0 && count > 0 621 if (count > 0
622 && row1 == 0
623 && row2 == nrow - 1
678 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
679 { 625 {
680 nscrolled = (long)TermWin.nscrolled + (long)count; 626 nsaved = min (nsaved + count, saveLines);
681 627
682 if (nscrolled > (long)TermWin.saveLines) 628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
683 TermWin.nscrolled = TermWin.saveLines;
684 else 629
685 TermWin.nscrolled = (unsigned int)nscrolled; 630 term_start = (term_start + count) % total_rows;
686 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
687 if ((options & Opt_scrollWithBuffer) 653 if (OPTION (Opt_scrollWithBuffer)
688 && TermWin.view_start != 0 654 && view_start != 0
689 && TermWin.view_start != TermWin.saveLines) 655 && view_start != saveLines)
690 scr_page (UP, count); 656 scr_page (UP, count);
691 } 657 }
692 else if (!spec) 658 else
693 row1 += TermWin.saveLines; 659 {
694
695 row2 += TermWin.saveLines;
696
697 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
698 { 661 {
699 i = selection.beg.row + TermWin.saveLines; 662 if ((selection.beg.row < row1 && selection.end.row > row1)
700 j = selection.end.row + TermWin.saveLines; 663 || (selection.beg.row < row2 && selection.end.row > row2)
701 if ((i < row1 && j > row1) 664 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
702 || (i < row2 && j > row2) 665 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
703 || (i - count < row1 && i >= row1) 666 || (selection.end.row - count < row1 && selection.end.row >= row1)
704 || (i - count > row2 && i <= row2) 667 || (selection.end.row - count > row2 && selection.end.row <= row2))
705 || (j - count < row1 && j >= row1)
706 || (j - count > row2 && j <= row2))
707 { 668 {
708 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
710 } 671 }
711 else if (j >= row1 && j <= row2) 672 else if (selection.end.row >= row1 && selection.end.row <= row2)
712 { 673 {
713 /* move selected region too */ 674 /* move selected region too */
714 selection.beg.row -= count; 675 selection.beg.row -= count;
715 selection.end.row -= count; 676 selection.end.row -= count;
716 selection.mark.row -= count; 677 selection.mark.row -= count;
678
679 selection_check (0);
717 } 680 }
718 }
719
720 selection_check (0); /* _after_ TermWin.nscrolled update */
721
722 num_scr += count;
723 j = count;
724
725 if (count < 0)
726 count = -count;
727
728 i = row2 - row1 + 1;
729 MIN_IT (count, i);
730
731 if (j > 0)
732 {
733 /* A: scroll up */
734
735 /* A1: Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738
739 /* A2: Rotate lines */
740 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744
745 j = row2 - count + 1, i = count;
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750
751 /* B1: Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--)
753 { 681 }
754 buf_text[i] = screen.text[j]; 682
755 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++)
756 } 691 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
757 693
758 /* B2: Rotate lines */ 694 if (!IN_RANGE_EXC (row + count, 0, rows))
759 for (j = row2, i = j - count; i >= row1; i--, j--) 695 scr_blank_screen_mem (temp_buf [row], rstyle);
760 { 696 }
761 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i];
764 }
765 697
766 j = row1, i = count; 698 for (int row = 0; row < rows; row++)
767 count = -count; 699 ROW(row1 + row) = temp_buf [row];
768 } 700 }
769
770 /* C: Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++)
776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
777 701
778 return count; 702 return count;
779} 703}
780 704
781/* ------------------------------------------------------------------------- */ 705/* ------------------------------------------------------------------------- */
… …
783 * Add text given in <str> of length <len> to screen struct 707 * Add text given in <str> of length <len> to screen struct
784 */ 708 */
785void 709void
786rxvt_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)
787{ 711{
712 if (len <= 0) /* sanity */
713 return;
714
788 unsigned char checksel; 715 unsigned char checksel;
789 unicode_t c; 716 unicode_t c;
790 int i, row, last_col; 717 int last_col;
791 text_t *stp; 718 const unicode_t *strend = str + len;
792 rend_t *srp;
793
794 if (len <= 0) /* sanity */
795 return;
796 719
797 want_refresh = 1; 720 want_refresh = 1;
798 ZERO_SCROLLBACK (); 721 ZERO_SCROLLBACK ();
799 last_col = TermWin.ncol; 722 last_col = ncol;
800 723
801 if (nlines > 0) 724 if (nlines > 0)
802 { 725 {
803 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
804 if ((nlines > 0) 727 if (nlines > 0
805 && (screen.tscroll == 0) 728 && screen.tscroll == 0
806 && (screen.bscroll == (TermWin.nrow - 1))) 729 && screen.bscroll == (nrow - 1))
807 { 730 {
808 /* _at least_ this many lines need to be scrolled */ 731 /* _at least_ this many lines need to be scrolled */
809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
810 screen.cur.row -= nlines; 733 screen.cur.row -= nlines;
811 } 734 }
812 } 735 }
813 736
814#ifdef DEBUG_STRICT 737#ifdef DEBUG_STRICT
815 assert (screen.cur.col < last_col); 738 assert (screen.cur.col < last_col);
816 assert ((screen.cur.row < TermWin.nrow) 739 assert (screen.cur.row < nrow
817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 740 && screen.cur.row >= -nsaved);
818#else /* drive with your eyes closed */
819 MIN_IT (screen.cur.col, last_col - 1);
820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
822#endif 741#endif
823 row = screen.cur.row + TermWin.saveLines; 742 int row = screen.cur.row;
824 743
825 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 744 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826 745
827 stp = screen.text[row]; 746 line_t *line = &ROW(row);
828 srp = screen.rend[row];
829 747
830 while (len--) 748 while (str < strend)
831 { 749 {
832 c = *str++; 750 c = *str++;
833 751
834 if (c < 0x20) 752 if (c < 0x20)
835 switch (c) 753 if (c == C0_LF)
836 { 754 {
837 case C0_HT: 755 if (!line->is_longer ()) /* XXX: think about this */
838 scr_tab (1, true); 756 max_it (line->l, screen.cur.col);
839 continue;
840 757
841 case C0_LF:
842 if (screen.tlen[row] != -1) /* XXX: think about this */
843 MAX_IT (screen.tlen[row], screen.cur.col);
844
845 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
846 759
847 if (screen.cur.row == screen.bscroll) 760 if (screen.cur.row == screen.bscroll)
848 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 761 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
849 else if (screen.cur.row < (TermWin.nrow - 1)) 762 else if (screen.cur.row < (nrow - 1))
850 row = (++screen.cur.row) + TermWin.saveLines; 763 row = ++screen.cur.row;
851 764
852 stp = screen.text[row]; /* _must_ refresh */ 765 line = &ROW(row); /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 766 continue;
767 }
768 else if (c == C0_CR)
769 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col);
855 772
856 case C0_CR:
857 if (screen.tlen[row] != -1) /* XXX: think about this */
858 MAX_IT (screen.tlen[row], screen.cur.col);
859
860 screen.flags &= ~Screen_WrapNext; 773 screen.flags &= ~Screen_WrapNext;
861 screen.cur.col = 0; 774 screen.cur.col = 0;
862 continue; 775 continue;
776 }
777 else if (c == C0_HT)
778 {
779 scr_tab (1, true);
780 continue;
863 } 781 }
864 782
865 if (checksel /* see if we're writing within selection */ 783 if (checksel /* see if we're writing within selection */
866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 784 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 785 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
875 CLEAR_SELECTION (); 793 CLEAR_SELECTION ();
876 } 794 }
877 795
878 if (screen.flags & Screen_WrapNext) 796 if (screen.flags & Screen_WrapNext)
879 { 797 {
880 screen.tlen[row] = -1; 798 line->set_is_longer ();
881 799
882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 800 scr_do_wrap ();
883
884 stp = screen.text[row]; /* _must_ refresh */
885 srp = screen.rend[row]; /* _must_ refresh */
886 } 801
802 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */
804 }
805
806 // some utf-8 decoders "decode" surrogate characters: let's fix this.
807 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
808 c = 0xfffd;
887 809
888 // rely on wcwidth to tell us the character width, at least for non-latin1 810 // rely on wcwidth to tell us the character width, at least for non-latin1
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 811 // do wcwidth before further replacements, as wcwidth might return -1
890 // characters have width -1 (DOH!) on GNU/Linux sometimes. 812 // for the line drawing characters below as they might be invalid in the current
813 // locale.
891 int width = c < 0x100 ? 1 : wcwidth (c); 814 int width = c < 0x100 ? 1 : wcwidth (c);
892 815
893 if (charsets[screen.charset] == '0') // DEC SPECIAL 816 if (charsets[screen.charset] == '0') // DEC SPECIAL
894 { 817 {
895 // vt100 special graphics and line drawing 818 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100 819 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars 820 // 40-5e rxvt extension for extra curses acs chars
898 static uint16_t vt100_0[63] = { // 40 .. 7e 821 static uint16_t vt100_0[62] = { // 41 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 822 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 823 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 824 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 825 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 826 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 827 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 828 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 829 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907 }; 830 };
908 831
909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 832 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910 { 833 {
911 c = vt100_0[c - 0x40]; 834 c = vt100_0[c - 0x41];
912 width = 1; 835 width = 1; // vt100 line drawing characters are always single-width
913 } 836 }
914 } 837 }
915 838
916 if (screen.flags & Screen_Insert) 839 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT); 840 scr_insdel_chars (width, INSERT);
918 841
919 if (width != 0) 842 if (width != 0)
920 { 843 {
921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3 844#if !UNICODE_3
926 // trim characters we can't store directly :( 845 // trim characters we can't store directly :(
927 if (c >= 0x10000) 846 if (c >= 0x10000)
928# if ENABLE_COMBINING 847# if ENABLE_COMBINING
929 c = rxvt_composite.compose (c); // map to lower 16 bits 848 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
931 c = 0xfffd; 850 c = 0xfffd;
932# endif 851# endif
933#endif 852#endif
934 853
935 // nuke the character at this position, if required 854 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR 855 if (line->t[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1 856 || (screen.cur.col < ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR)) 857 && line->t[screen.cur.col + 1] == NOCHAR))
939 { 858 {
940 int col = screen.cur.col; 859 int col = screen.cur.col;
941 860
942 // find begin 861 // find begin
943 while (col > 0 && stp[col] == NOCHAR) 862 while (col > 0 && line->t[col] == NOCHAR)
944 col--; 863 col--;
945 864
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 865 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
947 866
948 // found begin, nuke 867 // found begin, nuke
949 do { 868 do {
950 stp[col] = ' '; 869 line->t[col] = ' ';
951 srp[col] = rend; 870 line->r[col] = rend;
952 col++; 871 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR); 872 } while (col < ncol && line->t[col] == NOCHAR);
954 } 873 }
955 874
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876
877 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width)
879 {
880 // ...output spaces
881 c = ' ';
882 // and try the same character next loop iteration
883 --str;
884 }
957 885
958 do 886 do
959 { 887 {
960 stp[screen.cur.col] = c; 888 line->t[screen.cur.col] = c;
961 srp[screen.cur.col] = rend; 889 line->r[screen.cur.col] = rend;
962 890
963 if (screen.cur.col < last_col - 1) 891 if (screen.cur.col < last_col - 1)
964 screen.cur.col++; 892 screen.cur.col++;
965 else 893 else
966 { 894 {
967 screen.tlen[row] = last_col; 895 line->l = last_col;
968 if (screen.flags & Screen_Autowrap) 896 if (screen.flags & Screen_Autowrap)
969 screen.flags |= Screen_WrapNext; 897 screen.flags |= Screen_WrapNext;
970 break; 898 break;
971 } 899 }
972 900
… …
974 } 902 }
975 while (--width > 0); 903 while (--width > 0);
976 904
977 // pad with spaces when overwriting wide character with smaller one 905 // pad with spaces when overwriting wide character with smaller one
978 if (!width) 906 if (!width)
979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
980 { 908 {
981 stp[c] = ' '; 909 line->t[c] = ' ';
982 srp[c] = rend; 910 line->r[c] = rend;
983 } 911 }
984 } 912 }
985 else if (width == 0) 913 else // width == 0
986 { 914 {
987#if ENABLE_COMBINING 915#if ENABLE_COMBINING
988 // handle combining characters 916 // handle combining characters
989 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
990 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
991 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
992
993 text_t *tp; 920 text_t *tp;
994 rend_t *rp; 921 rend_t *rp;
995 922
996 if (screen.cur.col > 0) 923 if (screen.cur.col > 0)
997 { 924 {
998 tp = stp + screen.cur.col - 1; 925 tp = line->t + screen.cur.col - 1;
999 rp = srp + screen.cur.col - 1; 926 rp = line->r + screen.cur.col - 1;
1000 927
1001 while (*tp == NOCHAR && tp > stp) 928 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--; 929 tp--, rp--;
1003 } 930 }
1004 else if (screen.cur.row > 0 931 else if (screen.cur.row > 0
1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 932 && ROW(screen.cur.row - 1).is_longer ())
1006 { 933 {
1007 int line = screen.cur.row - 1 + TermWin.saveLines; 934 line_t *line = &ROW(screen.cur.row - 1);
1008 935
1009 tp = screen.text[line] + last_col - 1; 936 tp = line->t + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1; 937 rp = line->r + last_col - 1;
1011 938
1012 while (*tp == NOCHAR && tp > screen.text[line]) 939 while (*tp == NOCHAR && tp > line->t)
1013 tp--, rp--; 940 tp--, rp--;
1014 } 941 }
1015 else 942 else
1016 continue; 943 continue;
1017 944
… …
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1025#endif 952#endif
1026 } 953 }
1027 } 954 }
1028 955
1029 if (screen.tlen[row] != -1) /* XXX: think about this */ 956 if (!line->is_longer ()) /* XXX: think about this */
1030 MAX_IT (screen.tlen[row], screen.cur.col); 957 max_it (line->l, screen.cur.col);
1031 958
1032#ifdef DEBUG_STRICT 959#ifdef DEBUG_STRICT
1033 assert (screen.cur.row >= 0); 960 assert (screen.cur.row >= 0);
1034#else /* drive with your eyes closed */
1035 MAX_IT (screen.cur.row, 0);
1036#endif 961#endif
1037} 962}
1038 963
1039/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
1040/* 965/*
… …
1049 if (screen.cur.col == 0) 974 if (screen.cur.col == 0)
1050 { 975 {
1051 if (screen.cur.row > 0) 976 if (screen.cur.row > 0)
1052 { 977 {
1053#ifdef TERMCAP_HAS_BW 978#ifdef TERMCAP_HAS_BW
1054 screen.cur.col = TermWin.ncol - 1; 979 screen.cur.col = ncol - 1;
1055 screen.cur.row--; 980 screen.cur.row--;
1056 return; 981 return;
1057#endif 982#endif
1058 } 983 }
1059 } 984 }
… …
1079 1004
1080 if (count == 0) 1005 if (count == 0)
1081 return; 1006 return;
1082 else if (count > 0) 1007 else if (count > 0)
1083 { 1008 {
1084 int row = TermWin.saveLines + screen.cur.row; 1009 line_t &l = ROW(screen.cur.row);
1085 text_t *tp = screen.text[row];
1086 rend_t *rp = screen.rend[row];
1087 rend_t base_rend = rp[i]; 1010 rend_t base_rend = l.r[i];
1088 ht &= tp[i] == ' '; 1011 ht &= l.t[i] == ' ';
1089 1012
1090 for (; ++i < TermWin.ncol; ) 1013 for (; ++i < ncol; )
1091 if (tabs[i]) 1014 if (tabs[i])
1092 { 1015 {
1093 x = i; 1016 x = i;
1094 if (!--count) 1017 if (!--count)
1095 break; 1018 break;
1096 } 1019 }
1097 else 1020 else
1098 ht &= tp[i] == ' ' 1021 ht &= l.t[i] == ' '
1099 && RS_SAME (rp[i], base_rend); 1022 && RS_SAME (l.r[i], base_rend);
1100 1023
1101 if (count) 1024 if (count)
1102 x = TermWin.ncol - 1; 1025 x = ncol - 1;
1103 1026
1104 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1107 { 1030 {
1108 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1109 1032
1110 if (screen.tlen[row] != -1) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x); 1034 max_it (l.l, x);
1112 1035
1113 i = screen.cur.col; 1036 i = screen.cur.col;
1114 1037
1115 tp[i] = '\t'; 1038 l.t[i] = '\t';
1116 rp[i] = base_rend; 1039 l.r[i] = base_rend;
1117 1040
1118 while (++i < x) 1041 while (++i < x)
1119 { 1042 {
1120 tp[i] = NOCHAR; 1043 l.t[i] = NOCHAR;
1121 rp[i] = base_rend; 1044 l.r[i] = base_rend;
1122 } 1045 }
1123 } 1046 }
1124 } 1047 }
1125 else /* if (count < 0) */ 1048 else /* if (count < 0) */
1126 { 1049 {
… …
1152rxvt_term::scr_backindex () 1075rxvt_term::scr_backindex ()
1153{ 1076{
1154 if (screen.cur.col > 0) 1077 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1079 else
1157 {
1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1159 return; /* um, yeah? */
1160
1161 scr_insdel_chars (1, INSERT); 1080 scr_insdel_chars (1, INSERT);
1162 }
1163} 1081}
1164#endif 1082#endif
1165/* ------------------------------------------------------------------------- */ 1083/* ------------------------------------------------------------------------- */
1166/* 1084/*
1167 * Process DEC Forward Index 1085 * Process DEC Forward Index
… …
1171 */ 1089 */
1172#if ENABLE_FRILLS 1090#if ENABLE_FRILLS
1173void 1091void
1174rxvt_term::scr_forwardindex () 1092rxvt_term::scr_forwardindex ()
1175{ 1093{
1176 int row;
1177
1178 if (screen.cur.col < TermWin.ncol - 1) 1094 if (screen.cur.col < ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1096 else
1181 { 1097 {
1182 row = screen.cur.row + TermWin.saveLines; 1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1183 1099 ROW(screen.cur.row).l = ncol;
1184 if (screen.tlen[row] == 0)
1185 return; /* um, yeah? */
1186 else if (screen.tlen[row] == -1)
1187 screen.tlen[row] = TermWin.ncol;
1188 1100
1189 scr_gotorc (0, 0, R_RELATIVE); 1101 scr_gotorc (0, 0, R_RELATIVE);
1190 scr_insdel_chars (1, DELETE); 1102 scr_insdel_chars (1, DELETE);
1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1103 scr_gotorc (0, ncol - 1, R_RELATIVE);
1192 } 1104 }
1193} 1105}
1194#endif 1106#endif
1195 1107
1196/* ------------------------------------------------------------------------- */ 1108/* ------------------------------------------------------------------------- */
… …
1202{ 1114{
1203 want_refresh = 1; 1115 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1205 1117
1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1207 MAX_IT (screen.cur.col, 0); 1119 clamp_it (screen.cur.col, 0, ncol - 1);
1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1209 1120
1210 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1211 1122
1212 if (relative & R_RELATIVE) 1123 if (relative & R_RELATIVE)
1213 { 1124 {
… …
1231 else 1142 else
1232 { 1143 {
1233 if (screen.flags & Screen_Relative) 1144 if (screen.flags & Screen_Relative)
1234 { /* relative origin mode */ 1145 { /* relative origin mode */
1235 screen.cur.row = row + screen.tscroll; 1146 screen.cur.row = row + screen.tscroll;
1236 MIN_IT (screen.cur.row, screen.bscroll); 1147 min_it (screen.cur.row, screen.bscroll);
1237 } 1148 }
1238 else 1149 else
1239 screen.cur.row = row; 1150 screen.cur.row = row;
1240 } 1151 }
1241 1152
1242 MAX_IT (screen.cur.row, 0); 1153 clamp_it (screen.cur.row, 0, nrow - 1);
1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1244} 1154}
1245 1155
1246/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1247/* 1157/*
1248 * direction should be UP or DN 1158 * direction should be UP or DN
… …
1259 1169
1260 screen.flags &= ~Screen_WrapNext; 1170 screen.flags &= ~Screen_WrapNext;
1261 1171
1262 if ((screen.cur.row == screen.bscroll && direction == UP) 1172 if ((screen.cur.row == screen.bscroll && direction == UP)
1263 || (screen.cur.row == screen.tscroll && direction == DN)) 1173 || (screen.cur.row == screen.tscroll && direction == DN))
1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1174 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1265 else 1175 else
1266 screen.cur.row += dirn; 1176 screen.cur.row += dirn;
1267 1177
1268 MAX_IT (screen.cur.row, 0); 1178 clamp_it (screen.cur.row, 0, nrow - 1);
1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1270 selection_check (0); 1179 selection_check (0);
1271} 1180}
1272 1181
1273/* ------------------------------------------------------------------------- */ 1182/* ------------------------------------------------------------------------- */
1274/* 1183/*
… …
1278 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1279 */ 1188 */
1280void 1189void
1281rxvt_term::scr_erase_line (int mode) 1190rxvt_term::scr_erase_line (int mode)
1282{ 1191{
1283 unsigned int row, col, num; 1192 unsigned int col, num;
1284 1193
1285 want_refresh = 1; 1194 want_refresh = 1;
1286 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1287 1196
1288 selection_check (1); 1197 selection_check (1);
1289 1198
1290 row = TermWin.saveLines + screen.cur.row; 1199 line_t &line = ROW(screen.cur.row);
1200
1291 switch (mode) 1201 switch (mode)
1292 { 1202 {
1293 case 0: /* erase to end of line */ 1203 case 0: /* erase to end of line */
1294 col = screen.cur.col; 1204 col = screen.cur.col;
1295 num = TermWin.ncol - col; 1205 num = ncol - col;
1296 MIN_IT (screen.tlen[row], (int16_t)col); 1206 min_it (line.l, col);
1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1299 CLEAR_SELECTION (); 1209 CLEAR_SELECTION ();
1300 break; 1210 break;
1301 case 1: /* erase to beginning of line */ 1211 case 1: /* erase to beginning of line */
… …
1305 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1215 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1306 CLEAR_SELECTION (); 1216 CLEAR_SELECTION ();
1307 break; 1217 break;
1308 case 2: /* erase whole line */ 1218 case 2: /* erase whole line */
1309 col = 0; 1219 col = 0;
1310 num = TermWin.ncol; 1220 num = ncol;
1311 screen.tlen[row] = 0; 1221 line.l = 0;
1312 if (selection.beg.row <= screen.cur.row 1222 if (selection.beg.row <= screen.cur.row
1313 && selection.end.row >= screen.cur.row) 1223 && selection.end.row >= screen.cur.row)
1314 CLEAR_SELECTION (); 1224 CLEAR_SELECTION ();
1315 break; 1225 break;
1316 default: 1226 default:
1317 return; 1227 return;
1318 } 1228 }
1319 1229
1320 if (screen.text[row]) 1230 scr_blank_line (line, col, num, rstyle);
1321 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1322 else
1323 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1324} 1231}
1325 1232
1326/* ------------------------------------------------------------------------- */ 1233/* ------------------------------------------------------------------------- */
1327/* 1234/*
1328 * Erase part of whole of the screen 1235 * Erase part of whole of the screen
… …
1332 */ 1239 */
1333void 1240void
1334rxvt_term::scr_erase_screen (int mode) 1241rxvt_term::scr_erase_screen (int mode)
1335{ 1242{
1336 int num; 1243 int num;
1337 int32_t row, row_offset; 1244 int32_t row;
1338 rend_t ren; 1245 rend_t ren;
1339 XGCValues gcvalue; 1246 XGCValues gcvalue;
1340 1247
1341 want_refresh = 1; 1248 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1343
1344 row_offset = (int32_t)TermWin.saveLines;
1345 1250
1346 switch (mode) 1251 switch (mode)
1347 { 1252 {
1348 case 0: /* erase to end of screen */ 1253 case 0: /* erase to end of screen */
1349 selection_check (1); 1254 selection_check (1);
1350 scr_erase_line (0); 1255 scr_erase_line (0);
1351 row = screen.cur.row + 1; /* possible OOB */ 1256 row = screen.cur.row + 1; /* possible OOB */
1352 num = TermWin.nrow - row; 1257 num = nrow - row;
1353 break; 1258 break;
1354 case 1: /* erase to beginning of screen */ 1259 case 1: /* erase to beginning of screen */
1355 selection_check (3); 1260 selection_check (3);
1356 scr_erase_line (1); 1261 scr_erase_line (1);
1357 row = 0; 1262 row = 0;
1358 num = screen.cur.row; 1263 num = screen.cur.row;
1359 break; 1264 break;
1360 case 2: /* erase whole screen */ 1265 case 2: /* erase whole screen */
1361 selection_check (3); 1266 selection_check (3);
1362 row = 0; 1267 row = 0;
1363 num = TermWin.nrow; 1268 num = nrow;
1364 break; 1269 break;
1365 default: 1270 default:
1366 return; 1271 return;
1367 } 1272 }
1368 1273
… …
1370 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1275 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1371 || (selection.end.row >= row 1276 || (selection.end.row >= row
1372 && selection.end.row <= row + num))) 1277 && selection.end.row <= row + num)))
1373 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1374 1279
1375 if (row >= TermWin.nrow) /* Out Of Bounds */ 1280 if (row >= nrow) /* Out Of Bounds */
1376 return; 1281 return;
1377 1282
1378 MIN_IT (num, (TermWin.nrow - row)); 1283 min_it (num, nrow - row);
1379 1284
1380 if (rstyle & (RS_RVid | RS_Uline)) 1285 if (rstyle & (RS_RVid | RS_Uline))
1381 ren = (rend_t) ~RS_None; 1286 ren = (rend_t) ~RS_None;
1382 else if (GET_BASEBG (rstyle) == Color_bg) 1287 else if (GET_BASEBG (rstyle) == Color_bg)
1383 { 1288 {
… …
1385 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1386 } 1291 }
1387 else 1292 else
1388 { 1293 {
1389 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1392 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1393 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1395 } 1300 }
1396 1301
1397 for (; num--; row++) 1302 for (; num--; row++)
1398 { 1303 {
1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1304 ROW (row).l = 0;
1400 screen.tlen[row + row_offset] = 0; 1305 scr_blank_screen_mem (ROW (row), rstyle);
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1402 } 1307 }
1403} 1308}
1309
1310#if ENABLE_FRILLS
1311void
1312rxvt_term::scr_erase_savelines ()
1313{
1314 want_refresh = 1;
1315 ZERO_SCROLLBACK ();
1316
1317 nsaved = 0;
1318}
1319#endif
1404 1320
1405/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1406/* 1322/*
1407 * Fill the screen with `E's 1323 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1325 */
1410void 1326void
1411rxvt_term::scr_E () 1327rxvt_term::scr_E ()
1412{ 1328{
1413 int i, j, k; 1329 rend_t fs;
1414 rend_t *r1, fs;
1415 1330
1416 want_refresh = 1; 1331 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1418 1333
1419 num_scr_allow = 0; 1334 num_scr_allow = 0;
1420 selection_check (3); 1335 selection_check (3);
1421 1336
1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1337 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1338 for (int row = nrow; row--; )
1424 { 1339 {
1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1340 line_t &line = ROW(row);
1341
1426 fill_text (screen.text[k], 'E', TermWin.ncol); 1342 fill_text (line.t, 'E', ncol);
1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1343 rend_t *r1 = line.r;
1344
1345 for (int j = ncol; j--; )
1428 *r1++ = fs; 1346 *r1++ = fs;
1347
1348 line.l = ncol; /* make the `E's selectable */
1429 } 1349 }
1430} 1350}
1431 1351
1432/* ------------------------------------------------------------------------- */ 1352/* ------------------------------------------------------------------------- */
1433/* 1353/*
… …
1454 count = end; 1374 count = end;
1455 } 1375 }
1456 1376
1457 scr_do_wrap (); 1377 scr_do_wrap ();
1458 1378
1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1460} 1380}
1461 1381
1462/* ------------------------------------------------------------------------- */ 1382/* ------------------------------------------------------------------------- */
1463/* 1383/*
1464 * Insert/Delete <count> characters from the current position 1384 * Insert/Delete <count> characters from the current position
… …
1466void 1386void
1467rxvt_term::scr_insdel_chars (int count, int insdel) 1387rxvt_term::scr_insdel_chars (int count, int insdel)
1468{ 1388{
1469 int col, row; 1389 int col, row;
1470 rend_t tr; 1390 rend_t tr;
1471 text_t *stp;
1472 rend_t *srp;
1473 int16_t *slp;
1474 1391
1475 want_refresh = 1; 1392 want_refresh = 1;
1476 ZERO_SCROLLBACK (); 1393 ZERO_SCROLLBACK ();
1477 1394
1478 if (count <= 0) 1395 if (count <= 0)
1479 return; 1396 return;
1480 1397
1481 scr_do_wrap (); 1398 scr_do_wrap ();
1482 1399
1483 selection_check (1); 1400 selection_check (1);
1484 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1401 min_it (count, ncol - screen.cur.col);
1485 1402
1486 row = screen.cur.row + TermWin.saveLines;
1487
1488 stp = screen.text[row];
1489 srp = screen.rend[row]; 1403 row = screen.cur.row;
1490 slp = &screen.tlen[row]; 1404
1405 line_t *line = &ROW(row);
1491 1406
1492 switch (insdel) 1407 switch (insdel)
1493 { 1408 {
1494 case INSERT: 1409 case INSERT:
1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1496 { 1411 {
1497 stp[col] = stp[col - count]; 1412 line->t[col] = line->t[col - count];
1498 srp[col] = srp[col - count]; 1413 line->r[col] = line->r[col - count];
1499 } 1414 }
1500 1415
1501 if (*slp != -1) 1416 if (!line->is_longer ())
1502 { 1417 {
1503 *slp += count; 1418 line->l += count;
1504 MIN_IT (*slp, TermWin.ncol); 1419 min_it (line->l, ncol);
1505 } 1420 }
1506 1421
1507 if (selection.op && current_screen == selection.screen 1422 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1424 {
1510 if (selection.end.row != screen.cur.row 1425 if (selection.end.row != screen.cur.row
1511 || (selection.end.col + count >= TermWin.ncol)) 1426 || (selection.end.col + count >= ncol))
1512 CLEAR_SELECTION (); 1427 CLEAR_SELECTION ();
1513 else 1428 else
1514 { /* shift selection */ 1429 { /* shift selection */
1515 selection.beg.col += count; 1430 selection.beg.col += count;
1516 selection.mark.col += count; /* XXX: yes? */ 1431 selection.mark.col += count; /* XXX: yes? */
1517 selection.end.col += count; 1432 selection.end.col += count;
1518 } 1433 }
1519 } 1434 }
1520 1435
1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1436 scr_blank_line (*line, screen.cur.col, count, rstyle);
1522 (unsigned int)count, rstyle);
1523 break; 1437 break;
1524 1438
1525 case ERASE: 1439 case ERASE:
1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1440 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1441 selection_check (1);
1528 screen.cur.col -= count; 1442 screen.cur.col -= count;
1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1443 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 (unsigned int)count, rstyle);
1531 break; 1444 break;
1532 1445
1533 case DELETE: 1446 case DELETE:
1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1535 1448
1536 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1449 for (col = screen.cur.col; (col + count) < ncol; col++)
1537 { 1450 {
1538 stp[col] = stp[col + count]; 1451 line->t[col] = line->t[col + count];
1539 srp[col] = srp[col + count]; 1452 line->r[col] = line->r[col + count];
1540 } 1453 }
1541 1454
1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1455 scr_blank_line (*line, ncol - count, count, tr);
1543 (unsigned int)count, tr);
1544 1456
1545 if (*slp == -1) /* break line continuation */ 1457 if (line->is_longer ()) /* break line continuation */
1546 *slp = TermWin.ncol; 1458 line->l = ncol;
1547 1459
1548 *slp -= count; 1460 line->l = max (line->l - count, 0);
1549 MAX_IT (*slp, 0);
1550 1461
1551 if (selection.op && current_screen == selection.screen 1462 if (selection.op && current_screen == selection.screen
1552 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1553 { 1464 {
1554 if (selection.end.row != screen.cur.row 1465 if (selection.end.row != screen.cur.row
1555 || (screen.cur.col >= selection.beg.col - count) 1466 || (screen.cur.col >= selection.beg.col - count)
1556 || selection.end.col >= TermWin.ncol) 1467 || selection.end.col >= ncol)
1557 CLEAR_SELECTION (); 1468 CLEAR_SELECTION ();
1558 else 1469 else
1559 { 1470 {
1560 /* shift selection */ 1471 /* shift selection */
1561 selection.beg.col -= count; 1472 selection.beg.col -= count;
… …
1574 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1575 */ 1486 */
1576void 1487void
1577rxvt_term::scr_scroll_region (int top, int bot) 1488rxvt_term::scr_scroll_region (int top, int bot)
1578{ 1489{
1579 MAX_IT (top, 0); 1490 max_it (top, 0);
1580 MIN_IT (bot, (int)TermWin.nrow - 1); 1491 min_it (bot, nrow - 1);
1581 1492
1582 if (top > bot) 1493 if (top > bot)
1583 return; 1494 return;
1584 1495
1585 screen.tscroll = top; 1496 screen.tscroll = top;
… …
1664 */ 1575 */
1665void 1576void
1666rxvt_term::scr_set_tab (int mode) 1577rxvt_term::scr_set_tab (int mode)
1667{ 1578{
1668 if (mode < 0) 1579 if (mode < 0)
1669 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1580 memset (tabs, 0, ncol * sizeof (char));
1670 else if (screen.cur.col < TermWin.ncol) 1581 else if (screen.cur.col < ncol)
1671 tabs[screen.cur.col] = (mode ? 1 : 0); 1582 tabs[screen.cur.col] = (mode ? 1 : 0);
1672} 1583}
1673 1584
1674/* ------------------------------------------------------------------------- */ 1585/* ------------------------------------------------------------------------- */
1675/* 1586/*
… …
1683 XGCValues gcvalue; 1594 XGCValues gcvalue;
1684 1595
1685 if (rvideo != mode) 1596 if (rvideo != mode)
1686 { 1597 {
1687 rvideo = mode; 1598 rvideo = mode;
1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1690 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1691#endif 1602#endif
1692#if TRANSPARENT 1603#if TRANSPARENT
1693 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1694#endif 1605#endif
1695 XSetWindowBackground (display->display, TermWin.vt, 1606 XSetWindowBackground (display->display, vt,
1696 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1697 1608
1698 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
1699 gcvalue.background = pix_colors[Color_bg]; 1610 gcvalue.background = pix_colors[Color_bg];
1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1611 XChangeGC (display->display, gc, GCBackground | GCForeground,
1701 &gcvalue); 1612 &gcvalue);
1702 scr_clear (); 1613 scr_clear ();
1703 scr_touch (true); 1614 scr_touch (true);
1704 } 1615 }
1705} 1616}
… …
1786bool 1697bool
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1788{ 1699{
1789 bool found = false; 1700 bool found = false;
1790 1701
1791 for (int i = 0; i < TermWin.nrow; i++) 1702 for (int i = 0; i < nrow; i++)
1792 { 1703 {
1793 int col = 0; 1704 int col = 0;
1794 rend_t *drp = drawn_rend [i]; 1705 rend_t *drp = drawn_buf[i].r;
1795 1706
1796 for (; col < TermWin.ncol; col++, drp++) 1707 for (; col < ncol; col++, drp++)
1797 if ((*drp & mask) == value) 1708 if ((*drp & mask) == value)
1798 { 1709 {
1799 found = true; 1710 found = true;
1800 *drp = ~value; 1711 *drp = ~value;
1801 } 1712 }
… …
1812 PART_END, 1723 PART_END,
1813 RC_COUNT 1724 RC_COUNT
1814}; 1725};
1815 1726
1816void 1727void
1817rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1818{ 1729{
1819 int i; 1730 int i;
1820 row_col_t rc[RC_COUNT]; 1731 row_col_t rc[RC_COUNT];
1821 1732
1822 if (drawn_text == NULL) /* sanity check */ 1733 if (!drawn_buf) /* sanity check */
1823 return; 1734 return;
1824 1735
1825#ifndef NO_SLOW_LINK_SUPPORT 1736#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local) 1737 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 { 1738 {
1828 y = 0; 1739 y = 0;
1829 height = TermWin.height; 1740 eheight = height;
1830 } 1741 }
1831#endif
1832
1833#ifdef DEBUG_STRICT
1834 x = max (x, 0);
1835 x = min (x, (int)TermWin.width);
1836 y = max (y, 0);
1837 y = min (y, (int)TermWin.height);
1838#endif 1742#endif
1839 1743
1840 /* round down */ 1744 /* round down */
1841 rc[PART_BEG].col = Pixel2Col (x); 1745 rc[PART_BEG].col = Pixel2Col (x);
1842 rc[PART_BEG].row = Pixel2Row (y); 1746 rc[PART_BEG].row = Pixel2Row (y);
1843 /* round up */ 1747 /* round up */
1844 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1748 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1845 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1749 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1846 1750
1847 /* sanity checks */ 1751 /* sanity checks */
1848 for (i = PART_BEG; i < RC_COUNT; i++) 1752 for (i = PART_BEG; i < RC_COUNT; i++)
1849 { 1753 {
1850 MIN_IT (rc[i].col, TermWin.ncol - 1); 1754 min_it (rc[i].col, ncol - 1);
1851 MIN_IT (rc[i].row, TermWin.nrow - 1); 1755 min_it (rc[i].row, nrow - 1);
1852 } 1756 }
1853 1757
1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1856 1760
1857 if (refresh) 1761 if (refresh)
1858 scr_refresh (SLOW_REFRESH); 1762 scr_refresh (SLOW_REFRESH);
1859} 1763}
1860 1764
… …
1863 * Refresh the entire screen 1767 * Refresh the entire screen
1864 */ 1768 */
1865void 1769void
1866rxvt_term::scr_touch (bool refresh) 1770rxvt_term::scr_touch (bool refresh)
1867{ 1771{
1868 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1772 scr_expose (0, 0, width, height, refresh);
1869} 1773}
1870 1774
1871/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1872/* 1776/*
1873 * Move the display so that the line represented by scrollbar value Y is at 1777 * Move the display so that the line represented by scrollbar value Y is at
… …
1877rxvt_term::scr_move_to (int y, int len) 1781rxvt_term::scr_move_to (int y, int len)
1878{ 1782{
1879 long p = 0; 1783 long p = 0;
1880 unsigned int oldviewstart; 1784 unsigned int oldviewstart;
1881 1785
1882 oldviewstart = TermWin.view_start; 1786 oldviewstart = view_start;
1883 1787
1884 if (y < len) 1788 if (y < len)
1885 { 1789 {
1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1790 p = (nrow + nsaved) * (len - y) / len;
1887 p -= (long) (TermWin.nrow - 1); 1791 p -= (long) (nrow - 1);
1888 p = max (p, 0); 1792 p = max (p, 0);
1889 } 1793 }
1890 1794
1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1795 view_start = (unsigned int)min (p, nsaved);
1892 1796
1893 return scr_changeview (oldviewstart); 1797 return scr_changeview (oldviewstart);
1894} 1798}
1895 1799
1896/* ------------------------------------------------------------------------- */ 1800/* ------------------------------------------------------------------------- */
… …
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1806rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903{ 1807{
1904 int n; 1808 int n;
1905 unsigned int oldviewstart; 1809 unsigned int oldviewstart;
1906 1810
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start; 1811 oldviewstart = view_start;
1812
1911 if (direction == UP) 1813 if (direction == UP)
1912 { 1814 {
1913 n = TermWin.view_start + nlines; 1815 n = view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled); 1816 view_start = min (n, nsaved);
1915 } 1817 }
1916 else 1818 else
1917 { 1819 {
1918 n = TermWin.view_start - nlines; 1820 n = view_start - nlines;
1919 TermWin.view_start = max (n, 0); 1821 view_start = max (n, 0);
1920 } 1822 }
1823
1921 return scr_changeview (oldviewstart); 1824 return scr_changeview (oldviewstart);
1922} 1825}
1923 1826
1924int 1827int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1926{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1927 if (TermWin.view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1928 { 1833 {
1929 want_refresh = 1; 1834 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1931 } 1836 }
1932 1837
1933 return (int) (TermWin.view_start - oldviewstart); 1838 return (int) (view_start - oldviewstart);
1934} 1839}
1935 1840
1936/* ------------------------------------------------------------------------- */ 1841/* ------------------------------------------------------------------------- */
1937void 1842void
1938rxvt_term::scr_bell () 1843rxvt_term::scr_bell ()
1939{ 1844{
1940#ifndef NO_BELL 1845#ifndef NO_BELL
1846
1941# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1944# endif 1850# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1851 XMapWindow (display->display, parent[0]);
1946# endif 1852# endif
1947 if (options & Opt_visualBell) 1853
1854 if (OPTION (Opt_visualBell))
1948 { 1855 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1857 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1859 }
1952 else 1860 else
1953 XBell (display->display, 0); 1861 XBell (display->display, 0);
1862
1954#endif 1863#endif
1955} 1864}
1956 1865
1957/* ------------------------------------------------------------------------- */ 1866/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1867/* ARGSUSED */
1959void 1868void
1960rxvt_term::scr_printscreen (int fullhist) 1869rxvt_term::scr_printscreen (int fullhist)
1961{ 1870{
1962#ifdef PRINTPIPE 1871#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1872 int nrows, row_start;
1964 FILE *fd; 1873 FILE *fd;
1965 1874
1966 if ((fd = popen_printer ()) == NULL) 1875 if ((fd = popen_printer ()) == NULL)
1967 return; 1876 return;
1968 1877
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1878 if (fullhist)
1973 row_offset -= TermWin.view_start; 1879 {
1880 nrows = nrow + nsaved;
1881 row_start = -nsaved;
1882 }
1974 else 1883 else
1975 { 1884 {
1976 nrows += TermWin.nscrolled; 1885 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1886 row_start = -view_start;
1978 } 1887 }
1979 1888
1980 wctomb (0, 0); 1889 wctomb (0, 0);
1981 1890
1982 for (r1 = 0; r1 < nrows; r1++) 1891 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1892 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1893 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1894 int len = ROW(r1).l;
1986 1895
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1896 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1897 {
1989 char mb[MB_LEN_MAX]; 1898 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1899 text_t t = *tp++;
1991 if (t == NOCHAR) 1900 if (t == NOCHAR)
1992 continue; 1901 continue;
… …
2013/* 1922/*
2014 * Refresh the screen 1923 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1924 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1925 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1926 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 1927void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1928rxvt_term::scr_refresh (unsigned char refresh_type)
2030{ 1929{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1930 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 1931 showcursor; /* show the cursor */
2033 int16_t col, row, /* column/row we're processing */ 1932 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 1933 ocrow; /* old cursor row */
2035 int i, /* tmp */ 1934 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 1935#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 1936 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 1937#endif
2040 rend_t *crp; // cursor rendition pointer 1938 rend_t *crp; // cursor rendition pointer
2041 1939
2042 want_refresh = 0; /* screen is current */ 1940 want_refresh = 0; /* screen is current */
2043 1941
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1942 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1943 return;
2046 1944
2047 /* 1945 /*
2048 * A: set up vars 1946 * A: set up vars
2049 */ 1947 */
2050 must_clear = 0; 1948 must_clear = 0;
2051 refresh_count = 0; 1949 refresh_count = 0;
2052 1950
2053 row_offset = TermWin.saveLines - TermWin.view_start;
2054
2055#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 1952 must_clear |= bgPixmap.pixmap != None;
2057#endif 1953#endif
2058#if TRANSPARENT 1954#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
2060#endif 1956#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 1958
2063 /* 1959 /*
2064 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
… …
2081 1977
2082 if (showcursor) 1978 if (showcursor)
2083 { 1979 {
2084 int col = screen.cur.col; 1980 int col = screen.cur.col;
2085 1981
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1982 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 1983 col--;
2088 1984
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1985 crp = &ROW(screen.cur.row).r[col];
2090 1986
2091 if (showcursor && TermWin.focus) 1987 if (showcursor && focus)
2092 { 1988 {
1989 if (OPTION (Opt_cursorUnderline))
1990 *crp ^= RS_Uline;
1991 else
1992 {
2093 *crp ^= RS_RVid; 1993 *crp ^= RS_RVid;
1994
2094#ifndef NO_CURSORCOLOR 1995#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 1996 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 1997 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 1998 ccol1 = Color_cursor;
2098 else 1999 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2001 ccol1 = fgcolor_of (rstyle);
2101#else 2002#else
2102 ccol1 = Color_fg; 2003 ccol1 = Color_fg;
2103#endif 2004#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2005 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2006 ccol2 = Color_cursor2;
2106 else 2007 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2009 ccol2 = bgcolor_of (rstyle);
2109#else 2010#else
2110 ccol2 = Color_bg; 2011 ccol2 = Color_bg;
2111#endif 2012#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2013 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2014 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2015#endif
2016 }
2115 } 2017 }
2116 } 2018 }
2117 2019
2118 /* make sure no outline cursor is left around */ 2020 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2021 setoldcursor = 0;
2120 if (ocrow != -1) 2022 if (ocrow != -1)
2121 { 2023 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2024 if (screen.cur.row + view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2025 || screen.cur.col != oldcursor.col)
2124 { 2026 {
2125 if (ocrow < TermWin.nrow 2027 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2028 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2030
2129 if (TermWin.focus || !showcursor) 2031 if (focus || !showcursor)
2130 oldcursor.row = -1; 2032 oldcursor.row = -1;
2131 else 2033 else
2132 setoldcursor = 1; 2034 setoldcursor = 1;
2133 } 2035 }
2134 } 2036 }
2135 else if (!TermWin.focus) 2037 else if (!focus)
2136 setoldcursor = 1; 2038 setoldcursor = 1;
2137 2039
2138 if (setoldcursor) 2040 if (setoldcursor)
2139 { 2041 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2042 if (screen.cur.row + view_start >= nrow)
2141 oldcursor.row = -1; 2043 oldcursor.row = -1;
2142 else 2044 else
2143 { 2045 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2046 oldcursor.row = screen.cur.row + view_start;
2145 oldcursor.col = screen.cur.col; 2047 oldcursor.col = screen.cur.col;
2146 } 2048 }
2147 } 2049 }
2148 } 2050 }
2149 2051
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2150#if ENABLE_OVERLAY 2053#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2054 scr_swap_overlay ();
2152#endif 2055#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156 2056
2157#ifndef NO_SLOW_LINK_SUPPORT 2057#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2058 /*
2159 * D: CopyArea pass - very useful for slower links 2059 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2060 * This has been deliberately kept simple.
2161 */ 2061 */
2162 i = num_scr; 2062 i = num_scr;
2163 if (!display->is_local 2063 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2065 && abs (num_scr) < nrow && !must_clear)
2166 { 2066 {
2167 int16_t nits; 2067 int16_t nits;
2168 int j; 2068 int j;
2169 int len, wlen; 2069 int len, wlen;
2170 2070
2171 j = TermWin.nrow; 2071 j = nrow;
2172 wlen = len = -1; 2072 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2073 row = i > 0 ? 0 : j - 1;
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2075 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2077 {
2178 text_t *stp = screen.text[row + row_offset]; 2078 line_t s = ROW(row - view_start);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2079 line_t d = drawn_buf[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2080 line_t d2 = drawn_buf[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2081
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2082 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2084 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2085 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2086 nits++;
2190 2087
2191 if (nits > 8) /* XXX: arbitrary choice */ 2088 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2089 {
2193 for (col = TermWin.ncol; col--; ) 2090 for (col = ncol; col--; )
2194 { 2091 {
2195 *dtp++ = *dtp2++; 2092 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2093 *d.r++ = *d2.r++;
2197 } 2094 }
2198 2095
2199 if (len == -1) 2096 if (len == -1)
2200 len = row; 2097 len = row;
2201 2098
… …
2206 2103
2207 if (len != -1) 2104 if (len != -1)
2208 { 2105 {
2209 /* also comes here at end if needed because of >= above */ 2106 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2107 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2108 ::swap (wlen, len);
2212 2109
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2110 XCopyArea (display->display, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2111 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2112 (unsigned int)this->width,
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2113 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2114 0, Row2Pixel (len));
2218 len = -1; 2115 len = -1;
2219 } 2116 }
2220 } 2117 }
… …
2222#endif 2119#endif
2223 2120
2224 /* 2121 /*
2225 * E: main pass across every character 2122 * E: main pass across every character
2226 */ 2123 */
2227 for (row = 0; row < TermWin.nrow; row++) 2124 for (row = 0; row < nrow; row++)
2228 { 2125 {
2229 text_t *stp = screen.text[row + row_offset]; 2126 text_t *stp = ROW(row - view_start).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2127 rend_t *srp = ROW(row - view_start).r;
2231 text_t *dtp = drawn_text[row]; 2128 text_t *dtp = drawn_buf[row].t;
2232 rend_t *drp = drawn_rend[row]; 2129 rend_t *drp = drawn_buf[row].r;
2233 2130
2234 /* 2131 /*
2235 * E2: OK, now the real pass 2132 * E2: OK, now the real pass
2236 */ 2133 */
2237 int ypixel = (int)Row2Pixel (row); 2134 int ypixel = (int)Row2Pixel (row);
2238 2135
2239 for (col = 0; col < TermWin.ncol; col++) 2136 for (col = 0; col < ncol; col++)
2240 { 2137 {
2241 /* compare new text with old - if exactly the same then continue */ 2138 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2139 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2140 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2141 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2155 dtp[col] = stp[col];
2259 drp[col] = rend; 2156 drp[col] = rend;
2260 2157
2261 int xpixel = Col2Pixel (col); 2158 int xpixel = Col2Pixel (col);
2262 2159
2263 for (i = 0; ++col < TermWin.ncol; ) 2160 for (i = 0; ++col < ncol; )
2264 { 2161 {
2265 if (stp[col] == NOCHAR) 2162 if (stp[col] == NOCHAR)
2266 { 2163 {
2267 dtp[col] = stp[col]; 2164 dtp[col] = stp[col];
2268 drp[col] = rend; 2165 drp[col] = rend;
… …
2296 2193
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2194 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2195 while (i && text[count] == NOCHAR)
2299 count++, i--; 2196 count++, i--;
2300 2197
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2313 /* 2198 /*
2314 * Determine the attributes for the string 2199 * Determine the attributes for the string
2315 */ 2200 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2318 2203
2319 // only do special processing if ana attributes are set, which is rare 2204 // only do special processing if any attributes are set, which is unlikely
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2206 {
2207#if ENABLE_STYLES
2208 // force redraw after "careful" characters to avoid pixel droppings
2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2210 drp[col + 1] = ~srp[col + 1];
2211
2212 // include previous careful character(s) if possible, looks nicer (best effort...)
2213 while (text > stp
2214 && srp[text - stp - 1] & RS_Careful
2215 && RS_SAME (rend, srp[text - stp - 1]))
2216 text--, count++, xpixel -= fwidth;
2217#endif
2218
2322 bool invert = rend & RS_RVid; 2219 bool invert = rend & RS_RVid;
2323 2220
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2221#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2222 if (rend & RS_Bold
2326 && fore == Color_fg) 2223 && fore == Color_fg)
… …
2348 fore = Color_UL; 2245 fore = Color_UL;
2349#endif 2246#endif
2350 2247
2351 if (invert) 2248 if (invert)
2352 { 2249 {
2353 SWAP_IT (fore, back, int); 2250 ::swap (fore, back);
2354 2251
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2252#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2253 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2254 back = Color_RV;
2255
2256 if (fore == back)
2257 {
2258 fore = Color_bg;
2259 back = Color_fg;
2260 }
2358#endif 2261#endif
2359 } 2262 }
2360 2263
2361#ifdef TEXT_BLINK 2264#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2265 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2373 } 2276 }
2374 2277
2375 /* 2278 /*
2376 * Actually do the drawing of the string here 2279 * Actually do the drawing of the string here
2377 */ 2280 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2281 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2282
2380 if (back == fore) 2283 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2284 font->clear_rect (*drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight, 2285 fwidth * count, fheight,
2383 back); 2286 back);
2384 else if (back == Color_bg) 2287 else if (back == Color_bg)
2385 { 2288 {
2386 if (must_clear) 2289 if (must_clear)
2387 { 2290 {
2388 CLEAR_CHARS (xpixel, ypixel, count); 2291 CLEAR_CHARS (xpixel, ypixel, count);
2389 2292
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2293 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2294 if (text[i] != ' ')
2392 { 2295 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2296 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2394 break; 2297 break;
2395 } 2298 }
2396 } 2299 }
2397 else 2300 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2301 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2399 } 2302 }
2400 else 2303 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2305
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2306 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2307 {
2308#if ENABLE_FRILLS
2309 if (ISSET_PIXCOLOR (Color_underline))
2310 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2311 else
2312#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2313 XSetForeground (display->display, gc, pix_colors[fore]);
2314
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2315 XDrawLine (display->display, drawBuffer, gc,
2407 xpixel, ypixel + font->ascent + 1, 2316 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2317 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2318 }
2410 } /* for (col....) */ 2319 } /* for (col....) */
2411 } /* for (row....) */ 2320 } /* for (row....) */
2412 2321
2413#if ENABLE_OVERLAY 2322#if ENABLE_OVERLAY
2414 scr_swap_overlay (); 2323 scr_swap_overlay ();
2415#endif 2324#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2416 2326
2417 /* 2327 /*
2418 * G: cleanup cursor and display outline cursor if necessary 2328 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2329 */
2420 if (showcursor) 2330 if (showcursor)
2421 { 2331 {
2422 if (TermWin.focus) 2332 if (focus)
2333 {
2334 if (OPTION (Opt_cursorUnderline))
2335 *crp ^= RS_Uline;
2336 else
2423 { 2337 {
2424 *crp ^= RS_RVid; 2338 *crp ^= RS_RVid;
2425#ifndef NO_CURSORCOLOR 2339#ifndef NO_CURSORCOLOR
2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2340 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2427#endif 2341#endif
2342 }
2428 } 2343 }
2429 else if (oldcursor.row >= 0) 2344 else if (oldcursor.row >= 0)
2430 { 2345 {
2346 int cursorwidth = 1;
2347 int col = oldcursor.col;
2348
2349 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2350 col--;
2351
2352 while (col + cursorwidth < ncol
2353 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2354 cursorwidth++;
2355
2431#ifndef NO_CURSORCOLOR 2356#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2357 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2358 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2434#endif 2359#endif
2435 int cursorwidth = 1;
2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438 cursorwidth++;
2439 2360
2440 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2361 XDrawRectangle (display->display, drawBuffer, gc,
2441 Col2Pixel (oldcursor.col), 2362 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2363 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2364 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2365 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2366 }
2446 } 2367 }
2447 2368
2448 /* 2369 /*
2449 * H: cleanup selection 2370 * H: cleanup selection
… …
2456 num_scr = 0; 2377 num_scr = 0;
2457 num_scr_allow = 1; 2378 num_scr_allow = 1;
2458} 2379}
2459 2380
2460void 2381void
2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2382rxvt_term::scr_remap_chars (const line_t &l)
2462{ 2383{
2463 if (!rp || !tp) 2384 if (!l.t)
2464 return; 2385 return;
2465 2386
2466 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2387 for (int i = ncol; i--; )
2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2468} 2389}
2469 2390
2470void 2391void
2471rxvt_term::scr_remap_chars () 2392rxvt_term::scr_remap_chars ()
2472{ 2393{
2473 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2394 for (int i = total_rows; i--; )
2474 scr_remap_chars (screen.text[i], screen.rend[i]); 2395 scr_remap_chars (row_buf [i]);
2475 2396
2476 for (int i = TermWin.nrow; i--; ) 2397 for (int i = nrow; i--; )
2477 { 2398 {
2478 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2399 scr_remap_chars (drawn_buf [i]);
2479 scr_remap_chars (swap.text[i], swap.rend[i]); 2400 scr_remap_chars (swap_buf [i]);
2480 } 2401 }
2481} 2402}
2482 2403
2483void 2404void
2484rxvt_term::scr_recolour () 2405rxvt_term::scr_recolour ()
… …
2490#if XPM_BACKGROUND 2411#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap 2412 && !bgPixmap.pixmap
2492#endif 2413#endif
2493 ) 2414 )
2494 { 2415 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2416 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]); 2417 XClearWindow (display->display, parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2418 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2419#if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2420 if (scrollBar.win)
2500 { 2421 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2422 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2423 scrollBar.setIdle ();
… …
2512 2433
2513/* ------------------------------------------------------------------------- */ 2434/* ------------------------------------------------------------------------- */
2514void 2435void
2515rxvt_term::scr_clear (bool really) 2436rxvt_term::scr_clear (bool really)
2516{ 2437{
2517 if (!TermWin.mapped) 2438 if (!mapped)
2518 return; 2439 return;
2519 2440
2520 num_scr_allow = 0; 2441 num_scr_allow = 0;
2521 want_refresh = 1; 2442 want_refresh = 1;
2522 2443
2523#if TRANSPARENT
2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2525 {
2526 int i;
2527
2528 if (!(options & Opt_transparent_all))
2529 i = 0;
2530 else
2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533 while (i--)
2534 if (TermWin.parent[i] != None)
2535 XClearWindow (display->display, TermWin.parent[i]);
2536 }
2537#endif
2538
2539 if (really) 2444 if (really)
2540 XClearWindow (display->display, TermWin.vt); 2445 XClearWindow (display->display, vt);
2541} 2446}
2542 2447
2543/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2544void 2449void
2545rxvt_term::scr_reverse_selection () 2450rxvt_term::scr_reverse_selection ()
2546{ 2451{
2452 if (selection.op
2547 if (selection.op && current_screen == selection.screen) 2453 && current_screen == selection.screen
2454 && selection.end.row >= -view_start)
2548 { 2455 {
2549 int end_row = TermWin.saveLines - TermWin.view_start; 2456 int view_end = -view_start + nrow;
2550 int i = selection.beg.row + TermWin.saveLines; 2457 int row, col;
2551 int col, row = selection.end.row + TermWin.saveLines;
2552 rend_t *srp;
2553 2458
2554#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2555 if (selection.rect) 2460 if (selection.rect)
2556 { 2461 {
2557 end_row += TermWin.nrow; 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2558 2466
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2562 } 2476 }
2563 else 2477 else
2564#endif 2478#endif
2565 { 2479 {
2566 if (i >= end_row) 2480 if (selection.beg.row >= -view_start)
2481 {
2567 col = selection.beg.col; 2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2568 else 2485 else
2569 { 2486 {
2570 col = 0; 2487 col = 0;
2571 i = end_row; 2488 row = -view_start;
2572 } 2489 }
2573 2490
2574 end_row += TermWin.nrow; 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2575 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576 for (; i < row && i < end_row; i++, col = 0)
2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2578 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
2579 2494
2580 if (i == row && i < end_row) 2495 if (row == selection.end.row)
2581 for (srp = screen.rend[i]; col < selection.end.col; col++) 2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2582 srp[col] ^= RS_RVid; 2497 srp[col] ^= RS_RVid;
2583 } 2498 }
2584 } 2499 }
2585} 2500}
2586 2501
… …
2595{ 2510{
2596 int row, wrote; 2511 int row, wrote;
2597 unsigned int width, towrite; 2512 unsigned int width, towrite;
2598 char r1[] = "\n"; 2513 char r1[] = "\n";
2599 2514
2600 for (row = TermWin.saveLines - TermWin.nscrolled; 2515 for (row = saveLines - nsaved;
2601 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2516 row < saveLines + nrow - 1; row++)
2602 { 2517 {
2603 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2604 : TermWin.ncol; 2519 : ncol;
2605 for (towrite = width; towrite; towrite -= wrote) 2520 for (towrite = width; towrite; towrite -= wrote)
2606 { 2521 {
2607 wrote = write (fd, & (screen.text[row][width - towrite]), 2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2608 towrite); 2523 towrite);
2609 if (wrote < 0) 2524 if (wrote < 0)
2610 return; /* XXX: death, no report */ 2525 return; /* XXX: death, no report */
2611 } 2526 }
2612 if (screen.tlen[row] >= 0) 2527 if (row_buf[row].l >= 0)
2613 if (write (fd, r1, 1) <= 0) 2528 if (write (fd, r1, 1) <= 0)
2614 return; /* XXX: death, no report */ 2529 return; /* XXX: death, no report */
2615 } 2530 }
2616} 2531}
2617#endif 2532#endif
2618 2533
2619/* ------------------------------------------------------------------------- * 2534/* ------------------------------------------------------------------------- *
2620 * CHARACTER SELECTION * 2535 * CHARACTER SELECTION *
2621 * ------------------------------------------------------------------------- */ 2536 * ------------------------------------------------------------------------- */
2622
2623/*
2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2625 */
2626void 2537void
2627rxvt_term::selection_check (int check_more) 2538rxvt_term::selection_check (int check_more)
2628{ 2539{
2629 row_col_t pos; 2540 row_col_t pos;
2630 2541
2631 if (!selection.op) 2542 if (!selection.op)
2632 return; 2543 return;
2633 2544
2634 pos.row = pos.col = 0; 2545 pos.row = pos.col = 0;
2635 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2636 || (selection.beg.row >= TermWin.nrow) 2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2637 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2638 || (selection.mark.row >= TermWin.nrow)
2639 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2640 || (selection.end.row >= TermWin.nrow)
2641 || (check_more == 1 2549 || (check_more == 1
2642 && current_screen == selection.screen 2550 && current_screen == selection.screen
2643 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2644 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2645 || (check_more == 2 2553 || (check_more == 2
… …
2647 && ROWCOL_IS_AFTER (selection.end, pos)) 2555 && ROWCOL_IS_AFTER (selection.end, pos))
2648 || (check_more == 3 2556 || (check_more == 3
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2557 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 4 /* screen width change */ 2558 || (check_more == 4 /* screen width change */
2651 && (selection.beg.row != selection.end.row 2559 && (selection.beg.row != selection.end.row
2652 || selection.end.col > TermWin.ncol))) 2560 || selection.end.col > ncol)))
2653 CLEAR_SELECTION (); 2561 CLEAR_SELECTION ();
2654} 2562}
2655 2563
2656/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2657/* 2565/*
2658 * Paste a selection direct to the command fd 2566 * Paste a selection direct to the command fd
2659 */ 2567 */
2660void 2568void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2569rxvt_term::paste (char *data, unsigned int len)
2662{ 2570{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2571 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PROP_SIZE) 2572 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PROP_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2573 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2574 data[i] = C0_CR;
2675 2575
2676 tt_write (ds, (int)n); 2576 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2577}
2681 2578
2682/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2683/* 2580/*
2684 * Respond to a notification that a primary selection has been sent 2581 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify 2582 * EXT: SelectionNotify
2686 */ 2583 */
2687int 2584void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2585rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2689{ 2586{
2690 long nread = 0;
2691 unsigned long bytes_after;
2692 XTextProperty ct;
2693
2694 if (prop == None) /* check for failed XConvertSelection */ 2587 if (prop == None) /* check for failed XConvertSelection */
2695 { 2588 {
2696 if ((selection_type & Sel_CompoundText)) 2589 if ((selection_type & Sel_CompoundText))
2697 { 2590 {
2698 int selnum = selection_type & Sel_whereMask; 2591 int selnum = selection_type & Sel_whereMask;
… …
2711 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2604 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2712 else 2605 else
2713 selection_type = 0; 2606 selection_type = 0;
2714 } 2607 }
2715 2608
2716 return 0; 2609 return;
2717 }
2718
2719 for (;;)
2720 { 2610 }
2611
2612 unsigned long bytes_after;
2613 XTextProperty ct;
2614
2615 if (XGetWindowProperty (display->display, win, prop,
2616 0, PROP_SIZE / 4,
2617 delete_prop, AnyPropertyType,
2618 &ct.encoding, &ct.format,
2619 &ct.nitems, &bytes_after,
2620 &ct.value) != Success)
2621 {
2622 ct.value = 0;
2623 goto bailout;
2624 }
2625
2626 if (ct.encoding == None)
2627 goto bailout;
2628
2629 if (bytes_after)
2630 {
2631 // fetch and append remaining data
2632 XTextProperty ct2;
2633
2721 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2634 if (XGetWindowProperty (display->display, win, prop,
2722 (long) (PROP_SIZE / 4), delete_prop, 2635 ct.nitems / 4, (bytes_after + 3) / 4,
2636 delete_prop, AnyPropertyType,
2723 AnyPropertyType, &ct.encoding, &ct.format, 2637 &ct2.encoding, &ct2.format,
2724 &ct.nitems, &bytes_after, 2638 &ct2.nitems, &bytes_after,
2725 &ct.value) != Success) 2639 &ct2.value) != Success)
2726 break; 2640 goto bailout;
2727 2641
2728 if (ct.encoding == 0) 2642 // realloc should be compatible to XFree, here, and elsewhere, too
2729 break; 2643 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2644 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2645 ct.nitems += ct2.nitems;
2730 2646
2647 XFree (ct2.value);
2648 }
2649
2650 if (ct.value == 0)
2651 goto bailout;
2652
2731 if (ct.encoding == xa[XA_INCR]) 2653 if (ct.encoding == xa[XA_INCR])
2732 { 2654 {
2733 // INCR selection, start handshake 2655 // INCR selection, start handshake
2656 if (!delete_prop)
2734 XDeleteProperty (display->display, win, prop); 2657 XDeleteProperty (display->display, win, prop);
2658
2735 selection_wait = Sel_incr; 2659 selection_wait = Sel_incr;
2660 incr_buf_fill = 0;
2736 incr_ev.start (NOW + 10); 2661 incr_ev.start (NOW + 10);
2737 break;
2738 }
2739 2662
2740 if (ct.value == NULL) 2663 goto bailout;
2741 continue; 2664 }
2742 2665
2743 if (ct.nitems == 0) 2666 if (ct.nitems == 0)
2667 {
2668 if (selection_wait == Sel_incr)
2669 {
2670 XFree (ct.value);
2671
2672 // finally complete, now paste the whole thing
2673 selection_wait = Sel_normal;
2674 ct.value = (unsigned char *)incr_buf;
2675 ct.nitems = incr_buf_fill;
2676 incr_buf = 0;
2677 incr_buf_size = 0;
2678 incr_ev.stop ();
2744 { 2679 }
2680 else
2681 {
2745 if (selection_wait == Sel_normal && nread == 0 2682 if (selection_wait == Sel_normal
2746 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2683 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2747 { 2684 {
2748 /* 2685 /*
2749 * pass through again trying CUT_BUFFER0 if we've come from 2686 * pass through again trying CUT_BUFFER0 if we've come from
2750 * XConvertSelection () but nothing was presented 2687 * XConvertSelection () but nothing was presented
2751 */ 2688 */
2752 selection_paste (display->root, XA_CUT_BUFFER0, False); 2689 selection_paste (display->root, XA_CUT_BUFFER0, False);
2753 } 2690 }
2754 2691
2755 nread = -1; /* discount any previous stuff */ 2692 goto bailout;
2756 break; 2693 }
2694 }
2695 else if (selection_wait == Sel_incr)
2696 {
2697 incr_ev.start (NOW + 10);
2698
2699 while (incr_buf_fill + ct.nitems > incr_buf_size)
2757 } 2700 {
2701 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2702 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2703 }
2758 2704
2705 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2759 nread += ct.nitems; 2706 incr_buf_fill += ct.nitems;
2760 2707
2708 goto bailout;
2709 }
2710
2761 char **cl; 2711 char **cl;
2762 int cr; 2712 int cr;
2763 2713
2764#if ENABLE_FRILLS 2714#if ENABLE_FRILLS
2765 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2715 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2766 // so recode it manually 2716 // so recode it manually
2767 if (ct.encoding == xa[XA_UTF8_STRING]) 2717 if (ct.encoding == xa[XA_UTF8_STRING])
2768 { 2718 {
2769 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2770 char *s = rxvt_wcstombs (w); 2720 char *s = rxvt_wcstombs (w);
2771 2721 free (w);
2772 // TODO: strlen == only the first element will be converted. well... 2722 // TODO: strlen == only the first element will be converted. well...
2773 paste ((unsigned char *)s, strlen (s)); 2723 paste (s, strlen (s));
2774
2775 free (s); 2724 free (s);
2776 free (w); 2725 }
2777 }
2778 else 2726 else
2779#endif 2727#endif
2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2781 { 2729 && cl)
2730 {
2782 for (int i = 0; i < cr; i++) 2731 for (int i = 0; i < cr; i++)
2783 paste ((unsigned char *)cl[i], strlen (cl[i])); 2732 paste (cl[i], strlen (cl[i]));
2784 2733
2785 XFreeStringList (cl); 2734 XFreeStringList (cl);
2786 } 2735 }
2787 else 2736 else
2788 paste (ct.value, ct.nitems); 2737 paste ((char *)ct.value, ct.nitems); // paste raw
2789 2738
2790 if (bytes_after == 0) 2739bailout:
2791 break;
2792
2793 XFree (ct.value);
2794 }
2795
2796 if (ct.value)
2797 XFree (ct.value); 2740 XFree (ct.value);
2798 2741
2799 if (selection_wait == Sel_normal) 2742 if (selection_wait == Sel_normal)
2800 selection_wait = Sel_none; 2743 selection_wait = Sel_none;
2801
2802 return (int)nread;
2803} 2744}
2804 2745
2805void 2746void
2806rxvt_term::incr_cb (time_watcher &w) 2747rxvt_term::incr_cb (time_watcher &w)
2807{ 2748{
2808 selection_wait = Sel_none; 2749 selection_wait = Sel_none;
2809 2750
2751 incr_buf_size = 0;
2752 free (incr_buf);
2753
2810 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2754 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2811} 2755}
2812 2756
2813/*
2814 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2815 */
2816void 2757void
2817rxvt_term::selection_property (Window win, Atom prop) 2758rxvt_term::selection_property (Window win, Atom prop)
2818{ 2759{
2819 if (prop == None || selection_wait != Sel_incr) 2760 if (prop == None || selection_wait != Sel_incr)
2820 return; 2761 return;
2821 2762
2822 if (selection_paste (win, prop, 1) > 0) 2763 selection_paste (win, prop, true);
2823 incr_ev.start (NOW + 10);
2824 else
2825 {
2826 selection_wait = Sel_none;
2827 incr_ev.stop ();
2828 }
2829} 2764}
2830 2765
2831/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2832/* 2767/*
2833 * Request the current selection: 2768 * Request the current selection:
… …
2839 * EXT: button 2 release 2774 * EXT: button 2 release
2840 */ 2775 */
2841void 2776void
2842rxvt_term::selection_request (Time tm, int x, int y) 2777rxvt_term::selection_request (Time tm, int x, int y)
2843{ 2778{
2844 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2779 if (x < 0 || x >= width || y < 0 || y >= height)
2845 return; /* outside window */ 2780 return; /* outside window */
2846 2781
2847 if (selection.text) 2782 if (selection.text)
2848 { /* internal selection */ 2783 { /* internal selection */
2849 char *str = rxvt_wcstombs (selection.text, selection.len); 2784 char *str = rxvt_wcstombs (selection.text, selection.len);
2850 paste ((unsigned char *)str, strlen (str)); 2785 paste (str, strlen (str));
2851 free (str); 2786 free (str);
2852 return; 2787 return;
2853 } 2788 }
2854 else 2789 else
2855 { 2790 {
… …
2870 return; 2805 return;
2871#endif 2806#endif
2872 } 2807 }
2873 } 2808 }
2874 2809
2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2810 selection_wait = Sel_none; /* don't loop in selection_paste () */
2876 selection_paste (display->root, XA_CUT_BUFFER0, False); 2811 selection_paste (display->root, XA_CUT_BUFFER0, false);
2877} 2812}
2878 2813
2879int 2814int
2880rxvt_term::selection_request_other (Atom target, int selnum) 2815rxvt_term::selection_request_other (Atom target, int selnum)
2881{ 2816{
2882 Atom sel; 2817 Atom sel;
2883#ifdef DEBUG_SELECT
2884 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2885#endif
2886 2818
2887 selection_type |= selnum; 2819 selection_type |= selnum;
2888 2820
2889 if (selnum == Sel_Primary) 2821 if (selnum == Sel_Primary)
2890 sel = XA_PRIMARY; 2822 sel = XA_PRIMARY;
… …
2894 sel = xa[XA_CLIPBOARD]; 2826 sel = xa[XA_CLIPBOARD];
2895 2827
2896 if (XGetSelectionOwner (display->display, sel) != None) 2828 if (XGetSelectionOwner (display->display, sel) != None)
2897 { 2829 {
2898 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2830 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2899 TermWin.vt, selection_request_time); 2831 vt, selection_request_time);
2900 return 1; 2832 return 1;
2901 } 2833 }
2902 2834
2903 return 0; 2835 return 0;
2904} 2836}
… …
2927 * EXT: button 1 or 3 release 2859 * EXT: button 1 or 3 release
2928 */ 2860 */
2929void 2861void
2930rxvt_term::selection_make (Time tm) 2862rxvt_term::selection_make (Time tm)
2931{ 2863{
2932 int i, col, end_col, row, end_row; 2864 int i;
2933 wchar_t *new_selection_text; 2865 wchar_t *new_selection_text;
2934 text_t *t; 2866 text_t *t;
2935 2867
2936 switch (selection.op) 2868 switch (selection.op)
2937 { 2869 {
… …
2950 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2951 2883
2952 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2953 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2954 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2955 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2956 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2957 2892
2958 col = selection.beg.col;
2959 row = selection.beg.row + TermWin.saveLines;
2960 end_row = selection.end.row + TermWin.saveLines;
2961 int ofs = 0; 2893 int ofs = 0;
2962 int extra = 0; 2894 int extra = 0;
2963 2895
2896 int col = selection.beg.col;
2897 int row = selection.beg.row;
2898
2899 int end_col;
2900
2964 for (; row <= end_row; row++, col = 0) 2901 for (; row <= selection.end.row; row++, col = 0)
2965 { 2902 {
2966 end_col = screen.tlen[row];
2967
2968#if ENABLE_FRILLS 2903#if ENABLE_FRILLS
2969 if (selection.rect) 2904 if (selection.rect)
2970 { 2905 {
2971 col = selection.beg.col; 2906 col = selection.beg.col;
2972 end_col = TermWin.ncol + 1; 2907 end_col = ncol + 1;
2908 }
2909 else
2910#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2912
2913 col = max (col, 0);
2914
2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2973 } 2919 )
2974#endif
2975
2976 MAX_IT (col, 0);
2977
2978 if (end_col == -1)
2979 end_col = TermWin.ncol;
2980
2981 if (row == end_row || selection.rect)
2982 MIN_IT (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
2983 2921
2984 t = &screen.text[row][col]; 2922 t = ROW(row).t + col;
2985 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
2986 { 2924 {
2987 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
2988 t++; 2926 t++;
2989#if ENABLE_COMBINING 2927#if ENABLE_COMBINING
… …
3005#endif 2943#endif
3006 else 2944 else
3007 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
3008 } 2946 }
3009 2947
3010 if (screen.tlen[row] != -1 && row != end_row) 2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
3011 new_selection_text[ofs++] = C0_LF; 2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2960 if (!ROW(row).is_longer () && row != selection.end.row)
2961 new_selection_text[ofs++] = C0_LF;
3012 } 2962 }
3013 2963
3014 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
3015 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
3016 2966
… …
3026 2976
3027 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
3028 selection.len = ofs; 2978 selection.len = ofs;
3029 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3030 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
3031 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3032 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
3033 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
3034 else 2998 else
3035 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
3036 3000
3037#if 0 3001#if 0
3038 XTextProperty ct; 3002 XTextProperty ct;
3039 3003
3040 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3041 { 3005 {
3042 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3043 XFree (ct.value); 3007 XFree (ct.value);
3044 } 3008 }
3045#endif 3009#endif
3046
3047 selection_time = tm;
3048} 3010}
3049 3011
3050/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
3051/* 3013/*
3052 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3060 3022
3061 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3062 3024
3063 if (clicks == 2 || clicks == 3) 3025 if (clicks == 2 || clicks == 3)
3064 selection_extend_colrow (selection.mark.col, 3026 selection_extend_colrow (selection.mark.col,
3065 selection.mark.row + TermWin.view_start, 3027 selection.mark.row + view_start,
3066 0, /* button 3 */ 3028 0, /* button 3 */
3067 1, /* button press */ 3029 1, /* button press */
3068 0); /* click change */ 3030 0); /* click change */
3069} 3031}
3070 3032
… …
3074 */ 3036 */
3075void 3037void
3076rxvt_term::selection_start_colrow (int col, int row) 3038rxvt_term::selection_start_colrow (int col, int row)
3077{ 3039{
3078 want_refresh = 1; 3040 want_refresh = 1;
3041
3042 selection.mark.row = row - view_start;
3079 selection.mark.col = col; 3043 selection.mark.col = col;
3080 selection.mark.row = row - TermWin.view_start;
3081 3044
3082 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3083 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3084 MAX_IT (selection.mark.col, 0);
3085 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3086 3047
3087 while (selection.mark.col > 0 3048 while (selection.mark.col > 0
3088 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3050 --selection.mark.col;
3090 3051
3091 if (selection.op) 3052 if (selection.op)
3092 { /* clear the old selection */ 3053 { /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3054 selection.beg.row = selection.end.row = selection.mark.row;
… …
3117 text_t *stp; 3078 text_t *stp;
3118 rend_t *srp; 3079 rend_t *srp;
3119 3080
3120 if (dirn == UP) 3081 if (dirn == UP)
3121 { 3082 {
3122 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3083 bound.row = - nsaved - 1;
3123 bound.col = 0; 3084 bound.col = 0;
3124 dirnadd = -1; 3085 dirnadd = -1;
3125 } 3086 }
3126 else 3087 else
3127 { 3088 {
3128 bound.row = TermWin.saveLines + TermWin.nrow; 3089 bound.row = nrow;
3129 bound.col = TermWin.ncol - 1; 3090 bound.col = ncol - 1;
3130 dirnadd = 1; 3091 dirnadd = 1;
3131 } 3092 }
3132 3093
3133 row = mark->row + TermWin.saveLines; 3094 row = mark->row;
3134 col = mark->col; 3095 col = max (mark->col, 0);
3135 MAX_IT (col, 0); 3096
3136 /* find the edge of a word */ 3097 /* find the edge of a word */
3137 stp = &screen.text[row][col]; 3098 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3138 w1 = DELIMIT_TEXT (*stp); 3099 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3139
3140 srp = &screen.rend[row][col];
3141 w2 = DELIMIT_REND (*srp);
3142 3100
3143 for (;;) 3101 for (;;)
3144 { 3102 {
3145 for (; col != bound.col; col += dirnadd) 3103 for (; col != bound.col; col += dirnadd)
3146 { 3104 {
… …
3156 break; 3114 break;
3157 } 3115 }
3158 3116
3159 if ((col == bound.col) && (row != bound.row)) 3117 if ((col == bound.col) && (row != bound.row))
3160 { 3118 {
3161 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3119 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3162 { 3120 {
3163 trow = row + dirnadd; 3121 trow = row + dirnadd;
3164 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3122 tcol = dirn == UP ? ncol - 1 : 0;
3165 3123
3166 if (screen.text[trow] == NULL) 3124 if (!ROW(trow).t)
3167 break; 3125 break;
3168 3126
3169 stp = & (screen.text[trow][tcol]); 3127 stp = ROW(trow).t + tcol;
3170 srp = & (screen.rend[trow][tcol]); 3128 srp = ROW(trow).r + tcol;
3171 3129
3172 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3173 break; 3131 break;
3174 3132
3175 row = trow; 3133 row = trow;
… …
3183Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
3184 if (dirn == DN) 3142 if (dirn == DN)
3185 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3186 3144
3187 /* Poke the values back in */ 3145 /* Poke the values back in */
3188 ret->row = row - TermWin.saveLines; 3146 ret->row = row;
3189 ret->col = col; 3147 ret->col = col;
3190} 3148}
3191 3149
3192/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
3193/* 3151/*
… …
3198 * flag == 2 ==> button 3 motion 3156 * flag == 2 ==> button 3 motion
3199 */ 3157 */
3200void 3158void
3201rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
3202{ 3160{
3203 int col, row; 3161 int col = clamp (Pixel2Col (x), 0, ncol);
3204 3162 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3205 col = Pixel2Col (x);
3206 row = Pixel2Row (y);
3207 MAX_IT (row, 0);
3208 MIN_IT (row, (int)TermWin.nrow - 1);
3209 MAX_IT (col, 0);
3210 MIN_IT (col, (int)TermWin.ncol);
3211 3163
3212 /* 3164 /*
3213 * 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
3214 * 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
3215 * 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
3216 * be _past_ a character for it to be selected. 3168 * be _past_ a character for it to be selected.
3217 */ 3169 */
3218 if (((selection.clicks % 3) == 1) && !flag 3170 if (((selection.clicks % 3) == 1) && !flag
3219 && (col == selection.mark.col 3171 && (col == selection.mark.col
3220 && (row == selection.mark.row + TermWin.view_start))) 3172 && (row == selection.mark.row + view_start)))
3221 { 3173 {
3222 /* select nothing */ 3174 /* select nothing */
3223 selection.beg.row = selection.end.row = 0; 3175 selection.beg.row = selection.end.row = 0;
3224 selection.beg.col = selection.end.col = 0; 3176 selection.beg.col = selection.end.col = 0;
3225 selection.clicks = 4; 3177 selection.clicks = 4;
… …
3240 * Extend the selection to the specified col/row 3192 * Extend the selection to the specified col/row
3241 */ 3193 */
3242void 3194void
3243rxvt_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)
3244{ 3196{
3245 int16_t ncol = TermWin.ncol;
3246 int end_col;
3247 row_col_t pos; 3197 row_col_t pos;
3248 enum { 3198 enum {
3249 LEFT, RIGHT 3199 LEFT, RIGHT
3250 } closeto = RIGHT; 3200 } closeto = RIGHT;
3251 3201
… …
3282 selection.beg.col = selection.end.col = selection.mark.col; 3232 selection.beg.col = selection.end.col = selection.mark.col;
3283 selection.beg.row = selection.end.row = selection.mark.row; 3233 selection.beg.row = selection.end.row = selection.mark.row;
3284 } 3234 }
3285 3235
3286 pos.col = col; 3236 pos.col = col;
3287 pos.row = row; 3237 pos.row = row - view_start;
3288
3289 pos.row -= TermWin.view_start; /* adjust for scroll */
3290 3238
3291 /* 3239 /*
3292 * 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
3293 * in the way button3 drag extension works. 3241 * in the way button3 drag extension works.
3294 * We're either doing: button1 drag; button3 press; or button3 drag 3242 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3353 } 3301 }
3354 } 3302 }
3355 3303
3356 if (selection.clicks == 1) 3304 if (selection.clicks == 1)
3357 { 3305 {
3358 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3359 3307 && !ROW(selection.beg.row).is_longer ()
3360 if (selection.beg.col > end_col
3361 && end_col != -1
3362#if ENABLE_FRILLS 3308#if ENABLE_FRILLS
3363 && !selection.rect 3309 && !selection.rect
3364#endif 3310#endif
3365 ) 3311 )
3366 selection.beg.col = ncol; 3312 selection.beg.col = ncol;
3367 3313
3368 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3369
3370 if ( 3314 if (
3371 selection.end.col > end_col 3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && end_col != -1 3316 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3374 && !selection.rect 3318 && !selection.rect
3375#endif 3319#endif
3376 ) 3320 )
3377 selection.end.col = ncol; 3321 selection.end.col = ncol;
… …
3379 else if (selection.clicks == 2) 3323 else if (selection.clicks == 2)
3380 { 3324 {
3381 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3382 selection.end.col--; 3326 selection.end.col--;
3383 3327
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3384 selection_delimit_word (UP, &selection.beg, &selection.beg); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3386 } 3333 }
3387 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3388 { 3335 {
3389#if ENABLE_FRILLS 3336#if ENABLE_FRILLS
3390 if ((options & Opt_tripleclickwords)) 3337 if (OPTION (Opt_tripleclickwords))
3391 { 3338 {
3392 int end_row;
3393
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3339 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3396 3340
3397 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++)
3398 { 3342 {
3399 end_col = screen.tlen[end_row + TermWin.saveLines]; 3343 if (!ROW(end_row).is_longer ())
3400
3401 if (end_col != -1)
3402 { 3344 {
3403 selection.end.row = end_row; 3345 selection.end.row = end_row;
3404 selection.end.col = end_col; 3346 selection.end.col = ROW(end_row).l;
3405 selection_remove_trailing_spaces (); 3347 selection_remove_trailing_spaces ();
3406 break; 3348 break;
3407 } 3349 }
3408 } 3350 }
3409 } 3351 }
… …
3413 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3355 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3414 selection.mark.col++; 3356 selection.mark.col++;
3415 3357
3416 selection.beg.col = 0; 3358 selection.beg.col = 0;
3417 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++;
3418 } 3369 }
3419 } 3370 }
3420 3371
3421 if (button3 && buttonpress) 3372 if (button3 && buttonpress)
3422 { /* mark may need to be changed */ 3373 { /* mark may need to be changed */
… …
3432 } 3383 }
3433 } 3384 }
3434 3385
3435#if ENABLE_FRILLS 3386#if ENABLE_FRILLS
3436 if (selection.rect && selection.beg.col > selection.end.col) 3387 if (selection.rect && selection.beg.col > selection.end.col)
3437 SWAP_IT (selection.beg.col, selection.end.col, int); 3388 ::swap (selection.beg.col, selection.end.col);
3438#endif 3389#endif
3439} 3390}
3440 3391
3441#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3442void 3393void
… …
3446 text_t *stp; 3397 text_t *stp;
3447 3398
3448 end_col = selection.end.col; 3399 end_col = selection.end.col;
3449 end_row = selection.end.row; 3400 end_row = selection.end.row;
3450 3401
3451 for ( ; end_row >= selection.beg.row; ) 3402 for (; end_row >= selection.beg.row; )
3452 { 3403 {
3453 stp = screen.text[end_row + TermWin.saveLines]; 3404 stp = ROW(end_row).t;
3454 3405
3455 while (--end_col >= 0) 3406 while (--end_col >= 0)
3456 { 3407 {
3457 if (stp[end_col] != ' ' 3408 if (stp[end_col] != NOCHAR
3458 && stp[end_col] != '\t' 3409 && !unicode::is_space (stp[end_col]))
3459 && stp[end_col] != NOCHAR)
3460 break; 3410 break;
3461 } 3411 }
3462 3412
3463 if (end_col >= 0 3413 if (end_col >= 0
3464 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3414 || !ROW(end_row - 1).is_longer ())
3465 { 3415 {
3466 selection.end.col = end_col + 1; 3416 selection.end.col = end_col + 1;
3467 selection.end.row = end_row; 3417 selection.end.row = end_row;
3468 break; 3418 break;
3469 } 3419 }
3470 3420
3471 end_row--; 3421 end_row--;
3472 end_col = TermWin.ncol; 3422 end_col = ncol;
3473 } 3423 }
3474 3424
3475 if (selection.mark.row > selection.end.row) 3425 if (selection.mark.row > selection.end.row)
3476 { 3426 {
3477 selection.mark.row = selection.end.row; 3427 selection.mark.row = selection.end.row;
… …
3502 */ 3452 */
3503void 3453void
3504rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3454rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3505{ 3455{
3506 XSelectionEvent ev; 3456 XSelectionEvent ev;
3457 dDisp;
3507 3458
3508 ev.type = SelectionNotify; 3459 ev.type = SelectionNotify;
3509 ev.property = None; 3460 ev.property = None;
3510 ev.display = rq.display; 3461 ev.display = rq.display;
3511 ev.requestor = rq.requestor; 3462 ev.requestor = rq.requestor;
… …
3525 *target++ = xa[XA_COMPOUND_TEXT]; 3476 *target++ = xa[XA_COMPOUND_TEXT];
3526#if X_HAVE_UTF8_STRING 3477#if X_HAVE_UTF8_STRING
3527 *target++ = xa[XA_UTF8_STRING]; 3478 *target++ = xa[XA_UTF8_STRING];
3528#endif 3479#endif
3529 3480
3530 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3481 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3531 32, PropModeReplace, 3482 32, PropModeReplace,
3532 (unsigned char *)target_list, target - target_list); 3483 (unsigned char *)target_list, target - target_list);
3533 ev.property = rq.property; 3484 ev.property = rq.property;
3534 } 3485 }
3535#if TODO // TODO 3486#if TODO // TODO
… …
3538 /* TODO: Handle MULTIPLE */ 3489 /* TODO: Handle MULTIPLE */
3539 } 3490 }
3540#endif 3491#endif
3541 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3492 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3542 { 3493 {
3543 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3494 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3544 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3495 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3545 ev.property = rq.property; 3496 ev.property = rq.property;
3546 } 3497 }
3547 else if (rq.target == XA_STRING 3498 else if (rq.target == XA_STRING
3548 || rq.target == xa[XA_TEXT] 3499 || rq.target == xa[XA_TEXT]
… …
3606 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3557 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3607 ct.nitems = strlen ((char *)ct.value); 3558 ct.nitems = strlen ((char *)ct.value);
3608 } 3559 }
3609 else 3560 else
3610#endif 3561#endif
3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3562 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3612 freect = 1; 3563 freect = 1;
3613 else 3564 else
3614 { 3565 {
3615 /* if we failed to convert then send it raw */ 3566 /* if we failed to convert then send it raw */
3616 ct.value = (unsigned char *)cl; 3567 ct.value = (unsigned char *)cl;
3617 ct.nitems = selectlen; 3568 ct.nitems = selectlen;
3618 ct.encoding = target; 3569 ct.encoding = target;
3619 } 3570 }
3620 3571
3621 XChangeProperty (display->display, rq.requestor, rq.property, 3572 XChangeProperty (disp, rq.requestor, rq.property,
3622 ct.encoding, 8, PropModeReplace, 3573 ct.encoding, 8, PropModeReplace,
3623 ct.value, (int)ct.nitems); 3574 ct.value, (int)ct.nitems);
3624 ev.property = rq.property; 3575 ev.property = rq.property;
3625 3576
3626 if (freect) 3577 if (freect)
3627 XFree (ct.value); 3578 XFree (ct.value);
3628 } 3579 }
3629 3580
3630 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3581 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3631} 3582}
3632 3583
3633/* ------------------------------------------------------------------------- * 3584/* ------------------------------------------------------------------------- *
3634 * MOUSE ROUTINES * 3585 * MOUSE ROUTINES *
3635 * ------------------------------------------------------------------------- */ 3586 * ------------------------------------------------------------------------- */
… …
3639 */ 3590 */
3640void 3591void
3641rxvt_term::pixel_position (int *x, int *y) 3592rxvt_term::pixel_position (int *x, int *y)
3642{ 3593{
3643 *x = Pixel2Col (*x); 3594 *x = Pixel2Col (*x);
3644 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3645 *y = Pixel2Row (*y); 3596 *y = Pixel2Row (*y);
3646 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3647} 3598}
3648 3599
3649/* ------------------------------------------------------------------------- */ 3600/* ------------------------------------------------------------------------- */
3650#ifdef USE_XIM 3601#ifdef USE_XIM
3651void 3602void
3652rxvt_term::im_set_position (XPoint &pos) 3603rxvt_term::im_set_position (XPoint &pos)
3653{ 3604{
3654 XWindowAttributes xwa; 3605 XWindowAttributes xwa;
3655 3606
3656 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3607 XGetWindowAttributes (display->display, vt, &xwa);
3657 3608
3658 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3609 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3659 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3610 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3660} 3611}
3661#endif 3612#endif
3662 3613
3663#if ENABLE_OVERLAY 3614#if ENABLE_OVERLAY
3664void 3615void
3665rxvt_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)
3666{ 3617{
3667 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3618 if (nrow < 1 || ncol < 1)
3668 return; 3619 return;
3669 3620
3670 want_refresh = 1; 3621 want_refresh = 1;
3671 3622
3672 scr_overlay_off (); 3623 scr_overlay_off ();
3673 3624
3674 if (x < 0) x = TermWin.ncol - w; 3625 if (x < 0) x = ncol - w;
3675 if (y < 0) y = TermWin.nrow - h; 3626 if (y < 0) y = nrow - h;
3676 3627
3677 // make space for border 3628 // make space for border
3678 w += 2; MIN_IT (w, TermWin.ncol); 3629 w += 2; min_it (w, ncol);
3679 h += 2; MIN_IT (h, TermWin.nrow); 3630 h += 2; min_it (h, nrow);
3680 3631
3681 x -= 1; MAX_IT (x, 0); 3632 x -= 1; clamp_it (x, 0, ncol - w);
3682 y -= 1; MAX_IT (y, 0); 3633 y -= 1; clamp_it (y, 0, nrow - h);
3683
3684 MIN_IT (x, TermWin.ncol - w);
3685 MIN_IT (y, TermWin.nrow - h);
3686 3634
3687 ov_x = x; ov_y = y; 3635 ov_x = x; ov_y = y;
3688 ov_w = w; ov_h = h; 3636 ov_w = w; ov_h = h;
3689 3637
3690 ov_text = new text_t *[h]; 3638 ov_text = new text_t *[h];
… …
3755 while (*s) 3703 while (*s)
3756 scr_overlay_set (x++, y, *s++); 3704 scr_overlay_set (x++, y, *s++);
3757} 3705}
3758 3706
3759void 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
3760rxvt_term::scr_swap_overlay () 3724rxvt_term::scr_swap_overlay ()
3761{ 3725{
3762 if (!ov_text) 3726 if (!ov_text)
3763 return; 3727 return;
3764 3728
3765 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3766
3767 // swap screen mem with overlay 3729 // swap screen mem with overlay
3768 for (int y = ov_h; y--; ) 3730 for (int y = ov_h; y--; )
3769 { 3731 {
3770 text_t *t1 = ov_text[y]; 3732 text_t *t1 = ov_text[y];
3771 rend_t *r1 = ov_rend[y]; 3733 rend_t *r1 = ov_rend[y];
3772 3734
3773 text_t *t2 = screen.text[y + row_offset] + ov_x; 3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3774 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3775 3737
3776 for (int x = ov_w; x--; ) 3738 for (int x = ov_w; x--; )
3777 { 3739 {
3778 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3779 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3781 } 3743 }
3782} 3744}
3783 3745
3784#endif 3746#endif
3785/* ------------------------------------------------------------------------- */ 3747/* ------------------------------------------------------------------------- */
3748

Diff Legend

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