ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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