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

Diff Legend

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