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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC

… …
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 449
444 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
… …
470 * Hard reset 476 * Hard reset
471 */ 477 */
472void 478void
473rxvt_term::scr_poweron () 479rxvt_term::scr_poweron ()
474{ 480{
475 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
476
477 scr_release (); 481 scr_release ();
478 prev_nrow = prev_ncol = 0; 482 prev_nrow = prev_ncol = 0;
479 scr_reset (); 483 scr_reset ();
480 484
481 scr_clear (); 485 scr_clear (true);
482 scr_refresh (SLOW_REFRESH); 486 scr_refresh (SLOW_REFRESH);
483} 487}
484 488
485/* ------------------------------------------------------------------------- * 489/* ------------------------------------------------------------------------- *
486 * PROCESS SCREEN COMMANDS * 490 * PROCESS SCREEN COMMANDS *
… …
492 */ 496 */
493void 497void
494rxvt_term::scr_cursor (int mode) 498rxvt_term::scr_cursor (int mode)
495{ 499{
496 screen_t *s; 500 screen_t *s;
497
498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
499 501
500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
501 if (current_screen == SECONDARY) 503 if (current_screen == SECONDARY)
502 s = &swap; 504 s = &swap;
503 else 505 else
… …
505 s = &screen; 507 s = &screen;
506 508
507 switch (mode) 509 switch (mode)
508 { 510 {
509 case SAVE: 511 case SAVE:
510 s->s_cur.row = s->cur.row; 512 s->s_cur.row = screen.cur.row;
511 s->s_cur.col = s->cur.col; 513 s->s_cur.col = screen.cur.col;
512 s->s_rstyle = rstyle; 514 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 515 s->s_charset = screen.charset;
514 s->s_charset_char = charsets[s->charset]; 516 s->s_charset_char = charsets[screen.charset];
515 break; 517 break;
516 518
517 case RESTORE: 519 case RESTORE:
518 want_refresh = 1; 520 want_refresh = 1;
519 s->cur.row = s->s_cur.row; 521 screen.cur.row = s->s_cur.row;
520 s->cur.col = s->s_cur.col; 522 screen.cur.col = s->s_cur.col;
521 s->flags &= ~Screen_WrapNext; 523 screen.flags &= ~Screen_WrapNext;
522 rstyle = s->s_rstyle; 524 rstyle = s->s_rstyle;
523 s->charset = s->s_charset; 525 screen.charset = s->s_charset;
524 charsets[s->charset] = s->s_charset_char; 526 charsets[screen.charset] = s->s_charset_char;
525 set_font_style (); 527 set_font_style ();
526 break; 528 break;
527 } 529 }
528 530
529 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
552 int offset; 554 int offset;
553#endif 555#endif
554 556
555 want_refresh = 1; 557 want_refresh = 1;
556 558
557 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
558
559 TermWin.view_start = 0; 559 TermWin.view_start = 0;
560 560
561 if (current_screen == scrn) 561 if (current_screen == scrn)
562 return scrn; 562 return scrn;
563 563
564 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
565 565
566 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
567#if NSCREENS 575#if NSCREENS
568 if (Options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
569 { 577 {
570 num_scr = 0; 578 num_scr = 0;
571 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
572 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
573 { 582 {
574 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
575 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
576 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
577 } 586 }
578 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
579 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
580# ifdef DEBUG_STRICT
581 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
582 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
583# else /* drive with your eyes closed */
584 MAX_IT (screen.cur.row, 0);
585 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
586 MAX_IT (screen.cur.col, 0);
587 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
588# endif
589 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
590 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
591 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
592 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
593 } 592 }
594 else 593 else
595#endif 594#endif
596 if (Options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
597 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
599 return scrn; 598 return scrn;
600} 599}
601 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
602/* ------------------------------------------------------------------------- */ 618/* ------------------------------------------------------------------------- */
603/* 619/*
604 * Change the colour for following text 620 * Change the colour for following text
605 */ 621 */
606void 622void
607rxvt_term::scr_color (unsigned int color, int fgbg) 623rxvt_term::scr_color (unsigned int color, int fgbg)
608{ 624{
609 color &= RS_fgMask; 625 if (color > maxTermCOLOR)
626 color = fgbg;
627
610 if (fgbg == Color_fg) 628 if (fgbg == Color_fg)
611 rstyle = SET_FGCOLOR (rstyle, color); 629 rstyle = SET_FGCOLOR (rstyle, color);
612 else 630 else
613 rstyle = SET_BGCOLOR (rstyle, color); 631 rstyle = SET_BGCOLOR (rstyle, color);
614} 632}
… …
643 661
644 if (count == 0 || (row1 > row2)) 662 if (count == 0 || (row1 > row2))
645 return 0; 663 return 0;
646 664
647 want_refresh = 1; 665 want_refresh = 1;
648 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
649 666
650 if (row1 == 0 && count > 0 667 if (row1 == 0 && count > 0
651 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 668 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
652 { 669 {
653 nscrolled = (long)TermWin.nscrolled + (long)count; 670 nscrolled = (long)TermWin.nscrolled + (long)count;
654 671
655 if (nscrolled > (long)TermWin.saveLines) 672 if (nscrolled > (long)TermWin.saveLines)
656 TermWin.nscrolled = TermWin.saveLines; 673 TermWin.nscrolled = TermWin.saveLines;
657 else 674 else
658 TermWin.nscrolled = (uint16_t)nscrolled; 675 TermWin.nscrolled = (unsigned int)nscrolled;
659 676
660 if ((Options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
661 && TermWin.view_start != 0 678 && TermWin.view_start != 0
662 && TermWin.view_start != TermWin.saveLines) 679 && TermWin.view_start != TermWin.saveLines)
663 scr_page (UP, count); 680 scr_page (UP, count);
664 } 681 }
665 else if (!spec) 682 else if (!spec)
… …
682 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
683 } 700 }
684 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
685 { 702 {
686 /* move selected region too */ 703 /* move selected region too */
687 selection.beg.row -= count; 704 selection.beg.row -= count;
688 selection.end.row -= count; 705 selection.end.row -= count;
689 selection.mark.row -= count; 706 selection.mark.row -= count;
690 } 707 }
691 } 708 }
692 709
693 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
701 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
702 MIN_IT (count, i); 719 MIN_IT (count, i);
703 720
704 if (j > 0) 721 if (j > 0)
705 { 722 {
706 /* A: scroll up */ 723 /* scroll up */
707 724
708 /* 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 */
709 for (i = 0, j = row1; i < count; i++, j++) 742 for (i = 0, j = row2; i < count; i++, j--)
710 { 743 {
711 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
712 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
713 } 746 }
747
714 /* A2: Rotate lines */ 748 /* Rotate lines */
715 for (j = row1, i = j + count; i <= row2; i++, j++) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
716 { 750 {
717 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
718 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
719 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
720 } 754 }
721 j = row2 - count + 1, i = count;
722 }
723 else /* if (j < 0) */
724 {
725 /* B: scroll down */
726 755
727 /* B1: Copy lines that will get clobbered by the rotation */
728 for (i = 0, j = row2; i < count; i++, j--)
729 {
730 buf_text[i] = screen.text[j];
731 buf_rend[i] = screen.rend[j];
732 }
733 /* B2: Rotate lines */
734 for (j = row2, i = j - count; i >= row1; i--, j--)
735 {
736 screen.tlen[j] = screen.tlen[i];
737 screen.text[j] = screen.text[i];
738 screen.rend[j] = screen.rend[i];
739 }
740 j = row1, i = count; 756 j = row1, i = count;
741 count = -count; 757 count = -count;
742 } 758 }
743 759
744 /* 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 */
745 for (; i--; j++) 765 for (; i--; j++)
746 {
747 screen.tlen[j] = 0;
748 screen.text[j] = buf_text[i];
749 screen.rend[j] = buf_rend[i];
750
751 if (!spec) /* line length may not equal TermWin.ncol */
752 scr_blank_screen_mem (screen.text, screen.rend, 766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
753 (unsigned int)j, rstyle);
754 }
755 767
756 return count; 768 return count;
757} 769}
758 770
759/* ------------------------------------------------------------------------- */ 771/* ------------------------------------------------------------------------- */
… …
761 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
762 */ 774 */
763void 775void
764rxvt_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)
765{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
766 unsigned char checksel, clearsel; 781 unsigned char checksel;
767 unicode_t c; 782 unicode_t c;
768 int i, row, last_col; 783 int i, row, last_col;
769 text_t *stp; 784 text_t *stp;
770 rend_t *srp; 785 rend_t *srp;
771 786 const unicode_t *strend = str + len;
772 if (len <= 0) /* sanity */
773 return;
774 787
775 want_refresh = 1; 788 want_refresh = 1;
789 ZERO_SCROLLBACK ();
776 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
777 791
778 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
779 ZERO_SCROLLBACK ();
780 if (nlines > 0) 792 if (nlines > 0)
781 { 793 {
782 nlines += (screen.cur.row - screen.bscroll); 794 nlines += screen.cur.row - screen.bscroll;
783 if ((nlines > 0) 795 if ((nlines > 0)
784 && (screen.tscroll == 0) 796 && (screen.tscroll == 0)
785 && (screen.bscroll == (TermWin.nrow - 1))) 797 && (screen.bscroll == (TermWin.nrow - 1)))
786 { 798 {
787 /* _at least_ this many lines need to be scrolled */ 799 /* _at least_ this many lines need to be scrolled */
788 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
789 screen.cur.row -= nlines; 801 screen.cur.row -= nlines;
790 } 802 }
791 } 803 }
804
792#ifdef DEBUG_STRICT 805#ifdef DEBUG_STRICT
793 assert (screen.cur.col < last_col); 806 assert (screen.cur.col < last_col);
794 assert ((screen.cur.row < TermWin.nrow) 807 assert ((screen.cur.row < TermWin.nrow)
795 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
796#else /* drive with your eyes closed */ 809#else /* drive with your eyes closed */
797 MIN_IT (screen.cur.col, last_col - 1); 810 MIN_IT (screen.cur.col, last_col - 1);
798 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
799 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
800#endif 813#endif
801 row = screen.cur.row + TermWin.saveLines; 814 row = screen.cur.row + TermWin.saveLines;
802 815
803 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
804 clearsel = 0;
805 817
806 stp = screen.text[row]; 818 stp = screen.text[row];
807 srp = screen.rend[row]; 819 srp = screen.rend[row];
808 820
809 while (len--) 821 while (str < strend)
810 { 822 {
811 c = *str++; 823 c = *str++;
812 824
813 if (c < 0x20) 825 if (c < 0x20)
814 switch (c) 826 if (c == C0_LF)
827 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col);
830
831 screen.flags &= ~Screen_WrapNext;
832
833 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines;
837
838 stp = screen.text[row]; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue;
841 }
842 else if (c == C0_CR)
815 { 843 {
816 case C0_HT:
817 scr_tab (1);
818 continue;
819
820 case C0_LF:
821 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
822 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
823 846
824 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
825
826 if (screen.cur.row == screen.bscroll)
827 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
828 else if (screen.cur.row < (TermWin.nrow - 1))
829 row = (++screen.cur.row) + TermWin.saveLines;
830
831 stp = screen.text[row]; /* _must_ refresh */
832 srp = screen.rend[row]; /* _must_ refresh */
833 continue;
834
835 case C0_CR:
836 if (screen.tlen[row] != -1) /* XXX: think about this */
837 MAX_IT (screen.tlen[row], screen.cur.col);
838
839 screen.flags &= ~Screen_WrapNext;
840 screen.cur.col = 0; 848 screen.cur.col = 0;
841 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
842 } 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 {
876 // vt100 special graphics and line drawing
877 static uint16_t vt100_0[32] = { // 5f .. 7e
878 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
879 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
880 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
881 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
882 };
883
884 if (c >= 0x5f && c <= 0x7e)
885 {
886 c = vt100_0[c - 0x5f];
887 width = 1;
888 }
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);
… …
998#ifdef TERMCAP_HAS_BW 1055#ifdef TERMCAP_HAS_BW
999 screen.cur.col = TermWin.ncol - 1; 1056 screen.cur.col = TermWin.ncol - 1;
1000 screen.cur.row--; 1057 screen.cur.row--;
1001 return; 1058 return;
1002#endif 1059#endif
1003
1004 } 1060 }
1005 } 1061 }
1006 else if ((screen.flags & Screen_WrapNext) == 0) 1062 else if (!(screen.flags & Screen_WrapNext))
1007 scr_gotorc (0, -1, RELATIVE); 1063 scr_gotorc (0, -1, RELATIVE);
1008 1064
1009 screen.flags &= ~Screen_WrapNext; 1065 screen.flags &= ~Screen_WrapNext;
1010} 1066}
1011 1067
… …
1014 * Process Horizontal Tab 1070 * Process Horizontal Tab
1015 * count: +ve = forward; -ve = backwards 1071 * count: +ve = forward; -ve = backwards
1016 * XTERM_SEQ: CTRL-I 1072 * XTERM_SEQ: CTRL-I
1017 */ 1073 */
1018void 1074void
1019rxvt_term::scr_tab (int count) 1075rxvt_term::scr_tab (int count, bool ht)
1020{ 1076{
1021 int i, x; 1077 int i, x;
1022 1078
1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1024 want_refresh = 1; 1079 want_refresh = 1;
1025 i = x = screen.cur.col; 1080 i = x = screen.cur.col;
1026 1081
1027 if (count == 0) 1082 if (count == 0)
1028 return; 1083 return;
1029 else if (count > 0) 1084 else if (count > 0)
1030 { 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
1031 for (; ++i < TermWin.ncol; ) 1092 for (; ++i < TermWin.ncol; )
1032 if (tabs[i]) 1093 if (tabs[i])
1033 { 1094 {
1034 x = i; 1095 x = i;
1035 if (!--count) 1096 if (!--count)
1036 break; 1097 break;
1037 } 1098 }
1099 else
1100 ht &= tp[i] == ' '
1101 && RS_SAME (rp[i], base_rend);
1038 1102
1039 if (count) 1103 if (count)
1040 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 }
1041 } 1126 }
1042 else /* if (count < 0) */ 1127 else /* if (count < 0) */
1043 { 1128 {
1044 for (; --i >= 0; ) 1129 for (; --i >= 0; )
1045 if (tabs[i]) 1130 if (tabs[i])
… …
1062 * Process DEC Back Index 1147 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1064 * 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
1065 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1066 */ 1151 */
1067#ifndef NO_FRILLS 1152#if ENABLE_FRILLS
1068void 1153void
1069rxvt_term::scr_backindex () 1154rxvt_term::scr_backindex ()
1070{ 1155{
1071 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1158 else
1074 { 1159 {
1075 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1076 return; /* um, yeah? */ 1161 return; /* um, yeah? */
1162
1077 scr_insdel_chars (1, INSERT); 1163 scr_insdel_chars (1, INSERT);
1078 } 1164 }
1079} 1165}
1080#endif 1166#endif
1081/* ------------------------------------------------------------------------- */ 1167/* ------------------------------------------------------------------------- */
… …
1083 * Process DEC Forward Index 1169 * Process DEC Forward Index
1084 * XTERM_SEQ: ESC 9 1170 * XTERM_SEQ: ESC 9
1085 * 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
1086 * in that row left. Clear right column. 1172 * in that row left. Clear right column.
1087 */ 1173 */
1088#ifndef NO_FRILLS 1174#if ENABLE_FRILLS
1089void 1175void
1090rxvt_term::scr_forwardindex () 1176rxvt_term::scr_forwardindex ()
1091{ 1177{
1092 int row; 1178 int row;
1093 1179
1094 if (screen.cur.col < TermWin.ncol - 1) 1180 if (screen.cur.col < TermWin.ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1182 else
1097 { 1183 {
1098 row = screen.cur.row + TermWin.saveLines; 1184 row = screen.cur.row + TermWin.saveLines;
1185
1099 if (screen.tlen[row] == 0) 1186 if (screen.tlen[row] == 0)
1100 return; /* um, yeah? */ 1187 return; /* um, yeah? */
1101 else if (screen.tlen[row] == -1) 1188 else if (screen.tlen[row] == -1)
1102 screen.tlen[row] = TermWin.ncol; 1189 screen.tlen[row] = TermWin.ncol;
1190
1103 scr_gotorc (0, 0, R_RELATIVE); 1191 scr_gotorc (0, 0, R_RELATIVE);
1104 scr_insdel_chars (1, DELETE); 1192 scr_insdel_chars (1, DELETE);
1105 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1106 } 1194 }
1107} 1195}
… …
1115rxvt_term::scr_gotorc (int row, int col, int relative) 1203rxvt_term::scr_gotorc (int row, int col, int relative)
1116{ 1204{
1117 want_refresh = 1; 1205 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1206 ZERO_SCROLLBACK ();
1119 1207
1120 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));
1121
1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1123 MAX_IT (screen.cur.col, 0); 1209 MAX_IT (screen.cur.col, 0);
1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1125 1211
1126 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1213
1127 if (relative & R_RELATIVE) 1214 if (relative & R_RELATIVE)
1128 { 1215 {
1129 if (row > 0) 1216 if (row > 0)
1130 { 1217 {
1131 if (screen.cur.row <= screen.bscroll 1218 if (screen.cur.row <= screen.bscroll
… …
1151 MIN_IT (screen.cur.row, screen.bscroll); 1238 MIN_IT (screen.cur.row, screen.bscroll);
1152 } 1239 }
1153 else 1240 else
1154 screen.cur.row = row; 1241 screen.cur.row = row;
1155 } 1242 }
1243
1156 MAX_IT (screen.cur.row, 0); 1244 MAX_IT (screen.cur.row, 0);
1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1162} 1246}
1163 1247
1164/* ------------------------------------------------------------------------- */ 1248/* ------------------------------------------------------------------------- */
1165/* 1249/*
1166 * direction should be UP or DN 1250 * direction should be UP or DN
1167 */ 1251 */
1168void 1252void
1169rxvt_term::scr_index (enum page_dirn direction) 1253rxvt_term::scr_index (enum page_dirn direction)
1170{ 1254{
1171 int dirn; 1255 int dirn;
1172 1256
1173 want_refresh = 1; 1257 want_refresh = 1;
1258 ZERO_SCROLLBACK ();
1259
1174 dirn = ((direction == UP) ? 1 : -1); 1260 dirn = ((direction == UP) ? 1 : -1);
1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1176
1177 ZERO_SCROLLBACK ();
1178 1261
1179 screen.flags &= ~Screen_WrapNext; 1262 screen.flags &= ~Screen_WrapNext;
1263
1180 if ((screen.cur.row == screen.bscroll && direction == UP) 1264 if ((screen.cur.row == screen.bscroll && direction == UP)
1181 || (screen.cur.row == screen.tscroll && direction == DN)) 1265 || (screen.cur.row == screen.tscroll && direction == DN))
1182 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1183 else 1267 else
1184 screen.cur.row += dirn; 1268 screen.cur.row += dirn;
1269
1185 MAX_IT (screen.cur.row, 0); 1270 MAX_IT (screen.cur.row, 0);
1186 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1187 selection_check (0); 1272 selection_check (0);
1188} 1273}
1189 1274
… …
1198rxvt_term::scr_erase_line (int mode) 1283rxvt_term::scr_erase_line (int mode)
1199{ 1284{
1200 unsigned int row, col, num; 1285 unsigned int row, col, num;
1201 1286
1202 want_refresh = 1; 1287 want_refresh = 1;
1203 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1204 ZERO_SCROLLBACK (); 1288 ZERO_SCROLLBACK ();
1205 1289
1206 selection_check (1); 1290 selection_check (1);
1207
1208 screen.flags &= ~Screen_WrapNext;
1209 1291
1210 row = TermWin.saveLines + screen.cur.row; 1292 row = TermWin.saveLines + screen.cur.row;
1211 switch (mode) 1293 switch (mode)
1212 { 1294 {
1213 case 0: /* erase to end of line */ 1295 case 0: /* erase to end of line */
… …
1236 default: 1318 default:
1237 return; 1319 return;
1238 } 1320 }
1239 1321
1240 if (screen.text[row]) 1322 if (screen.text[row])
1241 scr_blank_line (& (screen.text[row][col]), 1323 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1242 & (screen.rend[row][col]), num, rstyle);
1243 else 1324 else
1244 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1325 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1245} 1326}
1246 1327
1247/* ------------------------------------------------------------------------- */ 1328/* ------------------------------------------------------------------------- */
… …
1258 int32_t row, row_offset; 1339 int32_t row, row_offset;
1259 rend_t ren; 1340 rend_t ren;
1260 XGCValues gcvalue; 1341 XGCValues gcvalue;
1261 1342
1262 want_refresh = 1; 1343 want_refresh = 1;
1263 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1264 ZERO_SCROLLBACK (); 1344 ZERO_SCROLLBACK ();
1345
1265 row_offset = (int32_t)TermWin.saveLines; 1346 row_offset = (int32_t)TermWin.saveLines;
1266 1347
1267 switch (mode) 1348 switch (mode)
1268 { 1349 {
1269 case 0: /* erase to end of screen */ 1350 case 0: /* erase to end of screen */
… …
1285 break; 1366 break;
1286 default: 1367 default:
1287 return; 1368 return;
1288 } 1369 }
1289 1370
1290 refresh_type |= REFRESH_BOUNDS;
1291
1292 if (selection.op && current_screen == selection.screen 1371 if (selection.op && current_screen == selection.screen
1293 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1372 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1294 || (selection.end.row >= row 1373 || (selection.end.row >= row
1295 && selection.end.row <= row + num))) 1374 && selection.end.row <= row + num)))
1296 CLEAR_SELECTION (); 1375 CLEAR_SELECTION ();
… …
1307 ren = DEFAULT_RSTYLE; 1386 ren = DEFAULT_RSTYLE;
1308 CLEAR_ROWS (row, num); 1387 CLEAR_ROWS (row, num);
1309 } 1388 }
1310 else 1389 else
1311 { 1390 {
1312 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1313 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1315 ERASE_ROWS (row, num); 1394 ERASE_ROWS (row, num);
1316 gcvalue.foreground = PixColors[Color_fg]; 1395 gcvalue.foreground = pix_colors[Color_fg];
1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1318 } 1397 }
1319 1398
1320 for (; num--; row++) 1399 for (; num--; row++)
1321 { 1400 {
1322 scr_blank_screen_mem (screen.text, screen.rend, 1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1323 (unsigned int) (row + row_offset), rstyle);
1324 screen.tlen[row + row_offset] = 0; 1402 screen.tlen[row + row_offset] = 0;
1325 scr_blank_line (drawn_text[row], drawn_rend[row], 1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1326 (unsigned int)TermWin.ncol, ren);
1327 } 1404 }
1328} 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
1329 1417
1330/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1331/* 1419/*
1332 * Fill the screen with `E's 1420 * Fill the screen with `E's
1333 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1334 */ 1422 */
1335void 1423void
1336rxvt_term::scr_E () 1424rxvt_term::scr_E ()
1337{ 1425{
1338 int i, j, k; 1426 int i, j, k;
1339 rend_t *r1, fs; 1427 rend_t *r1, fs;
1340 1428
1341 want_refresh = 1; 1429 want_refresh = 1;
1430 ZERO_SCROLLBACK ();
1431
1342 num_scr_allow = 0; 1432 num_scr_allow = 0;
1343 ZERO_SCROLLBACK ();
1344 selection_check (3); 1433 selection_check (3);
1345 1434
1346 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1347 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1348 { 1437 {
1349 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1350 fill_text (screen.text[k], 'E', TermWin.ncol); 1439 fill_text (screen.text[k], 'E', TermWin.ncol);
1351 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1375 if (insdel == DELETE) 1464 if (insdel == DELETE)
1376 return; 1465 return;
1377 else if (insdel == INSERT) 1466 else if (insdel == INSERT)
1378 count = end; 1467 count = end;
1379 } 1468 }
1380 screen.flags &= ~Screen_WrapNext; 1469
1470 scr_do_wrap ();
1381 1471
1382 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1472 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1383} 1473}
1384 1474
1385/* ------------------------------------------------------------------------- */ 1475/* ------------------------------------------------------------------------- */
… …
1399 ZERO_SCROLLBACK (); 1489 ZERO_SCROLLBACK ();
1400 1490
1401 if (count <= 0) 1491 if (count <= 0)
1402 return; 1492 return;
1403 1493
1494 scr_do_wrap ();
1495
1404 selection_check (1); 1496 selection_check (1);
1405 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1497 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1406 1498
1407 row = screen.cur.row + TermWin.saveLines; 1499 row = screen.cur.row + TermWin.saveLines;
1408 screen.flags &= ~Screen_WrapNext;
1409 1500
1410 stp = screen.text[row]; 1501 stp = screen.text[row];
1411 srp = screen.rend[row]; 1502 srp = screen.rend[row];
1412 slp = & (screen.tlen[row]); 1503 slp = &screen.tlen[row];
1413 1504
1414 switch (insdel) 1505 switch (insdel)
1415 { 1506 {
1416 case INSERT: 1507 case INSERT:
1417 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1418 col--)
1419 { 1509 {
1420 stp[col] = stp[col - count]; 1510 stp[col] = stp[col - count];
1421 srp[col] = srp[col - count]; 1511 srp[col] = srp[col - count];
1422 } 1512 }
1423 1513
… …
1433 if (selection.end.row != screen.cur.row 1523 if (selection.end.row != screen.cur.row
1434 || (selection.end.col + count >= TermWin.ncol)) 1524 || (selection.end.col + count >= TermWin.ncol))
1435 CLEAR_SELECTION (); 1525 CLEAR_SELECTION ();
1436 else 1526 else
1437 { /* shift selection */ 1527 { /* shift selection */
1438 selection.beg.col += count; 1528 selection.beg.col += count;
1439 selection.mark.col += count; /* XXX: yes? */ 1529 selection.mark.col += count; /* XXX: yes? */
1440 selection.end.col += count; 1530 selection.end.col += count;
1441 } 1531 }
1442 } 1532 }
1443 1533
1444 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1445 (unsigned int)count, rstyle); 1535 (unsigned int)count, rstyle);
1446 break; 1536 break;
1447 1537
1448 case ERASE: 1538 case ERASE:
1449 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1450 selection_check (1); 1540 selection_check (1);
1451 screen.cur.col -= count; 1541 screen.cur.col -= count;
1452 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1453 (unsigned int)count, rstyle); 1543 (unsigned int)count, rstyle);
1454 break; 1544 break;
1455 1545
1456 case DELETE: 1546 case DELETE:
1457 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1460 { 1550 {
1461 stp[col] = stp[col + count]; 1551 stp[col] = stp[col + count];
1462 srp[col] = srp[col + count]; 1552 srp[col] = srp[col + count];
1463 } 1553 }
1464 1554
1465 scr_blank_line (& (stp[TermWin.ncol - count]), 1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1466 & (srp[TermWin.ncol - count]),
1467 (unsigned int)count, tr); 1556 (unsigned int)count, tr);
1468 1557
1469 if (*slp == -1) /* break line continuation */ 1558 if (*slp == -1) /* break line continuation */
1470 *slp = TermWin.ncol; 1559 *slp = TermWin.ncol;
1471 1560
… …
1480 || selection.end.col >= TermWin.ncol) 1569 || selection.end.col >= TermWin.ncol)
1481 CLEAR_SELECTION (); 1570 CLEAR_SELECTION ();
1482 else 1571 else
1483 { 1572 {
1484 /* shift selection */ 1573 /* shift selection */
1485 selection.beg.col -= count; 1574 selection.beg.col -= count;
1486 selection.mark.col -= count; /* XXX: yes? */ 1575 selection.mark.col -= count; /* XXX: yes? */
1487 selection.end.col -= count; 1576 selection.end.col -= count;
1488 } 1577 }
1489 } 1578 }
1490 1579
1491 break; 1580 break;
1492 } 1581 }
… …
1538rxvt_term::scr_autowrap (int mode) 1627rxvt_term::scr_autowrap (int mode)
1539{ 1628{
1540 if (mode) 1629 if (mode)
1541 screen.flags |= Screen_Autowrap; 1630 screen.flags |= Screen_Autowrap;
1542 else 1631 else
1543 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1632 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1544} 1633}
1545 1634
1546/* ------------------------------------------------------------------------- */ 1635/* ------------------------------------------------------------------------- */
1547/* 1636/*
1548 * Set/unset margin origin mode 1637 * Set/unset margin origin mode
… …
1558{ 1647{
1559 if (mode) 1648 if (mode)
1560 screen.flags |= Screen_Relative; 1649 screen.flags |= Screen_Relative;
1561 else 1650 else
1562 screen.flags &= ~Screen_Relative; 1651 screen.flags &= ~Screen_Relative;
1652
1563 scr_gotorc (0, 0, 0); 1653 scr_gotorc (0, 0, 0);
1564} 1654}
1565 1655
1566/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
1567/* 1657/*
… …
1587 */ 1677 */
1588void 1678void
1589rxvt_term::scr_set_tab (int mode) 1679rxvt_term::scr_set_tab (int mode)
1590{ 1680{
1591 if (mode < 0) 1681 if (mode < 0)
1592 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1682 memset (tabs, 0, TermWin.ncol * sizeof (char));
1593 else if (screen.cur.col < TermWin.ncol) 1683 else if (screen.cur.col < TermWin.ncol)
1594 tabs[screen.cur.col] = (mode ? 1 : 0); 1684 tabs[screen.cur.col] = (mode ? 1 : 0);
1595} 1685}
1596 1686
1597/* ------------------------------------------------------------------------- */ 1687/* ------------------------------------------------------------------------- */
… …
1601 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1691 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1602 */ 1692 */
1603void 1693void
1604rxvt_term::scr_rvideo_mode (int mode) 1694rxvt_term::scr_rvideo_mode (int mode)
1605{ 1695{
1606 XGCValues gcvalue; 1696 XGCValues gcvalue;
1607 1697
1608 if (rvideo != mode) 1698 if (rvideo != mode)
1609 { 1699 {
1610 rvideo = mode; 1700 rvideo = mode;
1611 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1701 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1612#if defined(XPM_BACKGROUND) 1702#if XPM_BACKGROUND
1613 if (bgPixmap.pixmap == None) 1703 if (bgPixmap.pixmap == None)
1614#endif 1704#endif
1615#if defined(TRANSPARENT) 1705#if TRANSPARENT
1616 if (! (Options & Opt_transparent) || am_transparent == 0) 1706 if (! (options & Opt_transparent) || am_transparent == 0)
1617#endif 1707#endif
1618 XSetWindowBackground (display->display, TermWin.vt, 1708 XSetWindowBackground (display->display, TermWin.vt,
1619 PixColors[Color_bg]); 1709 pix_colors[Color_bg]);
1620 1710
1621 gcvalue.foreground = PixColors[Color_fg]; 1711 gcvalue.foreground = pix_colors[Color_fg];
1622 gcvalue.background = PixColors[Color_bg]; 1712 gcvalue.background = pix_colors[Color_bg];
1623 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1624 &gcvalue); 1714 &gcvalue);
1625 scr_clear (); 1715 scr_clear ();
1626 scr_touch (true); 1716 scr_touch (true);
1627 } 1717 }
… …
1675 * XTERM_SEQ: Invoke G2 character set: ESC N 1765 * XTERM_SEQ: Invoke G2 character set: ESC N
1676 * XTERM_SEQ: Invoke G3 character set: ESC O 1766 * XTERM_SEQ: Invoke G3 character set: ESC O
1677 */ 1767 */
1678void 1768void
1679rxvt_term::scr_charset_choose (int set) 1769rxvt_term::scr_charset_choose (int set)
1680 { 1770{
1681 screen.charset = set; 1771 screen.charset = set;
1682 set_font_style (); 1772 set_font_style ();
1683 } 1773}
1684 1774
1685/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1686/* 1776/*
1687 * Set a font 1777 * Set a font
1688 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1778 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1691 * XTERM_SEQ: Set G3 character set: ESC + <C> 1781 * XTERM_SEQ: Set G3 character set: ESC + <C>
1692 * See set_font_style for possible values for <C> 1782 * See set_font_style for possible values for <C>
1693 */ 1783 */
1694void 1784void
1695rxvt_term::scr_charset_set (int set, unsigned int ch) 1785rxvt_term::scr_charset_set (int set, unsigned int ch)
1696 { 1786{
1697 charsets[set] = (unsigned char)ch; 1787 charsets[set] = (unsigned char)ch;
1698 set_font_style (); 1788 set_font_style ();
1699 } 1789}
1700 1790
1701 1791
1702/* ------------------------------------------------------------------------- * 1792/* ------------------------------------------------------------------------- *
1703 * MAJOR SCREEN MANIPULATION * 1793 * MAJOR SCREEN MANIPULATION *
1704 * ------------------------------------------------------------------------- */ 1794 * ------------------------------------------------------------------------- */
… …
1743 row_col_t rc[RC_COUNT]; 1833 row_col_t rc[RC_COUNT];
1744 1834
1745 if (drawn_text == NULL) /* sanity check */ 1835 if (drawn_text == NULL) /* sanity check */
1746 return; 1836 return;
1747 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
1748#ifdef DEBUG_STRICT 1846#ifdef DEBUG_STRICT
1749 x = max (x, (int)TermWin.int_bwidth); 1847 x = max (x, 0);
1750 x = min (x, (int)TermWin.width); 1848 x = min (x, (int)TermWin.width);
1751 y = max (y, (int)TermWin.int_bwidth); 1849 y = max (y, 0);
1752 y = min (y, (int)TermWin.height); 1850 y = min (y, (int)TermWin.height);
1753#endif 1851#endif
1754 1852
1755 /* round down */ 1853 /* round down */
1756 rc[PART_BEG].col = Pixel2Col (x); 1854 rc[PART_BEG].col = Pixel2Col (x);
… …
1764 { 1862 {
1765 MIN_IT (rc[i].col, TermWin.ncol - 1); 1863 MIN_IT (rc[i].col, TermWin.ncol - 1);
1766 MIN_IT (rc[i].row, TermWin.nrow - 1); 1864 MIN_IT (rc[i].row, TermWin.nrow - 1);
1767 } 1865 }
1768 1866
1769 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));
1770
1771 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++)
1772 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);
1773 (rc[PART_END].col - rc[PART_BEG].col + 1));
1774 1869
1775 if (refresh) 1870 if (refresh)
1776 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1871 scr_refresh (SLOW_REFRESH);
1777} 1872}
1778 1873
1779/* ------------------------------------------------------------------------- */ 1874/* ------------------------------------------------------------------------- */
1780/* 1875/*
1781 * Refresh the entire screen 1876 * Refresh the entire screen
… …
1793 */ 1888 */
1794int 1889int
1795rxvt_term::scr_move_to (int y, int len) 1890rxvt_term::scr_move_to (int y, int len)
1796{ 1891{
1797 long p = 0; 1892 long p = 0;
1798 uint16_t oldviewstart; 1893 unsigned int oldviewstart;
1799 1894
1800 oldviewstart = TermWin.view_start; 1895 oldviewstart = TermWin.view_start;
1896
1801 if (y < len) 1897 if (y < len)
1802 { 1898 {
1803 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1804 p -= (long) (TermWin.nrow - 1); 1900 p -= (long) (TermWin.nrow - 1);
1805 p = max (p, 0); 1901 p = max (p, 0);
1806 } 1902 }
1903
1807 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1808 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1809 1905
1810 return scr_changeview (oldviewstart); 1906 return scr_changeview (oldviewstart);
1811} 1907}
1812 1908
1813/* ------------------------------------------------------------------------- */ 1909/* ------------------------------------------------------------------------- */
… …
1816 * direction should be UP or DN 1912 * direction should be UP or DN
1817 */ 1913 */
1818int 1914int
1819rxvt_term::scr_page (enum page_dirn direction, int nlines) 1915rxvt_term::scr_page (enum page_dirn direction, int nlines)
1820{ 1916{
1821 int n; 1917 int n;
1822 uint16_t oldviewstart; 1918 unsigned int oldviewstart;
1823 1919
1824 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1825#ifdef DEBUG_STRICT
1826 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1827#endif
1828 oldviewstart = TermWin.view_start; 1920 oldviewstart = TermWin.view_start;
1921
1829 if (direction == UP) 1922 if (direction == UP)
1830 { 1923 {
1831 n = TermWin.view_start + nlines; 1924 n = TermWin.view_start + nlines;
1832 TermWin.view_start = min (n, TermWin.nscrolled); 1925 TermWin.view_start = min (n, TermWin.nscrolled);
1833 } 1926 }
1834 else 1927 else
1835 { 1928 {
1836 n = TermWin.view_start - nlines; 1929 n = TermWin.view_start - nlines;
1837 TermWin.view_start = max (n, 0); 1930 TermWin.view_start = max (n, 0);
1838 } 1931 }
1932
1839 return scr_changeview (oldviewstart); 1933 return scr_changeview (oldviewstart);
1840} 1934}
1841 1935
1842int 1936int
1843rxvt_term::scr_changeview (uint16_t oldviewstart) 1937rxvt_term::scr_changeview (unsigned int oldviewstart)
1844{ 1938{
1845 if (TermWin.view_start != oldviewstart) 1939 if (TermWin.view_start != oldviewstart)
1846 { 1940 {
1847 want_refresh = 1; 1941 want_refresh = 1;
1848 num_scr -= (TermWin.view_start - oldviewstart); 1942 num_scr -= (TermWin.view_start - oldviewstart);
… …
1856rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1857{ 1951{
1858#ifndef NO_BELL 1952#ifndef NO_BELL
1859# ifndef NO_MAPALERT 1953# ifndef NO_MAPALERT
1860# ifdef MAPALERT_OPTION 1954# ifdef MAPALERT_OPTION
1861 if (Options & Opt_mapAlert) 1955 if (options & Opt_mapAlert)
1862# endif 1956# endif
1863 XMapWindow (display->display, TermWin.parent[0]); 1957 XMapWindow (display->display, TermWin.parent[0]);
1864# endif 1958# endif
1865 if (Options & Opt_visualBell) 1959 if (options & Opt_visualBell)
1866 { 1960 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1961 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 scr_rvideo_mode (!rvideo); /* refresh also done */ 1962 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 } 1963 }
1870 else 1964 else
… …
1876/* ARGSUSED */ 1970/* ARGSUSED */
1877void 1971void
1878rxvt_term::scr_printscreen (int fullhist) 1972rxvt_term::scr_printscreen (int fullhist)
1879{ 1973{
1880#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1881 int i, r1, nrows, row_offset; 1975 int i, r1, nrows, row_offset;
1882 text_t *t; 1976 FILE *fd;
1883 FILE *fd;
1884 1977
1885 if ((fd = popen_printer ()) == NULL) 1978 if ((fd = popen_printer ()) == NULL)
1886 return; 1979 return;
1980
1887 nrows = TermWin.nrow; 1981 nrows = TermWin.nrow;
1888 row_offset = TermWin.saveLines; 1982 row_offset = TermWin.saveLines;
1983
1889 if (!fullhist) 1984 if (!fullhist)
1890 row_offset -= TermWin.view_start; 1985 row_offset -= TermWin.view_start;
1891 else 1986 else
1892 { 1987 {
1893 nrows += TermWin.nscrolled; 1988 nrows += TermWin.nscrolled;
1894 row_offset -= TermWin.nscrolled; 1989 row_offset -= TermWin.nscrolled;
1895 } 1990 }
1896 1991
1992 wctomb (0, 0);
1993
1897 for (r1 = 0; r1 < nrows; r1++) 1994 for (r1 = 0; r1 < nrows; r1++)
1898 { 1995 {
1899 t = screen.text[r1 + row_offset]; 1996 text_t *tp = screen.text[r1 + row_offset];
1900 for (i = TermWin.ncol - 1; i >= 0; i--) 1997 int len = screen.tlen[r1 + row_offset];
1901 if (!isspace (t[i])) 1998
1902 break; 1999 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1903 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);
1904 } 2018 }
2019
1905 pclose_printer (fd); 2020 pclose_printer (fd);
1906#endif 2021#endif
1907} 2022}
1908 2023
1909/* ------------------------------------------------------------------------- */ 2024/* ------------------------------------------------------------------------- */
1910/* 2025/*
1911 * Refresh the screen 2026 * Refresh the screen
1912 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
1913 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
1914 */ 2029 */
1915
1916#define FONT_WIDTH(X, Y) \
1917 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1918#define FONT_RBEAR(X, Y) \
1919 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1920#define FONT_LBEAR(X, Y) \
1921 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1922#define IS_FONT_CHAR(X, Y) \
1923 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1924
1925void 2030void
1926rxvt_term::scr_refresh (unsigned char refresh_type) 2031rxvt_term::scr_refresh (unsigned char refresh_type)
1927{ 2032{
1928 unsigned char clearfirst, /* first character writes before cell */
1929 clearlast, /* last character writes beyond cell */
1930 must_clear, /* use draw_string not draw_image_string */ 2033 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 rvid, /* reverse video this position */
1932 showcursor; /* show the cursor */ 2034 showcursor; /* show the cursor */
1933 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
1934 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
1935 int i, /* tmp */ 2037 int i, /* tmp */
1936 row_offset; /* basic offset in screen structure */ 2038 row_offset; /* basic offset in screen structure */
1937#ifndef NO_CURSORCOLOR 2039#ifndef NO_CURSORCOLOR
1938 rend_t cc1; /* store colours at cursor position (s) */ 2040 rend_t cc1; /* store colours at cursor position (s) */
1939#endif 2041#endif
1940 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2042 rend_t *crp; // cursor rendition pointer
1941 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2043
2044 want_refresh = 0; /* screen is current */
1942 2045
1943 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2046 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1944 return; 2047 return;
1945 2048
1946 /* 2049 /*
1947 * A: set up vars 2050 * A: set up vars
1948 */ 2051 */
1949 clearfirst = clearlast = must_clear = 0; 2052 must_clear = 0;
1950
1951 refresh_count = 0; 2053 refresh_count = 0;
1952 2054
1953 row_offset = TermWin.saveLines - TermWin.view_start; 2055 row_offset = TermWin.saveLines - TermWin.view_start;
1954 2056
1955 if ((refresh_type & REFRESH_BOUNDS))
1956 {
1957 clearfirst = clearlast = 1;
1958 refresh_type &= ~REFRESH_BOUNDS;
1959 }
1960
1961#ifdef XPM_BACKGROUND 2057#if XPM_BACKGROUND
1962 must_clear |= (bgPixmap.pixmap != None); 2058 must_clear |= bgPixmap.pixmap != None;
1963#endif 2059#endif
1964#ifdef TRANSPARENT 2060#if TRANSPARENT
1965 must_clear |= ((Options & Opt_transparent) && am_transparent); 2061 must_clear |= (options & Opt_transparent) && am_transparent;
1966#endif 2062#endif
1967 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1968 2064
1969 /* 2065 /*
1970 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
1985 showcursor = 0; 2081 showcursor = 0;
1986#endif 2082#endif
1987 2083
1988 if (showcursor) 2084 if (showcursor)
1989 { 2085 {
2086 int col = screen.cur.col;
2087
2088 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2089 col--;
2090
1990 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2091 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1991 2092
1992 if (showcursor && TermWin.focus) 2093 if (showcursor && TermWin.focus)
1993 { 2094 {
2095 if (options & Opt_cursorUnderline)
2096 *crp ^= RS_Uline;
2097 else
2098 {
1994 *srp ^= RS_RVid; 2099 *crp ^= RS_RVid;
2100
1995#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
1996 cc1 = *srp & (RS_fgMask | RS_bgMask); 2102 cc1 = *crp & (RS_fgMask | RS_bgMask);
1997 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
1998 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
1999 else 2105 else
2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2001 ccol1 = GET_FGCOLOR (rstyle); 2107 ccol1 = GET_FGCOLOR (rstyle);
2002#else 2108#else
2003 ccol1 = Color_fg; 2109 ccol1 = Color_fg;
2004#endif 2110#endif
2005 if (ISSET_PIXCOLOR (Color_cursor2)) 2111 if (ISSET_PIXCOLOR (Color_cursor2))
2006 ccol2 = Color_cursor2; 2112 ccol2 = Color_cursor2;
2007 else 2113 else
2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2114#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2009 ccol2 = GET_BGCOLOR (rstyle); 2115 ccol2 = GET_BGCOLOR (rstyle);
2010#else 2116#else
2011 ccol2 = Color_bg; 2117 ccol2 = Color_bg;
2012#endif 2118#endif
2013 *srp = SET_FGCOLOR (*srp, ccol1); 2119 *crp = SET_FGCOLOR (*crp, ccol1);
2014 *srp = SET_BGCOLOR (*srp, ccol2); 2120 *crp = SET_BGCOLOR (*crp, ccol2);
2015#endif 2121#endif
2122 }
2016 } 2123 }
2017 } 2124 }
2018 2125
2019 /* make sure no outline cursor is left around */ 2126 /* make sure no outline cursor is left around */
2020 setoldcursor = 0; 2127 setoldcursor = 0;
… …
2046 oldcursor.col = screen.cur.col; 2153 oldcursor.col = screen.cur.col;
2047 } 2154 }
2048 } 2155 }
2049 } 2156 }
2050 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
2051#ifndef NO_SLOW_LINK_SUPPORT 2165#ifndef NO_SLOW_LINK_SUPPORT
2052 /* 2166 /*
2053 * D: CopyArea pass - very useful for slower links 2167 * D: CopyArea pass - very useful for slower links
2054 * This has been deliberately kept simple. 2168 * This has been deliberately kept simple.
2055 */ 2169 */
2056 i = num_scr; 2170 i = num_scr;
2171 if (!display->is_local
2057 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2172 && refresh_type == FAST_REFRESH && num_scr_allow && i
2058 && abs (i) < TermWin.nrow && !must_clear) 2173 && abs (i) < TermWin.nrow && !must_clear)
2059 { 2174 {
2060 int16_t nits; 2175 int16_t nits;
2061 int j; 2176 int j;
2062 rend_t *drp2;
2063 text_t *dtp2;
2064 int len, wlen; 2177 int len, wlen;
2065 2178
2066 j = TermWin.nrow; 2179 j = TermWin.nrow;
2067 wlen = len = -1; 2180 wlen = len = -1;
2068 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2069 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2182 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2070 { 2183 {
2071 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2184 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2072 { 2185 {
2073 stp = screen.text[row + row_offset]; 2186 text_t *stp = screen.text[row + row_offset];
2074 srp = screen.rend[row + row_offset]; 2187 rend_t *srp = screen.rend[row + row_offset];
2075 dtp = drawn_text[row]; 2188 text_t *dtp = drawn_text[row];
2076 dtp2 = drawn_text[row + i]; 2189 text_t *dtp2 = drawn_text[row + i];
2077 drp = drawn_rend[row]; 2190 rend_t *drp = drawn_rend[row];
2078 drp2 = drawn_rend[row + i]; 2191 rend_t *drp2 = drawn_rend[row + i];
2079 2192
2080 for (nits = 0, col = TermWin.ncol; col--; ) 2193 for (nits = 0, col = TermWin.ncol; col--; )
2081 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2194 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2082 nits--; 2195 nits--;
2083 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2196 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2103 { 2216 {
2104 /* also comes here at end if needed because of >= above */ 2217 /* also comes here at end if needed because of >= above */
2105 if (wlen < len) 2218 if (wlen < len)
2106 SWAP_IT (wlen, len, int); 2219 SWAP_IT (wlen, len, int);
2107 2220
2108 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2109 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2221 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2110 TermWin.gc, 0, Row2Pixel (len + i), 2222 TermWin.gc, 0, Row2Pixel (len + i),
2111 (unsigned int)TermWin_TotalWidth (), 2223 (unsigned int)TermWin_TotalWidth (),
2112 (unsigned int)Height2Pixel (wlen - len + 1), 2224 (unsigned int)Height2Pixel (wlen - len + 1),
2113 0, Row2Pixel (len)); 2225 0, Row2Pixel (len));
… …
2120 /* 2232 /*
2121 * E: main pass across every character 2233 * E: main pass across every character
2122 */ 2234 */
2123 for (row = 0; row < TermWin.nrow; row++) 2235 for (row = 0; row < TermWin.nrow; row++)
2124 { 2236 {
2125 stp = screen.text[row + row_offset]; 2237 text_t *stp = screen.text[row + row_offset];
2126 srp = screen.rend[row + row_offset]; 2238 rend_t *srp = screen.rend[row + row_offset];
2127 dtp = drawn_text[row]; 2239 text_t *dtp = drawn_text[row];
2128 drp = drawn_rend[row]; 2240 rend_t *drp = drawn_rend[row];
2129 2241
2130 /* 2242 /*
2131 * E2: OK, now the real pass 2243 * E2: OK, now the real pass
2132 */ 2244 */
2133 int ypixel = (int)Row2Pixel (row); 2245 int ypixel = (int)Row2Pixel (row);
2134 2246
2135 for (col = 0; col < TermWin.ncol; col++) 2247 for (col = 0; col < TermWin.ncol; col++)
2136 { 2248 {
2137 /* compare new text with old - if exactly the same then continue */ 2249 /* compare new text with old - if exactly the same then continue */
2138 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2250 if (stp[col] == dtp[col] /* Must match characters to skip. */
2139 && (srp[col] == drp[col] /* Either rendition the same or */ 2251 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2140 || (stp[col] == ' ' /* space w/ no background change */ 2252 || (stp[col] == ' ' /* space w/ no background change */
2141 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2253 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2142 continue; 2254 continue;
2143 2255
2144 // redraw one or more characters 2256 // redraw one or more characters
2145 2257
2146 // seek to the beginning if wide characters 2258 // seek to the beginning of wide characters
2147 while (stp[col] == NOCHAR && col > 0) 2259 while (stp[col] == NOCHAR && col > 0)
2148 --col; 2260 --col;
2149 2261
2150 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2151 text_t *text = stp + col; 2263 text_t *text = stp + col;
… …
2154 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2155 drp[col] = rend; 2267 drp[col] = rend;
2156 2268
2157 int xpixel = Col2Pixel (col); 2269 int xpixel = Col2Pixel (col);
2158 2270
2159 // this loop looks very messy, it can probably be optimized
2160 // and cleaned a bit by you?
2161 for (i = 0; ++col < TermWin.ncol; ) 2271 for (i = 0; ++col < TermWin.ncol; )
2162 { 2272 {
2163 if (stp[col] == NOCHAR) 2273 if (stp[col] == NOCHAR)
2164 { 2274 {
2165 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2166 drp[col] = rend; 2276 drp[col] = rend;
2167 count++; 2277 count++;
2168
2169 if (i) // only possible skip if char unchanged
2170 i++; 2278 i++;
2171 2279
2172 continue; 2280 continue;
2173 } 2281 }
2174 2282
2175 if (rend != srp[col]) 2283 if (!RS_SAME (rend, srp[col]))
2176 break; 2284 break;
2177 2285
2178 count++; 2286 count++;
2179 2287
2180 if (stp[col] != dtp[col] 2288 if (stp[col] != dtp[col]
2181 || srp[col] != drp[col]) 2289 || !RS_SAME (srp[col], drp[col]))
2182 { 2290 {
2183 if (must_clear && (i++ > (count / 2))) 2291 if (must_clear && (i++ > count / 2))
2184 break; 2292 break;
2185 2293
2186 dtp[col] = stp[col]; 2294 dtp[col] = stp[col];
2187 drp[col] = rend; 2295 drp[col] = rend;
2188 i = 0; 2296 i = 0;
2189 } 2297 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2298 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2191 break; 2299 break;
2192 } 2300 }
2193 2301
2194 col--; /* went one too far. move back */ 2302 col--; /* went one too far. move back */
2195 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
2196 2320
2197 /* 2321 /*
2198 * Determine the attributes for the string 2322 * Determine the attributes for the string
2199 */ 2323 */
2200 int fid = GET_FONT (rend);
2201 int fore = GET_FGCOLOR (rend); // desired foreground 2324 int fore = GET_FGCOLOR (rend); // desired foreground
2202 int back = GET_BGCOLOR (rend); // desired background 2325 int back = GET_BGCOLOR (rend); // desired background
2203 2326
2204 rend = GET_ATTR (rend); 2327 // only do special processing if ana attributes are set, which is rare
2205 2328 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2206 rvid = !!(rend & RS_RVid); 2329 {
2330 bool invert = rend & RS_RVid;
2207 2331
2208#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2209 if (rend & RS_Bold && fore == Color_fg) 2333 if (rend & RS_Bold
2334 && fore == Color_fg)
2210 { 2335 {
2211 if (ISSET_PIXCOLOR (Color_BD)) 2336 if (ISSET_PIXCOLOR (Color_BD))
2212 fore = Color_BD; 2337 fore = Color_BD;
2338# if !ENABLE_STYLES
2213 else 2339 else
2214 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
2215 } 2381 }
2216
2217 if (rend & RS_Uline)
2218 if (ISSET_PIXCOLOR (Color_UL))
2219 fore = Color_UL;
2220#endif
2221
2222 if (rvid)
2223 {
2224 SWAP_IT (fore, back, int);
2225
2226#ifndef NO_BOLD_UNDERLINE_REVERSE
2227 if (ISSET_PIXCOLOR (Color_RV)
2228# ifndef NO_CURSORCOLOR
2229 && !ISSET_PIXCOLOR (Color_cursor)
2230# endif
2231 )
2232 back = Color_RV;
2233#endif
2234 }
2235
2236#ifdef TEXT_BLINK
2237 if (rend & RS_Blink && back == Color_bg)
2238 {
2239 if (!text_blink_ev.active)
2240 {
2241 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2242 hidden_text = 0;
2243 }
2244 else if (hidden_text)
2245 fore = back;
2246 }
2247#endif
2248 2382
2249 /* 2383 /*
2250 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2251 */ 2385 */
2252 rxvt_font *font = (*TermWin.fontset)[fid]; 2386 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2253 2387
2254 if (back == fore) 2388 if (back == fore)
2255 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2389 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2256 TermWin.fwidth * count, TermWin.fheight, 2390 TermWin.fwidth * count, TermWin.fheight,
2257 back); 2391 back);
… …
2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2406 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2273 } 2407 }
2274 else 2408 else
2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2409 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2276 2410
2277 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
2278 XDrawLine (display->display, drawBuffer, TermWin.gc, 2420 XDrawLine (display->display, drawBuffer, TermWin.gc,
2279 xpixel, ypixel + font->ascent + 1, 2421 xpixel, ypixel + font->ascent + 1,
2280 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2422 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2423 }
2281 } /* for (col....) */ 2424 } /* for (col....) */
2282 } /* for (row....) */ 2425 } /* for (row....) */
2426
2427#if ENABLE_OVERLAY
2428 scr_swap_overlay ();
2429#endif
2283 2430
2284 /* 2431 /*
2285 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2286 */ 2433 */
2287 if (showcursor) 2434 if (showcursor)
2288 { 2435 {
2289 if (TermWin.focus) 2436 if (TermWin.focus)
2290 { 2437 {
2291 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2438 if (options & Opt_cursorUnderline)
2292 [screen.cur.col]); 2439 *crp ^= RS_Uline;
2440 else
2441 {
2293 *srp ^= RS_RVid; 2442 *crp ^= RS_RVid;
2294#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
2295 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2444 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2296#endif 2445#endif
2446 }
2297 } 2447 }
2298 else if (oldcursor.row >= 0) 2448 else if (oldcursor.row >= 0)
2299 { 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
2300#ifndef NO_CURSORCOLOR 2460#ifndef NO_CURSORCOLOR
2301 if (ISSET_PIXCOLOR (Color_cursor)) 2461 if (ISSET_PIXCOLOR (Color_cursor))
2302 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2462 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2303#endif 2463#endif
2304 int cursorwidth = 1;
2305 while (oldcursor.col + cursorwidth < TermWin.ncol
2306 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2307 cursorwidth++;
2308 2464
2309 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2465 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2310 Col2Pixel (oldcursor.col), 2466 Col2Pixel (col),
2311 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2312 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2313 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2314 } 2470 }
2315 } 2471 }
… …
2317 /* 2473 /*
2318 * H: cleanup selection 2474 * H: cleanup selection
2319 */ 2475 */
2320 scr_reverse_selection (); 2476 scr_reverse_selection ();
2321 2477
2322 /*
2323 * I: other general cleanup
2324 */
2325 if (clearfirst && TermWin.int_bwidth)
2326 /*
2327 * clear the whole screen height, note that width == 0 is treated
2328 * specially by XClearArea
2329 */
2330 XClearArea (display->display, TermWin.vt, 0, 0,
2331 (unsigned int)TermWin.int_bwidth,
2332 (unsigned int)TermWin_TotalHeight (), False);
2333
2334 if (clearlast && TermWin.int_bwidth)
2335 /*
2336 * clear the whole screen height, note that width == 0 is treated
2337 * specially by XClearArea
2338 */
2339 XClearArea (display->display, TermWin.vt,
2340 TermWin.width + TermWin.int_bwidth, 0,
2341 (unsigned int)TermWin.int_bwidth,
2342 (unsigned int)TermWin_TotalHeight (), False);
2343
2344 if (refresh_type & SMOOTH_REFRESH) 2478 if (refresh_type & SMOOTH_REFRESH)
2345 XSync (display->display, False); 2479 XFlush (display->display);
2346 2480
2347 num_scr = 0; 2481 num_scr = 0;
2348 num_scr_allow = 1; 2482 num_scr_allow = 1;
2349 want_refresh = 0; /* screen is current */
2350} 2483}
2351 2484
2352void 2485void
2353rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2486rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2354{ 2487{
2355 if (!rp || !tp) 2488 if (!rp || !tp)
2356 return; 2489 return;
2357 2490
2358 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2491 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2359 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2492 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2360} 2493}
2361 2494
2362void 2495void
2363rxvt_term::scr_remap_chars () 2496rxvt_term::scr_remap_chars ()
2364{ 2497{
… …
2370 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2503 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2371 scr_remap_chars (swap.text[i], swap.rend[i]); 2504 scr_remap_chars (swap.text[i], swap.rend[i]);
2372 } 2505 }
2373} 2506}
2374 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
2375/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2376void 2539void
2377rxvt_term::scr_clear (bool really) 2540rxvt_term::scr_clear (bool really)
2378{ 2541{
2379 if (!TermWin.mapped) 2542 if (!TermWin.mapped)
2380 return; 2543 return;
2381 2544
2382 num_scr_allow = 0; 2545 num_scr_allow = 0;
2383 want_refresh = 1; 2546 want_refresh = 1;
2384 2547
2385#ifdef TRANSPARENT 2548#if TRANSPARENT
2386 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2549 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2387 { 2550 {
2388 int i; 2551 int i;
2389 2552
2390 if (! (Options & Opt_transparent_all)) 2553 if (!(options & Opt_transparent_all))
2391 i = 0; 2554 i = 0;
2392 else 2555 else
2393 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2556 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2394 2557
2395 while (i--) 2558 while (i--)
… …
2411 int end_row = TermWin.saveLines - TermWin.view_start; 2574 int end_row = TermWin.saveLines - TermWin.view_start;
2412 int i = selection.beg.row + TermWin.saveLines; 2575 int i = selection.beg.row + TermWin.saveLines;
2413 int col, row = selection.end.row + TermWin.saveLines; 2576 int col, row = selection.end.row + TermWin.saveLines;
2414 rend_t *srp; 2577 rend_t *srp;
2415 2578
2416 if (i >= end_row) 2579#if ENABLE_FRILLS
2417 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 }
2418 else 2588 else
2589#endif
2590 {
2591 if (i >= end_row)
2592 col = selection.beg.col;
2593 else
2419 { 2594 {
2420 col = 0; 2595 col = 0;
2421 i = end_row; 2596 i = end_row;
2422 } 2597 }
2423 2598
2424 end_row += TermWin.nrow; 2599 end_row += TermWin.nrow;
2600
2425 for (; i < row && i < end_row; i++, col = 0) 2601 for (; i < row && i < end_row; i++, col = 0)
2426 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2602 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2427 srp[col] ^= RS_RVid; 2603 srp[col] ^= RS_RVid;
2428 2604
2429 if (i == row && i < end_row) 2605 if (i == row && i < end_row)
2430 for (srp = screen.rend[i]; col < selection.end.col; col++) 2606 for (srp = screen.rend[i]; col < selection.end.col; col++)
2431 srp[col] ^= RS_RVid; 2607 srp[col] ^= RS_RVid;
2608 }
2432 } 2609 }
2433} 2610}
2434 2611
2435/* ------------------------------------------------------------------------- */ 2612/* ------------------------------------------------------------------------- */
2436/* 2613/*
… …
2472 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2649 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2473 */ 2650 */
2474void 2651void
2475rxvt_term::selection_check (int check_more) 2652rxvt_term::selection_check (int check_more)
2476{ 2653{
2477 row_col_t pos; 2654 row_col_t pos;
2478 2655
2479 if (!selection.op) 2656 if (!selection.op)
2480 return; 2657 return;
2481 2658
2482 pos.row = pos.col = 0; 2659 pos.row = pos.col = 0;
… …
2504/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2505/* 2682/*
2506 * Paste a selection direct to the command fd 2683 * Paste a selection direct to the command fd
2507 */ 2684 */
2508void 2685void
2509rxvt_term::paste (const unsigned char *data, unsigned int len) 2686rxvt_term::paste (unsigned char *data, unsigned int len)
2510{ 2687{
2511 unsigned int i, j, n;
2512 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2513
2514#if 0
2515 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2516 ZERO_SCROLLBACK (r);
2517#endif
2518
2519 /* convert normal newline chars into common keyboard Return key sequence */ 2688 /* convert normal newline chars into common keyboard Return key sequence */
2520 for (i = 0; i < len; i += PROP_SIZE) 2689 for (unsigned int i = 0; i < len; i++)
2521 {
2522 n = min (len - i, PROP_SIZE);
2523 MEMCPY (ds, data + i, n);
2524
2525 for (j = 0; j < n; j++)
2526 if (ds[j] == C0_LF) 2690 if (data[i] == C0_LF)
2527 ds[j] = C0_CR; 2691 data[i] = C0_CR;
2528 2692
2529 tt_write (ds, (int)n); 2693 tt_write (data, len);
2530 }
2531
2532 free (ds);
2533} 2694}
2534 2695
2535/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2536/* 2697/*
2537 * Respond to a notification that a primary selection has been sent 2698 * Respond to a notification that a primary selection has been sent
2538 * EXT: SelectionNotify 2699 * EXT: SelectionNotify
2539 */ 2700 */
2540int 2701void
2541rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2542{ 2703{
2543 long nread = 0;
2544 unsigned long bytes_after;
2545 XTextProperty ct;
2546
2547 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2548
2549 if (prop == None) /* check for failed XConvertSelection */ 2704 if (prop == None) /* check for failed XConvertSelection */
2550 { 2705 {
2551 if ((selection_type & Sel_CompoundText)) 2706 if ((selection_type & Sel_CompoundText))
2552 { 2707 {
2553 int selnum = selection_type & Sel_whereMask; 2708 int selnum = selection_type & Sel_whereMask;
… …
2566 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2567 else 2722 else
2568 selection_type = 0; 2723 selection_type = 0;
2569 } 2724 }
2570 2725
2571 return 0; 2726 return;
2572 }
2573
2574 for (;;)
2575 { 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
2576 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2751 if (XGetWindowProperty (display->display, win, prop,
2577 (long) (PROP_SIZE / 4), delete_prop, 2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2578 AnyPropertyType, &ct.encoding, &ct.format, 2754 &ct2.encoding, &ct2.format,
2579 &ct.nitems, &bytes_after, 2755 &ct2.nitems, &bytes_after,
2580 &ct.value) != Success) 2756 &ct2.value) != Success)
2581 break; 2757 goto bailout;
2582 2758
2583 if (ct.encoding == 0) 2759 // realloc should be compatible to XFree, here, and elsewhere, too
2584 { 2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2585 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2586 break; 2762 ct.nitems += ct2.nitems;
2587 }
2588 2763
2764 XFree (ct2.value);
2765 }
2766
2589 if (ct.value == NULL) 2767 if (ct.value == 0)
2590 { 2768 goto bailout;
2591 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2592 continue;
2593 }
2594 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
2595 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 ();
2596 { 2796 }
2597 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2797 else
2598 2798 {
2599 if (selection_wait == Sel_normal && nread == 0 2799 if (selection_wait == Sel_normal
2600 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2601 { 2801 {
2602 /* 2802 /*
2603 * pass through again trying CUT_BUFFER0 if we've come from 2803 * pass through again trying CUT_BUFFER0 if we've come from
2604 * XConvertSelection () but nothing was presented 2804 * XConvertSelection () but nothing was presented
2605 */ 2805 */
2606 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2607 selection_paste (display->root, XA_CUT_BUFFER0, False); 2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2608 } 2807 }
2609 2808
2610 nread = -1; /* discount any previous stuff */ 2809 goto bailout;
2611 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)
2612 } 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 }
2613 2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2614 nread += ct.nitems; 2823 incr_buf_fill += ct.nitems;
2615 2824
2825 goto bailout;
2826 }
2827
2616 char **cl; 2828 char **cl;
2617 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
2618 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2845 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2619 &cr) >= 0 && cl) 2846 && cl)
2620 { 2847 {
2621 for (int i = 0; i < cr; i++) 2848 for (int i = 0; i < cr; i++)
2622 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2849 paste ((unsigned char *)cl[i], strlen (cl[i]));
2623 2850
2624 XFreeStringList (cl); 2851 XFreeStringList (cl);
2625 } 2852 }
2626 else 2853 else
2627 paste (ct.value, ct.nitems); 2854 paste (ct.value, ct.nitems); // paste raw
2628 2855
2629 if (bytes_after == 0) 2856bailout:
2630 break;
2631
2632 XFree (ct.value);
2633 }
2634
2635 if (ct.value)
2636 XFree (ct.value); 2857 XFree (ct.value);
2637 2858
2638 if (selection_wait == Sel_normal) 2859 if (selection_wait == Sel_normal)
2639 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2640
2641 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2642 return (int)nread;
2643} 2861}
2644 2862
2645void 2863void
2646rxvt_term::incr_cb (time_watcher &w) 2864rxvt_term::incr_cb (time_watcher &w)
2647{ 2865{
2648 selection_wait = Sel_none; 2866 selection_wait = Sel_none;
2649 2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2650 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2651} 2872}
2652 2873
2653/*
2654 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2655 */
2656void 2874void
2657rxvt_term::selection_property (Window win, Atom prop) 2875rxvt_term::selection_property (Window win, Atom prop)
2658{ 2876{
2659 int reget_time = 0; 2877 if (prop == None || selection_wait != Sel_incr)
2660
2661 if (prop == None)
2662 return; 2878 return;
2663 2879
2664 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2665 if (selection_wait == Sel_normal)
2666 {
2667 int a, afmt;
2668 Atom atype;
2669 unsigned long bytes_after, nitems;
2670 unsigned char *s = NULL;
2671
2672 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2673 xa[XA_INCR], &atype, &afmt, &nitems,
2674 &bytes_after, &s);
2675 if (s)
2676 XFree (s);
2677 if (a != Success)
2678 return;
2679
2680#ifndef __CYGWIN32__
2681 if (atype == xa[XA_INCR])
2682 { /* start an INCR transfer */
2683 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2684 XDeleteProperty (display->display, win, prop);
2685 XFlush (display->display);
2686 reget_time = 1;
2687 selection_wait = Sel_incr;
2688 }
2689#endif
2690
2691 }
2692 else if (selection_wait == Sel_incr)
2693 {
2694 reget_time = 1;
2695
2696 if (selection_paste (win, prop, True) == -1) 2880 selection_paste (win, prop, true);
2697 {
2698 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2699 selection_wait = Sel_none;
2700 incr_ev.stop ();
2701 }
2702 }
2703 if (reget_time) /* received more data so reget time */
2704 incr_ev.start (NOW + 10);
2705} 2881}
2706 2882
2707/* ------------------------------------------------------------------------- */ 2883/* ------------------------------------------------------------------------- */
2708/* 2884/*
2709 * Request the current selection: 2885 * Request the current selection:
… …
2715 * EXT: button 2 release 2891 * EXT: button 2 release
2716 */ 2892 */
2717void 2893void
2718rxvt_term::selection_request (Time tm, int x, int y) 2894rxvt_term::selection_request (Time tm, int x, int y)
2719{ 2895{
2720 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2721
2722 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2896 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2723 return; /* outside window */ 2897 return; /* outside window */
2724 2898
2725 if (selection.text) 2899 if (selection.text)
2726 { /* internal selection */ 2900 { /* internal selection */
2727 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2728 char *str = rxvt_wcstombs (selection.text, selection.len); 2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2729 paste ((unsigned char *)str, strlen (str)); 2902 paste ((unsigned char *)str, strlen (str));
2730 free (str); 2903 free (str);
2731 return; 2904 return;
2732 } 2905 }
… …
2746#else 2919#else
2747 selection_type = Sel_CompoundText; 2920 selection_type = Sel_CompoundText;
2748 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2921 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2749 return; 2922 return;
2750#endif 2923#endif
2751
2752 } 2924 }
2753 } 2925 }
2754 2926
2755 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2927 selection_wait = Sel_none; /* don't loop in selection_paste () */
2756 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2757 selection_paste (display->root, XA_CUT_BUFFER0, False); 2928 selection_paste (display->root, XA_CUT_BUFFER0, false);
2758} 2929}
2759 2930
2760int 2931int
2761rxvt_term::selection_request_other (Atom target, int selnum) 2932rxvt_term::selection_request_other (Atom target, int selnum)
2762{ 2933{
2763 Atom sel; 2934 Atom sel;
2764#ifdef DEBUG_SELECT
2765 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2766#endif
2767 2935
2768 selection_type |= selnum; 2936 selection_type |= selnum;
2769 2937
2770 if (selnum == Sel_Primary) 2938 if (selnum == Sel_Primary)
2771 sel = XA_PRIMARY; 2939 sel = XA_PRIMARY;
… …
2774 else 2942 else
2775 sel = xa[XA_CLIPBOARD]; 2943 sel = xa[XA_CLIPBOARD];
2776 2944
2777 if (XGetSelectionOwner (display->display, sel) != None) 2945 if (XGetSelectionOwner (display->display, sel) != None)
2778 { 2946 {
2779 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2780 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2947 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2781 TermWin.vt, selection_request_time); 2948 TermWin.vt, selection_request_time);
2782 return 1; 2949 return 1;
2783 } 2950 }
2784 2951
… …
2791 * EXT: SelectionClear 2958 * EXT: SelectionClear
2792 */ 2959 */
2793void 2960void
2794rxvt_term::selection_clear () 2961rxvt_term::selection_clear ()
2795{ 2962{
2796 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2797
2798 want_refresh = 1; 2963 want_refresh = 1;
2799 free (selection.text); 2964 free (selection.text);
2800 selection.text = NULL; 2965 selection.text = NULL;
2801 selection.len = 0; 2966 selection.len = 0;
2802 CLEAR_SELECTION (); 2967 CLEAR_SELECTION ();
… …
2815{ 2980{
2816 int i, col, end_col, row, end_row; 2981 int i, col, end_col, row, end_row;
2817 wchar_t *new_selection_text; 2982 wchar_t *new_selection_text;
2818 text_t *t; 2983 text_t *t;
2819 2984
2820 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2821 switch (selection.op) 2985 switch (selection.op)
2822 { 2986 {
2823 case SELECTION_CONT: 2987 case SELECTION_CONT:
2824 break; 2988 break;
2825 case SELECTION_INIT: 2989 case SELECTION_INIT:
… …
2839 3003
2840 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 3004 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2841 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));
2842 3006
2843 col = selection.beg.col; 3007 col = selection.beg.col;
2844 MAX_IT (col, 0);
2845 row = selection.beg.row + TermWin.saveLines; 3008 row = selection.beg.row + TermWin.saveLines;
2846 end_row = selection.end.row + TermWin.saveLines; 3009 end_row = selection.end.row + TermWin.saveLines;
2847 int ofs = 0; 3010 int ofs = 0;
2848 int extra = 0; 3011 int extra = 0;
2849 3012
2850 for (; row <= end_row; row++, col = 0) 3013 for (; row <= end_row; row++, col = 0)
2851 { 3014 {
2852 t = &(screen.text[row][col]);
2853
2854 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);
2855 3026
2856 if (end_col == -1) 3027 if (end_col == -1)
2857 end_col = TermWin.ncol; 3028 end_col = TermWin.ncol;
2858 3029
2859 if (row == end_row) 3030 if (row == end_row || selection.rect)
2860 MIN_IT (end_col, selection.end.col); 3031 MIN_IT (end_col, selection.end.col);
2861 3032
3033 t = &screen.text[row][col];
2862 for (; col < end_col; col++) 3034 for (; col < end_col; col++)
2863 { 3035 {
2864 if (*t == NOCHAR) 3036 if (*t == NOCHAR)
2865 t++; 3037 t++;
2866#if ENABLE_COMBINING 3038#if ENABLE_COMBINING
… …
2914#if 0 3086#if 0
2915 XTextProperty ct; 3087 XTextProperty ct;
2916 3088
2917 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3089 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2918 { 3090 {
2919 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3091 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2920 PropModeReplace, ct.value, ct.nitems);
2921 XFree (ct.value); 3092 XFree (ct.value);
2922 } 3093 }
2923#endif 3094#endif
2924 3095
2925 selection_time = tm; 3096 selection_time = tm;
2926 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2927} 3097}
2928 3098
2929/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
2930/* 3100/*
2931 * 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
2932 * EXT: button 1 press 3102 * EXT: button 1 press
2933 */ 3103 */
2934void 3104void
2935rxvt_term::selection_click (int clicks, int x, int y) 3105rxvt_term::selection_click (int clicks, int x, int y)
2936{ 3106{
2937 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2938
2939 clicks = ((clicks - 1) % 3) + 1; 3107 clicks = ((clicks - 1) % 3) + 1;
2940 selection.clicks = clicks; /* save clicks so extend will work */ 3108 selection.clicks = clicks; /* save clicks so extend will work */
2941 3109
2942 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3110 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2943 3111
… …
2985 * We now only find out the boundary in one direction 3153 * We now only find out the boundary in one direction
2986 */ 3154 */
2987 3155
2988/* 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 */
2989#define DELIMIT_TEXT(x) \ 3157#define DELIMIT_TEXT(x) \
2990 (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)))
2991#define DELIMIT_REND(x) 1 3159#define DELIMIT_REND(x) 1
2992 3160
2993void 3161void
2994rxvt_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)
2995{ 3163{
… …
3013 3181
3014 row = mark->row + TermWin.saveLines; 3182 row = mark->row + TermWin.saveLines;
3015 col = mark->col; 3183 col = mark->col;
3016 MAX_IT (col, 0); 3184 MAX_IT (col, 0);
3017 /* find the edge of a word */ 3185 /* find the edge of a word */
3018 stp = & (screen.text[row][col]); 3186 stp = &screen.text[row][col];
3019 w1 = DELIMIT_TEXT (*stp); 3187 w1 = DELIMIT_TEXT (*stp);
3020 3188
3021 srp = (&screen.rend[row][col]); 3189 srp = &screen.rend[row][col];
3022 w2 = DELIMIT_REND (*srp); 3190 w2 = DELIMIT_REND (*srp);
3023 3191
3024 for (;;) 3192 for (;;)
3025 { 3193 {
3026 for (; col != bound.col; col += dirnadd) 3194 for (; col != bound.col; col += dirnadd)
… …
3060 } 3228 }
3061 break; 3229 break;
3062 } 3230 }
3063 3231
3064Old_Word_Selection_You_Die: 3232Old_Word_Selection_You_Die:
3065 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));
3066
3067 if (dirn == DN) 3233 if (dirn == DN)
3068 col++; /* put us on one past the end */ 3234 col++; /* put us on one past the end */
3069 3235
3070 /* Poke the values back in */ 3236 /* Poke the values back in */
3071 ret->row = row - TermWin.saveLines; 3237 ret->row = row - TermWin.saveLines;
… …
3105 /* select nothing */ 3271 /* select nothing */
3106 selection.beg.row = selection.end.row = 0; 3272 selection.beg.row = selection.end.row = 0;
3107 selection.beg.col = selection.end.col = 0; 3273 selection.beg.col = selection.end.col = 0;
3108 selection.clicks = 4; 3274 selection.clicks = 4;
3109 want_refresh = 1; 3275 want_refresh = 1;
3110 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3111 return; 3276 return;
3112 } 3277 }
3113 3278
3114 if (selection.clicks == 4) 3279 if (selection.clicks == 4)
3115 selection.clicks = 1; 3280 selection.clicks = 1;
… …
3131 row_col_t pos; 3296 row_col_t pos;
3132 enum { 3297 enum {
3133 LEFT, RIGHT 3298 LEFT, RIGHT
3134 } closeto = RIGHT; 3299 } closeto = RIGHT;
3135 3300
3136 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));
3137 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));
3138
3139 want_refresh = 1; 3301 want_refresh = 1;
3302
3140 switch (selection.op) 3303 switch (selection.op)
3141 { 3304 {
3142 case SELECTION_INIT: 3305 case SELECTION_INIT:
3143 CLEAR_SELECTION (); 3306 CLEAR_SELECTION ();
3144 selection.op = SELECTION_BEGIN; 3307 selection.op = SELECTION_BEGIN;
… …
3157 selection_start_colrow (col, row); 3320 selection_start_colrow (col, row);
3158 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
3159 default: 3322 default:
3160 return; 3323 return;
3161 } 3324 }
3325
3162 if (selection.beg.col == selection.end.col 3326 if (selection.beg.col == selection.end.col
3163 && selection.beg.col != selection.mark.col 3327 && selection.beg.col != selection.mark.col
3164 && selection.beg.row == selection.end.row 3328 && selection.beg.row == selection.end.row
3165 && selection.beg.row != selection.mark.row) 3329 && selection.beg.row != selection.mark.row)
3166 { 3330 {
3167 selection.beg.col = selection.end.col = selection.mark.col; 3331 selection.beg.col = selection.end.col = selection.mark.col;
3168 selection.beg.row = selection.end.row = selection.mark.row; 3332 selection.beg.row = selection.end.row = selection.mark.row;
3169 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));
3170 } 3333 }
3171 3334
3172 pos.col = col; 3335 pos.col = col;
3173 pos.row = row; 3336 pos.row = row;
3174 3337
… …
3217 } 3380 }
3218 else 3381 else
3219 { /* button1 drag or button3 drag */ 3382 { /* button1 drag or button3 drag */
3220 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3383 if (ROWCOL_IS_AFTER (selection.mark, pos))
3221 { 3384 {
3222 if ((selection.mark.row == selection.end.row) 3385 if (selection.mark.row == selection.end.row
3223 && (selection.mark.col == selection.end.col) 3386 && selection.mark.col == selection.end.col
3387 && clickchange
3224 && clickchange && selection.clicks == 2) 3388 && selection.clicks == 2)
3225 selection.mark.col--; 3389 selection.mark.col--;
3226 3390
3227 selection.beg.row = pos.row; 3391 selection.beg.row = pos.row;
3228 selection.beg.col = pos.col; 3392 selection.beg.col = pos.col;
3229 selection.end.row = selection.mark.row; 3393 selection.end.row = selection.mark.row;
… …
3240 3404
3241 if (selection.clicks == 1) 3405 if (selection.clicks == 1)
3242 { 3406 {
3243 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3407 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3244 3408
3245 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
3246 { 3414 )
3247#if 1
3248 selection.beg.col = ncol; 3415 selection.beg.col = ncol;
3249#else
3250 if (selection.beg.row != selection.end.row)
3251 selection.beg.col = ncol;
3252 else
3253 selection.beg.col = selection.mark.col;
3254#endif
3255 }
3256 3416
3257 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3417 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3258 3418
3259 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 )
3260 selection.end.col = ncol; 3426 selection.end.col = ncol;
3261 } 3427 }
3262 else if (selection.clicks == 2) 3428 else if (selection.clicks == 2)
3263 { 3429 {
3264 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3430 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3265 selection.end.col--; 3431 selection.end.col--;
3266 3432
3267 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3268 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);
3269 } 3435 }
3270 else if (selection.clicks == 3) 3436 else if (selection.clicks == 3)
3271 { 3437 {
3272#ifndef NO_FRILLS 3438#if ENABLE_FRILLS
3273 if ((Options & Opt_tripleclickwords)) 3439 if (options & Opt_tripleclickwords)
3274 { 3440 {
3275 int end_row; 3441 int end_row;
3276 3442
3277 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3443 selection_delimit_word (UP, &selection.beg, &selection.beg);
3278 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3444 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3279 3445
3280 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++)
3281 { 3447 {
3282 end_col = screen.tlen[end_row + TermWin.saveLines]; 3448 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3293 else 3459 else
3294#endif 3460#endif
3295 { 3461 {
3296 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3462 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3297 selection.mark.col++; 3463 selection.mark.col++;
3464
3298 selection.beg.col = 0; 3465 selection.beg.col = 0;
3299 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++;
3300 } 3476 }
3301 } 3477 }
3302 3478
3303 if (button3 && buttonpress) 3479 if (button3 && buttonpress)
3304 { /* mark may need to be changed */ 3480 { /* mark may need to be changed */
3305 if (closeto == LEFT) 3481 if (closeto == LEFT)
3306 { 3482 {
3307 selection.mark.row = selection.end.row; 3483 selection.mark.row = selection.end.row;
3308 selection.mark.col = selection.end.col 3484 selection.mark.col = selection.end.col - (selection.clicks == 2);
3309 - (selection.clicks == 2);
3310 } 3485 }
3311 else 3486 else
3312 { 3487 {
3313 selection.mark.row = selection.beg.row; 3488 selection.mark.row = selection.beg.row;
3314 selection.mark.col = selection.beg.col; 3489 selection.mark.col = selection.beg.col;
3315 } 3490 }
3316 } 3491 }
3317 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));
3318}
3319 3492
3320#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
3321void 3500void
3322rxvt_term::selection_remove_trailing_spaces () 3501rxvt_term::selection_remove_trailing_spaces ()
3323{ 3502{
3324 int32_t end_col, end_row; 3503 int32_t end_col, end_row;
3325 text_t *stp; 3504 text_t *stp;
3326 3505
3327 end_col = selection.end.col; 3506 end_col = selection.end.col;
3328 end_row = selection.end.row; 3507 end_row = selection.end.row;
3508
3329 for ( ; end_row >= selection.beg.row; ) 3509 for ( ; end_row >= selection.beg.row; )
3330 { 3510 {
3331 stp = screen.text[end_row + TermWin.saveLines]; 3511 stp = screen.text[end_row + TermWin.saveLines];
3512
3332 while (--end_col >= 0) 3513 while (--end_col >= 0)
3333 { 3514 {
3334 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3515 if (stp[end_col] != ' '
3516 && stp[end_col] != '\t'
3517 && stp[end_col] != NOCHAR)
3335 break; 3518 break;
3336 } 3519 }
3520
3337 if (end_col >= 0 3521 if (end_col >= 0
3338 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3522 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3339 { 3523 {
3340 selection.end.col = end_col + 1; 3524 selection.end.col = end_col + 1;
3341 selection.end.row = end_row; 3525 selection.end.row = end_row;
3342 break; 3526 break;
3343 } 3527 }
3528
3344 end_row--; 3529 end_row--;
3345 end_col = TermWin.ncol; 3530 end_col = TermWin.ncol;
3346 } 3531 }
3532
3347 if (selection.mark.row > selection.end.row) 3533 if (selection.mark.row > selection.end.row)
3348 { 3534 {
3349 selection.mark.row = selection.end.row; 3535 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col; 3536 selection.mark.col = selection.end.col;
3351 } 3537 }
… …
3367 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3553 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3368} 3554}
3369 3555
3370/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3371/* 3557/*
3372 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3373 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3374 * the X11 protocol.
3375 */
3376typedef CARD32 Atom32;
3377
3378/* ------------------------------------------------------------------------- */
3379/*
3380 * Respond to a request for our current selection 3558 * Respond to a request for our current selection
3381 * EXT: SelectionRequest 3559 * EXT: SelectionRequest
3382 */ 3560 */
3383void 3561void
3384rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3562rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3385{ 3563{
3386 XSelectionEvent ev; 3564 XSelectionEvent ev;
3387 XTextProperty ct; 3565 dDisp;
3388 XICCEncodingStyle style;
3389 Atom target;
3390 3566
3391 ev.type = SelectionNotify; 3567 ev.type = SelectionNotify;
3392 ev.property = None; 3568 ev.property = None;
3393 ev.display = rq.display; 3569 ev.display = rq.display;
3394 ev.requestor = rq.requestor; 3570 ev.requestor = rq.requestor;
… …
3396 ev.target = rq.target; 3572 ev.target = rq.target;
3397 ev.time = rq.time; 3573 ev.time = rq.time;
3398 3574
3399 if (rq.target == xa[XA_TARGETS]) 3575 if (rq.target == xa[XA_TARGETS])
3400 { 3576 {
3401 Atom32 target_list[6]; 3577 Atom target_list[6];
3402 Atom32 *target = target_list; 3578 Atom *target = target_list;
3403 3579
3404 *target++ = (Atom32) xa[XA_TARGETS]; 3580 *target++ = xa[XA_TARGETS];
3405 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3581 *target++ = xa[XA_TIMESTAMP];
3406 *target++ = (Atom32) XA_STRING; 3582 *target++ = XA_STRING;
3407 *target++ = (Atom32) xa[XA_TEXT]; 3583 *target++ = xa[XA_TEXT];
3408 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3584 *target++ = xa[XA_COMPOUND_TEXT];
3409#if X_HAVE_UTF8_STRING 3585#if X_HAVE_UTF8_STRING
3410 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3586 *target++ = xa[XA_UTF8_STRING];
3411#endif 3587#endif
3412 3588
3413 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3589 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3414 (8 * sizeof (target_list[0])), PropModeReplace, 3590 32, PropModeReplace,
3415 (unsigned char *)target_list, 3591 (unsigned char *)target_list, target - target_list);
3416 target - target_list);
3417 ev.property = rq.property; 3592 ev.property = rq.property;
3418 } 3593 }
3594#if TODO // TODO
3419 else if (rq.target == xa[XA_MULTIPLE]) 3595 else if (rq.target == xa[XA_MULTIPLE])
3420 { 3596 {
3421 /* TODO: Handle MULTIPLE */ 3597 /* TODO: Handle MULTIPLE */
3422 } 3598 }
3599#endif
3423 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3600 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3424 { 3601 {
3425 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3602 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3426 (8 * sizeof (Time)), PropModeReplace,
3427 (unsigned char *)&selection_time, 1); 3603 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3428 ev.property = rq.property; 3604 ev.property = rq.property;
3429 } 3605 }
3430 else if (rq.target == XA_STRING 3606 else if (rq.target == XA_STRING
3431 || rq.target == xa[XA_TEXT] 3607 || rq.target == xa[XA_TEXT]
3432 || rq.target == xa[XA_COMPOUND_TEXT] 3608 || rq.target == xa[XA_COMPOUND_TEXT]
3433 || rq.target == xa[XA_UTF8_STRING] 3609 || rq.target == xa[XA_UTF8_STRING]
3434 ) 3610 )
3435 { 3611 {
3612 XTextProperty ct;
3613 Atom target = rq.target;
3436 short freect = 0; 3614 short freect = 0;
3437 int selectlen; 3615 int selectlen;
3438 wchar_t *cl; 3616 wchar_t *cl;
3439 3617 enum {
3440 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;
3441 3627
3442 if (target == XA_STRING) 3628 if (target == XA_STRING)
3443 // 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
3444 // will ask for another format anyways. 3630 // will ask for another format anyways.
3445 style = XStringStyle; 3631 style = enc_string;
3446 else if (target == xa[XA_TEXT]) 3632 else if (target == xa[XA_TEXT])
3447 style = XStdICCTextStyle; 3633 style = enc_text;
3448 else if (target == xa[XA_COMPOUND_TEXT]) 3634 else if (target == xa[XA_COMPOUND_TEXT])
3449 style = XCompoundTextStyle; 3635 style = enc_compound_text;
3450#if X_HAVE_UTF8_STRING 3636#if ENABLE_FRILLS
3451 else if (target == xa[XA_UTF8_STRING]) 3637 else if (target == xa[XA_UTF8_STRING])
3452 style = XUTF8StringStyle; 3638 style = enc_utf8;
3453#endif 3639#endif
3454 else 3640 else
3455 { 3641 {
3456 target = xa[XA_COMPOUND_TEXT]; 3642 target = xa[XA_COMPOUND_TEXT];
3457 style = XCompoundTextStyle; 3643 style = enc_compound_text;
3458 } 3644 }
3459 3645
3460 if (selection.text) 3646 if (selection.text)
3461 { 3647 {
3462 cl = selection.text; 3648 cl = selection.text;
… …
3466 { 3652 {
3467 cl = L""; 3653 cl = L"";
3468 selectlen = 0; 3654 selectlen = 0;
3469 } 3655 }
3470 3656
3471 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3657#if ENABLE_FRILLS
3472 // 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
3473 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3670 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3474 freect = 1; 3671 freect = 1;
3475 else 3672 else
3476 { 3673 {
3477 /* if we failed to convert then send it raw */ 3674 /* if we failed to convert then send it raw */
3478 ct.value = (unsigned char *)cl; 3675 ct.value = (unsigned char *)cl;
3479 ct.nitems = selectlen; 3676 ct.nitems = selectlen;
3677 ct.encoding = target;
3480 } 3678 }
3481 3679
3482 XChangeProperty (display->display, rq.requestor, rq.property, 3680 XChangeProperty (disp, rq.requestor, rq.property,
3483 target, 8, PropModeReplace, 3681 ct.encoding, 8, PropModeReplace,
3484 ct.value, (int)ct.nitems); 3682 ct.value, (int)ct.nitems);
3485 ev.property = rq.property; 3683 ev.property = rq.property;
3486 3684
3487 if (freect) 3685 if (freect)
3488 XFree (ct.value); 3686 XFree (ct.value);
3489 } 3687 }
3490 3688
3491 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3689 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3492} 3690}
3493 3691
3494/* ------------------------------------------------------------------------- * 3692/* ------------------------------------------------------------------------- *
3495 * MOUSE ROUTINES * 3693 * MOUSE ROUTINES *
3496 * ------------------------------------------------------------------------- */ 3694 * ------------------------------------------------------------------------- */
… …
3508} 3706}
3509 3707
3510/* ------------------------------------------------------------------------- */ 3708/* ------------------------------------------------------------------------- */
3511#ifdef USE_XIM 3709#ifdef USE_XIM
3512void 3710void
3513rxvt_term::im_set_position (XPoint *pos) 3711rxvt_term::im_set_position (XPoint &pos)
3514{ 3712{
3515 XWindowAttributes xwa; 3713 XWindowAttributes xwa;
3516 3714
3517 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3715 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3716
3518 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3717 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3519 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3718 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3520} 3719}
3521
3522#endif 3720#endif
3523/* ------------------------------------------------------------------------- */ 3721
3524 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
3525/* ------------------------------------------------------------------------- * 3860/* ------------------------------------------------------------------------- */
3526 * DEBUG ROUTINES *
3527 * ------------------------------------------------------------------------- */
3528#if 0
3529void
3530rxvt_debug_colors (void)
3531{
3532 int color;
3533 const char *name[] =
3534 {
3535 "fg", "bg",
3536 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3537 };
3538
3539 fprintf (stderr, "Color ( ");
3540 if (rstyle & RS_RVid)
3541 fprintf (stderr, "rvid ");
3542 if (rstyle & RS_Bold)
3543 fprintf (stderr, "bold ");
3544 if (rstyle & RS_Blink)
3545 fprintf (stderr, "blink ");
3546 if (rstyle & RS_Uline)
3547 fprintf (stderr, "uline ");
3548 fprintf (stderr, "): ");
3549
3550 color = GET_FGCOLOR (rstyle);
3551#ifndef NO_BRIGHTCOLOR
3552 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3553 {
3554 color -= (minBrightCOLOR - minCOLOR);
3555 fprintf (stderr, "bright ");
3556 }
3557#endif
3558 fprintf (stderr, "%s on ", name[color]);
3559
3560 color = GET_BGCOLOR (rstyle);
3561#ifndef NO_BRIGHTCOLOR
3562 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3563 {
3564 color -= (minBrightCOLOR - minCOLOR);
3565 fprintf (stderr, "bright ");
3566 }
3567#endif
3568 fprintf (stderr, "%s\n", name[color]);
3569}
3570#endif

Diff Legend

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