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

Diff Legend

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