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.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC

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

Diff Legend

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