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.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.167 by root, Fri Aug 5 16:42:44 2005 UTC

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

Diff Legend

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