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.24 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC

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

Diff Legend

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