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

Diff Legend

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