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