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.262 by root, Mon Feb 20 22:42:01 2006 UTC

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

Diff Legend

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