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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines