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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.307 by root, Fri Jun 27 00:44:32 2008 UTC

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

Diff Legend

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