ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.268 by root, Tue May 1 21:30:01 2007 UTC

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

Diff Legend

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