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