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

Diff Legend

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