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