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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC

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

Diff Legend

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