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.185 by root, Wed Dec 21 14:25:41 2005 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

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

Diff Legend

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