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

Diff Legend

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