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

Diff Legend

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