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.163 by root, Sat Jun 18 09:02:37 2005 UTC vs.
Revision 1.283 by root, Sun Nov 11 04:08:00 2007 UTC

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

Diff Legend

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