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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

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

Diff Legend

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