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.209 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC

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

Diff Legend

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