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

Diff Legend

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