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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC

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

Diff Legend

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