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

Diff Legend

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