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

Diff Legend

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