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.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

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

Diff Legend

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