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.358 by sf-exg, Tue Jan 4 18:22:11 2011 UTC

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

Diff Legend

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