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

Diff Legend

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