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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.337 by root, Thu Apr 1 00:58:38 2010 UTC

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

Diff Legend

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