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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.188 by root, Thu Dec 22 00:07:47 2005 UTC

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

Diff Legend

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