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

Diff Legend

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