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

Diff Legend

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