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

Diff Legend

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