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.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC

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

Diff Legend

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