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.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC

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

Diff Legend

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