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.187 by root, Wed Dec 21 23:57:12 2005 UTC vs.
Revision 1.297 by root, Wed Jan 9 01:14:29 2008 UTC

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

Diff Legend

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