ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.348 by sf-exg, Sat Oct 9 22:33:45 2010 UTC

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

Diff Legend

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