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