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.15 by pcg, Fri Jan 16 16:34:56 2004 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC

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

Diff Legend

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