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

Diff Legend

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