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