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.196 by root, Mon Dec 26 23:12:59 2005 UTC

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

Diff Legend

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