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

Diff Legend

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