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

Diff Legend

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