ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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