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.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.301 by ayin, Tue Jan 29 13:57:23 2008 UTC

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