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

Diff Legend

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