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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.297 by root, Wed Jan 9 01:14:29 2008 UTC

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

Diff Legend

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