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

Diff Legend

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