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

Diff Legend

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