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.26 by pcg, Sun Feb 1 20:12:53 2004 UTC vs.
Revision 1.196 by root, Mon Dec 26 23:12:59 2005 UTC

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

Diff Legend

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