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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

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

Diff Legend

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