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

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

Diff Legend

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