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

Diff Legend

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