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