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 (); |
… | |
… | |
154 | l.r[col] = rend; |
150 | l.r[col] = rend; |
155 | col++; |
151 | col++; |
156 | } while (col < ncol && l.t[col] == NOCHAR); |
152 | } while (col < ncol && l.t[col] == NOCHAR); |
157 | } |
153 | } |
158 | |
154 | |
|
|
155 | // set the rendition of a single wide character beginning at the given column |
|
|
156 | void |
|
|
157 | rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend) |
|
|
158 | { |
|
|
159 | do { |
|
|
160 | l.r[col] = rend; |
|
|
161 | col++; |
|
|
162 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
163 | } |
|
|
164 | |
159 | /* ------------------------------------------------------------------------- * |
165 | /* ------------------------------------------------------------------------- * |
160 | * SCREEN INITIALISATION * |
166 | * SCREEN INITIALISATION * |
161 | * ------------------------------------------------------------------------- */ |
167 | * ------------------------------------------------------------------------- */ |
162 | |
168 | |
163 | void |
169 | void |
|
|
170 | rxvt_term::scr_alloc () NOTHROW |
|
|
171 | { |
|
|
172 | int tsize = sizeof (text_t) * ncol; |
|
|
173 | int rsize = sizeof (rend_t) * ncol; |
|
|
174 | |
|
|
175 | // we assume that rend_t size is a sufficient alignment |
|
|
176 | // factor for text_t and line_t values, and we only |
|
|
177 | // need to adjust tsize. |
|
|
178 | tsize = (tsize + sizeof (rend_t) - 1); |
|
|
179 | tsize -= tsize % sizeof (rend_t); |
|
|
180 | |
|
|
181 | int all_rows = total_rows + nrow + nrow; |
|
|
182 | |
|
|
183 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
|
|
184 | chunk = chunk_alloc (chunk_size, 0); |
|
|
185 | |
|
|
186 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
|
|
187 | |
|
|
188 | for (int row = 0; row < all_rows; ++row) |
|
|
189 | { |
|
|
190 | line_t &l = ((line_t *)chunk) [row]; |
|
|
191 | |
|
|
192 | l.t = (text_t *)base; base += tsize; |
|
|
193 | l.r = (rend_t *)base; base += rsize; |
|
|
194 | l.l = -1; |
|
|
195 | l.f = 0; |
|
|
196 | } |
|
|
197 | |
|
|
198 | drawn_buf = (line_t *)chunk; |
|
|
199 | swap_buf = drawn_buf + nrow; |
|
|
200 | row_buf = swap_buf + nrow; |
|
|
201 | } |
|
|
202 | |
|
|
203 | void |
|
|
204 | rxvt_term::copy_line (line_t &dst, line_t &src) |
|
|
205 | { |
|
|
206 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
|
|
207 | dst.l = min (src.l, ncol); |
|
|
208 | memcpy (dst.t, src.t, sizeof (text_t) * dst.l); |
|
|
209 | memcpy (dst.r, src.r, sizeof (rend_t) * dst.l); |
|
|
210 | dst.f = src.f; |
|
|
211 | } |
|
|
212 | |
|
|
213 | void ecb_cold |
164 | rxvt_term::scr_reset () |
214 | rxvt_term::scr_reset () |
165 | { |
215 | { |
|
|
216 | #if ENABLE_OVERLAY |
|
|
217 | scr_overlay_off (); |
|
|
218 | #endif |
|
|
219 | |
166 | view_start = 0; |
220 | view_start = 0; |
167 | num_scr = 0; |
221 | num_scr = 0; |
168 | |
222 | |
169 | if (ncol == 0) |
223 | if (ncol == 0) |
170 | ncol = 80; |
224 | ncol = 80; |
… | |
… | |
190 | total_rows = nrow + saveLines; |
244 | total_rows = nrow + saveLines; |
191 | |
245 | |
192 | screen.tscroll = 0; |
246 | screen.tscroll = 0; |
193 | screen.bscroll = nrow - 1; |
247 | screen.bscroll = nrow - 1; |
194 | |
248 | |
|
|
249 | void *prev_chunk = chunk; |
|
|
250 | size_t prev_chunk_size = chunk_size; |
|
|
251 | line_t *prev_drawn_buf = drawn_buf; |
|
|
252 | line_t *prev_swap_buf = swap_buf; |
|
|
253 | line_t *prev_row_buf = row_buf; |
|
|
254 | |
|
|
255 | scr_alloc (); |
|
|
256 | |
195 | if (!row_buf) |
257 | if (!prev_row_buf) |
196 | { |
258 | { |
197 | /* |
|
|
198 | * first time called so just malloc everything: don't rely on realloc |
|
|
199 | */ |
|
|
200 | top_row = 0; |
259 | top_row = 0; |
201 | term_start = 0; |
260 | term_start = 0; |
202 | |
|
|
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
205 | |
|
|
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
209 | |
|
|
210 | for (int row = nrow; row--; ) |
|
|
211 | { |
|
|
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
214 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
215 | } |
|
|
216 | |
261 | |
217 | memset (charsets, 'B', sizeof (charsets)); |
262 | memset (charsets, 'B', sizeof (charsets)); |
218 | rstyle = DEFAULT_RSTYLE; |
263 | rstyle = DEFAULT_RSTYLE; |
219 | screen.flags = Screen_DefaultFlags; |
264 | screen.flags = Screen_DefaultFlags; |
220 | screen.cur.row = screen.cur.col = 0; |
265 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
243 | { |
288 | { |
244 | /* |
289 | /* |
245 | * add or delete rows as appropriate |
290 | * add or delete rows as appropriate |
246 | */ |
291 | */ |
247 | |
292 | |
248 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
293 | int common_col = min (prev_ncol, ncol); |
249 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
250 | |
|
|
251 | #if 0 |
|
|
252 | if (nrow < prev_nrow) |
|
|
253 | { |
|
|
254 | for (int row = nrow; row < prev_nrow; row++) |
|
|
255 | { |
|
|
256 | lfree (swap_buf [row]); |
|
|
257 | lfree (drawn_buf[row]); |
|
|
258 | } |
|
|
259 | } |
|
|
260 | #endif |
|
|
261 | |
|
|
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
264 | |
294 | |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
295 | for (int row = min (nrow, prev_nrow); row--; ) |
266 | { |
296 | { |
267 | lresize (drawn_buf[row]); |
297 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
268 | lresize (swap_buf [row]); |
298 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
269 | } |
299 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
270 | |
300 | |
271 | for (int row = prev_nrow; row < nrow; row++) |
301 | copy_line (swap_buf [row], prev_swap_buf [row]); |
272 | { |
302 | } |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
275 | } |
|
|
276 | |
|
|
277 | line_t *old_buf = row_buf; |
|
|
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
279 | |
303 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
304 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
305 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
306 | int q = total_rows; // rewrapped row |
283 | |
307 | |
… | |
… | |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
315 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | |
316 | |
293 | do |
317 | do |
294 | { |
318 | { |
295 | p = MOD (p - 1, prev_total_rows); |
319 | p = MOD (p - 1, prev_total_rows); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
320 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
297 | int plines = 1; |
321 | int plines = 1; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
322 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
299 | |
323 | |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
324 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
301 | { |
325 | { |
302 | p = MOD (p - 1, prev_total_rows); |
326 | p = MOD (p - 1, prev_total_rows); |
303 | |
327 | |
304 | plines++; |
328 | plines++; |
305 | llen += prev_ncol; |
329 | llen += prev_ncol; |
… | |
… | |
318 | |
342 | |
319 | // re-assemble the full line by destination lines |
343 | // re-assemble the full line by destination lines |
320 | for (int qrow = q; qlines--; qrow++) |
344 | for (int qrow = q; qlines--; qrow++) |
321 | { |
345 | { |
322 | qline = row_buf + qrow; |
346 | qline = row_buf + qrow; |
323 | lalloc (*qline); |
347 | qline->alloc (); // redundant with next line |
324 | qline->l = ncol; |
348 | qline->l = ncol; |
325 | qline->is_longer (1); |
349 | qline->is_longer (1); |
326 | |
350 | |
327 | int qcol = 0; |
351 | int qcol = 0; |
328 | |
352 | |
… | |
… | |
343 | // this seems to upset applications/shells/readline |
367 | // this seems to upset applications/shells/readline |
344 | // least. |
368 | // least. |
345 | if (prow == ocur.row) |
369 | if (prow == ocur.row) |
346 | screen.cur.row = q - (total_rows - nrow); |
370 | screen.cur.row = q - (total_rows - nrow); |
347 | |
371 | |
348 | line_t &pline = old_buf [prow]; |
372 | line_t &pline = prev_row_buf [prow]; |
349 | |
373 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
374 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
375 | |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
376 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
377 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
374 | { |
398 | { |
375 | // if no scrollback exists (yet), wing, instead of wrap |
399 | // if no scrollback exists (yet), wing, instead of wrap |
376 | |
400 | |
377 | for (int row = min (nrow, prev_nrow); row--; ) |
401 | for (int row = min (nrow, prev_nrow); row--; ) |
378 | { |
402 | { |
379 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
403 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
380 | line_t &qline = row_buf [row]; |
404 | line_t &dst = row_buf [row]; |
381 | |
405 | |
382 | qline = pline; |
406 | copy_line (dst, src); |
383 | lresize (qline); |
|
|
384 | } |
407 | } |
385 | |
408 | |
386 | for (int row = prev_nrow; row < nrow; row++) |
409 | for (int row = prev_nrow; row < nrow; row++) |
387 | { |
|
|
388 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
410 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
389 | } |
|
|
390 | |
411 | |
391 | term_start = 0; |
412 | term_start = 0; |
392 | } |
413 | } |
393 | |
|
|
394 | free (old_buf); |
|
|
395 | delete old_ta; |
|
|
396 | delete old_ra; |
|
|
397 | |
414 | |
398 | clamp_it (screen.cur.row, 0, nrow - 1); |
415 | clamp_it (screen.cur.row, 0, nrow - 1); |
399 | clamp_it (screen.cur.col, 0, ncol - 1); |
416 | clamp_it (screen.cur.col, 0, ncol - 1); |
400 | } |
417 | } |
401 | |
418 | |
|
|
419 | for (int row = nrow; row--; ) |
|
|
420 | { |
|
|
421 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
422 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
423 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
424 | } |
|
|
425 | |
|
|
426 | chunk_free (prev_chunk, prev_chunk_size); |
|
|
427 | |
402 | free (tabs); |
428 | free (tabs); |
403 | tabs = (char *)rxvt_malloc (ncol); |
429 | tabs = (char *)rxvt_malloc (ncol); |
404 | |
430 | |
405 | for (int col = ncol; --col; ) |
431 | for (int col = ncol; col--; ) |
406 | tabs [col] = col % TABSIZE == 0; |
432 | tabs [col] = col % TABSIZE == 0; |
407 | |
433 | |
408 | CLEAR_ALL_SELECTION (); |
434 | CLEAR_ALL_SELECTION (); |
409 | |
435 | |
410 | prev_nrow = nrow; |
436 | prev_nrow = nrow; |
… | |
… | |
413 | tt_winch (); |
439 | tt_winch (); |
414 | |
440 | |
415 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
441 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
416 | } |
442 | } |
417 | |
443 | |
418 | /* ------------------------------------------------------------------------- */ |
444 | void ecb_cold |
419 | /* |
|
|
420 | * Free everything. That way malloc debugging can find leakage. |
|
|
421 | */ |
|
|
422 | void |
|
|
423 | rxvt_term::scr_release () NOTHROW |
445 | rxvt_term::scr_release () NOTHROW |
424 | { |
446 | { |
425 | if (row_buf) |
447 | chunk_free (chunk, chunk_size); |
426 | { |
448 | chunk = 0; |
427 | delete talloc; talloc = 0; |
449 | row_buf = 0; |
428 | delete ralloc; ralloc = 0; |
|
|
429 | |
450 | |
430 | free (row_buf); |
|
|
431 | free (swap_buf); |
|
|
432 | free (drawn_buf); |
|
|
433 | row_buf = 0; // signal that we freed all the arrays above |
|
|
434 | |
|
|
435 | free (tabs); |
451 | free (tabs); |
436 | tabs = 0; |
452 | tabs = 0; |
437 | } |
|
|
438 | } |
453 | } |
439 | |
454 | |
440 | /* ------------------------------------------------------------------------- */ |
455 | /* ------------------------------------------------------------------------- */ |
441 | /* |
456 | /* |
442 | * Hard/Soft reset |
457 | * Hard/Soft reset |
443 | */ |
458 | */ |
444 | void |
459 | void ecb_cold |
445 | rxvt_term::scr_poweron () |
460 | rxvt_term::scr_poweron () |
446 | { |
461 | { |
447 | scr_release (); |
462 | scr_release (); |
|
|
463 | |
448 | prev_nrow = prev_ncol = 0; |
464 | prev_nrow = prev_ncol = 0; |
449 | rvideo_mode = false; |
465 | rvideo_mode = false; |
450 | scr_soft_reset (); |
466 | scr_soft_reset (); |
451 | scr_reset (); |
467 | scr_reset (); |
452 | |
468 | |
453 | scr_clear (true); |
469 | scr_clear (true); |
454 | scr_refresh (); |
470 | scr_refresh (); |
455 | } |
471 | } |
456 | |
472 | |
457 | void |
473 | void ecb_cold |
458 | rxvt_term::scr_soft_reset () |
474 | rxvt_term::scr_soft_reset () NOTHROW |
459 | { |
475 | { |
460 | /* only affects modes, nothing drastic such as clearing the screen */ |
476 | /* only affects modes, nothing drastic such as clearing the screen */ |
461 | #if ENABLE_OVERLAY |
477 | #if ENABLE_OVERLAY |
462 | scr_overlay_off (); |
478 | scr_overlay_off (); |
463 | #endif |
479 | #endif |
… | |
… | |
518 | assert (s->cur.row >= 0); |
534 | assert (s->cur.row >= 0); |
519 | assert (s->cur.col >= 0); |
535 | assert (s->cur.col >= 0); |
520 | } |
536 | } |
521 | |
537 | |
522 | void |
538 | void |
523 | rxvt_term::scr_swap_screen () |
539 | rxvt_term::scr_swap_screen () NOTHROW |
524 | { |
540 | { |
525 | if (!option (Opt_secondaryScreen)) |
541 | if (!option (Opt_secondaryScreen)) |
526 | return; |
542 | return; |
527 | |
543 | |
528 | for (int i = prev_nrow; i--; ) |
544 | for (int i = prev_nrow; i--; ) |
… | |
… | |
547 | return; |
563 | return; |
548 | |
564 | |
549 | want_refresh = 1; |
565 | want_refresh = 1; |
550 | view_start = 0; |
566 | view_start = 0; |
551 | |
567 | |
552 | selection_check (2); /* check for boundary cross */ |
568 | /* check for boundary cross */ |
|
|
569 | row_col_t pos; |
|
|
570 | pos.row = pos.col = 0; |
|
|
571 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
572 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
573 | CLEAR_SELECTION (); |
553 | |
574 | |
554 | current_screen = scrn; |
575 | current_screen = scrn; |
555 | |
576 | |
556 | #if NSCREENS |
577 | #if NSCREENS |
557 | if (option (Opt_secondaryScreen)) |
578 | if (option (Opt_secondaryScreen)) |
… | |
… | |
623 | /* |
644 | /* |
624 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
645 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
625 | * count positive ==> scroll up |
646 | * count positive ==> scroll up |
626 | * count negative ==> scroll down |
647 | * count negative ==> scroll down |
627 | */ |
648 | */ |
628 | int |
649 | int ecb_hot |
629 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
650 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
630 | { |
651 | { |
631 | if (count == 0 || (row1 > row2)) |
652 | if (count == 0 || (row1 > row2)) |
632 | return 0; |
653 | return 0; |
633 | |
654 | |
… | |
… | |
636 | |
657 | |
637 | if (count > 0 |
658 | if (count > 0 |
638 | && row1 == 0 |
659 | && row1 == 0 |
639 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
660 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
640 | { |
661 | { |
|
|
662 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
663 | |
641 | top_row = max (top_row - count, -saveLines); |
664 | top_row = max (top_row - count, -saveLines); |
642 | |
|
|
643 | // scroll everything up 'count' lines |
|
|
644 | term_start = (term_start + count) % total_rows; |
|
|
645 | |
665 | |
646 | // sever bottommost line |
666 | // sever bottommost line |
647 | { |
667 | { |
648 | line_t &l = ROW(row2 - count); |
668 | line_t &l = ROW(row2); |
649 | l.is_longer (0); |
669 | l.is_longer (0); |
650 | l.touch (); |
670 | l.touch (); |
651 | } |
671 | } |
652 | |
672 | |
|
|
673 | // scroll everything up 'count' lines |
|
|
674 | term_start = (term_start + count) % total_rows; |
|
|
675 | |
|
|
676 | // now copy lines below the scroll region bottom to the |
|
|
677 | // bottom of the screen again, so they look as if they |
|
|
678 | // hadn't moved. |
|
|
679 | for (int i = nrow; --i > row2; ) |
|
|
680 | { |
|
|
681 | line_t &l1 = ROW(i - count); |
|
|
682 | line_t &l2 = ROW(i); |
|
|
683 | |
|
|
684 | ::swap (l1, l2); |
|
|
685 | l2.touch (); |
|
|
686 | } |
|
|
687 | |
653 | // erase newly scrolled-in lines |
688 | // erase newly scrolled-in lines |
654 | for (int i = count; i--; ) |
689 | for (int i = count; i--; ) |
655 | { |
690 | { |
656 | line_t &l = ROW(nrow - 1 - i); |
691 | line_t &l = ROW(row2 - i); |
657 | |
692 | |
658 | // optimize if already cleared, can be significant on slow machines |
693 | // optimise if already cleared, can be significant on slow machines |
659 | // could be rolled into scr_blank_screen_mem |
694 | // could be rolled into scr_blank_screen_mem |
660 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
695 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
661 | { |
696 | { |
662 | scr_blank_line (l, 0, l.l, rstyle); |
697 | scr_blank_line (l, 0, l.l, rstyle); |
663 | l.l = 0; |
698 | l.l = 0; |
… | |
… | |
665 | } |
700 | } |
666 | else |
701 | else |
667 | scr_blank_screen_mem (l, rstyle); |
702 | scr_blank_screen_mem (l, rstyle); |
668 | } |
703 | } |
669 | |
704 | |
670 | // now copy lines below the scroll region bottom to the |
|
|
671 | // bottom of the screen again, so they look as if they |
|
|
672 | // hadn't moved. |
|
|
673 | for (int i = nrow; --i > row2; ) |
|
|
674 | { |
|
|
675 | line_t &l1 = ROW(i - count); |
|
|
676 | line_t &l2 = ROW(i); |
|
|
677 | |
|
|
678 | ::swap (l1, l2); |
|
|
679 | l2.touch (); |
|
|
680 | } |
|
|
681 | |
|
|
682 | // move and/or clear selection, if any |
705 | // move and/or clear selection, if any |
683 | if (selection.op && current_screen == selection.screen) |
706 | if (selection.op && current_screen == selection.screen |
|
|
707 | && selection.beg.row <= row2) |
684 | { |
708 | { |
685 | selection.beg.row -= count; |
709 | selection.beg.row -= count; |
686 | selection.end.row -= count; |
710 | selection.end.row -= count; |
687 | selection.mark.row -= count; |
711 | selection.mark.row -= count; |
688 | |
712 | |
689 | if (selection.beg.row < top_row |
713 | selection_check (0); |
690 | || selection.end.row < top_row |
|
|
691 | || selection.mark.row < top_row) |
|
|
692 | { |
|
|
693 | CLEAR_ALL_SELECTION (); |
|
|
694 | selection.op = SELECTION_CLEAR; |
|
|
695 | } |
|
|
696 | } |
714 | } |
697 | |
715 | |
698 | // finally move the view window, if desired |
716 | // finally move the view window, if desired |
699 | if (option (Opt_scrollWithBuffer) |
717 | if (option (Opt_scrollWithBuffer) |
700 | && view_start != 0 |
718 | && view_start != 0 |
701 | && view_start != -saveLines) |
719 | && view_start != -saveLines) |
702 | scr_page (UP, count); |
720 | scr_page (count); |
703 | |
721 | |
704 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
722 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
705 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
723 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
706 | } |
724 | } |
707 | else |
725 | else |
… | |
… | |
730 | } |
748 | } |
731 | |
749 | |
732 | // use a simple and robust scrolling algorithm, this |
750 | // use a simple and robust scrolling algorithm, this |
733 | // part of scr_scroll_text is not time-critical. |
751 | // part of scr_scroll_text is not time-critical. |
734 | |
752 | |
|
|
753 | // sever line above scroll region |
|
|
754 | if (row1) |
|
|
755 | { |
|
|
756 | line_t &l = ROW(row1 - 1); |
|
|
757 | l.is_longer (0); |
|
|
758 | l.touch (); |
|
|
759 | } |
|
|
760 | |
735 | int rows = row2 - row1 + 1; |
761 | int rows = row2 - row1 + 1; |
736 | |
762 | |
737 | min_it (count, rows); |
763 | min_it (count, rows); |
738 | |
764 | |
739 | line_t *temp_buf = row_buf + total_rows; |
765 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
740 | |
766 | |
741 | for (int row = 0; row < rows; row++) |
767 | for (int row = 0; row < rows; row++) |
742 | { |
768 | { |
743 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
769 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
744 | |
770 | |
… | |
… | |
746 | scr_blank_screen_mem (temp_buf [row], rstyle); |
772 | scr_blank_screen_mem (temp_buf [row], rstyle); |
747 | } |
773 | } |
748 | |
774 | |
749 | for (int row = 0; row < rows; row++) |
775 | for (int row = 0; row < rows; row++) |
750 | ROW(row1 + row) = temp_buf [row]; |
776 | ROW(row1 + row) = temp_buf [row]; |
|
|
777 | |
|
|
778 | // sever bottommost line |
|
|
779 | { |
|
|
780 | line_t &l = ROW(row2); |
|
|
781 | l.is_longer (0); |
|
|
782 | l.touch (); |
|
|
783 | } |
751 | } |
784 | } |
752 | |
785 | |
753 | return count; |
786 | return count; |
754 | } |
787 | } |
755 | |
788 | |
756 | /* ------------------------------------------------------------------------- */ |
789 | /* ------------------------------------------------------------------------- */ |
757 | /* |
790 | /* |
758 | * Add text given in <str> of length <len> to screen struct |
791 | * Add text given in <str> of length <len> to screen struct |
759 | */ |
792 | */ |
760 | void |
793 | void ecb_hot |
761 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
794 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
762 | { |
795 | { |
763 | if (len <= 0) /* sanity */ |
796 | if (len <= 0) /* sanity */ |
764 | return; |
797 | return; |
765 | |
798 | |
766 | unsigned char checksel; |
799 | bool checksel; |
767 | unicode_t c; |
800 | unicode_t c; |
768 | int ncol = this->ncol; |
801 | int ncol = this->ncol; |
769 | const wchar_t *strend = str + len; |
802 | const wchar_t *strend = str + len; |
770 | |
803 | |
771 | want_refresh = 1; |
804 | want_refresh = 1; |
… | |
… | |
797 | |
830 | |
798 | while (str < strend) |
831 | while (str < strend) |
799 | { |
832 | { |
800 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
833 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
801 | |
834 | |
802 | if (expect_false (c < 0x20)) |
835 | if (ecb_unlikely (c < 0x20)) |
803 | if (c == C0_LF) |
836 | if (c == C0_LF) |
804 | { |
837 | { |
805 | max_it (line->l, screen.cur.col); |
838 | max_it (line->l, screen.cur.col); |
806 | |
839 | |
807 | screen.flags &= ~Screen_WrapNext; |
840 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
826 | { |
859 | { |
827 | scr_tab (1, true); |
860 | scr_tab (1, true); |
828 | continue; |
861 | continue; |
829 | } |
862 | } |
830 | |
863 | |
831 | if (expect_false ( |
864 | if (ecb_unlikely ( |
832 | checksel /* see if we're writing within selection */ |
865 | checksel /* see if we're writing within selection */ |
833 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
866 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
834 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
867 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
835 | )) |
868 | )) |
836 | { |
869 | { |
… | |
… | |
841 | * should be a similar check. |
874 | * should be a similar check. |
842 | */ |
875 | */ |
843 | CLEAR_SELECTION (); |
876 | CLEAR_SELECTION (); |
844 | } |
877 | } |
845 | |
878 | |
846 | if (expect_false (screen.flags & Screen_WrapNext)) |
879 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
847 | { |
880 | { |
848 | scr_do_wrap (); |
881 | scr_do_wrap (); |
849 | |
882 | |
850 | line->l = ncol; |
883 | line->l = ncol; |
851 | line->is_longer (1); |
884 | line->is_longer (1); |
… | |
… | |
853 | row = screen.cur.row; |
886 | row = screen.cur.row; |
854 | line = &ROW(row); /* _must_ refresh */ |
887 | line = &ROW(row); /* _must_ refresh */ |
855 | } |
888 | } |
856 | |
889 | |
857 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
890 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
858 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
891 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
859 | c = 0xfffd; |
892 | c = 0xfffd; |
860 | |
893 | |
861 | // rely on wcwidth to tell us the character width, do wcwidth before |
894 | // rely on wcwidth to tell us the character width, do wcwidth before |
862 | // further replacements, as wcwidth might return -1 for the line |
895 | // further replacements, as wcwidth might return -1 for the line |
863 | // drawing characters below as they might be invalid in the current |
896 | // drawing characters below as they might be invalid in the current |
864 | // locale. |
897 | // locale. |
865 | int width = WCWIDTH (c); |
898 | int width = WCWIDTH (c); |
866 | |
899 | |
867 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
900 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
868 | { |
901 | { |
869 | // vt100 special graphics and line drawing |
902 | // vt100 special graphics and line drawing |
870 | // 5f-7e standard vt100 |
903 | // 5f-7e standard vt100 |
871 | // 40-5e rxvt extension for extra curses acs chars |
904 | // 40-5e rxvt extension for extra curses acs chars |
872 | static uint16_t vt100_0[62] = { // 41 .. 7e |
905 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
885 | c = vt100_0[c - 0x41]; |
918 | c = vt100_0[c - 0x41]; |
886 | width = 1; // vt100 line drawing characters are always single-width |
919 | width = 1; // vt100 line drawing characters are always single-width |
887 | } |
920 | } |
888 | } |
921 | } |
889 | |
922 | |
890 | if (expect_false (screen.flags & Screen_Insert)) |
923 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
891 | scr_insdel_chars (width, INSERT); |
924 | scr_insdel_chars (width, INSERT); |
892 | |
925 | |
893 | if (width != 0) |
926 | if (width != 0) |
894 | { |
927 | { |
895 | #if !UNICODE_3 |
928 | #if !UNICODE_3 |
… | |
… | |
903 | #endif |
936 | #endif |
904 | |
937 | |
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
938 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
906 | |
939 | |
907 | // if the character doesn't fit into the remaining columns... |
940 | // if the character doesn't fit into the remaining columns... |
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
941 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
909 | { |
942 | { |
910 | if (screen.flags & Screen_Autowrap) |
943 | if (screen.flags & Screen_Autowrap) |
911 | { |
944 | { |
912 | // ... artificially enlargen the previous one |
945 | // ... artificially enlargen the previous one |
913 | c = NOCHAR; |
946 | c = NOCHAR; |
… | |
… | |
920 | |
953 | |
921 | // nuke the character at this position, if required |
954 | // nuke the character at this position, if required |
922 | // due to wonderful coincidences everywhere else in this loop |
955 | // due to wonderful coincidences everywhere else in this loop |
923 | // we never have to check for overwriting a wide char itself, |
956 | // we never have to check for overwriting a wide char itself, |
924 | // only its tail. |
957 | // only its tail. |
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
958 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
926 | scr_kill_char (*line, screen.cur.col); |
959 | scr_kill_char (*line, screen.cur.col); |
927 | |
960 | |
928 | line->touch (); |
961 | line->touch (); |
929 | |
962 | |
930 | do |
963 | do |
931 | { |
964 | { |
932 | line->t[screen.cur.col] = c; |
965 | line->t[screen.cur.col] = c; |
933 | line->r[screen.cur.col] = rend; |
966 | line->r[screen.cur.col] = rend; |
934 | |
967 | |
935 | if (expect_true (screen.cur.col < ncol - 1)) |
968 | if (ecb_likely (screen.cur.col < ncol - 1)) |
936 | screen.cur.col++; |
969 | screen.cur.col++; |
937 | else |
970 | else |
938 | { |
971 | { |
939 | line->l = ncol; |
972 | line->l = ncol; |
940 | if (screen.flags & Screen_Autowrap) |
973 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
943 | goto end_of_line; |
976 | goto end_of_line; |
944 | } |
977 | } |
945 | |
978 | |
946 | c = NOCHAR; |
979 | c = NOCHAR; |
947 | } |
980 | } |
948 | while (expect_false (--width > 0)); |
981 | while (ecb_unlikely (--width > 0)); |
949 | |
982 | |
950 | // pad with spaces when overwriting wide character with smaller one |
983 | // pad with spaces when overwriting wide character with smaller one |
951 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
984 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
952 | { |
985 | { |
953 | line->t[c] = ' '; |
986 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
987 | line->r[c] = rend; |
955 | } |
988 | } |
956 | |
989 | |
… | |
… | |
1115 | * XTERM_SEQ: ESC 6 |
1148 | * XTERM_SEQ: ESC 6 |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1149 | * Move cursor left in row. If we're at the left boundary, shift everything |
1117 | * in that row right. Clear left column. |
1150 | * in that row right. Clear left column. |
1118 | */ |
1151 | */ |
1119 | #if !ENABLE_MINIMAL |
1152 | #if !ENABLE_MINIMAL |
1120 | void |
1153 | void ecb_cold |
1121 | rxvt_term::scr_backindex () NOTHROW |
1154 | rxvt_term::scr_backindex () NOTHROW |
1122 | { |
1155 | { |
1123 | if (screen.cur.col > 0) |
1156 | if (screen.cur.col > 0) |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1157 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1125 | else |
1158 | else |
… | |
… | |
1132 | * XTERM_SEQ: ESC 9 |
1165 | * XTERM_SEQ: ESC 9 |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1166 | * Move cursor right in row. If we're at the right boundary, shift everything |
1134 | * in that row left. Clear right column. |
1167 | * in that row left. Clear right column. |
1135 | */ |
1168 | */ |
1136 | #if !ENABLE_MINIMAL |
1169 | #if !ENABLE_MINIMAL |
1137 | void |
1170 | void ecb_cold |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1171 | rxvt_term::scr_forwardindex () NOTHROW |
1139 | { |
1172 | { |
1140 | if (screen.cur.col < ncol - 1) |
1173 | if (screen.cur.col < ncol - 1) |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1174 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1142 | else |
1175 | else |
… | |
… | |
1207 | * direction should be UP or DN |
1240 | * direction should be UP or DN |
1208 | */ |
1241 | */ |
1209 | void |
1242 | void |
1210 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1243 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1211 | { |
1244 | { |
1212 | int dirn; |
|
|
1213 | |
|
|
1214 | want_refresh = 1; |
1245 | want_refresh = 1; |
1215 | ZERO_SCROLLBACK (); |
1246 | ZERO_SCROLLBACK (); |
1216 | |
1247 | |
1217 | dirn = ((direction == UP) ? 1 : -1); |
|
|
1218 | |
|
|
1219 | screen.flags &= ~Screen_WrapNext; |
1248 | screen.flags &= ~Screen_WrapNext; |
1220 | |
1249 | |
1221 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1250 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1222 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1251 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1223 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1252 | scr_scroll_text (screen.tscroll, screen.bscroll, direction); |
1224 | else |
1253 | else |
1225 | screen.cur.row += dirn; |
1254 | screen.cur.row += direction; |
1226 | |
1255 | |
1227 | clamp_it (screen.cur.row, 0, nrow - 1); |
1256 | clamp_it (screen.cur.row, 0, nrow - 1); |
1228 | selection_check (0); |
1257 | selection_check (0); |
1229 | } |
1258 | } |
1230 | |
1259 | |
… | |
… | |
1293 | scr_blank_line (line, col, num, rstyle); |
1322 | scr_blank_line (line, col, num, rstyle); |
1294 | } |
1323 | } |
1295 | |
1324 | |
1296 | /* ------------------------------------------------------------------------- */ |
1325 | /* ------------------------------------------------------------------------- */ |
1297 | /* |
1326 | /* |
1298 | * Erase part of whole of the screen |
1327 | * Erase part or whole of the screen |
1299 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1328 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1300 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1329 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1301 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1330 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1302 | */ |
1331 | */ |
1303 | void |
1332 | void |
… | |
… | |
1312 | ZERO_SCROLLBACK (); |
1341 | ZERO_SCROLLBACK (); |
1313 | |
1342 | |
1314 | switch (mode) |
1343 | switch (mode) |
1315 | { |
1344 | { |
1316 | case 0: /* erase to end of screen */ |
1345 | case 0: /* erase to end of screen */ |
1317 | selection_check (1); |
|
|
1318 | scr_erase_line (0); |
1346 | scr_erase_line (0); |
1319 | row = screen.cur.row + 1; /* possible OOB */ |
1347 | row = screen.cur.row + 1; /* possible OOB */ |
1320 | num = nrow - row; |
1348 | num = nrow - row; |
1321 | break; |
1349 | break; |
1322 | case 1: /* erase to beginning of screen */ |
1350 | case 1: /* erase to beginning of screen */ |
1323 | selection_check (3); |
|
|
1324 | scr_erase_line (1); |
1351 | scr_erase_line (1); |
1325 | row = 0; |
1352 | row = 0; |
1326 | num = screen.cur.row; |
1353 | num = screen.cur.row; |
1327 | break; |
1354 | break; |
1328 | case 2: /* erase whole screen */ |
1355 | case 2: /* erase whole screen */ |
1329 | selection_check (3); |
|
|
1330 | row = 0; |
1356 | row = 0; |
1331 | num = nrow; |
1357 | num = nrow; |
1332 | break; |
1358 | break; |
1333 | default: |
1359 | default: |
1334 | return; |
1360 | return; |
… | |
… | |
1351 | { |
1377 | { |
1352 | ren = DEFAULT_RSTYLE; |
1378 | ren = DEFAULT_RSTYLE; |
1353 | |
1379 | |
1354 | if (mapped) |
1380 | if (mapped) |
1355 | XClearArea (dpy, vt, 0, |
1381 | XClearArea (dpy, vt, 0, |
1356 | Row2Pixel (row - view_start), (unsigned int)width, |
1382 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1357 | (unsigned int)Height2Pixel (num), False); |
1383 | (unsigned int)Height2Pixel (num), False); |
1358 | } |
1384 | } |
1359 | else |
1385 | else |
1360 | { |
1386 | { |
1361 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1387 | ren = rstyle & (RS_fgMask | RS_bgMask); |
… | |
… | |
1364 | { |
1390 | { |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1391 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1392 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XFillRectangle (dpy, vt, gc, |
1393 | XFillRectangle (dpy, vt, gc, |
1368 | 0, Row2Pixel (row - view_start), |
1394 | 0, Row2Pixel (row - view_start), |
1369 | (unsigned int)width, |
1395 | (unsigned int)vt_width, |
1370 | (unsigned int)Height2Pixel (num)); |
1396 | (unsigned int)Height2Pixel (num)); |
1371 | gcvalue.foreground = pix_colors[Color_fg]; |
1397 | gcvalue.foreground = pix_colors[Color_fg]; |
1372 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1398 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1373 | } |
1399 | } |
1374 | } |
1400 | } |
… | |
… | |
1396 | /* ------------------------------------------------------------------------- */ |
1422 | /* ------------------------------------------------------------------------- */ |
1397 | /* |
1423 | /* |
1398 | * Fill the screen with `E's |
1424 | * Fill the screen with `E's |
1399 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1425 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1400 | */ |
1426 | */ |
1401 | void |
1427 | void ecb_cold |
1402 | rxvt_term::scr_E () NOTHROW |
1428 | rxvt_term::scr_E () NOTHROW |
1403 | { |
1429 | { |
1404 | rend_t fs; |
1430 | rend_t fs; |
1405 | |
1431 | |
1406 | want_refresh = 1; |
1432 | want_refresh = 1; |
1407 | ZERO_SCROLLBACK (); |
1433 | ZERO_SCROLLBACK (); |
1408 | |
1434 | |
1409 | num_scr_allow = 0; |
1435 | num_scr_allow = 0; |
1410 | selection_check (3); |
1436 | |
|
|
1437 | row_col_t pos; |
|
|
1438 | pos.row = pos.col = 0; |
|
|
1439 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1440 | CLEAR_SELECTION (); |
1411 | |
1441 | |
1412 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1442 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1413 | for (int row = nrow; row--; ) |
1443 | for (int row = nrow; row--; ) |
1414 | { |
1444 | { |
1415 | line_t &line = ROW(row); |
1445 | line_t &line = ROW(row); |
… | |
… | |
1566 | /* ------------------------------------------------------------------------- */ |
1596 | /* ------------------------------------------------------------------------- */ |
1567 | /* |
1597 | /* |
1568 | * Set the scrolling region |
1598 | * Set the scrolling region |
1569 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1599 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1570 | */ |
1600 | */ |
1571 | void |
1601 | void ecb_cold |
1572 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1602 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1573 | { |
1603 | { |
1574 | max_it (top, 0); |
1604 | max_it (top, 0); |
1575 | min_it (bot, nrow - 1); |
1605 | min_it (bot, nrow - 1); |
1576 | |
1606 | |
… | |
… | |
1586 | /* |
1616 | /* |
1587 | * Make the cursor visible/invisible |
1617 | * Make the cursor visible/invisible |
1588 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1618 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1589 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1619 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1590 | */ |
1620 | */ |
1591 | void |
1621 | void ecb_cold |
1592 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1622 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1593 | { |
1623 | { |
1594 | want_refresh = 1; |
1624 | want_refresh = 1; |
1595 | |
1625 | |
1596 | if (mode) |
1626 | if (mode) |
… | |
… | |
1603 | /* |
1633 | /* |
1604 | * Set/unset automatic wrapping |
1634 | * Set/unset automatic wrapping |
1605 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1635 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1606 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1636 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1607 | */ |
1637 | */ |
1608 | void |
1638 | void ecb_cold |
1609 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1639 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1610 | { |
1640 | { |
1611 | if (mode) |
1641 | if (mode) |
1612 | screen.flags |= Screen_Autowrap; |
1642 | screen.flags |= Screen_Autowrap; |
1613 | else |
1643 | else |
… | |
… | |
1622 | * Relative mode: line numbers are relative to top margin of scrolling region |
1652 | * Relative mode: line numbers are relative to top margin of scrolling region |
1623 | * and the cursor cannot be moved outside. |
1653 | * and the cursor cannot be moved outside. |
1624 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1654 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1625 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1655 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1626 | */ |
1656 | */ |
1627 | void |
1657 | void ecb_cold |
1628 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1658 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1629 | { |
1659 | { |
1630 | if (mode) |
1660 | if (mode) |
1631 | screen.flags |= Screen_Relative; |
1661 | screen.flags |= Screen_Relative; |
1632 | else |
1662 | else |
… | |
… | |
1639 | /* |
1669 | /* |
1640 | * Set insert/replace mode |
1670 | * Set insert/replace mode |
1641 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1671 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1642 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1672 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1643 | */ |
1673 | */ |
1644 | void |
1674 | void ecb_cold |
1645 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1675 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1646 | { |
1676 | { |
1647 | if (mode) |
1677 | if (mode) |
1648 | screen.flags |= Screen_Insert; |
1678 | screen.flags |= Screen_Insert; |
1649 | else |
1679 | else |
… | |
… | |
1655 | * Set/Unset tabs |
1685 | * Set/Unset tabs |
1656 | * XTERM_SEQ: Set tab at current column : ESC H |
1686 | * XTERM_SEQ: Set tab at current column : ESC H |
1657 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1687 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1658 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1688 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1659 | */ |
1689 | */ |
1660 | void |
1690 | void ecb_cold |
1661 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1691 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1662 | { |
1692 | { |
1663 | if (mode < 0) |
1693 | if (mode < 0) |
1664 | memset (tabs, 0, ncol); |
1694 | memset (tabs, 0, ncol); |
1665 | else if (screen.cur.col < ncol) |
1695 | else if (screen.cur.col < ncol) |
… | |
… | |
1684 | if (rvideo_state != on) |
1714 | if (rvideo_state != on) |
1685 | { |
1715 | { |
1686 | rvideo_state = on; |
1716 | rvideo_state = on; |
1687 | |
1717 | |
1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1718 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1689 | #ifdef HAVE_BG_PIXMAP |
1719 | #ifdef HAVE_IMG |
1690 | if (bgPixmap.pixmap == None) |
1720 | if (bg_img == 0) |
1691 | #endif |
1721 | #endif |
1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1722 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1693 | |
1723 | |
1694 | XGCValues gcvalue; |
1724 | XGCValues gcvalue; |
1695 | gcvalue.foreground = pix_colors[Color_fg]; |
1725 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1704 | /* ------------------------------------------------------------------------- */ |
1734 | /* ------------------------------------------------------------------------- */ |
1705 | /* |
1735 | /* |
1706 | * Report current cursor position |
1736 | * Report current cursor position |
1707 | * XTERM_SEQ: Report position: ESC [ 6 n |
1737 | * XTERM_SEQ: Report position: ESC [ 6 n |
1708 | */ |
1738 | */ |
1709 | void |
1739 | void ecb_cold |
1710 | rxvt_term::scr_report_position () NOTHROW |
1740 | rxvt_term::scr_report_position () NOTHROW |
1711 | { |
1741 | { |
1712 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1742 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1713 | } |
1743 | } |
1714 | |
1744 | |
… | |
… | |
1717 | * ------------------------------------------------------------------------- */ |
1747 | * ------------------------------------------------------------------------- */ |
1718 | |
1748 | |
1719 | /* |
1749 | /* |
1720 | * Set font style |
1750 | * Set font style |
1721 | */ |
1751 | */ |
1722 | void |
1752 | void ecb_cold |
1723 | rxvt_term::set_font_style () NOTHROW |
1753 | rxvt_term::set_font_style () NOTHROW |
1724 | { |
1754 | { |
1725 | #if 0 |
1755 | #if 0 |
1726 | switch (charsets [screen.charset]) |
1756 | switch (charsets [screen.charset]) |
1727 | { |
1757 | { |
… | |
… | |
1749 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1779 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1750 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1780 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1751 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1781 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1752 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1782 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1753 | */ |
1783 | */ |
1754 | void |
1784 | void ecb_cold |
1755 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1785 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1756 | { |
1786 | { |
1757 | screen.charset = set; |
1787 | screen.charset = set; |
1758 | set_font_style (); |
1788 | set_font_style (); |
1759 | } |
1789 | } |
… | |
… | |
1780 | * ------------------------------------------------------------------------- */ |
1810 | * ------------------------------------------------------------------------- */ |
1781 | |
1811 | |
1782 | /* |
1812 | /* |
1783 | * refresh matching text. |
1813 | * refresh matching text. |
1784 | */ |
1814 | */ |
1785 | bool |
1815 | bool ecb_cold |
1786 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1816 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1787 | { |
1817 | { |
1788 | bool found = false; |
1818 | bool found = false; |
1789 | |
1819 | |
1790 | for (int i = 0; i < nrow; i++) |
1820 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1809 | PART_BEG = 0, |
1839 | PART_BEG = 0, |
1810 | PART_END, |
1840 | PART_END, |
1811 | RC_COUNT |
1841 | RC_COUNT |
1812 | }; |
1842 | }; |
1813 | |
1843 | |
1814 | void |
1844 | void ecb_hot |
1815 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1845 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1816 | { |
1846 | { |
1817 | int i; |
1847 | int i; |
1818 | row_col_t rc[RC_COUNT]; |
1848 | row_col_t rc[RC_COUNT]; |
1819 | |
1849 | |
… | |
… | |
1856 | * Refresh the entire screen |
1886 | * Refresh the entire screen |
1857 | */ |
1887 | */ |
1858 | void |
1888 | void |
1859 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1889 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1860 | { |
1890 | { |
1861 | scr_expose (0, 0, width, height, refresh); |
1891 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1862 | } |
1892 | } |
1863 | |
1893 | |
1864 | /* ------------------------------------------------------------------------- */ |
1894 | /* ------------------------------------------------------------------------- */ |
1865 | /* |
1895 | /* |
1866 | * Move the display so that the line represented by scrollbar value Y is at |
1896 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1876 | /* |
1906 | /* |
1877 | * Page the screen up/down nlines |
1907 | * Page the screen up/down nlines |
1878 | * direction should be UP or DN |
1908 | * direction should be UP or DN |
1879 | */ |
1909 | */ |
1880 | bool |
1910 | bool |
1881 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1911 | rxvt_term::scr_page (int nlines) NOTHROW |
1882 | { |
1912 | { |
1883 | int new_view_start = |
|
|
1884 | direction == UP ? view_start - nlines |
|
|
1885 | : view_start + nlines; |
|
|
1886 | |
|
|
1887 | return scr_changeview (new_view_start); |
1913 | return scr_changeview (view_start - nlines); |
1888 | } |
1914 | } |
1889 | |
1915 | |
1890 | bool |
1916 | bool |
1891 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1917 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1892 | { |
1918 | { |
… | |
… | |
1922 | |
1948 | |
1923 | # ifndef NO_MAPALERT |
1949 | # ifndef NO_MAPALERT |
1924 | # ifdef MAPALERT_OPTION |
1950 | # ifdef MAPALERT_OPTION |
1925 | if (option (Opt_mapAlert)) |
1951 | if (option (Opt_mapAlert)) |
1926 | # endif |
1952 | # endif |
1927 | XMapWindow (dpy, parent[0]); |
1953 | XMapWindow (dpy, parent); |
1928 | # endif |
1954 | # endif |
1929 | |
1955 | |
1930 | # if ENABLE_FRILLS |
1956 | # if ENABLE_FRILLS |
1931 | if (option (Opt_urgentOnBell)) |
1957 | if (option (Opt_urgentOnBell)) |
1932 | set_urgency (1); |
1958 | set_urgency (1); |
… | |
… | |
1945 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1971 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1946 | #endif |
1972 | #endif |
1947 | } |
1973 | } |
1948 | |
1974 | |
1949 | /* ------------------------------------------------------------------------- */ |
1975 | /* ------------------------------------------------------------------------- */ |
1950 | /* ARGSUSED */ |
1976 | void ecb_cold |
1951 | void |
|
|
1952 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1977 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1953 | { |
1978 | { |
1954 | #ifdef PRINTPIPE |
1979 | #ifdef PRINTPIPE |
1955 | int nrows, row_start; |
1980 | int nrows, row_start; |
1956 | FILE *fd = popen_printer (); |
1981 | FILE *fd = popen_printer (); |
… | |
… | |
2005 | /* |
2030 | /* |
2006 | * Refresh the screen |
2031 | * Refresh the screen |
2007 | * drawn_text/drawn_rend contain the screen information before the update. |
2032 | * drawn_text/drawn_rend contain the screen information before the update. |
2008 | * screen.text/screen.rend contain what the screen will change to. |
2033 | * screen.text/screen.rend contain what the screen will change to. |
2009 | */ |
2034 | */ |
2010 | void |
2035 | void ecb_hot |
2011 | rxvt_term::scr_refresh () NOTHROW |
2036 | rxvt_term::scr_refresh () NOTHROW |
2012 | { |
2037 | { |
2013 | int16_t col, row, /* column/row we're processing */ |
2038 | int16_t col, row, /* column/row we're processing */ |
2014 | ocrow; /* old cursor row */ |
2039 | ocrow; /* old cursor row */ |
2015 | int i; /* tmp */ |
2040 | int i; /* tmp */ |
2016 | #ifndef NO_CURSORCOLOR |
|
|
2017 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2018 | #endif |
|
|
2019 | rend_t *crp; // cursor rendition pointer |
|
|
2020 | rend_t ccol1, /* Cursor colour */ |
2041 | rend_t ccol1, /* Cursor colour */ |
2021 | ccol2; /* Cursor colour2 */ |
2042 | ccol2; /* Cursor colour2 */ |
|
|
2043 | rend_t cur_rend; |
|
|
2044 | int cur_col; |
|
|
2045 | int cursorwidth; |
2022 | |
2046 | |
2023 | want_refresh = 0; /* screen is current */ |
2047 | want_refresh = 0; /* screen is current */ |
2024 | |
2048 | |
2025 | if (refresh_type == NO_REFRESH || !mapped) |
2049 | if (refresh_type == NO_REFRESH || !mapped) |
2026 | return; |
2050 | return; |
… | |
… | |
2029 | * A: set up vars |
2053 | * A: set up vars |
2030 | */ |
2054 | */ |
2031 | refresh_count = 0; |
2055 | refresh_count = 0; |
2032 | |
2056 | |
2033 | unsigned int old_screen_flags = screen.flags; |
2057 | unsigned int old_screen_flags = screen.flags; |
2034 | char have_bg = 0; |
2058 | bool have_bg = 0; |
2035 | #ifdef HAVE_BG_PIXMAP |
2059 | #ifdef HAVE_IMG |
2036 | have_bg = bgPixmap.pixmap != None; |
2060 | have_bg = bg_img != 0; |
2037 | #endif |
2061 | #endif |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2062 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2039 | |
2063 | |
2040 | /* |
2064 | /* |
2041 | * B: reverse any characters which are selected |
2065 | * B: reverse any characters which are selected |
… | |
… | |
2045 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2069 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2046 | #if ENABLE_OVERLAY |
2070 | #if ENABLE_OVERLAY |
2047 | scr_swap_overlay (); |
2071 | scr_swap_overlay (); |
2048 | #endif |
2072 | #endif |
2049 | |
2073 | |
2050 | char showcursor = screen.flags & Screen_VisibleCursor; |
2074 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2051 | |
2075 | |
2052 | /* |
2076 | /* |
2053 | * C: set the cursor character (s) |
2077 | * C: set the cursor character (s) |
2054 | */ |
2078 | */ |
2055 | { |
2079 | { |
2056 | unsigned char setoldcursor; |
|
|
2057 | |
|
|
2058 | #ifdef CURSOR_BLINK |
2080 | #ifdef CURSOR_BLINK |
2059 | if (hidden_cursor) |
2081 | if (hidden_cursor) |
2060 | showcursor = 0; |
2082 | showcursor = 0; |
2061 | #endif |
2083 | #endif |
2062 | |
2084 | |
… | |
… | |
2065 | int col = screen.cur.col; |
2087 | int col = screen.cur.col; |
2066 | |
2088 | |
2067 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2089 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2068 | col--; |
2090 | col--; |
2069 | |
2091 | |
|
|
2092 | cursorwidth = 1; |
|
|
2093 | while (col + cursorwidth < ncol |
|
|
2094 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2095 | cursorwidth++; |
|
|
2096 | |
2070 | crp = &ROW(screen.cur.row).r[col]; |
2097 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2098 | cur_col = col; |
2071 | |
2099 | |
2072 | #ifndef NO_CURSORCOLOR |
2100 | #ifndef NO_CURSORCOLOR |
2073 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2074 | if (ISSET_PIXCOLOR (Color_cursor)) |
2101 | if (ISSET_PIXCOLOR (Color_cursor)) |
2075 | ccol1 = Color_cursor; |
2102 | ccol1 = Color_cursor; |
2076 | else |
2103 | else |
2077 | #endif |
2104 | #endif |
2078 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2105 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2092 | ccol2 = Color_bg; |
2119 | ccol2 = Color_bg; |
2093 | #endif |
2120 | #endif |
2094 | |
2121 | |
2095 | if (focus) |
2122 | if (focus) |
2096 | { |
2123 | { |
|
|
2124 | rend_t rend = cur_rend; |
|
|
2125 | |
2097 | if (option (Opt_cursorUnderline)) |
2126 | if (option (Opt_cursorUnderline)) |
2098 | *crp ^= RS_Uline; |
2127 | rend ^= RS_Uline; |
2099 | else |
2128 | else |
2100 | { |
2129 | { |
2101 | *crp ^= RS_RVid; |
2130 | rend ^= RS_RVid; |
2102 | *crp = SET_FGCOLOR (*crp, ccol1); |
2131 | rend = SET_FGCOLOR (rend, ccol1); |
2103 | *crp = SET_BGCOLOR (*crp, ccol2); |
2132 | rend = SET_BGCOLOR (rend, ccol2); |
2104 | } |
2133 | } |
|
|
2134 | |
|
|
2135 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2105 | } |
2136 | } |
2106 | } |
2137 | } |
2107 | |
2138 | |
2108 | /* make sure no outline cursor is left around */ |
2139 | /* make sure no outline cursor is left around */ |
2109 | setoldcursor = 0; |
|
|
2110 | if (ocrow != -1) |
2140 | if (ocrow != -1) |
2111 | { |
2141 | { |
2112 | if (screen.cur.row - view_start != ocrow |
2142 | if (screen.cur.row - view_start != ocrow |
2113 | || screen.cur.col != oldcursor.col) |
2143 | || screen.cur.col != oldcursor.col) |
2114 | { |
2144 | { |
2115 | if (ocrow < nrow |
2145 | if (ocrow < nrow |
2116 | && oldcursor.col < ncol) |
2146 | && oldcursor.col < ncol) |
2117 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2147 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2118 | |
|
|
2119 | if (focus || !showcursor) |
|
|
2120 | oldcursor.row = -1; |
|
|
2121 | else |
|
|
2122 | setoldcursor = 1; |
|
|
2123 | } |
2148 | } |
2124 | } |
2149 | } |
2125 | else if (!focus) |
|
|
2126 | setoldcursor = 1; |
|
|
2127 | |
2150 | |
2128 | if (setoldcursor) |
2151 | // save the current cursor coordinates if the cursor is visible |
|
|
2152 | // and the window is unfocused, so as to clear the outline cursor |
|
|
2153 | // in the next refresh if the cursor moves |
|
|
2154 | if (showcursor && !focus && screen.cur.row - view_start < nrow) |
2129 | { |
2155 | { |
2130 | if (screen.cur.row - view_start >= nrow) |
|
|
2131 | oldcursor.row = -1; |
|
|
2132 | else |
|
|
2133 | { |
|
|
2134 | oldcursor.row = screen.cur.row - view_start; |
2156 | oldcursor.row = screen.cur.row - view_start; |
2135 | oldcursor.col = screen.cur.col; |
2157 | oldcursor.col = screen.cur.col; |
2136 | } |
|
|
2137 | } |
2158 | } |
|
|
2159 | else |
|
|
2160 | oldcursor.row = -1; |
2138 | } |
2161 | } |
2139 | |
2162 | |
2140 | #ifndef NO_SLOW_LINK_SUPPORT |
2163 | #ifndef NO_SLOW_LINK_SUPPORT |
2141 | /* |
2164 | /* |
2142 | * D: CopyArea pass - very useful for slower links |
2165 | * D: CopyArea pass - very useful for slower links |
… | |
… | |
2148 | { |
2171 | { |
2149 | int16_t nits; |
2172 | int16_t nits; |
2150 | int i = num_scr; |
2173 | int i = num_scr; |
2151 | int j; |
2174 | int j; |
2152 | int len, wlen; |
2175 | int len, wlen; |
2153 | dLocal (int, num_scr); |
|
|
2154 | |
2176 | |
2155 | j = nrow; |
2177 | j = nrow; |
2156 | wlen = len = -1; |
2178 | wlen = len = -1; |
2157 | row = i > 0 ? 0 : j - 1; |
2179 | row = i > 0 ? 0 : j - 1; |
2158 | |
2180 | |
… | |
… | |
2233 | continue; |
2255 | continue; |
2234 | |
2256 | |
2235 | // redraw one or more characters |
2257 | // redraw one or more characters |
2236 | |
2258 | |
2237 | // seek to the beginning of wide characters |
2259 | // seek to the beginning of wide characters |
2238 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2260 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2239 | --col; |
2261 | --col; |
2240 | |
2262 | |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2263 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2242 | text_t *text = stp + col; |
2264 | text_t *text = stp + col; |
2243 | int count = 1; |
2265 | int count = 1; |
… | |
… | |
2281 | |
2303 | |
2282 | col--; /* went one too far. move back */ |
2304 | col--; /* went one too far. move back */ |
2283 | count -= i; /* dump any matching trailing chars */ |
2305 | count -= i; /* dump any matching trailing chars */ |
2284 | |
2306 | |
2285 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2307 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2286 | while (expect_false (i && text[count] == NOCHAR)) |
2308 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2287 | count++, i--; |
2309 | count++, i--; |
2288 | |
2310 | |
2289 | /* |
2311 | /* |
2290 | * Determine the attributes for the string |
2312 | * Determine the attributes for the string |
2291 | */ |
2313 | */ |
2292 | int fore = fgcolor_of (rend); // desired foreground |
2314 | int fore = fgcolor_of (rend); // desired foreground |
2293 | int back = bgcolor_of (rend); // desired background |
2315 | int back = bgcolor_of (rend); // desired background |
2294 | |
2316 | |
2295 | // only do special processing if any attributes are set, which is unlikely |
2317 | // only do special processing if any attributes are set, which is unlikely |
2296 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2318 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2297 | { |
2319 | { |
2298 | bool invert = rend & RS_RVid; |
2320 | bool invert = rend & RS_RVid; |
2299 | |
2321 | |
2300 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2322 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | if (rend & RS_Bold && fore == Color_fg) |
2323 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2390 | /* |
2412 | /* |
2391 | * Actually do the drawing of the string here |
2413 | * Actually do the drawing of the string here |
2392 | */ |
2414 | */ |
2393 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2415 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2394 | |
2416 | |
2395 | if (expect_true (have_bg && back == Color_bg)) |
2417 | if (ecb_likely (have_bg && back == Color_bg)) |
2396 | { |
2418 | { |
2397 | // this is very ugly, maybe push it into ->draw? |
2419 | // this is very ugly, maybe push it into ->draw? |
2398 | |
2420 | |
2399 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2421 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2400 | if (text[i] != ' ') |
2422 | if (text[i] != ' ') |
… | |
… | |
2407 | did_clear: ; |
2429 | did_clear: ; |
2408 | } |
2430 | } |
2409 | else |
2431 | else |
2410 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2432 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2411 | |
2433 | |
2412 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2434 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2413 | { |
2435 | { |
|
|
2436 | if (showcursor && focus && row == screen.cur.row |
|
|
2437 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2438 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2439 | else |
2414 | #if ENABLE_FRILLS |
2440 | #if ENABLE_FRILLS |
2415 | if (ISSET_PIXCOLOR (Color_underline)) |
2441 | if (ISSET_PIXCOLOR (Color_underline)) |
2416 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2442 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2417 | else |
2443 | else |
2418 | #endif |
2444 | #endif |
… | |
… | |
2429 | * G: cleanup cursor and display outline cursor if necessary |
2455 | * G: cleanup cursor and display outline cursor if necessary |
2430 | */ |
2456 | */ |
2431 | if (showcursor) |
2457 | if (showcursor) |
2432 | { |
2458 | { |
2433 | if (focus) |
2459 | if (focus) |
2434 | { |
2460 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2435 | if (option (Opt_cursorUnderline)) |
|
|
2436 | *crp ^= RS_Uline; |
|
|
2437 | else |
|
|
2438 | { |
|
|
2439 | *crp ^= RS_RVid; |
|
|
2440 | #ifndef NO_CURSORCOLOR |
|
|
2441 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
|
|
2442 | #endif |
|
|
2443 | } |
|
|
2444 | } |
|
|
2445 | else if (oldcursor.row >= 0) |
2461 | else if (oldcursor.row >= 0) |
2446 | { |
2462 | { |
2447 | int cursorwidth = 1; |
|
|
2448 | int col = oldcursor.col; |
|
|
2449 | |
|
|
2450 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2451 | col--; |
|
|
2452 | |
|
|
2453 | while (col + cursorwidth < ncol |
|
|
2454 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2455 | cursorwidth++; |
|
|
2456 | |
|
|
2457 | #ifndef NO_CURSORCOLOR |
|
|
2458 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2459 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2460 | else |
|
|
2461 | #endif |
|
|
2462 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2463 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2463 | |
2464 | |
2464 | XDrawRectangle (dpy, vt, gc, |
2465 | XDrawRectangle (dpy, vt, gc, |
2465 | Col2Pixel (col), |
2466 | Col2Pixel (cur_col), |
2466 | Row2Pixel (oldcursor.row), |
2467 | Row2Pixel (oldcursor.row), |
2467 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2468 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2468 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2469 | (unsigned int) (Height2Pixel (1) - 1)); |
2469 | } |
2470 | } |
2470 | } |
2471 | } |
2471 | |
2472 | |
2472 | /* |
2473 | /* |
2473 | * H: cleanup selection |
2474 | * H: cleanup selection |
… | |
… | |
2482 | screen.flags = old_screen_flags; |
2483 | screen.flags = old_screen_flags; |
2483 | num_scr = 0; |
2484 | num_scr = 0; |
2484 | num_scr_allow = 1; |
2485 | num_scr_allow = 1; |
2485 | } |
2486 | } |
2486 | |
2487 | |
2487 | void |
2488 | void ecb_cold |
2488 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2489 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2489 | { |
2490 | { |
2490 | if (!l.t) |
2491 | if (!l.valid ()) |
2491 | return; |
2492 | return; |
2492 | |
2493 | |
2493 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2494 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2494 | |
2495 | |
2495 | for (int i = ncol; i--; ) |
2496 | for (int i = ncol; i--; ) |
2496 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2497 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2497 | } |
2498 | } |
2498 | |
2499 | |
2499 | void |
2500 | void ecb_cold |
2500 | rxvt_term::scr_remap_chars () NOTHROW |
2501 | rxvt_term::scr_remap_chars () NOTHROW |
2501 | { |
2502 | { |
2502 | for (int i = total_rows; i--; ) |
2503 | for (int i = total_rows; i--; ) |
2503 | scr_remap_chars (row_buf [i]); |
2504 | scr_remap_chars (row_buf [i]); |
2504 | |
2505 | |
… | |
… | |
2507 | scr_remap_chars (drawn_buf [i]); |
2508 | scr_remap_chars (drawn_buf [i]); |
2508 | scr_remap_chars (swap_buf [i]); |
2509 | scr_remap_chars (swap_buf [i]); |
2509 | } |
2510 | } |
2510 | } |
2511 | } |
2511 | |
2512 | |
2512 | void |
2513 | void ecb_cold |
2513 | rxvt_term::scr_recolour () NOTHROW |
2514 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2514 | { |
2515 | { |
2515 | #ifdef HAVE_BG_PIXMAP |
2516 | bool transparent = false; |
2516 | bgPixmap.apply (); |
|
|
2517 | #else |
|
|
2518 | |
2517 | |
|
|
2518 | #ifdef HAVE_IMG |
|
|
2519 | if (bg_img != 0) |
|
|
2520 | { |
|
|
2521 | # if ENABLE_TRANSPARENCY |
|
|
2522 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2523 | { |
|
|
2524 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
|
|
2525 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
|
|
2526 | |
|
|
2527 | transparent = true; |
|
|
2528 | } |
|
|
2529 | else |
|
|
2530 | # endif |
|
|
2531 | { |
|
|
2532 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2533 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
|
|
2534 | } |
|
|
2535 | } |
|
|
2536 | else |
|
|
2537 | #endif |
|
|
2538 | { |
2519 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2539 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2520 | XClearWindow (dpy, parent[0]); |
|
|
2521 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2540 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2541 | } |
|
|
2542 | |
|
|
2543 | XClearWindow (dpy, parent); |
2522 | |
2544 | |
2523 | if (scrollBar.win) |
2545 | if (scrollBar.win) |
2524 | { |
2546 | { |
|
|
2547 | if (transparent) |
|
|
2548 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2549 | else |
2525 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2550 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2526 | scrollBar.state = STATE_IDLE; |
2551 | scrollBar.state = SB_STATE_IDLE; |
2527 | scrollBar.show (0); |
2552 | scrollBar.show (0); |
2528 | } |
2553 | } |
2529 | |
2554 | |
2530 | #endif |
2555 | if (refresh) |
2531 | |
2556 | { |
2532 | /* bgPixmap.apply () does not do the following : */ |
|
|
2533 | scr_clear (); |
2557 | scr_clear (); |
2534 | scr_touch (true); |
2558 | scr_touch (true); |
|
|
2559 | } |
2535 | want_refresh = 1; |
2560 | want_refresh = 1; |
2536 | } |
2561 | } |
2537 | |
2562 | |
2538 | /* ------------------------------------------------------------------------- */ |
2563 | /* ------------------------------------------------------------------------- */ |
2539 | void |
2564 | void |
… | |
… | |
2596 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2621 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2597 | srp[col] ^= rstyle; |
2622 | srp[col] ^= rstyle; |
2598 | } |
2623 | } |
2599 | |
2624 | |
2600 | /* ------------------------------------------------------------------------- */ |
2625 | /* ------------------------------------------------------------------------- */ |
2601 | void |
2626 | void ecb_hot |
2602 | rxvt_term::scr_reverse_selection () NOTHROW |
2627 | rxvt_term::scr_reverse_selection () NOTHROW |
2603 | { |
2628 | { |
2604 | if (selection.op |
2629 | if (selection.op |
2605 | && current_screen == selection.screen |
2630 | && current_screen == selection.screen |
2606 | && selection.end.row >= view_start) |
2631 | && selection.end.row >= view_start) |
… | |
… | |
2625 | */ |
2650 | */ |
2626 | #if 0 |
2651 | #if 0 |
2627 | void |
2652 | void |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
2653 | rxvt_term::scr_dump (int fd) NOTHROW |
2629 | { |
2654 | { |
2630 | int row, wrote; |
2655 | // if this method is needed, it can be implemented by factoring the |
2631 | unsigned int width, towrite; |
2656 | // relevant code in scr_printscreen |
2632 | char r1[] = "\n"; |
|
|
2633 | |
|
|
2634 | for (row = saveLines + top_row; |
|
|
2635 | row < saveLines + nrow - 1; row++) |
|
|
2636 | { |
|
|
2637 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2638 | : ncol; |
|
|
2639 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2640 | { |
|
|
2641 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2642 | towrite); |
|
|
2643 | if (wrote < 0) |
|
|
2644 | return; /* XXX: death, no report */ |
|
|
2645 | } |
|
|
2646 | if (row_buf[row].l >= 0) |
|
|
2647 | if (write (fd, r1, 1) <= 0) |
|
|
2648 | return; /* XXX: death, no report */ |
|
|
2649 | } |
|
|
2650 | } |
2657 | } |
2651 | #endif |
2658 | #endif |
2652 | |
2659 | |
2653 | /* ------------------------------------------------------------------------- * |
2660 | /* ------------------------------------------------------------------------- * |
2654 | * CHARACTER SELECTION * |
2661 | * CHARACTER SELECTION * |
2655 | * ------------------------------------------------------------------------- */ |
2662 | * ------------------------------------------------------------------------- */ |
2656 | void |
2663 | void |
2657 | rxvt_term::selection_check (int check_more) NOTHROW |
2664 | rxvt_term::selection_check (int check_more) NOTHROW |
2658 | { |
2665 | { |
2659 | row_col_t pos; |
|
|
2660 | |
|
|
2661 | if (!selection.op) |
2666 | if (!selection.op) |
2662 | return; |
2667 | return; |
2663 | |
2668 | |
2664 | pos.row = pos.col = 0; |
|
|
2665 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2669 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2666 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2670 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2667 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2671 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2668 | || (check_more == 1 |
2672 | || (check_more == 1 |
2669 | && current_screen == selection.screen |
2673 | && current_screen == selection.screen |
2670 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2674 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2671 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2675 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2672 | || (check_more == 2 |
|
|
2673 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2674 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2675 | || (check_more == 3 |
|
|
2676 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2677 | || (check_more == 4 /* screen width change */ |
|
|
2678 | && (selection.beg.row != selection.end.row |
|
|
2679 | || selection.end.col > ncol))) |
|
|
2680 | CLEAR_SELECTION (); |
2676 | CLEAR_ALL_SELECTION (); |
|
|
2677 | } |
|
|
2678 | |
|
|
2679 | void |
|
|
2680 | rxvt_term::selection_changed () NOTHROW |
|
|
2681 | { |
|
|
2682 | line_t &r1 = ROW (selection.beg.row); |
|
|
2683 | while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR) |
|
|
2684 | ++selection.beg.col; |
|
|
2685 | |
|
|
2686 | line_t &r2 = ROW (selection.end.row); |
|
|
2687 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2688 | ++selection.end.col; |
|
|
2689 | |
|
|
2690 | want_refresh = 1; |
2681 | } |
2691 | } |
2682 | |
2692 | |
2683 | /* ------------------------------------------------------------------------- */ |
2693 | /* ------------------------------------------------------------------------- */ |
2684 | /* |
2694 | /* |
2685 | * Paste a selection direct to the command fd |
2695 | * Paste a selection direct to the command fd |
… | |
… | |
2691 | for (unsigned int i = 0; i < len; i++) |
2701 | for (unsigned int i = 0; i < len; i++) |
2692 | if (data[i] == C0_LF) |
2702 | if (data[i] == C0_LF) |
2693 | data[i] = C0_CR; |
2703 | data[i] = C0_CR; |
2694 | |
2704 | |
2695 | if (priv_modes & PrivMode_BracketPaste) |
2705 | if (priv_modes & PrivMode_BracketPaste) |
2696 | tt_printf ("\e[200~"); |
2706 | tt_printf ("\x1b[200~"); |
2697 | |
2707 | |
2698 | tt_write (data, len); |
2708 | tt_write (data, len); |
2699 | |
2709 | |
2700 | if (priv_modes & PrivMode_BracketPaste) |
2710 | if (priv_modes & PrivMode_BracketPaste) |
2701 | tt_printf ("\e[201~"); |
2711 | tt_printf ("\x1b[201~"); |
2702 | } |
2712 | } |
2703 | |
2713 | |
2704 | void |
2714 | void |
2705 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2715 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2706 | { |
2716 | { |
… | |
… | |
2710 | tt_paste (data, len); |
2720 | tt_paste (data, len); |
2711 | } |
2721 | } |
2712 | |
2722 | |
2713 | /* ------------------------------------------------------------------------- */ |
2723 | /* ------------------------------------------------------------------------- */ |
2714 | /* |
2724 | /* |
2715 | * Respond to a notification that a primary selection has been sent |
2725 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2716 | * EXT: SelectionNotify |
2726 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2717 | */ |
2727 | * as fallback |
2718 | void |
|
|
2719 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
|
|
2720 | { |
|
|
2721 | if (prop == None) /* check for failed XConvertSelection */ |
|
|
2722 | { |
|
|
2723 | if ((selection_type & Sel_CompoundText)) |
|
|
2724 | { |
|
|
2725 | int selnum = selection_type & Sel_whereMask; |
|
|
2726 | |
|
|
2727 | selection_type = 0; |
|
|
2728 | if (selnum != Sel_direct) |
|
|
2729 | selection_request_other (XA_STRING, selnum); |
|
|
2730 | } |
|
|
2731 | |
|
|
2732 | if ((selection_type & Sel_UTF8String)) |
|
|
2733 | { |
|
|
2734 | int selnum = selection_type & Sel_whereMask; |
|
|
2735 | |
|
|
2736 | selection_type = Sel_CompoundText; |
|
|
2737 | if (selnum != Sel_direct) |
|
|
2738 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2739 | else |
|
|
2740 | selection_type = 0; |
|
|
2741 | } |
|
|
2742 | |
|
|
2743 | return; |
|
|
2744 | } |
|
|
2745 | |
|
|
2746 | unsigned long bytes_after; |
|
|
2747 | XTextProperty ct; |
|
|
2748 | |
|
|
2749 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2750 | 0, PROP_SIZE / 4, |
|
|
2751 | delete_prop, AnyPropertyType, |
|
|
2752 | &ct.encoding, &ct.format, |
|
|
2753 | &ct.nitems, &bytes_after, |
|
|
2754 | &ct.value) != Success) |
|
|
2755 | { |
|
|
2756 | ct.value = 0; |
|
|
2757 | goto bailout; |
|
|
2758 | } |
|
|
2759 | |
|
|
2760 | if (ct.encoding == None) |
|
|
2761 | goto bailout; |
|
|
2762 | |
|
|
2763 | if (bytes_after) |
|
|
2764 | { |
|
|
2765 | // fetch and append remaining data |
|
|
2766 | XTextProperty ct2; |
|
|
2767 | |
|
|
2768 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2769 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2770 | delete_prop, AnyPropertyType, |
|
|
2771 | &ct2.encoding, &ct2.format, |
|
|
2772 | &ct2.nitems, &bytes_after, |
|
|
2773 | &ct2.value) != Success) |
|
|
2774 | goto bailout; |
|
|
2775 | |
|
|
2776 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2777 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2778 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2779 | ct.nitems += ct2.nitems; |
|
|
2780 | |
|
|
2781 | XFree (ct2.value); |
|
|
2782 | } |
|
|
2783 | |
|
|
2784 | if (ct.value == 0) |
|
|
2785 | goto bailout; |
|
|
2786 | |
|
|
2787 | if (ct.encoding == xa[XA_INCR]) |
|
|
2788 | { |
|
|
2789 | // INCR selection, start handshake |
|
|
2790 | if (!delete_prop) |
|
|
2791 | XDeleteProperty (dpy, win, prop); |
|
|
2792 | |
|
|
2793 | selection_wait = Sel_incr; |
|
|
2794 | incr_buf_fill = 0; |
|
|
2795 | incr_ev.start (10); |
|
|
2796 | |
|
|
2797 | goto bailout; |
|
|
2798 | } |
|
|
2799 | |
|
|
2800 | if (ct.nitems == 0) |
|
|
2801 | { |
|
|
2802 | if (selection_wait == Sel_incr) |
|
|
2803 | { |
|
|
2804 | XFree (ct.value); |
|
|
2805 | |
|
|
2806 | // finally complete, now paste the whole thing |
|
|
2807 | selection_wait = Sel_normal; |
|
|
2808 | ct.value = (unsigned char *)incr_buf; |
|
|
2809 | ct.nitems = incr_buf_fill; |
|
|
2810 | incr_buf = 0; |
|
|
2811 | incr_buf_size = 0; |
|
|
2812 | incr_ev.stop (); |
|
|
2813 | } |
|
|
2814 | else |
|
|
2815 | { |
|
|
2816 | if (selection_wait == Sel_normal |
|
|
2817 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2818 | { |
|
|
2819 | /* |
|
|
2820 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2821 | * XConvertSelection () but nothing was presented |
|
|
2822 | */ |
|
|
2823 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2824 | } |
|
|
2825 | |
|
|
2826 | goto bailout; |
|
|
2827 | } |
|
|
2828 | } |
|
|
2829 | else if (selection_wait == Sel_incr) |
|
|
2830 | { |
|
|
2831 | incr_ev.start (10); |
|
|
2832 | |
|
|
2833 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2834 | { |
|
|
2835 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2836 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2837 | } |
|
|
2838 | |
|
|
2839 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2840 | incr_buf_fill += ct.nitems; |
|
|
2841 | |
|
|
2842 | goto bailout; |
|
|
2843 | } |
|
|
2844 | |
|
|
2845 | char **cl; |
|
|
2846 | int cr; |
|
|
2847 | |
|
|
2848 | #if !ENABLE_MINIMAL |
|
|
2849 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2850 | // so recode it manually |
|
|
2851 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2852 | { |
|
|
2853 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2854 | char *s = rxvt_wcstombs (w); |
|
|
2855 | free (w); |
|
|
2856 | // TODO: strlen == only the first element will be converted. well... |
|
|
2857 | paste (s, strlen (s)); |
|
|
2858 | free (s); |
|
|
2859 | } |
|
|
2860 | else |
|
|
2861 | #endif |
|
|
2862 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2863 | && cl) |
|
|
2864 | { |
|
|
2865 | for (int i = 0; i < cr; i++) |
|
|
2866 | paste (cl[i], strlen (cl[i])); |
|
|
2867 | |
|
|
2868 | XFreeStringList (cl); |
|
|
2869 | } |
|
|
2870 | else |
|
|
2871 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2872 | |
|
|
2873 | bailout: |
|
|
2874 | XFree (ct.value); |
|
|
2875 | |
|
|
2876 | if (selection_wait == Sel_normal) |
|
|
2877 | selection_wait = Sel_none; |
|
|
2878 | } |
|
|
2879 | |
|
|
2880 | void |
|
|
2881 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2882 | { |
|
|
2883 | selection_wait = Sel_none; |
|
|
2884 | |
|
|
2885 | incr_buf_size = 0; |
|
|
2886 | free (incr_buf); |
|
|
2887 | |
|
|
2888 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2889 | } |
|
|
2890 | |
|
|
2891 | void |
|
|
2892 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2893 | { |
|
|
2894 | if (prop == None || selection_wait != Sel_incr) |
|
|
2895 | return; |
|
|
2896 | |
|
|
2897 | selection_paste (win, prop, true); |
|
|
2898 | } |
|
|
2899 | |
|
|
2900 | /* ------------------------------------------------------------------------- */ |
|
|
2901 | /* |
|
|
2902 | * Request the current selection: |
|
|
2903 | * Order: > internal selection if available |
|
|
2904 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
|
|
2905 | * > CUT_BUFFER0 |
|
|
2906 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2907 | * will auto fallback to CUT_BUFFER0 |
|
|
2908 | * EXT: button 2 release |
2728 | * EXT: button 2 release |
2909 | */ |
2729 | */ |
2910 | void |
2730 | void |
2911 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2731 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2912 | { |
2732 | { |
2913 | if (selection.text && selnum == Sel_Primary) |
2733 | if (!selection_req) |
2914 | { |
|
|
2915 | /* internal selection */ |
|
|
2916 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2917 | paste (str, strlen (str)); |
|
|
2918 | free (str); |
|
|
2919 | return; |
|
|
2920 | } |
2734 | { |
2921 | else |
2735 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2736 | selection_req->run (); |
2922 | { |
2737 | } |
2923 | selection_request_time = tm; |
|
|
2924 | selection_wait = Sel_normal; |
|
|
2925 | |
|
|
2926 | #if X_HAVE_UTF8_STRING |
|
|
2927 | selection_type = Sel_UTF8String; |
|
|
2928 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2929 | return; |
|
|
2930 | #else |
|
|
2931 | selection_type = Sel_CompoundText; |
|
|
2932 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2933 | return; |
|
|
2934 | #endif |
|
|
2935 | } |
|
|
2936 | |
|
|
2937 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2938 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2939 | } |
|
|
2940 | |
|
|
2941 | int |
|
|
2942 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2943 | { |
|
|
2944 | Atom sel; |
|
|
2945 | |
|
|
2946 | selection_type |= selnum; |
|
|
2947 | |
|
|
2948 | if (selnum == Sel_Primary) |
|
|
2949 | sel = XA_PRIMARY; |
|
|
2950 | else if (selnum == Sel_Secondary) |
|
|
2951 | sel = XA_SECONDARY; |
|
|
2952 | else |
|
|
2953 | sel = xa[XA_CLIPBOARD]; |
|
|
2954 | |
|
|
2955 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2956 | { |
|
|
2957 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2958 | vt, selection_request_time); |
|
|
2959 | return 1; |
|
|
2960 | } |
|
|
2961 | |
|
|
2962 | return 0; |
|
|
2963 | } |
2738 | } |
2964 | |
2739 | |
2965 | /* ------------------------------------------------------------------------- */ |
2740 | /* ------------------------------------------------------------------------- */ |
2966 | /* |
2741 | /* |
2967 | * Clear all selected text |
2742 | * Clear all selected text |
… | |
… | |
2998 | * EXT: button 1 or 3 release |
2773 | * EXT: button 1 or 3 release |
2999 | */ |
2774 | */ |
3000 | void |
2775 | void |
3001 | rxvt_term::selection_make (Time tm) |
2776 | rxvt_term::selection_make (Time tm) |
3002 | { |
2777 | { |
3003 | int i; |
2778 | int size; |
3004 | wchar_t *new_selection_text; |
2779 | wchar_t *new_selection_text; |
3005 | text_t *t; |
2780 | text_t *t; |
3006 | |
2781 | |
3007 | switch (selection.op) |
2782 | switch (selection.op) |
3008 | { |
2783 | { |
… | |
… | |
3024 | return; /* nothing selected, go away */ |
2799 | return; /* nothing selected, go away */ |
3025 | |
2800 | |
3026 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2801 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3027 | return; |
2802 | return; |
3028 | |
2803 | |
3029 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2804 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3030 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2805 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3031 | |
2806 | |
3032 | int ofs = 0; |
2807 | int ofs = 0; |
3033 | int extra = 0; |
2808 | int extra = 0; |
3034 | |
2809 | |
3035 | int col = selection.beg.col; |
2810 | int col = selection.beg.col; |
… | |
… | |
3041 | { |
2816 | { |
3042 | #if !ENABLE_MINIMAL |
2817 | #if !ENABLE_MINIMAL |
3043 | if (selection.rect) |
2818 | if (selection.rect) |
3044 | { |
2819 | { |
3045 | col = selection.beg.col; |
2820 | col = selection.beg.col; |
3046 | end_col = ncol + 1; |
2821 | end_col = selection.end.col; |
3047 | } |
2822 | } |
3048 | else |
2823 | else |
3049 | #endif |
2824 | #endif |
3050 | end_col = ROW(row).l; |
2825 | end_col = ROW(row).l; |
3051 | |
2826 | |
3052 | col = max (col, 0); |
2827 | col = max (col, 0); |
3053 | |
2828 | |
3054 | if (row == selection.end.row |
2829 | if (row == selection.end.row) |
3055 | #if !ENABLE_MINIMAL |
|
|
3056 | || selection.rect |
|
|
3057 | #endif |
|
|
3058 | ) |
|
|
3059 | min_it (end_col, selection.end.col); |
2830 | min_it (end_col, selection.end.col); |
3060 | |
2831 | |
3061 | t = ROW(row).t + col; |
2832 | t = ROW(row).t + col; |
3062 | |
2833 | |
3063 | for (; col < end_col; col++) |
2834 | for (; col < end_col; col++) |
… | |
… | |
3071 | |
2842 | |
3072 | extra -= (len - 1); |
2843 | extra -= (len - 1); |
3073 | |
2844 | |
3074 | if (extra < 0) |
2845 | if (extra < 0) |
3075 | { |
2846 | { |
3076 | extra += i; |
2847 | extra += size; |
3077 | i += i; |
2848 | size += size; |
3078 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2849 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3079 | } |
2850 | } |
3080 | |
2851 | |
3081 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2852 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3082 | } |
2853 | } |
3083 | #endif |
2854 | #endif |
… | |
… | |
3095 | |
2866 | |
3096 | new_selection_text[ofs++] = C0_LF; |
2867 | new_selection_text[ofs++] = C0_LF; |
3097 | } |
2868 | } |
3098 | else |
2869 | else |
3099 | #endif |
2870 | #endif |
3100 | if (!ROW(row).is_longer () && row != selection.end.row) |
2871 | if (!ROW(row).is_longer () |
|
|
2872 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2873 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3101 | new_selection_text[ofs++] = C0_LF; |
2874 | new_selection_text[ofs++] = C0_LF; |
3102 | } |
2875 | } |
3103 | |
|
|
3104 | if (end_col != selection.end.col) |
|
|
3105 | new_selection_text[ofs++] = C0_LF; |
|
|
3106 | |
2876 | |
3107 | new_selection_text[ofs] = 0; |
2877 | new_selection_text[ofs] = 0; |
3108 | |
2878 | |
3109 | if (ofs == 0) |
2879 | if (ofs == 0) |
3110 | { |
2880 | { |
… | |
… | |
3166 | /* ------------------------------------------------------------------------- */ |
2936 | /* ------------------------------------------------------------------------- */ |
3167 | /* |
2937 | /* |
3168 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2938 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3169 | * EXT: button 1 press |
2939 | * EXT: button 1 press |
3170 | */ |
2940 | */ |
3171 | void |
2941 | void ecb_cold |
3172 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2942 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3173 | { |
2943 | { |
3174 | clicks = ((clicks - 1) % 3) + 1; |
2944 | clicks = ((clicks - 1) % 3) + 1; |
3175 | selection.clicks = clicks; /* save clicks so extend will work */ |
2945 | selection.clicks = clicks; /* save clicks so extend will work */ |
3176 | |
2946 | |
… | |
… | |
3195 | |
2965 | |
3196 | /* ------------------------------------------------------------------------- */ |
2966 | /* ------------------------------------------------------------------------- */ |
3197 | /* |
2967 | /* |
3198 | * Mark a selection at the specified col/row |
2968 | * Mark a selection at the specified col/row |
3199 | */ |
2969 | */ |
3200 | void |
2970 | void ecb_cold |
3201 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2971 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3202 | { |
2972 | { |
3203 | want_refresh = 1; |
2973 | want_refresh = 1; |
3204 | |
2974 | |
3205 | selection.mark.row = row + view_start; |
2975 | selection.mark.row = row + view_start; |
… | |
… | |
3228 | * Word select: select text for 2 clicks |
2998 | * Word select: select text for 2 clicks |
3229 | * We now only find out the boundary in one direction |
2999 | * We now only find out the boundary in one direction |
3230 | */ |
3000 | */ |
3231 | |
3001 | |
3232 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3002 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3233 | #define DELIMIT_TEXT(x) \ |
3003 | #define DELIMIT_TEXT(x) \ |
3234 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3004 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3235 | #define DELIMIT_REND(x) 1 |
3005 | #define DELIMIT_REND(x) 1 |
3236 | |
3006 | |
3237 | void |
3007 | void ecb_cold |
3238 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3008 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3239 | { |
3009 | { |
3240 | int col, row, dirnadd, tcol, trow, w1, w2; |
3010 | int col, row, dirnadd, tcol, trow, w1, w2; |
3241 | row_col_t bound; |
3011 | row_col_t bound; |
3242 | text_t *stp; |
3012 | text_t *stp; |
… | |
… | |
3316 | * EXT: button 3 press; button 1 or 3 drag |
3086 | * EXT: button 3 press; button 1 or 3 drag |
3317 | * flag == 0 ==> button 1 |
3087 | * flag == 0 ==> button 1 |
3318 | * flag == 1 ==> button 3 press |
3088 | * flag == 1 ==> button 3 press |
3319 | * flag == 2 ==> button 3 motion |
3089 | * flag == 2 ==> button 3 motion |
3320 | */ |
3090 | */ |
3321 | void |
3091 | void ecb_cold |
3322 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3092 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3323 | { |
3093 | { |
3324 | int col = clamp (Pixel2Col (x), 0, ncol); |
3094 | int col = clamp (Pixel2Col (x), 0, ncol); |
3325 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3095 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3326 | |
3096 | |
… | |
… | |
3352 | |
3122 | |
3353 | /* ------------------------------------------------------------------------- */ |
3123 | /* ------------------------------------------------------------------------- */ |
3354 | /* |
3124 | /* |
3355 | * Extend the selection to the specified col/row |
3125 | * Extend the selection to the specified col/row |
3356 | */ |
3126 | */ |
3357 | void |
3127 | void ecb_cold |
3358 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3128 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3359 | { |
3129 | { |
3360 | row_col_t pos; |
3130 | row_col_t pos; |
3361 | enum { |
3131 | enum { |
3362 | LEFT, RIGHT |
3132 | LEFT, RIGHT |
3363 | } closeto = RIGHT; |
3133 | } closeto = RIGHT; |
3364 | |
|
|
3365 | want_refresh = 1; |
|
|
3366 | |
3134 | |
3367 | switch (selection.op) |
3135 | switch (selection.op) |
3368 | { |
3136 | { |
3369 | case SELECTION_INIT: |
3137 | case SELECTION_INIT: |
3370 | CLEAR_SELECTION (); |
3138 | CLEAR_SELECTION (); |
… | |
… | |
3550 | |
3318 | |
3551 | #if !ENABLE_MINIMAL |
3319 | #if !ENABLE_MINIMAL |
3552 | if (selection.rect && selection.beg.col > selection.end.col) |
3320 | if (selection.rect && selection.beg.col > selection.end.col) |
3553 | ::swap (selection.beg.col, selection.end.col); |
3321 | ::swap (selection.beg.col, selection.end.col); |
3554 | #endif |
3322 | #endif |
|
|
3323 | |
|
|
3324 | selection_changed (); |
3555 | } |
3325 | } |
3556 | |
3326 | |
3557 | #if !ENABLE_MINIMAL |
3327 | #if !ENABLE_MINIMAL |
3558 | void |
3328 | void ecb_cold |
3559 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3329 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3560 | { |
3330 | { |
3561 | int32_t end_col, end_row; |
3331 | int32_t end_col, end_row; |
3562 | text_t *stp; |
3332 | text_t *stp; |
3563 | |
3333 | |
… | |
… | |
3601 | /* ------------------------------------------------------------------------- */ |
3371 | /* ------------------------------------------------------------------------- */ |
3602 | /* |
3372 | /* |
3603 | * Double click on button 3 when already selected |
3373 | * Double click on button 3 when already selected |
3604 | * EXT: button 3 double click |
3374 | * EXT: button 3 double click |
3605 | */ |
3375 | */ |
3606 | void |
3376 | void ecb_cold |
3607 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3377 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3608 | { |
3378 | { |
3609 | selection.clicks = selection.clicks % 3 + 1; |
3379 | selection.clicks = selection.clicks % 3 + 1; |
3610 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3380 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3611 | } |
3381 | } |
… | |
… | |
3613 | /* ------------------------------------------------------------------------- */ |
3383 | /* ------------------------------------------------------------------------- */ |
3614 | /* |
3384 | /* |
3615 | * Respond to a request for our current selection |
3385 | * Respond to a request for our current selection |
3616 | * EXT: SelectionRequest |
3386 | * EXT: SelectionRequest |
3617 | */ |
3387 | */ |
3618 | void |
3388 | void ecb_cold |
3619 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3389 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3620 | { |
3390 | { |
|
|
3391 | Atom property = rq.property == None ? rq.target : rq.property; |
3621 | XSelectionEvent ev; |
3392 | XSelectionEvent ev; |
3622 | |
3393 | |
3623 | ev.type = SelectionNotify; |
3394 | ev.type = SelectionNotify; |
3624 | ev.property = None; |
3395 | ev.property = None; |
3625 | ev.display = rq.display; |
3396 | ev.display = rq.display; |
… | |
… | |
3640 | *target++ = xa[XA_COMPOUND_TEXT]; |
3411 | *target++ = xa[XA_COMPOUND_TEXT]; |
3641 | #if X_HAVE_UTF8_STRING |
3412 | #if X_HAVE_UTF8_STRING |
3642 | *target++ = xa[XA_UTF8_STRING]; |
3413 | *target++ = xa[XA_UTF8_STRING]; |
3643 | #endif |
3414 | #endif |
3644 | |
3415 | |
3645 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3416 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3646 | 32, PropModeReplace, |
3417 | 32, PropModeReplace, |
3647 | (unsigned char *)target_list, target - target_list); |
3418 | (unsigned char *)target_list, target - target_list); |
3648 | ev.property = rq.property; |
3419 | ev.property = property; |
3649 | } |
3420 | } |
3650 | #if TODO // TODO |
3421 | #if TODO // TODO |
3651 | else if (rq.target == xa[XA_MULTIPLE]) |
3422 | else if (rq.target == xa[XA_MULTIPLE]) |
3652 | { |
3423 | { |
3653 | /* TODO: Handle MULTIPLE */ |
3424 | /* TODO: Handle MULTIPLE */ |
3654 | } |
3425 | } |
3655 | #endif |
3426 | #endif |
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3427 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3657 | { |
3428 | { |
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3429 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3659 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3430 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3660 | ev.property = rq.property; |
3431 | ev.property = property; |
3661 | } |
3432 | } |
3662 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3433 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3663 | { |
3434 | { |
3664 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3435 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3665 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3436 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3666 | ev.property = rq.property; |
3437 | ev.property = property; |
3667 | } |
3438 | } |
3668 | else if (rq.target == XA_STRING |
3439 | else if (rq.target == XA_STRING |
3669 | || rq.target == xa[XA_TEXT] |
3440 | || rq.target == xa[XA_TEXT] |
3670 | || rq.target == xa[XA_COMPOUND_TEXT] |
3441 | || rq.target == xa[XA_COMPOUND_TEXT] |
3671 | || rq.target == xa[XA_UTF8_STRING] |
3442 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3742 | ct.value = (unsigned char *)cl; |
3513 | ct.value = (unsigned char *)cl; |
3743 | ct.nitems = selectlen; |
3514 | ct.nitems = selectlen; |
3744 | ct.encoding = target; |
3515 | ct.encoding = target; |
3745 | } |
3516 | } |
3746 | |
3517 | |
3747 | XChangeProperty (dpy, rq.requestor, rq.property, |
3518 | XChangeProperty (dpy, rq.requestor, property, |
3748 | ct.encoding, 8, PropModeReplace, |
3519 | ct.encoding, 8, PropModeReplace, |
3749 | ct.value, (int)ct.nitems); |
3520 | ct.value, (int)ct.nitems); |
3750 | ev.property = rq.property; |
3521 | ev.property = property; |
3751 | |
3522 | |
3752 | if (freect) |
3523 | if (freect) |
3753 | XFree (ct.value); |
3524 | XFree (ct.value); |
3754 | } |
3525 | } |
3755 | |
3526 | |
3756 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3527 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3757 | } |
3528 | } |
3758 | |
3529 | |
3759 | /* ------------------------------------------------------------------------- */ |
3530 | /* ------------------------------------------------------------------------- */ |
3760 | #ifdef USE_XIM |
3531 | #if USE_XIM |
3761 | void |
3532 | void ecb_cold |
3762 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3533 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3763 | { |
3534 | { |
3764 | XWindowAttributes xwa; |
3535 | XWindowAttributes xwa; |
3765 | |
3536 | |
3766 | XGetWindowAttributes (dpy, vt, &xwa); |
3537 | XGetWindowAttributes (dpy, vt, &xwa); |