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.176 by root, Tue Dec 20 20:58:31 2005 UTC

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