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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.396 by root, Wed Nov 2 10:53:12 2011 UTC

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

Diff Legend

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