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

Diff Legend

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