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.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.293 by root, Mon Dec 24 08:00:18 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-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)
123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 121 {
122 lalloc (l);
123 col = 0;
124 width = ncol;
125 }
126
127 l.touch ();
128
129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
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
903 rend_t rend = SET_FONT (rstyle, 892
904 c > 0x7f || bold || c < 0x20 893 // nuke the character at this position, if required
905 ? TermWin.fontset->find_font (c, bold) 894 if (line->t[screen.cur.col] == NOCHAR
906 : TermWin.ascii_map [c - 0x20]); 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
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 ();
907 926
908 do 927 do
909 { 928 {
910 stp[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
911 srp[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
912 931
913 if (screen.cur.col < last_col - 1) 932 if (screen.cur.col < ncol - 1)
914 screen.cur.col++; 933 screen.cur.col++;
915 else 934 else
916 { 935 {
917 screen.tlen[row] = last_col; 936 line->l = ncol;
918 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
919 screen.flags |= Screen_WrapNext; 938 screen.flags |= Screen_WrapNext;
920 break; 939 break;
921 } 940 }
922 941
923 c = NOCHAR; 942 c = NOCHAR;
924 } 943 }
925 while (--width > 0); 944 while (--width > 0);
926 945
927 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
928 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 947 if (!width)
929 { 948 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
930 stp[c] = ' '; 953 line->t[c] = ' ';
931 srp[c] = rend; 954 line->r[c] = rend;
955 }
932 } 956 }
933 } 957 }
934 else if (width == 0) 958 else // width == 0
935 { 959 {
936#if ENABLE_COMBINING 960#if ENABLE_COMBINING
937 // handle combining characters 961 // handle combining characters
938 // we just tag the accent on the previous on-screen character. 962 // we just tag the accent on the previous on-screen character.
939 // this is arguably not correct, but also arguably not wrong. 963 // this is arguably not correct, but also arguably not wrong.
940 // we don't handle double-width characters nicely yet. 964 // we don't handle double-width characters nicely yet.
941 965 line_t *linep;
942 text_t *tp; 966 text_t *tp;
943 rend_t *rp; 967 rend_t *rp;
944 968
945 if (screen.cur.col > 0) 969 if (screen.cur.col > 0)
946 { 970 {
971 linep = line;
947 tp = stp + screen.cur.col - 1; 972 tp = line->t + screen.cur.col - 1;
948 rp = srp + screen.cur.col - 1; 973 rp = line->r + screen.cur.col - 1;
949 } 974 }
950 else if (screen.cur.row > 0 975 else if (screen.cur.row > 0
951 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 976 && ROW(screen.cur.row - 1).is_longer ())
952 { 977 {
953 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 978 linep = &ROW(screen.cur.row - 1);
954 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
955 } 981 }
956 else 982 else
957 continue; 983 continue;
958 984
959 // handle double-width-chars by making them look extremely ugly 985 linep->touch ();
960 if (*tp == NOCHAR) 986
961 *tp = ' '; // hack //D //TODO //--tp, --rp; 987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
962 989
963 // first try to find a precomposed character 990 // first try to find a precomposed character
964 unicode_t n = rxvt_compose (*tp, c); 991 unicode_t n = rxvt_compose (*tp, c);
965 if (n == NOCHAR) 992 if (n == NOCHAR)
966 n = rxvt_composite.compose (*tp, c); 993 n = rxvt_composite.compose (*tp, c);
967 994
968 *tp = n; 995 *tp = n;
969 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
970#endif 997#endif
971 } 998 }
972 } 999 }
973 1000
974 if (screen.tlen[row] != -1) /* XXX: think about this */ 1001 max_it (line->l, screen.cur.col);
975 MAX_IT (screen.tlen[row], screen.cur.col);
976
977 /*
978 * If we wrote anywhere in the selected area, kill the selection
979 * XXX: should we kill the mark too? Possibly, but maybe that
980 * should be a similar check.
981 */
982 if (clearsel)
983 CLEAR_SELECTION ();
984 1002
985#ifdef DEBUG_STRICT 1003#ifdef DEBUG_STRICT
986 assert (screen.cur.row >= 0); 1004 assert (screen.cur.row >= 0);
987#else /* drive with your eyes closed */
988 MAX_IT (screen.cur.row, 0);
989#endif 1005#endif
990} 1006}
991 1007
992/* ------------------------------------------------------------------------- */ 1008/* ------------------------------------------------------------------------- */
993/* 1009/*
994 * 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
995 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
996 */ 1012 */
997void 1013void
998rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
999{ 1015{
1000 want_refresh = 1; 1016 want_refresh = 1;
1001 1017
1002 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
1003 { 1019 {
1004 if (screen.cur.row > 0) 1020 if (screen.cur.row > 0)
1005 { 1021 {
1006#ifdef TERMCAP_HAS_BW 1022#ifdef TERMCAP_HAS_BW
1007 screen.cur.col = TermWin.ncol - 1; 1023 screen.cur.col = ncol - 1;
1008 screen.cur.row--; 1024 screen.cur.row--;
1009 return; 1025 return;
1010#endif 1026#endif
1011
1012 } 1027 }
1013 } 1028 }
1014 else if ((screen.flags & Screen_WrapNext) == 0) 1029 else if (!(screen.flags & Screen_WrapNext))
1015 scr_gotorc (0, -1, RELATIVE); 1030 scr_gotorc (0, -1, RELATIVE);
1016 1031
1017 screen.flags &= ~Screen_WrapNext; 1032 screen.flags &= ~Screen_WrapNext;
1018} 1033}
1019 1034
… …
1022 * Process Horizontal Tab 1037 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1025 */ 1040 */
1026void 1041void
1027rxvt_term::scr_tab (int count) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1043{
1029 int i, x; 1044 int i, x;
1030 1045
1031 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1032 want_refresh = 1; 1046 want_refresh = 1;
1033 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
1034 1048
1035 if (count == 0) 1049 if (count == 0)
1036 return; 1050 return;
1037 else if (count > 0) 1051 else if (count > 0)
1038 { 1052 {
1053 line_t &l = ROW(screen.cur.row);
1054 rend_t base_rend = l.r[i];
1055 ht &= l.t[i] == ' ';
1056
1039 for (; ++i < TermWin.ncol; ) 1057 for (; ++i < ncol; )
1040 if (tabs[i]) 1058 if (tabs[i])
1041 { 1059 {
1042 x = i; 1060 x = i;
1061
1043 if (!--count) 1062 if (!--count)
1044 break; 1063 break;
1045 } 1064 }
1065 else
1066 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend);
1046 1068
1047 if (count) 1069 if (count)
1048 x = TermWin.ncol - 1; 1070 x = ncol - 1;
1071
1072 // store horizontal tab commands as characters inside the text
1073 // buffer so they can be selected and pasted.
1074 if (ht && option (Opt_pastableTabs))
1075 {
1076 base_rend = SET_FONT (base_rend, 0);
1077
1078 l.touch (x);
1079
1080 i = screen.cur.col;
1081
1082 l.t[i] = '\t';
1083 l.r[i] = base_rend;
1084
1085 while (++i < x)
1086 {
1087 l.t[i] = NOCHAR;
1088 l.r[i] = base_rend;
1089 }
1090 }
1049 } 1091 }
1050 else /* if (count < 0) */ 1092 else /* if (count < 0) */
1051 { 1093 {
1052 for (; --i >= 0; ) 1094 for (; --i >= 0; )
1053 if (tabs[i]) 1095 if (tabs[i])
… …
1070 * Process DEC Back Index 1112 * Process DEC Back Index
1071 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1072 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1073 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1074 */ 1116 */
1075#ifndef NO_FRILLS 1117#if !ENABLE_MINIMAL
1076void 1118void
1077rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1078{ 1120{
1079 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1080 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1081 else 1123 else
1082 {
1083 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1084 return; /* um, yeah? */
1085 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
1086 }
1087} 1125}
1088#endif 1126#endif
1089/* ------------------------------------------------------------------------- */ 1127/* ------------------------------------------------------------------------- */
1090/* 1128/*
1091 * Process DEC Forward Index 1129 * Process DEC Forward Index
1092 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1093 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1094 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1095 */ 1133 */
1096#ifndef NO_FRILLS 1134#if !ENABLE_MINIMAL
1097void 1135void
1098rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1099{ 1137{
1100 int row;
1101
1102 if (screen.cur.col < TermWin.ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1104 else 1140 else
1105 { 1141 {
1106 row = screen.cur.row + TermWin.saveLines; 1142 line_t &l = ROW(screen.cur.row);
1107 if (screen.tlen[row] == 0) 1143
1108 return; /* um, yeah? */ 1144 l.touch ();
1109 else if (screen.tlen[row] == -1) 1145 l.is_longer (0);
1110 screen.tlen[row] = TermWin.ncol; 1146
1111 scr_gotorc (0, 0, R_RELATIVE); 1147 scr_gotorc (0, 0, R_RELATIVE);
1112 scr_insdel_chars (1, DELETE); 1148 scr_insdel_chars (1, DELETE);
1113 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1149 scr_gotorc (0, ncol - 1, R_RELATIVE);
1114 } 1150 }
1115} 1151}
1116#endif 1152#endif
1117 1153
1118/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1119/* 1155/*
1120 * Goto Row/Column 1156 * Goto Row/Column
1121 */ 1157 */
1122void 1158void
1123rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1124{ 1160{
1125 want_refresh = 1; 1161 want_refresh = 1;
1126 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1127 1163
1128 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));
1129
1130 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1131 MAX_IT (screen.cur.col, 0); 1165 clamp_it (screen.cur.col, 0, ncol - 1);
1132 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1133 1166
1134 screen.flags &= ~Screen_WrapNext; 1167 screen.flags &= ~Screen_WrapNext;
1168
1135 if (relative & R_RELATIVE) 1169 if (relative & R_RELATIVE)
1136 { 1170 {
1137 if (row > 0) 1171 if (row > 0)
1138 { 1172 {
1139 if (screen.cur.row <= screen.bscroll 1173 if (screen.cur.row <= screen.bscroll
… …
1152 } 1186 }
1153 } 1187 }
1154 else 1188 else
1155 { 1189 {
1156 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1157 { /* relative origin mode */ 1192 /* relative origin mode */
1158 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1159 MIN_IT (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1160 } 1195 }
1161 else 1196 else
1162 screen.cur.row = row; 1197 screen.cur.row = row;
1163 } 1198 }
1164 MAX_IT (screen.cur.row, 0);
1165 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1166 1199
1167 while (screen.cur.col > 0 1200 clamp_it (screen.cur.row, 0, nrow - 1);
1168 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1169 screen.cur.col--;
1170} 1201}
1171 1202
1172/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1173/* 1204/*
1174 * direction should be UP or DN 1205 * direction should be UP or DN
1175 */ 1206 */
1176void 1207void
1177rxvt_term::scr_index (enum page_dirn direction) 1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1178{ 1209{
1179 int dirn; 1210 int dirn;
1180 1211
1181 want_refresh = 1; 1212 want_refresh = 1;
1213 ZERO_SCROLLBACK ();
1214
1182 dirn = ((direction == UP) ? 1 : -1); 1215 dirn = ((direction == UP) ? 1 : -1);
1183 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1184
1185 ZERO_SCROLLBACK ();
1186 1216
1187 screen.flags &= ~Screen_WrapNext; 1217 screen.flags &= ~Screen_WrapNext;
1218
1188 if ((screen.cur.row == screen.bscroll && direction == UP) 1219 if ((screen.cur.row == screen.bscroll && direction == UP)
1189 || (screen.cur.row == screen.tscroll && direction == DN)) 1220 || (screen.cur.row == screen.tscroll && direction == DN))
1190 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1221 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1191 else 1222 else
1192 screen.cur.row += dirn; 1223 screen.cur.row += dirn;
1193 MAX_IT (screen.cur.row, 0); 1224
1194 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1225 clamp_it (screen.cur.row, 0, nrow - 1);
1195 selection_check (0); 1226 selection_check (0);
1196} 1227}
1197 1228
1198/* ------------------------------------------------------------------------- */ 1229/* ------------------------------------------------------------------------- */
1199/* 1230/*
… …
1201 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1202 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1203 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1204 */ 1235 */
1205void 1236void
1206rxvt_term::scr_erase_line (int mode) 1237rxvt_term::scr_erase_line (int mode) NOTHROW
1207{ 1238{
1208 unsigned int row, col, num; 1239 unsigned int col, num;
1209 1240
1210 want_refresh = 1; 1241 want_refresh = 1;
1211 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1212 ZERO_SCROLLBACK (); 1242 ZERO_SCROLLBACK ();
1213 1243
1214 selection_check (1); 1244 selection_check (1);
1215 1245
1216 screen.flags &= ~Screen_WrapNext; 1246 line_t &line = ROW(screen.cur.row);
1217 1247
1218 row = TermWin.saveLines + screen.cur.row; 1248 line.touch ();
1249 line.is_longer (0);
1250
1219 switch (mode) 1251 switch (mode)
1220 { 1252 {
1221 case 0: /* erase to end of line */ 1253 case 0: /* erase to end of line */
1222 col = screen.cur.col; 1254 col = screen.cur.col;
1223 num = TermWin.ncol - col; 1255 num = ncol - col;
1224 MIN_IT (screen.tlen[row], (int16_t)col); 1256 min_it (line.l, col);
1225 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1226 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1227 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1228 break; 1260 break;
1229 case 1: /* erase to beginning of line */ 1261 case 1: /* erase to beginning of line */
… …
1233 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1234 CLEAR_SELECTION (); 1266 CLEAR_SELECTION ();
1235 break; 1267 break;
1236 case 2: /* erase whole line */ 1268 case 2: /* erase whole line */
1237 col = 0; 1269 col = 0;
1238 num = TermWin.ncol; 1270 num = ncol;
1239 screen.tlen[row] = 0; 1271 line.l = 0;
1240 if (selection.beg.row <= screen.cur.row 1272 if (selection.beg.row <= screen.cur.row
1241 && selection.end.row >= screen.cur.row) 1273 && selection.end.row >= screen.cur.row)
1242 CLEAR_SELECTION (); 1274 CLEAR_SELECTION ();
1243 break; 1275 break;
1244 default: 1276 default:
1245 return; 1277 return;
1246 } 1278 }
1247 1279
1248 if (screen.text[row]) 1280 scr_blank_line (line, col, num, rstyle);
1249 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1250 else
1251 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1252} 1281}
1253 1282
1254/* ------------------------------------------------------------------------- */ 1283/* ------------------------------------------------------------------------- */
1255/* 1284/*
1256 * Erase part of whole of the screen 1285 * Erase part of whole of the screen
1257 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1286 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1258 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1287 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1259 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1288 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1260 */ 1289 */
1261void 1290void
1262rxvt_term::scr_erase_screen (int mode) 1291rxvt_term::scr_erase_screen (int mode) NOTHROW
1263{ 1292{
1264 int num; 1293 int num;
1265 int32_t row, row_offset; 1294 int32_t row;
1266 rend_t ren; 1295 rend_t ren;
1267 XGCValues gcvalue; 1296 XGCValues gcvalue;
1268 1297
1269 want_refresh = 1; 1298 want_refresh = 1;
1270 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1271 ZERO_SCROLLBACK (); 1299 ZERO_SCROLLBACK ();
1272 row_offset = (int32_t)TermWin.saveLines;
1273 1300
1274 switch (mode) 1301 switch (mode)
1275 { 1302 {
1276 case 0: /* erase to end of screen */ 1303 case 0: /* erase to end of screen */
1277 selection_check (1); 1304 selection_check (1);
1278 scr_erase_line (0); 1305 scr_erase_line (0);
1279 row = screen.cur.row + 1; /* possible OOB */ 1306 row = screen.cur.row + 1; /* possible OOB */
1280 num = TermWin.nrow - row; 1307 num = nrow - row;
1281 break; 1308 break;
1282 case 1: /* erase to beginning of screen */ 1309 case 1: /* erase to beginning of screen */
1283 selection_check (3); 1310 selection_check (3);
1284 scr_erase_line (1); 1311 scr_erase_line (1);
1285 row = 0; 1312 row = 0;
1286 num = screen.cur.row; 1313 num = screen.cur.row;
1287 break; 1314 break;
1288 case 2: /* erase whole screen */ 1315 case 2: /* erase whole screen */
1289 selection_check (3); 1316 selection_check (3);
1290 row = 0; 1317 row = 0;
1291 num = TermWin.nrow; 1318 num = nrow;
1292 break; 1319 break;
1293 default: 1320 default:
1294 return; 1321 return;
1295 } 1322 }
1296
1297 refresh_type |= REFRESH_BOUNDS;
1298 1323
1299 if (selection.op && current_screen == selection.screen 1324 if (selection.op && current_screen == selection.screen
1300 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1325 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1301 || (selection.end.row >= row 1326 || (selection.end.row >= row
1302 && selection.end.row <= row + num))) 1327 && selection.end.row <= row + num)))
1303 CLEAR_SELECTION (); 1328 CLEAR_SELECTION ();
1304 1329
1305 if (row >= TermWin.nrow) /* Out Of Bounds */ 1330 if (row >= nrow) /* Out Of Bounds */
1306 return; 1331 return;
1307 1332
1308 MIN_IT (num, (TermWin.nrow - row)); 1333 min_it (num, nrow - row);
1309 1334
1310 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1311 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1312 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1313 { 1338 {
1314 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1315 CLEAR_ROWS (row, num); 1340 CLEAR_ROWS (row, num);
1316 } 1341 }
1317 else 1342 else
1318 { 1343 {
1319 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1344 ren = rstyle & (RS_fgMask | RS_bgMask);
1320 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1346 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1347 ERASE_ROWS (row, num);
1323 gcvalue.foreground = PixColors[Color_fg]; 1348 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1349 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1325 } 1350 }
1326 1351
1327 for (; num--; row++) 1352 for (; num--; row++)
1328 { 1353 {
1329 scr_blank_screen_mem (screen.text, screen.rend, 1354 scr_blank_screen_mem (ROW(row), rstyle);
1330 (unsigned int) (row + row_offset), rstyle); 1355 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1331 screen.tlen[row + row_offset] = 0;
1332 scr_blank_line (drawn_text[row], drawn_rend[row],
1333 (unsigned int)TermWin.ncol, ren);
1334 } 1356 }
1335} 1357}
1358
1359#if !ENABLE_MINIMAL
1360void
1361rxvt_term::scr_erase_savelines () NOTHROW
1362{
1363 want_refresh = 1;
1364 ZERO_SCROLLBACK ();
1365
1366 top_row = 0;
1367}
1368#endif
1336 1369
1337/* ------------------------------------------------------------------------- */ 1370/* ------------------------------------------------------------------------- */
1338/* 1371/*
1339 * Fill the screen with `E's 1372 * Fill the screen with `E's
1340 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1373 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1341 */ 1374 */
1342void 1375void
1343rxvt_term::scr_E () 1376rxvt_term::scr_E () NOTHROW
1344{ 1377{
1345 int i, j, k; 1378 rend_t fs;
1346 rend_t *r1, fs;
1347 1379
1348 want_refresh = 1; 1380 want_refresh = 1;
1381 ZERO_SCROLLBACK ();
1382
1349 num_scr_allow = 0; 1383 num_scr_allow = 0;
1350 ZERO_SCROLLBACK ();
1351 selection_check (3); 1384 selection_check (3);
1352 1385
1353 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1386 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1354 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1387 for (int row = nrow; row--; )
1355 { 1388 {
1356 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1389 line_t &line = ROW(row);
1390
1357 fill_text (screen.text[k], 'E', TermWin.ncol); 1391 fill_text (line.t, 'E', ncol);
1358 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1392 rend_t *r1 = line.r;
1393
1394 for (int j = ncol; j--; )
1359 *r1++ = fs; 1395 *r1++ = fs;
1396
1397 line.is_longer (0);
1398 line.touch (ncol);
1360 } 1399 }
1361} 1400}
1362 1401
1363/* ------------------------------------------------------------------------- */ 1402/* ------------------------------------------------------------------------- */
1364/* 1403/*
1365 * Insert/Delete <count> lines 1404 * Insert/Delete <count> lines
1366 */ 1405 */
1367void 1406void
1368rxvt_term::scr_insdel_lines (int count, int insdel) 1407rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1369{ 1408{
1370 int end; 1409 int end;
1371 1410
1372 ZERO_SCROLLBACK (); 1411 ZERO_SCROLLBACK ();
1373 1412
… …
1382 if (insdel == DELETE) 1421 if (insdel == DELETE)
1383 return; 1422 return;
1384 else if (insdel == INSERT) 1423 else if (insdel == INSERT)
1385 count = end; 1424 count = end;
1386 } 1425 }
1387 screen.flags &= ~Screen_WrapNext;
1388 1426
1427 scr_do_wrap ();
1428
1389 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1429 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1390} 1430}
1391 1431
1392/* ------------------------------------------------------------------------- */ 1432/* ------------------------------------------------------------------------- */
1393/* 1433/*
1394 * Insert/Delete <count> characters from the current position 1434 * Insert/Delete <count> characters from the current position
1395 */ 1435 */
1396void 1436void
1397rxvt_term::scr_insdel_chars (int count, int insdel) 1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1398{ 1438{
1399 int col, row; 1439 int col, row;
1400 rend_t tr; 1440 rend_t tr;
1401 text_t *stp;
1402 rend_t *srp;
1403 int16_t *slp;
1404 1441
1405 want_refresh = 1; 1442 want_refresh = 1;
1406 ZERO_SCROLLBACK (); 1443 ZERO_SCROLLBACK ();
1407 1444
1408 if (count <= 0) 1445 if (count <= 0)
1409 return; 1446 return;
1410 1447
1448 scr_do_wrap ();
1449
1411 selection_check (1); 1450 selection_check (1);
1412 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1451 min_it (count, ncol - screen.cur.col);
1413 1452
1414 row = screen.cur.row + TermWin.saveLines;
1415 screen.flags &= ~Screen_WrapNext;
1416
1417 stp = screen.text[row];
1418 srp = screen.rend[row]; 1453 row = screen.cur.row;
1419 slp = & (screen.tlen[row]); 1454
1455 line_t *line = &ROW(row);
1456
1457 line->touch ();
1458 line->is_longer (0);
1420 1459
1421 switch (insdel) 1460 switch (insdel)
1422 { 1461 {
1423 case INSERT: 1462 case INSERT:
1424 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1425 col--)
1426 { 1464 {
1427 stp[col] = stp[col - count]; 1465 line->t[col] = line->t[col - count];
1428 srp[col] = srp[col - count]; 1466 line->r[col] = line->r[col - count];
1429 } 1467 }
1430 1468
1431 if (*slp != -1) 1469 line->l = min (line->l + count, ncol);
1432 {
1433 *slp += count;
1434 MIN_IT (*slp, TermWin.ncol);
1435 }
1436 1470
1437 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1438 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1439 { 1473 {
1440 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1441 || (selection.end.col + count >= TermWin.ncol)) 1475 || (selection.end.col + count >= ncol))
1442 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1443 else 1477 else
1478 {
1444 { /* shift selection */ 1479 /* shift selection */
1445 selection.beg.col += count; 1480 selection.beg.col += count;
1446 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1447 selection.end.col += count; 1482 selection.end.col += count;
1448 } 1483 }
1449 } 1484 }
1450 1485
1451 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1486 scr_blank_line (*line, screen.cur.col, count, rstyle);
1452 (unsigned int)count, rstyle);
1453 break; 1487 break;
1454 1488
1455 case ERASE: 1489 case ERASE:
1456 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1490 screen.cur.col += count; /* don't worry if > ncol */
1457 selection_check (1); 1491 selection_check (1);
1458 screen.cur.col -= count; 1492 screen.cur.col -= count;
1459 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1493
1460 (unsigned int)count, rstyle); 1494 line->l = max (line->l - count, 0);
1495 scr_blank_line (*line, screen.cur.col, count, rstyle);
1461 break; 1496 break;
1462 1497
1463 case DELETE: 1498 case DELETE:
1464 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1465 1500
1466 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1501 for (col = screen.cur.col; (col + count) < ncol; col++)
1467 { 1502 {
1468 stp[col] = stp[col + count]; 1503 line->t[col] = line->t[col + count];
1469 srp[col] = srp[col + count]; 1504 line->r[col] = line->r[col + count];
1470 } 1505 }
1471 1506
1472 scr_blank_line (& (stp[TermWin.ncol - count]), 1507 line->l = max (line->l - count, 0);
1473 & (srp[TermWin.ncol - count]), 1508 scr_blank_line (*line, ncol - count, count, tr);
1474 (unsigned int)count, tr);
1475
1476 if (*slp == -1) /* break line continuation */
1477 *slp = TermWin.ncol;
1478
1479 *slp -= count;
1480 MAX_IT (*slp, 0);
1481 1509
1482 if (selection.op && current_screen == selection.screen 1510 if (selection.op && current_screen == selection.screen
1483 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1484 { 1512 {
1485 if (selection.end.row != screen.cur.row 1513 if (selection.end.row != screen.cur.row
1486 || (screen.cur.col >= selection.beg.col - count) 1514 || (screen.cur.col >= selection.beg.col - count)
1487 || selection.end.col >= TermWin.ncol) 1515 || selection.end.col >= ncol)
1488 CLEAR_SELECTION (); 1516 CLEAR_SELECTION ();
1489 else 1517 else
1490 { 1518 {
1491 /* shift selection */ 1519 /* shift selection */
1492 selection.beg.col -= count; 1520 selection.beg.col -= count;
1493 selection.mark.col -= count; /* XXX: yes? */ 1521 selection.mark.col -= count; /* XXX: yes? */
1494 selection.end.col -= count; 1522 selection.end.col -= count;
1495 } 1523 }
1496 } 1524 }
1497 1525
1498 break; 1526 break;
1499 } 1527 }
… …
1503/* 1531/*
1504 * Set the scrolling region 1532 * Set the scrolling region
1505 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1506 */ 1534 */
1507void 1535void
1508rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1509{ 1537{
1510 MAX_IT (top, 0); 1538 max_it (top, 0);
1511 MIN_IT (bot, (int)TermWin.nrow - 1); 1539 min_it (bot, nrow - 1);
1512 1540
1513 if (top > bot) 1541 if (top > bot)
1514 return; 1542 return;
1515 1543
1516 screen.tscroll = top; 1544 screen.tscroll = top;
… …
1523 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1524 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1525 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1526 */ 1554 */
1527void 1555void
1528rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1529{ 1557{
1530 want_refresh = 1; 1558 want_refresh = 1;
1531 1559
1532 if (mode) 1560 if (mode)
1533 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1540 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1541 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1542 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1543 */ 1571 */
1544void 1572void
1545rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1546{ 1574{
1547 if (mode) 1575 if (mode)
1548 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1549 else 1577 else
1550 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1551} 1579}
1552 1580
1553/* ------------------------------------------------------------------------- */ 1581/* ------------------------------------------------------------------------- */
1554/* 1582/*
1555 * Set/unset margin origin mode 1583 * Set/unset margin origin mode
… …
1559 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1560 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1561 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1562 */ 1590 */
1563void 1591void
1564rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1565{ 1593{
1566 if (mode) 1594 if (mode)
1567 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1568 else 1596 else
1569 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
1598
1570 scr_gotorc (0, 0, 0); 1599 scr_gotorc (0, 0, 0);
1571} 1600}
1572 1601
1573/* ------------------------------------------------------------------------- */ 1602/* ------------------------------------------------------------------------- */
1574/* 1603/*
1575 * Set insert/replace mode 1604 * Set insert/replace mode
1576 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1577 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1578 */ 1607 */
1579void 1608void
1580rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1581{ 1610{
1582 if (mode) 1611 if (mode)
1583 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1584 else 1613 else
1585 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1591 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1592 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1593 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1594 */ 1623 */
1595void 1624void
1596rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1597{ 1626{
1598 if (mode < 0) 1627 if (mode < 0)
1599 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1600 else if (screen.cur.col < TermWin.ncol) 1629 else if (screen.cur.col < ncol)
1601 tabs[screen.cur.col] = (mode ? 1 : 0); 1630 tabs [screen.cur.col] = !!mode;
1602} 1631}
1603 1632
1604/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1605/* 1634/*
1606 * Set reverse/normal video 1635 * Set reverse/normal video
1607 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1608 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1609 */ 1638 */
1610void 1639void
1611rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1612{ 1641{
1613 XGCValues gcvalue; 1642 rvideo_mode = on;
1614 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1615 if (rvideo != mode) 1648 if (rvideo_state != on)
1616 { 1649 {
1617 rvideo = mode; 1650 rvideo_state = on;
1618 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1651
1619#if defined(XPM_BACKGROUND) 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP
1620 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1621#endif 1655#endif
1622#if defined(TRANSPARENT) 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1623 if (! (Options & Opt_transparent) || am_transparent == 0)
1624#endif
1625 XSetWindowBackground (display->display, TermWin.vt,
1626 PixColors[Color_bg]);
1627 1657
1658 XGCValues gcvalue;
1628 gcvalue.foreground = PixColors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
1629 gcvalue.background = PixColors[Color_bg]; 1660 gcvalue.background = pix_colors[Color_bg];
1630 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1661 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1631 &gcvalue); 1662
1632 scr_clear (); 1663 scr_clear ();
1633 scr_touch (true); 1664 scr_touch (true);
1634 } 1665 }
1635} 1666}
1636 1667
… …
1638/* 1669/*
1639 * Report current cursor position 1670 * Report current cursor position
1640 * XTERM_SEQ: Report position: ESC [ 6 n 1671 * XTERM_SEQ: Report position: ESC [ 6 n
1641 */ 1672 */
1642void 1673void
1643rxvt_term::scr_report_position () 1674rxvt_term::scr_report_position () NOTHROW
1644{ 1675{
1645 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1676 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1646} 1677}
1647 1678
1648/* ------------------------------------------------------------------------- * 1679/* ------------------------------------------------------------------------- *
… …
1651 1682
1652/* 1683/*
1653 * Set font style 1684 * Set font style
1654 */ 1685 */
1655void 1686void
1656rxvt_term::set_font_style () 1687rxvt_term::set_font_style () NOTHROW
1657{ 1688{
1689#if 0
1658 switch (charsets[screen.charset]) 1690 switch (charsets [screen.charset])
1659 { 1691 {
1660 case '0': /* DEC Special Character & Line Drawing Set */ 1692 case '0': /* DEC Special Character & Line Drawing Set */
1661 break; 1693 break;
1662 case 'A': /* United Kingdom (UK) */ 1694 case 'A': /* United Kingdom (UK) */
1663 break; 1695 break;
… …
1670 case 'C': /* Finnish character set */ 1702 case 'C': /* Finnish character set */
1671 break; 1703 break;
1672 case 'K': /* German character set */ 1704 case 'K': /* German character set */
1673 break; 1705 break;
1674 } 1706 }
1707#endif
1675} 1708}
1676 1709
1677/* ------------------------------------------------------------------------- */ 1710/* ------------------------------------------------------------------------- */
1678/* 1711/*
1679 * Choose a font 1712 * Choose a font
… …
1681 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1714 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1682 * XTERM_SEQ: Invoke G2 character set: ESC N 1715 * XTERM_SEQ: Invoke G2 character set: ESC N
1683 * XTERM_SEQ: Invoke G3 character set: ESC O 1716 * XTERM_SEQ: Invoke G3 character set: ESC O
1684 */ 1717 */
1685void 1718void
1686rxvt_term::scr_charset_choose (int set) 1719rxvt_term::scr_charset_choose (int set) NOTHROW
1687 { 1720{
1688 screen.charset = set; 1721 screen.charset = set;
1689 set_font_style (); 1722 set_font_style ();
1690 } 1723}
1691 1724
1692/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1693/* 1726/*
1694 * Set a font 1727 * Set a font
1695 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1728 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1697 * XTERM_SEQ: Set G2 character set: ESC * <C> 1730 * XTERM_SEQ: Set G2 character set: ESC * <C>
1698 * XTERM_SEQ: Set G3 character set: ESC + <C> 1731 * XTERM_SEQ: Set G3 character set: ESC + <C>
1699 * See set_font_style for possible values for <C> 1732 * See set_font_style for possible values for <C>
1700 */ 1733 */
1701void 1734void
1702rxvt_term::scr_charset_set (int set, unsigned int ch) 1735rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1703 { 1736{
1704 charsets[set] = (unsigned char)ch; 1737 charsets[set] = (unsigned char)ch;
1705 set_font_style (); 1738 set_font_style ();
1706 } 1739}
1707 1740
1708 1741
1709/* ------------------------------------------------------------------------- * 1742/* ------------------------------------------------------------------------- *
1710 * MAJOR SCREEN MANIPULATION * 1743 * MAJOR SCREEN MANIPULATION *
1711 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1712 1745
1713/* 1746/*
1714 * refresh matching text. 1747 * refresh matching text.
1715 */ 1748 */
1716bool 1749bool
1717rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1750rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1718{ 1751{
1719 bool found = false; 1752 bool found = false;
1720 1753
1721 for (int i = 0; i < TermWin.nrow; i++) 1754 for (int i = 0; i < nrow; i++)
1722 { 1755 {
1723 int col = 0;
1724 rend_t *drp = drawn_rend [i]; 1756 rend_t *drp = drawn_buf[i].r;
1725 1757
1726 for (; col < TermWin.ncol; col++, drp++) 1758 for (int col = 0; col < ncol; col++, drp++)
1727 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1728 { 1760 {
1729 found = true; 1761 found = true;
1730 *drp = ~value; 1762 *drp = ~value;
1731 } 1763 }
… …
1742 PART_END, 1774 PART_END,
1743 RC_COUNT 1775 RC_COUNT
1744}; 1776};
1745 1777
1746void 1778void
1747rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1748{ 1780{
1749 int i; 1781 int i;
1750 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1751 1783
1752 if (drawn_text == NULL) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1753 return; 1785 return;
1754 1786
1755#ifndef NO_SLOW_LINK_SUPPORT 1787#ifndef NO_SLOW_LINK_SUPPORT
1756 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1757 { 1789 {
1758 y = 0; 1790 y = 0;
1759 height = TermWin.height; 1791 eheight = height;
1760 } 1792 }
1761#endif
1762
1763#ifdef DEBUG_STRICT
1764 x = max (x, 0);
1765 x = min (x, (int)TermWin.width);
1766 y = max (y, 0);
1767 y = min (y, (int)TermWin.height);
1768#endif 1793#endif
1769 1794
1770 /* round down */ 1795 /* round down */
1771 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1772 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
1773 /* round up */ 1798 /* round up */
1774 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1799 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1775 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1800 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1776 1801
1777 /* sanity checks */ 1802 /* sanity checks */
1778 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1779 { 1804 {
1780 MIN_IT (rc[i].col, TermWin.ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1781 MIN_IT (rc[i].row, TermWin.nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1782 } 1807 }
1783 1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1784 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));
1785
1786 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1787 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811
1812 num_scr_allow = 0;
1788 1813
1789 if (refresh) 1814 if (refresh)
1790 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1815 scr_refresh ();
1791} 1816}
1792 1817
1793/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1794/* 1819/*
1795 * Refresh the entire screen 1820 * Refresh the entire screen
1796 */ 1821 */
1797void 1822void
1798rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1799{ 1824{
1800 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1801} 1826}
1802 1827
1803/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1804/* 1829/*
1805 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1806 * the top of the screen 1831 * the top of the screen
1807 */ 1832 */
1808int 1833void
1809rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1810{ 1835{
1811 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1812 uint16_t oldviewstart;
1813
1814 oldviewstart = TermWin.view_start;
1815 if (y < len)
1816 {
1817 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1818 p -= (long) (TermWin.nrow - 1);
1819 p = max (p, 0);
1820 }
1821 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1822 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1823
1824 return scr_changeview (oldviewstart);
1825} 1837}
1826 1838
1827/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1828/* 1840/*
1829 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1830 * direction should be UP or DN 1842 * direction should be UP or DN
1831 */ 1843 */
1832int 1844bool
1833rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1834{ 1846{
1835 int n; 1847 int new_view_start =
1836 uint16_t oldviewstart; 1848 direction == UP ? view_start - nlines
1849 : view_start + nlines;
1837 1850
1838 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1839#ifdef DEBUG_STRICT
1840 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1841#endif
1842 oldviewstart = TermWin.view_start;
1843 if (direction == UP)
1844 {
1845 n = TermWin.view_start + nlines;
1846 TermWin.view_start = min (n, TermWin.nscrolled);
1847 }
1848 else
1849 {
1850 n = TermWin.view_start - nlines;
1851 TermWin.view_start = max (n, 0);
1852 }
1853 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1854} 1852}
1855 1853
1856int 1854bool
1857rxvt_term::scr_changeview (uint16_t oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1858{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1859 if (TermWin.view_start != oldviewstart) 1859 if (new_view_start == view_start)
1860 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1861 want_refresh = 1; 1864 want_refresh = 1;
1862 num_scr -= (TermWin.view_start - oldviewstart);
1863 }
1864 1865
1865 return (int) (TermWin.view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866}
1867 1867
1868/* ------------------------------------------------------------------------- */ 1868 return true;
1869void 1869}
1870rxvt_term::scr_bell () 1870
1871{
1872#ifndef NO_BELL 1871#ifndef NO_BELL
1872void
1873rxvt_term::bell_cb (ev::timer &w, int revents)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877 refresh_check ();
1878}
1879#endif
1880
1881/* ------------------------------------------------------------------------- */
1882void
1883rxvt_term::scr_bell () NOTHROW
1884{
1885#ifndef NO_BELL
1886
1873# ifndef NO_MAPALERT 1887# ifndef NO_MAPALERT
1874# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1875 if (Options & Opt_mapAlert) 1889 if (option (Opt_mapAlert))
1876# endif 1890# endif
1877 XMapWindow (display->display, TermWin.parent[0]); 1891 XMapWindow (dpy, parent[0]);
1878# endif 1892# endif
1893
1894# if ENABLE_FRILLS
1895 if (option (Opt_urgentOnBell))
1896 {
1897 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1898 {
1899 h->flags |= XUrgencyHint;
1900 XSetWMHints (dpy, parent[0], h);
1901 }
1902 }
1903# endif
1904
1879 if (Options & Opt_visualBell) 1905 if (option (Opt_visualBell))
1880 { 1906 {
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1907 rvideo_bell = true;
1882 scr_rvideo_mode (!rvideo); /* refresh also done */ 1908 scr_rvideo_mode (rvideo_mode);
1909 flush ();
1910
1911 bell_ev.start (VISUAL_BELL_DURATION);
1883 } 1912 }
1884 else 1913 else
1885 XBell (display->display, 0); 1914 XBell (dpy, 0);
1886#endif 1915#endif
1887} 1916}
1888 1917
1889/* ------------------------------------------------------------------------- */ 1918/* ------------------------------------------------------------------------- */
1890/* ARGSUSED */ 1919/* ARGSUSED */
1891void 1920void
1892rxvt_term::scr_printscreen (int fullhist) 1921rxvt_term::scr_printscreen (int fullhist) NOTHROW
1893{ 1922{
1894#ifdef PRINTPIPE 1923#ifdef PRINTPIPE
1895 int i, r1, nrows, row_offset; 1924 int nrows, row_start;
1896 text_t *t; 1925 FILE *fd;
1897 FILE *fd;
1898 1926
1899 if ((fd = popen_printer ()) == NULL) 1927 if ((fd = popen_printer ()) == NULL)
1900 return; 1928 return;
1901 nrows = TermWin.nrow; 1929
1902 row_offset = TermWin.saveLines;
1903 if (!fullhist) 1930 if (fullhist)
1904 row_offset -= TermWin.view_start; 1931 {
1932 nrows = nrow - top_row;
1933 row_start = top_row;
1934 }
1905 else 1935 else
1906 { 1936 {
1907 nrows += TermWin.nscrolled; 1937 nrows = nrow;
1908 row_offset -= TermWin.nscrolled; 1938 row_start = view_start;
1909 } 1939 }
1910 1940
1941 wctomb (0, 0);
1942
1911 for (r1 = 0; r1 < nrows; r1++) 1943 for (int r1 = 0; r1 < nrows; r1++)
1912 {
1913 t = screen.text[r1 + row_offset];
1914 for (i = TermWin.ncol - 1; i >= 0; i--)
1915 if (!isspace (t[i]))
1916 break;
1917 fprintf (fd, "%.*s\n", (i + 1), t);
1918 } 1944 {
1945 text_t *tp = ROW(r1).t;
1946 int len = ROW(r1).l;
1947
1948 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1949 {
1950 char mb[MB_LEN_MAX];
1951 text_t t = *tp++;
1952 if (t == NOCHAR)
1953 continue;
1954
1955 len = wctomb (mb, t);
1956
1957 if (len <= 0)
1958 {
1959 mb[0] = ' ';
1960 len = 1;
1961 }
1962
1963 fwrite (mb, 1, len, fd);
1964 }
1965
1966 fputc ('\n', fd);
1967 }
1968
1919 pclose_printer (fd); 1969 pclose_printer (fd);
1920#endif 1970#endif
1921} 1971}
1922 1972
1923/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1924/* 1974/*
1925 * Refresh the screen 1975 * Refresh the screen
1926 * drawn_text/drawn_rend contain the screen information before the update. 1976 * drawn_text/drawn_rend contain the screen information before the update.
1927 * screen.text/screen.rend contain what the screen will change to. 1977 * screen.text/screen.rend contain what the screen will change to.
1928 */ 1978 */
1929
1930#define FONT_WIDTH(X, Y) \
1931 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1932#define FONT_RBEAR(X, Y) \
1933 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1934#define FONT_LBEAR(X, Y) \
1935 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1936#define IS_FONT_CHAR(X, Y) \
1937 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1938
1939void 1979void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1980rxvt_term::scr_refresh () NOTHROW
1941{ 1981{
1942 unsigned char clearfirst, /* first character writes before cell */ 1982 unsigned char have_bg,
1943 clearlast, /* last character writes beyond cell */
1944 must_clear, /* use draw_string not draw_image_string */
1945 rvid, /* reverse video this position */
1946 showcursor; /* show the cursor */ 1983 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 1984 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 1985 ocrow; /* old cursor row */
1949 int i, /* tmp */ 1986 int i; /* tmp */
1950 row_offset; /* basic offset in screen structure */
1951#ifndef NO_CURSORCOLOR 1987#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1988 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1989#endif
1954 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1990 rend_t *crp; // cursor rendition pointer
1955 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1991 rend_t ccol1, /* Cursor colour */
1992 ccol2; /* Cursor colour2 */
1956 1993
1994 want_refresh = 0; /* screen is current */
1995
1957 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1996 if (refresh_type == NO_REFRESH || !mapped)
1958 return; 1997 return;
1959 1998
1960 /* 1999 /*
1961 * A: set up vars 2000 * A: set up vars
1962 */ 2001 */
1963 clearfirst = clearlast = must_clear = 0; 2002 have_bg = 0;
1964
1965 refresh_count = 0; 2003 refresh_count = 0;
1966 2004
1967 row_offset = TermWin.saveLines - TermWin.view_start; 2005#ifdef HAVE_BG_PIXMAP
1968
1969 if ((refresh_type & REFRESH_BOUNDS))
1970 {
1971 clearfirst = clearlast = 1;
1972 refresh_type &= ~REFRESH_BOUNDS;
1973 }
1974
1975#ifdef XPM_BACKGROUND
1976 must_clear |= (bgPixmap.pixmap != None); 2006 have_bg |= bgPixmap.pixmap != None;
1977#endif
1978#ifdef TRANSPARENT
1979 must_clear |= ((Options & Opt_transparent) && am_transparent);
1980#endif 2007#endif
1981 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1982 2009
1983 /* 2010 /*
1984 * B: reverse any characters which are selected 2011 * B: reverse any characters which are selected
… …
1988 /* 2015 /*
1989 * C: set the cursor character (s) 2016 * C: set the cursor character (s)
1990 */ 2017 */
1991 { 2018 {
1992 unsigned char setoldcursor; 2019 unsigned char setoldcursor;
1993 rend_t ccol1, /* Cursor colour */
1994 ccol2; /* Cursor colour2 */
1995 2020
1996 showcursor = (screen.flags & Screen_VisibleCursor); 2021 showcursor = (screen.flags & Screen_VisibleCursor);
1997#ifdef CURSOR_BLINK 2022#ifdef CURSOR_BLINK
1998 if (hidden_cursor) 2023 if (hidden_cursor)
1999 showcursor = 0; 2024 showcursor = 0;
2000#endif 2025#endif
2001 2026
2002 if (showcursor) 2027 if (showcursor)
2003 { 2028 {
2004 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2029 int col = screen.cur.col;
2005 2030
2031 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2032 col--;
2033
2034 crp = &ROW(screen.cur.row).r[col];
2035
2036#ifndef NO_CURSORCOLOR
2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2038 if (ISSET_PIXCOLOR (Color_cursor))
2039 ccol1 = Color_cursor;
2040 else
2041#endif
2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2043 ccol1 = fgcolor_of (rstyle);
2044#else
2045 ccol1 = Color_fg;
2046#endif
2047
2048#ifndef NO_CURSORCOLOR
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#endif
2053#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2054 ccol2 = bgcolor_of (rstyle);
2055#else
2056 ccol2 = Color_bg;
2057#endif
2058
2006 if (showcursor && TermWin.focus) 2059 if (showcursor && focus)
2007 { 2060 {
2061 if (option (Opt_cursorUnderline))
2008 *srp ^= RS_RVid; 2062 *crp ^= RS_Uline;
2009#ifndef NO_CURSORCOLOR
2010 cc1 = *srp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor;
2013 else 2063 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = GET_FGCOLOR (rstyle);
2016#else
2017 ccol1 = Color_fg;
2018#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2;
2021 else 2064 {
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2065 *crp ^= RS_RVid;
2023 ccol2 = GET_BGCOLOR (rstyle);
2024#else
2025 ccol2 = Color_bg;
2026#endif
2027 *srp = SET_FGCOLOR (*srp, ccol1); 2066 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *srp = SET_BGCOLOR (*srp, ccol2); 2067 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif 2068 }
2030 } 2069 }
2031 } 2070 }
2032 2071
2033 /* make sure no outline cursor is left around */ 2072 /* make sure no outline cursor is left around */
2034 setoldcursor = 0; 2073 setoldcursor = 0;
2035 if (ocrow != -1) 2074 if (ocrow != -1)
2036 { 2075 {
2037 if (screen.cur.row + TermWin.view_start != ocrow 2076 if (screen.cur.row - view_start != ocrow
2038 || screen.cur.col != oldcursor.col) 2077 || screen.cur.col != oldcursor.col)
2039 { 2078 {
2040 if (ocrow < TermWin.nrow 2079 if (ocrow < nrow
2041 && oldcursor.col < TermWin.ncol) 2080 && oldcursor.col < ncol)
2042 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2081 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2043 2082
2044 if (TermWin.focus || !showcursor) 2083 if (focus || !showcursor)
2045 oldcursor.row = -1; 2084 oldcursor.row = -1;
2046 else 2085 else
2047 setoldcursor = 1; 2086 setoldcursor = 1;
2048 } 2087 }
2049 } 2088 }
2050 else if (!TermWin.focus) 2089 else if (!focus)
2051 setoldcursor = 1; 2090 setoldcursor = 1;
2052 2091
2053 if (setoldcursor) 2092 if (setoldcursor)
2054 { 2093 {
2055 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2094 if (screen.cur.row - view_start >= nrow)
2056 oldcursor.row = -1; 2095 oldcursor.row = -1;
2057 else 2096 else
2058 { 2097 {
2059 oldcursor.row = screen.cur.row + TermWin.view_start; 2098 oldcursor.row = screen.cur.row - view_start;
2060 oldcursor.col = screen.cur.col; 2099 oldcursor.col = screen.cur.col;
2061 } 2100 }
2062 } 2101 }
2063 } 2102 }
2103
2104 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2105#if ENABLE_OVERLAY
2106 scr_swap_overlay ();
2107#endif
2064 2108
2065#ifndef NO_SLOW_LINK_SUPPORT 2109#ifndef NO_SLOW_LINK_SUPPORT
2066 /* 2110 /*
2067 * D: CopyArea pass - very useful for slower links 2111 * D: CopyArea pass - very useful for slower links
2068 * This has been deliberately kept simple. 2112 * This has been deliberately kept simple.
2069 */ 2113 */
2070 i = num_scr;
2071 if (!display->is_local 2114 if (!display->is_local
2072 && refresh_type == FAST_REFRESH && num_scr_allow && i 2115 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2073 && abs (i) < TermWin.nrow && !must_clear) 2116 && abs (num_scr) < nrow && !have_bg)
2074 { 2117 {
2075 int16_t nits; 2118 int16_t nits;
2119 int i = num_scr;
2076 int j; 2120 int j;
2077 rend_t *drp2;
2078 text_t *dtp2;
2079 int len, wlen; 2121 int len, wlen;
2122 dLocal (int, num_scr);
2080 2123
2081 j = TermWin.nrow; 2124 j = nrow;
2082 wlen = len = -1; 2125 wlen = len = -1;
2083 row = i > 0 ? 0 : j - 1; 2126 row = i > 0 ? 0 : j - 1;
2127
2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2128 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2085 { 2129 {
2086 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2130 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2087 { 2131 {
2088 stp = screen.text[row + row_offset]; 2132 line_t s = ROW(view_start + row);
2089 srp = screen.rend[row + row_offset];
2090 dtp = drawn_text[row]; 2133 line_t d = drawn_buf[row];
2091 dtp2 = drawn_text[row + i]; 2134 line_t d2 = drawn_buf[row + i];
2092 drp = drawn_rend[row];
2093 drp2 = drawn_rend[row + i];
2094 2135
2095 for (nits = 0, col = TermWin.ncol; col--; ) 2136 for (nits = 0, col = ncol; col--; )
2096 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2137 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2097 nits--; 2138 nits--;
2098 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2139 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2099 nits++; 2140 nits++;
2100 2141
2101 if (nits > 8) /* XXX: arbitrary choice */ 2142 if (nits > 8) /* XXX: arbitrary choice */
2102 { 2143 {
2103 for (col = TermWin.ncol; col--; ) 2144 for (col = ncol; col--; )
2104 { 2145 {
2105 *dtp++ = *dtp2++; 2146 *d.t++ = *d2.t++;
2106 *drp++ = *drp2++; 2147 *d.r++ = *d2.r++;
2107 } 2148 }
2108 2149
2109 if (len == -1) 2150 if (len == -1)
2110 len = row; 2151 len = row;
2111 2152
2112 wlen = row; 2153 wlen = row;
2113 continue; 2154 continue;
2114 } 2155 }
2115 } 2156 }
2116 2157
2117 if (len != -1) 2158 if (len >= 0)
2118 { 2159 {
2119 /* also comes here at end if needed because of >= above */ 2160 /* also comes here at end if needed because of >= above */
2120 if (wlen < len) 2161 if (wlen < len)
2121 SWAP_IT (wlen, len, int); 2162 ::swap (wlen, len);
2122 2163
2123 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2164 XGCValues gcv;
2124 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2165
2166 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2167 XCopyArea (dpy, vt, vt,
2125 TermWin.gc, 0, Row2Pixel (len + i), 2168 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)TermWin_TotalWidth (), 2169 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2170 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2171 0, Row2Pixel (len));
2172 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2173
2129 len = -1; 2174 len = -1;
2130 } 2175 }
2131 } 2176 }
2132 } 2177 }
2133#endif 2178#endif
2134 2179
2135 /* 2180 /*
2136 * E: main pass across every character 2181 * E: main pass across every character
2137 */ 2182 */
2138 for (row = 0; row < TermWin.nrow; row++) 2183 for (row = 0; row < nrow; row++)
2139 { 2184 {
2140 stp = screen.text[row + row_offset]; 2185 text_t *stp = ROW(view_start + row).t;
2141 srp = screen.rend[row + row_offset]; 2186 rend_t *srp = ROW(view_start + row).r;
2142 dtp = drawn_text[row]; 2187 text_t *dtp = drawn_buf[row].t;
2143 drp = drawn_rend[row]; 2188 rend_t *drp = drawn_buf[row].r;
2144 2189
2145 /* 2190 /*
2146 * E2: OK, now the real pass 2191 * E2: OK, now the real pass
2147 */ 2192 */
2148 int ypixel = (int)Row2Pixel (row); 2193 int ypixel = (int)Row2Pixel (row);
2149 2194
2150 for (col = 0; col < TermWin.ncol; col++) 2195 for (col = 0; col < ncol; col++)
2151 { 2196 {
2152 /* compare new text with old - if exactly the same then continue */ 2197 /* compare new text with old - if exactly the same then continue */
2153 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2198 if (stp[col] == dtp[col] /* Must match characters to skip. */
2154 && (srp[col] == drp[col] /* Either rendition the same or */ 2199 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2155 || (stp[col] == ' ' /* space w/ no background change */ 2200 || (stp[col] == ' ' /* space w/ no background change */
2156 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2201 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2157 continue; 2202 continue;
2158 2203
2159 // redraw one or more characters 2204 // redraw one or more characters
2160 2205
2161 // seek to the beginning if wide characters 2206 // seek to the beginning of wide characters
2162 while (stp[col] == NOCHAR && col > 0) 2207 while (stp[col] == NOCHAR && col > 0)
2163 --col; 2208 --col;
2164 2209
2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2210 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2166 text_t *text = stp + col; 2211 text_t *text = stp + col;
… …
2169 dtp[col] = stp[col]; 2214 dtp[col] = stp[col];
2170 drp[col] = rend; 2215 drp[col] = rend;
2171 2216
2172 int xpixel = Col2Pixel (col); 2217 int xpixel = Col2Pixel (col);
2173 2218
2174 // this loop looks very messy, it can probably be optimized
2175 // and cleaned a bit by you?
2176 for (i = 0; ++col < TermWin.ncol; ) 2219 for (i = 0; ++col < ncol; )
2177 { 2220 {
2178 if (stp[col] == NOCHAR) 2221 if (stp[col] == NOCHAR)
2179 { 2222 {
2180 dtp[col] = stp[col]; 2223 dtp[col] = stp[col];
2181 drp[col] = rend; 2224 drp[col] = rend;
2182 count++; 2225 count++;
2183
2184 if (i) // only possible skip if char unchanged
2185 i++; 2226 i++;
2186 2227
2187 continue; 2228 continue;
2188 } 2229 }
2189 2230
2190 if (rend != srp[col]) 2231 if (!RS_SAME (rend, srp[col]))
2191 break; 2232 break;
2192 2233
2193 count++; 2234 count++;
2194 2235
2195 if (stp[col] != dtp[col] 2236 if (stp[col] != dtp[col]
2196 || srp[col] != drp[col]) 2237 || !RS_SAME (srp[col], drp[col]))
2197 { 2238 {
2198 if (must_clear && (i++ > (count / 2))) 2239 if (have_bg && (i++ > count / 2))
2199 break; 2240 break;
2200 2241
2201 dtp[col] = stp[col]; 2242 dtp[col] = stp[col];
2202 drp[col] = rend; 2243 drp[col] = rend;
2203 i = 0; 2244 i = 0;
2204 } 2245 }
2205 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2246 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2206 break; 2247 break;
2207 } 2248 }
2208 2249
2209 col--; /* went one too far. move back */ 2250 col--; /* went one too far. move back */
2210 count -= i; /* dump any matching trailing chars */ 2251 count -= i; /* dump any matching trailing chars */
2252
2253 // sometimes we optimize away the trailing NOCHAR's, add them back
2254 while (i && text[count] == NOCHAR)
2255 count++, i--;
2211 2256
2212 /* 2257 /*
2213 * Determine the attributes for the string 2258 * Determine the attributes for the string
2214 */ 2259 */
2215 int fid = GET_FONT (rend);
2216 int fore = GET_FGCOLOR (rend); // desired foreground 2260 int fore = fgcolor_of (rend); // desired foreground
2217 int back = GET_BGCOLOR (rend); // desired background 2261 int back = bgcolor_of (rend); // desired background
2218 2262
2219 rend = GET_ATTR (rend); 2263 // only do special processing if any attributes are set, which is unlikely
2220 2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2221 rvid = !!(rend & RS_RVid); 2265 {
2266 bool invert = rend & RS_RVid;
2222 2267
2223#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2224 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2269 if (rend & RS_Bold && fore == Color_fg)
2225 { 2270 {
2226 if (ISSET_PIXCOLOR (Color_BD)) 2271 if (ISSET_PIXCOLOR (Color_BD))
2227 fore = Color_BD; 2272 fore = Color_BD;
2273# if !ENABLE_STYLES
2228 else 2274 else
2229 rvid = !rvid; 2275 invert = !invert;
2276# endif
2277 }
2278
2279 if (rend & RS_Italic && fore == Color_fg)
2280 {
2281 if (ISSET_PIXCOLOR (Color_IT))
2282 fore = Color_IT;
2283# if !ENABLE_STYLES
2284 else
2285 invert = !invert;
2286# endif
2287 }
2288
2289 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2290 fore = Color_UL;
2291#endif
2292
2293 if (invert)
2294 {
2295#ifdef OPTION_HC
2296 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2297 || !ISSET_PIXCOLOR (Color_HC))
2298#endif
2299 /* invert the column if no highlightColor is set or it is the
2300 * current cursor column */
2301 ::swap (fore, back);
2302#ifdef OPTION_HC
2303 else if (ISSET_PIXCOLOR (Color_HC))
2304 back = Color_HC;
2305#endif
2306
2307#ifndef NO_BOLD_UNDERLINE_REVERSE
2308# ifndef OPTION_HC
2309 if (ISSET_PIXCOLOR (Color_RV))
2310 back = Color_RV;
2311# endif
2312 if (fore == back)
2313 {
2314 fore = Color_bg;
2315 back = Color_fg;
2316 }
2317#endif
2318 }
2319
2320#ifdef TEXT_BLINK
2321 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2322 {
2323 if (!text_blink_ev.is_active ())
2324 {
2325 text_blink_ev.again ();
2326 hidden_text = 0;
2327 }
2328 else if (hidden_text)
2329 fore = back;
2330 }
2331#endif
2332
2333#if ENABLE_STYLES
2334 // "careful" (too wide) character handling
2335
2336 // include previous careful character(s) if possible, looks nicer (best effort...)
2337 while (text > stp
2338 && srp[text - stp - 1] & RS_Careful
2339 && RS_SAME (rend, srp[text - stp - 1]))
2340 text--, count++, xpixel -= fwidth;
2341
2342 // force redraw after "careful" characters to avoid pixel droppings
2343 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2344 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2345
2346 // force redraw before "careful" characters to avoid pixel droppings
2347 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2348 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2349#endif
2230 } 2350 }
2231
2232 if (rend & RS_Uline)
2233 if (ISSET_PIXCOLOR (Color_UL))
2234 fore = Color_UL;
2235#endif
2236
2237 if (rvid)
2238 {
2239 SWAP_IT (fore, back, int);
2240
2241#ifndef NO_BOLD_UNDERLINE_REVERSE
2242 if (ISSET_PIXCOLOR (Color_RV)
2243# ifndef NO_CURSORCOLOR
2244 && !ISSET_PIXCOLOR (Color_cursor)
2245# endif
2246 )
2247 back = Color_RV;
2248#endif
2249 }
2250
2251#ifdef TEXT_BLINK
2252 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2253 {
2254 if (!text_blink_ev.active)
2255 {
2256 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2257 hidden_text = 0;
2258 }
2259 else if (hidden_text)
2260 fore = back;
2261 }
2262#endif
2263 2351
2264 /* 2352 /*
2265 * Actually do the drawing of the string here 2353 * Actually do the drawing of the string here
2266 */ 2354 */
2267 rxvt_font *font = (*TermWin.fontset)[fid]; 2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2268 2356
2269 if (back == fore)
2270 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2271 TermWin.fwidth * count, TermWin.fheight,
2272 back);
2273 else if (back == Color_bg) 2357 if (have_bg && back == Color_bg)
2274 { 2358 {
2275 if (must_clear) 2359 // this is very ugly, maybe push it into ->draw?
2276 {
2277 CLEAR_CHARS (xpixel, ypixel, count);
2278 2360
2279 for (i = 0; i < count; i++) /* don't draw empty strings */ 2361 for (i = 0; i < count; i++) /* don't draw empty strings */
2280 if (text[i] != ' ') 2362 if (text[i] != ' ')
2281 { 2363 {
2282 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2364 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2283 break; 2365 goto did_clear;
2284 }
2285 } 2366 }
2286 else 2367
2287 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2368 CLEAR_CHARS (xpixel, ypixel, count);
2369 did_clear: ;
2288 } 2370 }
2289 else 2371 else
2290 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2291 2373
2292 if (rend & RS_Uline && font->descent > 1 && fore != back) 2374 if (rend & RS_Uline && font->descent > 1 && fore != back)
2375 {
2376#if ENABLE_FRILLS
2377 if (ISSET_PIXCOLOR (Color_underline))
2378 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2379 else
2380#endif
2381 XSetForeground (dpy, gc, pix_colors[fore]);
2382
2293 XDrawLine (display->display, drawBuffer, TermWin.gc, 2383 XDrawLine (dpy, drawBuffer, gc,
2294 xpixel, ypixel + font->ascent + 1, 2384 xpixel, ypixel + font->ascent + 1,
2295 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2386 }
2296 } /* for (col....) */ 2387 } /* for (col....) */
2297 } /* for (row....) */ 2388 } /* for (row....) */
2389
2390#if ENABLE_OVERLAY
2391 scr_swap_overlay ();
2392#endif
2393 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2298 2394
2299 /* 2395 /*
2300 * G: cleanup cursor and display outline cursor if necessary 2396 * G: cleanup cursor and display outline cursor if necessary
2301 */ 2397 */
2302 if (showcursor) 2398 if (showcursor)
2303 { 2399 {
2304 if (TermWin.focus) 2400 if (focus)
2401 {
2402 if (option (Opt_cursorUnderline))
2403 *crp ^= RS_Uline;
2404 else
2305 { 2405 {
2306 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2307 [screen.cur.col]);
2308 *srp ^= RS_RVid; 2406 *crp ^= RS_RVid;
2309#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2310 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2408 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2311#endif 2409#endif
2410 }
2312 } 2411 }
2313 else if (oldcursor.row >= 0) 2412 else if (oldcursor.row >= 0)
2314 { 2413 {
2414 int cursorwidth = 1;
2415 int col = oldcursor.col;
2416
2417 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2418 col--;
2419
2420 while (col + cursorwidth < ncol
2421 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2422 cursorwidth++;
2423
2315#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
2316 if (ISSET_PIXCOLOR (Color_cursor)) 2425 if (ISSET_PIXCOLOR (Color_cursor))
2317 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else
2318#endif 2428#endif
2319 int cursorwidth = 1; 2429 XSetForeground (dpy, gc, pix_colors[ccol1]);
2320 while (oldcursor.col + cursorwidth < TermWin.ncol
2321 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2322 cursorwidth++;
2323 2430
2324 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2431 XDrawRectangle (dpy, drawBuffer, gc,
2325 Col2Pixel (oldcursor.col), 2432 Col2Pixel (col),
2326 Row2Pixel (oldcursor.row), 2433 Row2Pixel (oldcursor.row),
2327 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2434 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2328 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2329 } 2436 }
2330 } 2437 }
2331 2438
2332 /* 2439 /*
2333 * H: cleanup selection 2440 * H: cleanup selection
2334 */ 2441 */
2335 scr_reverse_selection (); 2442 scr_reverse_selection ();
2336 2443
2337 /*
2338 * I: other general cleanup
2339 */
2340#if 0
2341 if (clearfirst && TermWin.int_bwidth)
2342 /*
2343 * clear the whole screen height, note that width == 0 is treated
2344 * specially by XClearArea
2345 */
2346 XClearArea (display->display, TermWin.vt, 0, 0,
2347 (unsigned int)TermWin.int_bwidth,
2348 (unsigned int)TermWin_TotalHeight (), False);
2349
2350 if (clearlast && TermWin.int_bwidth)
2351 /*
2352 * clear the whole screen height, note that width == 0 is treated
2353 * specially by XClearArea
2354 */
2355 XClearArea (display->display, TermWin.vt,
2356 TermWin.width + TermWin.int_bwidth, 0,
2357 (unsigned int)TermWin.int_bwidth,
2358 (unsigned int)TermWin_TotalHeight (), False);
2359#endif
2360
2361 if (refresh_type & SMOOTH_REFRESH)
2362 XFlush (display->display);
2363
2364 num_scr = 0; 2444 num_scr = 0;
2365 num_scr_allow = 1; 2445 num_scr_allow = 1;
2366 want_refresh = 0; /* screen is current */
2367} 2446}
2368 2447
2369void 2448void
2370rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2449rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2371{ 2450{
2372 if (!rp || !tp) 2451 if (!l.t)
2373 return; 2452 return;
2374 2453
2375 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2454 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2376 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2377}
2378 2455
2456 for (int i = ncol; i--; )
2457 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2458}
2459
2379void 2460void
2380rxvt_term::scr_remap_chars () 2461rxvt_term::scr_remap_chars () NOTHROW
2381{ 2462{
2382 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2463 for (int i = total_rows; i--; )
2383 scr_remap_chars (screen.text[i], screen.rend[i]); 2464 scr_remap_chars (row_buf [i]);
2384 2465
2385 for (int i = TermWin.nrow; i--; ) 2466 for (int i = nrow; i--; )
2467 {
2468 scr_remap_chars (drawn_buf [i]);
2469 scr_remap_chars (swap_buf [i]);
2470 }
2471}
2472
2473void
2474rxvt_term::scr_recolour () NOTHROW
2475{
2476#ifdef HAVE_BG_PIXMAP
2477 bgPixmap.apply ();
2478#else
2479
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483
2484# if HAVE_SCROLLBARS
2485 if (scrollBar.win)
2386 { 2486 {
2387 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2388 scr_remap_chars (swap.text[i], swap.rend[i]); 2488 scrollBar.setIdle ();
2489 scrollbar_show (0);
2389 } 2490 }
2390} 2491# endif
2391 2492
2493 scr_clear ();
2494 scr_touch (true);
2495 want_refresh = 1;
2496
2497#endif
2498}
2499
2392/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2393void 2501void
2394rxvt_term::scr_clear (bool really) 2502rxvt_term::scr_clear (bool really) NOTHROW
2395{ 2503{
2396 if (!TermWin.mapped) 2504 if (!mapped)
2397 return; 2505 return;
2398 2506
2399 num_scr_allow = 0; 2507 num_scr_allow = 0;
2400 want_refresh = 1; 2508 want_refresh = 1;
2401 2509
2402#ifdef TRANSPARENT 2510 if (really)
2403 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2511 XClearWindow (dpy, vt);
2512}
2513
2514void
2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2516{
2517 int view_end = view_start + nrow;
2518 int row, col;
2519
2520 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2521 {
2522 text_t *stp = ROW(row).t;
2523 rend_t *srp = ROW(row).r;
2524
2525 for (col = beg_col; col < end_col; col++)
2526 srp[col] ^= rstyle1;
2527
2528 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2529 srp[col] ^= rstyle2;
2530
2531 if (++col < end_col)
2532 srp[col] ^= rstyle2;
2404 { 2533 }
2405 int i; 2534}
2406 2535
2407 if (! (Options & Opt_transparent_all)) 2536void
2537rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2538{
2539 int view_end = view_start + nrow;
2540 int row, col;
2541
2542 if (beg_row >= view_start)
2543 {
2544 col = beg_col;
2545 row = beg_row;
2546 }
2547 else
2548 {
2408 i = 0; 2549 col = 0;
2550 row = view_start;
2551 }
2552
2553 for (; row < min (end_row, view_end); row++, col = 0)
2554 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2555 srp[col] ^= rstyle;
2556
2557 if (row == end_row)
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle;
2560}
2561
2562/* ------------------------------------------------------------------------- */
2563void
2564rxvt_term::scr_reverse_selection () NOTHROW
2565{
2566 if (selection.op
2567 && current_screen == selection.screen
2568 && selection.end.row >= view_start)
2569 {
2570#if !ENABLE_MINIMAL
2571 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline);
2409 else 2575 else
2410 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2411
2412 while (i--)
2413 if (TermWin.parent[i] != None)
2414 XClearWindow (display->display, TermWin.parent[i]);
2415 }
2416#endif 2576#endif
2417 2577 scr_xor_span (selection.beg.row, selection.beg.col,
2418 if (really) 2578 selection.end.row, selection.end.col,
2419 XClearWindow (display->display, TermWin.vt); 2579 RS_RVid);
2420}
2421
2422/* ------------------------------------------------------------------------- */
2423void
2424rxvt_term::scr_reverse_selection ()
2425{
2426 if (selection.op && current_screen == selection.screen)
2427 {
2428 int end_row = TermWin.saveLines - TermWin.view_start;
2429 int i = selection.beg.row + TermWin.saveLines;
2430 int col, row = selection.end.row + TermWin.saveLines;
2431 rend_t *srp;
2432
2433 if (i >= end_row)
2434 col = selection.beg.col;
2435 else
2436 {
2437 col = 0;
2438 i = end_row;
2439 }
2440
2441 end_row += TermWin.nrow;
2442 for (; i < row && i < end_row; i++, col = 0)
2443 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2444 srp[col] ^= RS_RVid;
2445
2446 if (i == row && i < end_row)
2447 for (srp = screen.rend[i]; col < selection.end.col; col++)
2448 srp[col] ^= RS_RVid;
2449 } 2580 }
2450} 2581}
2451 2582
2452/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2453/* 2584/*
2454 * Dump the whole scrollback and screen to the passed filedescriptor. The 2585 * Dump the whole scrollback and screen to the passed filedescriptor. The
2455 * invoking routine must close the fd. 2586 * invoking routine must close the fd.
2456 */ 2587 */
2457#if 0 2588#if 0
2458void 2589void
2459rxvt_term::scr_dump (int fd) 2590rxvt_term::scr_dump (int fd) NOTHROW
2460{ 2591{
2461 int row, wrote; 2592 int row, wrote;
2462 unsigned int width, towrite; 2593 unsigned int width, towrite;
2463 char r1[] = "\n"; 2594 char r1[] = "\n";
2464 2595
2465 for (row = TermWin.saveLines - TermWin.nscrolled; 2596 for (row = saveLines - nsaved;
2466 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2467 { 2598 {
2468 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2469 : TermWin.ncol; 2600 : ncol;
2470 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
2471 { 2602 {
2472 wrote = write (fd, & (screen.text[row][width - towrite]), 2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2473 towrite); 2604 towrite);
2474 if (wrote < 0) 2605 if (wrote < 0)
2475 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2476 } 2607 }
2477 if (screen.tlen[row] >= 0) 2608 if (row_buf[row].l >= 0)
2478 if (write (fd, r1, 1) <= 0) 2609 if (write (fd, r1, 1) <= 0)
2479 return; /* XXX: death, no report */ 2610 return; /* XXX: death, no report */
2480 } 2611 }
2481} 2612}
2482#endif 2613#endif
2483 2614
2484/* ------------------------------------------------------------------------- * 2615/* ------------------------------------------------------------------------- *
2485 * CHARACTER SELECTION * 2616 * CHARACTER SELECTION *
2486 * ------------------------------------------------------------------------- */ 2617 * ------------------------------------------------------------------------- */
2487
2488/*
2489 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2490 */
2491void 2618void
2492rxvt_term::selection_check (int check_more) 2619rxvt_term::selection_check (int check_more) NOTHROW
2493{ 2620{
2494 row_col_t pos; 2621 row_col_t pos;
2495 2622
2496 if (!selection.op) 2623 if (!selection.op)
2497 return; 2624 return;
2498 2625
2499 pos.row = pos.col = 0; 2626 pos.row = pos.col = 0;
2500 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2501 || (selection.beg.row >= TermWin.nrow) 2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2502 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2503 || (selection.mark.row >= TermWin.nrow)
2504 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2505 || (selection.end.row >= TermWin.nrow)
2506 || (check_more == 1 2630 || (check_more == 1
2507 && current_screen == selection.screen 2631 && current_screen == selection.screen
2508 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2509 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2510 || (check_more == 2 2634 || (check_more == 2
… …
2512 && ROWCOL_IS_AFTER (selection.end, pos)) 2636 && ROWCOL_IS_AFTER (selection.end, pos))
2513 || (check_more == 3 2637 || (check_more == 3
2514 && ROWCOL_IS_AFTER (selection.end, pos)) 2638 && ROWCOL_IS_AFTER (selection.end, pos))
2515 || (check_more == 4 /* screen width change */ 2639 || (check_more == 4 /* screen width change */
2516 && (selection.beg.row != selection.end.row 2640 && (selection.beg.row != selection.end.row
2517 || selection.end.col > TermWin.ncol))) 2641 || selection.end.col > ncol)))
2518 CLEAR_SELECTION (); 2642 CLEAR_SELECTION ();
2519} 2643}
2520 2644
2521/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2522/* 2646/*
2523 * Paste a selection direct to the command fd 2647 * Paste a selection direct to the command fd
2524 */ 2648 */
2525void 2649void
2526rxvt_term::paste (const unsigned char *data, unsigned int len) 2650rxvt_term::paste (char *data, unsigned int len) NOTHROW
2527{ 2651{
2528 unsigned int i, j, n;
2529 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2530
2531#if 0
2532 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2533 ZERO_SCROLLBACK (r);
2534#endif
2535
2536 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2537 for (i = 0; i < len; i += PROP_SIZE) 2653 for (unsigned int i = 0; i < len; i++)
2538 {
2539 n = min (len - i, PROP_SIZE);
2540 MEMCPY (ds, data + i, n);
2541
2542 for (j = 0; j < n; j++)
2543 if (ds[j] == C0_LF) 2654 if (data[i] == C0_LF)
2544 ds[j] = C0_CR; 2655 data[i] = C0_CR;
2545 2656
2546 tt_write (ds, (int)n); 2657 tt_write (data, len);
2547 }
2548
2549 free (ds);
2550} 2658}
2551 2659
2552/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2553/* 2661/*
2554 * Respond to a notification that a primary selection has been sent 2662 * Respond to a notification that a primary selection has been sent
2555 * EXT: SelectionNotify 2663 * EXT: SelectionNotify
2556 */ 2664 */
2557int 2665void
2558rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2559{ 2667{
2560 long nread = 0;
2561 unsigned long bytes_after;
2562 XTextProperty ct;
2563
2564 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2565
2566 if (prop == None) /* check for failed XConvertSelection */ 2668 if (prop == None) /* check for failed XConvertSelection */
2567 { 2669 {
2568 if ((selection_type & Sel_CompoundText)) 2670 if ((selection_type & Sel_CompoundText))
2569 { 2671 {
2570 int selnum = selection_type & Sel_whereMask; 2672 int selnum = selection_type & Sel_whereMask;
… …
2583 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2685 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2584 else 2686 else
2585 selection_type = 0; 2687 selection_type = 0;
2586 } 2688 }
2587 2689
2588 return 0; 2690 return;
2589 }
2590
2591 for (;;)
2592 { 2691 }
2593 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2692
2594 (long) (PROP_SIZE / 4), delete_prop, 2693 unsigned long bytes_after;
2694 XTextProperty ct;
2695
2696 if (XGetWindowProperty (dpy, win, prop,
2697 0, PROP_SIZE / 4,
2698 delete_prop, AnyPropertyType,
2699 &ct.encoding, &ct.format,
2700 &ct.nitems, &bytes_after,
2701 &ct.value) != Success)
2702 {
2703 ct.value = 0;
2704 goto bailout;
2705 }
2706
2707 if (ct.encoding == None)
2708 goto bailout;
2709
2710 if (bytes_after)
2711 {
2712 // fetch and append remaining data
2713 XTextProperty ct2;
2714
2715 if (XGetWindowProperty (dpy, win, prop,
2716 ct.nitems / 4, (bytes_after + 3) / 4,
2717 delete_prop, AnyPropertyType,
2595 AnyPropertyType, &ct.encoding, &ct.format, 2718 &ct2.encoding, &ct2.format,
2596 &ct.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2597 &ct.value) != Success) 2720 &ct2.value) != Success)
2598 break; 2721 goto bailout;
2599 2722
2600 if (ct.encoding == 0) 2723 // realloc should be compatible to XFree, here, and elsewhere, too
2601 { 2724 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2602 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2725 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2603 break; 2726 ct.nitems += ct2.nitems;
2604 }
2605 2727
2728 XFree (ct2.value);
2729 }
2730
2606 if (ct.value == NULL) 2731 if (ct.value == 0)
2607 { 2732 goto bailout;
2608 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2609 continue;
2610 }
2611 2733
2734 if (ct.encoding == xa[XA_INCR])
2735 {
2736 // INCR selection, start handshake
2737 if (!delete_prop)
2738 XDeleteProperty (dpy, win, prop);
2739
2740 selection_wait = Sel_incr;
2741 incr_buf_fill = 0;
2742 incr_ev.start (10);
2743
2744 goto bailout;
2745 }
2746
2612 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
2748 {
2749 if (selection_wait == Sel_incr)
2750 {
2751 XFree (ct.value);
2752
2753 // finally complete, now paste the whole thing
2754 selection_wait = Sel_normal;
2755 ct.value = (unsigned char *)incr_buf;
2756 ct.nitems = incr_buf_fill;
2757 incr_buf = 0;
2758 incr_buf_size = 0;
2759 incr_ev.stop ();
2613 { 2760 }
2614 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2761 else
2615 2762 {
2616 if (selection_wait == Sel_normal && nread == 0 2763 if (selection_wait == Sel_normal
2617 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2618 { 2765 {
2619 /* 2766 /*
2620 * pass through again trying CUT_BUFFER0 if we've come from 2767 * pass through again trying CUT_BUFFER0 if we've come from
2621 * XConvertSelection () but nothing was presented 2768 * XConvertSelection () but nothing was presented
2622 */ 2769 */
2623 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2624 selection_paste (display->root, XA_CUT_BUFFER0, False); 2770 selection_paste (display->root, XA_CUT_BUFFER0, False);
2625 } 2771 }
2626 2772
2627 nread = -1; /* discount any previous stuff */ 2773 goto bailout;
2628 break;
2629 }
2630
2631 nread += ct.nitems;
2632
2633 char **cl;
2634 int cr;
2635 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2636 { 2774 }
2775 }
2776 else if (selection_wait == Sel_incr)
2777 {
2778 incr_ev.start (10);
2779
2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2781 {
2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784 }
2785
2786 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787 incr_buf_fill += ct.nitems;
2788
2789 goto bailout;
2790 }
2791
2792 char **cl;
2793 int cr;
2794
2795#if !ENABLE_MINIMAL
2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797 // so recode it manually
2798 if (ct.encoding == xa[XA_UTF8_STRING])
2799 {
2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801 char *s = rxvt_wcstombs (w);
2802 free (w);
2803 // TODO: strlen == only the first element will be converted. well...
2804 paste (s, strlen (s));
2805 free (s);
2806 }
2807 else
2808#endif
2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810 && cl)
2811 {
2637 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2638 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2639 2814
2640 XFreeStringList (cl); 2815 XFreeStringList (cl);
2641 } 2816 }
2642 else 2817 else
2643 paste (ct.value, ct.nitems); 2818 paste ((char *)ct.value, ct.nitems); // paste raw
2644 2819
2645 if (bytes_after == 0) 2820bailout:
2646 break;
2647
2648 XFree (ct.value);
2649 }
2650
2651 if (ct.value)
2652 XFree (ct.value); 2821 XFree (ct.value);
2653 2822
2654 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2655 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2656
2657 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2658 return (int)nread;
2659} 2825}
2660 2826
2661void 2827void
2662rxvt_term::incr_cb (time_watcher &w) 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2663{ 2829{
2664 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2665 2831
2832 incr_buf_size = 0;
2833 free (incr_buf);
2834
2666 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2667} 2836}
2668 2837
2669/*
2670 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2671 */
2672void 2838void
2673rxvt_term::selection_property (Window win, Atom prop) 2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2674{ 2840{
2675 int reget_time = 0; 2841 if (prop == None || selection_wait != Sel_incr)
2676
2677 if (prop == None)
2678 return; 2842 return;
2679 2843
2680 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2681 if (selection_wait == Sel_normal)
2682 {
2683 int a, afmt;
2684 Atom atype;
2685 unsigned long bytes_after, nitems;
2686 unsigned char *s = NULL;
2687
2688 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2689 xa[XA_INCR], &atype, &afmt, &nitems,
2690 &bytes_after, &s);
2691 if (s)
2692 XFree (s);
2693 if (a != Success)
2694 return;
2695
2696#ifndef __CYGWIN32__
2697 if (atype == xa[XA_INCR])
2698 { /* start an INCR transfer */
2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2700 XDeleteProperty (display->display, win, prop);
2701 XFlush (display->display);
2702 reget_time = 1;
2703 selection_wait = Sel_incr;
2704 }
2705#endif
2706
2707 }
2708 else if (selection_wait == Sel_incr)
2709 {
2710 reget_time = 1;
2711
2712 if (selection_paste (win, prop, True) == -1) 2844 selection_paste (win, prop, true);
2713 {
2714 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2715 selection_wait = Sel_none;
2716 incr_ev.stop ();
2717 }
2718 }
2719 if (reget_time) /* received more data so reget time */
2720 incr_ev.start (NOW + 10);
2721} 2845}
2722 2846
2723/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2724/* 2848/*
2725 * Request the current selection: 2849 * Request the current selection:
2726 * Order: > internal selection if available 2850 * Order: > internal selection if available
2727 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2728 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2729 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2730 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
2731 * EXT: button 2 release 2855 * EXT: button 2 release
2732 */ 2856 */
2733void 2857void
2734rxvt_term::selection_request (Time tm, int x, int y) 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2735{ 2859{
2736 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2860 if (selection.text && selnum == Sel_Primary)
2737 2861 {
2738 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2739 return; /* outside window */
2740
2741 if (selection.text)
2742 { /* internal selection */ 2862 /* internal selection */
2743 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2744 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2745 paste ((unsigned char *)str, strlen (str)); 2864 paste (str, strlen (str));
2746 free (str); 2865 free (str);
2747 return; 2866 return;
2748 } 2867 }
2749 else 2868 else
2750 { 2869 {
2751 int i;
2752
2753 selection_request_time = tm; 2870 selection_request_time = tm;
2754 selection_wait = Sel_normal; 2871 selection_wait = Sel_normal;
2755 2872
2756 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2757 {
2758#if X_HAVE_UTF8_STRING 2873#if X_HAVE_UTF8_STRING
2759 selection_type = Sel_UTF8String; 2874 selection_type = Sel_UTF8String;
2760 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2875 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2761 return; 2876 return;
2762#else 2877#else
2763 selection_type = Sel_CompoundText; 2878 selection_type = Sel_CompoundText;
2764 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2879 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2765 return; 2880 return;
2766#endif 2881#endif
2767
2768 }
2769 } 2882 }
2770 2883
2771 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2884 selection_wait = Sel_none; /* don't loop in selection_paste () */
2772 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2773 selection_paste (display->root, XA_CUT_BUFFER0, False); 2885 selection_paste (display->root, XA_CUT_BUFFER0, false);
2774} 2886}
2775 2887
2776int 2888int
2777rxvt_term::selection_request_other (Atom target, int selnum) 2889rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2778{ 2890{
2779 Atom sel; 2891 Atom sel;
2780#ifdef DEBUG_SELECT
2781 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2782#endif
2783 2892
2784 selection_type |= selnum; 2893 selection_type |= selnum;
2785 2894
2786 if (selnum == Sel_Primary) 2895 if (selnum == Sel_Primary)
2787 sel = XA_PRIMARY; 2896 sel = XA_PRIMARY;
2788 else if (selnum == Sel_Secondary) 2897 else if (selnum == Sel_Secondary)
2789 sel = XA_SECONDARY; 2898 sel = XA_SECONDARY;
2790 else 2899 else
2791 sel = xa[XA_CLIPBOARD]; 2900 sel = xa[XA_CLIPBOARD];
2792 2901
2793 if (XGetSelectionOwner (display->display, sel) != None) 2902 if (XGetSelectionOwner (dpy, sel) != None)
2794 { 2903 {
2795 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2796 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2797 TermWin.vt, selection_request_time); 2905 vt, selection_request_time);
2798 return 1; 2906 return 1;
2799 } 2907 }
2800 2908
2801 return 0; 2909 return 0;
2802} 2910}
… …
2805/* 2913/*
2806 * Clear all selected text 2914 * Clear all selected text
2807 * EXT: SelectionClear 2915 * EXT: SelectionClear
2808 */ 2916 */
2809void 2917void
2810rxvt_term::selection_clear () 2918rxvt_term::selection_clear () NOTHROW
2811{ 2919{
2812 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2813
2814 want_refresh = 1; 2920 want_refresh = 1;
2815 free (selection.text); 2921 free (selection.text);
2816 selection.text = NULL; 2922 selection.text = NULL;
2817 selection.len = 0; 2923 selection.len = 0;
2818 CLEAR_SELECTION (); 2924 CLEAR_SELECTION ();
… …
2827 * EXT: button 1 or 3 release 2933 * EXT: button 1 or 3 release
2828 */ 2934 */
2829void 2935void
2830rxvt_term::selection_make (Time tm) 2936rxvt_term::selection_make (Time tm)
2831{ 2937{
2832 int i, col, end_col, row, end_row; 2938 int i;
2833 wchar_t *new_selection_text; 2939 wchar_t *new_selection_text;
2834 text_t *t; 2940 text_t *t;
2835 2941
2836 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2837 switch (selection.op) 2942 switch (selection.op)
2838 { 2943 {
2839 case SELECTION_CONT: 2944 case SELECTION_CONT:
2840 break; 2945 break;
2841 case SELECTION_INIT: 2946 case SELECTION_INIT:
… …
2851 selection.op = SELECTION_DONE; 2956 selection.op = SELECTION_DONE;
2852 2957
2853 if (selection.clicks == 4) 2958 if (selection.clicks == 4)
2854 return; /* nothing selected, go away */ 2959 return; /* nothing selected, go away */
2855 2960
2961 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2962 return;
2963
2856 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2964 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2857 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2965 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2858 2966
2859 col = selection.beg.col;
2860 MAX_IT (col, 0);
2861 row = selection.beg.row + TermWin.saveLines;
2862 end_row = selection.end.row + TermWin.saveLines;
2863 int ofs = 0; 2967 int ofs = 0;
2864 int extra = 0; 2968 int extra = 0;
2865 2969
2970 int col = selection.beg.col;
2971 int row = selection.beg.row;
2972
2973 int end_col;
2974
2866 for (; row <= end_row; row++, col = 0) 2975 for (; row <= selection.end.row; row++, col = 0)
2867 { 2976 {
2868 t = &(screen.text[row][col]); 2977#if !ENABLE_MINIMAL
2869 2978 if (selection.rect)
2870 end_col = screen.tlen[row]; 2979 {
2871 2980 col = selection.beg.col;
2872 if (end_col == -1)
2873 end_col = TermWin.ncol; 2981 end_col = ncol + 1;
2982 }
2983 else
2984#endif
2985 end_col = ROW(row).l;
2874 2986
2987 col = max (col, 0);
2988
2875 if (row == end_row) 2989 if (row == selection.end.row
2990#if !ENABLE_MINIMAL
2991 || selection.rect
2992#endif
2993 )
2876 MIN_IT (end_col, selection.end.col); 2994 min_it (end_col, selection.end.col);
2995
2996 t = ROW(row).t + col;
2877 2997
2878 for (; col < end_col; col++) 2998 for (; col < end_col; col++)
2879 { 2999 {
2880 if (*t == NOCHAR) 3000 if (*t == NOCHAR)
2881 t++; 3001 t++;
… …
2898#endif 3018#endif
2899 else 3019 else
2900 new_selection_text[ofs++] = *t++; 3020 new_selection_text[ofs++] = *t++;
2901 } 3021 }
2902 3022
2903 if (screen.tlen[row] != -1 && row != end_row) 3023#if !ENABLE_MINIMAL
3024 if (selection.rect)
3025 {
3026 while (ofs
3027 && new_selection_text[ofs - 1] != C0_LF
3028 && unicode::is_space (new_selection_text[ofs - 1]))
3029 --ofs;
3030
2904 new_selection_text[ofs++] = C0_LF; 3031 new_selection_text[ofs++] = C0_LF;
3032 }
3033 else
3034#endif
3035 if (!ROW(row).is_longer () && row != selection.end.row)
3036 new_selection_text[ofs++] = C0_LF;
2905 } 3037 }
2906 3038
2907 if (end_col != selection.end.col) 3039 if (end_col != selection.end.col)
2908 new_selection_text[ofs++] = C0_LF; 3040 new_selection_text[ofs++] = C0_LF;
2909 3041
… …
2919 3051
2920 // we usually allocate much more than necessary, so realloc it smaller again 3052 // we usually allocate much more than necessary, so realloc it smaller again
2921 selection.len = ofs; 3053 selection.len = ofs;
2922 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3054 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2923 3055
3056 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3057 return;
3058
3059 selection_grab (tm);
3060}
3061
3062bool
3063rxvt_term::selection_grab (Time tm) NOTHROW
3064{
3065 selection_time = tm;
3066
2924 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3067 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2925 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3068 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3069 {
2926 display->set_selection_owner (this); 3070 display->set_selection_owner (this);
3071 return true;
3072 }
2927 else 3073 else
2928 rxvt_warn ("can't get primary selection, ignoring.\n"); 3074 {
3075 selection_clear ();
3076 return false;
3077 }
2929 3078
2930#if 0 3079#if 0
2931 XTextProperty ct; 3080 XTextProperty ct;
2932 3081
2933 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3082 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2934 { 3083 {
2935 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3084 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2936 PropModeReplace, ct.value, ct.nitems);
2937 XFree (ct.value); 3085 XFree (ct.value);
2938 } 3086 }
2939#endif 3087#endif
2940
2941 selection_time = tm;
2942 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2943} 3088}
2944 3089
2945/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
2946/* 3091/*
2947 * Mark or select text based upon number of clicks: 1, 2, or 3 3092 * Mark or select text based upon number of clicks: 1, 2, or 3
2948 * EXT: button 1 press 3093 * EXT: button 1 press
2949 */ 3094 */
2950void 3095void
2951rxvt_term::selection_click (int clicks, int x, int y) 3096rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2952{ 3097{
2953 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2954
2955 clicks = ((clicks - 1) % 3) + 1; 3098 clicks = ((clicks - 1) % 3) + 1;
2956 selection.clicks = clicks; /* save clicks so extend will work */ 3099 selection.clicks = clicks; /* save clicks so extend will work */
2957 3100
3101 if (clicks == 2 && !selection.rect
3102 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3103 {
3104 MEvent.clicks = 1; // what a mess
3105 selection.screen = current_screen;
3106 selection.op = SELECTION_CONT;
3107 return;
3108 }
3109
2958 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3110 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2959 3111
2960 if (clicks == 2 || clicks == 3) 3112 if (clicks == 2 || clicks == 3)
2961 selection_extend_colrow (selection.mark.col, 3113 selection_extend_colrow (selection.mark.col,
2962 selection.mark.row + TermWin.view_start, 3114 selection.mark.row - view_start,
2963 0, /* button 3 */ 3115 0, /* button 3 */
2964 1, /* button press */ 3116 1, /* button press */
2965 0); /* click change */ 3117 0); /* click change */
2966} 3118}
2967 3119
2968/* ------------------------------------------------------------------------- */ 3120/* ------------------------------------------------------------------------- */
2969/* 3121/*
2970 * Mark a selection at the specified col/row 3122 * Mark a selection at the specified col/row
2971 */ 3123 */
2972void 3124void
2973rxvt_term::selection_start_colrow (int col, int row) 3125rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2974{ 3126{
2975 want_refresh = 1; 3127 want_refresh = 1;
3128
3129 selection.mark.row = row + view_start;
2976 selection.mark.col = col; 3130 selection.mark.col = col;
2977 selection.mark.row = row - TermWin.view_start;
2978 3131
2979 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3132 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2980 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3133 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2981 MAX_IT (selection.mark.col, 0);
2982 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2983 3134
2984 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
2985 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2986 --selection.mark.col; 3137 --selection.mark.col;
2987 3138
2988 if (selection.op) 3139 if (selection.op)
3140 {
2989 { /* clear the old selection */ 3141 /* clear the old selection */
2990 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
2991 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
2992 } 3144 }
2993 3145
2994 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3001 * We now only find out the boundary in one direction 3153 * We now only find out the boundary in one direction
3002 */ 3154 */
3003 3155
3004/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3156/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3005#define DELIMIT_TEXT(x) \ 3157#define DELIMIT_TEXT(x) \
3006 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3158 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3007#define DELIMIT_REND(x) 1 3159#define DELIMIT_REND(x) 1
3008 3160
3009void 3161void
3010rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3162rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3011{ 3163{
3012 int col, row, dirnadd, tcol, trow, w1, w2; 3164 int col, row, dirnadd, tcol, trow, w1, w2;
3013 row_col_t bound; 3165 row_col_t bound;
3014 text_t *stp; 3166 text_t *stp;
3015 rend_t *srp; 3167 rend_t *srp;
3016 3168
3017 if (dirn == UP) 3169 if (dirn == UP)
3018 { 3170 {
3019 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3171 bound.row = top_row - 1;
3020 bound.col = 0; 3172 bound.col = 0;
3021 dirnadd = -1; 3173 dirnadd = -1;
3022 } 3174 }
3023 else 3175 else
3024 { 3176 {
3025 bound.row = TermWin.saveLines + TermWin.nrow; 3177 bound.row = nrow;
3026 bound.col = TermWin.ncol - 1; 3178 bound.col = ncol - 1;
3027 dirnadd = 1; 3179 dirnadd = 1;
3028 } 3180 }
3029 3181
3030 row = mark->row + TermWin.saveLines; 3182 row = mark->row;
3031 col = mark->col; 3183 col = max (mark->col, 0);
3032 MAX_IT (col, 0); 3184
3033 /* find the edge of a word */ 3185 /* find the edge of a word */
3034 stp = & (screen.text[row][col]); 3186 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3035 w1 = DELIMIT_TEXT (*stp); 3187 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3036
3037 srp = (&screen.rend[row][col]);
3038 w2 = DELIMIT_REND (*srp);
3039 3188
3040 for (;;) 3189 for (;;)
3041 { 3190 {
3042 for (; col != bound.col; col += dirnadd) 3191 for (; col != bound.col; col += dirnadd)
3043 { 3192 {
… …
3053 break; 3202 break;
3054 } 3203 }
3055 3204
3056 if ((col == bound.col) && (row != bound.row)) 3205 if ((col == bound.col) && (row != bound.row))
3057 { 3206 {
3058 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3207 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3059 { 3208 {
3060 trow = row + dirnadd; 3209 trow = row + dirnadd;
3061 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3210 tcol = dirn == UP ? ncol - 1 : 0;
3062 3211
3063 if (screen.text[trow] == NULL) 3212 if (!ROW(trow).t)
3064 break; 3213 break;
3065 3214
3066 stp = & (screen.text[trow][tcol]); 3215 stp = ROW(trow).t + tcol;
3067 srp = & (screen.rend[trow][tcol]); 3216 srp = ROW(trow).r + tcol;
3068 3217
3069 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3218 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3070 break; 3219 break;
3071 3220
3072 row = trow; 3221 row = trow;
… …
3075 } 3224 }
3076 } 3225 }
3077 break; 3226 break;
3078 } 3227 }
3079 3228
3080Old_Word_Selection_You_Die:
3081 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));
3082
3083 if (dirn == DN) 3229 if (dirn == DN)
3084 col++; /* put us on one past the end */ 3230 col++; /* put us on one past the end */
3085 3231
3086 /* Poke the values back in */ 3232 /* Poke the values back in */
3087 ret->row = row - TermWin.saveLines; 3233 ret->row = row;
3088 ret->col = col; 3234 ret->col = col;
3089} 3235}
3090 3236
3091/* ------------------------------------------------------------------------- */ 3237/* ------------------------------------------------------------------------- */
3092/* 3238/*
… …
3095 * flag == 0 ==> button 1 3241 * flag == 0 ==> button 1
3096 * flag == 1 ==> button 3 press 3242 * flag == 1 ==> button 3 press
3097 * flag == 2 ==> button 3 motion 3243 * flag == 2 ==> button 3 motion
3098 */ 3244 */
3099void 3245void
3100rxvt_term::selection_extend (int x, int y, int flag) 3246rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3101{ 3247{
3102 int col, row; 3248 int col = clamp (Pixel2Col (x), 0, ncol);
3103 3249 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3104 col = Pixel2Col (x);
3105 row = Pixel2Row (y);
3106 MAX_IT (row, 0);
3107 MIN_IT (row, (int)TermWin.nrow - 1);
3108 MAX_IT (col, 0);
3109 MIN_IT (col, (int)TermWin.ncol);
3110 3250
3111 /* 3251 /*
3112 * If we're selecting characters (single click) then we must check first 3252 * If we're selecting characters (single click) then we must check first
3113 * if we are at the same place as the original mark. If we are then 3253 * if we are at the same place as the original mark. If we are then
3114 * select nothing. Otherwise, if we're to the right of the mark, you have to 3254 * select nothing. Otherwise, if we're to the right of the mark, you have to
3115 * be _past_ a character for it to be selected. 3255 * be _past_ a character for it to be selected.
3116 */ 3256 */
3117 if (((selection.clicks % 3) == 1) && !flag 3257 if (((selection.clicks % 3) == 1) && !flag
3118 && (col == selection.mark.col 3258 && (col == selection.mark.col
3119 && (row == selection.mark.row + TermWin.view_start))) 3259 && (row == selection.mark.row - view_start)))
3120 { 3260 {
3121 /* select nothing */ 3261 /* select nothing */
3122 selection.beg.row = selection.end.row = 0; 3262 selection.beg.row = selection.end.row = 0;
3123 selection.beg.col = selection.end.col = 0; 3263 selection.beg.col = selection.end.col = 0;
3124 selection.clicks = 4; 3264 selection.clicks = 4;
3125 want_refresh = 1; 3265 want_refresh = 1;
3126 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3127 return; 3266 return;
3128 } 3267 }
3129 3268
3130 if (selection.clicks == 4) 3269 if (selection.clicks == 4)
3131 selection.clicks = 1; 3270 selection.clicks = 1;
… …
3138/* ------------------------------------------------------------------------- */ 3277/* ------------------------------------------------------------------------- */
3139/* 3278/*
3140 * Extend the selection to the specified col/row 3279 * Extend the selection to the specified col/row
3141 */ 3280 */
3142void 3281void
3143rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3282rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3144{ 3283{
3145 int16_t ncol = TermWin.ncol;
3146 int end_col;
3147 row_col_t pos; 3284 row_col_t pos;
3148 enum { 3285 enum {
3149 LEFT, RIGHT 3286 LEFT, RIGHT
3150 } closeto = RIGHT; 3287 } closeto = RIGHT;
3151 3288
3152 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));
3153 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));
3154
3155 want_refresh = 1; 3289 want_refresh = 1;
3290
3156 switch (selection.op) 3291 switch (selection.op)
3157 { 3292 {
3158 case SELECTION_INIT: 3293 case SELECTION_INIT:
3159 CLEAR_SELECTION (); 3294 CLEAR_SELECTION ();
3160 selection.op = SELECTION_BEGIN; 3295 selection.op = SELECTION_BEGIN;
… …
3173 selection_start_colrow (col, row); 3308 selection_start_colrow (col, row);
3174 /* FALLTHROUGH */ 3309 /* FALLTHROUGH */
3175 default: 3310 default:
3176 return; 3311 return;
3177 } 3312 }
3313
3178 if (selection.beg.col == selection.end.col 3314 if (selection.beg.col == selection.end.col
3179 && selection.beg.col != selection.mark.col 3315 && selection.beg.col != selection.mark.col
3180 && selection.beg.row == selection.end.row 3316 && selection.beg.row == selection.end.row
3181 && selection.beg.row != selection.mark.row) 3317 && selection.beg.row != selection.mark.row)
3182 { 3318 {
3183 selection.beg.col = selection.end.col = selection.mark.col; 3319 selection.beg.col = selection.end.col = selection.mark.col;
3184 selection.beg.row = selection.end.row = selection.mark.row; 3320 selection.beg.row = selection.end.row = selection.mark.row;
3185 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));
3186 } 3321 }
3187 3322
3188 pos.col = col; 3323 pos.col = col;
3189 pos.row = row; 3324 pos.row = view_start + row;
3190
3191 pos.row -= TermWin.view_start; /* adjust for scroll */
3192 3325
3193 /* 3326 /*
3194 * This is mainly xterm style selection with a couple of differences, mainly 3327 * This is mainly xterm style selection with a couple of differences, mainly
3195 * in the way button3 drag extension works. 3328 * in the way button3 drag extension works.
3196 * We're either doing: button1 drag; button3 press; or button3 drag 3329 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3202 * a point/word/line which is either the start or end of the selection 3335 * a point/word/line which is either the start or end of the selection
3203 * and it was decided by whichever point/word/line was `fixed' at the 3336 * and it was decided by whichever point/word/line was `fixed' at the
3204 * time of the most recent button3 press 3337 * time of the most recent button3 press
3205 */ 3338 */
3206 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3207 { /* button3 press */ 3341 /* button3 press */
3208 /* 3342 /*
3209 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3210 */ 3344 */
3211 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3212 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3230 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3231 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3232 } 3366 }
3233 } 3367 }
3234 else 3368 else
3369 {
3235 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3236 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3237 { 3372 {
3238 if ((selection.mark.row == selection.end.row) 3373 if (selection.mark.row == selection.end.row
3239 && (selection.mark.col == selection.end.col) 3374 && selection.mark.col == selection.end.col
3375 && clickchange
3240 && clickchange && selection.clicks == 2) 3376 && selection.clicks == 2)
3241 selection.mark.col--; 3377 selection.mark.col--;
3242 3378
3243 selection.beg.row = pos.row; 3379 selection.beg.row = pos.row;
3244 selection.beg.col = pos.col; 3380 selection.beg.col = pos.col;
3245 selection.end.row = selection.mark.row; 3381 selection.end.row = selection.mark.row;
… …
3254 } 3390 }
3255 } 3391 }
3256 3392
3257 if (selection.clicks == 1) 3393 if (selection.clicks == 1)
3258 { 3394 {
3259 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3395 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3260 3396 && !ROW(selection.beg.row).is_longer ()
3261 if (end_col != -1 && selection.beg.col > end_col) 3397#if !ENABLE_MINIMAL
3398 && !selection.rect
3399#endif
3262 { 3400 )
3263#if 1
3264 selection.beg.col = ncol; 3401 selection.beg.col = ncol;
3265#else 3402
3266 if (selection.beg.row != selection.end.row) 3403 if (
3267 selection.beg.col = ncol; 3404 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3268 else 3405 && !ROW(selection.end.row).is_longer ()
3269 selection.beg.col = selection.mark.col; 3406#if !ENABLE_MINIMAL
3407 && !selection.rect
3270#endif 3408#endif
3271 } 3409 )
3272
3273 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3274
3275 if (end_col != -1 && selection.end.col > end_col)
3276 selection.end.col = ncol; 3410 selection.end.col = ncol;
3277 } 3411 }
3278 else if (selection.clicks == 2) 3412 else if (selection.clicks == 2)
3279 { 3413 {
3280 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3414 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3281 selection.end.col--; 3415 selection.end.col--;
3282 3416
3283 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3284 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3418 selection_delimit_word (DN, &selection.end, &selection.end);
3285 } 3419 }
3286 else if (selection.clicks == 3) 3420 else if (selection.clicks == 3)
3287 { 3421 {
3288#ifndef NO_FRILLS 3422#if ENABLE_FRILLS
3289 if ((Options & Opt_tripleclickwords)) 3423 if (option (Opt_tripleclickwords))
3290 { 3424 {
3291 int end_row; 3425 selection_delimit_word (UP, &selection.beg, &selection.beg);
3292 3426
3293 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3294 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3295
3296 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3427 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3297 { 3428 {
3298 end_col = screen.tlen[end_row + TermWin.saveLines]; 3429 if (!ROW(end_row).is_longer ())
3299
3300 if (end_col != -1)
3301 { 3430 {
3302 selection.end.row = end_row; 3431 selection.end.row = end_row;
3303 selection.end.col = end_col; 3432 selection.end.col = ROW(end_row).l;
3433# if !ENABLE_MINIMAL
3304 selection_remove_trailing_spaces (); 3434 selection_remove_trailing_spaces ();
3435# endif
3305 break; 3436 break;
3306 } 3437 }
3307 } 3438 }
3308 } 3439 }
3309 else 3440 else
3310#endif 3441#endif
3311 { 3442 {
3312 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3443 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3313 selection.mark.col++; 3444 selection.mark.col++;
3445
3314 selection.beg.col = 0; 3446 selection.beg.col = 0;
3315 selection.end.col = ncol; 3447 selection.end.col = ncol;
3448
3449 // select a complete logical line
3450 while (selection.beg.row > -saveLines
3451 && ROW(selection.beg.row - 1).is_longer ())
3452 selection.beg.row--;
3453
3454 while (selection.end.row < nrow
3455 && ROW(selection.end.row).is_longer ())
3456 selection.end.row++;
3316 } 3457 }
3317 } 3458 }
3318 3459
3319 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3320 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3321 if (closeto == LEFT) 3463 if (closeto == LEFT)
3322 { 3464 {
3323 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3324 selection.mark.col = selection.end.col 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3325 - (selection.clicks == 2);
3326 } 3467 }
3327 else 3468 else
3328 { 3469 {
3329 selection.mark.row = selection.beg.row; 3470 selection.mark.row = selection.beg.row;
3330 selection.mark.col = selection.beg.col; 3471 selection.mark.col = selection.beg.col;
3331 } 3472 }
3332 } 3473 }
3333 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));
3334}
3335 3474
3336#ifndef NO_FRILLS 3475#if !ENABLE_MINIMAL
3476 if (selection.rect && selection.beg.col > selection.end.col)
3477 ::swap (selection.beg.col, selection.end.col);
3478#endif
3479}
3480
3481#if !ENABLE_MINIMAL
3337void 3482void
3338rxvt_term::selection_remove_trailing_spaces () 3483rxvt_term::selection_remove_trailing_spaces () NOTHROW
3339{ 3484{
3340 int32_t end_col, end_row; 3485 int32_t end_col, end_row;
3341 text_t *stp; 3486 text_t *stp;
3342 3487
3343 end_col = selection.end.col; 3488 end_col = selection.end.col;
3344 end_row = selection.end.row; 3489 end_row = selection.end.row;
3490
3345 for ( ; end_row >= selection.beg.row; ) 3491 for (; end_row >= selection.beg.row; )
3346 { 3492 {
3347 stp = screen.text[end_row + TermWin.saveLines]; 3493 stp = ROW(end_row).t;
3494
3348 while (--end_col >= 0) 3495 while (--end_col >= 0)
3349 { 3496 {
3350 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3497 if (stp[end_col] != NOCHAR
3498 && !unicode::is_space (stp[end_col]))
3351 break; 3499 break;
3352 } 3500 }
3501
3353 if (end_col >= 0 3502 if (end_col >= 0
3354 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3503 || !ROW(end_row - 1).is_longer ())
3355 { 3504 {
3356 selection.end.col = end_col + 1; 3505 selection.end.col = end_col + 1;
3357 selection.end.row = end_row; 3506 selection.end.row = end_row;
3358 break; 3507 break;
3359 } 3508 }
3509
3360 end_row--; 3510 end_row--;
3361 end_col = TermWin.ncol; 3511 end_col = ncol;
3362 } 3512 }
3513
3363 if (selection.mark.row > selection.end.row) 3514 if (selection.mark.row > selection.end.row)
3364 { 3515 {
3365 selection.mark.row = selection.end.row; 3516 selection.mark.row = selection.end.row;
3366 selection.mark.col = selection.end.col; 3517 selection.mark.col = selection.end.col;
3367 } 3518 }
… …
3375/* 3526/*
3376 * Double click on button 3 when already selected 3527 * Double click on button 3 when already selected
3377 * EXT: button 3 double click 3528 * EXT: button 3 double click
3378 */ 3529 */
3379void 3530void
3380rxvt_term::selection_rotate (int x, int y) 3531rxvt_term::selection_rotate (int x, int y) NOTHROW
3381{ 3532{
3382 selection.clicks = selection.clicks % 3 + 1; 3533 selection.clicks = selection.clicks % 3 + 1;
3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3534 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3384} 3535}
3385 3536
3386/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3387/* 3538/*
3388 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3389 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3390 * the X11 protocol.
3391 */
3392typedef CARD32 Atom32;
3393
3394/* ------------------------------------------------------------------------- */
3395/*
3396 * Respond to a request for our current selection 3539 * Respond to a request for our current selection
3397 * EXT: SelectionRequest 3540 * EXT: SelectionRequest
3398 */ 3541 */
3399void 3542void
3400rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3401{ 3544{
3402 XSelectionEvent ev; 3545 XSelectionEvent ev;
3403 XTextProperty ct;
3404 XICCEncodingStyle style;
3405 Atom target;
3406 3546
3407 ev.type = SelectionNotify; 3547 ev.type = SelectionNotify;
3408 ev.property = None; 3548 ev.property = None;
3409 ev.display = rq.display; 3549 ev.display = rq.display;
3410 ev.requestor = rq.requestor; 3550 ev.requestor = rq.requestor;
… …
3412 ev.target = rq.target; 3552 ev.target = rq.target;
3413 ev.time = rq.time; 3553 ev.time = rq.time;
3414 3554
3415 if (rq.target == xa[XA_TARGETS]) 3555 if (rq.target == xa[XA_TARGETS])
3416 { 3556 {
3417 Atom32 target_list[6]; 3557 Atom target_list[6];
3418 Atom32 *target = target_list; 3558 Atom *target = target_list;
3419 3559
3420 *target++ = (Atom32) xa[XA_TARGETS]; 3560 *target++ = xa[XA_TARGETS];
3421 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3561 *target++ = xa[XA_TIMESTAMP];
3422 *target++ = (Atom32) XA_STRING; 3562 *target++ = XA_STRING;
3423 *target++ = (Atom32) xa[XA_TEXT]; 3563 *target++ = xa[XA_TEXT];
3424 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3564 *target++ = xa[XA_COMPOUND_TEXT];
3425#if X_HAVE_UTF8_STRING 3565#if X_HAVE_UTF8_STRING
3426 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3566 *target++ = xa[XA_UTF8_STRING];
3427#endif 3567#endif
3428 3568
3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3569 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3430 (8 * sizeof (target_list[0])), PropModeReplace, 3570 32, PropModeReplace,
3431 (unsigned char *)target_list, 3571 (unsigned char *)target_list, target - target_list);
3432 target - target_list);
3433 ev.property = rq.property; 3572 ev.property = rq.property;
3434 } 3573 }
3574#if TODO // TODO
3435 else if (rq.target == xa[XA_MULTIPLE]) 3575 else if (rq.target == xa[XA_MULTIPLE])
3436 { 3576 {
3437 /* TODO: Handle MULTIPLE */ 3577 /* TODO: Handle MULTIPLE */
3438 } 3578 }
3579#endif
3439 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3580 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3440 { 3581 {
3441 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3582 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3442 (8 * sizeof (Time)), PropModeReplace,
3443 (unsigned char *)&selection_time, 1); 3583 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3444 ev.property = rq.property; 3584 ev.property = rq.property;
3445 } 3585 }
3446 else if (rq.target == XA_STRING 3586 else if (rq.target == XA_STRING
3447 || rq.target == xa[XA_TEXT] 3587 || rq.target == xa[XA_TEXT]
3448 || rq.target == xa[XA_COMPOUND_TEXT] 3588 || rq.target == xa[XA_COMPOUND_TEXT]
3449 || rq.target == xa[XA_UTF8_STRING] 3589 || rq.target == xa[XA_UTF8_STRING]
3450 ) 3590 )
3451 { 3591 {
3592 XTextProperty ct;
3593 Atom target = rq.target;
3452 short freect = 0; 3594 short freect = 0;
3453 int selectlen; 3595 int selectlen;
3454 wchar_t *cl; 3596 wchar_t *cl;
3455 3597 enum {
3456 target = rq.target; 3598 enc_string = XStringStyle,
3599 enc_text = XStdICCTextStyle,
3600 enc_compound_text = XCompoundTextStyle,
3601#ifdef X_HAVE_UTF8_STRING
3602 enc_utf8 = XUTF8StringStyle,
3603#else
3604 enc_utf8 = -1,
3605#endif
3606 } style;
3457 3607
3458 if (target == XA_STRING) 3608 if (target == XA_STRING)
3459 // we actually don't do XA_STRING, but who cares, as i18n clients 3609 // we actually don't do XA_STRING, but who cares, as i18n clients
3460 // will ask for another format anyways. 3610 // will ask for another format anyways.
3461 style = XStringStyle; 3611 style = enc_string;
3462 else if (target == xa[XA_TEXT]) 3612 else if (target == xa[XA_TEXT])
3463 style = XStdICCTextStyle; 3613 style = enc_text;
3464 else if (target == xa[XA_COMPOUND_TEXT]) 3614 else if (target == xa[XA_COMPOUND_TEXT])
3465 style = XCompoundTextStyle; 3615 style = enc_compound_text;
3466#if X_HAVE_UTF8_STRING 3616#if !ENABLE_MINIMAL
3467 else if (target == xa[XA_UTF8_STRING]) 3617 else if (target == xa[XA_UTF8_STRING])
3468 style = XUTF8StringStyle; 3618 style = enc_utf8;
3469#endif 3619#endif
3470 else 3620 else
3471 { 3621 {
3472 target = xa[XA_COMPOUND_TEXT]; 3622 target = xa[XA_COMPOUND_TEXT];
3473 style = XCompoundTextStyle; 3623 style = enc_compound_text;
3474 } 3624 }
3475 3625
3476 if (selection.text) 3626 if (selection.text)
3477 { 3627 {
3478 cl = selection.text; 3628 cl = selection.text;
… …
3482 { 3632 {
3483 cl = L""; 3633 cl = L"";
3484 selectlen = 0; 3634 selectlen = 0;
3485 } 3635 }
3486 3636
3487 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3637#if !ENABLE_MINIMAL
3488 // manually for XUTF8StringStyle. 3638 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3639 // so recode it manually
3640 if (style == enc_utf8)
3641 {
3642 freect = 1;
3643 ct.encoding = target;
3644 ct.format = 8;
3645 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3646 ct.nitems = strlen ((char *)ct.value);
3647 }
3648 else
3649#endif
3489 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3650 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3490 freect = 1; 3651 freect = 1;
3491 else 3652 else
3492 { 3653 {
3493 /* if we failed to convert then send it raw */ 3654 /* if we failed to convert then send it raw */
3494 ct.value = (unsigned char *)cl; 3655 ct.value = (unsigned char *)cl;
3495 ct.nitems = selectlen; 3656 ct.nitems = selectlen;
3657 ct.encoding = target;
3496 } 3658 }
3497 3659
3498 XChangeProperty (display->display, rq.requestor, rq.property, 3660 XChangeProperty (dpy, rq.requestor, rq.property,
3499 target, 8, PropModeReplace, 3661 ct.encoding, 8, PropModeReplace,
3500 ct.value, (int)ct.nitems); 3662 ct.value, (int)ct.nitems);
3501 ev.property = rq.property; 3663 ev.property = rq.property;
3502 3664
3503 if (freect) 3665 if (freect)
3504 XFree (ct.value); 3666 XFree (ct.value);
3505 } 3667 }
3506 3668
3507 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3508}
3509
3510/* ------------------------------------------------------------------------- *
3511 * MOUSE ROUTINES *
3512 * ------------------------------------------------------------------------- */
3513
3514/*
3515 * return col/row values corresponding to x/y pixel values
3516 */
3517void
3518rxvt_term::pixel_position (int *x, int *y)
3519{
3520 *x = Pixel2Col (*x);
3521 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3522 *y = Pixel2Row (*y);
3523 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3524} 3670}
3525 3671
3526/* ------------------------------------------------------------------------- */ 3672/* ------------------------------------------------------------------------- */
3527#ifdef USE_XIM 3673#ifdef USE_XIM
3528void 3674void
3529rxvt_term::im_set_position (XPoint *pos) 3675rxvt_term::im_set_position (XPoint &pos) NOTHROW
3530{ 3676{
3531 XWindowAttributes xwa; 3677 XWindowAttributes xwa;
3532 3678
3533 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3679 XGetWindowAttributes (dpy, vt, &xwa);
3680
3534 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3681 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3535 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3682 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3536} 3683}
3537
3538#endif 3684#endif
3685
3686#if ENABLE_OVERLAY
3687void
3688rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3689{
3690 if (nrow < 1 || ncol < 1)
3691 return;
3692
3693 want_refresh = 1;
3694
3695 scr_overlay_off ();
3696
3697 if (x < 0) x = ncol - w;
3698 if (y < 0) y = nrow - h;
3699
3700 // make space for border
3701 w += 2; min_it (w, ncol);
3702 h += 2; min_it (h, nrow);
3703
3704 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; clamp_it (y, 0, nrow - h);
3706
3707 ov_x = x; ov_y = y;
3708 ov_w = w; ov_h = h;
3709
3710 ov_text = new text_t *[h];
3711 ov_rend = new rend_t *[h];
3712
3713 for (y = 0; y < h; y++)
3714 {
3715 text_t *tp = ov_text[y] = new text_t[w];
3716 rend_t *rp = ov_rend[y] = new rend_t[w];
3717
3718 text_t t0, t1, t2;
3719 rend_t r = OVERLAY_RSTYLE;
3720
3721 if (y == 0)
3722 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3723 else if (y < h - 1)
3724 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3725 else
3726 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3727
3728 *tp++ = t0;
3729 *rp++ = r;
3730
3731 for (x = w - 2; x > 0; --x)
3732 {
3733 *tp++ = t1;
3734 *rp++ = r;
3735 }
3736
3737 *tp = t2;
3738 *rp = r;
3739 }
3740}
3741
3742void
3743rxvt_term::scr_overlay_off () NOTHROW
3744{
3745 if (!ov_text)
3746 return;
3747
3748 want_refresh = 1;
3749
3750 for (int y = 0; y < ov_h; y++)
3751 {
3752 delete [] ov_text[y];
3753 delete [] ov_rend[y];
3754 }
3755
3756 delete [] ov_text; ov_text = 0;
3757 delete [] ov_rend; ov_rend = 0;
3758}
3759
3760void
3761rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3762{
3763 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3764 return;
3765
3766 x++, y++;
3767
3768 ov_text[y][x] = text;
3769 ov_rend[y][x] = rend;
3770}
3771
3772void
3773rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3774{
3775 while (*s)
3776 scr_overlay_set (x++, y, *s++);
3777}
3778
3779void
3780rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3781{
3782 while (*s)
3783 {
3784 text_t t = *s++;
3785 int width = WCWIDTH (t);
3786
3787 while (width--)
3788 {
3789 scr_overlay_set (x++, y, t);
3790 t = NOCHAR;
3791 }
3792 }
3793}
3794
3795void
3796rxvt_term::scr_swap_overlay () NOTHROW
3797{
3798 if (!ov_text)
3799 return;
3800
3801 // swap screen mem with overlay
3802 for (int y = ov_h; y--; )
3803 {
3804 text_t *t1 = ov_text[y];
3805 rend_t *r1 = ov_rend[y];
3806
3807 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3808 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3809
3810 for (int x = ov_w; x--; )
3811 {
3812 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814 }
3815 }
3816}
3817
3818#endif
3539/* ------------------------------------------------------------------------- */ 3819/* ------------------------------------------------------------------------- */
3820

Diff Legend

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