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

Diff Legend

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