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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines