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

Diff Legend

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