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

Diff Legend

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