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

Diff Legend

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