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

Diff Legend

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