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