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

Diff Legend

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