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

Diff Legend

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