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.189 by root, Thu Dec 22 15:28:15 2005 UTC

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