ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines