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

Diff Legend

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