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

Diff Legend

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