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