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

Diff Legend

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