ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.324 by root, Wed Nov 5 00:01:01 2008 UTC

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