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.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.375 by root, Mon Feb 21 07:12:03 2011 UTC

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

Diff Legend

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