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