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

Diff Legend

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