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.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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