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