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.243 by ayin, Thu Jan 19 23:15:21 2006 UTC

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

Diff Legend

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