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

Diff Legend

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