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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.176 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.293 by root, Mon Dec 24 08:00:18 2007 UTC

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