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

Diff Legend

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