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