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

Diff Legend

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