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.78 by root, Fri Jul 30 18:35:11 2004 UTC vs.
Revision 1.232 by root, Sun Jan 15 16:59:54 2006 UTC

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

Diff Legend

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