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.206 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC

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