ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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