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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC

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

Diff Legend

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