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.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.308 by root, Tue Jul 15 16:41:22 2008 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines