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.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.298 by ayin, Sun Jan 20 14:12:39 2008 UTC

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