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