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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 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] = LINE_CONT1;
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->is_longer ()) /* 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->is_longer ()) /* 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->set_is_longer ();
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].is_longer ()) 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->is_longer ()) /* 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.is_longer ()) /* 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)
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) 1139 l.touch ();
1174 return; /* um, yeah? */ 1140 l.is_longer (0);
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol;
1178 1141
1179 scr_gotorc (0, 0, R_RELATIVE); 1142 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1143 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1144 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1145 }
… …
1186/* ------------------------------------------------------------------------- */ 1149/* ------------------------------------------------------------------------- */
1187/* 1150/*
1188 * Goto Row/Column 1151 * Goto Row/Column
1189 */ 1152 */
1190void 1153void
1191rxvt_term::scr_gotorc (int row, int col, int relative) 1154rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1192{ 1155{
1193 want_refresh = 1; 1156 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1157 ZERO_SCROLLBACK ();
1195 1158
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1159 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1160 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1161
1200 screen.flags &= ~Screen_WrapNext; 1162 screen.flags &= ~Screen_WrapNext;
1201 1163
1202 if (relative & R_RELATIVE) 1164 if (relative & R_RELATIVE)
1203 { 1165 {
… …
1219 } 1181 }
1220 } 1182 }
1221 else 1183 else
1222 { 1184 {
1223 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1224 { /* relative origin mode */ 1187 /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1227 } 1190 }
1228 else 1191 else
1229 screen.cur.row = row; 1192 screen.cur.row = row;
1230 } 1193 }
1231 1194
1232 MAX_IT (screen.cur.row, 0); 1195 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1196}
1235 1197
1236/* ------------------------------------------------------------------------- */ 1198/* ------------------------------------------------------------------------- */
1237/* 1199/*
1238 * direction should be UP or DN 1200 * direction should be UP or DN
1239 */ 1201 */
1240void 1202void
1241rxvt_term::scr_index (enum page_dirn direction) 1203rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1242{ 1204{
1243 int dirn; 1205 int dirn;
1244 1206
1245 want_refresh = 1; 1207 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1208 ZERO_SCROLLBACK ();
… …
1249 1211
1250 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1251 1213
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1214 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1215 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1216 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1217 else
1256 screen.cur.row += dirn; 1218 screen.cur.row += dirn;
1257 1219
1258 MAX_IT (screen.cur.row, 0); 1220 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1221 selection_check (0);
1261} 1222}
1262 1223
1263/* ------------------------------------------------------------------------- */ 1224/* ------------------------------------------------------------------------- */
1264/* 1225/*
1265 * Erase part or whole of a line 1226 * Erase part or whole of a line
1266 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1269 */ 1231 */
1270void 1232void
1271rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1272{ 1234{
1273 unsigned int row, col, num; 1235 unsigned int col, num;
1274 1236
1275 want_refresh = 1; 1237 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
1277 1239
1278 selection_check (1); 1240 selection_check (1);
1279 1241
1280 row = saveLines + screen.cur.row; 1242 line_t &line = ROW(screen.cur.row);
1243
1244 line.touch ();
1245 line.is_longer (0);
1281 1246
1282 switch (mode) 1247 switch (mode)
1283 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1284 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1256 col = screen.cur.col;
1286 num = ncol - col; 1257 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1258 min_it (line.l, col);
1259
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1291 break; 1263 break;
1264
1292 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1293 col = 0; 1266 col = 0;
1294 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1295 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1297 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1298 break; 1272 break;
1273
1299 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1300 col = 0; 1275 col = 0;
1301 num = ncol; 1276 num = ncol;
1302 save[row].l = 0; 1277 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1279 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1306 break; 1281 break;
1307 default: 1282 default:
1308 return; 1283 return;
1309 } 1284 }
1310 1285
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1286 scr_blank_line (line, col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1287}
1316 1288
1317/* ------------------------------------------------------------------------- */ 1289/* ------------------------------------------------------------------------- */
1318/* 1290/*
1319 * Erase part of whole of the screen 1291 * Erase part of whole of the screen
1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1323 */ 1295 */
1324void 1296void
1325rxvt_term::scr_erase_screen (int mode) 1297rxvt_term::scr_erase_screen (int mode) NOTHROW
1326{ 1298{
1327 int num; 1299 int num;
1328 int32_t row, row_offset; 1300 int32_t row;
1329 rend_t ren; 1301 rend_t ren;
1330 XGCValues gcvalue; 1302 XGCValues gcvalue;
1331 1303
1332 want_refresh = 1; 1304 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1305 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1306
1337 switch (mode) 1307 switch (mode)
1338 { 1308 {
1339 case 0: /* erase to end of screen */ 1309 case 0: /* erase to end of screen */
1340 selection_check (1); 1310 selection_check (1);
… …
1364 CLEAR_SELECTION (); 1334 CLEAR_SELECTION ();
1365 1335
1366 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1367 return; 1337 return;
1368 1338
1369 MIN_IT (num, (nrow - row)); 1339 min_it (num, nrow - row);
1370 1340
1371 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1344 {
… …
1376 CLEAR_ROWS (row, num); 1346 CLEAR_ROWS (row, num);
1377 } 1347 }
1378 else 1348 else
1379 { 1349 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1350 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1352 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1353 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1354 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 } 1356 }
1387 1357
1388 for (; num--; row++) 1358 for (; num--; row++)
1389 { 1359 {
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1360 scr_blank_screen_mem (ROW(row), rstyle);
1391 save[row + row_offset].l = 0;
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1361 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1362 }
1394} 1363}
1395 1364
1396#if ENABLE_FRILLS 1365#if !ENABLE_MINIMAL
1397void 1366void
1398rxvt_term::scr_erase_savelines () 1367rxvt_term::scr_erase_savelines () NOTHROW
1399{ 1368{
1400 want_refresh = 1; 1369 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1370 ZERO_SCROLLBACK ();
1402 1371
1403 nscrolled = 0; 1372 top_row = 0;
1404} 1373}
1405#endif 1374#endif
1406 1375
1407/* ------------------------------------------------------------------------- */ 1376/* ------------------------------------------------------------------------- */
1408/* 1377/*
1409 * Fill the screen with `E's 1378 * Fill the screen with `E's
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1379 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1380 */
1412void 1381void
1413rxvt_term::scr_E () 1382rxvt_term::scr_E () NOTHROW
1414{ 1383{
1415 int i, j, k;
1416 rend_t *r1, fs; 1384 rend_t fs;
1417 1385
1418 want_refresh = 1; 1386 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1387 ZERO_SCROLLBACK ();
1420 1388
1421 num_scr_allow = 0; 1389 num_scr_allow = 0;
1422 selection_check (3); 1390 selection_check (3);
1423 1391
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1392 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1393 for (int row = nrow; row--; )
1426 { 1394 {
1427 line_t &line = save[k]; 1395 line_t &line = ROW(row);
1428 1396
1429 fill_text (line.t, 'E', ncol); 1397 fill_text (line.t, 'E', ncol);
1398 rend_t *r1 = line.r;
1430 1399
1431 for (r1 = line.r, j = ncol; j--; ) 1400 for (int j = ncol; j--; )
1432 *r1++ = fs; 1401 *r1++ = fs;
1433 1402
1434 line.l = ncol; /* make the `E's selectable */ 1403 line.is_longer (0);
1404 line.touch (ncol);
1435 } 1405 }
1436} 1406}
1437 1407
1438/* ------------------------------------------------------------------------- */ 1408/* ------------------------------------------------------------------------- */
1439/* 1409/*
1440 * Insert/Delete <count> lines 1410 * Insert/Delete <count> lines
1441 */ 1411 */
1442void 1412void
1443rxvt_term::scr_insdel_lines (int count, int insdel) 1413rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1444{ 1414{
1445 int end; 1415 int end;
1446 1416
1447 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1448 1418
… …
1460 count = end; 1430 count = end;
1461 } 1431 }
1462 1432
1463 scr_do_wrap (); 1433 scr_do_wrap ();
1464 1434
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1435 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1436}
1467 1437
1468/* ------------------------------------------------------------------------- */ 1438/* ------------------------------------------------------------------------- */
1469/* 1439/*
1470 * Insert/Delete <count> characters from the current position 1440 * Insert/Delete <count> characters from the current position
1471 */ 1441 */
1472void 1442void
1473rxvt_term::scr_insdel_chars (int count, int insdel) 1443rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1474{ 1444{
1475 int col, row; 1445 int col, row;
1476 rend_t tr; 1446 rend_t tr;
1477 1447
1478 want_refresh = 1; 1448 want_refresh = 1;
… …
1482 return; 1452 return;
1483 1453
1484 scr_do_wrap (); 1454 scr_do_wrap ();
1485 1455
1486 selection_check (1); 1456 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1457 min_it (count, ncol - screen.cur.col);
1488 1458
1489 row = screen.cur.row + saveLines; 1459 row = screen.cur.row;
1490 1460
1491 line_t *line = save + row; 1461 line_t *line = &ROW(row);
1462
1463 line->touch ();
1464 line->is_longer (0);
1492 1465
1493 switch (insdel) 1466 switch (insdel)
1494 { 1467 {
1495 case INSERT: 1468 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1469 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1470 {
1498 line->t[col] = line->t[col - count]; 1471 line->t[col] = line->t[col - count];
1499 line->r[col] = line->r[col - count]; 1472 line->r[col] = line->r[col - count];
1500 } 1473 }
1501 1474
1502 if (!line->is_longer ()) 1475 line->l = min (line->l + count, ncol);
1503 {
1504 line->l += count;
1505 MIN_IT (line->l, ncol);
1506 }
1507 1476
1508 if (selection.op && current_screen == selection.screen 1477 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1478 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1479 {
1511 if (selection.end.row != screen.cur.row 1480 if (selection.end.row != screen.cur.row
1512 || (selection.end.col + count >= ncol)) 1481 || (selection.end.col + count >= ncol))
1513 CLEAR_SELECTION (); 1482 CLEAR_SELECTION ();
1514 else 1483 else
1484 {
1515 { /* shift selection */ 1485 /* shift selection */
1516 selection.beg.col += count; 1486 selection.beg.col += count;
1517 selection.mark.col += count; /* XXX: yes? */ 1487 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1488 selection.end.col += count;
1519 } 1489 }
1520 } 1490 }
1521 1491
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1492 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1493 break;
1524 1494
1525 case ERASE: 1495 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1496 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1497 selection_check (1);
1528 screen.cur.col -= count; 1498 screen.cur.col -= count;
1499
1500 line->l = max (line->l - count, 0);
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1501 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1502 break;
1531 1503
1532 case DELETE: 1504 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1505 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534 1506
… …
1536 { 1508 {
1537 line->t[col] = line->t[col + count]; 1509 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1510 line->r[col] = line->r[col + count];
1539 } 1511 }
1540 1512
1513 line->l = max (line->l - count, 0);
1541 scr_blank_line (*line, ncol - count, count, tr); 1514 scr_blank_line (*line, ncol - count, count, tr);
1542
1543 if (line->is_longer ()) /* break line continuation */
1544 line->l = ncol;
1545
1546 line->l -= count;
1547 MAX_IT (line->l, 0);
1548 1515
1549 if (selection.op && current_screen == selection.screen 1516 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1517 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1518 {
1552 if (selection.end.row != screen.cur.row 1519 if (selection.end.row != screen.cur.row
… …
1570/* 1537/*
1571 * Set the scrolling region 1538 * Set the scrolling region
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1539 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1540 */
1574void 1541void
1575rxvt_term::scr_scroll_region (int top, int bot) 1542rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1576{ 1543{
1577 MAX_IT (top, 0); 1544 max_it (top, 0);
1578 MIN_IT (bot, (int)nrow - 1); 1545 min_it (bot, nrow - 1);
1579 1546
1580 if (top > bot) 1547 if (top > bot)
1581 return; 1548 return;
1582 1549
1583 screen.tscroll = top; 1550 screen.tscroll = top;
… …
1590 * Make the cursor visible/invisible 1557 * Make the cursor visible/invisible
1591 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1558 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1592 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1559 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1593 */ 1560 */
1594void 1561void
1595rxvt_term::scr_cursor_visible (int mode) 1562rxvt_term::scr_cursor_visible (int mode) NOTHROW
1596{ 1563{
1597 want_refresh = 1; 1564 want_refresh = 1;
1598 1565
1599 if (mode) 1566 if (mode)
1600 screen.flags |= Screen_VisibleCursor; 1567 screen.flags |= Screen_VisibleCursor;
… …
1607 * Set/unset automatic wrapping 1574 * Set/unset automatic wrapping
1608 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1575 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1609 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1576 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1610 */ 1577 */
1611void 1578void
1612rxvt_term::scr_autowrap (int mode) 1579rxvt_term::scr_autowrap (int mode) NOTHROW
1613{ 1580{
1614 if (mode) 1581 if (mode)
1615 screen.flags |= Screen_Autowrap; 1582 screen.flags |= Screen_Autowrap;
1616 else 1583 else
1617 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1584 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1626 * and the cursor cannot be moved outside. 1593 * and the cursor cannot be moved outside.
1627 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1594 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1628 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1595 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1629 */ 1596 */
1630void 1597void
1631rxvt_term::scr_relative_origin (int mode) 1598rxvt_term::scr_relative_origin (int mode) NOTHROW
1632{ 1599{
1633 if (mode) 1600 if (mode)
1634 screen.flags |= Screen_Relative; 1601 screen.flags |= Screen_Relative;
1635 else 1602 else
1636 screen.flags &= ~Screen_Relative; 1603 screen.flags &= ~Screen_Relative;
… …
1643 * Set insert/replace mode 1610 * Set insert/replace mode
1644 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1611 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1645 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1612 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1646 */ 1613 */
1647void 1614void
1648rxvt_term::scr_insert_mode (int mode) 1615rxvt_term::scr_insert_mode (int mode) NOTHROW
1649{ 1616{
1650 if (mode) 1617 if (mode)
1651 screen.flags |= Screen_Insert; 1618 screen.flags |= Screen_Insert;
1652 else 1619 else
1653 screen.flags &= ~Screen_Insert; 1620 screen.flags &= ~Screen_Insert;
… …
1659 * XTERM_SEQ: Set tab at current column : ESC H 1626 * XTERM_SEQ: Set tab at current column : ESC H
1660 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1627 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1661 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1628 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1662 */ 1629 */
1663void 1630void
1664rxvt_term::scr_set_tab (int mode) 1631rxvt_term::scr_set_tab (int mode) NOTHROW
1665{ 1632{
1666 if (mode < 0) 1633 if (mode < 0)
1667 memset (tabs, 0, ncol * sizeof (char)); 1634 memset (tabs, 0, ncol);
1668 else if (screen.cur.col < ncol) 1635 else if (screen.cur.col < ncol)
1669 tabs[screen.cur.col] = (mode ? 1 : 0); 1636 tabs [screen.cur.col] = !!mode;
1670} 1637}
1671 1638
1672/* ------------------------------------------------------------------------- */ 1639/* ------------------------------------------------------------------------- */
1673/* 1640/*
1674 * Set reverse/normal video 1641 * Set reverse/normal video
1675 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1642 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1676 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1643 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1677 */ 1644 */
1678void 1645void
1679rxvt_term::scr_rvideo_mode (int mode) 1646rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1680{ 1647{
1681 XGCValues gcvalue; 1648 rvideo_mode = on;
1682 1649
1650#ifndef NO_BELL
1651 on ^= rvideo_bell;
1652#endif
1653
1683 if (rvideo != mode) 1654 if (rvideo_state != on)
1684 { 1655 {
1685 rvideo = mode; 1656 rvideo_state = on;
1657
1686 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#if XPM_BACKGROUND 1659#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1660 if (bgPixmap.pixmap == None)
1689#endif 1661#endif
1690#if TRANSPARENT 1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 if (! (options & Opt_transparent) || am_transparent == 0)
1692#endif
1693 XSetWindowBackground (display->display, vt,
1694 pix_colors[Color_bg]);
1695 1663
1664 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1665 gcvalue.foreground = pix_colors[Color_fg];
1697 gcvalue.background = pix_colors[Color_bg]; 1666 gcvalue.background = pix_colors[Color_bg];
1698 XChangeGC (display->display, gc, GCBackground | GCForeground, 1667 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1699 &gcvalue); 1668
1700 scr_clear (); 1669 scr_clear ();
1701 scr_touch (true); 1670 scr_touch (true);
1702 } 1671 }
1703} 1672}
1704 1673
… …
1706/* 1675/*
1707 * Report current cursor position 1676 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1677 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1678 */
1710void 1679void
1711rxvt_term::scr_report_position () 1680rxvt_term::scr_report_position () NOTHROW
1712{ 1681{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1682 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1683}
1715 1684
1716/* ------------------------------------------------------------------------- * 1685/* ------------------------------------------------------------------------- *
… …
1719 1688
1720/* 1689/*
1721 * Set font style 1690 * Set font style
1722 */ 1691 */
1723void 1692void
1724rxvt_term::set_font_style () 1693rxvt_term::set_font_style () NOTHROW
1725{ 1694{
1695#if 0
1726 switch (charsets[screen.charset]) 1696 switch (charsets [screen.charset])
1727 { 1697 {
1728 case '0': /* DEC Special Character & Line Drawing Set */ 1698 case '0': /* DEC Special Character & Line Drawing Set */
1729 break; 1699 break;
1730 case 'A': /* United Kingdom (UK) */ 1700 case 'A': /* United Kingdom (UK) */
1731 break; 1701 break;
… …
1738 case 'C': /* Finnish character set */ 1708 case 'C': /* Finnish character set */
1739 break; 1709 break;
1740 case 'K': /* German character set */ 1710 case 'K': /* German character set */
1741 break; 1711 break;
1742 } 1712 }
1713#endif
1743} 1714}
1744 1715
1745/* ------------------------------------------------------------------------- */ 1716/* ------------------------------------------------------------------------- */
1746/* 1717/*
1747 * Choose a font 1718 * Choose a font
… …
1749 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1720 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1750 * XTERM_SEQ: Invoke G2 character set: ESC N 1721 * XTERM_SEQ: Invoke G2 character set: ESC N
1751 * XTERM_SEQ: Invoke G3 character set: ESC O 1722 * XTERM_SEQ: Invoke G3 character set: ESC O
1752 */ 1723 */
1753void 1724void
1754rxvt_term::scr_charset_choose (int set) 1725rxvt_term::scr_charset_choose (int set) NOTHROW
1755{ 1726{
1756 screen.charset = set; 1727 screen.charset = set;
1757 set_font_style (); 1728 set_font_style ();
1758} 1729}
1759 1730
… …
1765 * XTERM_SEQ: Set G2 character set: ESC * <C> 1736 * XTERM_SEQ: Set G2 character set: ESC * <C>
1766 * XTERM_SEQ: Set G3 character set: ESC + <C> 1737 * XTERM_SEQ: Set G3 character set: ESC + <C>
1767 * See set_font_style for possible values for <C> 1738 * See set_font_style for possible values for <C>
1768 */ 1739 */
1769void 1740void
1770rxvt_term::scr_charset_set (int set, unsigned int ch) 1741rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1771{ 1742{
1772 charsets[set] = (unsigned char)ch; 1743 charsets[set] = (unsigned char)ch;
1773 set_font_style (); 1744 set_font_style ();
1774} 1745}
1775 1746
… …
1780 1751
1781/* 1752/*
1782 * refresh matching text. 1753 * refresh matching text.
1783 */ 1754 */
1784bool 1755bool
1785rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1756rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1786{ 1757{
1787 bool found = false; 1758 bool found = false;
1788 1759
1789 for (int i = 0; i < nrow; i++) 1760 for (int i = 0; i < nrow; i++)
1790 { 1761 {
1791 int col = 0;
1792 rend_t *drp = drawn[i].r; 1762 rend_t *drp = drawn_buf[i].r;
1793 1763
1794 for (; col < ncol; col++, drp++) 1764 for (int col = 0; col < ncol; col++, drp++)
1795 if ((*drp & mask) == value) 1765 if ((*drp & mask) == value)
1796 { 1766 {
1797 found = true; 1767 found = true;
1798 *drp = ~value; 1768 *drp = ~value;
1799 } 1769 }
… …
1810 PART_END, 1780 PART_END,
1811 RC_COUNT 1781 RC_COUNT
1812}; 1782};
1813 1783
1814void 1784void
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1785rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1786{
1817 int i; 1787 int i;
1818 row_col_t rc[RC_COUNT]; 1788 row_col_t rc[RC_COUNT];
1819 1789
1820 if (!drawn) /* sanity check */ 1790 if (!drawn_buf) /* sanity check */
1821 return; 1791 return;
1822 1792
1823#ifndef NO_SLOW_LINK_SUPPORT 1793#ifndef NO_SLOW_LINK_SUPPORT
1824 if (refresh_type == FAST_REFRESH && !display->is_local) 1794 if (refresh_type == FAST_REFRESH && !display->is_local)
1825 { 1795 {
1826 y = 0; 1796 y = 0;
1827 eheight = height; 1797 eheight = height;
1828 } 1798 }
1829#endif
1830
1831#ifdef DEBUG_STRICT
1832 x = max (x, 0);
1833 x = min (x, (int)width);
1834 y = max (y, 0);
1835 y = min (y, (int)height);
1836#endif 1799#endif
1837 1800
1838 /* round down */ 1801 /* round down */
1839 rc[PART_BEG].col = Pixel2Col (x); 1802 rc[PART_BEG].col = Pixel2Col (x);
1840 rc[PART_BEG].row = Pixel2Row (y); 1803 rc[PART_BEG].row = Pixel2Row (y);
… …
1843 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1806 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844 1807
1845 /* sanity checks */ 1808 /* sanity checks */
1846 for (i = PART_BEG; i < RC_COUNT; i++) 1809 for (i = PART_BEG; i < RC_COUNT; i++)
1847 { 1810 {
1848 MIN_IT (rc[i].col, ncol - 1); 1811 min_it (rc[i].col, ncol - 1);
1849 MIN_IT (rc[i].row, nrow - 1); 1812 min_it (rc[i].row, nrow - 1);
1850 } 1813 }
1851 1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1852 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1853 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1817
1818 num_scr_allow = 0;
1854 1819
1855 if (refresh) 1820 if (refresh)
1856 scr_refresh (SLOW_REFRESH); 1821 scr_refresh ();
1857} 1822}
1858 1823
1859/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1860/* 1825/*
1861 * Refresh the entire screen 1826 * Refresh the entire screen
1862 */ 1827 */
1863void 1828void
1864rxvt_term::scr_touch (bool refresh) 1829rxvt_term::scr_touch (bool refresh) NOTHROW
1865{ 1830{
1866 scr_expose (0, 0, width, height, refresh); 1831 scr_expose (0, 0, width, height, refresh);
1867} 1832}
1868 1833
1869/* ------------------------------------------------------------------------- */ 1834/* ------------------------------------------------------------------------- */
1870/* 1835/*
1871 * Move the display so that the line represented by scrollbar value Y is at 1836 * Move the display so that the line represented by scrollbar value Y is at
1872 * the top of the screen 1837 * the top of the screen
1873 */ 1838 */
1874int 1839void
1875rxvt_term::scr_move_to (int y, int len) 1840rxvt_term::scr_move_to (int y, int len) NOTHROW
1876{ 1841{
1877 long p = 0; 1842 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1878 unsigned int oldviewstart;
1879
1880 oldviewstart = view_start;
1881
1882 if (y < len)
1883 {
1884 p = (nrow + nscrolled) * (len - y) / len;
1885 p -= (long) (nrow - 1);
1886 p = max (p, 0);
1887 }
1888
1889 view_start = (unsigned int)min (p, nscrolled);
1890
1891 return scr_changeview (oldviewstart);
1892} 1843}
1893 1844
1894/* ------------------------------------------------------------------------- */ 1845/* ------------------------------------------------------------------------- */
1895/* 1846/*
1896 * Page the screen up/down nlines 1847 * Page the screen up/down nlines
1897 * direction should be UP or DN 1848 * direction should be UP or DN
1898 */ 1849 */
1899int 1850bool
1900rxvt_term::scr_page (enum page_dirn direction, int nlines) 1851rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1901{ 1852{
1902 int n; 1853 int new_view_start =
1903 unsigned int oldviewstart;
1904
1905 oldviewstart = view_start;
1906
1907 if (direction == UP)
1908 {
1909 n = view_start + nlines;
1910 view_start = min (n, nscrolled);
1911 }
1912 else
1913 {
1914 n = view_start - nlines; 1854 direction == UP ? view_start - nlines
1915 view_start = max (n, 0); 1855 : view_start + nlines;
1916 }
1917 1856
1918 return scr_changeview (oldviewstart); 1857 return scr_changeview (new_view_start);
1919} 1858}
1920 1859
1921int 1860bool
1922rxvt_term::scr_changeview (unsigned int oldviewstart) 1861rxvt_term::scr_changeview (int new_view_start) NOTHROW
1923{ 1862{
1863 clamp_it (new_view_start, top_row, 0);
1864
1924 if (view_start != oldviewstart) 1865 if (new_view_start == view_start)
1925 { 1866 return false;
1867
1868 num_scr += new_view_start - view_start;
1869 view_start = new_view_start;
1926 want_refresh = 1; 1870 want_refresh = 1;
1927 num_scr -= (view_start - oldviewstart);
1928 }
1929 1871
1930 return (int) (view_start - oldviewstart); 1872 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1931}
1932 1873
1933/* ------------------------------------------------------------------------- */ 1874 return true;
1875}
1876
1877#ifndef NO_BELL
1934void 1878void
1879rxvt_term::bell_cb (ev::timer &w, int revents)
1880{
1881 rvideo_bell = false;
1882 scr_rvideo_mode (rvideo_mode);
1883 refresh_check ();
1884}
1885#endif
1886
1887/* ------------------------------------------------------------------------- */
1888void
1935rxvt_term::scr_bell () 1889rxvt_term::scr_bell () NOTHROW
1936{ 1890{
1937#ifndef NO_BELL 1891#ifndef NO_BELL
1938 1892
1939# ifndef NO_MAPALERT 1893# ifndef NO_MAPALERT
1940# ifdef MAPALERT_OPTION 1894# ifdef MAPALERT_OPTION
1941 if (options & Opt_mapAlert) 1895 if (option (Opt_mapAlert))
1942# endif 1896# endif
1943 XMapWindow (display->display, parent[0]); 1897 XMapWindow (dpy, parent[0]);
1944# endif 1898# endif
1945 1899
1900# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell))
1902 {
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif
1910
1946 if (options & Opt_visualBell) 1911 if (option (Opt_visualBell))
1947 { 1912 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1913 rvideo_bell = true;
1914 scr_rvideo_mode (rvideo_mode);
1915 flush ();
1916
1949 rxvt_usleep (VISUAL_BELL_DURATION); 1917 bell_ev.start (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1918 }
1952 else 1919 else
1953 XBell (display->display, 0); 1920 XBell (dpy, 0);
1954
1955#endif 1921#endif
1956} 1922}
1957 1923
1958/* ------------------------------------------------------------------------- */ 1924/* ------------------------------------------------------------------------- */
1959/* ARGSUSED */ 1925/* ARGSUSED */
1960void 1926void
1961rxvt_term::scr_printscreen (int fullhist) 1927rxvt_term::scr_printscreen (int fullhist) NOTHROW
1962{ 1928{
1963#ifdef PRINTPIPE 1929#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1930 int nrows, row_start;
1965 FILE *fd; 1931 FILE *fd;
1966 1932
1967 if ((fd = popen_printer ()) == NULL) 1933 if ((fd = popen_printer ()) == NULL)
1968 return; 1934 return;
1969 1935
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1936 if (fullhist)
1974 row_offset -= view_start; 1937 {
1938 nrows = nrow - top_row;
1939 row_start = top_row;
1940 }
1975 else 1941 else
1976 { 1942 {
1977 nrows += nscrolled; 1943 nrows = nrow;
1978 row_offset -= nscrolled; 1944 row_start = view_start;
1979 } 1945 }
1980 1946
1981 wctomb (0, 0); 1947 wctomb (0, 0);
1982 1948
1983 for (r1 = 0; r1 < nrows; r1++) 1949 for (int r1 = 0; r1 < nrows; r1++)
1984 { 1950 {
1985 text_t *tp = save[r1 + row_offset].t; 1951 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1952 int len = ROW(r1).l;
1987 1953
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1954 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1955 {
1990 char mb[MB_LEN_MAX]; 1956 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1957 text_t t = *tp++;
1992 if (t == NOCHAR) 1958 if (t == NOCHAR)
1993 continue; 1959 continue;
… …
2015 * Refresh the screen 1981 * Refresh the screen
2016 * drawn_text/drawn_rend contain the screen information before the update. 1982 * drawn_text/drawn_rend contain the screen information before the update.
2017 * screen.text/screen.rend contain what the screen will change to. 1983 * screen.text/screen.rend contain what the screen will change to.
2018 */ 1984 */
2019void 1985void
2020rxvt_term::scr_refresh (unsigned char refresh_type) 1986rxvt_term::scr_refresh () NOTHROW
2021{ 1987{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1988 unsigned char have_bg,
2023 showcursor; /* show the cursor */ 1989 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1990 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1991 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1992 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1993#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1994 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1995#endif
2031 rend_t *crp; // cursor rendition pointer 1996 rend_t *crp; // cursor rendition pointer
1997 rend_t ccol1, /* Cursor colour */
1998 ccol2; /* Cursor colour2 */
2032 1999
2033 want_refresh = 0; /* screen is current */ 2000 want_refresh = 0; /* screen is current */
2034 2001
2035 if (refresh_type == NO_REFRESH || !mapped) 2002 if (refresh_type == NO_REFRESH || !mapped)
2036 return; 2003 return;
2037 2004
2038 /* 2005 /*
2039 * A: set up vars 2006 * A: set up vars
2040 */ 2007 */
2041 must_clear = 0;
2042 refresh_count = 0; 2008 refresh_count = 0;
2043 2009
2044 row_offset = saveLines - view_start; 2010 have_bg = 0;
2045 2011#ifdef HAVE_BG_PIXMAP
2046#if XPM_BACKGROUND
2047 must_clear |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
2048#endif
2049#if TRANSPARENT
2050 must_clear |= (options & Opt_transparent) && am_transparent;
2051#endif 2013#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 2015
2054 /* 2016 /*
2055 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
2059 /* 2021 /*
2060 * C: set the cursor character (s) 2022 * C: set the cursor character (s)
2061 */ 2023 */
2062 { 2024 {
2063 unsigned char setoldcursor; 2025 unsigned char setoldcursor;
2064 rend_t ccol1, /* Cursor colour */
2065 ccol2; /* Cursor colour2 */
2066 2026
2067 showcursor = (screen.flags & Screen_VisibleCursor); 2027 showcursor = (screen.flags & Screen_VisibleCursor);
2068#ifdef CURSOR_BLINK 2028#ifdef CURSOR_BLINK
2069 if (hidden_cursor) 2029 if (hidden_cursor)
2070 showcursor = 0; 2030 showcursor = 0;
… …
2072 2032
2073 if (showcursor) 2033 if (showcursor)
2074 { 2034 {
2075 int col = screen.cur.col; 2035 int col = screen.cur.col;
2076 2036
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 2037 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 2038 col--;
2079 2039
2080 crp = &screen.line[screen.cur.row]->r[col]; 2040 crp = &ROW(screen.cur.row).r[col];
2041
2042#ifndef NO_CURSORCOLOR
2043 cc1 = *crp & (RS_fgMask | RS_bgMask);
2044 if (ISSET_PIXCOLOR (Color_cursor))
2045 ccol1 = Color_cursor;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol1 = fgcolor_of (rstyle);
2050#else
2051 ccol1 = Color_fg;
2052#endif
2053
2054#ifndef NO_CURSORCOLOR
2055 if (ISSET_PIXCOLOR (Color_cursor2))
2056 ccol2 = Color_cursor2;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol2 = bgcolor_of (rstyle);
2061#else
2062 ccol2 = Color_bg;
2063#endif
2081 2064
2082 if (showcursor && focus) 2065 if (showcursor && focus)
2083 { 2066 {
2084 if (options & Opt_cursorUnderline) 2067 if (option (Opt_cursorUnderline))
2085 *crp ^= RS_Uline; 2068 *crp ^= RS_Uline;
2086 else 2069 else
2087 { 2070 {
2088 *crp ^= RS_RVid; 2071 *crp ^= RS_RVid;
2089
2090#ifndef NO_CURSORCOLOR
2091 cc1 = *crp & (RS_fgMask | RS_bgMask);
2092 if (ISSET_PIXCOLOR (Color_cursor))
2093 ccol1 = Color_cursor;
2094 else
2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2096 ccol1 = GET_FGCOLOR (rstyle);
2097#else
2098 ccol1 = Color_fg;
2099#endif
2100 if (ISSET_PIXCOLOR (Color_cursor2))
2101 ccol2 = Color_cursor2;
2102 else
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2104 ccol2 = GET_BGCOLOR (rstyle);
2105#else
2106 ccol2 = Color_bg;
2107#endif
2108 *crp = SET_FGCOLOR (*crp, ccol1); 2072 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2073 *crp = SET_BGCOLOR (*crp, ccol2);
2110#endif
2111 } 2074 }
2112 } 2075 }
2113 } 2076 }
2114 2077
2115 /* make sure no outline cursor is left around */ 2078 /* make sure no outline cursor is left around */
2116 setoldcursor = 0; 2079 setoldcursor = 0;
2117 if (ocrow != -1) 2080 if (ocrow != -1)
2118 { 2081 {
2119 if (screen.cur.row + view_start != ocrow 2082 if (screen.cur.row - view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2083 || screen.cur.col != oldcursor.col)
2121 { 2084 {
2122 if (ocrow < nrow 2085 if (ocrow < nrow
2123 && oldcursor.col < ncol) 2086 && oldcursor.col < ncol)
2124 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2087 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2088
2126 if (focus || !showcursor) 2089 if (focus || !showcursor)
2127 oldcursor.row = -1; 2090 oldcursor.row = -1;
2128 else 2091 else
2129 setoldcursor = 1; 2092 setoldcursor = 1;
… …
2132 else if (!focus) 2095 else if (!focus)
2133 setoldcursor = 1; 2096 setoldcursor = 1;
2134 2097
2135 if (setoldcursor) 2098 if (setoldcursor)
2136 { 2099 {
2137 if (screen.cur.row + view_start >= nrow) 2100 if (screen.cur.row - view_start >= nrow)
2138 oldcursor.row = -1; 2101 oldcursor.row = -1;
2139 else 2102 else
2140 { 2103 {
2141 oldcursor.row = screen.cur.row + view_start; 2104 oldcursor.row = screen.cur.row - view_start;
2142 oldcursor.col = screen.cur.col; 2105 oldcursor.col = screen.cur.col;
2143 } 2106 }
2144 } 2107 }
2145 } 2108 }
2146 2109
2110 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2147#if ENABLE_OVERLAY 2111#if ENABLE_OVERLAY
2148 scr_swap_overlay (); 2112 scr_swap_overlay ();
2149#endif 2113#endif
2150 2114
2151#ifndef NO_SLOW_LINK_SUPPORT 2115#ifndef NO_SLOW_LINK_SUPPORT
2152 /* 2116 /*
2153 * D: CopyArea pass - very useful for slower links 2117 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2118 * This has been deliberately kept simple.
2155 */ 2119 */
2156 i = num_scr;
2157 if (!display->is_local 2120 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2121 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2122 && abs (num_scr) < nrow && !have_bg)
2160 { 2123 {
2161 int16_t nits; 2124 int16_t nits;
2125 int i = num_scr;
2162 int j; 2126 int j;
2163 int len, wlen; 2127 int len, wlen;
2128 dLocal (int, num_scr);
2164 2129
2165 j = nrow; 2130 j = nrow;
2166 wlen = len = -1; 2131 wlen = len = -1;
2167 row = i > 0 ? 0 : j - 1; 2132 row = i > 0 ? 0 : j - 1;
2133
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2134 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2135 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2136 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2137 {
2172 line_t s = save[row + row_offset]; 2138 line_t s = ROW(view_start + row);
2173 line_t d = drawn[row]; 2139 line_t d = drawn_buf[row];
2174 line_t d2 = drawn[row + i]; 2140 line_t d2 = drawn_buf[row + i];
2175 2141
2176 for (nits = 0, col = ncol; col--; ) 2142 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2143 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2144 nits--;
2179 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2145 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2193 wlen = row; 2159 wlen = row;
2194 continue; 2160 continue;
2195 } 2161 }
2196 } 2162 }
2197 2163
2198 if (len != -1) 2164 if (len >= 0)
2199 { 2165 {
2200 /* also comes here at end if needed because of >= above */ 2166 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2167 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2168 ::swap (wlen, len);
2203 2169
2170 XGCValues gcv;
2171
2172 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204 XCopyArea (display->display, vt, vt, 2173 XCopyArea (dpy, vt, vt,
2205 gc, 0, Row2Pixel (len + i), 2174 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2175 (unsigned int)this->width,
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2176 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2177 0, Row2Pixel (len));
2178 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2179
2209 len = -1; 2180 len = -1;
2210 } 2181 }
2211 } 2182 }
2212 } 2183 }
2213#endif 2184#endif
… …
2215 /* 2186 /*
2216 * E: main pass across every character 2187 * E: main pass across every character
2217 */ 2188 */
2218 for (row = 0; row < nrow; row++) 2189 for (row = 0; row < nrow; row++)
2219 { 2190 {
2220 text_t *stp = save[row + row_offset].t; 2191 text_t *stp = ROW(view_start + row).t;
2221 rend_t *srp = save[row + row_offset].r; 2192 rend_t *srp = ROW(view_start + row).r;
2222 text_t *dtp = drawn[row].t; 2193 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn[row].r; 2194 rend_t *drp = drawn_buf[row].r;
2224 2195
2225 /* 2196 /*
2226 * E2: OK, now the real pass 2197 * E2: OK, now the real pass
2227 */ 2198 */
2228 int ypixel = (int)Row2Pixel (row); 2199 int ypixel = (int)Row2Pixel (row);
… …
2269 count++; 2240 count++;
2270 2241
2271 if (stp[col] != dtp[col] 2242 if (stp[col] != dtp[col]
2272 || !RS_SAME (srp[col], drp[col])) 2243 || !RS_SAME (srp[col], drp[col]))
2273 { 2244 {
2274 if (must_clear && (i++ > count / 2)) 2245 if (have_bg && (i++ > count / 2))
2275 break; 2246 break;
2276 2247
2277 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2278 drp[col] = rend; 2249 drp[col] = rend;
2279 i = 0; 2250 i = 0;
2280 } 2251 }
2281 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2252 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2282 break; 2253 break;
2283 } 2254 }
2284 2255
2285 col--; /* went one too far. move back */ 2256 col--; /* went one too far. move back */
2286 count -= i; /* dump any matching trailing chars */ 2257 count -= i; /* dump any matching trailing chars */
… …
2290 count++, i--; 2261 count++, i--;
2291 2262
2292 /* 2263 /*
2293 * Determine the attributes for the string 2264 * Determine the attributes for the string
2294 */ 2265 */
2295 int fore = GET_FGCOLOR (rend); // desired foreground 2266 int fore = fgcolor_of (rend); // desired foreground
2296 int back = GET_BGCOLOR (rend); // desired background 2267 int back = bgcolor_of (rend); // desired background
2297 2268
2298 // only do special processing if any attributes are set, which is rare 2269 // only do special processing if any attributes are set, which is unlikely
2299 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2300 { 2271 {
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= fwidth;
2311#endif
2312
2313 bool invert = rend & RS_RVid; 2272 bool invert = rend & RS_RVid;
2314 2273
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2274#ifndef NO_BOLD_UNDERLINE_REVERSE
2316 if (rend & RS_Bold
2317 && fore == Color_fg) 2275 if (rend & RS_Bold && fore == Color_fg)
2318 { 2276 {
2319 if (ISSET_PIXCOLOR (Color_BD)) 2277 if (ISSET_PIXCOLOR (Color_BD))
2320 fore = Color_BD; 2278 fore = Color_BD;
2321# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2322 else 2280 else
2323 invert = !invert; 2281 invert = !invert;
2324# endif 2282# endif
2325 } 2283 }
2326 2284
2327 if (rend & RS_Italic 2285 if (rend & RS_Italic && fore == Color_fg)
2328 && fore == Color_fg)
2329 { 2286 {
2330 if (ISSET_PIXCOLOR (Color_IT)) 2287 if (ISSET_PIXCOLOR (Color_IT))
2331 fore = Color_IT; 2288 fore = Color_IT;
2332# if !ENABLE_STYLES 2289# if !ENABLE_STYLES
2333 else 2290 else
2334 invert = !invert; 2291 invert = !invert;
2335# endif 2292# endif
2336 } 2293 }
2337 2294
2338 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2339 fore = Color_UL; 2296 fore = Color_UL;
2340#endif 2297#endif
2341 2298
2342 if (invert) 2299 if (invert)
2343 { 2300 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2344 SWAP_IT (fore, back, int); 2307 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2345 2312
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2347 if (ISSET_PIXCOLOR (Color_RV)) 2315 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2316 back = Color_RV;
2349 2317# endif
2350 if (fore == back) 2318 if (fore == back)
2351 { 2319 {
2352 fore = Color_bg; 2320 fore = Color_bg;
2353 back = Color_fg; 2321 back = Color_fg;
2354 } 2322 }
… …
2356 } 2324 }
2357 2325
2358#ifdef TEXT_BLINK 2326#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2327 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2360 { 2328 {
2361 if (!text_blink_ev.active) 2329 if (!text_blink_ev.is_active ())
2362 { 2330 {
2363 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2331 text_blink_ev.again ();
2364 hidden_text = 0; 2332 hidden_text = 0;
2365 } 2333 }
2366 else if (hidden_text) 2334 else if (hidden_text)
2367 fore = back; 2335 fore = back;
2368 } 2336 }
2369#endif 2337#endif
2338
2339#if ENABLE_STYLES
2340 // "careful" (too wide) character handling
2341
2342 // include previous careful character(s) if possible, looks nicer (best effort...)
2343 while (text > stp
2344 && srp[text - stp - 1] & RS_Careful
2345 && RS_SAME (rend, srp[text - stp - 1]))
2346 text--, count++, xpixel -= fwidth;
2347
2348 // force redraw after "careful" characters to avoid pixel droppings
2349 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2350 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2351
2352 // force redraw before "careful" characters to avoid pixel droppings
2353 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2354 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2355#endif
2370 } 2356 }
2371 2357
2372 /* 2358 /*
2373 * Actually do the drawing of the string here 2359 * Actually do the drawing of the string here
2374 */ 2360 */
2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376 2362
2377 if (back == fore)
2378 font->clear_rect (*drawable, xpixel, ypixel,
2379 fwidth * count, fheight,
2380 back);
2381 else if (back == Color_bg) 2363 if (have_bg && back == Color_bg)
2382 { 2364 {
2383 if (must_clear) 2365 // this is very ugly, maybe push it into ->draw?
2384 {
2385 CLEAR_CHARS (xpixel, ypixel, count);
2386 2366
2387 for (i = 0; i < count; i++) /* don't draw empty strings */ 2367 for (i = 0; i < count; i++) /* don't draw empty strings */
2388 if (text[i] != ' ') 2368 if (text[i] != ' ')
2389 { 2369 {
2390 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2370 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2391 break; 2371 goto did_clear;
2392 }
2393 } 2372 }
2394 else 2373
2395 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2374 CLEAR_CHARS (xpixel, ypixel, count);
2375 did_clear: ;
2396 } 2376 }
2397 else 2377 else
2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2399 2379
2400 if (rend & RS_Uline && font->descent > 1 && fore != back) 2380 if (rend & RS_Uline && font->descent > 1 && fore != back)
2401 { 2381 {
2402#if ENABLE_FRILLS 2382#if ENABLE_FRILLS
2403 if (ISSET_PIXCOLOR (Color_underline)) 2383 if (ISSET_PIXCOLOR (Color_underline))
2404 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2405 else 2385 else
2406#endif 2386#endif
2407 XSetForeground (display->display, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2408 2388
2409 XDrawLine (display->display, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2410 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2392 }
2413 } /* for (col....) */ 2393 } /* for (col....) */
2414 } /* for (row....) */ 2394 } /* for (row....) */
2415 2395
2416#if ENABLE_OVERLAY 2396#if ENABLE_OVERLAY
2417 scr_swap_overlay (); 2397 scr_swap_overlay ();
2418#endif 2398#endif
2399 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419 2400
2420 /* 2401 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2402 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2403 */
2423 if (showcursor) 2404 if (showcursor)
2424 { 2405 {
2425 if (focus) 2406 if (focus)
2426 { 2407 {
2427 if (options & Opt_cursorUnderline) 2408 if (option (Opt_cursorUnderline))
2428 *crp ^= RS_Uline; 2409 *crp ^= RS_Uline;
2429 else 2410 else
2430 { 2411 {
2431 *crp ^= RS_RVid; 2412 *crp ^= RS_RVid;
2432#ifndef NO_CURSORCOLOR 2413#ifndef NO_CURSORCOLOR
… …
2437 else if (oldcursor.row >= 0) 2418 else if (oldcursor.row >= 0)
2438 { 2419 {
2439 int cursorwidth = 1; 2420 int cursorwidth = 1;
2440 int col = oldcursor.col; 2421 int col = oldcursor.col;
2441 2422
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2423 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2424 col--;
2444 2425
2445 while (col + cursorwidth < ncol 2426 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2427 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2428 cursorwidth++;
2448 2429
2449#ifndef NO_CURSORCOLOR 2430#ifndef NO_CURSORCOLOR
2450 if (ISSET_PIXCOLOR (Color_cursor)) 2431 if (ISSET_PIXCOLOR (Color_cursor))
2451 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2433 else
2452#endif 2434#endif
2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2453 2436
2454 XDrawRectangle (display->display, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2455 Col2Pixel (col), 2438 Col2Pixel (col),
2456 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2457 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2458 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2459 } 2442 }
… …
2462 /* 2445 /*
2463 * H: cleanup selection 2446 * H: cleanup selection
2464 */ 2447 */
2465 scr_reverse_selection (); 2448 scr_reverse_selection ();
2466 2449
2467 if (refresh_type & SMOOTH_REFRESH)
2468 XFlush (display->display);
2469
2470 num_scr = 0; 2450 num_scr = 0;
2471 num_scr_allow = 1; 2451 num_scr_allow = 1;
2472} 2452}
2473 2453
2474void 2454void
2475rxvt_term::scr_remap_chars (const line_t &l) 2455rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2476{ 2456{
2477 if (!l.t) 2457 if (!l.t)
2478 return; 2458 return;
2479 2459
2460 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2461
2480 for (int i = ncol; i--; ) 2462 for (int i = ncol; i--; )
2481 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2482} 2464}
2483 2465
2484void 2466void
2485rxvt_term::scr_remap_chars () 2467rxvt_term::scr_remap_chars () NOTHROW
2486{ 2468{
2487 for (int i = nrow + saveLines; i--; ) 2469 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2470 scr_remap_chars (row_buf [i]);
2489 2471
2490 for (int i = nrow; i--; ) 2472 for (int i = nrow; i--; )
2491 { 2473 {
2492 scr_remap_chars (drawn[i]); 2474 scr_remap_chars (drawn_buf [i]);
2493 scr_remap_chars (swap_save[i]); 2475 scr_remap_chars (swap_buf [i]);
2494 } 2476 }
2495} 2477}
2496 2478
2497void 2479void
2498rxvt_term::scr_recolour () 2480rxvt_term::scr_recolour () NOTHROW
2499{ 2481{
2500 if (1 2482#ifdef HAVE_BG_PIXMAP
2501#if TRANSPARENT 2483 bgPixmap.apply ();
2502 && !am_transparent 2484#else
2503#endif 2485
2504#if XPM_BACKGROUND
2505 && !bgPixmap.pixmap
2506#endif
2507 )
2508 {
2509 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2510 XClearWindow (display->display, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2511 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2512#if HAVE_SCROLLBARS 2489
2513 if (scrollBar.win) 2490 if (scrollBar.win)
2514 { 2491 {
2515 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2516 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2517 scrollbar_show (0); 2494 scrollBar.show (0);
2518 }
2519#endif
2520 } 2495 }
2521 2496
2497#endif
2498
2499 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2500 scr_clear ();
2523 scr_touch (true); 2501 scr_touch (true);
2524 want_refresh = 1; 2502 want_refresh = 1;
2525} 2503}
2526 2504
2527/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2528void 2506void
2529rxvt_term::scr_clear (bool really) 2507rxvt_term::scr_clear (bool really) NOTHROW
2530{ 2508{
2531 if (!mapped) 2509 if (!mapped)
2532 return; 2510 return;
2533 2511
2534 num_scr_allow = 0; 2512 num_scr_allow = 0;
2535 want_refresh = 1; 2513 want_refresh = 1;
2536 2514
2537 if (really) 2515 if (really)
2538 XClearWindow (display->display, vt); 2516 XClearWindow (dpy, vt);
2539} 2517}
2540 2518
2541/* ------------------------------------------------------------------------- */
2542void 2519void
2520rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2521{
2522 int view_end = view_start + nrow;
2523 int row, col;
2524
2525 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2526 {
2527 text_t *stp = ROW(row).t;
2528 rend_t *srp = ROW(row).r;
2529
2530 for (col = beg_col; col < end_col; col++)
2531 srp[col] ^= rstyle1;
2532
2533 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2534 srp[col] ^= rstyle2;
2535
2536 if (++col < end_col)
2537 srp[col] ^= rstyle2;
2538 }
2539}
2540
2541void
2542rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2543{
2544 int view_end = view_start + nrow;
2545 int row, col;
2546
2547 if (beg_row >= view_start)
2548 {
2549 col = beg_col;
2550 row = beg_row;
2551 }
2552 else
2553 {
2554 col = 0;
2555 row = view_start;
2556 }
2557
2558 for (; row < min (end_row, view_end); row++, col = 0)
2559 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2560 srp[col] ^= rstyle;
2561
2562 if (row == end_row)
2563 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2564 srp[col] ^= rstyle;
2565}
2566
2567/* ------------------------------------------------------------------------- */
2568void
2543rxvt_term::scr_reverse_selection () 2569rxvt_term::scr_reverse_selection () NOTHROW
2544{ 2570{
2571 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2572 && current_screen == selection.screen
2573 && selection.end.row >= view_start)
2546 { 2574 {
2547 int end_row = saveLines - view_start; 2575#if !ENABLE_MINIMAL
2548 int i = selection.beg.row + saveLines;
2549 int col, row = selection.end.row + saveLines;
2550 rend_t *srp;
2551
2552#if ENABLE_FRILLS
2553 if (selection.rect) 2576 if (selection.rect)
2554 { 2577 scr_xor_rect (selection.beg.row, selection.beg.col,
2555 end_row += nrow; 2578 selection.end.row, selection.end.col,
2556 2579 RS_RVid, RS_RVid | RS_Uline);
2557 for (; i <= row && i <= end_row; i++)
2558 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
2559 srp[col] ^= RS_RVid;
2560 }
2561 else 2580 else
2562#endif 2581#endif
2563 { 2582 scr_xor_span (selection.beg.row, selection.beg.col,
2564 if (i >= end_row) 2583 selection.end.row, selection.end.col,
2565 col = selection.beg.col; 2584 RS_RVid);
2566 else
2567 {
2568 col = 0;
2569 i = end_row;
2570 }
2571
2572 end_row += nrow;
2573
2574 for (; i < row && i < end_row; i++, col = 0)
2575 for (srp = save[i].r; col < ncol; col++)
2576 srp[col] ^= RS_RVid;
2577
2578 if (i == row && i < end_row)
2579 for (srp = save[i].r; col < selection.end.col; col++)
2580 srp[col] ^= RS_RVid;
2581 }
2582 } 2585 }
2583} 2586}
2584 2587
2585/* ------------------------------------------------------------------------- */ 2588/* ------------------------------------------------------------------------- */
2586/* 2589/*
2587 * Dump the whole scrollback and screen to the passed filedescriptor. The 2590 * Dump the whole scrollback and screen to the passed filedescriptor. The
2588 * invoking routine must close the fd. 2591 * invoking routine must close the fd.
2589 */ 2592 */
2590#if 0 2593#if 0
2591void 2594void
2592rxvt_term::scr_dump (int fd) 2595rxvt_term::scr_dump (int fd) NOTHROW
2593{ 2596{
2594 int row, wrote; 2597 int row, wrote;
2595 unsigned int width, towrite; 2598 unsigned int width, towrite;
2596 char r1[] = "\n"; 2599 char r1[] = "\n";
2597 2600
2598 for (row = saveLines - nscrolled; 2601 for (row = saveLines + top_row;
2599 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2600 { 2603 {
2601 width = save[row].l >= 0 ? save[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2605 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
2604 { 2607 {
2605 wrote = write (fd, & (save[row].t[width - towrite]), 2608 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606 towrite); 2609 towrite);
2607 if (wrote < 0) 2610 if (wrote < 0)
2608 return; /* XXX: death, no report */ 2611 return; /* XXX: death, no report */
2609 } 2612 }
2610 if (save[row].l >= 0) 2613 if (row_buf[row].l >= 0)
2611 if (write (fd, r1, 1) <= 0) 2614 if (write (fd, r1, 1) <= 0)
2612 return; /* XXX: death, no report */ 2615 return; /* XXX: death, no report */
2613 } 2616 }
2614} 2617}
2615#endif 2618#endif
2616 2619
2617/* ------------------------------------------------------------------------- * 2620/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2621 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2622 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2623void
2625rxvt_term::selection_check (int check_more) 2624rxvt_term::selection_check (int check_more) NOTHROW
2626{ 2625{
2627 row_col_t pos; 2626 row_col_t pos;
2628 2627
2629 if (!selection.op) 2628 if (!selection.op)
2630 return; 2629 return;
2631 2630
2632 pos.row = pos.col = 0; 2631 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2632 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2634 || (selection.beg.row >= nrow) 2633 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2634 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2636 || (selection.mark.row >= nrow)
2637 || (selection.end.row < - (int32_t)nscrolled)
2638 || (selection.end.row >= nrow)
2639 || (check_more == 1 2635 || (check_more == 1
2640 && current_screen == selection.screen 2636 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2637 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2638 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2639 || (check_more == 2
… …
2654/* ------------------------------------------------------------------------- */ 2650/* ------------------------------------------------------------------------- */
2655/* 2651/*
2656 * Paste a selection direct to the command fd 2652 * Paste a selection direct to the command fd
2657 */ 2653 */
2658void 2654void
2659rxvt_term::paste (unsigned char *data, unsigned int len) 2655rxvt_term::paste (char *data, unsigned int len) NOTHROW
2660{ 2656{
2661 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2662 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2663 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2664 data[i] = C0_CR; 2660 data[i] = C0_CR;
2665 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2666 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2667} 2669}
2668 2670
2669/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2670/* 2672/*
2671 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent
2672 * EXT: SelectionNotify 2674 * EXT: SelectionNotify
2673 */ 2675 */
2674void 2676void
2675rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2676{ 2678{
2677 if (prop == None) /* check for failed XConvertSelection */ 2679 if (prop == None) /* check for failed XConvertSelection */
2678 { 2680 {
2679 if ((selection_type & Sel_CompoundText)) 2681 if ((selection_type & Sel_CompoundText))
2680 { 2682 {
… …
2700 } 2702 }
2701 2703
2702 unsigned long bytes_after; 2704 unsigned long bytes_after;
2703 XTextProperty ct; 2705 XTextProperty ct;
2704 2706
2705 if (XGetWindowProperty (display->display, win, prop, 2707 if (XGetWindowProperty (dpy, win, prop,
2706 0, PROP_SIZE / 4, 2708 0, PROP_SIZE / 4,
2707 delete_prop, AnyPropertyType, 2709 delete_prop, AnyPropertyType,
2708 &ct.encoding, &ct.format, 2710 &ct.encoding, &ct.format,
2709 &ct.nitems, &bytes_after, 2711 &ct.nitems, &bytes_after,
2710 &ct.value) != Success) 2712 &ct.value) != Success)
… …
2719 if (bytes_after) 2721 if (bytes_after)
2720 { 2722 {
2721 // fetch and append remaining data 2723 // fetch and append remaining data
2722 XTextProperty ct2; 2724 XTextProperty ct2;
2723 2725
2724 if (XGetWindowProperty (display->display, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2725 ct.nitems / 4, (bytes_after + 3) / 4, 2727 ct.nitems / 4, (bytes_after + 3) / 4,
2726 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2727 &ct2.encoding, &ct2.format, 2729 &ct2.encoding, &ct2.format,
2728 &ct2.nitems, &bytes_after, 2730 &ct2.nitems, &bytes_after,
2729 &ct2.value) != Success) 2731 &ct2.value) != Success)
… …
2742 2744
2743 if (ct.encoding == xa[XA_INCR]) 2745 if (ct.encoding == xa[XA_INCR])
2744 { 2746 {
2745 // INCR selection, start handshake 2747 // INCR selection, start handshake
2746 if (!delete_prop) 2748 if (!delete_prop)
2747 XDeleteProperty (display->display, win, prop); 2749 XDeleteProperty (dpy, win, prop);
2748 2750
2749 selection_wait = Sel_incr; 2751 selection_wait = Sel_incr;
2750 incr_buf_fill = 0; 2752 incr_buf_fill = 0;
2751 incr_ev.start (NOW + 10); 2753 incr_ev.start (10);
2752 2754
2753 goto bailout; 2755 goto bailout;
2754 } 2756 }
2755 2757
2756 if (ct.nitems == 0) 2758 if (ct.nitems == 0)
… …
2765 ct.nitems = incr_buf_fill; 2767 ct.nitems = incr_buf_fill;
2766 incr_buf = 0; 2768 incr_buf = 0;
2767 incr_buf_size = 0; 2769 incr_buf_size = 0;
2768 incr_ev.stop (); 2770 incr_ev.stop ();
2769 } 2771 }
2770 else 2772 else
2771 { 2773 {
2772 if (selection_wait == Sel_normal 2774 if (selection_wait == Sel_normal
2773 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2774 { 2776 {
2775 /* 2777 /*
… …
2782 goto bailout; 2784 goto bailout;
2783 } 2785 }
2784 } 2786 }
2785 else if (selection_wait == Sel_incr) 2787 else if (selection_wait == Sel_incr)
2786 { 2788 {
2787 incr_ev.start (NOW + 10); 2789 incr_ev.start (10);
2788 2790
2789 while (incr_buf_fill + ct.nitems > incr_buf_size) 2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2790 { 2792 {
2791 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2792 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2799 } 2801 }
2800 2802
2801 char **cl; 2803 char **cl;
2802 int cr; 2804 int cr;
2803 2805
2804#if ENABLE_FRILLS 2806#if !ENABLE_MINIMAL
2805 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2806 // so recode it manually 2808 // so recode it manually
2807 if (ct.encoding == xa[XA_UTF8_STRING]) 2809 if (ct.encoding == xa[XA_UTF8_STRING])
2808 { 2810 {
2809 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2810 char *s = rxvt_wcstombs (w); 2812 char *s = rxvt_wcstombs (w);
2811 free (w); 2813 free (w);
2812 // TODO: strlen == only the first element will be converted. well... 2814 // TODO: strlen == only the first element will be converted. well...
2813 paste ((unsigned char *)s, strlen (s)); 2815 paste (s, strlen (s));
2814 free (s); 2816 free (s);
2815 } 2817 }
2816 else 2818 else
2817#endif 2819#endif
2818 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2819 && cl) 2821 && cl)
2820 { 2822 {
2821 for (int i = 0; i < cr; i++) 2823 for (int i = 0; i < cr; i++)
2822 paste ((unsigned char *)cl[i], strlen (cl[i])); 2824 paste (cl[i], strlen (cl[i]));
2823 2825
2824 XFreeStringList (cl); 2826 XFreeStringList (cl);
2825 } 2827 }
2826 else 2828 else
2827 paste (ct.value, ct.nitems); // paste raw 2829 paste ((char *)ct.value, ct.nitems); // paste raw
2828 2830
2829bailout: 2831bailout:
2830 XFree (ct.value); 2832 XFree (ct.value);
2831 2833
2832 if (selection_wait == Sel_normal) 2834 if (selection_wait == Sel_normal)
2833 selection_wait = Sel_none; 2835 selection_wait = Sel_none;
2834} 2836}
2835 2837
2836void 2838void
2837rxvt_term::incr_cb (time_watcher &w) 2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2838{ 2840{
2839 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2840 2842
2841 incr_buf_size = 0; 2843 incr_buf_size = 0;
2842 free (incr_buf); 2844 free (incr_buf);
2843 2845
2844 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2845} 2847}
2846 2848
2847void 2849void
2848rxvt_term::selection_property (Window win, Atom prop) 2850rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2849{ 2851{
2850 if (prop == None || selection_wait != Sel_incr) 2852 if (prop == None || selection_wait != Sel_incr)
2851 return; 2853 return;
2852 2854
2853 selection_paste (win, prop, true); 2855 selection_paste (win, prop, true);
2854} 2856}
2855 2857
2856/* ------------------------------------------------------------------------- */ 2858/* ------------------------------------------------------------------------- */
2857/* 2859/*
2858 * Request the current selection: 2860 * Request the current selection:
2859 * Order: > internal selection if available 2861 * Order: > internal selection if available
2860 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2861 * > CUT_BUFFER0 2863 * > CUT_BUFFER0
2862 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2863 * will auto fallback to CUT_BUFFER0 2865 * will auto fallback to CUT_BUFFER0
2864 * EXT: button 2 release 2866 * EXT: button 2 release
2865 */ 2867 */
2866void 2868void
2867rxvt_term::selection_request (Time tm, int x, int y) 2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2868{ 2870{
2869 if (x < 0 || x >= width || y < 0 || y >= height) 2871 if (selection.text && selnum == Sel_Primary)
2870 return; /* outside window */ 2872 {
2871
2872 if (selection.text)
2873 { /* internal selection */ 2873 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste ((unsigned char *)str, strlen (str)); 2875 paste (str, strlen (str));
2876 free (str); 2876 free (str);
2877 return; 2877 return;
2878 } 2878 }
2879 else 2879 else
2880 { 2880 {
2881 int i;
2882
2883 selection_request_time = tm; 2881 selection_request_time = tm;
2884 selection_wait = Sel_normal; 2882 selection_wait = Sel_normal;
2885 2883
2886 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2887 {
2888#if X_HAVE_UTF8_STRING 2884#if X_HAVE_UTF8_STRING
2889 selection_type = Sel_UTF8String; 2885 selection_type = Sel_UTF8String;
2890 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2891 return; 2887 return;
2892#else 2888#else
2893 selection_type = Sel_CompoundText; 2889 selection_type = Sel_CompoundText;
2894 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2895 return; 2891 return;
2896#endif 2892#endif
2897 }
2898 } 2893 }
2899 2894
2900 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2901 selection_paste (display->root, XA_CUT_BUFFER0, false); 2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2902} 2897}
2903 2898
2904int 2899int
2905rxvt_term::selection_request_other (Atom target, int selnum) 2900rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2906{ 2901{
2907 Atom sel; 2902 Atom sel;
2908 2903
2909 selection_type |= selnum; 2904 selection_type |= selnum;
2910 2905
… …
2913 else if (selnum == Sel_Secondary) 2908 else if (selnum == Sel_Secondary)
2914 sel = XA_SECONDARY; 2909 sel = XA_SECONDARY;
2915 else 2910 else
2916 sel = xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2917 2912
2918 if (XGetSelectionOwner (display->display, sel) != None) 2913 if (XGetSelectionOwner (dpy, sel) != None)
2919 { 2914 {
2920 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2921 vt, selection_request_time); 2916 vt, selection_request_time);
2922 return 1; 2917 return 1;
2923 } 2918 }
2924 2919
2925 return 0; 2920 return 0;
… …
2929/* 2924/*
2930 * Clear all selected text 2925 * Clear all selected text
2931 * EXT: SelectionClear 2926 * EXT: SelectionClear
2932 */ 2927 */
2933void 2928void
2934rxvt_term::selection_clear () 2929rxvt_term::selection_clear () NOTHROW
2935{ 2930{
2936 want_refresh = 1; 2931 want_refresh = 1;
2937 free (selection.text); 2932 free (selection.text);
2938 selection.text = NULL; 2933 selection.text = NULL;
2939 selection.len = 0; 2934 selection.len = 0;
… …
2949 * EXT: button 1 or 3 release 2944 * EXT: button 1 or 3 release
2950 */ 2945 */
2951void 2946void
2952rxvt_term::selection_make (Time tm) 2947rxvt_term::selection_make (Time tm)
2953{ 2948{
2954 int i, col, end_col, row, end_row; 2949 int i;
2955 wchar_t *new_selection_text; 2950 wchar_t *new_selection_text;
2956 text_t *t; 2951 text_t *t;
2957 2952
2958 switch (selection.op) 2953 switch (selection.op)
2959 { 2954 {
… …
2972 selection.op = SELECTION_DONE; 2967 selection.op = SELECTION_DONE;
2973 2968
2974 if (selection.clicks == 4) 2969 if (selection.clicks == 4)
2975 return; /* nothing selected, go away */ 2970 return; /* nothing selected, go away */
2976 2971
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return;
2974
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2977
2980 col = selection.beg.col;
2981 row = selection.beg.row + saveLines;
2982 end_row = selection.end.row + saveLines;
2983 int ofs = 0; 2978 int ofs = 0;
2984 int extra = 0; 2979 int extra = 0;
2985 2980
2981 int col = selection.beg.col;
2982 int row = selection.beg.row;
2983
2984 int end_col;
2985
2986 for (; row <= end_row; row++, col = 0) 2986 for (; row <= selection.end.row; row++, col = 0)
2987 { 2987 {
2988#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2989 if (selection.rect) 2989 if (selection.rect)
2990 { 2990 {
2991 col = selection.beg.col; 2991 col = selection.beg.col;
2992 end_col = ncol + 1; 2992 end_col = ncol + 1;
2993 } 2993 }
2994 else 2994 else
2995#endif 2995#endif
2996 end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN 2996 end_col = ROW(row).l;
2997 2997
2998 MAX_IT (col, 0); 2998 col = max (col, 0);
2999 2999
3000 if (row == end_row || selection.rect) 3000 if (row == selection.end.row
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
3001 MIN_IT (end_col, selection.end.col); 3005 min_it (end_col, selection.end.col);
3002 3006
3003 t = save[row].t + col; 3007 t = ROW(row).t + col;
3008
3004 for (; col < end_col; col++) 3009 for (; col < end_col; col++)
3005 { 3010 {
3006 if (*t == NOCHAR) 3011 if (*t == NOCHAR)
3007 t++; 3012 t++;
3008#if ENABLE_COMBINING 3013#if ENABLE_COMBINING
… …
3024#endif 3029#endif
3025 else 3030 else
3026 new_selection_text[ofs++] = *t++; 3031 new_selection_text[ofs++] = *t++;
3027 } 3032 }
3028 3033
3029 if (!save[row].is_longer () && row != end_row) 3034#if !ENABLE_MINIMAL
3035 if (selection.rect)
3036 {
3037 while (ofs
3038 && new_selection_text[ofs - 1] != C0_LF
3039 && unicode::is_space (new_selection_text[ofs - 1]))
3040 --ofs;
3041
3030 new_selection_text[ofs++] = C0_LF; 3042 new_selection_text[ofs++] = C0_LF;
3043 }
3044 else
3045#endif
3046 if (!ROW(row).is_longer () && row != selection.end.row)
3047 new_selection_text[ofs++] = C0_LF;
3031 } 3048 }
3032 3049
3033 if (end_col != selection.end.col) 3050 if (end_col != selection.end.col)
3034 new_selection_text[ofs++] = C0_LF; 3051 new_selection_text[ofs++] = C0_LF;
3035 3052
… …
3045 3062
3046 // we usually allocate much more than necessary, so realloc it smaller again 3063 // we usually allocate much more than necessary, so realloc it smaller again
3047 selection.len = ofs; 3064 selection.len = ofs;
3048 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3065 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3049 3066
3067 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3068 return;
3069
3070 selection_grab (tm);
3071}
3072
3073bool
3074rxvt_term::selection_grab (Time tm) NOTHROW
3075{
3076 selection_time = tm;
3077
3050 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3080 {
3052 display->set_selection_owner (this); 3081 display->set_selection_owner (this);
3082 return true;
3083 }
3053 else 3084 else
3054 rxvt_warn ("can't get primary selection, ignoring.\n"); 3085 {
3086 selection_clear ();
3087 return false;
3088 }
3055 3089
3056#if 0 3090#if 0
3057 XTextProperty ct; 3091 XTextProperty ct;
3058 3092
3059 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3060 { 3094 {
3061 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3062 XFree (ct.value); 3096 XFree (ct.value);
3063 } 3097 }
3064#endif 3098#endif
3065
3066 selection_time = tm;
3067} 3099}
3068 3100
3069/* ------------------------------------------------------------------------- */ 3101/* ------------------------------------------------------------------------- */
3070/* 3102/*
3071 * Mark or select text based upon number of clicks: 1, 2, or 3 3103 * Mark or select text based upon number of clicks: 1, 2, or 3
3072 * EXT: button 1 press 3104 * EXT: button 1 press
3073 */ 3105 */
3074void 3106void
3075rxvt_term::selection_click (int clicks, int x, int y) 3107rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3076{ 3108{
3077 clicks = ((clicks - 1) % 3) + 1; 3109 clicks = ((clicks - 1) % 3) + 1;
3078 selection.clicks = clicks; /* save clicks so extend will work */ 3110 selection.clicks = clicks; /* save clicks so extend will work */
3079 3111
3112 if (clicks == 2 && !selection.rect
3113 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3114 {
3115 MEvent.clicks = 1; // what a mess
3116 selection.screen = current_screen;
3117 selection.op = SELECTION_CONT;
3118 return;
3119 }
3120
3080 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3121 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3081 3122
3082 if (clicks == 2 || clicks == 3) 3123 if (clicks == 2 || clicks == 3)
3083 selection_extend_colrow (selection.mark.col, 3124 selection_extend_colrow (selection.mark.col,
3084 selection.mark.row + view_start, 3125 selection.mark.row - view_start,
3085 0, /* button 3 */ 3126 0, /* button 3 */
3086 1, /* button press */ 3127 1, /* button press */
3087 0); /* click change */ 3128 0); /* click change */
3088} 3129}
3089 3130
3090/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3091/* 3132/*
3092 * Mark a selection at the specified col/row 3133 * Mark a selection at the specified col/row
3093 */ 3134 */
3094void 3135void
3095rxvt_term::selection_start_colrow (int col, int row) 3136rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3096{ 3137{
3097 want_refresh = 1; 3138 want_refresh = 1;
3139
3140 selection.mark.row = row + view_start;
3098 selection.mark.col = col; 3141 selection.mark.col = col;
3099 selection.mark.row = row - view_start;
3100 3142
3101 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3143 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3102 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3103 MAX_IT (selection.mark.col, 0);
3104 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3105 3145
3106 while (selection.mark.col > 0 3146 while (selection.mark.col > 0
3107 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108 --selection.mark.col; 3148 --selection.mark.col;
3109 3149
3110 if (selection.op) 3150 if (selection.op)
3151 {
3111 { /* clear the old selection */ 3152 /* clear the old selection */
3112 selection.beg.row = selection.end.row = selection.mark.row; 3153 selection.beg.row = selection.end.row = selection.mark.row;
3113 selection.beg.col = selection.end.col = selection.mark.col; 3154 selection.beg.col = selection.end.col = selection.mark.col;
3114 } 3155 }
3115 3156
3116 selection.op = SELECTION_INIT; 3157 selection.op = SELECTION_INIT;
… …
3127#define DELIMIT_TEXT(x) \ 3168#define DELIMIT_TEXT(x) \
3128 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3169 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3129#define DELIMIT_REND(x) 1 3170#define DELIMIT_REND(x) 1
3130 3171
3131void 3172void
3132rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3173rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3133{ 3174{
3134 int col, row, dirnadd, tcol, trow, w1, w2; 3175 int col, row, dirnadd, tcol, trow, w1, w2;
3135 row_col_t bound; 3176 row_col_t bound;
3136 text_t *stp; 3177 text_t *stp;
3137 rend_t *srp; 3178 rend_t *srp;
3138 3179
3139 if (dirn == UP) 3180 if (dirn == UP)
3140 { 3181 {
3141 bound.row = saveLines - nscrolled - 1; 3182 bound.row = top_row - 1;
3142 bound.col = 0; 3183 bound.col = 0;
3143 dirnadd = -1; 3184 dirnadd = -1;
3144 } 3185 }
3145 else 3186 else
3146 { 3187 {
3147 bound.row = saveLines + nrow; 3188 bound.row = nrow;
3148 bound.col = ncol - 1; 3189 bound.col = ncol - 1;
3149 dirnadd = 1; 3190 dirnadd = 1;
3150 } 3191 }
3151 3192
3152 row = mark->row + saveLines; 3193 row = mark->row;
3153 col = mark->col; 3194 col = max (mark->col, 0);
3154 MAX_IT (col, 0); 3195
3155 /* find the edge of a word */ 3196 /* find the edge of a word */
3156 stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); 3197 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157 srp = save[row].r + col; w2 = DELIMIT_REND (*srp); 3198 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158 3199
3159 for (;;) 3200 for (;;)
3160 { 3201 {
3161 for (; col != bound.col; col += dirnadd) 3202 for (; col != bound.col; col += dirnadd)
3162 { 3203 {
… …
3172 break; 3213 break;
3173 } 3214 }
3174 3215
3175 if ((col == bound.col) && (row != bound.row)) 3216 if ((col == bound.col) && (row != bound.row))
3176 { 3217 {
3177 if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) 3218 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178 { 3219 {
3179 trow = row + dirnadd; 3220 trow = row + dirnadd;
3180 tcol = dirn == UP ? ncol - 1 : 0; 3221 tcol = dirn == UP ? ncol - 1 : 0;
3181 3222
3182 if (!save[trow].t) 3223 if (!ROW(trow).t)
3183 break; 3224 break;
3184 3225
3185 stp = save[trow].t + tcol; 3226 stp = ROW(trow).t + tcol;
3186 srp = save[trow].r + tcol; 3227 srp = ROW(trow).r + tcol;
3187 3228
3188 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3229 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189 break; 3230 break;
3190 3231
3191 row = trow; 3232 row = trow;
… …
3194 } 3235 }
3195 } 3236 }
3196 break; 3237 break;
3197 } 3238 }
3198 3239
3199Old_Word_Selection_You_Die:
3200 if (dirn == DN) 3240 if (dirn == DN)
3201 col++; /* put us on one past the end */ 3241 col++; /* put us on one past the end */
3202 3242
3203 /* Poke the values back in */ 3243 /* Poke the values back in */
3204 ret->row = row - saveLines; 3244 ret->row = row;
3205 ret->col = col; 3245 ret->col = col;
3206} 3246}
3207 3247
3208/* ------------------------------------------------------------------------- */ 3248/* ------------------------------------------------------------------------- */
3209/* 3249/*
… …
3212 * flag == 0 ==> button 1 3252 * flag == 0 ==> button 1
3213 * flag == 1 ==> button 3 press 3253 * flag == 1 ==> button 3 press
3214 * flag == 2 ==> button 3 motion 3254 * flag == 2 ==> button 3 motion
3215 */ 3255 */
3216void 3256void
3217rxvt_term::selection_extend (int x, int y, int flag) 3257rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3218{ 3258{
3219 int col, row; 3259 int col = clamp (Pixel2Col (x), 0, ncol);
3220 3260 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3221 col = Pixel2Col (x);
3222 row = Pixel2Row (y);
3223 MAX_IT (row, 0);
3224 MIN_IT (row, (int)nrow - 1);
3225 MAX_IT (col, 0);
3226 MIN_IT (col, (int)ncol);
3227 3261
3228 /* 3262 /*
3229 * If we're selecting characters (single click) then we must check first 3263 * If we're selecting characters (single click) then we must check first
3230 * if we are at the same place as the original mark. If we are then 3264 * if we are at the same place as the original mark. If we are then
3231 * select nothing. Otherwise, if we're to the right of the mark, you have to 3265 * select nothing. Otherwise, if we're to the right of the mark, you have to
3232 * be _past_ a character for it to be selected. 3266 * be _past_ a character for it to be selected.
3233 */ 3267 */
3234 if (((selection.clicks % 3) == 1) && !flag 3268 if (((selection.clicks % 3) == 1) && !flag
3235 && (col == selection.mark.col 3269 && (col == selection.mark.col
3236 && (row == selection.mark.row + view_start))) 3270 && (row == selection.mark.row - view_start)))
3237 { 3271 {
3238 /* select nothing */ 3272 /* select nothing */
3239 selection.beg.row = selection.end.row = 0; 3273 selection.beg.row = selection.end.row = 0;
3240 selection.beg.col = selection.end.col = 0; 3274 selection.beg.col = selection.end.col = 0;
3241 selection.clicks = 4; 3275 selection.clicks = 4;
… …
3254/* ------------------------------------------------------------------------- */ 3288/* ------------------------------------------------------------------------- */
3255/* 3289/*
3256 * Extend the selection to the specified col/row 3290 * Extend the selection to the specified col/row
3257 */ 3291 */
3258void 3292void
3259rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3293rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3260{ 3294{
3261 row_col_t pos; 3295 row_col_t pos;
3262 enum { 3296 enum {
3263 LEFT, RIGHT 3297 LEFT, RIGHT
3264 } closeto = RIGHT; 3298 } closeto = RIGHT;
… …
3296 selection.beg.col = selection.end.col = selection.mark.col; 3330 selection.beg.col = selection.end.col = selection.mark.col;
3297 selection.beg.row = selection.end.row = selection.mark.row; 3331 selection.beg.row = selection.end.row = selection.mark.row;
3298 } 3332 }
3299 3333
3300 pos.col = col; 3334 pos.col = col;
3301 pos.row = row; 3335 pos.row = view_start + row;
3302
3303 pos.row -= view_start; /* adjust for scroll */
3304 3336
3305 /* 3337 /*
3306 * This is mainly xterm style selection with a couple of differences, mainly 3338 * This is mainly xterm style selection with a couple of differences, mainly
3307 * in the way button3 drag extension works. 3339 * in the way button3 drag extension works.
3308 * We're either doing: button1 drag; button3 press; or button3 drag 3340 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3314 * a point/word/line which is either the start or end of the selection 3346 * a point/word/line which is either the start or end of the selection
3315 * and it was decided by whichever point/word/line was `fixed' at the 3347 * and it was decided by whichever point/word/line was `fixed' at the
3316 * time of the most recent button3 press 3348 * time of the most recent button3 press
3317 */ 3349 */
3318 if (button3 && buttonpress) 3350 if (button3 && buttonpress)
3351 {
3319 { /* button3 press */ 3352 /* button3 press */
3320 /* 3353 /*
3321 * first determine which edge of the selection we are closest to 3354 * first determine which edge of the selection we are closest to
3322 */ 3355 */
3323 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3356 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3324 || (!ROWCOL_IS_AFTER (pos, selection.end) 3357 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3342 selection.mark.row = selection.beg.row; 3375 selection.mark.row = selection.beg.row;
3343 selection.mark.col = selection.beg.col; 3376 selection.mark.col = selection.beg.col;
3344 } 3377 }
3345 } 3378 }
3346 else 3379 else
3380 {
3347 { /* button1 drag or button3 drag */ 3381 /* button1 drag or button3 drag */
3348 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3382 if (ROWCOL_IS_AFTER (selection.mark, pos))
3349 { 3383 {
3350 if (selection.mark.row == selection.end.row 3384 if (selection.mark.row == selection.end.row
3351 && selection.mark.col == selection.end.col 3385 && selection.mark.col == selection.end.col
3352 && clickchange 3386 && clickchange
… …
3367 } 3401 }
3368 } 3402 }
3369 3403
3370 if (selection.clicks == 1) 3404 if (selection.clicks == 1)
3371 { 3405 {
3372 if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN 3406 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373 && !save[selection.beg.row + saveLines].is_longer () 3407 && !ROW(selection.beg.row).is_longer ()
3374#if ENABLE_FRILLS 3408#if !ENABLE_MINIMAL
3375 && !selection.rect 3409 && !selection.rect
3376#endif 3410#endif
3377 ) 3411 )
3378 selection.beg.col = ncol; 3412 selection.beg.col = ncol;
3379 3413
3380 if ( 3414 if (
3381 selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN 3415 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382 && !save[selection.end.row + saveLines].is_longer () 3416 && !ROW(selection.end.row).is_longer ()
3383#if ENABLE_FRILLS 3417#if !ENABLE_MINIMAL
3384 && !selection.rect 3418 && !selection.rect
3385#endif 3419#endif
3386 ) 3420 )
3387 selection.end.col = ncol; 3421 selection.end.col = ncol;
3388 } 3422 }
… …
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3429 selection_delimit_word (DN, &selection.end, &selection.end);
3396 } 3430 }
3397 else if (selection.clicks == 3) 3431 else if (selection.clicks == 3)
3398 { 3432 {
3399#if ENABLE_FRILLS 3433#if ENABLE_FRILLS
3400 if (options & Opt_tripleclickwords) 3434 if (option (Opt_tripleclickwords))
3401 { 3435 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3436 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3437
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3438 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3439 {
3406 if (!save[end_row + saveLines].is_longer ()) 3440 if (!ROW(end_row).is_longer ())
3407 { 3441 {
3408 selection.end.row = end_row; 3442 selection.end.row = end_row;
3409 selection.end.col = save[end_row + saveLines].l; 3443 selection.end.col = ROW(end_row).l;
3444# if !ENABLE_MINIMAL
3410 selection_remove_trailing_spaces (); 3445 selection_remove_trailing_spaces ();
3446# endif
3411 break; 3447 break;
3412 } 3448 }
3413 } 3449 }
3414 } 3450 }
3415 else 3451 else
… …
3421 selection.beg.col = 0; 3457 selection.beg.col = 0;
3422 selection.end.col = ncol; 3458 selection.end.col = ncol;
3423 3459
3424 // select a complete logical line 3460 // select a complete logical line
3425 while (selection.beg.row > -saveLines 3461 while (selection.beg.row > -saveLines
3426 && save[selection.beg.row - 1 + saveLines].is_longer ()) 3462 && ROW(selection.beg.row - 1).is_longer ())
3427 selection.beg.row--; 3463 selection.beg.row--;
3428 3464
3429 while (selection.end.row < nrow 3465 while (selection.end.row < nrow
3430 && save[selection.end.row + saveLines].is_longer ()) 3466 && ROW(selection.end.row).is_longer ())
3431 selection.end.row++; 3467 selection.end.row++;
3432 } 3468 }
3433 } 3469 }
3434 3470
3435 if (button3 && buttonpress) 3471 if (button3 && buttonpress)
3472 {
3436 { /* mark may need to be changed */ 3473 /* mark may need to be changed */
3437 if (closeto == LEFT) 3474 if (closeto == LEFT)
3438 { 3475 {
3439 selection.mark.row = selection.end.row; 3476 selection.mark.row = selection.end.row;
3440 selection.mark.col = selection.end.col - (selection.clicks == 2); 3477 selection.mark.col = selection.end.col - (selection.clicks == 2);
3441 } 3478 }
… …
3444 selection.mark.row = selection.beg.row; 3481 selection.mark.row = selection.beg.row;
3445 selection.mark.col = selection.beg.col; 3482 selection.mark.col = selection.beg.col;
3446 } 3483 }
3447 } 3484 }
3448 3485
3449#if ENABLE_FRILLS 3486#if !ENABLE_MINIMAL
3450 if (selection.rect && selection.beg.col > selection.end.col) 3487 if (selection.rect && selection.beg.col > selection.end.col)
3451 SWAP_IT (selection.beg.col, selection.end.col, int); 3488 ::swap (selection.beg.col, selection.end.col);
3452#endif 3489#endif
3453} 3490}
3454 3491
3455#if ENABLE_FRILLS 3492#if !ENABLE_MINIMAL
3456void 3493void
3457rxvt_term::selection_remove_trailing_spaces () 3494rxvt_term::selection_remove_trailing_spaces () NOTHROW
3458{ 3495{
3459 int32_t end_col, end_row; 3496 int32_t end_col, end_row;
3460 text_t *stp; 3497 text_t *stp;
3461 3498
3462 end_col = selection.end.col; 3499 end_col = selection.end.col;
3463 end_row = selection.end.row; 3500 end_row = selection.end.row;
3464 3501
3465 for ( ; end_row >= selection.beg.row; ) 3502 for (; end_row >= selection.beg.row; )
3466 { 3503 {
3467 stp = save[end_row + saveLines].t; 3504 stp = ROW(end_row).t;
3468 3505
3469 while (--end_col >= 0) 3506 while (--end_col >= 0)
3470 { 3507 {
3471 if (stp[end_col] != ' ' 3508 if (stp[end_col] != NOCHAR
3472 && stp[end_col] != '\t' 3509 && !unicode::is_space (stp[end_col]))
3473 && stp[end_col] != NOCHAR)
3474 break; 3510 break;
3475 } 3511 }
3476 3512
3477 if (end_col >= 0 3513 if (end_col >= 0
3478 || !save[end_row - 1 + saveLines].is_longer ()) 3514 || !ROW(end_row - 1).is_longer ())
3479 { 3515 {
3480 selection.end.col = end_col + 1; 3516 selection.end.col = end_col + 1;
3481 selection.end.row = end_row; 3517 selection.end.row = end_row;
3482 break; 3518 break;
3483 } 3519 }
… …
3501/* 3537/*
3502 * Double click on button 3 when already selected 3538 * Double click on button 3 when already selected
3503 * EXT: button 3 double click 3539 * EXT: button 3 double click
3504 */ 3540 */
3505void 3541void
3506rxvt_term::selection_rotate (int x, int y) 3542rxvt_term::selection_rotate (int x, int y) NOTHROW
3507{ 3543{
3508 selection.clicks = selection.clicks % 3 + 1; 3544 selection.clicks = selection.clicks % 3 + 1;
3509 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3545 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3510} 3546}
3511 3547
… …
3513/* 3549/*
3514 * Respond to a request for our current selection 3550 * Respond to a request for our current selection
3515 * EXT: SelectionRequest 3551 * EXT: SelectionRequest
3516 */ 3552 */
3517void 3553void
3518rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3554rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3519{ 3555{
3520 XSelectionEvent ev; 3556 XSelectionEvent ev;
3521 dDisp;
3522 3557
3523 ev.type = SelectionNotify; 3558 ev.type = SelectionNotify;
3524 ev.property = None; 3559 ev.property = None;
3525 ev.display = rq.display; 3560 ev.display = rq.display;
3526 ev.requestor = rq.requestor; 3561 ev.requestor = rq.requestor;
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3575 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3576#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3577 *target++ = xa[XA_UTF8_STRING];
3543#endif 3578#endif
3544 3579
3545 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3580 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3581 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3582 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3583 ev.property = rq.property;
3549 } 3584 }
3550#if TODO // TODO 3585#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3588 /* TODO: Handle MULTIPLE */
3554 } 3589 }
3555#endif 3590#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3592 {
3558 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3594 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3595 ev.property = rq.property;
3561 } 3596 }
3562 else if (rq.target == XA_STRING 3597 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3598 || rq.target == xa[XA_TEXT]
… …
3587 style = enc_string; 3622 style = enc_string;
3588 else if (target == xa[XA_TEXT]) 3623 else if (target == xa[XA_TEXT])
3589 style = enc_text; 3624 style = enc_text;
3590 else if (target == xa[XA_COMPOUND_TEXT]) 3625 else if (target == xa[XA_COMPOUND_TEXT])
3591 style = enc_compound_text; 3626 style = enc_compound_text;
3592#if ENABLE_FRILLS 3627#if !ENABLE_MINIMAL
3593 else if (target == xa[XA_UTF8_STRING]) 3628 else if (target == xa[XA_UTF8_STRING])
3594 style = enc_utf8; 3629 style = enc_utf8;
3595#endif 3630#endif
3596 else 3631 else
3597 { 3632 {
… …
3608 { 3643 {
3609 cl = L""; 3644 cl = L"";
3610 selectlen = 0; 3645 selectlen = 0;
3611 } 3646 }
3612 3647
3613#if ENABLE_FRILLS 3648#if !ENABLE_MINIMAL
3614 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3649 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3615 // so recode it manually 3650 // so recode it manually
3616 if (style == enc_utf8) 3651 if (style == enc_utf8)
3617 { 3652 {
3618 freect = 1; 3653 freect = 1;
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3656 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3657 ct.nitems = strlen ((char *)ct.value);
3623 } 3658 }
3624 else 3659 else
3625#endif 3660#endif
3626 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3661 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3662 freect = 1;
3628 else 3663 else
3629 { 3664 {
3630 /* if we failed to convert then send it raw */ 3665 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3666 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3667 ct.nitems = selectlen;
3633 ct.encoding = target; 3668 ct.encoding = target;
3634 } 3669 }
3635 3670
3636 XChangeProperty (disp, rq.requestor, rq.property, 3671 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3672 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3673 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3674 ev.property = rq.property;
3640 3675
3641 if (freect) 3676 if (freect)
3642 XFree (ct.value); 3677 XFree (ct.value);
3643 } 3678 }
3644 3679
3645 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3680 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646}
3647
3648/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */
3651
3652/*
3653 * return col/row values corresponding to x/y pixel values
3654 */
3655void
3656rxvt_term::pixel_position (int *x, int *y)
3657{
3658 *x = Pixel2Col (*x);
3659 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y);
3661 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3662} 3681}
3663 3682
3664/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3684#ifdef USE_XIM
3666void 3685void
3667rxvt_term::im_set_position (XPoint &pos) 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3687{
3669 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3670 3689
3671 XGetWindowAttributes (display->display, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3672 3691
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3694}
3676#endif 3695#endif
3677 3696
3678#if ENABLE_OVERLAY 3697#if ENABLE_OVERLAY
3679void 3698void
3680rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3699rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3681{ 3700{
3682 if (nrow < 3 || ncol < 3) 3701 if (nrow < 1 || ncol < 1)
3683 return; 3702 return;
3684 3703
3685 want_refresh = 1; 3704 want_refresh = 1;
3686 3705
3687 scr_overlay_off (); 3706 scr_overlay_off ();
3688 3707
3689 if (x < 0) x = ncol - w; 3708 if (x < 0) x = ncol - w;
3690 if (y < 0) y = nrow - h; 3709 if (y < 0) y = nrow - h;
3691 3710
3692 // make space for border 3711 // make space for border
3693 w += 2; MIN_IT (w, ncol); 3712 w += 2; min_it (w, ncol);
3694 h += 2; MIN_IT (h, nrow); 3713 h += 2; min_it (h, nrow);
3695 3714
3696 x -= 1; MAX_IT (x, 0); 3715 x -= 1; clamp_it (x, 0, ncol - w);
3697 y -= 1; MAX_IT (y, 0); 3716 y -= 1; clamp_it (y, 0, nrow - h);
3698
3699 MIN_IT (x, ncol - w);
3700 MIN_IT (y, nrow - h);
3701 3717
3702 ov_x = x; ov_y = y; 3718 ov_x = x; ov_y = y;
3703 ov_w = w; ov_h = h; 3719 ov_w = w; ov_h = h;
3704 3720
3705 ov_text = new text_t *[h]; 3721 ov_text = new text_t *[h];
… …
3733 *rp = r; 3749 *rp = r;
3734 } 3750 }
3735} 3751}
3736 3752
3737void 3753void
3738rxvt_term::scr_overlay_off () 3754rxvt_term::scr_overlay_off () NOTHROW
3739{ 3755{
3740 if (!ov_text) 3756 if (!ov_text)
3741 return; 3757 return;
3742 3758
3743 want_refresh = 1; 3759 want_refresh = 1;
… …
3751 delete [] ov_text; ov_text = 0; 3767 delete [] ov_text; ov_text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3768 delete [] ov_rend; ov_rend = 0;
3753} 3769}
3754 3770
3755void 3771void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3773{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3759 return; 3775 return;
3760 3776
3761 x++, y++; 3777 x++, y++;
… …
3763 ov_text[y][x] = text; 3779 ov_text[y][x] = text;
3764 ov_rend[y][x] = rend; 3780 ov_rend[y][x] = rend;
3765} 3781}
3766 3782
3767void 3783void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) 3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3785{
3770 while (*s) 3786 while (*s)
3771 scr_overlay_set (x++, y, *s++); 3787 scr_overlay_set (x++, y, *s++);
3772} 3788}
3773 3789
3774void 3790void
3775rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3791rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3776{ 3792{
3777 while (*s) 3793 while (*s)
3778 { 3794 {
3779 text_t t = *s++; 3795 text_t t = *s++;
3780 int width = wcwidth (t); 3796 int width = WCWIDTH (t);
3781 3797
3782 while (width--) 3798 while (width--)
3783 { 3799 {
3784 scr_overlay_set (x++, y, t); 3800 scr_overlay_set (x++, y, t);
3785 t = NOCHAR; 3801 t = NOCHAR;
3786 } 3802 }
3787 } 3803 }
3788} 3804}
3789 3805
3790void 3806void
3791rxvt_term::scr_swap_overlay () 3807rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3808{
3793 if (!ov_text) 3809 if (!ov_text)
3794 return; 3810 return;
3795 3811
3796 int row_offset = ov_y + saveLines - view_start;
3797
3798 // swap screen mem with overlay 3812 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3813 for (int y = ov_h; y--; )
3800 { 3814 {
3801 text_t *t1 = ov_text[y]; 3815 text_t *t1 = ov_text[y];
3802 rend_t *r1 = ov_rend[y]; 3816 rend_t *r1 = ov_rend[y];
3803 3817
3804 text_t *t2 = save[y + row_offset].t + ov_x; 3818 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3805 rend_t *r2 = save[y + row_offset].r + ov_x; 3819 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3806 3820
3807 for (int x = ov_w; x--; ) 3821 for (int x = ov_w; x--; )
3808 { 3822 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3823 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3824 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3812 } 3826 }
3813} 3827}
3814 3828
3815#endif 3829#endif
3816/* ------------------------------------------------------------------------- */ 3830/* ------------------------------------------------------------------------- */
3831

Diff Legend

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