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

Diff Legend

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