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

Diff Legend

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