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.39 by pcg, Wed Feb 25 15:06:05 2004 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC

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

Diff Legend

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