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