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

Diff Legend

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