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.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

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

Diff Legend

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