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.178 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.316 by root, Tue Nov 4 15:02:35 2008 UTC

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