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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 2005 UTC

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

Diff Legend

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