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