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

Diff Legend

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