ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.192 by root, Thu Dec 22 19:25:58 2005 UTC

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

Diff Legend

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