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

Diff Legend

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