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.189 by root, Thu Dec 22 15:28:15 2005 UTC

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

Diff Legend

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