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.202 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
92 */ 93 */
93#define drawBuffer vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
167 nrow = 24; 173 nrow = 24;
168 174
169 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 176 return;
171 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
172 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
174 { 183 {
175 //TODO//FIXME 184 //TODO//FIXME
176 saveLines++; 185 saveLines++;
177 prev_nrow--; 186 prev_nrow--;
178 nsaved++; 187 top_row--;
179 } 188 }
180 189
181 want_refresh = 1; 190 want_refresh = 1;
182 191
183 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
188 197
189 if (!row_buf) 198 if (!row_buf)
190 { 199 {
191 /* 200 /*
192 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 202 */
195 nsaved = 0; /* no saved lines */ 203 top_row = 0;
196 term_start = 0; 204 term_start = 0;
197 205
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 208
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 212
206 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
207 { 214 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 237 selection.text = NULL;
231 selection.len = 0; 238 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
234 selection.clicks = 0; 241 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 243 }
238 else 244 else
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
254 } 260 }
255 } 261 }
256#endif 262#endif
257 263
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 266
262 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
263 { 268 {
264 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
269 { 274 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 277 }
273 278
279 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 281
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
279 285
280 if (nsaved) 286 if (top_row)
281 { 287 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 293
… …
289 { 295 {
290 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 299#endif
294
295 int plines = 1; 300 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 302
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 304 {
… …
317 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
319 { 324 {
320 qline = row_buf + qrow; 325 qline = row_buf + qrow;
321 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
322 qline->set_is_longer (); 328 qline->is_longer (1);
323 329
324 int qcol = 0; 330 int qcol = 0;
325 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
326 // fill a single destination line 336 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
328 { 338 {
329 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
340 350
341 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
342 352
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344 354
345 assert (len);
346 assert (pline.t);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350 357
351 lofs += len; 358 lofs += len;
352 qcol += len; 359 qcol += len;
353 } 360 }
354 } 361 }
355 362
356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 364 qline->is_longer (0);
358 if (qline->l < 0)
359 {
360 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
361 qline->l = 0;
362 }
363#endif
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 366 }
366 while (p != pend && q > 0); 367 while (p != pend && q > 0);
367 368
368 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
369 nsaved = term_start - q; 370 top_row = q - term_start;
370 371
371 // make sure all terminal lines exist 372 // make sure all terminal lines exist
372 while (nsaved < 0) 373 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374
375 } 375 }
376 else 376 else
377 { 377 {
378 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
379 379
… …
392 } 392 }
393 393
394 term_start = 0; 394 term_start = 0;
395 } 395 }
396 396
397#ifdef DEBUG_STRICT //TODO: remove
398 for (int i = -nsaved; i < nrow; i++)
399 assert (ROW (i).t);
400#endif
401
402 free (old_buf); 397 free (old_buf);
403 delete old_ta; 398 delete old_ta;
404 delete old_ra; 399 delete old_ra;
405 400
406 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
407 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
408 403
409 if (tabs)
410 free (tabs); 404 free (tabs);
411 } 405 }
406
407 CLEAR_ALL_SELECTION ();
412 408
413 prev_nrow = nrow; 409 prev_nrow = nrow;
414 prev_ncol = ncol; 410 prev_ncol = ncol;
415 411
416 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
417 413
418 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
420 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
421 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 423}
423 424
424/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
425/* 426/*
426 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
427 */ 428 */
428void 429void
429rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
430{ 431{
432 if (row_buf)
433 {
431 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
433 436
434 free (row_buf); 437 free (row_buf);
435 free (swap_buf); 438 free (swap_buf);
436 free (drawn_buf); 439 free (drawn_buf);
437 free (temp_buf);
438 free (tabs); 440 free (tabs);
439 441
440 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
441} 444}
442 445
443/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
444/* 447/*
445 * Hard reset 448 * Hard reset
… …
450 scr_release (); 453 scr_release ();
451 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
452 scr_reset (); 455 scr_reset ();
453 456
454 scr_clear (true); 457 scr_clear (true);
455 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
456} 459}
457 460
458/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
462 * Save and Restore cursor 465 * Save and Restore cursor
463 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
464 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
465 */ 468 */
466void 469void
467rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
468{ 471{
469 screen_t *s; 472 screen_t *s;
470 473
471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
472 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
504 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
506#endif 509#endif
507} 510}
508 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
509/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
510/* 528/*
511 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 532 */
515int 533void
516rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
517{ 535{
536 if (scrn == current_screen)
537 return;
538
518 want_refresh = 1; 539 want_refresh = 1;
519 view_start = 0; 540 view_start = 0;
520 541
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
525 543
526 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 545
534#if NSCREENS 546#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
536 { 548 {
537 num_scr = 0; 549 num_scr = 0;
538 550
539 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 552
542 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
546 } 557 }
547 else 558 else
548#endif 559#endif
549 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 562}
554 563
555// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
556void 565void
557rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
558{ 567{
559 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
560 return; 569 return;
561 570
562 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
572/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
573/* 582/*
574 * Change the colour for following text 583 * Change the colour for following text
575 */ 584 */
576void 585void
577rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
578{ 587{
579 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
580 color = fgbg; 589 color = fgbg;
581 590
582 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
583 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
584 else 593 else
… …
588/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
589/* 598/*
590 * Change the rendition style for following text 599 * Change the rendition style for following text
591 */ 600 */
592void 601void
593rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 603 {
595 if (set) 604 if (set)
596 rstyle |= style; 605 rstyle |= style;
597 else if (style == ~RS_None) 606 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 615 * count positive ==> scroll up
607 * count negative ==> scroll down 616 * count negative ==> scroll down
608 */ 617 */
609int 618int
610rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
611{ 620{
612 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
613 return 0; 622 return 0;
614 623
615 want_refresh = 1; 624 want_refresh = 1;
616 num_scr += count; 625 num_scr += count;
617 626
618 if (count > 0 627 if (count > 0
619 && row1 == 0 628 && row1 == 0
620 && row2 == nrow - 1
621 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
622 { 630 {
623 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
625 635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
626 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
627 { 661 {
628 selection.beg.row -= count; 662 selection.beg.row -= count;
629 selection.end.row -= count; 663 selection.end.row -= count;
630 selection.mark.row -= count; 664 selection.mark.row -= count;
631 665
632 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
633 || selection.end.row < -nsaved 667 || selection.end.row < top_row
634 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
635 { 669 {
636 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
638 } 672 }
639 } 673 }
640 674
641 for (int i = count; i--; ) 675 // finally move the view window, if desired
642 {
643 ROW(row2 - i).l = 0;
644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
646
647 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
648 && view_start != 0 677 && view_start != 0
649 && view_start != saveLines) 678 && view_start != -saveLines)
650 scr_page (UP, count); 679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
651 } 683 }
652 else 684 else
653 { 685 {
654 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen)
655 { 687 {
… …
679 711
680 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
681 713
682 min_it (count, rows); 714 min_it (count, rows);
683 715
716 line_t *temp_buf = row_buf + total_rows;
717
684 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
685 { 719 {
686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
687 721
688 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
699/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
700/* 734/*
701 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
702 */ 736 */
703void 737void
704rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
705{ 739{
706 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
707 return; 741 return;
708 742
709 unsigned char checksel; 743 unsigned char checksel;
710 unicode_t c; 744 unicode_t c;
711 int last_col; 745 int ncol = this->ncol;
712 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
713 747
714 want_refresh = 1; 748 want_refresh = 1;
715 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
716 last_col = ncol;
717 750
718 if (nlines > 0) 751 if (minlines > 0)
719 { 752 {
720 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754 min_it (minlines, screen.cur.row - top_row);
755
721 if (nlines > 0 756 if (minlines > 0
722 && screen.tscroll == 0 757 && screen.tscroll == 0
723 && screen.bscroll == (nrow - 1)) 758 && screen.bscroll == nrow - 1)
724 { 759 {
725 /* _at least_ this many lines need to be scrolled */ 760 /* _at least_ this many lines need to be scrolled */
726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
727 screen.cur.row -= nlines; 762 screen.cur.row -= minlines;
728 } 763 }
729 } 764 }
730 765
731#ifdef DEBUG_STRICT 766#ifdef DEBUG_STRICT
732 assert (screen.cur.col < last_col); 767 assert (screen.cur.col < ncol);
733 assert (screen.cur.row < nrow 768 assert (screen.cur.row < nrow
734 && screen.cur.row >= -nsaved); 769 && screen.cur.row >= top_row);
735#endif 770#endif
736 int row = screen.cur.row; 771 int row = screen.cur.row;
737 772
738 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 773 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
739 774
740 line_t *line = &ROW(row); 775 line_t *line = &ROW(row);
741 776
742 while (str < strend) 777 while (str < strend)
743 { 778 {
744 c = *str++; 779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
745 780
746 if (c < 0x20) 781 if (c < 0x20)
747 if (c == C0_LF) 782 if (c == C0_LF)
748 { 783 {
749 if (!line->is_longer ()) /* XXX: think about this */
750 max_it (line->l, screen.cur.col); 784 max_it (line->l, screen.cur.col);
751 785
752 screen.flags &= ~Screen_WrapNext; 786 screen.flags &= ~Screen_WrapNext;
753 787
754 if (screen.cur.row == screen.bscroll) 788 if (screen.cur.row == screen.bscroll)
755 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 789 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
759 line = &ROW(row); /* _must_ refresh */ 793 line = &ROW(row); /* _must_ refresh */
760 continue; 794 continue;
761 } 795 }
762 else if (c == C0_CR) 796 else if (c == C0_CR)
763 { 797 {
764 if (!line->is_longer ()) /* XXX: think about this */
765 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
766 799
767 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
768 screen.cur.col = 0; 801 screen.cur.col = 0;
769 continue; 802 continue;
770 } 803 }
… …
787 CLEAR_SELECTION (); 820 CLEAR_SELECTION ();
788 } 821 }
789 822
790 if (screen.flags & Screen_WrapNext) 823 if (screen.flags & Screen_WrapNext)
791 { 824 {
792 line->set_is_longer ();
793
794 scr_do_wrap (); 825 scr_do_wrap ();
795 826
827 line->l = ncol;
828 line->is_longer (1);
829
796 row = screen.cur.row; 830 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 831 line = &ROW(row); /* _must_ refresh */
798 } 832 }
799 833
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 834 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 835 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 836 c = 0xfffd;
803 837
804 // rely on wcwidth to tell us the character width, at least for non-latin1 838 // rely on wcwidth to tell us the character width, do wcwidth before
805 // do wcwidth before further replacements, as wcwidth might return -1 839 // further replacements, as wcwidth might return -1 for the line
806 // for the line drawing characters below as they might be invalid in the current 840 // drawing characters below as they might be invalid in the current
807 // locale. 841 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 842 int width = WCWIDTH (c);
809 843
810 if (charsets[screen.charset] == '0') // DEC SPECIAL 844 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 845 {
812 // vt100 special graphics and line drawing 846 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 847 // 5f-7e standard vt100
814 // 40-5e rxvt extension for extra curses acs chars 848 // 40-5e rxvt extension for extra curses acs chars
815 static uint16_t vt100_0[62] = { // 41 .. 7e 849 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
867 } 901 }
868 902
869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870 904
871 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > last_col - width && last_col >= width) 906 if (screen.cur.col > ncol - width && ncol >= width)
873 { 907 {
874 // ...output spaces 908 // ...output spaces
875 c = ' '; 909 c = ' ';
876 // and try the same character next loop iteration 910 // and try the same character next loop iteration
877 --str; 911 --str;
878 } 912 }
879 913
914 line->touch ();
915
880 do 916 do
881 { 917 {
882 line->t[screen.cur.col] = c; 918 line->t[screen.cur.col] = c;
883 line->r[screen.cur.col] = rend; 919 line->r[screen.cur.col] = rend;
884 920
885 if (screen.cur.col < last_col - 1) 921 if (screen.cur.col < ncol - 1)
886 screen.cur.col++; 922 screen.cur.col++;
887 else 923 else
888 { 924 {
889 line->l = last_col; 925 line->l = ncol;
890 if (screen.flags & Screen_Autowrap) 926 if (screen.flags & Screen_Autowrap)
891 screen.flags |= Screen_WrapNext; 927 screen.flags |= Screen_WrapNext;
892 break; 928 break;
893 } 929 }
894 930
… …
896 } 932 }
897 while (--width > 0); 933 while (--width > 0);
898 934
899 // pad with spaces when overwriting wide character with smaller one 935 // pad with spaces when overwriting wide character with smaller one
900 if (!width) 936 if (!width)
937 {
938 line->touch ();
939
901 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 940 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
902 { 941 {
903 line->t[c] = ' '; 942 line->t[c] = ' ';
904 line->r[c] = rend; 943 line->r[c] = rend;
905 } 944 }
945 }
906 } 946 }
907 else // width == 0 947 else // width == 0
908 { 948 {
909#if ENABLE_COMBINING 949#if ENABLE_COMBINING
910 // handle combining characters 950 // handle combining characters
911 // we just tag the accent on the previous on-screen character. 951 // we just tag the accent on the previous on-screen character.
912 // this is arguably not correct, but also arguably not wrong. 952 // this is arguably not correct, but also arguably not wrong.
913 // we don't handle double-width characters nicely yet. 953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
914 text_t *tp; 955 text_t *tp;
915 rend_t *rp; 956 rend_t *rp;
916 957
917 if (screen.cur.col > 0) 958 if (screen.cur.col > 0)
918 { 959 {
960 linep = line;
919 tp = line->t + screen.cur.col - 1; 961 tp = line->t + screen.cur.col - 1;
920 rp = line->r + screen.cur.col - 1; 962 rp = line->r + screen.cur.col - 1;
921
922 while (*tp == NOCHAR && tp > line->t)
923 tp--, rp--;
924 } 963 }
925 else if (screen.cur.row > 0 964 else if (screen.cur.row > 0
926 && ROW(screen.cur.row - 1).is_longer ()) 965 && ROW(screen.cur.row - 1).is_longer ())
927 { 966 {
928 line_t *line = &ROW(screen.cur.row - 1); 967 linep = &ROW(screen.cur.row - 1);
929
930 tp = line->t + last_col - 1; 968 tp = line->t + ncol - 1;
931 rp = line->r + last_col - 1; 969 rp = line->r + ncol - 1;
932
933 while (*tp == NOCHAR && tp > line->t)
934 tp--, rp--;
935 } 970 }
936 else 971 else
937 continue; 972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
938 978
939 // first try to find a precomposed character 979 // first try to find a precomposed character
940 unicode_t n = rxvt_compose (*tp, c); 980 unicode_t n = rxvt_compose (*tp, c);
941 if (n == NOCHAR) 981 if (n == NOCHAR)
942 n = rxvt_composite.compose (*tp, c); 982 n = rxvt_composite.compose (*tp, c);
… …
945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
946#endif 986#endif
947 } 987 }
948 } 988 }
949 989
950 if (!line->is_longer ()) /* XXX: think about this */
951 max_it (line->l, screen.cur.col); 990 max_it (line->l, screen.cur.col);
952 991
953#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
954 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
955#endif 994#endif
956} 995}
… …
959/* 998/*
960 * Process Backspace. Move back the cursor back a position, wrap if have to 999 * Process Backspace. Move back the cursor back a position, wrap if have to
961 * XTERM_SEQ: CTRL-H 1000 * XTERM_SEQ: CTRL-H
962 */ 1001 */
963void 1002void
964rxvt_term::scr_backspace () 1003rxvt_term::scr_backspace () NOTHROW
965{ 1004{
966 want_refresh = 1; 1005 want_refresh = 1;
967 1006
968 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
969 { 1008 {
… …
987 * Process Horizontal Tab 1026 * Process Horizontal Tab
988 * count: +ve = forward; -ve = backwards 1027 * count: +ve = forward; -ve = backwards
989 * XTERM_SEQ: CTRL-I 1028 * XTERM_SEQ: CTRL-I
990 */ 1029 */
991void 1030void
992rxvt_term::scr_tab (int count, bool ht) 1031rxvt_term::scr_tab (int count, bool ht) NOTHROW
993{ 1032{
994 int i, x; 1033 int i, x;
995 1034
996 want_refresh = 1; 1035 want_refresh = 1;
997 i = x = screen.cur.col; 1036 i = x = screen.cur.col;
… …
1006 1045
1007 for (; ++i < ncol; ) 1046 for (; ++i < ncol; )
1008 if (tabs[i]) 1047 if (tabs[i])
1009 { 1048 {
1010 x = i; 1049 x = i;
1050
1011 if (!--count) 1051 if (!--count)
1012 break; 1052 break;
1013 } 1053 }
1014 else 1054 else
1015 ht &= l.t[i] == ' ' 1055 ht &= l.t[i] == ' '
… …
1022 // buffer so they can be selected and pasted. 1062 // buffer so they can be selected and pasted.
1023 if (ht && OPTION (Opt_pastableTabs)) 1063 if (ht && OPTION (Opt_pastableTabs))
1024 { 1064 {
1025 base_rend = SET_FONT (base_rend, 0); 1065 base_rend = SET_FONT (base_rend, 0);
1026 1066
1027 if (!l.is_longer ()) /* XXX: think about this */ 1067 l.touch (x);
1028 max_it (l.l, x);
1029 1068
1030 i = screen.cur.col; 1069 i = screen.cur.col;
1031 1070
1032 l.t[i] = '\t'; 1071 l.t[i] = '\t';
1033 l.r[i] = base_rend; 1072 l.r[i] = base_rend;
… …
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1103 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1104 * in that row right. Clear left column.
1066 */ 1105 */
1067#if ENABLE_FRILLS 1106#if ENABLE_FRILLS
1068void 1107void
1069rxvt_term::scr_backindex () 1108rxvt_term::scr_backindex () NOTHROW
1070{ 1109{
1071 if (screen.cur.col > 0) 1110 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1112 else
1074 scr_insdel_chars (1, INSERT); 1113 scr_insdel_chars (1, INSERT);
… …
1081 * Move cursor right in row. If we're at the right boundary, shift everything 1120 * Move cursor right in row. If we're at the right boundary, shift everything
1082 * in that row left. Clear right column. 1121 * in that row left. Clear right column.
1083 */ 1122 */
1084#if ENABLE_FRILLS 1123#if ENABLE_FRILLS
1085void 1124void
1086rxvt_term::scr_forwardindex () 1125rxvt_term::scr_forwardindex () NOTHROW
1087{ 1126{
1088 if (screen.cur.col < ncol - 1) 1127 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1129 else
1091 { 1130 {
1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1131 line_t &l = ROW(screen.cur.row);
1093 ROW(screen.cur.row).l = ncol; 1132
1133 l.touch ();
1134 l.is_longer (0);
1094 1135
1095 scr_gotorc (0, 0, R_RELATIVE); 1136 scr_gotorc (0, 0, R_RELATIVE);
1096 scr_insdel_chars (1, DELETE); 1137 scr_insdel_chars (1, DELETE);
1097 scr_gotorc (0, ncol - 1, R_RELATIVE); 1138 scr_gotorc (0, ncol - 1, R_RELATIVE);
1098 } 1139 }
… …
1102/* ------------------------------------------------------------------------- */ 1143/* ------------------------------------------------------------------------- */
1103/* 1144/*
1104 * Goto Row/Column 1145 * Goto Row/Column
1105 */ 1146 */
1106void 1147void
1107rxvt_term::scr_gotorc (int row, int col, int relative) 1148rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1108{ 1149{
1109 want_refresh = 1; 1150 want_refresh = 1;
1110 ZERO_SCROLLBACK (); 1151 ZERO_SCROLLBACK ();
1111 1152
1112 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1153 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1150/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1151/* 1192/*
1152 * direction should be UP or DN 1193 * direction should be UP or DN
1153 */ 1194 */
1154void 1195void
1155rxvt_term::scr_index (enum page_dirn direction) 1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1156{ 1197{
1157 int dirn; 1198 int dirn;
1158 1199
1159 want_refresh = 1; 1200 want_refresh = 1;
1160 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
… …
1179 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1180 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1182 */ 1223 */
1183void 1224void
1184rxvt_term::scr_erase_line (int mode) 1225rxvt_term::scr_erase_line (int mode) NOTHROW
1185{ 1226{
1186 unsigned int col, num; 1227 unsigned int col, num;
1187 1228
1188 want_refresh = 1; 1229 want_refresh = 1;
1189 ZERO_SCROLLBACK (); 1230 ZERO_SCROLLBACK ();
1190 1231
1191 selection_check (1); 1232 selection_check (1);
1192 1233
1193 line_t &line = ROW(screen.cur.row); 1234 line_t &line = ROW(screen.cur.row);
1235
1236 line.touch ();
1237 line.is_longer (0);
1194 1238
1195 switch (mode) 1239 switch (mode)
1196 { 1240 {
1197 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1198 col = screen.cur.col; 1242 col = screen.cur.col;
… …
1230 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1274 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1231 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1275 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1232 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1276 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1233 */ 1277 */
1234void 1278void
1235rxvt_term::scr_erase_screen (int mode) 1279rxvt_term::scr_erase_screen (int mode) NOTHROW
1236{ 1280{
1237 int num; 1281 int num;
1238 int32_t row; 1282 int32_t row;
1239 rend_t ren; 1283 rend_t ren;
1240 XGCValues gcvalue; 1284 XGCValues gcvalue;
… …
1285 } 1329 }
1286 else 1330 else
1287 { 1331 {
1288 ren = rstyle & (RS_fgMask | RS_bgMask); 1332 ren = rstyle & (RS_fgMask | RS_bgMask);
1289 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1290 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1291 ERASE_ROWS (row, num); 1335 ERASE_ROWS (row, num);
1292 gcvalue.foreground = pix_colors[Color_fg]; 1336 gcvalue.foreground = pix_colors[Color_fg];
1293 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1294 } 1338 }
1295 1339
1296 for (; num--; row++) 1340 for (; num--; row++)
1297 { 1341 {
1298 ROW (row).l = 0;
1299 scr_blank_screen_mem (ROW (row), rstyle); 1342 scr_blank_screen_mem (ROW(row), rstyle);
1300 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1343 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1301 } 1344 }
1302} 1345}
1303 1346
1304#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
1305void 1348void
1306rxvt_term::scr_erase_savelines () 1349rxvt_term::scr_erase_savelines () NOTHROW
1307{ 1350{
1308 want_refresh = 1; 1351 want_refresh = 1;
1309 ZERO_SCROLLBACK (); 1352 ZERO_SCROLLBACK ();
1310 1353
1311 nsaved = 0; 1354 top_row = 0;
1312} 1355}
1313#endif 1356#endif
1314 1357
1315/* ------------------------------------------------------------------------- */ 1358/* ------------------------------------------------------------------------- */
1316/* 1359/*
1317 * Fill the screen with `E's 1360 * Fill the screen with `E's
1318 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1361 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1319 */ 1362 */
1320void 1363void
1321rxvt_term::scr_E () 1364rxvt_term::scr_E () NOTHROW
1322{ 1365{
1323 rend_t fs; 1366 rend_t fs;
1324 1367
1325 want_refresh = 1; 1368 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1369 ZERO_SCROLLBACK ();
… …
1337 rend_t *r1 = line.r; 1380 rend_t *r1 = line.r;
1338 1381
1339 for (int j = ncol; j--; ) 1382 for (int j = ncol; j--; )
1340 *r1++ = fs; 1383 *r1++ = fs;
1341 1384
1342 line.l = ncol; /* make the `E's selectable */ 1385 line.is_longer (0);
1386 line.touch (ncol);
1343 } 1387 }
1344} 1388}
1345 1389
1346/* ------------------------------------------------------------------------- */ 1390/* ------------------------------------------------------------------------- */
1347/* 1391/*
1348 * Insert/Delete <count> lines 1392 * Insert/Delete <count> lines
1349 */ 1393 */
1350void 1394void
1351rxvt_term::scr_insdel_lines (int count, int insdel) 1395rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1352{ 1396{
1353 int end; 1397 int end;
1354 1398
1355 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1356 1400
… …
1376/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1377/* 1421/*
1378 * Insert/Delete <count> characters from the current position 1422 * Insert/Delete <count> characters from the current position
1379 */ 1423 */
1380void 1424void
1381rxvt_term::scr_insdel_chars (int count, int insdel) 1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1382{ 1426{
1383 int col, row; 1427 int col, row;
1384 rend_t tr; 1428 rend_t tr;
1385 1429
1386 want_refresh = 1; 1430 want_refresh = 1;
… …
1395 min_it (count, ncol - screen.cur.col); 1439 min_it (count, ncol - screen.cur.col);
1396 1440
1397 row = screen.cur.row; 1441 row = screen.cur.row;
1398 1442
1399 line_t *line = &ROW(row); 1443 line_t *line = &ROW(row);
1444
1445 line->touch ();
1446 line->is_longer (0);
1400 1447
1401 switch (insdel) 1448 switch (insdel)
1402 { 1449 {
1403 case INSERT: 1450 case INSERT:
1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1451 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1405 { 1452 {
1406 line->t[col] = line->t[col - count]; 1453 line->t[col] = line->t[col - count];
1407 line->r[col] = line->r[col - count]; 1454 line->r[col] = line->r[col - count];
1408 } 1455 }
1409 1456
1410 if (!line->is_longer ()) 1457 line->l = min (line->l + count, ncol);
1411 {
1412 line->l += count;
1413 min_it (line->l, ncol);
1414 }
1415 1458
1416 if (selection.op && current_screen == selection.screen 1459 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1461 {
1419 if (selection.end.row != screen.cur.row 1462 if (selection.end.row != screen.cur.row
… …
1432 1475
1433 case ERASE: 1476 case ERASE:
1434 screen.cur.col += count; /* don't worry if > ncol */ 1477 screen.cur.col += count; /* don't worry if > ncol */
1435 selection_check (1); 1478 selection_check (1);
1436 screen.cur.col -= count; 1479 screen.cur.col -= count;
1480
1481 line->l = max (line->l - count, 0);
1437 scr_blank_line (*line, screen.cur.col, count, rstyle); 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1438 break; 1483 break;
1439 1484
1440 case DELETE: 1485 case DELETE:
1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1444 { 1489 {
1445 line->t[col] = line->t[col + count]; 1490 line->t[col] = line->t[col + count];
1446 line->r[col] = line->r[col + count]; 1491 line->r[col] = line->r[col + count];
1447 } 1492 }
1448 1493
1494 line->l = max (line->l - count, 0);
1449 scr_blank_line (*line, ncol - count, count, tr); 1495 scr_blank_line (*line, ncol - count, count, tr);
1450
1451 if (line->is_longer ()) /* break line continuation */
1452 line->l = ncol;
1453
1454 line->l = max (line->l - count, 0);
1455 1496
1456 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1499 {
1459 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
… …
1477/* 1518/*
1478 * Set the scrolling region 1519 * Set the scrolling region
1479 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1520 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1480 */ 1521 */
1481void 1522void
1482rxvt_term::scr_scroll_region (int top, int bot) 1523rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1483{ 1524{
1484 max_it (top, 0); 1525 max_it (top, 0);
1485 min_it (bot, nrow - 1); 1526 min_it (bot, nrow - 1);
1486 1527
1487 if (top > bot) 1528 if (top > bot)
… …
1497 * Make the cursor visible/invisible 1538 * Make the cursor visible/invisible
1498 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1539 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1499 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1540 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1500 */ 1541 */
1501void 1542void
1502rxvt_term::scr_cursor_visible (int mode) 1543rxvt_term::scr_cursor_visible (int mode) NOTHROW
1503{ 1544{
1504 want_refresh = 1; 1545 want_refresh = 1;
1505 1546
1506 if (mode) 1547 if (mode)
1507 screen.flags |= Screen_VisibleCursor; 1548 screen.flags |= Screen_VisibleCursor;
… …
1514 * Set/unset automatic wrapping 1555 * Set/unset automatic wrapping
1515 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1556 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1516 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1557 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1517 */ 1558 */
1518void 1559void
1519rxvt_term::scr_autowrap (int mode) 1560rxvt_term::scr_autowrap (int mode) NOTHROW
1520{ 1561{
1521 if (mode) 1562 if (mode)
1522 screen.flags |= Screen_Autowrap; 1563 screen.flags |= Screen_Autowrap;
1523 else 1564 else
1524 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1565 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1533 * and the cursor cannot be moved outside. 1574 * and the cursor cannot be moved outside.
1534 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1575 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1535 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1576 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1536 */ 1577 */
1537void 1578void
1538rxvt_term::scr_relative_origin (int mode) 1579rxvt_term::scr_relative_origin (int mode) NOTHROW
1539{ 1580{
1540 if (mode) 1581 if (mode)
1541 screen.flags |= Screen_Relative; 1582 screen.flags |= Screen_Relative;
1542 else 1583 else
1543 screen.flags &= ~Screen_Relative; 1584 screen.flags &= ~Screen_Relative;
… …
1550 * Set insert/replace mode 1591 * Set insert/replace mode
1551 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1592 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1552 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1593 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1553 */ 1594 */
1554void 1595void
1555rxvt_term::scr_insert_mode (int mode) 1596rxvt_term::scr_insert_mode (int mode) NOTHROW
1556{ 1597{
1557 if (mode) 1598 if (mode)
1558 screen.flags |= Screen_Insert; 1599 screen.flags |= Screen_Insert;
1559 else 1600 else
1560 screen.flags &= ~Screen_Insert; 1601 screen.flags &= ~Screen_Insert;
… …
1566 * XTERM_SEQ: Set tab at current column : ESC H 1607 * XTERM_SEQ: Set tab at current column : ESC H
1567 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1608 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1568 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1609 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1569 */ 1610 */
1570void 1611void
1571rxvt_term::scr_set_tab (int mode) 1612rxvt_term::scr_set_tab (int mode) NOTHROW
1572{ 1613{
1573 if (mode < 0) 1614 if (mode < 0)
1574 memset (tabs, 0, ncol * sizeof (char)); 1615 memset (tabs, 0, ncol * sizeof (char));
1575 else if (screen.cur.col < ncol) 1616 else if (screen.cur.col < ncol)
1576 tabs[screen.cur.col] = (mode ? 1 : 0); 1617 tabs [screen.cur.col] = !!mode;
1577} 1618}
1578 1619
1579/* ------------------------------------------------------------------------- */ 1620/* ------------------------------------------------------------------------- */
1580/* 1621/*
1581 * Set reverse/normal video 1622 * Set reverse/normal video
1582 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1623 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1583 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1624 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1584 */ 1625 */
1585void 1626void
1586rxvt_term::scr_rvideo_mode (int mode) 1627rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1587{ 1628{
1588 XGCValues gcvalue; 1629 rvideo_mode = on;
1589 1630
1631#ifndef NO_BELL
1632 on ^= rvideo_bell;
1633#endif
1634
1590 if (rvideo != mode) 1635 if (rvideo_state != on)
1591 { 1636 {
1592 rvideo = mode; 1637 rvideo_state = on;
1638
1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1594#if XPM_BACKGROUND 1640#if XPM_BACKGROUND
1595 if (bgPixmap.pixmap == None) 1641 if (bgPixmap.pixmap == None)
1596#endif 1642#endif
1597#if TRANSPARENT 1643#if TRANSPARENT
1598 if (! OPTION (Opt_transparent) || am_transparent == 0) 1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1599#endif 1645#endif
1600 XSetWindowBackground (display->display, vt, 1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1601 pix_colors[Color_bg]);
1602 1647
1648 XGCValues gcvalue;
1603 gcvalue.foreground = pix_colors[Color_fg]; 1649 gcvalue.foreground = pix_colors[Color_fg];
1604 gcvalue.background = pix_colors[Color_bg]; 1650 gcvalue.background = pix_colors[Color_bg];
1605 XChangeGC (display->display, gc, GCBackground | GCForeground, 1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1606 &gcvalue); 1652
1607 scr_clear (); 1653 scr_clear ();
1608 scr_touch (true); 1654 scr_touch (true);
1609 } 1655 }
1610} 1656}
1611 1657
… …
1613/* 1659/*
1614 * Report current cursor position 1660 * Report current cursor position
1615 * XTERM_SEQ: Report position: ESC [ 6 n 1661 * XTERM_SEQ: Report position: ESC [ 6 n
1616 */ 1662 */
1617void 1663void
1618rxvt_term::scr_report_position () 1664rxvt_term::scr_report_position () NOTHROW
1619{ 1665{
1620 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1666 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1621} 1667}
1622 1668
1623/* ------------------------------------------------------------------------- * 1669/* ------------------------------------------------------------------------- *
… …
1626 1672
1627/* 1673/*
1628 * Set font style 1674 * Set font style
1629 */ 1675 */
1630void 1676void
1631rxvt_term::set_font_style () 1677rxvt_term::set_font_style () NOTHROW
1632{ 1678{
1679#if 0
1633 switch (charsets[screen.charset]) 1680 switch (charsets [screen.charset])
1634 { 1681 {
1635 case '0': /* DEC Special Character & Line Drawing Set */ 1682 case '0': /* DEC Special Character & Line Drawing Set */
1636 break; 1683 break;
1637 case 'A': /* United Kingdom (UK) */ 1684 case 'A': /* United Kingdom (UK) */
1638 break; 1685 break;
… …
1645 case 'C': /* Finnish character set */ 1692 case 'C': /* Finnish character set */
1646 break; 1693 break;
1647 case 'K': /* German character set */ 1694 case 'K': /* German character set */
1648 break; 1695 break;
1649 } 1696 }
1697#endif
1650} 1698}
1651 1699
1652/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
1653/* 1701/*
1654 * Choose a font 1702 * Choose a font
… …
1656 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1704 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1657 * XTERM_SEQ: Invoke G2 character set: ESC N 1705 * XTERM_SEQ: Invoke G2 character set: ESC N
1658 * XTERM_SEQ: Invoke G3 character set: ESC O 1706 * XTERM_SEQ: Invoke G3 character set: ESC O
1659 */ 1707 */
1660void 1708void
1661rxvt_term::scr_charset_choose (int set) 1709rxvt_term::scr_charset_choose (int set) NOTHROW
1662{ 1710{
1663 screen.charset = set; 1711 screen.charset = set;
1664 set_font_style (); 1712 set_font_style ();
1665} 1713}
1666 1714
… …
1672 * XTERM_SEQ: Set G2 character set: ESC * <C> 1720 * XTERM_SEQ: Set G2 character set: ESC * <C>
1673 * XTERM_SEQ: Set G3 character set: ESC + <C> 1721 * XTERM_SEQ: Set G3 character set: ESC + <C>
1674 * See set_font_style for possible values for <C> 1722 * See set_font_style for possible values for <C>
1675 */ 1723 */
1676void 1724void
1677rxvt_term::scr_charset_set (int set, unsigned int ch) 1725rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1678{ 1726{
1679 charsets[set] = (unsigned char)ch; 1727 charsets[set] = (unsigned char)ch;
1680 set_font_style (); 1728 set_font_style ();
1681} 1729}
1682 1730
… …
1687 1735
1688/* 1736/*
1689 * refresh matching text. 1737 * refresh matching text.
1690 */ 1738 */
1691bool 1739bool
1692rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1740rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1693{ 1741{
1694 bool found = false; 1742 bool found = false;
1695 1743
1696 for (int i = 0; i < nrow; i++) 1744 for (int i = 0; i < nrow; i++)
1697 { 1745 {
… …
1717 PART_END, 1765 PART_END,
1718 RC_COUNT 1766 RC_COUNT
1719}; 1767};
1720 1768
1721void 1769void
1722rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1770rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1723{ 1771{
1724 int i; 1772 int i;
1725 row_col_t rc[RC_COUNT]; 1773 row_col_t rc[RC_COUNT];
1726 1774
1727 if (!drawn_buf) /* sanity check */ 1775 if (!drawn_buf) /* sanity check */
… …
1750 } 1798 }
1751 1799
1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1800 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1801 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1754 1802
1803 num_scr_allow = 0;
1804
1755 if (refresh) 1805 if (refresh)
1756 scr_refresh (SLOW_REFRESH); 1806 scr_refresh ();
1757} 1807}
1758 1808
1759/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1760/* 1810/*
1761 * Refresh the entire screen 1811 * Refresh the entire screen
1762 */ 1812 */
1763void 1813void
1764rxvt_term::scr_touch (bool refresh) 1814rxvt_term::scr_touch (bool refresh) NOTHROW
1765{ 1815{
1766 scr_expose (0, 0, width, height, refresh); 1816 scr_expose (0, 0, width, height, refresh);
1767} 1817}
1768 1818
1769/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1770/* 1820/*
1771 * Move the display so that the line represented by scrollbar value Y is at 1821 * Move the display so that the line represented by scrollbar value Y is at
1772 * the top of the screen 1822 * the top of the screen
1773 */ 1823 */
1774int 1824void
1775rxvt_term::scr_move_to (int y, int len) 1825rxvt_term::scr_move_to (int y, int len) NOTHROW
1776{ 1826{
1777 long p = 0; 1827 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1778 unsigned int oldviewstart;
1779
1780 oldviewstart = view_start;
1781
1782 if (y < len)
1783 {
1784 p = (nrow + nsaved) * (len - y) / len;
1785 p -= (long) (nrow - 1);
1786 p = max (p, 0);
1787 }
1788
1789 view_start = (unsigned int)min (p, nsaved);
1790
1791 return scr_changeview (oldviewstart);
1792} 1828}
1793 1829
1794/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
1795/* 1831/*
1796 * Page the screen up/down nlines 1832 * Page the screen up/down nlines
1797 * direction should be UP or DN 1833 * direction should be UP or DN
1798 */ 1834 */
1799int 1835bool
1800rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1801{ 1837{
1802 int n; 1838 int new_view_start =
1803 unsigned int oldviewstart;
1804
1805 oldviewstart = view_start;
1806
1807 if (direction == UP)
1808 {
1809 n = view_start + nlines;
1810 view_start = min (n, nsaved);
1811 }
1812 else
1813 {
1814 n = view_start - nlines; 1839 direction == UP ? view_start - nlines
1815 view_start = max (n, 0); 1840 : view_start + nlines;
1816 }
1817 1841
1818 return scr_changeview (oldviewstart); 1842 return scr_changeview (new_view_start);
1819} 1843}
1820 1844
1821int 1845bool
1822rxvt_term::scr_changeview (unsigned int oldviewstart) 1846rxvt_term::scr_changeview (int new_view_start) NOTHROW
1823{ 1847{
1848 clamp_it (new_view_start, top_row, 0);
1849
1824 if (view_start != oldviewstart) 1850 if (new_view_start == view_start)
1825 { 1851 return false;
1852
1853 num_scr += new_view_start - view_start;
1854 view_start = new_view_start;
1826 want_refresh = 1; 1855 want_refresh = 1;
1827 num_scr -= (view_start - oldviewstart);
1828 }
1829 1856
1830 return (int) (view_start - oldviewstart); 1857 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831}
1832 1858
1833/* ------------------------------------------------------------------------- */ 1859 return true;
1860}
1861
1862#ifndef NO_BELL
1834void 1863void
1864rxvt_term::bell_cb (time_watcher &w)
1865{
1866 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode);
1868}
1869#endif
1870
1871/* ------------------------------------------------------------------------- */
1872void
1835rxvt_term::scr_bell () 1873rxvt_term::scr_bell () NOTHROW
1836{ 1874{
1837#ifndef NO_BELL 1875#ifndef NO_BELL
1838 1876
1839# ifndef NO_MAPALERT 1877# ifndef NO_MAPALERT
1840# ifdef MAPALERT_OPTION 1878# ifdef MAPALERT_OPTION
1841 if (OPTION (Opt_mapAlert)) 1879 if (OPTION (Opt_mapAlert))
1842# endif 1880# endif
1843 XMapWindow (display->display, parent[0]); 1881 XMapWindow (xdisp, parent[0]);
1844# endif 1882# endif
1845 1883
1846 if (OPTION (Opt_visualBell)) 1884 if (OPTION (Opt_visualBell))
1847 { 1885 {
1848 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 rvideo_bell = true;
1849 rxvt_usleep (VISUAL_BELL_DURATION); 1887 scr_rvideo_mode (rvideo_mode);
1850 scr_rvideo_mode (!rvideo); /* refresh also done */ 1888 display->flush ();
1889
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1851 } 1891 }
1852 else 1892 else
1853 XBell (display->display, 0); 1893 XBell (xdisp, 0);
1854 1894
1855#endif 1895#endif
1856} 1896}
1857 1897
1858/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1859/* ARGSUSED */ 1899/* ARGSUSED */
1860void 1900void
1861rxvt_term::scr_printscreen (int fullhist) 1901rxvt_term::scr_printscreen (int fullhist) NOTHROW
1862{ 1902{
1863#ifdef PRINTPIPE 1903#ifdef PRINTPIPE
1864 int nrows, row_start; 1904 int nrows, row_start;
1865 FILE *fd; 1905 FILE *fd;
1866 1906
1867 if ((fd = popen_printer ()) == NULL) 1907 if ((fd = popen_printer ()) == NULL)
1868 return; 1908 return;
1869 1909
1870 if (fullhist) 1910 if (fullhist)
1871 { 1911 {
1872 nrows = nrow + nsaved; 1912 nrows = nrow - top_row;
1873 row_start = -nsaved; 1913 row_start = top_row;
1874 } 1914 }
1875 else 1915 else
1876 { 1916 {
1877 nrows = nrow; 1917 nrows = nrow;
1878 row_start = -view_start; 1918 row_start = view_start;
1879 } 1919 }
1880 1920
1881 wctomb (0, 0); 1921 wctomb (0, 0);
1882 1922
1883 for (int r1 = 0; r1 < nrows; r1++) 1923 for (int r1 = 0; r1 < nrows; r1++)
… …
1915 * Refresh the screen 1955 * Refresh the screen
1916 * drawn_text/drawn_rend contain the screen information before the update. 1956 * drawn_text/drawn_rend contain the screen information before the update.
1917 * screen.text/screen.rend contain what the screen will change to. 1957 * screen.text/screen.rend contain what the screen will change to.
1918 */ 1958 */
1919void 1959void
1920rxvt_term::scr_refresh (unsigned char refresh_type) 1960rxvt_term::scr_refresh () NOTHROW
1921{ 1961{
1922 unsigned char must_clear, /* use draw_string not draw_image_string */ 1962 unsigned char must_clear, /* use draw_string not draw_image_string */
1923 showcursor; /* show the cursor */ 1963 showcursor; /* show the cursor */
1924 int16_t col, row, /* column/row we're processing */ 1964 int16_t col, row, /* column/row we're processing */
1925 ocrow; /* old cursor row */ 1965 ocrow; /* old cursor row */
… …
2011 2051
2012 /* make sure no outline cursor is left around */ 2052 /* make sure no outline cursor is left around */
2013 setoldcursor = 0; 2053 setoldcursor = 0;
2014 if (ocrow != -1) 2054 if (ocrow != -1)
2015 { 2055 {
2016 if (screen.cur.row + view_start != ocrow 2056 if (screen.cur.row - view_start != ocrow
2017 || screen.cur.col != oldcursor.col) 2057 || screen.cur.col != oldcursor.col)
2018 { 2058 {
2019 if (ocrow < nrow 2059 if (ocrow < nrow
2020 && oldcursor.col < ncol) 2060 && oldcursor.col < ncol)
2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2061 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2029 else if (!focus) 2069 else if (!focus)
2030 setoldcursor = 1; 2070 setoldcursor = 1;
2031 2071
2032 if (setoldcursor) 2072 if (setoldcursor)
2033 { 2073 {
2034 if (screen.cur.row + view_start >= nrow) 2074 if (screen.cur.row - view_start >= nrow)
2035 oldcursor.row = -1; 2075 oldcursor.row = -1;
2036 else 2076 else
2037 { 2077 {
2038 oldcursor.row = screen.cur.row + view_start; 2078 oldcursor.row = screen.cur.row - view_start;
2039 oldcursor.col = screen.cur.col; 2079 oldcursor.col = screen.cur.col;
2040 } 2080 }
2041 } 2081 }
2042 } 2082 }
2043 2083
2084 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2085#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2086 scr_swap_overlay ();
2046#endif 2087#endif
2047 2088
2048#ifndef NO_SLOW_LINK_SUPPORT 2089#ifndef NO_SLOW_LINK_SUPPORT
2049 /* 2090 /*
2050 * D: CopyArea pass - very useful for slower links 2091 * D: CopyArea pass - very useful for slower links
2051 * This has been deliberately kept simple. 2092 * This has been deliberately kept simple.
2052 */ 2093 */
2053 i = num_scr;
2054 if (!display->is_local 2094 if (!display->is_local
2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2056 && abs (num_scr) < nrow && !must_clear) 2096 && abs (num_scr) < nrow && !must_clear)
2057 { 2097 {
2058 int16_t nits; 2098 int16_t nits;
2059 int j; 2099 int j;
2060 int len, wlen; 2100 int len, wlen;
2101 dLocal (int, num_scr);
2061 2102
2062 j = nrow; 2103 j = nrow;
2063 wlen = len = -1; 2104 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2105 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2107 {
2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2068 { 2109 {
2069 line_t s = ROW(row - view_start); 2110 line_t s = ROW(view_start + row);
2070 line_t d = drawn_buf[row]; 2111 line_t d = drawn_buf[row];
2071 line_t d2 = drawn_buf[row + i]; 2112 line_t d2 = drawn_buf[row + i];
2072 2113
2073 for (nits = 0, col = ncol; col--; ) 2114 for (nits = 0, col = ncol; col--; )
2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2096 { 2137 {
2097 /* also comes here at end if needed because of >= above */ 2138 /* also comes here at end if needed because of >= above */
2098 if (wlen < len) 2139 if (wlen < len)
2099 ::swap (wlen, len); 2140 ::swap (wlen, len);
2100 2141
2101 XCopyArea (display->display, vt, vt, 2142 XCopyArea (xdisp, vt, vt,
2102 gc, 0, Row2Pixel (len + i), 2143 gc, 0, Row2Pixel (len + i),
2103 (unsigned int)TermWin_TotalWidth (), 2144 (unsigned int)this->width,
2104 (unsigned int)Height2Pixel (wlen - len + 1), 2145 (unsigned int)Height2Pixel (wlen - len + 1),
2105 0, Row2Pixel (len)); 2146 0, Row2Pixel (len));
2106 len = -1; 2147 len = -1;
2107 } 2148 }
2108 } 2149 }
… …
2112 /* 2153 /*
2113 * E: main pass across every character 2154 * E: main pass across every character
2114 */ 2155 */
2115 for (row = 0; row < nrow; row++) 2156 for (row = 0; row < nrow; row++)
2116 { 2157 {
2117 text_t *stp = ROW(row - view_start).t; 2158 text_t *stp = ROW(view_start + row).t;
2118 rend_t *srp = ROW(row - view_start).r; 2159 rend_t *srp = ROW(view_start + row).r;
2119 text_t *dtp = drawn_buf[row].t; 2160 text_t *dtp = drawn_buf[row].t;
2120 rend_t *drp = drawn_buf[row].r; 2161 rend_t *drp = drawn_buf[row].r;
2121 2162
2122 /* 2163 /*
2123 * E2: OK, now the real pass 2164 * E2: OK, now the real pass
… …
2194 2235
2195 // only do special processing if any attributes are set, which is unlikely 2236 // only do special processing if any attributes are set, which is unlikely
2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2197 { 2238 {
2198#if ENABLE_STYLES 2239#if ENABLE_STYLES
2199 // force redraw after "careful" characters to avoid pixel droppings 2240 // "careful" (too wide) character handling
2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2201 drp[col + 1] = ~srp[col + 1];
2202 2241
2203 // include previous careful character(s) if possible, looks nicer (best effort...) 2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2204 while (text > stp 2243 while (text > stp
2205 && srp[text - stp - 1] & RS_Careful 2244 && srp[text - stp - 1] & RS_Careful
2206 && RS_SAME (rend, srp[text - stp - 1])) 2245 && RS_SAME (rend, srp[text - stp - 1]))
2207 text--, count++, xpixel -= fwidth; 2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2208#endif 2255#endif
2209 2256
2210 bool invert = rend & RS_RVid; 2257 bool invert = rend & RS_RVid;
2211 2258
2212#ifndef NO_BOLD_UNDERLINE_REVERSE 2259#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2296 2343
2297 if (rend & RS_Uline && font->descent > 1 && fore != back) 2344 if (rend & RS_Uline && font->descent > 1 && fore != back)
2298 { 2345 {
2299#if ENABLE_FRILLS 2346#if ENABLE_FRILLS
2300 if (ISSET_PIXCOLOR (Color_underline)) 2347 if (ISSET_PIXCOLOR (Color_underline))
2301 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2302 else 2349 else
2303#endif 2350#endif
2304 XSetForeground (display->display, gc, pix_colors[fore]); 2351 XSetForeground (xdisp, gc, pix_colors[fore]);
2305 2352
2306 XDrawLine (display->display, drawBuffer, gc, 2353 XDrawLine (xdisp, drawBuffer, gc,
2307 xpixel, ypixel + font->ascent + 1, 2354 xpixel, ypixel + font->ascent + 1,
2308 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2309 } 2356 }
2310 } /* for (col....) */ 2357 } /* for (col....) */
2311 } /* for (row....) */ 2358 } /* for (row....) */
2312 2359
2313#if ENABLE_OVERLAY 2360#if ENABLE_OVERLAY
2314 scr_swap_overlay (); 2361 scr_swap_overlay ();
2315#endif 2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2316 2364
2317 /* 2365 /*
2318 * G: cleanup cursor and display outline cursor if necessary 2366 * G: cleanup cursor and display outline cursor if necessary
2319 */ 2367 */
2320 if (showcursor) 2368 if (showcursor)
… …
2343 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2344 cursorwidth++; 2392 cursorwidth++;
2345 2393
2346#ifndef NO_CURSORCOLOR 2394#ifndef NO_CURSORCOLOR
2347 if (ISSET_PIXCOLOR (Color_cursor)) 2395 if (ISSET_PIXCOLOR (Color_cursor))
2348 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2349#endif 2397#endif
2350 2398
2351 XDrawRectangle (display->display, drawBuffer, gc, 2399 XDrawRectangle (xdisp, drawBuffer, gc,
2352 Col2Pixel (col), 2400 Col2Pixel (col),
2353 Row2Pixel (oldcursor.row), 2401 Row2Pixel (oldcursor.row),
2354 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2402 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2355 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2356 } 2404 }
… …
2359 /* 2407 /*
2360 * H: cleanup selection 2408 * H: cleanup selection
2361 */ 2409 */
2362 scr_reverse_selection (); 2410 scr_reverse_selection ();
2363 2411
2364 if (refresh_type & SMOOTH_REFRESH)
2365 XFlush (display->display);
2366
2367 num_scr = 0; 2412 num_scr = 0;
2368 num_scr_allow = 1; 2413 num_scr_allow = 1;
2369} 2414}
2370 2415
2371void 2416void
2372rxvt_term::scr_remap_chars (const line_t &l) 2417rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2373{ 2418{
2374 if (!l.t) 2419 if (!l.t)
2375 return; 2420 return;
2376 2421
2422 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2423
2377 for (int i = ncol; i--; ) 2424 for (int i = ncol; i--; )
2378 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2425 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2379} 2426}
2380 2427
2381void 2428void
2382rxvt_term::scr_remap_chars () 2429rxvt_term::scr_remap_chars () NOTHROW
2383{ 2430{
2384 for (int i = total_rows; i--; ) 2431 for (int i = total_rows; i--; )
2385 scr_remap_chars (row_buf [i]); 2432 scr_remap_chars (row_buf [i]);
2386 2433
2387 for (int i = nrow; i--; ) 2434 for (int i = nrow; i--; )
… …
2390 scr_remap_chars (swap_buf [i]); 2437 scr_remap_chars (swap_buf [i]);
2391 } 2438 }
2392} 2439}
2393 2440
2394void 2441void
2395rxvt_term::scr_recolour () 2442rxvt_term::scr_recolour () NOTHROW
2396{ 2443{
2397 if (1 2444 if (1
2398#if TRANSPARENT 2445#if TRANSPARENT
2399 && !am_transparent 2446 && !am_transparent
2400#endif 2447#endif
2401#if XPM_BACKGROUND 2448#if XPM_BACKGROUND
2402 && !bgPixmap.pixmap 2449 && !bgPixmap.pixmap
2403#endif 2450#endif
2404 ) 2451 )
2405 { 2452 {
2406 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2407 XClearWindow (display->display, parent[0]); 2454 XClearWindow (xdisp, parent[0]);
2408 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2409#if HAVE_SCROLLBARS 2456#if HAVE_SCROLLBARS
2410 if (scrollBar.win) 2457 if (scrollBar.win)
2411 { 2458 {
2412 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2413 scrollBar.setIdle (); 2460 scrollBar.setIdle ();
2414 scrollbar_show (0); 2461 scrollbar_show (0);
2415 } 2462 }
2416#endif 2463#endif
2417 } 2464 }
… …
2421 want_refresh = 1; 2468 want_refresh = 1;
2422} 2469}
2423 2470
2424/* ------------------------------------------------------------------------- */ 2471/* ------------------------------------------------------------------------- */
2425void 2472void
2426rxvt_term::scr_clear (bool really) 2473rxvt_term::scr_clear (bool really) NOTHROW
2427{ 2474{
2428 if (!mapped) 2475 if (!mapped)
2429 return; 2476 return;
2430 2477
2431 num_scr_allow = 0; 2478 num_scr_allow = 0;
2432 want_refresh = 1; 2479 want_refresh = 1;
2433 2480
2434 if (really) 2481 if (really)
2435 XClearWindow (display->display, vt); 2482 XClearWindow (xdisp, vt);
2436} 2483}
2437 2484
2438/* ------------------------------------------------------------------------- */
2439void 2485void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2492 {
2493 text_t *stp = ROW(row).t;
2494 rend_t *srp = ROW(row).r;
2495
2496 for (col = beg_col; col < end_col; col++)
2497 srp[col] ^= rstyle1;
2498
2499 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2500 srp[col] ^= rstyle2;
2501
2502 if (++col < end_col)
2503 srp[col] ^= rstyle2;
2504 }
2505}
2506
2507void
2508rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2509{
2510 int view_end = view_start + nrow;
2511 int row, col;
2512
2513 if (beg_row >= view_start)
2514 {
2515 col = beg_col;
2516 row = beg_row;
2517 }
2518 else
2519 {
2520 col = 0;
2521 row = view_start;
2522 }
2523
2524 for (; row < min (end_row, view_end); row++, col = 0)
2525 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2526 srp[col] ^= rstyle;
2527
2528 if (row == end_row)
2529 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2530 srp[col] ^= rstyle;
2531}
2532
2533/* ------------------------------------------------------------------------- */
2534void
2440rxvt_term::scr_reverse_selection () 2535rxvt_term::scr_reverse_selection () NOTHROW
2441{ 2536{
2442 if (selection.op 2537 if (selection.op
2443 && current_screen == selection.screen 2538 && current_screen == selection.screen
2444 && selection.end.row >= -view_start) 2539 && selection.end.row >= view_start)
2445 { 2540 {
2446 int view_end = -view_start + nrow;
2447 int row, col;
2448
2449#if ENABLE_FRILLS 2541#if ENABLE_FRILLS
2450 if (selection.rect) 2542 if (selection.rect)
2451 { 2543 scr_xor_rect (selection.beg.row, selection.beg.col,
2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2544 selection.end.row, selection.end.col,
2453 { 2545 RS_RVid, RS_RVid | RS_Uline);
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2456
2457 for (col = selection.beg.col; col < selection.end.col; col++)
2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462 }
2463 }
2464 else 2546 else
2465#endif 2547#endif
2466 { 2548 scr_xor_span (selection.beg.row, selection.beg.col,
2467 if (selection.beg.row >= -view_start) 2549 selection.end.row, selection.end.col,
2468 { 2550 RS_RVid);
2469 col = selection.beg.col;
2470 row = selection.beg.row;
2471 }
2472 else
2473 {
2474 col = 0;
2475 row = -view_start;
2476 }
2477
2478 for (; row < min (selection.end.row, view_end); row++, col = 0)
2479 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2480 srp[col] ^= RS_RVid;
2481
2482 if (row == selection.end.row)
2483 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2484 srp[col] ^= RS_RVid;
2485 }
2486 } 2551 }
2487} 2552}
2488 2553
2489/* ------------------------------------------------------------------------- */ 2554/* ------------------------------------------------------------------------- */
2490/* 2555/*
2491 * Dump the whole scrollback and screen to the passed filedescriptor. The 2556 * Dump the whole scrollback and screen to the passed filedescriptor. The
2492 * invoking routine must close the fd. 2557 * invoking routine must close the fd.
2493 */ 2558 */
2494#if 0 2559#if 0
2495void 2560void
2496rxvt_term::scr_dump (int fd) 2561rxvt_term::scr_dump (int fd) NOTHROW
2497{ 2562{
2498 int row, wrote; 2563 int row, wrote;
2499 unsigned int width, towrite; 2564 unsigned int width, towrite;
2500 char r1[] = "\n"; 2565 char r1[] = "\n";
2501 2566
… …
2520 2585
2521/* ------------------------------------------------------------------------- * 2586/* ------------------------------------------------------------------------- *
2522 * CHARACTER SELECTION * 2587 * CHARACTER SELECTION *
2523 * ------------------------------------------------------------------------- */ 2588 * ------------------------------------------------------------------------- */
2524void 2589void
2525rxvt_term::selection_check (int check_more) 2590rxvt_term::selection_check (int check_more) NOTHROW
2526{ 2591{
2527 row_col_t pos; 2592 row_col_t pos;
2528 2593
2529 if (!selection.op) 2594 if (!selection.op)
2530 return; 2595 return;
2531 2596
2532 pos.row = pos.col = 0; 2597 pos.row = pos.col = 0;
2533 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2598 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2534 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2599 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2535 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2600 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2536 || (check_more == 1 2601 || (check_more == 1
2537 && current_screen == selection.screen 2602 && current_screen == selection.screen
2538 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2603 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2539 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2604 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2540 || (check_more == 2 2605 || (check_more == 2
… …
2551/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2552/* 2617/*
2553 * Paste a selection direct to the command fd 2618 * Paste a selection direct to the command fd
2554 */ 2619 */
2555void 2620void
2556rxvt_term::paste (unsigned char *data, unsigned int len) 2621rxvt_term::paste (char *data, unsigned int len) NOTHROW
2557{ 2622{
2558 /* convert normal newline chars into common keyboard Return key sequence */ 2623 /* convert normal newline chars into common keyboard Return key sequence */
2559 for (unsigned int i = 0; i < len; i++) 2624 for (unsigned int i = 0; i < len; i++)
2560 if (data[i] == C0_LF) 2625 if (data[i] == C0_LF)
2561 data[i] = C0_CR; 2626 data[i] = C0_CR;
… …
2567/* 2632/*
2568 * Respond to a notification that a primary selection has been sent 2633 * Respond to a notification that a primary selection has been sent
2569 * EXT: SelectionNotify 2634 * EXT: SelectionNotify
2570 */ 2635 */
2571void 2636void
2572rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2637rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2573{ 2638{
2574 if (prop == None) /* check for failed XConvertSelection */ 2639 if (prop == None) /* check for failed XConvertSelection */
2575 { 2640 {
2576 if ((selection_type & Sel_CompoundText)) 2641 if ((selection_type & Sel_CompoundText))
2577 { 2642 {
… …
2597 } 2662 }
2598 2663
2599 unsigned long bytes_after; 2664 unsigned long bytes_after;
2600 XTextProperty ct; 2665 XTextProperty ct;
2601 2666
2602 if (XGetWindowProperty (display->display, win, prop, 2667 if (XGetWindowProperty (xdisp, win, prop,
2603 0, PROP_SIZE / 4, 2668 0, PROP_SIZE / 4,
2604 delete_prop, AnyPropertyType, 2669 delete_prop, AnyPropertyType,
2605 &ct.encoding, &ct.format, 2670 &ct.encoding, &ct.format,
2606 &ct.nitems, &bytes_after, 2671 &ct.nitems, &bytes_after,
2607 &ct.value) != Success) 2672 &ct.value) != Success)
… …
2616 if (bytes_after) 2681 if (bytes_after)
2617 { 2682 {
2618 // fetch and append remaining data 2683 // fetch and append remaining data
2619 XTextProperty ct2; 2684 XTextProperty ct2;
2620 2685
2621 if (XGetWindowProperty (display->display, win, prop, 2686 if (XGetWindowProperty (xdisp, win, prop,
2622 ct.nitems / 4, (bytes_after + 3) / 4, 2687 ct.nitems / 4, (bytes_after + 3) / 4,
2623 delete_prop, AnyPropertyType, 2688 delete_prop, AnyPropertyType,
2624 &ct2.encoding, &ct2.format, 2689 &ct2.encoding, &ct2.format,
2625 &ct2.nitems, &bytes_after, 2690 &ct2.nitems, &bytes_after,
2626 &ct2.value) != Success) 2691 &ct2.value) != Success)
… …
2639 2704
2640 if (ct.encoding == xa[XA_INCR]) 2705 if (ct.encoding == xa[XA_INCR])
2641 { 2706 {
2642 // INCR selection, start handshake 2707 // INCR selection, start handshake
2643 if (!delete_prop) 2708 if (!delete_prop)
2644 XDeleteProperty (display->display, win, prop); 2709 XDeleteProperty (xdisp, win, prop);
2645 2710
2646 selection_wait = Sel_incr; 2711 selection_wait = Sel_incr;
2647 incr_buf_fill = 0; 2712 incr_buf_fill = 0;
2648 incr_ev.start (NOW + 10); 2713 incr_ev.start (NOW + 10);
2649 2714
… …
2705 { 2770 {
2706 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2707 char *s = rxvt_wcstombs (w); 2772 char *s = rxvt_wcstombs (w);
2708 free (w); 2773 free (w);
2709 // TODO: strlen == only the first element will be converted. well... 2774 // TODO: strlen == only the first element will be converted. well...
2710 paste ((unsigned char *)s, strlen (s)); 2775 paste (s, strlen (s));
2711 free (s); 2776 free (s);
2712 } 2777 }
2713 else 2778 else
2714#endif 2779#endif
2715 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2716 && cl) 2781 && cl)
2717 { 2782 {
2718 for (int i = 0; i < cr; i++) 2783 for (int i = 0; i < cr; i++)
2719 paste ((unsigned char *)cl[i], strlen (cl[i])); 2784 paste (cl[i], strlen (cl[i]));
2720 2785
2721 XFreeStringList (cl); 2786 XFreeStringList (cl);
2722 } 2787 }
2723 else 2788 else
2724 paste (ct.value, ct.nitems); // paste raw 2789 paste ((char *)ct.value, ct.nitems); // paste raw
2725 2790
2726bailout: 2791bailout:
2727 XFree (ct.value); 2792 XFree (ct.value);
2728 2793
2729 if (selection_wait == Sel_normal) 2794 if (selection_wait == Sel_normal)
2730 selection_wait = Sel_none; 2795 selection_wait = Sel_none;
2731} 2796}
2732 2797
2733void 2798void
2734rxvt_term::incr_cb (time_watcher &w) 2799rxvt_term::incr_cb (time_watcher &w) NOTHROW
2735{ 2800{
2736 selection_wait = Sel_none; 2801 selection_wait = Sel_none;
2737 2802
2738 incr_buf_size = 0; 2803 incr_buf_size = 0;
2739 free (incr_buf); 2804 free (incr_buf);
2740 2805
2741 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2806 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2742} 2807}
2743 2808
2744void 2809void
2745rxvt_term::selection_property (Window win, Atom prop) 2810rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2746{ 2811{
2747 if (prop == None || selection_wait != Sel_incr) 2812 if (prop == None || selection_wait != Sel_incr)
2748 return; 2813 return;
2749 2814
2750 selection_paste (win, prop, true); 2815 selection_paste (win, prop, true);
… …
2759 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2760 * will auto fallback to CUT_BUFFER0 2825 * will auto fallback to CUT_BUFFER0
2761 * EXT: button 2 release 2826 * EXT: button 2 release
2762 */ 2827 */
2763void 2828void
2764rxvt_term::selection_request (Time tm, int x, int y) 2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2765{ 2830{
2766 if (x < 0 || x >= width || y < 0 || y >= height) 2831 if (selection.text && selnum == Sel_Primary)
2767 return; /* outside window */
2768
2769 if (selection.text)
2770 { /* internal selection */ 2832 { /* internal selection */
2771 char *str = rxvt_wcstombs (selection.text, selection.len); 2833 char *str = rxvt_wcstombs (selection.text, selection.len);
2772 paste ((unsigned char *)str, strlen (str)); 2834 paste (str, strlen (str));
2773 free (str); 2835 free (str);
2774 return; 2836 return;
2775 } 2837 }
2776 else 2838 else
2777 { 2839 {
2778 int i;
2779
2780 selection_request_time = tm; 2840 selection_request_time = tm;
2781 selection_wait = Sel_normal; 2841 selection_wait = Sel_normal;
2782 2842
2783 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2784 {
2785#if X_HAVE_UTF8_STRING 2843#if X_HAVE_UTF8_STRING
2786 selection_type = Sel_UTF8String; 2844 selection_type = Sel_UTF8String;
2787 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2788 return; 2846 return;
2789#else 2847#else
2790 selection_type = Sel_CompoundText; 2848 selection_type = Sel_CompoundText;
2791 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2792 return; 2850 return;
2793#endif 2851#endif
2794 }
2795 } 2852 }
2796 2853
2797 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2854 selection_wait = Sel_none; /* don't loop in selection_paste () */
2798 selection_paste (display->root, XA_CUT_BUFFER0, false); 2855 selection_paste (display->root, XA_CUT_BUFFER0, false);
2799} 2856}
2800 2857
2801int 2858int
2802rxvt_term::selection_request_other (Atom target, int selnum) 2859rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2803{ 2860{
2804 Atom sel; 2861 Atom sel;
2805 2862
2806 selection_type |= selnum; 2863 selection_type |= selnum;
2807 2864
… …
2810 else if (selnum == Sel_Secondary) 2867 else if (selnum == Sel_Secondary)
2811 sel = XA_SECONDARY; 2868 sel = XA_SECONDARY;
2812 else 2869 else
2813 sel = xa[XA_CLIPBOARD]; 2870 sel = xa[XA_CLIPBOARD];
2814 2871
2815 if (XGetSelectionOwner (display->display, sel) != None) 2872 if (XGetSelectionOwner (xdisp, sel) != None)
2816 { 2873 {
2817 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2818 vt, selection_request_time); 2875 vt, selection_request_time);
2819 return 1; 2876 return 1;
2820 } 2877 }
2821 2878
2822 return 0; 2879 return 0;
… …
2826/* 2883/*
2827 * Clear all selected text 2884 * Clear all selected text
2828 * EXT: SelectionClear 2885 * EXT: SelectionClear
2829 */ 2886 */
2830void 2887void
2831rxvt_term::selection_clear () 2888rxvt_term::selection_clear () NOTHROW
2832{ 2889{
2833 want_refresh = 1; 2890 want_refresh = 1;
2834 free (selection.text); 2891 free (selection.text);
2835 selection.text = NULL; 2892 selection.text = NULL;
2836 selection.len = 0; 2893 selection.len = 0;
… …
2869 selection.op = SELECTION_DONE; 2926 selection.op = SELECTION_DONE;
2870 2927
2871 if (selection.clicks == 4) 2928 if (selection.clicks == 4)
2872 return; /* nothing selected, go away */ 2929 return; /* nothing selected, go away */
2873 2930
2931 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2932 return;
2933
2874 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2934 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2875 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2935 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2876 2936
2877 int ofs = 0; 2937 int ofs = 0;
2878 int extra = 0; 2938 int extra = 0;
… …
2890 col = selection.beg.col; 2950 col = selection.beg.col;
2891 end_col = ncol + 1; 2951 end_col = ncol + 1;
2892 } 2952 }
2893 else 2953 else
2894#endif 2954#endif
2895 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2955 end_col = ROW(row).l;
2896 2956
2897 col = max (col, 0); 2957 col = max (col, 0);
2898 2958
2899 if (row == selection.end.row 2959 if (row == selection.end.row
2900#if ENABLE_FRILLS 2960#if ENABLE_FRILLS
… …
2902#endif 2962#endif
2903 ) 2963 )
2904 min_it (end_col, selection.end.col); 2964 min_it (end_col, selection.end.col);
2905 2965
2906 t = ROW(row).t + col; 2966 t = ROW(row).t + col;
2967
2907 for (; col < end_col; col++) 2968 for (; col < end_col; col++)
2908 { 2969 {
2909 if (*t == NOCHAR) 2970 if (*t == NOCHAR)
2910 t++; 2971 t++;
2911#if ENABLE_COMBINING 2972#if ENABLE_COMBINING
… …
2960 3021
2961 // we usually allocate much more than necessary, so realloc it smaller again 3022 // we usually allocate much more than necessary, so realloc it smaller again
2962 selection.len = ofs; 3023 selection.len = ofs;
2963 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2964 3025
3026 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3027 return;
3028
3029 selection_grab (tm);
3030}
3031
3032bool
3033rxvt_term::selection_grab (Time tm) NOTHROW
3034{
3035 selection_time = tm;
3036
2965 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
2966 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3039 {
2967 display->set_selection_owner (this); 3040 display->set_selection_owner (this);
3041 return true;
3042 }
2968 else 3043 else
2969 rxvt_warn ("can't get primary selection, ignoring.\n"); 3044 {
3045 selection_clear ();
3046 return false;
3047 }
2970 3048
2971#if 0 3049#if 0
2972 XTextProperty ct; 3050 XTextProperty ct;
2973 3051
2974 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
2975 { 3053 {
2976 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2977 XFree (ct.value); 3055 XFree (ct.value);
2978 } 3056 }
2979#endif 3057#endif
2980
2981 selection_time = tm;
2982} 3058}
2983 3059
2984/* ------------------------------------------------------------------------- */ 3060/* ------------------------------------------------------------------------- */
2985/* 3061/*
2986 * Mark or select text based upon number of clicks: 1, 2, or 3 3062 * Mark or select text based upon number of clicks: 1, 2, or 3
2987 * EXT: button 1 press 3063 * EXT: button 1 press
2988 */ 3064 */
2989void 3065void
2990rxvt_term::selection_click (int clicks, int x, int y) 3066rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2991{ 3067{
2992 clicks = ((clicks - 1) % 3) + 1; 3068 clicks = ((clicks - 1) % 3) + 1;
2993 selection.clicks = clicks; /* save clicks so extend will work */ 3069 selection.clicks = clicks; /* save clicks so extend will work */
2994 3070
3071 if (clicks == 2 && !selection.rect
3072 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3073 {
3074 MEvent.clicks = 1; // what a mess
3075 selection.screen = current_screen;
3076 selection.op = SELECTION_CONT;
3077 return;
3078 }
3079
2995 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3080 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2996 3081
2997 if (clicks == 2 || clicks == 3) 3082 if (clicks == 2 || clicks == 3)
2998 selection_extend_colrow (selection.mark.col, 3083 selection_extend_colrow (selection.mark.col,
2999 selection.mark.row + view_start, 3084 selection.mark.row - view_start,
3000 0, /* button 3 */ 3085 0, /* button 3 */
3001 1, /* button press */ 3086 1, /* button press */
3002 0); /* click change */ 3087 0); /* click change */
3003} 3088}
3004 3089
3005/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
3006/* 3091/*
3007 * Mark a selection at the specified col/row 3092 * Mark a selection at the specified col/row
3008 */ 3093 */
3009void 3094void
3010rxvt_term::selection_start_colrow (int col, int row) 3095rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3011{ 3096{
3012 want_refresh = 1; 3097 want_refresh = 1;
3013 3098
3014 selection.mark.row = row - view_start; 3099 selection.mark.row = row + view_start;
3015 selection.mark.col = col; 3100 selection.mark.col = col;
3016 3101
3017 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3102 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3018 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3019 3104
3020 while (selection.mark.col > 0 3105 while (selection.mark.col > 0
3021 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3022 --selection.mark.col; 3107 --selection.mark.col;
… …
3041#define DELIMIT_TEXT(x) \ 3126#define DELIMIT_TEXT(x) \
3042 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3127 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3043#define DELIMIT_REND(x) 1 3128#define DELIMIT_REND(x) 1
3044 3129
3045void 3130void
3046rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3131rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3047{ 3132{
3048 int col, row, dirnadd, tcol, trow, w1, w2; 3133 int col, row, dirnadd, tcol, trow, w1, w2;
3049 row_col_t bound; 3134 row_col_t bound;
3050 text_t *stp; 3135 text_t *stp;
3051 rend_t *srp; 3136 rend_t *srp;
3052 3137
3053 if (dirn == UP) 3138 if (dirn == UP)
3054 { 3139 {
3055 bound.row = - nsaved - 1; 3140 bound.row = top_row - 1;
3056 bound.col = 0; 3141 bound.col = 0;
3057 dirnadd = -1; 3142 dirnadd = -1;
3058 } 3143 }
3059 else 3144 else
3060 { 3145 {
… …
3108 } 3193 }
3109 } 3194 }
3110 break; 3195 break;
3111 } 3196 }
3112 3197
3113Old_Word_Selection_You_Die:
3114 if (dirn == DN) 3198 if (dirn == DN)
3115 col++; /* put us on one past the end */ 3199 col++; /* put us on one past the end */
3116 3200
3117 /* Poke the values back in */ 3201 /* Poke the values back in */
3118 ret->row = row; 3202 ret->row = row;
… …
3126 * flag == 0 ==> button 1 3210 * flag == 0 ==> button 1
3127 * flag == 1 ==> button 3 press 3211 * flag == 1 ==> button 3 press
3128 * flag == 2 ==> button 3 motion 3212 * flag == 2 ==> button 3 motion
3129 */ 3213 */
3130void 3214void
3131rxvt_term::selection_extend (int x, int y, int flag) 3215rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3132{ 3216{
3133 int col = clamp (Pixel2Col (x), 0, ncol); 3217 int col = clamp (Pixel2Col (x), 0, ncol);
3134 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3218 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3135 3219
3136 /* 3220 /*
… …
3139 * select nothing. Otherwise, if we're to the right of the mark, you have to 3223 * select nothing. Otherwise, if we're to the right of the mark, you have to
3140 * be _past_ a character for it to be selected. 3224 * be _past_ a character for it to be selected.
3141 */ 3225 */
3142 if (((selection.clicks % 3) == 1) && !flag 3226 if (((selection.clicks % 3) == 1) && !flag
3143 && (col == selection.mark.col 3227 && (col == selection.mark.col
3144 && (row == selection.mark.row + view_start))) 3228 && (row == selection.mark.row - view_start)))
3145 { 3229 {
3146 /* select nothing */ 3230 /* select nothing */
3147 selection.beg.row = selection.end.row = 0; 3231 selection.beg.row = selection.end.row = 0;
3148 selection.beg.col = selection.end.col = 0; 3232 selection.beg.col = selection.end.col = 0;
3149 selection.clicks = 4; 3233 selection.clicks = 4;
… …
3162/* ------------------------------------------------------------------------- */ 3246/* ------------------------------------------------------------------------- */
3163/* 3247/*
3164 * Extend the selection to the specified col/row 3248 * Extend the selection to the specified col/row
3165 */ 3249 */
3166void 3250void
3167rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3251rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3168{ 3252{
3169 row_col_t pos; 3253 row_col_t pos;
3170 enum { 3254 enum {
3171 LEFT, RIGHT 3255 LEFT, RIGHT
3172 } closeto = RIGHT; 3256 } closeto = RIGHT;
… …
3204 selection.beg.col = selection.end.col = selection.mark.col; 3288 selection.beg.col = selection.end.col = selection.mark.col;
3205 selection.beg.row = selection.end.row = selection.mark.row; 3289 selection.beg.row = selection.end.row = selection.mark.row;
3206 } 3290 }
3207 3291
3208 pos.col = col; 3292 pos.col = col;
3209 pos.row = row - view_start; 3293 pos.row = view_start + row;
3210 3294
3211 /* 3295 /*
3212 * This is mainly xterm style selection with a couple of differences, mainly 3296 * This is mainly xterm style selection with a couple of differences, mainly
3213 * in the way button3 drag extension works. 3297 * in the way button3 drag extension works.
3214 * We're either doing: button1 drag; button3 press; or button3 drag 3298 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3358#endif 3442#endif
3359} 3443}
3360 3444
3361#if ENABLE_FRILLS 3445#if ENABLE_FRILLS
3362void 3446void
3363rxvt_term::selection_remove_trailing_spaces () 3447rxvt_term::selection_remove_trailing_spaces () NOTHROW
3364{ 3448{
3365 int32_t end_col, end_row; 3449 int32_t end_col, end_row;
3366 text_t *stp; 3450 text_t *stp;
3367 3451
3368 end_col = selection.end.col; 3452 end_col = selection.end.col;
… …
3406/* 3490/*
3407 * Double click on button 3 when already selected 3491 * Double click on button 3 when already selected
3408 * EXT: button 3 double click 3492 * EXT: button 3 double click
3409 */ 3493 */
3410void 3494void
3411rxvt_term::selection_rotate (int x, int y) 3495rxvt_term::selection_rotate (int x, int y) NOTHROW
3412{ 3496{
3413 selection.clicks = selection.clicks % 3 + 1; 3497 selection.clicks = selection.clicks % 3 + 1;
3414 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3498 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3415} 3499}
3416 3500
… …
3418/* 3502/*
3419 * Respond to a request for our current selection 3503 * Respond to a request for our current selection
3420 * EXT: SelectionRequest 3504 * EXT: SelectionRequest
3421 */ 3505 */
3422void 3506void
3423rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3507rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3424{ 3508{
3425 XSelectionEvent ev; 3509 XSelectionEvent ev;
3426 dDisp;
3427 3510
3428 ev.type = SelectionNotify; 3511 ev.type = SelectionNotify;
3429 ev.property = None; 3512 ev.property = None;
3430 ev.display = rq.display; 3513 ev.display = rq.display;
3431 ev.requestor = rq.requestor; 3514 ev.requestor = rq.requestor;
… …
3445 *target++ = xa[XA_COMPOUND_TEXT]; 3528 *target++ = xa[XA_COMPOUND_TEXT];
3446#if X_HAVE_UTF8_STRING 3529#if X_HAVE_UTF8_STRING
3447 *target++ = xa[XA_UTF8_STRING]; 3530 *target++ = xa[XA_UTF8_STRING];
3448#endif 3531#endif
3449 3532
3450 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3451 32, PropModeReplace, 3534 32, PropModeReplace,
3452 (unsigned char *)target_list, target - target_list); 3535 (unsigned char *)target_list, target - target_list);
3453 ev.property = rq.property; 3536 ev.property = rq.property;
3454 } 3537 }
3455#if TODO // TODO 3538#if TODO // TODO
… …
3458 /* TODO: Handle MULTIPLE */ 3541 /* TODO: Handle MULTIPLE */
3459 } 3542 }
3460#endif 3543#endif
3461 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3462 { 3545 {
3463 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3464 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3547 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3465 ev.property = rq.property; 3548 ev.property = rq.property;
3466 } 3549 }
3467 else if (rq.target == XA_STRING 3550 else if (rq.target == XA_STRING
3468 || rq.target == xa[XA_TEXT] 3551 || rq.target == xa[XA_TEXT]
… …
3526 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3527 ct.nitems = strlen ((char *)ct.value); 3610 ct.nitems = strlen ((char *)ct.value);
3528 } 3611 }
3529 else 3612 else
3530#endif 3613#endif
3531 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3532 freect = 1; 3615 freect = 1;
3533 else 3616 else
3534 { 3617 {
3535 /* if we failed to convert then send it raw */ 3618 /* if we failed to convert then send it raw */
3536 ct.value = (unsigned char *)cl; 3619 ct.value = (unsigned char *)cl;
3537 ct.nitems = selectlen; 3620 ct.nitems = selectlen;
3538 ct.encoding = target; 3621 ct.encoding = target;
3539 } 3622 }
3540 3623
3541 XChangeProperty (disp, rq.requestor, rq.property, 3624 XChangeProperty (xdisp, rq.requestor, rq.property,
3542 ct.encoding, 8, PropModeReplace, 3625 ct.encoding, 8, PropModeReplace,
3543 ct.value, (int)ct.nitems); 3626 ct.value, (int)ct.nitems);
3544 ev.property = rq.property; 3627 ev.property = rq.property;
3545 3628
3546 if (freect) 3629 if (freect)
3547 XFree (ct.value); 3630 XFree (ct.value);
3548 } 3631 }
3549 3632
3550 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3551} 3634}
3552 3635
3553/* ------------------------------------------------------------------------- * 3636/* ------------------------------------------------------------------------- *
3554 * MOUSE ROUTINES * 3637 * MOUSE ROUTINES *
3555 * ------------------------------------------------------------------------- */ 3638 * ------------------------------------------------------------------------- */
3556 3639
3557/* 3640/*
3558 * return col/row values corresponding to x/y pixel values 3641 * return col/row values corresponding to x/y pixel values
3559 */ 3642 */
3560void 3643void
3561rxvt_term::pixel_position (int *x, int *y) 3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3562{ 3645{
3563 *x = Pixel2Col (*x); 3646 *x = Pixel2Col (*x);
3564 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3565 *y = Pixel2Row (*y); 3648 *y = Pixel2Row (*y);
3566 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3567} 3650}
3568 3651
3569/* ------------------------------------------------------------------------- */ 3652/* ------------------------------------------------------------------------- */
3570#ifdef USE_XIM 3653#ifdef USE_XIM
3571void 3654void
3572rxvt_term::im_set_position (XPoint &pos) 3655rxvt_term::im_set_position (XPoint &pos) NOTHROW
3573{ 3656{
3574 XWindowAttributes xwa; 3657 XWindowAttributes xwa;
3575 3658
3576 XGetWindowAttributes (display->display, vt, &xwa); 3659 XGetWindowAttributes (xdisp, vt, &xwa);
3577 3660
3578 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3661 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3579 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3580} 3663}
3581#endif 3664#endif
3582 3665
3583#if ENABLE_OVERLAY 3666#if ENABLE_OVERLAY
3584void 3667void
3585rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3668rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3586{ 3669{
3587 if (nrow < 3 || ncol < 3) 3670 if (nrow < 1 || ncol < 1)
3588 return; 3671 return;
3589 3672
3590 want_refresh = 1; 3673 want_refresh = 1;
3591 3674
3592 scr_overlay_off (); 3675 scr_overlay_off ();
… …
3635 *rp = r; 3718 *rp = r;
3636 } 3719 }
3637} 3720}
3638 3721
3639void 3722void
3640rxvt_term::scr_overlay_off () 3723rxvt_term::scr_overlay_off () NOTHROW
3641{ 3724{
3642 if (!ov_text) 3725 if (!ov_text)
3643 return; 3726 return;
3644 3727
3645 want_refresh = 1; 3728 want_refresh = 1;
… …
3653 delete [] ov_text; ov_text = 0; 3736 delete [] ov_text; ov_text = 0;
3654 delete [] ov_rend; ov_rend = 0; 3737 delete [] ov_rend; ov_rend = 0;
3655} 3738}
3656 3739
3657void 3740void
3658rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3659{ 3742{
3660 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3661 return; 3744 return;
3662 3745
3663 x++, y++; 3746 x++, y++;
… …
3665 ov_text[y][x] = text; 3748 ov_text[y][x] = text;
3666 ov_rend[y][x] = rend; 3749 ov_rend[y][x] = rend;
3667} 3750}
3668 3751
3669void 3752void
3670rxvt_term::scr_overlay_set (int x, int y, const char *s) 3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3671{ 3754{
3672 while (*s) 3755 while (*s)
3673 scr_overlay_set (x++, y, *s++); 3756 scr_overlay_set (x++, y, *s++);
3674} 3757}
3675 3758
3676void 3759void
3677rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3760rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3678{ 3761{
3679 while (*s) 3762 while (*s)
3680 { 3763 {
3681 text_t t = *s++; 3764 text_t t = *s++;
3682 int width = wcwidth (t); 3765 int width = WCWIDTH (t);
3683 3766
3684 while (width--) 3767 while (width--)
3685 { 3768 {
3686 scr_overlay_set (x++, y, t); 3769 scr_overlay_set (x++, y, t);
3687 t = NOCHAR; 3770 t = NOCHAR;
3688 } 3771 }
3689 } 3772 }
3690} 3773}
3691 3774
3692void 3775void
3693rxvt_term::scr_swap_overlay () 3776rxvt_term::scr_swap_overlay () NOTHROW
3694{ 3777{
3695 if (!ov_text) 3778 if (!ov_text)
3696 return; 3779 return;
3697 3780
3698 // swap screen mem with overlay 3781 // swap screen mem with overlay
3699 for (int y = ov_h; y--; ) 3782 for (int y = ov_h; y--; )
3700 { 3783 {
3701 text_t *t1 = ov_text[y]; 3784 text_t *t1 = ov_text[y];
3702 rend_t *r1 = ov_rend[y]; 3785 rend_t *r1 = ov_rend[y];
3703 3786
3704 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3787 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3705 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3788 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3706 3789
3707 for (int x = ov_w; x--; ) 3790 for (int x = ov_w; x--; )
3708 { 3791 {
3709 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3792 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3793 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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