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

Diff Legend

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