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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.185 by root, Wed Dec 21 14:25:41 2005 UTC vs.
Revision 1.320 by root, Tue Nov 4 23:20:17 2008 UTC

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