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