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