ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.182 by root, Wed Dec 21 10:35:47 2005 UTC

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

Diff Legend

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