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

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

Diff Legend

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