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

Diff Legend

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