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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.217 by root, Mon Jan 9 19:01:56 2006 UTC

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

Diff Legend

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