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