ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC

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

Diff Legend

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