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

Diff Legend

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