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

Diff Legend

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