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.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.272 by root, Fri Aug 10 23:52:12 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
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
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (option (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
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 (dpy, 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 (dpy, 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 (dpy, 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
128 efs &= ~RS_baseattrMask; 129 l.touch ();
130
131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
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;
133 136
… …
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 * ------------------------------------------------------------------------- */
… …
155{ 161{
156#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
157 scr_overlay_off (); 163 scr_overlay_off ();
158#endif 164#endif
159 165
166 rvideo_mode = false;
160 view_start = 0; 167 view_start = 0;
161 num_scr = 0; 168 num_scr = 0;
162 169
163 if (ncol == 0) 170 if (ncol == 0)
164 ncol = 80; 171 ncol = 80;
… …
167 nrow = 24; 174 nrow = 24;
168 175
169 if (ncol == prev_ncol && nrow == prev_nrow) 176 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 177 return;
171 178
179 if (current_screen != PRIMARY)
180 scr_swap_screen ();
181
172 // we need at least two lines for wrapping to work correctly 182 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 183 while (nrow + saveLines < 2)
174 { 184 {
175 //TODO//FIXME 185 //TODO//FIXME
176 saveLines++; 186 saveLines++;
177 prev_nrow--; 187 prev_nrow--;
178 nsaved++; 188 top_row--;
179 } 189 }
180 190
181 want_refresh = 1; 191 want_refresh = 1;
182 192
183 int prev_total_rows = prev_nrow + saveLines; 193 int prev_total_rows = prev_nrow + saveLines;
… …
188 198
189 if (!row_buf) 199 if (!row_buf)
190 { 200 {
191 /* 201 /*
192 * first time called so just malloc everything: don't rely on realloc 202 * 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 */ 203 */
195 nsaved = 0; /* no saved lines */ 204 top_row = 0;
196 term_start = 0; 205 term_start = 0;
197 206
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 207 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 208 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 209
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 210 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)); 211 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 212 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 213
206 for (int row = nrow; row--; ) 214 for (int row = nrow; row--; )
207 { 215 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 216 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 217 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 238 selection.text = NULL;
231 selection.len = 0; 239 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 240 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 241 selection.screen = PRIMARY;
234 selection.clicks = 0; 242 selection.clicks = 0;
235 CLEAR_ALL_SELECTION ();
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 < ncol ? llen : MOD (llen - 1, ncol) + 1; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
364 qline->is_longer (0);
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 366 }
359 while (p != pend && q > 0); 367 while (p != pend && q > 0);
360 368
361 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
362 nsaved = term_start - q; 370 top_row = q - term_start;
363 371
364 // make sure all terminal lines exist 372 // make sure all terminal lines exist
365 while (nsaved < 0) 373 while (top_row > 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
367
368 } 375 }
369 else 376 else
370 { 377 {
371 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
372 379
… …
385 } 392 }
386 393
387 term_start = 0; 394 term_start = 0;
388 } 395 }
389 396
390#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t);
393#endif
394
395 free (old_buf); 397 free (old_buf);
396 delete old_ta; 398 delete old_ta;
397 delete old_ra; 399 delete old_ra;
398 400
399 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
401 403
402 if (tabs)
403 free (tabs); 404 free (tabs);
404 } 405 }
406
407 CLEAR_ALL_SELECTION ();
405 408
406 prev_nrow = nrow; 409 prev_nrow = nrow;
407 prev_ncol = ncol; 410 prev_ncol = ncol;
408 411
409 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
410 413
411 for (int col = ncol; col--; ) 414 for (int col = ncol; --col; )
412 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
413 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
414 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415} 423}
416 424
417/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
418/* 426/*
419 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
420 */ 428 */
421void 429void
422rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
423{ 431{
432 if (row_buf)
433 {
424 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
425 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
426 436
427 free (row_buf); 437 free (row_buf);
428 free (swap_buf); 438 free (swap_buf);
429 free (drawn_buf); 439 free (drawn_buf);
430 free (temp_buf);
431 free (tabs); 440 free (tabs);
432 441
433 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
434} 444}
435 445
436/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
437/* 447/*
438 * Hard reset 448 * Hard reset
… …
443 scr_release (); 453 scr_release ();
444 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
445 scr_reset (); 455 scr_reset ();
446 456
447 scr_clear (true); 457 scr_clear (true);
448 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
449} 459}
450 460
451/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
452 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
453 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
455 * Save and Restore cursor 465 * Save and Restore cursor
456 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
457 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
458 */ 468 */
459void 469void
460rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
461{ 471{
462 screen_t *s; 472 screen_t *s;
463 473
464#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
465 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
497 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
498 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
499#endif 509#endif
500} 510}
501 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
502/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
503/* 528/*
504 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
505 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
506 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
507 */ 532 */
508int 533void
509rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
510{ 535{
536 if (scrn == current_screen)
537 return;
538
511 want_refresh = 1; 539 want_refresh = 1;
512 view_start = 0; 540 view_start = 0;
513 541
514 if (current_screen == scrn)
515 return scrn;
516
517 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
518 543
519 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
520 545
521 ::swap (screen.cur.row, swap.cur.row);
522 ::swap (screen.cur.col, swap.cur.col);
523
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526
527#if NSCREENS 546#if NSCREENS
528 if (options & Opt_secondaryScreen) 547 if (option (Opt_secondaryScreen))
529 { 548 {
530 num_scr = 0; 549 num_scr = 0;
531 550
532 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
533 ::swap (ROW(i), swap_buf [i]);
534 552
535 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
536 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
537 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
539 } 557 }
540 else 558 else
541#endif 559#endif
542 if (options & Opt_secondaryScroll) 560 if (option (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544
545 return scrn;
546} 562}
547 563
548// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
549void 565void
550rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
551{ 567{
552 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
553 return; 569 return;
554 570
555 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
565/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
566/* 582/*
567 * Change the colour for following text 583 * Change the colour for following text
568 */ 584 */
569void 585void
570rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
571{ 587{
572 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
573 color = fgbg; 589 color = fgbg;
574 590
575 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
576 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
577 else 593 else
… …
581/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
582/* 598/*
583 * Change the rendition style for following text 599 * Change the rendition style for following text
584 */ 600 */
585void 601void
586rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
587 { 603 {
588 if (set) 604 if (set)
589 rstyle |= style; 605 rstyle |= style;
590 else if (style == ~RS_None) 606 else if (style == ~RS_None)
591 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
598 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
599 * count positive ==> scroll up 615 * count positive ==> scroll up
600 * count negative ==> scroll down 616 * count negative ==> scroll down
601 */ 617 */
602int 618int
603rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
604{ 620{
605 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
606 return 0; 622 return 0;
607 623
608 want_refresh = 1; 624 want_refresh = 1;
609 num_scr += count; 625 num_scr += count;
610 626
611 if (count > 0 627 if (count > 0
612 && row1 == 0 628 && row1 == 0
613 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
615 { 630 {
616 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
617 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
618 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 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
658 }
659
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any
619 if (selection.op && current_screen == selection.screen) 673 if (selection.op && current_screen == selection.screen)
620 { 674 {
621 selection.beg.row -= count; 675 selection.beg.row -= count;
622 selection.end.row -= count; 676 selection.end.row -= count;
623 selection.mark.row -= count; 677 selection.mark.row -= count;
624 678
625 if (selection.beg.row < -nsaved 679 if (selection.beg.row < top_row
626 || selection.end.row < -nsaved 680 || selection.end.row < top_row
627 || selection.mark.row < -nsaved) 681 || selection.mark.row < top_row)
628 { 682 {
629 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
630 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
631 } 685 }
632 } 686 }
633 687
634 for (int i = count; i--; ) 688 // finally move the view window, if desired
635 scr_blank_screen_mem (ROW(row2 - i), rstyle);
636
637 if ((options & Opt_scrollWithBuffer) 689 if (option (Opt_scrollWithBuffer)
638 && view_start != 0 690 && view_start != 0
639 && view_start != saveLines) 691 && view_start != -saveLines)
640 scr_page (UP, count); 692 scr_page (UP, count);
693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
641 } 696 }
642 else 697 else
643 { 698 {
644 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen)
645 { 700 {
… …
669 724
670 int rows = row2 - row1 + 1; 725 int rows = row2 - row1 + 1;
671 726
672 min_it (count, rows); 727 min_it (count, rows);
673 728
729 line_t *temp_buf = row_buf + total_rows;
730
674 for (int row = 0; row < rows; row++) 731 for (int row = 0; row < rows; row++)
675 { 732 {
676 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
677 734
678 if (!IN_RANGE_EXC (row + count, 0, rows)) 735 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
689/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
690/* 747/*
691 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
692 */ 749 */
693void 750void
694rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
695{ 752{
696 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
697 return; 754 return;
698 755
699 unsigned char checksel; 756 unsigned char checksel;
700 unicode_t c; 757 unicode_t c;
701 int last_col; 758 int ncol = this->ncol;
702 const unicode_t *strend = str + len; 759 const wchar_t *strend = str + len;
703 760
704 want_refresh = 1; 761 want_refresh = 1;
705 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
706 last_col = ncol;
707 763
708 if (nlines > 0) 764 if (minlines > 0)
709 { 765 {
710 nlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
768
711 if (nlines > 0 769 if (minlines > 0
712 && screen.tscroll == 0 770 && screen.tscroll == 0
713 && screen.bscroll == (nrow - 1)) 771 && screen.bscroll == nrow - 1)
714 { 772 {
715 /* _at least_ this many lines need to be scrolled */ 773 /* _at least_ this many lines need to be scrolled */
716 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
717 screen.cur.row -= nlines; 775 screen.cur.row -= minlines;
718 } 776 }
719 } 777 }
720 778
721#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
722 assert (screen.cur.col < last_col); 780 assert (screen.cur.col < ncol);
723 assert (screen.cur.row < nrow 781 assert (screen.cur.row < nrow
724 && screen.cur.row >= -nsaved); 782 && screen.cur.row >= top_row);
725#endif 783#endif
726 int row = screen.cur.row; 784 int row = screen.cur.row;
727 785
728 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
729 787
730 line_t *line = &ROW(row); 788 line_t *line = &ROW(row);
731 789
732 while (str < strend) 790 while (str < strend)
733 { 791 {
734 c = *str++; 792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
735 793
736 if (c < 0x20) 794 if (c < 0x20)
737 if (c == C0_LF) 795 if (c == C0_LF)
738 { 796 {
739 if (!line->is_longer ()) /* XXX: think about this */
740 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
741 798
742 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
743 800
744 if (screen.cur.row == screen.bscroll) 801 if (screen.cur.row == screen.bscroll)
745 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 802 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
749 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
750 continue; 807 continue;
751 } 808 }
752 else if (c == C0_CR) 809 else if (c == C0_CR)
753 { 810 {
754 if (!line->is_longer ()) /* XXX: think about this */
755 max_it (line->l, screen.cur.col); 811 max_it (line->l, screen.cur.col);
756 812
757 screen.flags &= ~Screen_WrapNext; 813 screen.flags &= ~Screen_WrapNext;
758 screen.cur.col = 0; 814 screen.cur.col = 0;
759 continue; 815 continue;
760 } 816 }
… …
777 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
778 } 834 }
779 835
780 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
781 { 837 {
782 line->set_is_longer ();
783
784 scr_do_wrap (); 838 scr_do_wrap ();
785 839
840 line->l = ncol;
841 line->is_longer (1);
842
786 row = screen.cur.row; 843 row = screen.cur.row;
787 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
788 } 845 }
789 846
790 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
791 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
792 c = 0xfffd; 849 c = 0xfffd;
793 850
794 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
795 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
796 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
797 // locale. 854 // locale.
798 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
799 856
800 if (charsets[screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
801 { 858 {
802 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
803 // 5f-7e standard vt100 860 // 5f-7e standard vt100
804 // 40-5e rxvt extension for extra curses acs chars 861 // 40-5e rxvt extension for extra curses acs chars
805 static uint16_t vt100_0[62] = { // 41 .. 7e 862 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 } 914 }
858 915
859 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
860 917
861 // if the character doesn't fit into the remaining columns... 918 // if the character doesn't fit into the remaining columns...
862 if (screen.cur.col > last_col - width && last_col >= width) 919 if (screen.cur.col > ncol - width && ncol >= width)
863 { 920 {
864 // ...output spaces 921 // ...output spaces
865 c = ' '; 922 c = ' ';
866 // and try the same character next loop iteration 923 // and try the same character next loop iteration
867 --str; 924 --str;
868 } 925 }
869 926
927 line->touch ();
928
870 do 929 do
871 { 930 {
872 line->t[screen.cur.col] = c; 931 line->t[screen.cur.col] = c;
873 line->r[screen.cur.col] = rend; 932 line->r[screen.cur.col] = rend;
874 933
875 if (screen.cur.col < last_col - 1) 934 if (screen.cur.col < ncol - 1)
876 screen.cur.col++; 935 screen.cur.col++;
877 else 936 else
878 { 937 {
879 line->l = last_col; 938 line->l = ncol;
880 if (screen.flags & Screen_Autowrap) 939 if (screen.flags & Screen_Autowrap)
881 screen.flags |= Screen_WrapNext; 940 screen.flags |= Screen_WrapNext;
882 break; 941 break;
883 } 942 }
884 943
… …
886 } 945 }
887 while (--width > 0); 946 while (--width > 0);
888 947
889 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
890 if (!width) 949 if (!width)
950 {
951 line->touch ();
952
891 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
892 { 954 {
893 line->t[c] = ' '; 955 line->t[c] = ' ';
894 line->r[c] = rend; 956 line->r[c] = rend;
895 } 957 }
958 }
896 } 959 }
897 else // width == 0 960 else // width == 0
898 { 961 {
899#if ENABLE_COMBINING 962#if ENABLE_COMBINING
900 // handle combining characters 963 // handle combining characters
901 // we just tag the accent on the previous on-screen character. 964 // we just tag the accent on the previous on-screen character.
902 // this is arguably not correct, but also arguably not wrong. 965 // this is arguably not correct, but also arguably not wrong.
903 // we don't handle double-width characters nicely yet. 966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
904 text_t *tp; 968 text_t *tp;
905 rend_t *rp; 969 rend_t *rp;
906 970
907 if (screen.cur.col > 0) 971 if (screen.cur.col > 0)
908 { 972 {
973 linep = line;
909 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
910 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
911
912 while (*tp == NOCHAR && tp > line->t)
913 tp--, rp--;
914 } 976 }
915 else if (screen.cur.row > 0 977 else if (screen.cur.row > 0
916 && ROW(screen.cur.row - 1).is_longer ()) 978 && ROW(screen.cur.row - 1).is_longer ())
917 { 979 {
918 line_t *line = &ROW(screen.cur.row - 1); 980 linep = &ROW(screen.cur.row - 1);
919
920 tp = line->t + last_col - 1; 981 tp = line->t + ncol - 1;
921 rp = line->r + last_col - 1; 982 rp = line->r + ncol - 1;
922
923 while (*tp == NOCHAR && tp > line->t)
924 tp--, rp--;
925 } 983 }
926 else 984 else
927 continue; 985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
928 991
929 // first try to find a precomposed character 992 // first try to find a precomposed character
930 unicode_t n = rxvt_compose (*tp, c); 993 unicode_t n = rxvt_compose (*tp, c);
931 if (n == NOCHAR) 994 if (n == NOCHAR)
932 n = rxvt_composite.compose (*tp, c); 995 n = rxvt_composite.compose (*tp, c);
… …
935 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
936#endif 999#endif
937 } 1000 }
938 } 1001 }
939 1002
940 if (!line->is_longer ()) /* XXX: think about this */
941 max_it (line->l, screen.cur.col); 1003 max_it (line->l, screen.cur.col);
942 1004
943#ifdef DEBUG_STRICT 1005#ifdef DEBUG_STRICT
944 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
945#endif 1007#endif
946} 1008}
… …
949/* 1011/*
950 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
951 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
952 */ 1014 */
953void 1015void
954rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
955{ 1017{
956 want_refresh = 1; 1018 want_refresh = 1;
957 1019
958 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
959 { 1021 {
… …
977 * Process Horizontal Tab 1039 * Process Horizontal Tab
978 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
979 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
980 */ 1042 */
981void 1043void
982rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
983{ 1045{
984 int i, x; 1046 int i, x;
985 1047
986 want_refresh = 1; 1048 want_refresh = 1;
987 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
996 1058
997 for (; ++i < ncol; ) 1059 for (; ++i < ncol; )
998 if (tabs[i]) 1060 if (tabs[i])
999 { 1061 {
1000 x = i; 1062 x = i;
1063
1001 if (!--count) 1064 if (!--count)
1002 break; 1065 break;
1003 } 1066 }
1004 else 1067 else
1005 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
… …
1008 if (count) 1071 if (count)
1009 x = ncol - 1; 1072 x = ncol - 1;
1010 1073
1011 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1012 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1013 if (ht && options & Opt_pastableTabs) 1076 if (ht && option (Opt_pastableTabs))
1014 { 1077 {
1015 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1016 1079
1017 if (!l.is_longer ()) /* XXX: think about this */ 1080 l.touch (x);
1018 max_it (l.l, x);
1019 1081
1020 i = screen.cur.col; 1082 i = screen.cur.col;
1021 1083
1022 l.t[i] = '\t'; 1084 l.t[i] = '\t';
1023 l.r[i] = base_rend; 1085 l.r[i] = base_rend;
… …
1052 * Process DEC Back Index 1114 * Process DEC Back Index
1053 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1054 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1055 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1056 */ 1118 */
1057#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1058void 1120void
1059rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1060{ 1122{
1061 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1062 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1063 else 1125 else
1064 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1069 * Process DEC Forward Index 1131 * Process DEC Forward Index
1070 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1071 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1072 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1073 */ 1135 */
1074#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1075void 1137void
1076rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1077{ 1139{
1078 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1080 else 1142 else
1081 { 1143 {
1082 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1144 line_t &l = ROW(screen.cur.row);
1083 ROW(screen.cur.row).l = ncol; 1145
1146 l.touch ();
1147 l.is_longer (0);
1084 1148
1085 scr_gotorc (0, 0, R_RELATIVE); 1149 scr_gotorc (0, 0, R_RELATIVE);
1086 scr_insdel_chars (1, DELETE); 1150 scr_insdel_chars (1, DELETE);
1087 scr_gotorc (0, ncol - 1, R_RELATIVE); 1151 scr_gotorc (0, ncol - 1, R_RELATIVE);
1088 } 1152 }
… …
1092/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1093/* 1157/*
1094 * Goto Row/Column 1158 * Goto Row/Column
1095 */ 1159 */
1096void 1160void
1097rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1098{ 1162{
1099 want_refresh = 1; 1163 want_refresh = 1;
1100 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1101 1165
1102 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1140/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1141/* 1205/*
1142 * direction should be UP or DN 1206 * direction should be UP or DN
1143 */ 1207 */
1144void 1208void
1145rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1146{ 1210{
1147 int dirn; 1211 int dirn;
1148 1212
1149 want_refresh = 1; 1213 want_refresh = 1;
1150 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1169 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1170 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1171 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1172 */ 1236 */
1173void 1237void
1174rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1175{ 1239{
1176 unsigned int col, num; 1240 unsigned int col, num;
1177 1241
1178 want_refresh = 1; 1242 want_refresh = 1;
1179 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1180 1244
1181 selection_check (1); 1245 selection_check (1);
1182 1246
1183 line_t &line = ROW(screen.cur.row); 1247 line_t &line = ROW(screen.cur.row);
1248
1249 line.touch ();
1250 line.is_longer (0);
1184 1251
1185 switch (mode) 1252 switch (mode)
1186 { 1253 {
1187 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1188 col = screen.cur.col; 1255 col = screen.cur.col;
… …
1220 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1221 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1222 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1223 */ 1290 */
1224void 1291void
1225rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1226{ 1293{
1227 int num; 1294 int num;
1228 int32_t row; 1295 int32_t row;
1229 rend_t ren; 1296 rend_t ren;
1230 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1274 CLEAR_ROWS (row, num); 1341 CLEAR_ROWS (row, num);
1275 } 1342 }
1276 else 1343 else
1277 { 1344 {
1278 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1279 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1281 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1282 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1283 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1284 } 1351 }
1285 1352
1286 for (; num--; row++) 1353 for (; num--; row++)
1287 { 1354 {
1288 scr_blank_screen_mem (ROW (row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1289 ROW (row).l = 0;
1290 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1291 } 1357 }
1292} 1358}
1293 1359
1294#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1295void 1361void
1296rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1297{ 1363{
1298 want_refresh = 1; 1364 want_refresh = 1;
1299 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1300 1366
1301 nsaved = 0; 1367 top_row = 0;
1302} 1368}
1303#endif 1369#endif
1304 1370
1305/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1306/* 1372/*
1307 * Fill the screen with `E's 1373 * Fill the screen with `E's
1308 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1309 */ 1375 */
1310void 1376void
1311rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1312{ 1378{
1313 rend_t fs; 1379 rend_t fs;
1314 1380
1315 want_refresh = 1; 1381 want_refresh = 1;
1316 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1327 rend_t *r1 = line.r; 1393 rend_t *r1 = line.r;
1328 1394
1329 for (int j = ncol; j--; ) 1395 for (int j = ncol; j--; )
1330 *r1++ = fs; 1396 *r1++ = fs;
1331 1397
1332 line.l = ncol; /* make the `E's selectable */ 1398 line.is_longer (0);
1399 line.touch (ncol);
1333 } 1400 }
1334} 1401}
1335 1402
1336/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1337/* 1404/*
1338 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1339 */ 1406 */
1340void 1407void
1341rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1342{ 1409{
1343 int end; 1410 int end;
1344 1411
1345 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1346 1413
… …
1366/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1367/* 1434/*
1368 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1369 */ 1436 */
1370void 1437void
1371rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1372{ 1439{
1373 int col, row; 1440 int col, row;
1374 rend_t tr; 1441 rend_t tr;
1375 1442
1376 want_refresh = 1; 1443 want_refresh = 1;
… …
1385 min_it (count, ncol - screen.cur.col); 1452 min_it (count, ncol - screen.cur.col);
1386 1453
1387 row = screen.cur.row; 1454 row = screen.cur.row;
1388 1455
1389 line_t *line = &ROW(row); 1456 line_t *line = &ROW(row);
1457
1458 line->touch ();
1459 line->is_longer (0);
1390 1460
1391 switch (insdel) 1461 switch (insdel)
1392 { 1462 {
1393 case INSERT: 1463 case INSERT:
1394 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1395 { 1465 {
1396 line->t[col] = line->t[col - count]; 1466 line->t[col] = line->t[col - count];
1397 line->r[col] = line->r[col - count]; 1467 line->r[col] = line->r[col - count];
1398 } 1468 }
1399 1469
1400 if (!line->is_longer ()) 1470 line->l = min (line->l + count, ncol);
1401 {
1402 line->l += count;
1403 min_it (line->l, ncol);
1404 }
1405 1471
1406 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1474 {
1409 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1422 1488
1423 case ERASE: 1489 case ERASE:
1424 screen.cur.col += count; /* don't worry if > ncol */ 1490 screen.cur.col += count; /* don't worry if > ncol */
1425 selection_check (1); 1491 selection_check (1);
1426 screen.cur.col -= count; 1492 screen.cur.col -= count;
1493
1494 line->l = max (line->l - count, 0);
1427 scr_blank_line (*line, screen.cur.col, count, rstyle); 1495 scr_blank_line (*line, screen.cur.col, count, rstyle);
1428 break; 1496 break;
1429 1497
1430 case DELETE: 1498 case DELETE:
1431 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1434 { 1502 {
1435 line->t[col] = line->t[col + count]; 1503 line->t[col] = line->t[col + count];
1436 line->r[col] = line->r[col + count]; 1504 line->r[col] = line->r[col + count];
1437 } 1505 }
1438 1506
1507 line->l = max (line->l - count, 0);
1439 scr_blank_line (*line, ncol - count, count, tr); 1508 scr_blank_line (*line, ncol - count, count, tr);
1440
1441 if (line->is_longer ()) /* break line continuation */
1442 line->l = ncol;
1443
1444 line->l = max (line->l - count, 0);
1445 1509
1446 if (selection.op && current_screen == selection.screen 1510 if (selection.op && current_screen == selection.screen
1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448 { 1512 {
1449 if (selection.end.row != screen.cur.row 1513 if (selection.end.row != screen.cur.row
… …
1467/* 1531/*
1468 * Set the scrolling region 1532 * Set the scrolling region
1469 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1470 */ 1534 */
1471void 1535void
1472rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1473{ 1537{
1474 max_it (top, 0); 1538 max_it (top, 0);
1475 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1476 1540
1477 if (top > bot) 1541 if (top > bot)
… …
1487 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1488 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1489 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1490 */ 1554 */
1491void 1555void
1492rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1493{ 1557{
1494 want_refresh = 1; 1558 want_refresh = 1;
1495 1559
1496 if (mode) 1560 if (mode)
1497 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1504 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1505 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1506 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1507 */ 1571 */
1508void 1572void
1509rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1510{ 1574{
1511 if (mode) 1575 if (mode)
1512 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1513 else 1577 else
1514 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1523 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1524 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1525 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1526 */ 1590 */
1527void 1591void
1528rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1529{ 1593{
1530 if (mode) 1594 if (mode)
1531 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1532 else 1596 else
1533 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1540 * Set insert/replace mode 1604 * Set insert/replace mode
1541 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1542 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1543 */ 1607 */
1544void 1608void
1545rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1546{ 1610{
1547 if (mode) 1611 if (mode)
1548 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1549 else 1613 else
1550 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1556 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1557 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1558 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1559 */ 1623 */
1560void 1624void
1561rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1562{ 1626{
1563 if (mode < 0) 1627 if (mode < 0)
1564 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1565 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1566 tabs[screen.cur.col] = (mode ? 1 : 0); 1630 tabs [screen.cur.col] = !!mode;
1567} 1631}
1568 1632
1569/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1570/* 1634/*
1571 * Set reverse/normal video 1635 * Set reverse/normal video
1572 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1573 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1574 */ 1638 */
1575void 1639void
1576rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1577{ 1641{
1578 XGCValues gcvalue; 1642 rvideo_mode = on;
1579 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1580 if (rvideo != mode) 1648 if (rvideo_state != on)
1581 { 1649 {
1582 rvideo = mode; 1650 rvideo_state = on;
1651
1583 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1584#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1585 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1586#endif 1655#endif
1587#if TRANSPARENT 1656#if ENABLE_TRANSPARENCY
1588 if (! (options & Opt_transparent) || am_transparent == 0) 1657 if (!option (Opt_transparent) || am_transparent == 0)
1589#endif 1658#endif
1590 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1591 pix_colors[Color_bg]);
1592 1660
1661 XGCValues gcvalue;
1593 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1594 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1595 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1596 &gcvalue); 1665
1597 scr_clear (); 1666 scr_clear ();
1598 scr_touch (true); 1667 scr_touch (true);
1599 } 1668 }
1600} 1669}
1601 1670
… …
1603/* 1672/*
1604 * Report current cursor position 1673 * Report current cursor position
1605 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1606 */ 1675 */
1607void 1676void
1608rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1609{ 1678{
1610 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1611} 1680}
1612 1681
1613/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1616 1685
1617/* 1686/*
1618 * Set font style 1687 * Set font style
1619 */ 1688 */
1620void 1689void
1621rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1622{ 1691{
1692#if 0
1623 switch (charsets[screen.charset]) 1693 switch (charsets [screen.charset])
1624 { 1694 {
1625 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
1626 break; 1696 break;
1627 case 'A': /* United Kingdom (UK) */ 1697 case 'A': /* United Kingdom (UK) */
1628 break; 1698 break;
… …
1635 case 'C': /* Finnish character set */ 1705 case 'C': /* Finnish character set */
1636 break; 1706 break;
1637 case 'K': /* German character set */ 1707 case 'K': /* German character set */
1638 break; 1708 break;
1639 } 1709 }
1710#endif
1640} 1711}
1641 1712
1642/* ------------------------------------------------------------------------- */ 1713/* ------------------------------------------------------------------------- */
1643/* 1714/*
1644 * Choose a font 1715 * Choose a font
… …
1646 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1647 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1648 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1649 */ 1720 */
1650void 1721void
1651rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1652{ 1723{
1653 screen.charset = set; 1724 screen.charset = set;
1654 set_font_style (); 1725 set_font_style ();
1655} 1726}
1656 1727
… …
1662 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1663 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1664 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1665 */ 1736 */
1666void 1737void
1667rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1668{ 1739{
1669 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1670 set_font_style (); 1741 set_font_style ();
1671} 1742}
1672 1743
… …
1677 1748
1678/* 1749/*
1679 * refresh matching text. 1750 * refresh matching text.
1680 */ 1751 */
1681bool 1752bool
1682rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1683{ 1754{
1684 bool found = false; 1755 bool found = false;
1685 1756
1686 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1687 { 1758 {
1688 int col = 0;
1689 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1690 1760
1691 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1692 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1693 { 1763 {
1694 found = true; 1764 found = true;
1695 *drp = ~value; 1765 *drp = ~value;
1696 } 1766 }
… …
1707 PART_END, 1777 PART_END,
1708 RC_COUNT 1778 RC_COUNT
1709}; 1779};
1710 1780
1711void 1781void
1712rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1713{ 1783{
1714 int i; 1784 int i;
1715 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1716 1786
1717 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1740 } 1810 }
1741 1811
1742 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1743 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1744 1814
1815 num_scr_allow = 0;
1816
1745 if (refresh) 1817 if (refresh)
1746 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1747} 1819}
1748 1820
1749/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1750/* 1822/*
1751 * Refresh the entire screen 1823 * Refresh the entire screen
1752 */ 1824 */
1753void 1825void
1754rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1755{ 1827{
1756 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1757} 1829}
1758 1830
1759/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1760/* 1832/*
1761 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1762 * the top of the screen 1834 * the top of the screen
1763 */ 1835 */
1764int 1836void
1765rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1766{ 1838{
1767 long p = 0; 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1768 unsigned int oldviewstart;
1769
1770 oldviewstart = view_start;
1771
1772 if (y < len)
1773 {
1774 p = (nrow + nsaved) * (len - y) / len;
1775 p -= (long) (nrow - 1);
1776 p = max (p, 0);
1777 }
1778
1779 view_start = (unsigned int)min (p, nsaved);
1780
1781 return scr_changeview (oldviewstart);
1782} 1840}
1783 1841
1784/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1785/* 1843/*
1786 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1787 * direction should be UP or DN 1845 * direction should be UP or DN
1788 */ 1846 */
1789int 1847bool
1790rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1791{ 1849{
1792 int n; 1850 int new_view_start =
1793 unsigned int oldviewstart;
1794
1795 oldviewstart = view_start;
1796
1797 if (direction == UP)
1798 {
1799 n = view_start + nlines;
1800 view_start = min (n, nsaved);
1801 }
1802 else
1803 {
1804 n = view_start - nlines; 1851 direction == UP ? view_start - nlines
1805 view_start = max (n, 0); 1852 : view_start + nlines;
1806 }
1807 1853
1808 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1809} 1855}
1810 1856
1811int 1857bool
1812rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1813{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1814 if (view_start != oldviewstart) 1862 if (new_view_start == view_start)
1815 { 1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1816 want_refresh = 1; 1867 want_refresh = 1;
1817 num_scr -= (view_start - oldviewstart);
1818 }
1819 1868
1820 return (int) (view_start - oldviewstart); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1821}
1822 1870
1823/* ------------------------------------------------------------------------- */ 1871 return true;
1872}
1873
1874#ifndef NO_BELL
1824void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1825rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1826{ 1886{
1827#ifndef NO_BELL 1887#ifndef NO_BELL
1828 1888
1829# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1830# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1831 if (options & Opt_mapAlert) 1891 if (option (Opt_mapAlert))
1832# endif 1892# endif
1833 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1834# endif 1894# endif
1895# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell))
1897 {
1898 XWMHints *h;
1835 1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif
1908
1836 if (options & Opt_visualBell) 1909 if (option (Opt_visualBell))
1837 { 1910 {
1838 scr_rvideo_mode (!rvideo); /* refresh also done */ 1911 rvideo_bell = true;
1839 rxvt_usleep (VISUAL_BELL_DURATION); 1912 scr_rvideo_mode (rvideo_mode);
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1913 display->flush ();
1914
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1841 } 1916 }
1842 else 1917 else
1843 XBell (display->display, 0); 1918 XBell (dpy, 0);
1844
1845#endif 1919#endif
1846} 1920}
1847 1921
1848/* ------------------------------------------------------------------------- */ 1922/* ------------------------------------------------------------------------- */
1849/* ARGSUSED */ 1923/* ARGSUSED */
1850void 1924void
1851rxvt_term::scr_printscreen (int fullhist) 1925rxvt_term::scr_printscreen (int fullhist) NOTHROW
1852{ 1926{
1853#ifdef PRINTPIPE 1927#ifdef PRINTPIPE
1854 int nrows, row_start; 1928 int nrows, row_start;
1855 FILE *fd; 1929 FILE *fd;
1856 1930
1857 if ((fd = popen_printer ()) == NULL) 1931 if ((fd = popen_printer ()) == NULL)
1858 return; 1932 return;
1859 1933
1860 if (fullhist) 1934 if (fullhist)
1861 { 1935 {
1862 nrows = nrow + nsaved; 1936 nrows = nrow - top_row;
1863 row_start = -nsaved; 1937 row_start = top_row;
1864 } 1938 }
1865 else 1939 else
1866 { 1940 {
1867 nrows = nrow; 1941 nrows = nrow;
1868 row_start = -view_start; 1942 row_start = view_start;
1869 } 1943 }
1870 1944
1871 wctomb (0, 0); 1945 wctomb (0, 0);
1872 1946
1873 for (int r1 = 0; r1 < nrows; r1++) 1947 for (int r1 = 0; r1 < nrows; r1++)
… …
1905 * Refresh the screen 1979 * Refresh the screen
1906 * drawn_text/drawn_rend contain the screen information before the update. 1980 * drawn_text/drawn_rend contain the screen information before the update.
1907 * screen.text/screen.rend contain what the screen will change to. 1981 * screen.text/screen.rend contain what the screen will change to.
1908 */ 1982 */
1909void 1983void
1910rxvt_term::scr_refresh (unsigned char refresh_type) 1984rxvt_term::scr_refresh () NOTHROW
1911{ 1985{
1912 unsigned char must_clear, /* use draw_string not draw_image_string */ 1986 unsigned char have_bg,
1913 showcursor; /* show the cursor */ 1987 showcursor; /* show the cursor */
1914 int16_t col, row, /* column/row we're processing */ 1988 int16_t col, row, /* column/row we're processing */
1915 ocrow; /* old cursor row */ 1989 ocrow; /* old cursor row */
1916 int i; /* tmp */ 1990 int i; /* tmp */
1917#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
1918 rend_t cc1; /* store colours at cursor position (s) */ 1992 rend_t cc1; /* store colours at cursor position (s) */
1919#endif 1993#endif
1920 rend_t *crp; // cursor rendition pointer 1994 rend_t *crp; // cursor rendition pointer
1995 rend_t ccol1, /* Cursor colour */
1996 ccol2; /* Cursor colour2 */
1921 1997
1922 want_refresh = 0; /* screen is current */ 1998 want_refresh = 0; /* screen is current */
1923 1999
1924 if (refresh_type == NO_REFRESH || !mapped) 2000 if (refresh_type == NO_REFRESH || !mapped)
1925 return; 2001 return;
1926 2002
1927 /* 2003 /*
1928 * A: set up vars 2004 * A: set up vars
1929 */ 2005 */
1930 must_clear = 0; 2006 have_bg = 0;
1931 refresh_count = 0; 2007 refresh_count = 0;
1932 2008
1933#if XPM_BACKGROUND 2009#ifdef HAVE_BG_PIXMAP
1934 must_clear |= bgPixmap.pixmap != None; 2010 have_bg |= bgPixmap.pixmap != None;
1935#endif 2011#endif
1936#if TRANSPARENT 2012#if ENABLE_TRANSPARENCY
1937 must_clear |= (options & Opt_transparent) && am_transparent; 2013 have_bg |= option (Opt_transparent) && am_transparent;
1938#endif 2014#endif
1939 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1940 2016
1941 /* 2017 /*
1942 * B: reverse any characters which are selected 2018 * B: reverse any characters which are selected
… …
1946 /* 2022 /*
1947 * C: set the cursor character (s) 2023 * C: set the cursor character (s)
1948 */ 2024 */
1949 { 2025 {
1950 unsigned char setoldcursor; 2026 unsigned char setoldcursor;
1951 rend_t ccol1, /* Cursor colour */
1952 ccol2; /* Cursor colour2 */
1953 2027
1954 showcursor = (screen.flags & Screen_VisibleCursor); 2028 showcursor = (screen.flags & Screen_VisibleCursor);
1955#ifdef CURSOR_BLINK 2029#ifdef CURSOR_BLINK
1956 if (hidden_cursor) 2030 if (hidden_cursor)
1957 showcursor = 0; 2031 showcursor = 0;
… …
1964 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2038 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1965 col--; 2039 col--;
1966 2040
1967 crp = &ROW(screen.cur.row).r[col]; 2041 crp = &ROW(screen.cur.row).r[col];
1968 2042
2043#ifndef NO_CURSORCOLOR
2044 cc1 = *crp & (RS_fgMask | RS_bgMask);
2045 if (ISSET_PIXCOLOR (Color_cursor))
2046 ccol1 = Color_cursor;
2047 else
2048#endif
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol1 = fgcolor_of (rstyle);
2051#else
2052 ccol1 = Color_fg;
2053#endif
2054
2055#ifndef NO_CURSORCOLOR
2056 if (ISSET_PIXCOLOR (Color_cursor2))
2057 ccol2 = Color_cursor2;
2058 else
2059#endif
2060#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2061 ccol2 = bgcolor_of (rstyle);
2062#else
2063 ccol2 = Color_bg;
2064#endif
2065
1969 if (showcursor && focus) 2066 if (showcursor && focus)
1970 { 2067 {
1971 if (options & Opt_cursorUnderline) 2068 if (option (Opt_cursorUnderline))
1972 *crp ^= RS_Uline; 2069 *crp ^= RS_Uline;
1973 else 2070 else
1974 { 2071 {
1975 *crp ^= RS_RVid; 2072 *crp ^= RS_RVid;
1976
1977#ifndef NO_CURSORCOLOR
1978 cc1 = *crp & (RS_fgMask | RS_bgMask);
1979 if (ISSET_PIXCOLOR (Color_cursor))
1980 ccol1 = Color_cursor;
1981 else
1982#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1983 ccol1 = GET_FGCOLOR (rstyle);
1984#else
1985 ccol1 = Color_fg;
1986#endif
1987 if (ISSET_PIXCOLOR (Color_cursor2))
1988 ccol2 = Color_cursor2;
1989 else
1990#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1991 ccol2 = GET_BGCOLOR (rstyle);
1992#else
1993 ccol2 = Color_bg;
1994#endif
1995 *crp = SET_FGCOLOR (*crp, ccol1); 2073 *crp = SET_FGCOLOR (*crp, ccol1);
1996 *crp = SET_BGCOLOR (*crp, ccol2); 2074 *crp = SET_BGCOLOR (*crp, ccol2);
1997#endif
1998 } 2075 }
1999 } 2076 }
2000 } 2077 }
2001 2078
2002 /* make sure no outline cursor is left around */ 2079 /* make sure no outline cursor is left around */
2003 setoldcursor = 0; 2080 setoldcursor = 0;
2004 if (ocrow != -1) 2081 if (ocrow != -1)
2005 { 2082 {
2006 if (screen.cur.row + view_start != ocrow 2083 if (screen.cur.row - view_start != ocrow
2007 || screen.cur.col != oldcursor.col) 2084 || screen.cur.col != oldcursor.col)
2008 { 2085 {
2009 if (ocrow < nrow 2086 if (ocrow < nrow
2010 && oldcursor.col < ncol) 2087 && oldcursor.col < ncol)
2011 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2088 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2019 else if (!focus) 2096 else if (!focus)
2020 setoldcursor = 1; 2097 setoldcursor = 1;
2021 2098
2022 if (setoldcursor) 2099 if (setoldcursor)
2023 { 2100 {
2024 if (screen.cur.row + view_start >= nrow) 2101 if (screen.cur.row - view_start >= nrow)
2025 oldcursor.row = -1; 2102 oldcursor.row = -1;
2026 else 2103 else
2027 { 2104 {
2028 oldcursor.row = screen.cur.row + view_start; 2105 oldcursor.row = screen.cur.row - view_start;
2029 oldcursor.col = screen.cur.col; 2106 oldcursor.col = screen.cur.col;
2030 } 2107 }
2031 } 2108 }
2032 } 2109 }
2033 2110
2111 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2034#if ENABLE_OVERLAY 2112#if ENABLE_OVERLAY
2035 scr_swap_overlay (); 2113 scr_swap_overlay ();
2036#endif 2114#endif
2037 2115
2038#ifndef NO_SLOW_LINK_SUPPORT 2116#ifndef NO_SLOW_LINK_SUPPORT
2039 /* 2117 /*
2040 * D: CopyArea pass - very useful for slower links 2118 * D: CopyArea pass - very useful for slower links
2041 * This has been deliberately kept simple. 2119 * This has been deliberately kept simple.
2042 */ 2120 */
2043 i = num_scr;
2044 if (!display->is_local 2121 if (!display->is_local
2045 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2122 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2046 && abs (num_scr) < nrow && !must_clear) 2123 && abs (num_scr) < nrow && !have_bg)
2047 { 2124 {
2048 int16_t nits; 2125 int16_t nits;
2126 int i = num_scr;
2049 int j; 2127 int j;
2050 int len, wlen; 2128 int len, wlen;
2129 dLocal (int, num_scr);
2051 2130
2052 j = nrow; 2131 j = nrow;
2053 wlen = len = -1; 2132 wlen = len = -1;
2054 row = i > 0 ? 0 : j - 1; 2133 row = i > 0 ? 0 : j - 1;
2134
2055 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2135 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2056 { 2136 {
2057 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2137 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2058 { 2138 {
2059 line_t s = ROW(row - view_start); 2139 line_t s = ROW(view_start + row);
2060 line_t d = drawn_buf[row]; 2140 line_t d = drawn_buf[row];
2061 line_t d2 = drawn_buf[row + i]; 2141 line_t d2 = drawn_buf[row + i];
2062 2142
2063 for (nits = 0, col = ncol; col--; ) 2143 for (nits = 0, col = ncol; col--; )
2064 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2144 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2080 wlen = row; 2160 wlen = row;
2081 continue; 2161 continue;
2082 } 2162 }
2083 } 2163 }
2084 2164
2085 if (len != -1) 2165 if (len >= 0)
2086 { 2166 {
2087 /* also comes here at end if needed because of >= above */ 2167 /* also comes here at end if needed because of >= above */
2088 if (wlen < len) 2168 if (wlen < len)
2089 ::swap (wlen, len); 2169 ::swap (wlen, len);
2090 2170
2171 XGCValues gcv;
2172
2173 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2091 XCopyArea (display->display, vt, vt, 2174 XCopyArea (dpy, vt, vt,
2092 gc, 0, Row2Pixel (len + i), 2175 gc, 0, Row2Pixel (len + i),
2093 (unsigned int)TermWin_TotalWidth (), 2176 (unsigned int)this->width,
2094 (unsigned int)Height2Pixel (wlen - len + 1), 2177 (unsigned int)Height2Pixel (wlen - len + 1),
2095 0, Row2Pixel (len)); 2178 0, Row2Pixel (len));
2179 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2180
2096 len = -1; 2181 len = -1;
2097 } 2182 }
2098 } 2183 }
2099 } 2184 }
2100#endif 2185#endif
… …
2102 /* 2187 /*
2103 * E: main pass across every character 2188 * E: main pass across every character
2104 */ 2189 */
2105 for (row = 0; row < nrow; row++) 2190 for (row = 0; row < nrow; row++)
2106 { 2191 {
2107 text_t *stp = ROW(row - view_start).t; 2192 text_t *stp = ROW(view_start + row).t;
2108 rend_t *srp = ROW(row - view_start).r; 2193 rend_t *srp = ROW(view_start + row).r;
2109 text_t *dtp = drawn_buf[row].t; 2194 text_t *dtp = drawn_buf[row].t;
2110 rend_t *drp = drawn_buf[row].r; 2195 rend_t *drp = drawn_buf[row].r;
2111 2196
2112 /* 2197 /*
2113 * E2: OK, now the real pass 2198 * E2: OK, now the real pass
… …
2156 count++; 2241 count++;
2157 2242
2158 if (stp[col] != dtp[col] 2243 if (stp[col] != dtp[col]
2159 || !RS_SAME (srp[col], drp[col])) 2244 || !RS_SAME (srp[col], drp[col]))
2160 { 2245 {
2161 if (must_clear && (i++ > count / 2)) 2246 if (have_bg && (i++ > count / 2))
2162 break; 2247 break;
2163 2248
2164 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2165 drp[col] = rend; 2250 drp[col] = rend;
2166 i = 0; 2251 i = 0;
2167 } 2252 }
2168 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2253 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2169 break; 2254 break;
2170 } 2255 }
2171 2256
2172 col--; /* went one too far. move back */ 2257 col--; /* went one too far. move back */
2173 count -= i; /* dump any matching trailing chars */ 2258 count -= i; /* dump any matching trailing chars */
… …
2177 count++, i--; 2262 count++, i--;
2178 2263
2179 /* 2264 /*
2180 * Determine the attributes for the string 2265 * Determine the attributes for the string
2181 */ 2266 */
2182 int fore = GET_FGCOLOR (rend); // desired foreground 2267 int fore = fgcolor_of (rend); // desired foreground
2183 int back = GET_BGCOLOR (rend); // desired background 2268 int back = bgcolor_of (rend); // desired background
2184 2269
2185 // only do special processing if any attributes are set, which is rare 2270 // only do special processing if any attributes are set, which is unlikely
2186 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2271 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2187 { 2272 {
2188#if ENABLE_STYLES
2189 // force redraw after "careful" characters to avoid pixel droppings
2190 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2191 drp[col + 1] = ~srp[col + 1];
2192
2193 // include previous careful character(s) if possible, looks nicer (best effort...)
2194 while (text > stp
2195 && srp[text - stp - 1] & RS_Careful
2196 && RS_SAME (rend, srp[text - stp - 1]))
2197 text--, count++, xpixel -= fwidth;
2198#endif
2199
2200 bool invert = rend & RS_RVid; 2273 bool invert = rend & RS_RVid;
2201 2274
2202#ifndef NO_BOLD_UNDERLINE_REVERSE 2275#ifndef NO_BOLD_UNDERLINE_REVERSE
2203 if (rend & RS_Bold 2276 if (rend & RS_Bold
2204 && fore == Color_fg) 2277 && fore == Color_fg)
… …
2220 else 2293 else
2221 invert = !invert; 2294 invert = !invert;
2222# endif 2295# endif
2223 } 2296 }
2224 2297
2225 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2226 fore = Color_UL; 2299 fore = Color_UL;
2227#endif 2300#endif
2228 2301
2229 if (invert) 2302 if (invert)
2230 { 2303 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2231 ::swap (fore, back); 2310 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2232 2315
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2316#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2234 if (ISSET_PIXCOLOR (Color_RV)) 2318 if (ISSET_PIXCOLOR (Color_RV))
2235 back = Color_RV; 2319 back = Color_RV;
2236 2320# endif
2237 if (fore == back) 2321 if (fore == back)
2238 { 2322 {
2239 fore = Color_bg; 2323 fore = Color_bg;
2240 back = Color_fg; 2324 back = Color_fg;
2241 } 2325 }
… …
2252 } 2336 }
2253 else if (hidden_text) 2337 else if (hidden_text)
2254 fore = back; 2338 fore = back;
2255 } 2339 }
2256#endif 2340#endif
2341
2342#if ENABLE_STYLES
2343 // "careful" (too wide) character handling
2344
2345 // include previous careful character(s) if possible, looks nicer (best effort...)
2346 while (text > stp
2347 && srp[text - stp - 1] & RS_Careful
2348 && RS_SAME (rend, srp[text - stp - 1]))
2349 text--, count++, xpixel -= fwidth;
2350
2351 // force redraw after "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2353 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2354
2355 // force redraw before "careful" characters to avoid pixel droppings
2356 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2357 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2358#endif
2257 } 2359 }
2258 2360
2259 /* 2361 /*
2260 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2261 */ 2363 */
2262 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2263 2365
2264 if (back == fore)
2265 font->clear_rect (*drawable, xpixel, ypixel,
2266 fwidth * count, fheight,
2267 back);
2268 else if (back == Color_bg) 2366 if (have_bg && back == Color_bg)
2269 { 2367 {
2270 if (must_clear) 2368 // this is very ugly, maybe push it into ->draw?
2271 {
2272 CLEAR_CHARS (xpixel, ypixel, count);
2273 2369
2274 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2275 if (text[i] != ' ') 2371 if (text[i] != ' ')
2276 { 2372 {
2277 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2278 break; 2374 goto did_clear;
2279 }
2280 } 2375 }
2281 else 2376
2282 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2378 did_clear: ;
2283 } 2379 }
2284 else 2380 else
2285 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2286 2382
2287 if (rend & RS_Uline && font->descent > 1 && fore != back) 2383 if (rend & RS_Uline && font->descent > 1 && fore != back)
2288 { 2384 {
2289#if ENABLE_FRILLS 2385#if ENABLE_FRILLS
2290 if (ISSET_PIXCOLOR (Color_underline)) 2386 if (ISSET_PIXCOLOR (Color_underline))
2291 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2387 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2292 else 2388 else
2293#endif 2389#endif
2294 XSetForeground (display->display, gc, pix_colors[fore]); 2390 XSetForeground (dpy, gc, pix_colors[fore]);
2295 2391
2296 XDrawLine (display->display, drawBuffer, gc, 2392 XDrawLine (dpy, drawBuffer, gc,
2297 xpixel, ypixel + font->ascent + 1, 2393 xpixel, ypixel + font->ascent + 1,
2298 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2299 } 2395 }
2300 } /* for (col....) */ 2396 } /* for (col....) */
2301 } /* for (row....) */ 2397 } /* for (row....) */
2302 2398
2303#if ENABLE_OVERLAY 2399#if ENABLE_OVERLAY
2304 scr_swap_overlay (); 2400 scr_swap_overlay ();
2305#endif 2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2306 2403
2307 /* 2404 /*
2308 * G: cleanup cursor and display outline cursor if necessary 2405 * G: cleanup cursor and display outline cursor if necessary
2309 */ 2406 */
2310 if (showcursor) 2407 if (showcursor)
2311 { 2408 {
2312 if (focus) 2409 if (focus)
2313 { 2410 {
2314 if (options & Opt_cursorUnderline) 2411 if (option (Opt_cursorUnderline))
2315 *crp ^= RS_Uline; 2412 *crp ^= RS_Uline;
2316 else 2413 else
2317 { 2414 {
2318 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2319#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
… …
2333 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2430 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2334 cursorwidth++; 2431 cursorwidth++;
2335 2432
2336#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
2337 if (ISSET_PIXCOLOR (Color_cursor)) 2434 if (ISSET_PIXCOLOR (Color_cursor))
2338 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else
2339#endif 2437#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2340 2439
2341 XDrawRectangle (display->display, drawBuffer, gc, 2440 XDrawRectangle (dpy, drawBuffer, gc,
2342 Col2Pixel (col), 2441 Col2Pixel (col),
2343 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2344 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2345 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2346 } 2445 }
… …
2349 /* 2448 /*
2350 * H: cleanup selection 2449 * H: cleanup selection
2351 */ 2450 */
2352 scr_reverse_selection (); 2451 scr_reverse_selection ();
2353 2452
2354 if (refresh_type & SMOOTH_REFRESH)
2355 XFlush (display->display);
2356
2357 num_scr = 0; 2453 num_scr = 0;
2358 num_scr_allow = 1; 2454 num_scr_allow = 1;
2359} 2455}
2360 2456
2361void 2457void
2362rxvt_term::scr_remap_chars (const line_t &l) 2458rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2363{ 2459{
2364 if (!l.t) 2460 if (!l.t)
2365 return; 2461 return;
2366 2462
2463 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2464
2367 for (int i = ncol; i--; ) 2465 for (int i = ncol; i--; )
2368 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2466 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2369} 2467}
2370 2468
2371void 2469void
2372rxvt_term::scr_remap_chars () 2470rxvt_term::scr_remap_chars () NOTHROW
2373{ 2471{
2374 for (int i = total_rows; i--; ) 2472 for (int i = total_rows; i--; )
2375 scr_remap_chars (row_buf [i]); 2473 scr_remap_chars (row_buf [i]);
2376 2474
2377 for (int i = nrow; i--; ) 2475 for (int i = nrow; i--; )
… …
2380 scr_remap_chars (swap_buf [i]); 2478 scr_remap_chars (swap_buf [i]);
2381 } 2479 }
2382} 2480}
2383 2481
2384void 2482void
2385rxvt_term::scr_recolour () 2483rxvt_term::scr_recolour () NOTHROW
2386{ 2484{
2387 if (1 2485 if (1
2388#if TRANSPARENT 2486#if ENABLE_TRANSPARENCY
2389 && !am_transparent 2487 && !am_transparent
2390#endif 2488#endif
2391#if XPM_BACKGROUND 2489#ifdef HAVE_BG_PIXMAP
2392 && !bgPixmap.pixmap 2490 && !bgPixmap.pixmap
2393#endif 2491#endif
2394 ) 2492 )
2395 { 2493 {
2396 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2397 XClearWindow (display->display, parent[0]); 2495 XClearWindow (dpy, parent[0]);
2398 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2496 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2399#if HAVE_SCROLLBARS 2497#if HAVE_SCROLLBARS
2400 if (scrollBar.win) 2498 if (scrollBar.win)
2401 { 2499 {
2402 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2403 scrollBar.setIdle (); 2501 scrollBar.setIdle ();
2404 scrollbar_show (0); 2502 scrollbar_show (0);
2405 } 2503 }
2406#endif 2504#endif
2407 } 2505 }
… …
2411 want_refresh = 1; 2509 want_refresh = 1;
2412} 2510}
2413 2511
2414/* ------------------------------------------------------------------------- */ 2512/* ------------------------------------------------------------------------- */
2415void 2513void
2416rxvt_term::scr_clear (bool really) 2514rxvt_term::scr_clear (bool really) NOTHROW
2417{ 2515{
2418 if (!mapped) 2516 if (!mapped)
2419 return; 2517 return;
2420 2518
2421 num_scr_allow = 0; 2519 num_scr_allow = 0;
2422 want_refresh = 1; 2520 want_refresh = 1;
2423 2521
2424 if (really) 2522 if (really)
2425 XClearWindow (display->display, vt); 2523 XClearWindow (dpy, vt);
2426} 2524}
2427 2525
2428/* ------------------------------------------------------------------------- */
2429void 2526void
2527rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2528{
2529 int view_end = view_start + nrow;
2530 int row, col;
2531
2532 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2533 {
2534 text_t *stp = ROW(row).t;
2535 rend_t *srp = ROW(row).r;
2536
2537 for (col = beg_col; col < end_col; col++)
2538 srp[col] ^= rstyle1;
2539
2540 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2541 srp[col] ^= rstyle2;
2542
2543 if (++col < end_col)
2544 srp[col] ^= rstyle2;
2545 }
2546}
2547
2548void
2549rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2550{
2551 int view_end = view_start + nrow;
2552 int row, col;
2553
2554 if (beg_row >= view_start)
2555 {
2556 col = beg_col;
2557 row = beg_row;
2558 }
2559 else
2560 {
2561 col = 0;
2562 row = view_start;
2563 }
2564
2565 for (; row < min (end_row, view_end); row++, col = 0)
2566 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2567 srp[col] ^= rstyle;
2568
2569 if (row == end_row)
2570 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2571 srp[col] ^= rstyle;
2572}
2573
2574/* ------------------------------------------------------------------------- */
2575void
2430rxvt_term::scr_reverse_selection () 2576rxvt_term::scr_reverse_selection () NOTHROW
2431{ 2577{
2432 if (selection.op 2578 if (selection.op
2433 && current_screen == selection.screen 2579 && current_screen == selection.screen
2434 && selection.end.row >= -view_start) 2580 && selection.end.row >= view_start)
2435 { 2581 {
2436 int view_end = -view_start + nrow; 2582#if !ENABLE_MINIMAL
2437 int row, col;
2438
2439#if ENABLE_FRILLS
2440 if (selection.rect) 2583 if (selection.rect)
2441 { 2584 scr_xor_rect (selection.beg.row, selection.beg.col,
2442 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2585 selection.end.row, selection.end.col,
2443 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2586 RS_RVid, RS_RVid | RS_Uline);
2444 srp[col] ^= RS_RVid;
2445 }
2446 else 2587 else
2447#endif 2588#endif
2448 { 2589 scr_xor_span (selection.beg.row, selection.beg.col,
2449 if (selection.beg.row >= -view_start) 2590 selection.end.row, selection.end.col,
2450 { 2591 RS_RVid);
2451 col = selection.beg.col;
2452 row = selection.beg.row;
2453 }
2454 else
2455 {
2456 col = 0;
2457 row = view_start;
2458 }
2459
2460 for (; row < min (selection.end.row, view_end); row++, col = 0)
2461 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2462 srp[col] ^= RS_RVid;
2463
2464 if (row == selection.end.row)
2465 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2466 srp[col] ^= RS_RVid;
2467 }
2468 } 2592 }
2469} 2593}
2470 2594
2471/* ------------------------------------------------------------------------- */ 2595/* ------------------------------------------------------------------------- */
2472/* 2596/*
2473 * Dump the whole scrollback and screen to the passed filedescriptor. The 2597 * Dump the whole scrollback and screen to the passed filedescriptor. The
2474 * invoking routine must close the fd. 2598 * invoking routine must close the fd.
2475 */ 2599 */
2476#if 0 2600#if 0
2477void 2601void
2478rxvt_term::scr_dump (int fd) 2602rxvt_term::scr_dump (int fd) NOTHROW
2479{ 2603{
2480 int row, wrote; 2604 int row, wrote;
2481 unsigned int width, towrite; 2605 unsigned int width, towrite;
2482 char r1[] = "\n"; 2606 char r1[] = "\n";
2483 2607
… …
2502 2626
2503/* ------------------------------------------------------------------------- * 2627/* ------------------------------------------------------------------------- *
2504 * CHARACTER SELECTION * 2628 * CHARACTER SELECTION *
2505 * ------------------------------------------------------------------------- */ 2629 * ------------------------------------------------------------------------- */
2506void 2630void
2507rxvt_term::selection_check (int check_more) 2631rxvt_term::selection_check (int check_more) NOTHROW
2508{ 2632{
2509 row_col_t pos; 2633 row_col_t pos;
2510 2634
2511 if (!selection.op) 2635 if (!selection.op)
2512 return; 2636 return;
2513 2637
2514 pos.row = pos.col = 0; 2638 pos.row = pos.col = 0;
2515 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2639 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2516 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2640 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2517 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2641 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2518 || (check_more == 1 2642 || (check_more == 1
2519 && current_screen == selection.screen 2643 && current_screen == selection.screen
2520 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2644 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2521 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2645 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2522 || (check_more == 2 2646 || (check_more == 2
… …
2533/* ------------------------------------------------------------------------- */ 2657/* ------------------------------------------------------------------------- */
2534/* 2658/*
2535 * Paste a selection direct to the command fd 2659 * Paste a selection direct to the command fd
2536 */ 2660 */
2537void 2661void
2538rxvt_term::paste (unsigned char *data, unsigned int len) 2662rxvt_term::paste (char *data, unsigned int len) NOTHROW
2539{ 2663{
2540 /* convert normal newline chars into common keyboard Return key sequence */ 2664 /* convert normal newline chars into common keyboard Return key sequence */
2541 for (unsigned int i = 0; i < len; i++) 2665 for (unsigned int i = 0; i < len; i++)
2542 if (data[i] == C0_LF) 2666 if (data[i] == C0_LF)
2543 data[i] = C0_CR; 2667 data[i] = C0_CR;
… …
2549/* 2673/*
2550 * Respond to a notification that a primary selection has been sent 2674 * Respond to a notification that a primary selection has been sent
2551 * EXT: SelectionNotify 2675 * EXT: SelectionNotify
2552 */ 2676 */
2553void 2677void
2554rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2678rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2555{ 2679{
2556 if (prop == None) /* check for failed XConvertSelection */ 2680 if (prop == None) /* check for failed XConvertSelection */
2557 { 2681 {
2558 if ((selection_type & Sel_CompoundText)) 2682 if ((selection_type & Sel_CompoundText))
2559 { 2683 {
… …
2579 } 2703 }
2580 2704
2581 unsigned long bytes_after; 2705 unsigned long bytes_after;
2582 XTextProperty ct; 2706 XTextProperty ct;
2583 2707
2584 if (XGetWindowProperty (display->display, win, prop, 2708 if (XGetWindowProperty (dpy, win, prop,
2585 0, PROP_SIZE / 4, 2709 0, PROP_SIZE / 4,
2586 delete_prop, AnyPropertyType, 2710 delete_prop, AnyPropertyType,
2587 &ct.encoding, &ct.format, 2711 &ct.encoding, &ct.format,
2588 &ct.nitems, &bytes_after, 2712 &ct.nitems, &bytes_after,
2589 &ct.value) != Success) 2713 &ct.value) != Success)
… …
2598 if (bytes_after) 2722 if (bytes_after)
2599 { 2723 {
2600 // fetch and append remaining data 2724 // fetch and append remaining data
2601 XTextProperty ct2; 2725 XTextProperty ct2;
2602 2726
2603 if (XGetWindowProperty (display->display, win, prop, 2727 if (XGetWindowProperty (dpy, win, prop,
2604 ct.nitems / 4, (bytes_after + 3) / 4, 2728 ct.nitems / 4, (bytes_after + 3) / 4,
2605 delete_prop, AnyPropertyType, 2729 delete_prop, AnyPropertyType,
2606 &ct2.encoding, &ct2.format, 2730 &ct2.encoding, &ct2.format,
2607 &ct2.nitems, &bytes_after, 2731 &ct2.nitems, &bytes_after,
2608 &ct2.value) != Success) 2732 &ct2.value) != Success)
… …
2621 2745
2622 if (ct.encoding == xa[XA_INCR]) 2746 if (ct.encoding == xa[XA_INCR])
2623 { 2747 {
2624 // INCR selection, start handshake 2748 // INCR selection, start handshake
2625 if (!delete_prop) 2749 if (!delete_prop)
2626 XDeleteProperty (display->display, win, prop); 2750 XDeleteProperty (dpy, win, prop);
2627 2751
2628 selection_wait = Sel_incr; 2752 selection_wait = Sel_incr;
2629 incr_buf_fill = 0; 2753 incr_buf_fill = 0;
2630 incr_ev.start (NOW + 10); 2754 incr_ev.start (NOW + 10);
2631 2755
… …
2678 } 2802 }
2679 2803
2680 char **cl; 2804 char **cl;
2681 int cr; 2805 int cr;
2682 2806
2683#if ENABLE_FRILLS 2807#if !ENABLE_MINIMAL
2684 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2808 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2685 // so recode it manually 2809 // so recode it manually
2686 if (ct.encoding == xa[XA_UTF8_STRING]) 2810 if (ct.encoding == xa[XA_UTF8_STRING])
2687 { 2811 {
2688 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2812 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2689 char *s = rxvt_wcstombs (w); 2813 char *s = rxvt_wcstombs (w);
2690 free (w); 2814 free (w);
2691 // TODO: strlen == only the first element will be converted. well... 2815 // TODO: strlen == only the first element will be converted. well...
2692 paste ((unsigned char *)s, strlen (s)); 2816 paste (s, strlen (s));
2693 free (s); 2817 free (s);
2694 } 2818 }
2695 else 2819 else
2696#endif 2820#endif
2697 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2821 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2698 && cl) 2822 && cl)
2699 { 2823 {
2700 for (int i = 0; i < cr; i++) 2824 for (int i = 0; i < cr; i++)
2701 paste ((unsigned char *)cl[i], strlen (cl[i])); 2825 paste (cl[i], strlen (cl[i]));
2702 2826
2703 XFreeStringList (cl); 2827 XFreeStringList (cl);
2704 } 2828 }
2705 else 2829 else
2706 paste (ct.value, ct.nitems); // paste raw 2830 paste ((char *)ct.value, ct.nitems); // paste raw
2707 2831
2708bailout: 2832bailout:
2709 XFree (ct.value); 2833 XFree (ct.value);
2710 2834
2711 if (selection_wait == Sel_normal) 2835 if (selection_wait == Sel_normal)
2712 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2713} 2837}
2714 2838
2715void 2839void
2716rxvt_term::incr_cb (time_watcher &w) 2840rxvt_term::incr_cb (time_watcher &w) NOTHROW
2717{ 2841{
2718 selection_wait = Sel_none; 2842 selection_wait = Sel_none;
2719 2843
2720 incr_buf_size = 0; 2844 incr_buf_size = 0;
2721 free (incr_buf); 2845 free (incr_buf);
2722 2846
2723 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2847 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2724} 2848}
2725 2849
2726void 2850void
2727rxvt_term::selection_property (Window win, Atom prop) 2851rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2728{ 2852{
2729 if (prop == None || selection_wait != Sel_incr) 2853 if (prop == None || selection_wait != Sel_incr)
2730 return; 2854 return;
2731 2855
2732 selection_paste (win, prop, true); 2856 selection_paste (win, prop, true);
… …
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2865 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0 2866 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2867 * EXT: button 2 release
2744 */ 2868 */
2745void 2869void
2746rxvt_term::selection_request (Time tm, int x, int y) 2870rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2747{ 2871{
2748 if (x < 0 || x >= width || y < 0 || y >= height) 2872 if (selection.text && selnum == Sel_Primary)
2749 return; /* outside window */
2750
2751 if (selection.text)
2752 { /* internal selection */ 2873 { /* internal selection */
2753 char *str = rxvt_wcstombs (selection.text, selection.len); 2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2754 paste ((unsigned char *)str, strlen (str)); 2875 paste (str, strlen (str));
2755 free (str); 2876 free (str);
2756 return; 2877 return;
2757 } 2878 }
2758 else 2879 else
2759 { 2880 {
2760 int i;
2761
2762 selection_request_time = tm; 2881 selection_request_time = tm;
2763 selection_wait = Sel_normal; 2882 selection_wait = Sel_normal;
2764 2883
2765 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2766 {
2767#if X_HAVE_UTF8_STRING 2884#if X_HAVE_UTF8_STRING
2768 selection_type = Sel_UTF8String; 2885 selection_type = Sel_UTF8String;
2769 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2770 return; 2887 return;
2771#else 2888#else
2772 selection_type = Sel_CompoundText; 2889 selection_type = Sel_CompoundText;
2773 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2774 return; 2891 return;
2775#endif 2892#endif
2776 }
2777 } 2893 }
2778 2894
2779 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2780 selection_paste (display->root, XA_CUT_BUFFER0, false); 2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2781} 2897}
2782 2898
2783int 2899int
2784rxvt_term::selection_request_other (Atom target, int selnum) 2900rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2785{ 2901{
2786 Atom sel; 2902 Atom sel;
2787 2903
2788 selection_type |= selnum; 2904 selection_type |= selnum;
2789 2905
… …
2792 else if (selnum == Sel_Secondary) 2908 else if (selnum == Sel_Secondary)
2793 sel = XA_SECONDARY; 2909 sel = XA_SECONDARY;
2794 else 2910 else
2795 sel = xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2796 2912
2797 if (XGetSelectionOwner (display->display, sel) != None) 2913 if (XGetSelectionOwner (dpy, sel) != None)
2798 { 2914 {
2799 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2800 vt, selection_request_time); 2916 vt, selection_request_time);
2801 return 1; 2917 return 1;
2802 } 2918 }
2803 2919
2804 return 0; 2920 return 0;
… …
2808/* 2924/*
2809 * Clear all selected text 2925 * Clear all selected text
2810 * EXT: SelectionClear 2926 * EXT: SelectionClear
2811 */ 2927 */
2812void 2928void
2813rxvt_term::selection_clear () 2929rxvt_term::selection_clear () NOTHROW
2814{ 2930{
2815 want_refresh = 1; 2931 want_refresh = 1;
2816 free (selection.text); 2932 free (selection.text);
2817 selection.text = NULL; 2933 selection.text = NULL;
2818 selection.len = 0; 2934 selection.len = 0;
… …
2851 selection.op = SELECTION_DONE; 2967 selection.op = SELECTION_DONE;
2852 2968
2853 if (selection.clicks == 4) 2969 if (selection.clicks == 4)
2854 return; /* nothing selected, go away */ 2970 return; /* nothing selected, go away */
2855 2971
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return;
2974
2856 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2857 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2858 2977
2859 int ofs = 0; 2978 int ofs = 0;
2860 int extra = 0; 2979 int extra = 0;
… …
2864 2983
2865 int end_col; 2984 int end_col;
2866 2985
2867 for (; row <= selection.end.row; row++, col = 0) 2986 for (; row <= selection.end.row; row++, col = 0)
2868 { 2987 {
2869#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2870 if (selection.rect) 2989 if (selection.rect)
2871 { 2990 {
2872 col = selection.beg.col; 2991 col = selection.beg.col;
2873 end_col = ncol + 1; 2992 end_col = ncol + 1;
2874 } 2993 }
2875 else 2994 else
2876#endif 2995#endif
2877 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2996 end_col = ROW(row).l;
2878 2997
2879 col = max (col, 0); 2998 col = max (col, 0);
2880 2999
2881 if (row == selection.end.row || selection.rect) 3000 if (row == selection.end.row
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
2882 end_col = min (end_col, selection.end.col); 3005 min_it (end_col, selection.end.col);
2883 3006
2884 t = ROW(row).t + col; 3007 t = ROW(row).t + col;
3008
2885 for (; col < end_col; col++) 3009 for (; col < end_col; col++)
2886 { 3010 {
2887 if (*t == NOCHAR) 3011 if (*t == NOCHAR)
2888 t++; 3012 t++;
2889#if ENABLE_COMBINING 3013#if ENABLE_COMBINING
… …
2905#endif 3029#endif
2906 else 3030 else
2907 new_selection_text[ofs++] = *t++; 3031 new_selection_text[ofs++] = *t++;
2908 } 3032 }
2909 3033
3034#if !ENABLE_MINIMAL
3035 if (selection.rect)
3036 {
3037 while (ofs
3038 && new_selection_text[ofs - 1] != C0_LF
3039 && unicode::is_space (new_selection_text[ofs - 1]))
3040 --ofs;
3041
3042 new_selection_text[ofs++] = C0_LF;
3043 }
3044 else
3045#endif
2910 if (!ROW(row).is_longer () && row != selection.end.row) 3046 if (!ROW(row).is_longer () && row != selection.end.row)
2911 new_selection_text[ofs++] = C0_LF; 3047 new_selection_text[ofs++] = C0_LF;
2912 } 3048 }
2913 3049
2914 if (end_col != selection.end.col) 3050 if (end_col != selection.end.col)
2915 new_selection_text[ofs++] = C0_LF; 3051 new_selection_text[ofs++] = C0_LF;
2916 3052
… …
2926 3062
2927 // we usually allocate much more than necessary, so realloc it smaller again 3063 // we usually allocate much more than necessary, so realloc it smaller again
2928 selection.len = ofs; 3064 selection.len = ofs;
2929 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3065 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2930 3066
3067 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3068 return;
3069
3070 selection_grab (tm);
3071}
3072
3073bool
3074rxvt_term::selection_grab (Time tm) NOTHROW
3075{
3076 selection_time = tm;
3077
2931 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2932 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3080 {
2933 display->set_selection_owner (this); 3081 display->set_selection_owner (this);
3082 return true;
3083 }
2934 else 3084 else
2935 rxvt_warn ("can't get primary selection, ignoring.\n"); 3085 {
3086 selection_clear ();
3087 return false;
3088 }
2936 3089
2937#if 0 3090#if 0
2938 XTextProperty ct; 3091 XTextProperty ct;
2939 3092
2940 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2941 { 3094 {
2942 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2943 XFree (ct.value); 3096 XFree (ct.value);
2944 } 3097 }
2945#endif 3098#endif
2946
2947 selection_time = tm;
2948} 3099}
2949 3100
2950/* ------------------------------------------------------------------------- */ 3101/* ------------------------------------------------------------------------- */
2951/* 3102/*
2952 * Mark or select text based upon number of clicks: 1, 2, or 3 3103 * Mark or select text based upon number of clicks: 1, 2, or 3
2953 * EXT: button 1 press 3104 * EXT: button 1 press
2954 */ 3105 */
2955void 3106void
2956rxvt_term::selection_click (int clicks, int x, int y) 3107rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2957{ 3108{
2958 clicks = ((clicks - 1) % 3) + 1; 3109 clicks = ((clicks - 1) % 3) + 1;
2959 selection.clicks = clicks; /* save clicks so extend will work */ 3110 selection.clicks = clicks; /* save clicks so extend will work */
2960 3111
3112 if (clicks == 2 && !selection.rect
3113 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3114 {
3115 MEvent.clicks = 1; // what a mess
3116 selection.screen = current_screen;
3117 selection.op = SELECTION_CONT;
3118 return;
3119 }
3120
2961 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3121 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2962 3122
2963 if (clicks == 2 || clicks == 3) 3123 if (clicks == 2 || clicks == 3)
2964 selection_extend_colrow (selection.mark.col, 3124 selection_extend_colrow (selection.mark.col,
2965 selection.mark.row + view_start, 3125 selection.mark.row - view_start,
2966 0, /* button 3 */ 3126 0, /* button 3 */
2967 1, /* button press */ 3127 1, /* button press */
2968 0); /* click change */ 3128 0); /* click change */
2969} 3129}
2970 3130
2971/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
2972/* 3132/*
2973 * Mark a selection at the specified col/row 3133 * Mark a selection at the specified col/row
2974 */ 3134 */
2975void 3135void
2976rxvt_term::selection_start_colrow (int col, int row) 3136rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2977{ 3137{
2978 want_refresh = 1; 3138 want_refresh = 1;
2979 3139
2980 selection.mark.row = row - view_start; 3140 selection.mark.row = row + view_start;
2981 selection.mark.col = col; 3141 selection.mark.col = col;
2982 3142
2983 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3143 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2984 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2985 3145
2986 while (selection.mark.col > 0 3146 while (selection.mark.col > 0
2987 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2988 --selection.mark.col; 3148 --selection.mark.col;
… …
3007#define DELIMIT_TEXT(x) \ 3167#define DELIMIT_TEXT(x) \
3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3168 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3009#define DELIMIT_REND(x) 1 3169#define DELIMIT_REND(x) 1
3010 3170
3011void 3171void
3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3172rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3013{ 3173{
3014 int col, row, dirnadd, tcol, trow, w1, w2; 3174 int col, row, dirnadd, tcol, trow, w1, w2;
3015 row_col_t bound; 3175 row_col_t bound;
3016 text_t *stp; 3176 text_t *stp;
3017 rend_t *srp; 3177 rend_t *srp;
3018 3178
3019 if (dirn == UP) 3179 if (dirn == UP)
3020 { 3180 {
3021 bound.row = - nsaved - 1; 3181 bound.row = top_row - 1;
3022 bound.col = 0; 3182 bound.col = 0;
3023 dirnadd = -1; 3183 dirnadd = -1;
3024 } 3184 }
3025 else 3185 else
3026 { 3186 {
… …
3074 } 3234 }
3075 } 3235 }
3076 break; 3236 break;
3077 } 3237 }
3078 3238
3079Old_Word_Selection_You_Die:
3080 if (dirn == DN) 3239 if (dirn == DN)
3081 col++; /* put us on one past the end */ 3240 col++; /* put us on one past the end */
3082 3241
3083 /* Poke the values back in */ 3242 /* Poke the values back in */
3084 ret->row = row; 3243 ret->row = row;
… …
3092 * flag == 0 ==> button 1 3251 * flag == 0 ==> button 1
3093 * flag == 1 ==> button 3 press 3252 * flag == 1 ==> button 3 press
3094 * flag == 2 ==> button 3 motion 3253 * flag == 2 ==> button 3 motion
3095 */ 3254 */
3096void 3255void
3097rxvt_term::selection_extend (int x, int y, int flag) 3256rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3098{ 3257{
3099 int col = clamp (Pixel2Col (x), 0, ncol); 3258 int col = clamp (Pixel2Col (x), 0, ncol);
3100 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3259 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3101 3260
3102 /* 3261 /*
… …
3105 * select nothing. Otherwise, if we're to the right of the mark, you have to 3264 * select nothing. Otherwise, if we're to the right of the mark, you have to
3106 * be _past_ a character for it to be selected. 3265 * be _past_ a character for it to be selected.
3107 */ 3266 */
3108 if (((selection.clicks % 3) == 1) && !flag 3267 if (((selection.clicks % 3) == 1) && !flag
3109 && (col == selection.mark.col 3268 && (col == selection.mark.col
3110 && (row == selection.mark.row + view_start))) 3269 && (row == selection.mark.row - view_start)))
3111 { 3270 {
3112 /* select nothing */ 3271 /* select nothing */
3113 selection.beg.row = selection.end.row = 0; 3272 selection.beg.row = selection.end.row = 0;
3114 selection.beg.col = selection.end.col = 0; 3273 selection.beg.col = selection.end.col = 0;
3115 selection.clicks = 4; 3274 selection.clicks = 4;
… …
3128/* ------------------------------------------------------------------------- */ 3287/* ------------------------------------------------------------------------- */
3129/* 3288/*
3130 * Extend the selection to the specified col/row 3289 * Extend the selection to the specified col/row
3131 */ 3290 */
3132void 3291void
3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3292rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3134{ 3293{
3135 row_col_t pos; 3294 row_col_t pos;
3136 enum { 3295 enum {
3137 LEFT, RIGHT 3296 LEFT, RIGHT
3138 } closeto = RIGHT; 3297 } closeto = RIGHT;
… …
3170 selection.beg.col = selection.end.col = selection.mark.col; 3329 selection.beg.col = selection.end.col = selection.mark.col;
3171 selection.beg.row = selection.end.row = selection.mark.row; 3330 selection.beg.row = selection.end.row = selection.mark.row;
3172 } 3331 }
3173 3332
3174 pos.col = col; 3333 pos.col = col;
3175 pos.row = row - view_start; 3334 pos.row = view_start + row;
3176 3335
3177 /* 3336 /*
3178 * This is mainly xterm style selection with a couple of differences, mainly 3337 * This is mainly xterm style selection with a couple of differences, mainly
3179 * in the way button3 drag extension works. 3338 * in the way button3 drag extension works.
3180 * We're either doing: button1 drag; button3 press; or button3 drag 3339 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3241 3400
3242 if (selection.clicks == 1) 3401 if (selection.clicks == 1)
3243 { 3402 {
3244 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3403 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3245 && !ROW(selection.beg.row).is_longer () 3404 && !ROW(selection.beg.row).is_longer ()
3246#if ENABLE_FRILLS 3405#if !ENABLE_MINIMAL
3247 && !selection.rect 3406 && !selection.rect
3248#endif 3407#endif
3249 ) 3408 )
3250 selection.beg.col = ncol; 3409 selection.beg.col = ncol;
3251 3410
3252 if ( 3411 if (
3253 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3412 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3254 && !ROW(selection.end.row).is_longer () 3413 && !ROW(selection.end.row).is_longer ()
3255#if ENABLE_FRILLS 3414#if !ENABLE_MINIMAL
3256 && !selection.rect 3415 && !selection.rect
3257#endif 3416#endif
3258 ) 3417 )
3259 selection.end.col = ncol; 3418 selection.end.col = ncol;
3260 } 3419 }
… …
3267 selection_delimit_word (DN, &selection.end, &selection.end); 3426 selection_delimit_word (DN, &selection.end, &selection.end);
3268 } 3427 }
3269 else if (selection.clicks == 3) 3428 else if (selection.clicks == 3)
3270 { 3429 {
3271#if ENABLE_FRILLS 3430#if ENABLE_FRILLS
3272 if (options & Opt_tripleclickwords) 3431 if (option (Opt_tripleclickwords))
3273 { 3432 {
3274 selection_delimit_word (UP, &selection.beg, &selection.beg); 3433 selection_delimit_word (UP, &selection.beg, &selection.beg);
3275 3434
3276 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3435 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3277 { 3436 {
3278 if (!ROW(end_row).is_longer ()) 3437 if (!ROW(end_row).is_longer ())
3279 { 3438 {
3280 selection.end.row = end_row; 3439 selection.end.row = end_row;
3281 selection.end.col = ROW(end_row).l; 3440 selection.end.col = ROW(end_row).l;
3441# if !ENABLE_MINIMAL
3282 selection_remove_trailing_spaces (); 3442 selection_remove_trailing_spaces ();
3443# endif
3283 break; 3444 break;
3284 } 3445 }
3285 } 3446 }
3286 } 3447 }
3287 else 3448 else
… …
3316 selection.mark.row = selection.beg.row; 3477 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3478 selection.mark.col = selection.beg.col;
3318 } 3479 }
3319 } 3480 }
3320 3481
3321#if ENABLE_FRILLS 3482#if !ENABLE_MINIMAL
3322 if (selection.rect && selection.beg.col > selection.end.col) 3483 if (selection.rect && selection.beg.col > selection.end.col)
3323 ::swap (selection.beg.col, selection.end.col); 3484 ::swap (selection.beg.col, selection.end.col);
3324#endif 3485#endif
3325} 3486}
3326 3487
3327#if ENABLE_FRILLS 3488#if !ENABLE_MINIMAL
3328void 3489void
3329rxvt_term::selection_remove_trailing_spaces () 3490rxvt_term::selection_remove_trailing_spaces () NOTHROW
3330{ 3491{
3331 int32_t end_col, end_row; 3492 int32_t end_col, end_row;
3332 text_t *stp; 3493 text_t *stp;
3333 3494
3334 end_col = selection.end.col; 3495 end_col = selection.end.col;
… …
3338 { 3499 {
3339 stp = ROW(end_row).t; 3500 stp = ROW(end_row).t;
3340 3501
3341 while (--end_col >= 0) 3502 while (--end_col >= 0)
3342 { 3503 {
3343 if (stp[end_col] != ' ' 3504 if (stp[end_col] != NOCHAR
3344 && stp[end_col] != '\t' 3505 && !unicode::is_space (stp[end_col]))
3345 && stp[end_col] != NOCHAR)
3346 break; 3506 break;
3347 } 3507 }
3348 3508
3349 if (end_col >= 0 3509 if (end_col >= 0
3350 || !ROW(end_row - 1).is_longer ()) 3510 || !ROW(end_row - 1).is_longer ())
… …
3373/* 3533/*
3374 * Double click on button 3 when already selected 3534 * Double click on button 3 when already selected
3375 * EXT: button 3 double click 3535 * EXT: button 3 double click
3376 */ 3536 */
3377void 3537void
3378rxvt_term::selection_rotate (int x, int y) 3538rxvt_term::selection_rotate (int x, int y) NOTHROW
3379{ 3539{
3380 selection.clicks = selection.clicks % 3 + 1; 3540 selection.clicks = selection.clicks % 3 + 1;
3381 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3541 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3382} 3542}
3383 3543
… …
3385/* 3545/*
3386 * Respond to a request for our current selection 3546 * Respond to a request for our current selection
3387 * EXT: SelectionRequest 3547 * EXT: SelectionRequest
3388 */ 3548 */
3389void 3549void
3390rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3550rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3391{ 3551{
3392 XSelectionEvent ev; 3552 XSelectionEvent ev;
3393 dDisp;
3394 3553
3395 ev.type = SelectionNotify; 3554 ev.type = SelectionNotify;
3396 ev.property = None; 3555 ev.property = None;
3397 ev.display = rq.display; 3556 ev.display = rq.display;
3398 ev.requestor = rq.requestor; 3557 ev.requestor = rq.requestor;
… …
3412 *target++ = xa[XA_COMPOUND_TEXT]; 3571 *target++ = xa[XA_COMPOUND_TEXT];
3413#if X_HAVE_UTF8_STRING 3572#if X_HAVE_UTF8_STRING
3414 *target++ = xa[XA_UTF8_STRING]; 3573 *target++ = xa[XA_UTF8_STRING];
3415#endif 3574#endif
3416 3575
3417 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3576 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3418 32, PropModeReplace, 3577 32, PropModeReplace,
3419 (unsigned char *)target_list, target - target_list); 3578 (unsigned char *)target_list, target - target_list);
3420 ev.property = rq.property; 3579 ev.property = rq.property;
3421 } 3580 }
3422#if TODO // TODO 3581#if TODO // TODO
… …
3425 /* TODO: Handle MULTIPLE */ 3584 /* TODO: Handle MULTIPLE */
3426 } 3585 }
3427#endif 3586#endif
3428 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3429 { 3588 {
3430 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3589 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3431 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3590 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3432 ev.property = rq.property; 3591 ev.property = rq.property;
3433 } 3592 }
3434 else if (rq.target == XA_STRING 3593 else if (rq.target == XA_STRING
3435 || rq.target == xa[XA_TEXT] 3594 || rq.target == xa[XA_TEXT]
… …
3459 style = enc_string; 3618 style = enc_string;
3460 else if (target == xa[XA_TEXT]) 3619 else if (target == xa[XA_TEXT])
3461 style = enc_text; 3620 style = enc_text;
3462 else if (target == xa[XA_COMPOUND_TEXT]) 3621 else if (target == xa[XA_COMPOUND_TEXT])
3463 style = enc_compound_text; 3622 style = enc_compound_text;
3464#if ENABLE_FRILLS 3623#if !ENABLE_MINIMAL
3465 else if (target == xa[XA_UTF8_STRING]) 3624 else if (target == xa[XA_UTF8_STRING])
3466 style = enc_utf8; 3625 style = enc_utf8;
3467#endif 3626#endif
3468 else 3627 else
3469 { 3628 {
… …
3480 { 3639 {
3481 cl = L""; 3640 cl = L"";
3482 selectlen = 0; 3641 selectlen = 0;
3483 } 3642 }
3484 3643
3485#if ENABLE_FRILLS 3644#if !ENABLE_MINIMAL
3486 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3645 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3487 // so recode it manually 3646 // so recode it manually
3488 if (style == enc_utf8) 3647 if (style == enc_utf8)
3489 { 3648 {
3490 freect = 1; 3649 freect = 1;
… …
3493 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3652 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3494 ct.nitems = strlen ((char *)ct.value); 3653 ct.nitems = strlen ((char *)ct.value);
3495 } 3654 }
3496 else 3655 else
3497#endif 3656#endif
3498 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3657 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3499 freect = 1; 3658 freect = 1;
3500 else 3659 else
3501 { 3660 {
3502 /* if we failed to convert then send it raw */ 3661 /* if we failed to convert then send it raw */
3503 ct.value = (unsigned char *)cl; 3662 ct.value = (unsigned char *)cl;
3504 ct.nitems = selectlen; 3663 ct.nitems = selectlen;
3505 ct.encoding = target; 3664 ct.encoding = target;
3506 } 3665 }
3507 3666
3508 XChangeProperty (disp, rq.requestor, rq.property, 3667 XChangeProperty (dpy, rq.requestor, rq.property,
3509 ct.encoding, 8, PropModeReplace, 3668 ct.encoding, 8, PropModeReplace,
3510 ct.value, (int)ct.nitems); 3669 ct.value, (int)ct.nitems);
3511 ev.property = rq.property; 3670 ev.property = rq.property;
3512 3671
3513 if (freect) 3672 if (freect)
3514 XFree (ct.value); 3673 XFree (ct.value);
3515 } 3674 }
3516 3675
3517 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3676 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3518} 3677}
3519 3678
3520/* ------------------------------------------------------------------------- * 3679/* ------------------------------------------------------------------------- *
3521 * MOUSE ROUTINES * 3680 * MOUSE ROUTINES *
3522 * ------------------------------------------------------------------------- */ 3681 * ------------------------------------------------------------------------- */
3523 3682
3524/* 3683/*
3525 * return col/row values corresponding to x/y pixel values 3684 * return col/row values corresponding to x/y pixel values
3526 */ 3685 */
3527void 3686void
3528rxvt_term::pixel_position (int *x, int *y) 3687rxvt_term::pixel_position (int *x, int *y) NOTHROW
3529{ 3688{
3530 *x = Pixel2Col (*x); 3689 *x = Pixel2Col (*x);
3531 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3690 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3532 *y = Pixel2Row (*y); 3691 *y = Pixel2Row (*y);
3533 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3692 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3534} 3693}
3535 3694
3536/* ------------------------------------------------------------------------- */ 3695/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3696#ifdef USE_XIM
3538void 3697void
3539rxvt_term::im_set_position (XPoint &pos) 3698rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3699{
3541 XWindowAttributes xwa; 3700 XWindowAttributes xwa;
3542 3701
3543 XGetWindowAttributes (display->display, vt, &xwa); 3702 XGetWindowAttributes (dpy, vt, &xwa);
3544 3703
3545 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3704 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3546 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3705 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3547} 3706}
3548#endif 3707#endif
3549 3708
3550#if ENABLE_OVERLAY 3709#if ENABLE_OVERLAY
3551void 3710void
3552rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3711rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3553{ 3712{
3554 if (nrow < 3 || ncol < 3) 3713 if (nrow < 1 || ncol < 1)
3555 return; 3714 return;
3556 3715
3557 want_refresh = 1; 3716 want_refresh = 1;
3558 3717
3559 scr_overlay_off (); 3718 scr_overlay_off ();
… …
3602 *rp = r; 3761 *rp = r;
3603 } 3762 }
3604} 3763}
3605 3764
3606void 3765void
3607rxvt_term::scr_overlay_off () 3766rxvt_term::scr_overlay_off () NOTHROW
3608{ 3767{
3609 if (!ov_text) 3768 if (!ov_text)
3610 return; 3769 return;
3611 3770
3612 want_refresh = 1; 3771 want_refresh = 1;
… …
3620 delete [] ov_text; ov_text = 0; 3779 delete [] ov_text; ov_text = 0;
3621 delete [] ov_rend; ov_rend = 0; 3780 delete [] ov_rend; ov_rend = 0;
3622} 3781}
3623 3782
3624void 3783void
3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3784rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3626{ 3785{
3627 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3786 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3628 return; 3787 return;
3629 3788
3630 x++, y++; 3789 x++, y++;
… …
3632 ov_text[y][x] = text; 3791 ov_text[y][x] = text;
3633 ov_rend[y][x] = rend; 3792 ov_rend[y][x] = rend;
3634} 3793}
3635 3794
3636void 3795void
3637rxvt_term::scr_overlay_set (int x, int y, const char *s) 3796rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3638{ 3797{
3639 while (*s) 3798 while (*s)
3640 scr_overlay_set (x++, y, *s++); 3799 scr_overlay_set (x++, y, *s++);
3641} 3800}
3642 3801
3643void 3802void
3644rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3803rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3645{ 3804{
3646 while (*s) 3805 while (*s)
3647 { 3806 {
3648 text_t t = *s++; 3807 text_t t = *s++;
3649 int width = wcwidth (t); 3808 int width = WCWIDTH (t);
3650 3809
3651 while (width--) 3810 while (width--)
3652 { 3811 {
3653 scr_overlay_set (x++, y, t); 3812 scr_overlay_set (x++, y, t);
3654 t = NOCHAR; 3813 t = NOCHAR;
3655 } 3814 }
3656 } 3815 }
3657} 3816}
3658 3817
3659void 3818void
3660rxvt_term::scr_swap_overlay () 3819rxvt_term::scr_swap_overlay () NOTHROW
3661{ 3820{
3662 if (!ov_text) 3821 if (!ov_text)
3663 return; 3822 return;
3664 3823
3665 // swap screen mem with overlay 3824 // swap screen mem with overlay
3666 for (int y = ov_h; y--; ) 3825 for (int y = ov_h; y--; )
3667 { 3826 {
3668 text_t *t1 = ov_text[y]; 3827 text_t *t1 = ov_text[y];
3669 rend_t *r1 = ov_rend[y]; 3828 rend_t *r1 = ov_rend[y];
3670 3829
3671 text_t *t2 = ROW(y - view_start).t + ov_x; 3830 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3672 rend_t *r2 = ROW(y - view_start).r + ov_x; 3831 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3673 3832
3674 for (int x = ov_w; x--; ) 3833 for (int x = ov_w; x--; )
3675 { 3834 {
3676 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3835 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3677 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3836 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