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.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC vs.
Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
49 if (option (Opt_scrollTtyOutput)) \ 47 if (option (Opt_scrollTtyOutput)) \
50 view_start = 0 48 view_start = 0
51#define CLEAR_SELECTION() \ 49#define CLEAR_SELECTION() \
52 selection.beg.row = selection.beg.col \ 50 selection.beg.row = selection.beg.col \
53 = selection.end.row = selection.end.col = 0 51 = selection.end.row = selection.end.col = 0
54#define CLEAR_SELECTION_MARK() \ 52#define CLEAR_ALL_SELECTION() \
53 selection.beg.row = selection.beg.col \
54 = selection.mark.row = selection.mark.col \
55 selection.mark.row = selection.mark.col = 0 55 = selection.end.row = selection.end.col = 0
56 56
57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
58 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 58 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
60 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 60 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
96 96
97/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
98void 98void
99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
100{ 100{
101 if (!l.t) 101 if (!l.valid ())
102 { 102 {
103 lalloc (l); 103 l.alloc ();
104 col = 0; 104 col = 0;
105 width = ncol; 105 width = ncol;
106 } 106 }
107 107
108 l.touch (); 108 l.touch ();
… …
155/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158 158
159void 159void
160rxvt_term::scr_alloc ()
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void
160rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
161{ 195{
162#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
163 scr_overlay_off (); 197 scr_overlay_off ();
164#endif 198#endif
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
195 if (!row_buf) 238 if (!prev_row_buf)
196 { 239 {
197 /* 240 /*
198 * first time called so just malloc everything: don't rely on realloc 241 * first time called so just malloc everything: don't rely on realloc
199 */ 242 */
200 top_row = 0; 243 top_row = 0;
201 term_start = 0; 244 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 245
217 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
243 { 272 {
244 /* 273 /*
245 * add or delete rows as appropriate 274 * add or delete rows as appropriate
246 */ 275 */
247 276
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
266 { 278 {
267 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 281
271 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272 { 286 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279 287
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
283 291
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 300
293 do 301 do
294 { 302 {
295 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 305 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 307
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 309 {
302 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
303 311
304 plines++; 312 plines++;
305 llen += prev_ncol; 313 llen += prev_ncol;
… …
318 326
319 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
321 { 329 {
322 qline = row_buf + qrow; 330 qline = row_buf + qrow;
323 lalloc (*qline); 331 qline->alloc (); // redundant with next line
324 qline->l = ncol; 332 qline->l = ncol;
325 qline->is_longer (1); 333 qline->is_longer (1);
326 334
327 int qcol = 0; 335 int qcol = 0;
328 336
… …
343 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
344 // least. 352 // least.
345 if (prow == ocur.row) 353 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
347 355
348 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
349 357
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 359
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 382 {
375 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
376 384
377 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
378 { 386 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
381 389
382 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
384 } 394 }
385 395
386 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 398
391 term_start = 0; 399 term_start = 0;
392 } 400 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 401
398 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 404 }
401 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
402 free (tabs); 415 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
404 417
405 for (int col = ncol; col--; ) 418 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
407 420
408 CLEAR_SELECTION (); 421 CLEAR_ALL_SELECTION ();
409 CLEAR_SELECTION_MARK ();
410 422
411 prev_nrow = nrow; 423 prev_nrow = nrow;
412 prev_ncol = ncol; 424 prev_ncol = ncol;
413 425
414 tt_winch (); 426 tt_winch ();
… …
421 * Free everything. That way malloc debugging can find leakage. 433 * Free everything. That way malloc debugging can find leakage.
422 */ 434 */
423void 435void
424rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
425{ 437{
426 if (row_buf) 438 free (chunk);
427 {
428 delete talloc; talloc = 0;
429 delete ralloc; ralloc = 0;
430
431 free (row_buf);
432 free (swap_buf);
433 free (drawn_buf);
434 row_buf = 0; // signal that we freed all the arrays above
435
436 free (tabs); 439 free (tabs);
437 tabs = 0;
438 }
439} 440}
440 441
441/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
442/* 443/*
443 * Hard/Soft reset 444 * Hard/Soft reset
444 */ 445 */
445void 446void
446rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
447{ 448{
448 scr_release (); 449 scr_release ();
450
451 row_buf = 0;
452 tabs = 0;
449 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
450 rvideo_mode = false; 454 rvideo_mode = false;
451 scr_soft_reset (); 455 scr_soft_reset ();
452 scr_reset (); 456 scr_reset ();
453 457
454 scr_clear (true); 458 scr_clear (true);
455 scr_refresh (); 459 scr_refresh ();
456} 460}
457 461
458void 462void
459rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
460{ 464{
461 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
462#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
463 scr_overlay_off (); 467 scr_overlay_off ();
464#endif 468#endif
… …
519 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
521} 525}
522 526
523void 527void
524rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
525{ 529{
526 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
527 return; 531 return;
528 532
529 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
548 return; 552 return;
549 553
550 want_refresh = 1; 554 want_refresh = 1;
551 view_start = 0; 555 view_start = 0;
552 556
553 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
554 563
555 current_screen = scrn; 564 current_screen = scrn;
556 565
557#if NSCREENS 566#if NSCREENS
558 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
… …
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 720 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 721 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1) 722 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2)) 723 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 { 724 {
716 CLEAR_SELECTION (); 725 CLEAR_ALL_SELECTION ();
717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) 726 selection.op = SELECTION_CLEAR;
718 CLEAR_SELECTION_MARK ();
719 } 727 }
720 else if (selection.end.row >= row1 && selection.end.row <= row2) 728 else if (selection.end.row >= row1 && selection.end.row <= row2)
721 { 729 {
722 /* move selected region too */ 730 /* move selected region too */
723 selection.beg.row -= count; 731 selection.beg.row -= count;
… …
1307 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1308} 1316}
1309 1317
1310/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1311/* 1319/*
1312 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316 */ 1324 */
1317void 1325void
… …
1326 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1327 1335
1328 switch (mode) 1336 switch (mode)
1329 { 1337 {
1330 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1331 selection_check (1);
1332 scr_erase_line (0); 1339 scr_erase_line (0);
1333 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1334 num = nrow - row; 1341 num = nrow - row;
1335 break; 1342 break;
1336 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1337 selection_check (3);
1338 scr_erase_line (1); 1344 scr_erase_line (1);
1339 row = 0; 1345 row = 0;
1340 num = screen.cur.row; 1346 num = screen.cur.row;
1341 break; 1347 break;
1342 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1343 selection_check (3);
1344 row = 0; 1349 row = 0;
1345 num = nrow; 1350 num = nrow;
1346 break; 1351 break;
1347 default: 1352 default:
1348 return; 1353 return;
… …
1365 { 1370 {
1366 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1367 1372
1368 if (mapped) 1373 if (mapped)
1369 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1372 } 1377 }
1373 else 1378 else
1374 { 1379 {
1375 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1378 { 1383 {
1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1380 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1381 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1383 (unsigned int)width, 1388 (unsigned int)vt_width,
1384 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1385 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 } 1392 }
1388 } 1393 }
… …
1419 1424
1420 want_refresh = 1; 1425 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1422 1427
1423 num_scr_allow = 0; 1428 num_scr_allow = 0;
1424 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1425 1434
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1428 { 1437 {
1429 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1870 * Refresh the entire screen 1879 * Refresh the entire screen
1871 */ 1880 */
1872void 1881void
1873rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1874{ 1883{
1875 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1876} 1885}
1877 1886
1878/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1879/* 1888/*
1880 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
2161 { 2170 {
2162 int16_t nits; 2171 int16_t nits;
2163 int i = num_scr; 2172 int i = num_scr;
2164 int j; 2173 int j;
2165 int len, wlen; 2174 int len, wlen;
2166 dLocal (int, num_scr);
2167 2175
2168 j = nrow; 2176 j = nrow;
2169 wlen = len = -1; 2177 wlen = len = -1;
2170 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2171 2179
… …
2476 2484
2477 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2478 Col2Pixel (col), 2486 Col2Pixel (col),
2479 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2480 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2482 } 2490 }
2483 } 2491 }
2484 2492
2485 /* 2493 /*
2486 * H: cleanup selection 2494 * H: cleanup selection
… …
2498} 2506}
2499 2507
2500void 2508void
2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2502{ 2510{
2503 if (!l.t) 2511 if (!l.valid ())
2504 return; 2512 return;
2505 2513
2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2507 2515
2508 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
… …
2662 */ 2670 */
2663#if 0 2671#if 0
2664void 2672void
2665rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2666{ 2674{
2667 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2668 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2669 const char r1[] = "\n";
2670
2671 for (row = saveLines + top_row;
2672 row < saveLines + nrow - 1; row++)
2673 {
2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2675 : ncol;
2676 for (towrite = width; towrite; towrite -= wrote)
2677 {
2678 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2679 towrite);
2680 if (wrote < 0)
2681 return; /* XXX: death, no report */
2682 }
2683 if (row_buf[row].l >= 0)
2684 if (write (fd, r1, 1) <= 0)
2685 return; /* XXX: death, no report */
2686 }
2687} 2677}
2688#endif 2678#endif
2689 2679
2690/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2691 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
… …
2694rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2695{ 2685{
2696 if (!selection.op) 2686 if (!selection.op)
2697 return; 2687 return;
2698 2688
2699 row_col_t pos;
2700 pos.row = pos.col = 0;
2701
2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704 || (check_more == 1 2692 || (check_more == 1
2705 && current_screen == selection.screen 2693 && current_screen == selection.screen
2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2708 || (check_more == 2
2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2710 && ROWCOL_IS_AFTER (selection.end, pos))
2711 || (check_more == 3
2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2713 CLEAR_SELECTION (); 2696 CLEAR_ALL_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2717} 2697}
2718 2698
2719/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2720/* 2700/*
2721 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2727 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2728 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2729 data[i] = C0_CR; 2709 data[i] = C0_CR;
2730 2710
2731 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2733 2713
2734 tt_write (data, len); 2714 tt_write (data, len);
2735 2715
2736 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2737 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2738} 2718}
2739 2719
2740void 2720void
2741rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2742{ 2722{

Diff Legend

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