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

Diff Legend

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