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

Diff Legend

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