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.57 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC

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

Diff Legend

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