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

Diff Legend

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