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