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

Diff Legend

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