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.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.150 by root, Mon Dec 13 19:16:36 2004 UTC

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

Diff Legend

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