ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 2005 UTC

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

Diff Legend

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