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.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.299 by root, Wed Jan 23 06:49:30 2008 UTC

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