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.9 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.267 by root, Thu Nov 2 17:23:50 2006 UTC

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

Diff Legend

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