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