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.15 by pcg, Fri Jan 16 16:34:56 2004 UTC vs.
Revision 1.171 by root, Fri Dec 16 13:05:49 2005 UTC

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

Diff Legend

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