1 | /*---------------------------------------------------------------------------* |
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-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
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. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a separate compile! |
|
|
34 | |
|
|
35 | static inline void |
33 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
34 | fill_text (text_t *start, text_t value, int len) |
37 | { |
35 | { |
38 | while (len--) |
36 | while (len--) |
39 | *start++ = value; |
37 | *start++ = value; |
40 | } |
38 | } |
41 | |
39 | |
42 | /* ------------------------------------------------------------------------- */ |
40 | /* ------------------------------------------------------------------------- */ |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
|
|
45 | #define TABSIZE 8 /* default tab size */ |
41 | #define TABSIZE 8 /* default tab size */ |
46 | |
42 | |
47 | /* ------------------------------------------------------------------------- * |
43 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
44 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
45 | * ------------------------------------------------------------------------- */ |
… | |
… | |
100 | |
96 | |
101 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
102 | void |
98 | void |
103 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
99 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
104 | { |
100 | { |
105 | if (!l.t) |
101 | if (!l.valid ()) |
106 | { |
102 | { |
107 | lalloc (l); |
103 | l.alloc (); |
108 | col = 0; |
104 | col = 0; |
109 | width = ncol; |
105 | width = ncol; |
110 | } |
106 | } |
111 | |
107 | |
112 | l.touch (); |
108 | l.touch (); |
… | |
… | |
143 | while (col > 0 && l.t[col] == NOCHAR) |
139 | while (col > 0 && l.t[col] == NOCHAR) |
144 | col--; |
140 | col--; |
145 | |
141 | |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
142 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
143 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
144 | |
|
|
145 | l.touch (); |
148 | |
146 | |
149 | // found start, nuke |
147 | // found start, nuke |
150 | do { |
148 | do { |
151 | l.t[col] = ' '; |
149 | l.t[col] = ' '; |
152 | l.r[col] = rend; |
150 | l.r[col] = rend; |
… | |
… | |
157 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
158 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
159 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
160 | |
158 | |
161 | void |
159 | void |
|
|
160 | rxvt_term::scr_alloc () NOTHROW |
|
|
161 | { |
|
|
162 | int tsize = sizeof (text_t) * ncol; |
|
|
163 | int rsize = sizeof (rend_t) * ncol; |
|
|
164 | |
|
|
165 | // we assume that rend_t size is a sufficient alignment |
|
|
166 | // factor for text_t and line_t values, and we only |
|
|
167 | // need to adjust tsize. |
|
|
168 | tsize = (tsize + sizeof (rend_t) - 1); |
|
|
169 | tsize -= tsize % sizeof (rend_t); |
|
|
170 | |
|
|
171 | int all_rows = total_rows + nrow + nrow; |
|
|
172 | |
|
|
173 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
|
|
174 | chunk = rxvt_malloc (chunk_size); |
|
|
175 | |
|
|
176 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
|
|
177 | |
|
|
178 | for (int row = 0; row < all_rows; ++row) |
|
|
179 | { |
|
|
180 | line_t &l = ((line_t *)chunk) [row]; |
|
|
181 | |
|
|
182 | l.t = (text_t *)base; base += tsize; |
|
|
183 | l.r = (rend_t *)base; base += rsize; |
|
|
184 | l.l = -1; |
|
|
185 | l.f = 0; |
|
|
186 | } |
|
|
187 | |
|
|
188 | drawn_buf = (line_t *)chunk; |
|
|
189 | swap_buf = drawn_buf + nrow; |
|
|
190 | row_buf = swap_buf + nrow; |
|
|
191 | } |
|
|
192 | |
|
|
193 | void ecb_cold |
162 | rxvt_term::scr_reset () |
194 | rxvt_term::scr_reset () |
163 | { |
195 | { |
|
|
196 | #if ENABLE_OVERLAY |
|
|
197 | scr_overlay_off (); |
|
|
198 | #endif |
|
|
199 | |
164 | view_start = 0; |
200 | view_start = 0; |
165 | num_scr = 0; |
201 | num_scr = 0; |
166 | |
202 | |
167 | if (ncol == 0) |
203 | if (ncol == 0) |
168 | ncol = 80; |
204 | ncol = 80; |
… | |
… | |
188 | total_rows = nrow + saveLines; |
224 | total_rows = nrow + saveLines; |
189 | |
225 | |
190 | screen.tscroll = 0; |
226 | screen.tscroll = 0; |
191 | screen.bscroll = nrow - 1; |
227 | screen.bscroll = nrow - 1; |
192 | |
228 | |
|
|
229 | void *prev_chunk = chunk; |
|
|
230 | line_t *prev_drawn_buf = drawn_buf; |
|
|
231 | line_t *prev_swap_buf = swap_buf; |
|
|
232 | line_t *prev_row_buf = row_buf; |
|
|
233 | |
|
|
234 | int common_col = min (prev_ncol, ncol); |
|
|
235 | |
|
|
236 | scr_alloc (); |
|
|
237 | |
193 | if (!row_buf) |
238 | if (!prev_row_buf) |
194 | { |
239 | { |
195 | /* |
240 | /* |
196 | * first time called so just malloc everything: don't rely on realloc |
241 | * first time called so just malloc everything: don't rely on realloc |
197 | */ |
242 | */ |
198 | top_row = 0; |
243 | top_row = 0; |
199 | term_start = 0; |
244 | term_start = 0; |
200 | |
|
|
201 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
202 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
203 | |
|
|
204 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
205 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
206 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
207 | |
|
|
208 | for (int row = nrow; row--; ) |
|
|
209 | { |
|
|
210 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
211 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
212 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
213 | } |
|
|
214 | |
245 | |
215 | memset (charsets, 'B', sizeof (charsets)); |
246 | memset (charsets, 'B', sizeof (charsets)); |
216 | rstyle = DEFAULT_RSTYLE; |
247 | rstyle = DEFAULT_RSTYLE; |
217 | screen.flags = Screen_DefaultFlags; |
248 | screen.flags = Screen_DefaultFlags; |
218 | screen.cur.row = screen.cur.col = 0; |
249 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
241 | { |
272 | { |
242 | /* |
273 | /* |
243 | * add or delete rows as appropriate |
274 | * add or delete rows as appropriate |
244 | */ |
275 | */ |
245 | |
276 | |
246 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
247 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
248 | |
|
|
249 | #if 0 |
|
|
250 | if (nrow < prev_nrow) |
|
|
251 | { |
|
|
252 | for (int row = nrow; row < prev_nrow; row++) |
|
|
253 | { |
|
|
254 | lfree (swap_buf [row]); |
|
|
255 | lfree (drawn_buf[row]); |
|
|
256 | } |
|
|
257 | } |
|
|
258 | #endif |
|
|
259 | |
|
|
260 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
261 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
262 | |
|
|
263 | for (int row = min (nrow, prev_nrow); row--; ) |
277 | for (int row = min (nrow, prev_nrow); row--; ) |
264 | { |
278 | { |
265 | lresize (drawn_buf[row]); |
279 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
266 | lresize (swap_buf [row]); |
280 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
267 | } |
|
|
268 | |
281 | |
269 | for (int row = prev_nrow; row < nrow; row++) |
282 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
|
|
283 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
|
|
284 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
|
|
285 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
270 | { |
286 | } |
271 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
273 | } |
|
|
274 | |
|
|
275 | line_t *old_buf = row_buf; |
|
|
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
277 | |
287 | |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
288 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
289 | int pend = MOD (term_start + top_row , prev_total_rows); |
280 | int q = total_rows; // rewrapped row |
290 | int q = total_rows; // rewrapped row |
281 | |
291 | |
… | |
… | |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
299 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
300 | |
291 | do |
301 | do |
292 | { |
302 | { |
293 | p = MOD (p - 1, prev_total_rows); |
303 | p = MOD (p - 1, prev_total_rows); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
304 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
295 | int plines = 1; |
305 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
306 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
297 | |
307 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
308 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
309 | { |
300 | p = MOD (p - 1, prev_total_rows); |
310 | p = MOD (p - 1, prev_total_rows); |
301 | |
311 | |
302 | plines++; |
312 | plines++; |
303 | llen += prev_ncol; |
313 | llen += prev_ncol; |
… | |
… | |
316 | |
326 | |
317 | // re-assemble the full line by destination lines |
327 | // re-assemble the full line by destination lines |
318 | for (int qrow = q; qlines--; qrow++) |
328 | for (int qrow = q; qlines--; qrow++) |
319 | { |
329 | { |
320 | qline = row_buf + qrow; |
330 | qline = row_buf + qrow; |
321 | lalloc (*qline); |
331 | qline->alloc (); // redundant with next line |
322 | qline->l = ncol; |
332 | qline->l = ncol; |
323 | qline->is_longer (1); |
333 | qline->is_longer (1); |
324 | |
334 | |
325 | int qcol = 0; |
335 | int qcol = 0; |
326 | |
336 | |
… | |
… | |
341 | // this seems to upset applications/shells/readline |
351 | // this seems to upset applications/shells/readline |
342 | // least. |
352 | // least. |
343 | if (prow == ocur.row) |
353 | if (prow == ocur.row) |
344 | screen.cur.row = q - (total_rows - nrow); |
354 | screen.cur.row = q - (total_rows - nrow); |
345 | |
355 | |
346 | line_t &pline = old_buf [prow]; |
356 | line_t &pline = prev_row_buf [prow]; |
347 | |
357 | |
348 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
358 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
349 | |
359 | |
350 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
360 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
351 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
361 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
372 | { |
382 | { |
373 | // if no scrollback exists (yet), wing, instead of wrap |
383 | // if no scrollback exists (yet), wing, instead of wrap |
374 | |
384 | |
375 | for (int row = min (nrow, prev_nrow); row--; ) |
385 | for (int row = min (nrow, prev_nrow); row--; ) |
376 | { |
386 | { |
377 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
387 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
378 | line_t &qline = row_buf [row]; |
388 | line_t &dst = row_buf [row]; |
379 | |
389 | |
380 | qline = pline; |
390 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
381 | lresize (qline); |
391 | |
|
|
392 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
|
|
393 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
382 | } |
394 | } |
383 | |
395 | |
384 | for (int row = prev_nrow; row < nrow; row++) |
396 | for (int row = prev_nrow; row < nrow; row++) |
385 | { |
|
|
386 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
397 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
387 | } |
|
|
388 | |
398 | |
389 | term_start = 0; |
399 | term_start = 0; |
390 | } |
400 | } |
391 | |
|
|
392 | free (old_buf); |
|
|
393 | delete old_ta; |
|
|
394 | delete old_ra; |
|
|
395 | |
401 | |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
398 | } |
404 | } |
399 | |
405 | |
|
|
406 | for (int row = nrow; row--; ) |
|
|
407 | { |
|
|
408 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
409 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
410 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
411 | } |
|
|
412 | |
|
|
413 | free (prev_chunk); |
|
|
414 | |
400 | free (tabs); |
415 | free (tabs); |
401 | tabs = (char *)rxvt_malloc (ncol); |
416 | tabs = (char *)rxvt_malloc (ncol); |
402 | |
417 | |
403 | for (int col = ncol; --col; ) |
418 | for (int col = ncol; col--; ) |
404 | tabs [col] = col % TABSIZE == 0; |
419 | tabs [col] = col % TABSIZE == 0; |
405 | |
420 | |
406 | CLEAR_ALL_SELECTION (); |
421 | CLEAR_ALL_SELECTION (); |
407 | |
422 | |
408 | prev_nrow = nrow; |
423 | prev_nrow = nrow; |
… | |
… | |
415 | |
430 | |
416 | /* ------------------------------------------------------------------------- */ |
431 | /* ------------------------------------------------------------------------- */ |
417 | /* |
432 | /* |
418 | * Free everything. That way malloc debugging can find leakage. |
433 | * Free everything. That way malloc debugging can find leakage. |
419 | */ |
434 | */ |
420 | void |
435 | void ecb_cold |
421 | rxvt_term::scr_release () NOTHROW |
436 | rxvt_term::scr_release () NOTHROW |
422 | { |
437 | { |
423 | if (row_buf) |
438 | free (chunk); |
424 | { |
|
|
425 | delete talloc; talloc = 0; |
|
|
426 | delete ralloc; ralloc = 0; |
|
|
427 | |
|
|
428 | free (row_buf); |
|
|
429 | free (swap_buf); |
|
|
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
|
|
433 | free (tabs); |
439 | free (tabs); |
434 | tabs = 0; |
|
|
435 | } |
|
|
436 | } |
440 | } |
437 | |
441 | |
438 | /* ------------------------------------------------------------------------- */ |
442 | /* ------------------------------------------------------------------------- */ |
439 | /* |
443 | /* |
440 | * Hard/Soft reset |
444 | * Hard/Soft reset |
441 | */ |
445 | */ |
442 | void |
446 | void ecb_cold |
443 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
444 | { |
448 | { |
445 | scr_release (); |
449 | scr_release (); |
|
|
450 | |
|
|
451 | row_buf = 0; |
|
|
452 | tabs = 0; |
446 | prev_nrow = prev_ncol = 0; |
453 | prev_nrow = prev_ncol = 0; |
447 | rvideo_mode = false; |
454 | rvideo_mode = false; |
448 | scr_soft_reset (); |
455 | scr_soft_reset (); |
449 | scr_reset (); |
456 | scr_reset (); |
450 | |
457 | |
451 | scr_clear (true); |
458 | scr_clear (true); |
452 | scr_refresh (); |
459 | scr_refresh (); |
453 | } |
460 | } |
454 | |
461 | |
455 | void |
462 | void ecb_cold |
456 | rxvt_term::scr_soft_reset () |
463 | rxvt_term::scr_soft_reset () NOTHROW |
457 | { |
464 | { |
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
465 | /* only affects modes, nothing drastic such as clearing the screen */ |
459 | #if ENABLE_OVERLAY |
466 | #if ENABLE_OVERLAY |
460 | scr_overlay_off (); |
467 | scr_overlay_off (); |
461 | #endif |
468 | #endif |
… | |
… | |
516 | assert (s->cur.row >= 0); |
523 | assert (s->cur.row >= 0); |
517 | assert (s->cur.col >= 0); |
524 | assert (s->cur.col >= 0); |
518 | } |
525 | } |
519 | |
526 | |
520 | void |
527 | void |
521 | rxvt_term::scr_swap_screen () |
528 | rxvt_term::scr_swap_screen () NOTHROW |
522 | { |
529 | { |
523 | if (!option (Opt_secondaryScreen)) |
530 | if (!option (Opt_secondaryScreen)) |
524 | return; |
531 | return; |
525 | |
532 | |
526 | for (int i = prev_nrow; i--; ) |
533 | for (int i = prev_nrow; i--; ) |
… | |
… | |
545 | return; |
552 | return; |
546 | |
553 | |
547 | want_refresh = 1; |
554 | want_refresh = 1; |
548 | view_start = 0; |
555 | view_start = 0; |
549 | |
556 | |
550 | selection_check (2); /* check for boundary cross */ |
557 | /* check for boundary cross */ |
|
|
558 | row_col_t pos; |
|
|
559 | pos.row = pos.col = 0; |
|
|
560 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
561 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
562 | CLEAR_SELECTION (); |
551 | |
563 | |
552 | current_screen = scrn; |
564 | current_screen = scrn; |
553 | |
565 | |
554 | #if NSCREENS |
566 | #if NSCREENS |
555 | if (option (Opt_secondaryScreen)) |
567 | if (option (Opt_secondaryScreen)) |
… | |
… | |
621 | /* |
633 | /* |
622 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
634 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
623 | * count positive ==> scroll up |
635 | * count positive ==> scroll up |
624 | * count negative ==> scroll down |
636 | * count negative ==> scroll down |
625 | */ |
637 | */ |
626 | int |
638 | int ecb_hot |
627 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
639 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
628 | { |
640 | { |
629 | if (count == 0 || (row1 > row2)) |
641 | if (count == 0 || (row1 > row2)) |
630 | return 0; |
642 | return 0; |
631 | |
643 | |
… | |
… | |
634 | |
646 | |
635 | if (count > 0 |
647 | if (count > 0 |
636 | && row1 == 0 |
648 | && row1 == 0 |
637 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
649 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
638 | { |
650 | { |
|
|
651 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
652 | |
639 | top_row = max (top_row - count, -saveLines); |
653 | top_row = max (top_row - count, -saveLines); |
640 | |
|
|
641 | // scroll everything up 'count' lines |
|
|
642 | term_start = (term_start + count) % total_rows; |
|
|
643 | |
654 | |
644 | // sever bottommost line |
655 | // sever bottommost line |
645 | { |
656 | { |
646 | line_t &l = ROW(row2 - count); |
657 | line_t &l = ROW(row2); |
647 | l.is_longer (0); |
658 | l.is_longer (0); |
648 | l.touch (); |
659 | l.touch (); |
649 | } |
660 | } |
650 | |
661 | |
|
|
662 | // scroll everything up 'count' lines |
|
|
663 | term_start = (term_start + count) % total_rows; |
|
|
664 | |
|
|
665 | // now copy lines below the scroll region bottom to the |
|
|
666 | // bottom of the screen again, so they look as if they |
|
|
667 | // hadn't moved. |
|
|
668 | for (int i = nrow; --i > row2; ) |
|
|
669 | { |
|
|
670 | line_t &l1 = ROW(i - count); |
|
|
671 | line_t &l2 = ROW(i); |
|
|
672 | |
|
|
673 | ::swap (l1, l2); |
|
|
674 | l2.touch (); |
|
|
675 | } |
|
|
676 | |
651 | // erase newly scrolled-in lines |
677 | // erase newly scrolled-in lines |
652 | for (int i = count; i--; ) |
678 | for (int i = count; i--; ) |
653 | { |
679 | { |
654 | line_t &l = ROW(nrow - 1 - i); |
680 | line_t &l = ROW(row2 - i); |
655 | |
681 | |
656 | // optimize if already cleared, can be significant on slow machines |
682 | // optimise if already cleared, can be significant on slow machines |
657 | // could be rolled into scr_blank_screen_mem |
683 | // could be rolled into scr_blank_screen_mem |
658 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
684 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
659 | { |
685 | { |
660 | scr_blank_line (l, 0, l.l, rstyle); |
686 | scr_blank_line (l, 0, l.l, rstyle); |
661 | l.l = 0; |
687 | l.l = 0; |
… | |
… | |
663 | } |
689 | } |
664 | else |
690 | else |
665 | scr_blank_screen_mem (l, rstyle); |
691 | scr_blank_screen_mem (l, rstyle); |
666 | } |
692 | } |
667 | |
693 | |
668 | // now copy lines below the scroll region bottom to the |
|
|
669 | // bottom of the screen again, so they look as if they |
|
|
670 | // hadn't moved. |
|
|
671 | for (int i = nrow; --i > row2; ) |
|
|
672 | { |
|
|
673 | line_t &l1 = ROW(i - count); |
|
|
674 | line_t &l2 = ROW(i); |
|
|
675 | |
|
|
676 | ::swap (l1, l2); |
|
|
677 | l2.touch (); |
|
|
678 | } |
|
|
679 | |
|
|
680 | // move and/or clear selection, if any |
694 | // move and/or clear selection, if any |
681 | if (selection.op && current_screen == selection.screen) |
695 | if (selection.op && current_screen == selection.screen |
|
|
696 | && selection.beg.row <= row2) |
682 | { |
697 | { |
683 | selection.beg.row -= count; |
698 | selection.beg.row -= count; |
684 | selection.end.row -= count; |
699 | selection.end.row -= count; |
685 | selection.mark.row -= count; |
700 | selection.mark.row -= count; |
686 | |
701 | |
687 | if (selection.beg.row < top_row |
702 | selection_check (0); |
688 | || selection.end.row < top_row |
|
|
689 | || selection.mark.row < top_row) |
|
|
690 | { |
|
|
691 | CLEAR_ALL_SELECTION (); |
|
|
692 | selection.op = SELECTION_CLEAR; |
|
|
693 | } |
|
|
694 | } |
703 | } |
695 | |
704 | |
696 | // finally move the view window, if desired |
705 | // finally move the view window, if desired |
697 | if (option (Opt_scrollWithBuffer) |
706 | if (option (Opt_scrollWithBuffer) |
698 | && view_start != 0 |
707 | && view_start != 0 |
… | |
… | |
728 | } |
737 | } |
729 | |
738 | |
730 | // use a simple and robust scrolling algorithm, this |
739 | // use a simple and robust scrolling algorithm, this |
731 | // part of scr_scroll_text is not time-critical. |
740 | // part of scr_scroll_text is not time-critical. |
732 | |
741 | |
|
|
742 | // sever line above scroll region |
|
|
743 | if (row1) |
|
|
744 | { |
|
|
745 | line_t &l = ROW(row1 - 1); |
|
|
746 | l.is_longer (0); |
|
|
747 | l.touch (); |
|
|
748 | } |
|
|
749 | |
733 | int rows = row2 - row1 + 1; |
750 | int rows = row2 - row1 + 1; |
734 | |
751 | |
735 | min_it (count, rows); |
752 | min_it (count, rows); |
736 | |
753 | |
737 | line_t *temp_buf = row_buf + total_rows; |
754 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
738 | |
755 | |
739 | for (int row = 0; row < rows; row++) |
756 | for (int row = 0; row < rows; row++) |
740 | { |
757 | { |
741 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
758 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
742 | |
759 | |
… | |
… | |
744 | scr_blank_screen_mem (temp_buf [row], rstyle); |
761 | scr_blank_screen_mem (temp_buf [row], rstyle); |
745 | } |
762 | } |
746 | |
763 | |
747 | for (int row = 0; row < rows; row++) |
764 | for (int row = 0; row < rows; row++) |
748 | ROW(row1 + row) = temp_buf [row]; |
765 | ROW(row1 + row) = temp_buf [row]; |
|
|
766 | |
|
|
767 | // sever bottommost line |
|
|
768 | { |
|
|
769 | line_t &l = ROW(row2); |
|
|
770 | l.is_longer (0); |
|
|
771 | l.touch (); |
|
|
772 | } |
749 | } |
773 | } |
750 | |
774 | |
751 | return count; |
775 | return count; |
752 | } |
776 | } |
753 | |
777 | |
754 | /* ------------------------------------------------------------------------- */ |
778 | /* ------------------------------------------------------------------------- */ |
755 | /* |
779 | /* |
756 | * Add text given in <str> of length <len> to screen struct |
780 | * Add text given in <str> of length <len> to screen struct |
757 | */ |
781 | */ |
758 | void |
782 | void ecb_hot |
759 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
783 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
760 | { |
784 | { |
761 | if (len <= 0) /* sanity */ |
785 | if (len <= 0) /* sanity */ |
762 | return; |
786 | return; |
763 | |
787 | |
764 | unsigned char checksel; |
788 | bool checksel; |
765 | unicode_t c; |
789 | unicode_t c; |
766 | int ncol = this->ncol; |
790 | int ncol = this->ncol; |
767 | const wchar_t *strend = str + len; |
791 | const wchar_t *strend = str + len; |
768 | |
792 | |
769 | want_refresh = 1; |
793 | want_refresh = 1; |
… | |
… | |
795 | |
819 | |
796 | while (str < strend) |
820 | while (str < strend) |
797 | { |
821 | { |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
822 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
799 | |
823 | |
800 | if (expect_false (c < 0x20)) |
824 | if (ecb_unlikely (c < 0x20)) |
801 | if (c == C0_LF) |
825 | if (c == C0_LF) |
802 | { |
826 | { |
803 | max_it (line->l, screen.cur.col); |
827 | max_it (line->l, screen.cur.col); |
804 | |
828 | |
805 | screen.flags &= ~Screen_WrapNext; |
829 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
824 | { |
848 | { |
825 | scr_tab (1, true); |
849 | scr_tab (1, true); |
826 | continue; |
850 | continue; |
827 | } |
851 | } |
828 | |
852 | |
829 | if (expect_false ( |
853 | if (ecb_unlikely ( |
830 | checksel /* see if we're writing within selection */ |
854 | checksel /* see if we're writing within selection */ |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
855 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
856 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
833 | )) |
857 | )) |
834 | { |
858 | { |
… | |
… | |
839 | * should be a similar check. |
863 | * should be a similar check. |
840 | */ |
864 | */ |
841 | CLEAR_SELECTION (); |
865 | CLEAR_SELECTION (); |
842 | } |
866 | } |
843 | |
867 | |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
868 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
845 | { |
869 | { |
846 | scr_do_wrap (); |
870 | scr_do_wrap (); |
847 | |
871 | |
848 | line->l = ncol; |
872 | line->l = ncol; |
849 | line->is_longer (1); |
873 | line->is_longer (1); |
… | |
… | |
851 | row = screen.cur.row; |
875 | row = screen.cur.row; |
852 | line = &ROW(row); /* _must_ refresh */ |
876 | line = &ROW(row); /* _must_ refresh */ |
853 | } |
877 | } |
854 | |
878 | |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
879 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
880 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
857 | c = 0xfffd; |
881 | c = 0xfffd; |
858 | |
882 | |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
883 | // rely on wcwidth to tell us the character width, do wcwidth before |
860 | // further replacements, as wcwidth might return -1 for the line |
884 | // further replacements, as wcwidth might return -1 for the line |
861 | // drawing characters below as they might be invalid in the current |
885 | // drawing characters below as they might be invalid in the current |
862 | // locale. |
886 | // locale. |
863 | int width = WCWIDTH (c); |
887 | int width = WCWIDTH (c); |
864 | |
888 | |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
889 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
866 | { |
890 | { |
867 | // vt100 special graphics and line drawing |
891 | // vt100 special graphics and line drawing |
868 | // 5f-7e standard vt100 |
892 | // 5f-7e standard vt100 |
869 | // 40-5e rxvt extension for extra curses acs chars |
893 | // 40-5e rxvt extension for extra curses acs chars |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
894 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
883 | c = vt100_0[c - 0x41]; |
907 | c = vt100_0[c - 0x41]; |
884 | width = 1; // vt100 line drawing characters are always single-width |
908 | width = 1; // vt100 line drawing characters are always single-width |
885 | } |
909 | } |
886 | } |
910 | } |
887 | |
911 | |
888 | if (expect_false (screen.flags & Screen_Insert)) |
912 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
889 | scr_insdel_chars (width, INSERT); |
913 | scr_insdel_chars (width, INSERT); |
890 | |
914 | |
891 | if (width != 0) |
915 | if (width != 0) |
892 | { |
916 | { |
893 | #if !UNICODE_3 |
917 | #if !UNICODE_3 |
… | |
… | |
898 | # else |
922 | # else |
899 | c = 0xfffd; |
923 | c = 0xfffd; |
900 | # endif |
924 | # endif |
901 | #endif |
925 | #endif |
902 | |
926 | |
|
|
927 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
928 | |
|
|
929 | // if the character doesn't fit into the remaining columns... |
|
|
930 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
931 | { |
|
|
932 | if (screen.flags & Screen_Autowrap) |
|
|
933 | { |
|
|
934 | // ... artificially enlargen the previous one |
|
|
935 | c = NOCHAR; |
|
|
936 | // and try the same character next loop iteration |
|
|
937 | --str; |
|
|
938 | } |
|
|
939 | else |
|
|
940 | screen.cur.col = ncol - width; |
|
|
941 | } |
|
|
942 | |
903 | // nuke the character at this position, if required |
943 | // nuke the character at this position, if required |
904 | if (expect_false ( |
944 | // due to wonderful coincidences everywhere else in this loop |
|
|
945 | // we never have to check for overwriting a wide char itself, |
|
|
946 | // only its tail. |
905 | line->t[screen.cur.col] == NOCHAR |
947 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
906 | || (screen.cur.col < ncol - 1 |
|
|
907 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
908 | )) |
|
|
909 | scr_kill_char (*line, screen.cur.col); |
948 | scr_kill_char (*line, screen.cur.col); |
910 | |
|
|
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
912 | |
|
|
913 | // if the character doesn't fit into the remaining columns... |
|
|
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
915 | { |
|
|
916 | // ... artificially enlargen the previous one |
|
|
917 | c = NOCHAR; |
|
|
918 | // and try the same character next loop iteration |
|
|
919 | --str; |
|
|
920 | } |
|
|
921 | |
949 | |
922 | line->touch (); |
950 | line->touch (); |
923 | |
951 | |
924 | do |
952 | do |
925 | { |
953 | { |
926 | line->t[screen.cur.col] = c; |
954 | line->t[screen.cur.col] = c; |
927 | line->r[screen.cur.col] = rend; |
955 | line->r[screen.cur.col] = rend; |
928 | |
956 | |
929 | if (expect_true (screen.cur.col < ncol - 1)) |
957 | if (ecb_likely (screen.cur.col < ncol - 1)) |
930 | screen.cur.col++; |
958 | screen.cur.col++; |
931 | else |
959 | else |
932 | { |
960 | { |
933 | line->l = ncol; |
961 | line->l = ncol; |
934 | if (screen.flags & Screen_Autowrap) |
962 | if (screen.flags & Screen_Autowrap) |
935 | screen.flags |= Screen_WrapNext; |
963 | screen.flags |= Screen_WrapNext; |
936 | break; |
964 | |
|
|
965 | goto end_of_line; |
937 | } |
966 | } |
938 | |
967 | |
939 | c = NOCHAR; |
968 | c = NOCHAR; |
940 | } |
969 | } |
941 | while (expect_false (--width > 0)); |
970 | while (ecb_unlikely (--width > 0)); |
942 | |
971 | |
943 | // pad with spaces when overwriting wide character with smaller one |
972 | // pad with spaces when overwriting wide character with smaller one |
944 | if (expect_false (!width)) |
973 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
945 | { |
974 | { |
946 | line->touch (); |
|
|
947 | |
|
|
948 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
949 | { |
|
|
950 | line->t[c] = ' '; |
975 | line->t[c] = ' '; |
951 | line->r[c] = rend; |
976 | line->r[c] = rend; |
952 | } |
|
|
953 | } |
977 | } |
|
|
978 | |
|
|
979 | end_of_line: |
|
|
980 | ; |
954 | } |
981 | } |
955 | #if ENABLE_COMBINING |
982 | #if ENABLE_COMBINING |
956 | else // width == 0 |
983 | else // width == 0 |
957 | { |
984 | { |
958 | if (c != 0xfeff) // ignore BOM |
985 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1021 | |
1048 | |
1022 | want_refresh = 1; |
1049 | want_refresh = 1; |
1023 | #endif |
1050 | #endif |
1024 | } |
1051 | } |
1025 | } |
1052 | } |
|
|
1053 | else if (screen.flags & Screen_WrapNext) |
|
|
1054 | screen.flags &= ~Screen_WrapNext; |
1026 | else |
1055 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1056 | scr_gotorc (0, -1, RELATIVE); |
1028 | } |
1057 | } |
1029 | |
1058 | |
1030 | /* ------------------------------------------------------------------------- */ |
1059 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1108 | * XTERM_SEQ: ESC 6 |
1137 | * XTERM_SEQ: ESC 6 |
1109 | * Move cursor left in row. If we're at the left boundary, shift everything |
1138 | * Move cursor left in row. If we're at the left boundary, shift everything |
1110 | * in that row right. Clear left column. |
1139 | * in that row right. Clear left column. |
1111 | */ |
1140 | */ |
1112 | #if !ENABLE_MINIMAL |
1141 | #if !ENABLE_MINIMAL |
1113 | void |
1142 | void ecb_cold |
1114 | rxvt_term::scr_backindex () NOTHROW |
1143 | rxvt_term::scr_backindex () NOTHROW |
1115 | { |
1144 | { |
1116 | if (screen.cur.col > 0) |
1145 | if (screen.cur.col > 0) |
1117 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1146 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1118 | else |
1147 | else |
… | |
… | |
1125 | * XTERM_SEQ: ESC 9 |
1154 | * XTERM_SEQ: ESC 9 |
1126 | * Move cursor right in row. If we're at the right boundary, shift everything |
1155 | * Move cursor right in row. If we're at the right boundary, shift everything |
1127 | * in that row left. Clear right column. |
1156 | * in that row left. Clear right column. |
1128 | */ |
1157 | */ |
1129 | #if !ENABLE_MINIMAL |
1158 | #if !ENABLE_MINIMAL |
1130 | void |
1159 | void ecb_cold |
1131 | rxvt_term::scr_forwardindex () NOTHROW |
1160 | rxvt_term::scr_forwardindex () NOTHROW |
1132 | { |
1161 | { |
1133 | if (screen.cur.col < ncol - 1) |
1162 | if (screen.cur.col < ncol - 1) |
1134 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1163 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1135 | else |
1164 | else |
… | |
… | |
1286 | scr_blank_line (line, col, num, rstyle); |
1315 | scr_blank_line (line, col, num, rstyle); |
1287 | } |
1316 | } |
1288 | |
1317 | |
1289 | /* ------------------------------------------------------------------------- */ |
1318 | /* ------------------------------------------------------------------------- */ |
1290 | /* |
1319 | /* |
1291 | * Erase part of whole of the screen |
1320 | * Erase part or whole of the screen |
1292 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1321 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1293 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1322 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1294 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1323 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1295 | */ |
1324 | */ |
1296 | void |
1325 | void |
… | |
… | |
1305 | ZERO_SCROLLBACK (); |
1334 | ZERO_SCROLLBACK (); |
1306 | |
1335 | |
1307 | switch (mode) |
1336 | switch (mode) |
1308 | { |
1337 | { |
1309 | case 0: /* erase to end of screen */ |
1338 | case 0: /* erase to end of screen */ |
1310 | selection_check (1); |
|
|
1311 | scr_erase_line (0); |
1339 | scr_erase_line (0); |
1312 | row = screen.cur.row + 1; /* possible OOB */ |
1340 | row = screen.cur.row + 1; /* possible OOB */ |
1313 | num = nrow - row; |
1341 | num = nrow - row; |
1314 | break; |
1342 | break; |
1315 | case 1: /* erase to beginning of screen */ |
1343 | case 1: /* erase to beginning of screen */ |
1316 | selection_check (3); |
|
|
1317 | scr_erase_line (1); |
1344 | scr_erase_line (1); |
1318 | row = 0; |
1345 | row = 0; |
1319 | num = screen.cur.row; |
1346 | num = screen.cur.row; |
1320 | break; |
1347 | break; |
1321 | case 2: /* erase whole screen */ |
1348 | case 2: /* erase whole screen */ |
1322 | selection_check (3); |
|
|
1323 | row = 0; |
1349 | row = 0; |
1324 | num = nrow; |
1350 | num = nrow; |
1325 | break; |
1351 | break; |
1326 | default: |
1352 | default: |
1327 | return; |
1353 | return; |
… | |
… | |
1336 | if (row >= nrow) /* Out Of Bounds */ |
1362 | if (row >= nrow) /* Out Of Bounds */ |
1337 | return; |
1363 | return; |
1338 | |
1364 | |
1339 | min_it (num, nrow - row); |
1365 | min_it (num, nrow - row); |
1340 | |
1366 | |
1341 | // TODO: the code below does not work when view_start != 0 |
|
|
1342 | // the workaround is to disable the clear and use a normal refresh |
|
|
1343 | // when view_start != 0. mysterious. |
|
|
1344 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1367 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1345 | ren = (rend_t) ~RS_None; |
1368 | ren = (rend_t) ~RS_None; |
1346 | else if (GET_BASEBG (rstyle) == Color_bg) |
1369 | else if (GET_BASEBG (rstyle) == Color_bg) |
1347 | { |
1370 | { |
1348 | ren = DEFAULT_RSTYLE; |
1371 | ren = DEFAULT_RSTYLE; |
1349 | |
1372 | |
1350 | if (mapped && !view_start) |
1373 | if (mapped) |
1351 | XClearArea (dpy, vt, 0, |
1374 | XClearArea (dpy, vt, 0, |
1352 | Row2Pixel (row - view_start), (unsigned int)width, |
1375 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1353 | (unsigned int)Height2Pixel (num), False); |
1376 | (unsigned int)Height2Pixel (num), False); |
1354 | } |
1377 | } |
1355 | else |
1378 | else |
1356 | { |
1379 | { |
1357 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1380 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1358 | |
1381 | |
1359 | if (mapped && !view_start) |
1382 | if (mapped) |
1360 | { |
1383 | { |
1361 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1384 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1362 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1385 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1363 | XFillRectangle (dpy, vt, gc, |
1386 | XFillRectangle (dpy, vt, gc, |
1364 | 0, Row2Pixel (row - view_start), |
1387 | 0, Row2Pixel (row - view_start), |
1365 | (unsigned int)width, |
1388 | (unsigned int)vt_width, |
1366 | (unsigned int)Height2Pixel (num)); |
1389 | (unsigned int)Height2Pixel (num)); |
1367 | gcvalue.foreground = pix_colors[Color_fg]; |
1390 | gcvalue.foreground = pix_colors[Color_fg]; |
1368 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1391 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1369 | } |
1392 | } |
1370 | } |
1393 | } |
1371 | |
1394 | |
1372 | for (; num--; row++) |
1395 | for (; num--; row++) |
1373 | { |
1396 | { |
1374 | scr_blank_screen_mem (ROW(row), rstyle); |
1397 | scr_blank_screen_mem (ROW(row), rstyle); |
1375 | |
1398 | |
1376 | if (!view_start) |
1399 | if (row - view_start < nrow) |
1377 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1400 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1378 | } |
1401 | } |
1379 | } |
1402 | } |
1380 | |
1403 | |
1381 | #if !ENABLE_MINIMAL |
1404 | #if !ENABLE_MINIMAL |
1382 | void |
1405 | void |
… | |
… | |
1392 | /* ------------------------------------------------------------------------- */ |
1415 | /* ------------------------------------------------------------------------- */ |
1393 | /* |
1416 | /* |
1394 | * Fill the screen with `E's |
1417 | * Fill the screen with `E's |
1395 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1418 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1396 | */ |
1419 | */ |
1397 | void |
1420 | void ecb_cold |
1398 | rxvt_term::scr_E () NOTHROW |
1421 | rxvt_term::scr_E () NOTHROW |
1399 | { |
1422 | { |
1400 | rend_t fs; |
1423 | rend_t fs; |
1401 | |
1424 | |
1402 | want_refresh = 1; |
1425 | want_refresh = 1; |
1403 | ZERO_SCROLLBACK (); |
1426 | ZERO_SCROLLBACK (); |
1404 | |
1427 | |
1405 | num_scr_allow = 0; |
1428 | num_scr_allow = 0; |
1406 | selection_check (3); |
1429 | |
|
|
1430 | row_col_t pos; |
|
|
1431 | pos.row = pos.col = 0; |
|
|
1432 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1433 | CLEAR_SELECTION (); |
1407 | |
1434 | |
1408 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1435 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1409 | for (int row = nrow; row--; ) |
1436 | for (int row = nrow; row--; ) |
1410 | { |
1437 | { |
1411 | line_t &line = ROW(row); |
1438 | line_t &line = ROW(row); |
… | |
… | |
1562 | /* ------------------------------------------------------------------------- */ |
1589 | /* ------------------------------------------------------------------------- */ |
1563 | /* |
1590 | /* |
1564 | * Set the scrolling region |
1591 | * Set the scrolling region |
1565 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1592 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1566 | */ |
1593 | */ |
1567 | void |
1594 | void ecb_cold |
1568 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1595 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1569 | { |
1596 | { |
1570 | max_it (top, 0); |
1597 | max_it (top, 0); |
1571 | min_it (bot, nrow - 1); |
1598 | min_it (bot, nrow - 1); |
1572 | |
1599 | |
… | |
… | |
1582 | /* |
1609 | /* |
1583 | * Make the cursor visible/invisible |
1610 | * Make the cursor visible/invisible |
1584 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1611 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1585 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1612 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1586 | */ |
1613 | */ |
1587 | void |
1614 | void ecb_cold |
1588 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1615 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1589 | { |
1616 | { |
1590 | want_refresh = 1; |
1617 | want_refresh = 1; |
1591 | |
1618 | |
1592 | if (mode) |
1619 | if (mode) |
… | |
… | |
1599 | /* |
1626 | /* |
1600 | * Set/unset automatic wrapping |
1627 | * Set/unset automatic wrapping |
1601 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1628 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1602 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1629 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1603 | */ |
1630 | */ |
1604 | void |
1631 | void ecb_cold |
1605 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1632 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1606 | { |
1633 | { |
1607 | if (mode) |
1634 | if (mode) |
1608 | screen.flags |= Screen_Autowrap; |
1635 | screen.flags |= Screen_Autowrap; |
1609 | else |
1636 | else |
… | |
… | |
1618 | * Relative mode: line numbers are relative to top margin of scrolling region |
1645 | * Relative mode: line numbers are relative to top margin of scrolling region |
1619 | * and the cursor cannot be moved outside. |
1646 | * and the cursor cannot be moved outside. |
1620 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1647 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1621 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1648 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1622 | */ |
1649 | */ |
1623 | void |
1650 | void ecb_cold |
1624 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1651 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1625 | { |
1652 | { |
1626 | if (mode) |
1653 | if (mode) |
1627 | screen.flags |= Screen_Relative; |
1654 | screen.flags |= Screen_Relative; |
1628 | else |
1655 | else |
… | |
… | |
1635 | /* |
1662 | /* |
1636 | * Set insert/replace mode |
1663 | * Set insert/replace mode |
1637 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1664 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1638 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1665 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1639 | */ |
1666 | */ |
1640 | void |
1667 | void ecb_cold |
1641 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1668 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1642 | { |
1669 | { |
1643 | if (mode) |
1670 | if (mode) |
1644 | screen.flags |= Screen_Insert; |
1671 | screen.flags |= Screen_Insert; |
1645 | else |
1672 | else |
… | |
… | |
1651 | * Set/Unset tabs |
1678 | * Set/Unset tabs |
1652 | * XTERM_SEQ: Set tab at current column : ESC H |
1679 | * XTERM_SEQ: Set tab at current column : ESC H |
1653 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1680 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1654 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1681 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1655 | */ |
1682 | */ |
1656 | void |
1683 | void ecb_cold |
1657 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1684 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1658 | { |
1685 | { |
1659 | if (mode < 0) |
1686 | if (mode < 0) |
1660 | memset (tabs, 0, ncol); |
1687 | memset (tabs, 0, ncol); |
1661 | else if (screen.cur.col < ncol) |
1688 | else if (screen.cur.col < ncol) |
… | |
… | |
1681 | { |
1708 | { |
1682 | rvideo_state = on; |
1709 | rvideo_state = on; |
1683 | |
1710 | |
1684 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1711 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1685 | #ifdef HAVE_BG_PIXMAP |
1712 | #ifdef HAVE_BG_PIXMAP |
1686 | if (bgPixmap.pixmap == None) |
1713 | if (bg_pixmap == None) |
1687 | #endif |
1714 | #endif |
1688 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1715 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1689 | |
1716 | |
1690 | XGCValues gcvalue; |
1717 | XGCValues gcvalue; |
1691 | gcvalue.foreground = pix_colors[Color_fg]; |
1718 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1700 | /* ------------------------------------------------------------------------- */ |
1727 | /* ------------------------------------------------------------------------- */ |
1701 | /* |
1728 | /* |
1702 | * Report current cursor position |
1729 | * Report current cursor position |
1703 | * XTERM_SEQ: Report position: ESC [ 6 n |
1730 | * XTERM_SEQ: Report position: ESC [ 6 n |
1704 | */ |
1731 | */ |
1705 | void |
1732 | void ecb_cold |
1706 | rxvt_term::scr_report_position () NOTHROW |
1733 | rxvt_term::scr_report_position () NOTHROW |
1707 | { |
1734 | { |
1708 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1735 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1709 | } |
1736 | } |
1710 | |
1737 | |
… | |
… | |
1713 | * ------------------------------------------------------------------------- */ |
1740 | * ------------------------------------------------------------------------- */ |
1714 | |
1741 | |
1715 | /* |
1742 | /* |
1716 | * Set font style |
1743 | * Set font style |
1717 | */ |
1744 | */ |
1718 | void |
1745 | void ecb_cold |
1719 | rxvt_term::set_font_style () NOTHROW |
1746 | rxvt_term::set_font_style () NOTHROW |
1720 | { |
1747 | { |
1721 | #if 0 |
1748 | #if 0 |
1722 | switch (charsets [screen.charset]) |
1749 | switch (charsets [screen.charset]) |
1723 | { |
1750 | { |
… | |
… | |
1745 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1772 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1746 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1773 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1747 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1774 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1748 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1775 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1749 | */ |
1776 | */ |
1750 | void |
1777 | void ecb_cold |
1751 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1778 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1752 | { |
1779 | { |
1753 | screen.charset = set; |
1780 | screen.charset = set; |
1754 | set_font_style (); |
1781 | set_font_style (); |
1755 | } |
1782 | } |
… | |
… | |
1776 | * ------------------------------------------------------------------------- */ |
1803 | * ------------------------------------------------------------------------- */ |
1777 | |
1804 | |
1778 | /* |
1805 | /* |
1779 | * refresh matching text. |
1806 | * refresh matching text. |
1780 | */ |
1807 | */ |
1781 | bool |
1808 | bool ecb_cold |
1782 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1809 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1783 | { |
1810 | { |
1784 | bool found = false; |
1811 | bool found = false; |
1785 | |
1812 | |
1786 | for (int i = 0; i < nrow; i++) |
1813 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1805 | PART_BEG = 0, |
1832 | PART_BEG = 0, |
1806 | PART_END, |
1833 | PART_END, |
1807 | RC_COUNT |
1834 | RC_COUNT |
1808 | }; |
1835 | }; |
1809 | |
1836 | |
1810 | void |
1837 | void ecb_hot |
1811 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1838 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1812 | { |
1839 | { |
1813 | int i; |
1840 | int i; |
1814 | row_col_t rc[RC_COUNT]; |
1841 | row_col_t rc[RC_COUNT]; |
1815 | |
1842 | |
… | |
… | |
1852 | * Refresh the entire screen |
1879 | * Refresh the entire screen |
1853 | */ |
1880 | */ |
1854 | void |
1881 | void |
1855 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1882 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1856 | { |
1883 | { |
1857 | scr_expose (0, 0, width, height, refresh); |
1884 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1858 | } |
1885 | } |
1859 | |
1886 | |
1860 | /* ------------------------------------------------------------------------- */ |
1887 | /* ------------------------------------------------------------------------- */ |
1861 | /* |
1888 | /* |
1862 | * Move the display so that the line represented by scrollbar value Y is at |
1889 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1918 | |
1945 | |
1919 | # ifndef NO_MAPALERT |
1946 | # ifndef NO_MAPALERT |
1920 | # ifdef MAPALERT_OPTION |
1947 | # ifdef MAPALERT_OPTION |
1921 | if (option (Opt_mapAlert)) |
1948 | if (option (Opt_mapAlert)) |
1922 | # endif |
1949 | # endif |
1923 | XMapWindow (dpy, parent[0]); |
1950 | XMapWindow (dpy, parent); |
1924 | # endif |
1951 | # endif |
1925 | |
1952 | |
1926 | # if ENABLE_FRILLS |
1953 | # if ENABLE_FRILLS |
1927 | if (option (Opt_urgentOnBell)) |
1954 | if (option (Opt_urgentOnBell)) |
1928 | set_urgency (1); |
1955 | set_urgency (1); |
… | |
… | |
1941 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1968 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1942 | #endif |
1969 | #endif |
1943 | } |
1970 | } |
1944 | |
1971 | |
1945 | /* ------------------------------------------------------------------------- */ |
1972 | /* ------------------------------------------------------------------------- */ |
1946 | /* ARGSUSED */ |
1973 | void ecb_cold |
1947 | void |
|
|
1948 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1974 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1949 | { |
1975 | { |
1950 | #ifdef PRINTPIPE |
1976 | #ifdef PRINTPIPE |
1951 | int nrows, row_start; |
1977 | int nrows, row_start; |
1952 | FILE *fd = popen_printer (); |
1978 | FILE *fd = popen_printer (); |
… | |
… | |
2001 | /* |
2027 | /* |
2002 | * Refresh the screen |
2028 | * Refresh the screen |
2003 | * drawn_text/drawn_rend contain the screen information before the update. |
2029 | * drawn_text/drawn_rend contain the screen information before the update. |
2004 | * screen.text/screen.rend contain what the screen will change to. |
2030 | * screen.text/screen.rend contain what the screen will change to. |
2005 | */ |
2031 | */ |
2006 | void |
2032 | void ecb_hot |
2007 | rxvt_term::scr_refresh () NOTHROW |
2033 | rxvt_term::scr_refresh () NOTHROW |
2008 | { |
2034 | { |
2009 | int16_t col, row, /* column/row we're processing */ |
2035 | int16_t col, row, /* column/row we're processing */ |
2010 | ocrow; /* old cursor row */ |
2036 | ocrow; /* old cursor row */ |
2011 | int i; /* tmp */ |
2037 | int i; /* tmp */ |
… | |
… | |
2025 | * A: set up vars |
2051 | * A: set up vars |
2026 | */ |
2052 | */ |
2027 | refresh_count = 0; |
2053 | refresh_count = 0; |
2028 | |
2054 | |
2029 | unsigned int old_screen_flags = screen.flags; |
2055 | unsigned int old_screen_flags = screen.flags; |
2030 | char have_bg = 0; |
2056 | bool have_bg = 0; |
2031 | #ifdef HAVE_BG_PIXMAP |
2057 | #ifdef HAVE_BG_PIXMAP |
2032 | have_bg = bgPixmap.pixmap != None; |
2058 | have_bg = bg_pixmap != None; |
2033 | #endif |
2059 | #endif |
2034 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2060 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2035 | |
2061 | |
2036 | /* |
2062 | /* |
2037 | * B: reverse any characters which are selected |
2063 | * B: reverse any characters which are selected |
… | |
… | |
2041 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2067 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2042 | #if ENABLE_OVERLAY |
2068 | #if ENABLE_OVERLAY |
2043 | scr_swap_overlay (); |
2069 | scr_swap_overlay (); |
2044 | #endif |
2070 | #endif |
2045 | |
2071 | |
2046 | char showcursor = screen.flags & Screen_VisibleCursor; |
2072 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2047 | |
2073 | |
2048 | /* |
2074 | /* |
2049 | * C: set the cursor character (s) |
2075 | * C: set the cursor character (s) |
2050 | */ |
2076 | */ |
2051 | { |
2077 | { |
2052 | unsigned char setoldcursor; |
2078 | bool setoldcursor; |
2053 | |
2079 | |
2054 | #ifdef CURSOR_BLINK |
2080 | #ifdef CURSOR_BLINK |
2055 | if (hidden_cursor) |
2081 | if (hidden_cursor) |
2056 | showcursor = 0; |
2082 | showcursor = 0; |
2057 | #endif |
2083 | #endif |
… | |
… | |
2144 | { |
2170 | { |
2145 | int16_t nits; |
2171 | int16_t nits; |
2146 | int i = num_scr; |
2172 | int i = num_scr; |
2147 | int j; |
2173 | int j; |
2148 | int len, wlen; |
2174 | int len, wlen; |
2149 | dLocal (int, num_scr); |
|
|
2150 | |
2175 | |
2151 | j = nrow; |
2176 | j = nrow; |
2152 | wlen = len = -1; |
2177 | wlen = len = -1; |
2153 | row = i > 0 ? 0 : j - 1; |
2178 | row = i > 0 ? 0 : j - 1; |
2154 | |
2179 | |
… | |
… | |
2229 | continue; |
2254 | continue; |
2230 | |
2255 | |
2231 | // redraw one or more characters |
2256 | // redraw one or more characters |
2232 | |
2257 | |
2233 | // seek to the beginning of wide characters |
2258 | // seek to the beginning of wide characters |
2234 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2259 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2235 | --col; |
2260 | --col; |
2236 | |
2261 | |
2237 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2262 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2238 | text_t *text = stp + col; |
2263 | text_t *text = stp + col; |
2239 | int count = 1; |
2264 | int count = 1; |
… | |
… | |
2277 | |
2302 | |
2278 | col--; /* went one too far. move back */ |
2303 | col--; /* went one too far. move back */ |
2279 | count -= i; /* dump any matching trailing chars */ |
2304 | count -= i; /* dump any matching trailing chars */ |
2280 | |
2305 | |
2281 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2306 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2282 | while (expect_false (i && text[count] == NOCHAR)) |
2307 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2283 | count++, i--; |
2308 | count++, i--; |
2284 | |
2309 | |
2285 | /* |
2310 | /* |
2286 | * Determine the attributes for the string |
2311 | * Determine the attributes for the string |
2287 | */ |
2312 | */ |
2288 | int fore = fgcolor_of (rend); // desired foreground |
2313 | int fore = fgcolor_of (rend); // desired foreground |
2289 | int back = bgcolor_of (rend); // desired background |
2314 | int back = bgcolor_of (rend); // desired background |
2290 | |
2315 | |
2291 | // only do special processing if any attributes are set, which is unlikely |
2316 | // only do special processing if any attributes are set, which is unlikely |
2292 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2317 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2293 | { |
2318 | { |
2294 | bool invert = rend & RS_RVid; |
2319 | bool invert = rend & RS_RVid; |
2295 | |
2320 | |
2296 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2321 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2297 | if (rend & RS_Bold && fore == Color_fg) |
2322 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2386 | /* |
2411 | /* |
2387 | * Actually do the drawing of the string here |
2412 | * Actually do the drawing of the string here |
2388 | */ |
2413 | */ |
2389 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2414 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2390 | |
2415 | |
2391 | if (expect_true (have_bg && back == Color_bg)) |
2416 | if (ecb_likely (have_bg && back == Color_bg)) |
2392 | { |
2417 | { |
2393 | // this is very ugly, maybe push it into ->draw? |
2418 | // this is very ugly, maybe push it into ->draw? |
2394 | |
2419 | |
2395 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2420 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2396 | if (text[i] != ' ') |
2421 | if (text[i] != ' ') |
… | |
… | |
2403 | did_clear: ; |
2428 | did_clear: ; |
2404 | } |
2429 | } |
2405 | else |
2430 | else |
2406 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2431 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2407 | |
2432 | |
2408 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2433 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2409 | { |
2434 | { |
2410 | #if ENABLE_FRILLS |
2435 | #if ENABLE_FRILLS |
2411 | if (ISSET_PIXCOLOR (Color_underline)) |
2436 | if (ISSET_PIXCOLOR (Color_underline)) |
2412 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2437 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2413 | else |
2438 | else |
… | |
… | |
2459 | |
2484 | |
2460 | XDrawRectangle (dpy, vt, gc, |
2485 | XDrawRectangle (dpy, vt, gc, |
2461 | Col2Pixel (col), |
2486 | Col2Pixel (col), |
2462 | Row2Pixel (oldcursor.row), |
2487 | Row2Pixel (oldcursor.row), |
2463 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2488 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2464 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2489 | (unsigned int) (Height2Pixel (1) - 1)); |
2465 | } |
2490 | } |
2466 | } |
2491 | } |
2467 | |
2492 | |
2468 | /* |
2493 | /* |
2469 | * H: cleanup selection |
2494 | * H: cleanup selection |
… | |
… | |
2478 | screen.flags = old_screen_flags; |
2503 | screen.flags = old_screen_flags; |
2479 | num_scr = 0; |
2504 | num_scr = 0; |
2480 | num_scr_allow = 1; |
2505 | num_scr_allow = 1; |
2481 | } |
2506 | } |
2482 | |
2507 | |
2483 | void |
2508 | void ecb_cold |
2484 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2509 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2485 | { |
2510 | { |
2486 | if (!l.t) |
2511 | if (!l.valid ()) |
2487 | return; |
2512 | return; |
2488 | |
2513 | |
2489 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2514 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2490 | |
2515 | |
2491 | for (int i = ncol; i--; ) |
2516 | for (int i = ncol; i--; ) |
2492 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2517 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2493 | } |
2518 | } |
2494 | |
2519 | |
2495 | void |
2520 | void ecb_cold |
2496 | rxvt_term::scr_remap_chars () NOTHROW |
2521 | rxvt_term::scr_remap_chars () NOTHROW |
2497 | { |
2522 | { |
2498 | for (int i = total_rows; i--; ) |
2523 | for (int i = total_rows; i--; ) |
2499 | scr_remap_chars (row_buf [i]); |
2524 | scr_remap_chars (row_buf [i]); |
2500 | |
2525 | |
… | |
… | |
2503 | scr_remap_chars (drawn_buf [i]); |
2528 | scr_remap_chars (drawn_buf [i]); |
2504 | scr_remap_chars (swap_buf [i]); |
2529 | scr_remap_chars (swap_buf [i]); |
2505 | } |
2530 | } |
2506 | } |
2531 | } |
2507 | |
2532 | |
2508 | void |
2533 | void ecb_cold |
2509 | rxvt_term::scr_recolour () NOTHROW |
2534 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2510 | { |
2535 | { |
|
|
2536 | bool transparent = false; |
|
|
2537 | |
2511 | #ifdef HAVE_BG_PIXMAP |
2538 | #ifdef HAVE_BG_PIXMAP |
2512 | bgPixmap.apply (); |
2539 | if (bg_pixmap != None) |
2513 | #else |
2540 | { |
|
|
2541 | # ifdef ENABLE_TRANSPARENCY |
|
|
2542 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2543 | { |
|
|
2544 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2514 | |
2546 | |
|
|
2547 | transparent = true; |
|
|
2548 | } |
|
|
2549 | else |
|
|
2550 | # endif |
|
|
2551 | { |
|
|
2552 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2553 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2554 | } |
|
|
2555 | } |
|
|
2556 | else |
|
|
2557 | #endif |
|
|
2558 | { |
2515 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2559 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2516 | XClearWindow (dpy, parent[0]); |
|
|
2517 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2560 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2561 | } |
|
|
2562 | |
|
|
2563 | XClearWindow (dpy, parent); |
2518 | |
2564 | |
2519 | if (scrollBar.win) |
2565 | if (scrollBar.win) |
2520 | { |
2566 | { |
|
|
2567 | if (transparent) |
|
|
2568 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2569 | else |
2521 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2570 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2522 | scrollBar.state = STATE_IDLE; |
2571 | scrollBar.state = SB_STATE_IDLE; |
2523 | scrollBar.show (0); |
2572 | scrollBar.show (0); |
2524 | } |
2573 | } |
2525 | |
2574 | |
2526 | #endif |
2575 | if (refresh) |
2527 | |
2576 | { |
2528 | /* bgPixmap.apply () does not do the following : */ |
|
|
2529 | scr_clear (); |
2577 | scr_clear (); |
2530 | scr_touch (true); |
2578 | scr_touch (true); |
|
|
2579 | } |
2531 | want_refresh = 1; |
2580 | want_refresh = 1; |
2532 | } |
2581 | } |
2533 | |
2582 | |
2534 | /* ------------------------------------------------------------------------- */ |
2583 | /* ------------------------------------------------------------------------- */ |
2535 | void |
2584 | void |
… | |
… | |
2592 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2641 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2593 | srp[col] ^= rstyle; |
2642 | srp[col] ^= rstyle; |
2594 | } |
2643 | } |
2595 | |
2644 | |
2596 | /* ------------------------------------------------------------------------- */ |
2645 | /* ------------------------------------------------------------------------- */ |
2597 | void |
2646 | void ecb_hot |
2598 | rxvt_term::scr_reverse_selection () NOTHROW |
2647 | rxvt_term::scr_reverse_selection () NOTHROW |
2599 | { |
2648 | { |
2600 | if (selection.op |
2649 | if (selection.op |
2601 | && current_screen == selection.screen |
2650 | && current_screen == selection.screen |
2602 | && selection.end.row >= view_start) |
2651 | && selection.end.row >= view_start) |
… | |
… | |
2621 | */ |
2670 | */ |
2622 | #if 0 |
2671 | #if 0 |
2623 | void |
2672 | void |
2624 | rxvt_term::scr_dump (int fd) NOTHROW |
2673 | rxvt_term::scr_dump (int fd) NOTHROW |
2625 | { |
2674 | { |
2626 | int row, wrote; |
2675 | // if this method is needed, it can be implemented by factoring the |
2627 | unsigned int width, towrite; |
2676 | // relevant code in scr_printscreen |
2628 | char r1[] = "\n"; |
|
|
2629 | |
|
|
2630 | for (row = saveLines + top_row; |
|
|
2631 | row < saveLines + nrow - 1; row++) |
|
|
2632 | { |
|
|
2633 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2634 | : ncol; |
|
|
2635 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2636 | { |
|
|
2637 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2638 | towrite); |
|
|
2639 | if (wrote < 0) |
|
|
2640 | return; /* XXX: death, no report */ |
|
|
2641 | } |
|
|
2642 | if (row_buf[row].l >= 0) |
|
|
2643 | if (write (fd, r1, 1) <= 0) |
|
|
2644 | return; /* XXX: death, no report */ |
|
|
2645 | } |
|
|
2646 | } |
2677 | } |
2647 | #endif |
2678 | #endif |
2648 | |
2679 | |
2649 | /* ------------------------------------------------------------------------- * |
2680 | /* ------------------------------------------------------------------------- * |
2650 | * CHARACTER SELECTION * |
2681 | * CHARACTER SELECTION * |
2651 | * ------------------------------------------------------------------------- */ |
2682 | * ------------------------------------------------------------------------- */ |
2652 | void |
2683 | void |
2653 | rxvt_term::selection_check (int check_more) NOTHROW |
2684 | rxvt_term::selection_check (int check_more) NOTHROW |
2654 | { |
2685 | { |
2655 | row_col_t pos; |
|
|
2656 | |
|
|
2657 | if (!selection.op) |
2686 | if (!selection.op) |
2658 | return; |
2687 | return; |
2659 | |
2688 | |
2660 | pos.row = pos.col = 0; |
|
|
2661 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2689 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2662 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2690 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2663 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2664 | || (check_more == 1 |
2692 | || (check_more == 1 |
2665 | && current_screen == selection.screen |
2693 | && current_screen == selection.screen |
2666 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2694 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2667 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2695 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2668 | || (check_more == 2 |
|
|
2669 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2670 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2671 | || (check_more == 3 |
|
|
2672 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2673 | || (check_more == 4 /* screen width change */ |
|
|
2674 | && (selection.beg.row != selection.end.row |
|
|
2675 | || selection.end.col > ncol))) |
|
|
2676 | CLEAR_SELECTION (); |
2696 | CLEAR_ALL_SELECTION (); |
2677 | } |
2697 | } |
2678 | |
2698 | |
2679 | /* ------------------------------------------------------------------------- */ |
2699 | /* ------------------------------------------------------------------------- */ |
2680 | /* |
2700 | /* |
2681 | * Paste a selection direct to the command fd |
2701 | * Paste a selection direct to the command fd |
… | |
… | |
2687 | for (unsigned int i = 0; i < len; i++) |
2707 | for (unsigned int i = 0; i < len; i++) |
2688 | if (data[i] == C0_LF) |
2708 | if (data[i] == C0_LF) |
2689 | data[i] = C0_CR; |
2709 | data[i] = C0_CR; |
2690 | |
2710 | |
2691 | if (priv_modes & PrivMode_BracketPaste) |
2711 | if (priv_modes & PrivMode_BracketPaste) |
2692 | tt_printf ("\e[200~"); |
2712 | tt_printf ("\x1b[200~"); |
2693 | |
2713 | |
2694 | tt_write (data, len); |
2714 | tt_write (data, len); |
2695 | |
2715 | |
2696 | if (priv_modes & PrivMode_BracketPaste) |
2716 | if (priv_modes & PrivMode_BracketPaste) |
2697 | tt_printf ("\e[201~"); |
2717 | tt_printf ("\x1b[201~"); |
2698 | } |
2718 | } |
2699 | |
2719 | |
2700 | void |
2720 | void |
2701 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2721 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2702 | { |
2722 | { |
… | |
… | |
2706 | tt_paste (data, len); |
2726 | tt_paste (data, len); |
2707 | } |
2727 | } |
2708 | |
2728 | |
2709 | /* ------------------------------------------------------------------------- */ |
2729 | /* ------------------------------------------------------------------------- */ |
2710 | /* |
2730 | /* |
2711 | * Respond to a notification that a primary selection has been sent |
2731 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2712 | * EXT: SelectionNotify |
2732 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2713 | */ |
2733 | * as fallback |
2714 | void |
|
|
2715 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
|
|
2716 | { |
|
|
2717 | if (prop == None) /* check for failed XConvertSelection */ |
|
|
2718 | { |
|
|
2719 | if ((selection_type & Sel_CompoundText)) |
|
|
2720 | { |
|
|
2721 | int selnum = selection_type & Sel_whereMask; |
|
|
2722 | |
|
|
2723 | selection_type = 0; |
|
|
2724 | if (selnum != Sel_direct) |
|
|
2725 | selection_request_other (XA_STRING, selnum); |
|
|
2726 | } |
|
|
2727 | |
|
|
2728 | if ((selection_type & Sel_UTF8String)) |
|
|
2729 | { |
|
|
2730 | int selnum = selection_type & Sel_whereMask; |
|
|
2731 | |
|
|
2732 | selection_type = Sel_CompoundText; |
|
|
2733 | if (selnum != Sel_direct) |
|
|
2734 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2735 | else |
|
|
2736 | selection_type = 0; |
|
|
2737 | } |
|
|
2738 | |
|
|
2739 | return; |
|
|
2740 | } |
|
|
2741 | |
|
|
2742 | unsigned long bytes_after; |
|
|
2743 | XTextProperty ct; |
|
|
2744 | |
|
|
2745 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2746 | 0, PROP_SIZE / 4, |
|
|
2747 | delete_prop, AnyPropertyType, |
|
|
2748 | &ct.encoding, &ct.format, |
|
|
2749 | &ct.nitems, &bytes_after, |
|
|
2750 | &ct.value) != Success) |
|
|
2751 | { |
|
|
2752 | ct.value = 0; |
|
|
2753 | goto bailout; |
|
|
2754 | } |
|
|
2755 | |
|
|
2756 | if (ct.encoding == None) |
|
|
2757 | goto bailout; |
|
|
2758 | |
|
|
2759 | if (bytes_after) |
|
|
2760 | { |
|
|
2761 | // fetch and append remaining data |
|
|
2762 | XTextProperty ct2; |
|
|
2763 | |
|
|
2764 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2765 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2766 | delete_prop, AnyPropertyType, |
|
|
2767 | &ct2.encoding, &ct2.format, |
|
|
2768 | &ct2.nitems, &bytes_after, |
|
|
2769 | &ct2.value) != Success) |
|
|
2770 | goto bailout; |
|
|
2771 | |
|
|
2772 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2773 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2774 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2775 | ct.nitems += ct2.nitems; |
|
|
2776 | |
|
|
2777 | XFree (ct2.value); |
|
|
2778 | } |
|
|
2779 | |
|
|
2780 | if (ct.value == 0) |
|
|
2781 | goto bailout; |
|
|
2782 | |
|
|
2783 | if (ct.encoding == xa[XA_INCR]) |
|
|
2784 | { |
|
|
2785 | // INCR selection, start handshake |
|
|
2786 | if (!delete_prop) |
|
|
2787 | XDeleteProperty (dpy, win, prop); |
|
|
2788 | |
|
|
2789 | selection_wait = Sel_incr; |
|
|
2790 | incr_buf_fill = 0; |
|
|
2791 | incr_ev.start (10); |
|
|
2792 | |
|
|
2793 | goto bailout; |
|
|
2794 | } |
|
|
2795 | |
|
|
2796 | if (ct.nitems == 0) |
|
|
2797 | { |
|
|
2798 | if (selection_wait == Sel_incr) |
|
|
2799 | { |
|
|
2800 | XFree (ct.value); |
|
|
2801 | |
|
|
2802 | // finally complete, now paste the whole thing |
|
|
2803 | selection_wait = Sel_normal; |
|
|
2804 | ct.value = (unsigned char *)incr_buf; |
|
|
2805 | ct.nitems = incr_buf_fill; |
|
|
2806 | incr_buf = 0; |
|
|
2807 | incr_buf_size = 0; |
|
|
2808 | incr_ev.stop (); |
|
|
2809 | } |
|
|
2810 | else |
|
|
2811 | { |
|
|
2812 | if (selection_wait == Sel_normal |
|
|
2813 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2814 | { |
|
|
2815 | /* |
|
|
2816 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2817 | * XConvertSelection () but nothing was presented |
|
|
2818 | */ |
|
|
2819 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2820 | } |
|
|
2821 | |
|
|
2822 | goto bailout; |
|
|
2823 | } |
|
|
2824 | } |
|
|
2825 | else if (selection_wait == Sel_incr) |
|
|
2826 | { |
|
|
2827 | incr_ev.start (10); |
|
|
2828 | |
|
|
2829 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2830 | { |
|
|
2831 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2832 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2833 | } |
|
|
2834 | |
|
|
2835 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2836 | incr_buf_fill += ct.nitems; |
|
|
2837 | |
|
|
2838 | goto bailout; |
|
|
2839 | } |
|
|
2840 | |
|
|
2841 | char **cl; |
|
|
2842 | int cr; |
|
|
2843 | |
|
|
2844 | #if !ENABLE_MINIMAL |
|
|
2845 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2846 | // so recode it manually |
|
|
2847 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2848 | { |
|
|
2849 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2850 | char *s = rxvt_wcstombs (w); |
|
|
2851 | free (w); |
|
|
2852 | // TODO: strlen == only the first element will be converted. well... |
|
|
2853 | paste (s, strlen (s)); |
|
|
2854 | free (s); |
|
|
2855 | } |
|
|
2856 | else |
|
|
2857 | #endif |
|
|
2858 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2859 | && cl) |
|
|
2860 | { |
|
|
2861 | for (int i = 0; i < cr; i++) |
|
|
2862 | paste (cl[i], strlen (cl[i])); |
|
|
2863 | |
|
|
2864 | XFreeStringList (cl); |
|
|
2865 | } |
|
|
2866 | else |
|
|
2867 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2868 | |
|
|
2869 | bailout: |
|
|
2870 | XFree (ct.value); |
|
|
2871 | |
|
|
2872 | if (selection_wait == Sel_normal) |
|
|
2873 | selection_wait = Sel_none; |
|
|
2874 | } |
|
|
2875 | |
|
|
2876 | void |
|
|
2877 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2878 | { |
|
|
2879 | selection_wait = Sel_none; |
|
|
2880 | |
|
|
2881 | incr_buf_size = 0; |
|
|
2882 | free (incr_buf); |
|
|
2883 | |
|
|
2884 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2885 | } |
|
|
2886 | |
|
|
2887 | void |
|
|
2888 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2889 | { |
|
|
2890 | if (prop == None || selection_wait != Sel_incr) |
|
|
2891 | return; |
|
|
2892 | |
|
|
2893 | selection_paste (win, prop, true); |
|
|
2894 | } |
|
|
2895 | |
|
|
2896 | /* ------------------------------------------------------------------------- */ |
|
|
2897 | /* |
|
|
2898 | * Request the current selection: |
|
|
2899 | * Order: > internal selection if available |
|
|
2900 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
|
|
2901 | * > CUT_BUFFER0 |
|
|
2902 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2903 | * will auto fallback to CUT_BUFFER0 |
|
|
2904 | * EXT: button 2 release |
2734 | * EXT: button 2 release |
2905 | */ |
2735 | */ |
2906 | void |
2736 | void |
2907 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2737 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2908 | { |
2738 | { |
2909 | if (selection.text && selnum == Sel_Primary) |
2739 | if (!selection_req) |
2910 | { |
|
|
2911 | /* internal selection */ |
|
|
2912 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2913 | paste (str, strlen (str)); |
|
|
2914 | free (str); |
|
|
2915 | return; |
|
|
2916 | } |
2740 | { |
2917 | else |
2741 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2742 | selection_req->run (); |
2918 | { |
2743 | } |
2919 | selection_request_time = tm; |
|
|
2920 | selection_wait = Sel_normal; |
|
|
2921 | |
|
|
2922 | #if X_HAVE_UTF8_STRING |
|
|
2923 | selection_type = Sel_UTF8String; |
|
|
2924 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2925 | return; |
|
|
2926 | #else |
|
|
2927 | selection_type = Sel_CompoundText; |
|
|
2928 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2929 | return; |
|
|
2930 | #endif |
|
|
2931 | } |
|
|
2932 | |
|
|
2933 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2934 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2935 | } |
|
|
2936 | |
|
|
2937 | int |
|
|
2938 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2939 | { |
|
|
2940 | Atom sel; |
|
|
2941 | |
|
|
2942 | selection_type |= selnum; |
|
|
2943 | |
|
|
2944 | if (selnum == Sel_Primary) |
|
|
2945 | sel = XA_PRIMARY; |
|
|
2946 | else if (selnum == Sel_Secondary) |
|
|
2947 | sel = XA_SECONDARY; |
|
|
2948 | else |
|
|
2949 | sel = xa[XA_CLIPBOARD]; |
|
|
2950 | |
|
|
2951 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2952 | { |
|
|
2953 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2954 | vt, selection_request_time); |
|
|
2955 | return 1; |
|
|
2956 | } |
|
|
2957 | |
|
|
2958 | return 0; |
|
|
2959 | } |
2744 | } |
2960 | |
2745 | |
2961 | /* ------------------------------------------------------------------------- */ |
2746 | /* ------------------------------------------------------------------------- */ |
2962 | /* |
2747 | /* |
2963 | * Clear all selected text |
2748 | * Clear all selected text |
… | |
… | |
2994 | * EXT: button 1 or 3 release |
2779 | * EXT: button 1 or 3 release |
2995 | */ |
2780 | */ |
2996 | void |
2781 | void |
2997 | rxvt_term::selection_make (Time tm) |
2782 | rxvt_term::selection_make (Time tm) |
2998 | { |
2783 | { |
2999 | int i; |
2784 | int size; |
3000 | wchar_t *new_selection_text; |
2785 | wchar_t *new_selection_text; |
3001 | text_t *t; |
2786 | text_t *t; |
3002 | |
2787 | |
3003 | switch (selection.op) |
2788 | switch (selection.op) |
3004 | { |
2789 | { |
… | |
… | |
3020 | return; /* nothing selected, go away */ |
2805 | return; /* nothing selected, go away */ |
3021 | |
2806 | |
3022 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2807 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3023 | return; |
2808 | return; |
3024 | |
2809 | |
3025 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2810 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3026 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2811 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3027 | |
2812 | |
3028 | int ofs = 0; |
2813 | int ofs = 0; |
3029 | int extra = 0; |
2814 | int extra = 0; |
3030 | |
2815 | |
3031 | int col = selection.beg.col; |
2816 | int col = selection.beg.col; |
… | |
… | |
3037 | { |
2822 | { |
3038 | #if !ENABLE_MINIMAL |
2823 | #if !ENABLE_MINIMAL |
3039 | if (selection.rect) |
2824 | if (selection.rect) |
3040 | { |
2825 | { |
3041 | col = selection.beg.col; |
2826 | col = selection.beg.col; |
3042 | end_col = ncol + 1; |
2827 | end_col = selection.end.col; |
3043 | } |
2828 | } |
3044 | else |
2829 | else |
3045 | #endif |
2830 | #endif |
3046 | end_col = ROW(row).l; |
2831 | end_col = ROW(row).l; |
3047 | |
2832 | |
3048 | col = max (col, 0); |
2833 | col = max (col, 0); |
3049 | |
2834 | |
3050 | if (row == selection.end.row |
2835 | if (row == selection.end.row) |
3051 | #if !ENABLE_MINIMAL |
|
|
3052 | || selection.rect |
|
|
3053 | #endif |
|
|
3054 | ) |
|
|
3055 | min_it (end_col, selection.end.col); |
2836 | min_it (end_col, selection.end.col); |
3056 | |
2837 | |
3057 | t = ROW(row).t + col; |
2838 | t = ROW(row).t + col; |
3058 | |
2839 | |
3059 | for (; col < end_col; col++) |
2840 | for (; col < end_col; col++) |
… | |
… | |
3067 | |
2848 | |
3068 | extra -= (len - 1); |
2849 | extra -= (len - 1); |
3069 | |
2850 | |
3070 | if (extra < 0) |
2851 | if (extra < 0) |
3071 | { |
2852 | { |
3072 | extra += i; |
2853 | extra += size; |
3073 | i += i; |
2854 | size += size; |
3074 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2855 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3075 | } |
2856 | } |
3076 | |
2857 | |
3077 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2858 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3078 | } |
2859 | } |
3079 | #endif |
2860 | #endif |
… | |
… | |
3091 | |
2872 | |
3092 | new_selection_text[ofs++] = C0_LF; |
2873 | new_selection_text[ofs++] = C0_LF; |
3093 | } |
2874 | } |
3094 | else |
2875 | else |
3095 | #endif |
2876 | #endif |
3096 | if (!ROW(row).is_longer () && row != selection.end.row) |
2877 | if (!ROW(row).is_longer () |
|
|
2878 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2879 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3097 | new_selection_text[ofs++] = C0_LF; |
2880 | new_selection_text[ofs++] = C0_LF; |
3098 | } |
2881 | } |
3099 | |
|
|
3100 | if (end_col != selection.end.col) |
|
|
3101 | new_selection_text[ofs++] = C0_LF; |
|
|
3102 | |
2882 | |
3103 | new_selection_text[ofs] = 0; |
2883 | new_selection_text[ofs] = 0; |
3104 | |
2884 | |
3105 | if (ofs == 0) |
2885 | if (ofs == 0) |
3106 | { |
2886 | { |
… | |
… | |
3162 | /* ------------------------------------------------------------------------- */ |
2942 | /* ------------------------------------------------------------------------- */ |
3163 | /* |
2943 | /* |
3164 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2944 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3165 | * EXT: button 1 press |
2945 | * EXT: button 1 press |
3166 | */ |
2946 | */ |
3167 | void |
2947 | void ecb_cold |
3168 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2948 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3169 | { |
2949 | { |
3170 | clicks = ((clicks - 1) % 3) + 1; |
2950 | clicks = ((clicks - 1) % 3) + 1; |
3171 | selection.clicks = clicks; /* save clicks so extend will work */ |
2951 | selection.clicks = clicks; /* save clicks so extend will work */ |
3172 | |
2952 | |
… | |
… | |
3191 | |
2971 | |
3192 | /* ------------------------------------------------------------------------- */ |
2972 | /* ------------------------------------------------------------------------- */ |
3193 | /* |
2973 | /* |
3194 | * Mark a selection at the specified col/row |
2974 | * Mark a selection at the specified col/row |
3195 | */ |
2975 | */ |
3196 | void |
2976 | void ecb_cold |
3197 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2977 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3198 | { |
2978 | { |
3199 | want_refresh = 1; |
2979 | want_refresh = 1; |
3200 | |
2980 | |
3201 | selection.mark.row = row + view_start; |
2981 | selection.mark.row = row + view_start; |
… | |
… | |
3228 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3008 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3229 | #define DELIMIT_TEXT(x) \ |
3009 | #define DELIMIT_TEXT(x) \ |
3230 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3010 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3231 | #define DELIMIT_REND(x) 1 |
3011 | #define DELIMIT_REND(x) 1 |
3232 | |
3012 | |
3233 | void |
3013 | void ecb_cold |
3234 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3014 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3235 | { |
3015 | { |
3236 | int col, row, dirnadd, tcol, trow, w1, w2; |
3016 | int col, row, dirnadd, tcol, trow, w1, w2; |
3237 | row_col_t bound; |
3017 | row_col_t bound; |
3238 | text_t *stp; |
3018 | text_t *stp; |
… | |
… | |
3312 | * EXT: button 3 press; button 1 or 3 drag |
3092 | * EXT: button 3 press; button 1 or 3 drag |
3313 | * flag == 0 ==> button 1 |
3093 | * flag == 0 ==> button 1 |
3314 | * flag == 1 ==> button 3 press |
3094 | * flag == 1 ==> button 3 press |
3315 | * flag == 2 ==> button 3 motion |
3095 | * flag == 2 ==> button 3 motion |
3316 | */ |
3096 | */ |
3317 | void |
3097 | void ecb_cold |
3318 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3098 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3319 | { |
3099 | { |
3320 | int col = clamp (Pixel2Col (x), 0, ncol); |
3100 | int col = clamp (Pixel2Col (x), 0, ncol); |
3321 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3101 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3322 | |
3102 | |
… | |
… | |
3348 | |
3128 | |
3349 | /* ------------------------------------------------------------------------- */ |
3129 | /* ------------------------------------------------------------------------- */ |
3350 | /* |
3130 | /* |
3351 | * Extend the selection to the specified col/row |
3131 | * Extend the selection to the specified col/row |
3352 | */ |
3132 | */ |
3353 | void |
3133 | void ecb_cold |
3354 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3134 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3355 | { |
3135 | { |
3356 | row_col_t pos; |
3136 | row_col_t pos; |
3357 | enum { |
3137 | enum { |
3358 | LEFT, RIGHT |
3138 | LEFT, RIGHT |
… | |
… | |
3549 | ::swap (selection.beg.col, selection.end.col); |
3329 | ::swap (selection.beg.col, selection.end.col); |
3550 | #endif |
3330 | #endif |
3551 | } |
3331 | } |
3552 | |
3332 | |
3553 | #if !ENABLE_MINIMAL |
3333 | #if !ENABLE_MINIMAL |
3554 | void |
3334 | void ecb_cold |
3555 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3335 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3556 | { |
3336 | { |
3557 | int32_t end_col, end_row; |
3337 | int32_t end_col, end_row; |
3558 | text_t *stp; |
3338 | text_t *stp; |
3559 | |
3339 | |
… | |
… | |
3597 | /* ------------------------------------------------------------------------- */ |
3377 | /* ------------------------------------------------------------------------- */ |
3598 | /* |
3378 | /* |
3599 | * Double click on button 3 when already selected |
3379 | * Double click on button 3 when already selected |
3600 | * EXT: button 3 double click |
3380 | * EXT: button 3 double click |
3601 | */ |
3381 | */ |
3602 | void |
3382 | void ecb_cold |
3603 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3383 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3604 | { |
3384 | { |
3605 | selection.clicks = selection.clicks % 3 + 1; |
3385 | selection.clicks = selection.clicks % 3 + 1; |
3606 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3386 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3607 | } |
3387 | } |
… | |
… | |
3609 | /* ------------------------------------------------------------------------- */ |
3389 | /* ------------------------------------------------------------------------- */ |
3610 | /* |
3390 | /* |
3611 | * Respond to a request for our current selection |
3391 | * Respond to a request for our current selection |
3612 | * EXT: SelectionRequest |
3392 | * EXT: SelectionRequest |
3613 | */ |
3393 | */ |
3614 | void |
3394 | void ecb_cold |
3615 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3395 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3616 | { |
3396 | { |
|
|
3397 | Atom property = rq.property == None ? rq.target : rq.property; |
3617 | XSelectionEvent ev; |
3398 | XSelectionEvent ev; |
3618 | |
3399 | |
3619 | ev.type = SelectionNotify; |
3400 | ev.type = SelectionNotify; |
3620 | ev.property = None; |
3401 | ev.property = None; |
3621 | ev.display = rq.display; |
3402 | ev.display = rq.display; |
… | |
… | |
3636 | *target++ = xa[XA_COMPOUND_TEXT]; |
3417 | *target++ = xa[XA_COMPOUND_TEXT]; |
3637 | #if X_HAVE_UTF8_STRING |
3418 | #if X_HAVE_UTF8_STRING |
3638 | *target++ = xa[XA_UTF8_STRING]; |
3419 | *target++ = xa[XA_UTF8_STRING]; |
3639 | #endif |
3420 | #endif |
3640 | |
3421 | |
3641 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3422 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3642 | 32, PropModeReplace, |
3423 | 32, PropModeReplace, |
3643 | (unsigned char *)target_list, target - target_list); |
3424 | (unsigned char *)target_list, target - target_list); |
3644 | ev.property = rq.property; |
3425 | ev.property = property; |
3645 | } |
3426 | } |
3646 | #if TODO // TODO |
3427 | #if TODO // TODO |
3647 | else if (rq.target == xa[XA_MULTIPLE]) |
3428 | else if (rq.target == xa[XA_MULTIPLE]) |
3648 | { |
3429 | { |
3649 | /* TODO: Handle MULTIPLE */ |
3430 | /* TODO: Handle MULTIPLE */ |
3650 | } |
3431 | } |
3651 | #endif |
3432 | #endif |
3652 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3433 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3653 | { |
3434 | { |
3654 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3435 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3655 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3436 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3656 | ev.property = rq.property; |
3437 | ev.property = property; |
3657 | } |
3438 | } |
3658 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3439 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3659 | { |
3440 | { |
3660 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3441 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3661 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3442 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3662 | ev.property = rq.property; |
3443 | ev.property = property; |
3663 | } |
3444 | } |
3664 | else if (rq.target == XA_STRING |
3445 | else if (rq.target == XA_STRING |
3665 | || rq.target == xa[XA_TEXT] |
3446 | || rq.target == xa[XA_TEXT] |
3666 | || rq.target == xa[XA_COMPOUND_TEXT] |
3447 | || rq.target == xa[XA_COMPOUND_TEXT] |
3667 | || rq.target == xa[XA_UTF8_STRING] |
3448 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3738 | ct.value = (unsigned char *)cl; |
3519 | ct.value = (unsigned char *)cl; |
3739 | ct.nitems = selectlen; |
3520 | ct.nitems = selectlen; |
3740 | ct.encoding = target; |
3521 | ct.encoding = target; |
3741 | } |
3522 | } |
3742 | |
3523 | |
3743 | XChangeProperty (dpy, rq.requestor, rq.property, |
3524 | XChangeProperty (dpy, rq.requestor, property, |
3744 | ct.encoding, 8, PropModeReplace, |
3525 | ct.encoding, 8, PropModeReplace, |
3745 | ct.value, (int)ct.nitems); |
3526 | ct.value, (int)ct.nitems); |
3746 | ev.property = rq.property; |
3527 | ev.property = property; |
3747 | |
3528 | |
3748 | if (freect) |
3529 | if (freect) |
3749 | XFree (ct.value); |
3530 | XFree (ct.value); |
3750 | } |
3531 | } |
3751 | |
3532 | |
3752 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3533 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3753 | } |
3534 | } |
3754 | |
3535 | |
3755 | /* ------------------------------------------------------------------------- */ |
3536 | /* ------------------------------------------------------------------------- */ |
3756 | #ifdef USE_XIM |
3537 | #ifdef USE_XIM |
3757 | void |
3538 | void ecb_cold |
3758 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3539 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3759 | { |
3540 | { |
3760 | XWindowAttributes xwa; |
3541 | XWindowAttributes xwa; |
3761 | |
3542 | |
3762 | XGetWindowAttributes (dpy, vt, &xwa); |
3543 | XGetWindowAttributes (dpy, vt, &xwa); |