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.199 by root, Tue Dec 27 01:46:06 2005 UTC vs.
Revision 1.292 by root, Sun Dec 23 02:43:55 2007 UTC

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