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.192 by root, Thu Dec 22 19:25:58 2005 UTC vs.
Revision 1.282 by ayin, Wed Oct 31 10:06:42 2007 UTC

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