1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a separate compile! |
|
|
34 | |
|
|
35 | static inline void |
33 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
34 | fill_text (text_t *start, text_t value, int len) |
37 | { |
35 | { |
38 | while (len--) |
36 | while (len--) |
39 | *start++ = value; |
37 | *start++ = value; |
40 | } |
38 | } |
41 | |
39 | |
42 | /* ------------------------------------------------------------------------- */ |
40 | /* ------------------------------------------------------------------------- */ |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
|
|
45 | #define TABSIZE 8 /* default tab size */ |
41 | #define TABSIZE 8 /* default tab size */ |
46 | |
42 | |
47 | /* ------------------------------------------------------------------------- * |
43 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
44 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
45 | * ------------------------------------------------------------------------- */ |
… | |
… | |
100 | |
96 | |
101 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
102 | void |
98 | void |
103 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
99 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
104 | { |
100 | { |
105 | if (!l.t) |
101 | if (!l.valid ()) |
106 | { |
102 | { |
107 | lalloc (l); |
103 | l.alloc (); |
108 | col = 0; |
104 | col = 0; |
109 | width = ncol; |
105 | width = ncol; |
110 | } |
106 | } |
111 | |
107 | |
112 | l.touch (); |
108 | l.touch (); |
… | |
… | |
143 | while (col > 0 && l.t[col] == NOCHAR) |
139 | while (col > 0 && l.t[col] == NOCHAR) |
144 | col--; |
140 | col--; |
145 | |
141 | |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
142 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
143 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
144 | |
|
|
145 | l.touch (); |
148 | |
146 | |
149 | // found start, nuke |
147 | // found start, nuke |
150 | do { |
148 | do { |
151 | l.t[col] = ' '; |
149 | l.t[col] = ' '; |
152 | l.r[col] = rend; |
150 | l.r[col] = rend; |
153 | col++; |
151 | col++; |
154 | } while (col < ncol && l.t[col] == NOCHAR); |
152 | } while (col < ncol && l.t[col] == NOCHAR); |
155 | } |
153 | } |
156 | |
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 | |
157 | /* ------------------------------------------------------------------------- * |
165 | /* ------------------------------------------------------------------------- * |
158 | * SCREEN INITIALISATION * |
166 | * SCREEN INITIALISATION * |
159 | * ------------------------------------------------------------------------- */ |
167 | * ------------------------------------------------------------------------- */ |
160 | |
168 | |
161 | 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 |
162 | rxvt_term::scr_reset () |
214 | rxvt_term::scr_reset () |
163 | { |
215 | { |
|
|
216 | #if ENABLE_OVERLAY |
|
|
217 | scr_overlay_off (); |
|
|
218 | #endif |
|
|
219 | |
164 | view_start = 0; |
220 | view_start = 0; |
165 | num_scr = 0; |
221 | num_scr = 0; |
166 | |
222 | |
167 | if (ncol == 0) |
223 | if (ncol == 0) |
168 | ncol = 80; |
224 | ncol = 80; |
… | |
… | |
188 | total_rows = nrow + saveLines; |
244 | total_rows = nrow + saveLines; |
189 | |
245 | |
190 | screen.tscroll = 0; |
246 | screen.tscroll = 0; |
191 | screen.bscroll = nrow - 1; |
247 | screen.bscroll = nrow - 1; |
192 | |
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 | |
193 | if (!row_buf) |
257 | if (!prev_row_buf) |
194 | { |
258 | { |
195 | /* |
259 | /* |
196 | * first time called so just malloc everything: don't rely on realloc |
260 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
197 | */ |
261 | */ |
198 | top_row = 0; |
262 | top_row = 0; |
199 | term_start = 0; |
263 | term_start = 0; |
200 | |
|
|
201 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
202 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
203 | |
|
|
204 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
205 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
206 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
207 | |
|
|
208 | for (int row = nrow; row--; ) |
|
|
209 | { |
|
|
210 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
211 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
212 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
213 | } |
|
|
214 | |
264 | |
215 | memset (charsets, 'B', sizeof (charsets)); |
265 | memset (charsets, 'B', sizeof (charsets)); |
216 | rstyle = DEFAULT_RSTYLE; |
266 | rstyle = DEFAULT_RSTYLE; |
217 | screen.flags = Screen_DefaultFlags; |
267 | screen.flags = Screen_DefaultFlags; |
218 | screen.cur.row = screen.cur.col = 0; |
268 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
241 | { |
291 | { |
242 | /* |
292 | /* |
243 | * add or delete rows as appropriate |
293 | * add or delete rows as appropriate |
244 | */ |
294 | */ |
245 | |
295 | |
246 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
247 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
248 | |
|
|
249 | #if 0 |
|
|
250 | if (nrow < prev_nrow) |
|
|
251 | { |
|
|
252 | for (int row = nrow; row < prev_nrow; row++) |
|
|
253 | { |
|
|
254 | lfree (swap_buf [row]); |
|
|
255 | lfree (drawn_buf[row]); |
|
|
256 | } |
|
|
257 | } |
|
|
258 | #endif |
|
|
259 | |
|
|
260 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
261 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
262 | |
|
|
263 | for (int row = min (nrow, prev_nrow); row--; ) |
296 | for (int row = min (nrow, prev_nrow); row--; ) |
264 | { |
297 | { |
265 | lresize (drawn_buf[row]); |
298 | copy_line (drawn_buf [row], prev_drawn_buf [row]); |
266 | lresize (swap_buf [row]); |
299 | copy_line (swap_buf [row], prev_swap_buf [row]); |
267 | } |
|
|
268 | |
|
|
269 | for (int row = prev_nrow; row < nrow; row++) |
|
|
270 | { |
300 | } |
271 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
273 | } |
|
|
274 | |
|
|
275 | line_t *old_buf = row_buf; |
|
|
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
277 | |
301 | |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
302 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
303 | int pend = MOD (term_start + top_row , prev_total_rows); |
280 | int q = total_rows; // rewrapped row |
304 | int q = total_rows; // rewrapped row |
281 | |
305 | |
… | |
… | |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
313 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
314 | |
291 | do |
315 | do |
292 | { |
316 | { |
293 | p = MOD (p - 1, prev_total_rows); |
317 | p = MOD (p - 1, prev_total_rows); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
318 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
295 | int plines = 1; |
319 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
320 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
297 | |
321 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
322 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
323 | { |
300 | p = MOD (p - 1, prev_total_rows); |
324 | p = MOD (p - 1, prev_total_rows); |
301 | |
325 | |
302 | plines++; |
326 | plines++; |
303 | llen += prev_ncol; |
327 | llen += prev_ncol; |
… | |
… | |
316 | |
340 | |
317 | // re-assemble the full line by destination lines |
341 | // re-assemble the full line by destination lines |
318 | for (int qrow = q; qlines--; qrow++) |
342 | for (int qrow = q; qlines--; qrow++) |
319 | { |
343 | { |
320 | qline = row_buf + qrow; |
344 | qline = row_buf + qrow; |
321 | lalloc (*qline); |
345 | qline->alloc (); // redundant with next line |
322 | qline->l = ncol; |
346 | qline->l = ncol; |
323 | qline->is_longer (1); |
347 | qline->is_longer (1); |
324 | |
348 | |
325 | int qcol = 0; |
349 | int qcol = 0; |
326 | |
350 | |
… | |
… | |
341 | // this seems to upset applications/shells/readline |
365 | // this seems to upset applications/shells/readline |
342 | // least. |
366 | // least. |
343 | if (prow == ocur.row) |
367 | if (prow == ocur.row) |
344 | screen.cur.row = q - (total_rows - nrow); |
368 | screen.cur.row = q - (total_rows - nrow); |
345 | |
369 | |
346 | line_t &pline = old_buf [prow]; |
370 | line_t &pline = prev_row_buf [prow]; |
347 | |
371 | |
348 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
372 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
349 | |
373 | |
350 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
374 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
351 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
375 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
372 | { |
396 | { |
373 | // if no scrollback exists (yet), wing, instead of wrap |
397 | // if no scrollback exists (yet), wing, instead of wrap |
374 | |
398 | |
375 | for (int row = min (nrow, prev_nrow); row--; ) |
399 | for (int row = min (nrow, prev_nrow); row--; ) |
376 | { |
400 | { |
377 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
401 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
378 | line_t &qline = row_buf [row]; |
402 | line_t &dst = row_buf [row]; |
379 | |
403 | |
380 | qline = pline; |
404 | copy_line (dst, src); |
381 | lresize (qline); |
|
|
382 | } |
405 | } |
383 | |
406 | |
384 | for (int row = prev_nrow; row < nrow; row++) |
407 | for (int row = prev_nrow; row < nrow; row++) |
385 | { |
|
|
386 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
408 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
387 | } |
|
|
388 | |
409 | |
389 | term_start = 0; |
410 | term_start = 0; |
390 | } |
411 | } |
391 | |
|
|
392 | free (old_buf); |
|
|
393 | delete old_ta; |
|
|
394 | delete old_ra; |
|
|
395 | |
412 | |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
413 | clamp_it (screen.cur.row, 0, nrow - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
414 | clamp_it (screen.cur.col, 0, ncol - 1); |
398 | } |
415 | } |
399 | |
416 | |
|
|
417 | for (int row = nrow; row--; ) |
|
|
418 | { |
|
|
419 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
420 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
421 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
422 | } |
|
|
423 | |
|
|
424 | chunk_free (prev_chunk, prev_chunk_size); |
|
|
425 | |
400 | free (tabs); |
426 | free (tabs); |
401 | tabs = (char *)rxvt_malloc (ncol); |
427 | tabs = (char *)rxvt_malloc (ncol); |
402 | |
428 | |
403 | for (int col = ncol; --col; ) |
429 | for (int col = ncol; col--; ) |
404 | tabs [col] = col % TABSIZE == 0; |
430 | tabs [col] = col % TABSIZE == 0; |
405 | |
431 | |
406 | CLEAR_ALL_SELECTION (); |
432 | CLEAR_ALL_SELECTION (); |
407 | |
433 | |
408 | prev_nrow = nrow; |
434 | prev_nrow = nrow; |
… | |
… | |
411 | tt_winch (); |
437 | tt_winch (); |
412 | |
438 | |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
439 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
414 | } |
440 | } |
415 | |
441 | |
416 | /* ------------------------------------------------------------------------- */ |
442 | void ecb_cold |
417 | /* |
|
|
418 | * Free everything. That way malloc debugging can find leakage. |
|
|
419 | */ |
|
|
420 | void |
|
|
421 | rxvt_term::scr_release () NOTHROW |
443 | rxvt_term::scr_release () NOTHROW |
422 | { |
444 | { |
423 | if (row_buf) |
445 | chunk_free (chunk, chunk_size); |
424 | { |
446 | chunk = 0; |
425 | delete talloc; talloc = 0; |
447 | row_buf = 0; |
426 | delete ralloc; ralloc = 0; |
|
|
427 | |
448 | |
428 | free (row_buf); |
|
|
429 | free (swap_buf); |
|
|
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
|
|
433 | free (tabs); |
449 | free (tabs); |
434 | tabs = 0; |
450 | tabs = 0; |
435 | } |
|
|
436 | } |
451 | } |
437 | |
452 | |
438 | /* ------------------------------------------------------------------------- */ |
453 | /* ------------------------------------------------------------------------- */ |
439 | /* |
454 | /* |
440 | * Hard/Soft reset |
455 | * Hard/Soft reset |
441 | */ |
456 | */ |
442 | void |
457 | void ecb_cold |
443 | rxvt_term::scr_poweron () |
458 | rxvt_term::scr_poweron () |
444 | { |
459 | { |
445 | scr_release (); |
460 | scr_release (); |
|
|
461 | |
446 | prev_nrow = prev_ncol = 0; |
462 | prev_nrow = prev_ncol = 0; |
447 | rvideo_mode = false; |
463 | rvideo_mode = false; |
448 | scr_soft_reset (); |
464 | scr_soft_reset (); |
449 | scr_reset (); |
465 | scr_reset (); |
450 | |
466 | |
451 | scr_clear (true); |
467 | scr_clear (true); |
452 | scr_refresh (); |
468 | scr_refresh (); |
453 | } |
469 | } |
454 | |
470 | |
455 | void |
471 | void ecb_cold |
456 | rxvt_term::scr_soft_reset () |
472 | rxvt_term::scr_soft_reset () NOTHROW |
457 | { |
473 | { |
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
474 | /* only affects modes, nothing drastic such as clearing the screen */ |
459 | #if ENABLE_OVERLAY |
475 | #if ENABLE_OVERLAY |
460 | scr_overlay_off (); |
476 | scr_overlay_off (); |
461 | #endif |
477 | #endif |
… | |
… | |
516 | assert (s->cur.row >= 0); |
532 | assert (s->cur.row >= 0); |
517 | assert (s->cur.col >= 0); |
533 | assert (s->cur.col >= 0); |
518 | } |
534 | } |
519 | |
535 | |
520 | void |
536 | void |
521 | rxvt_term::scr_swap_screen () |
537 | rxvt_term::scr_swap_screen () NOTHROW |
522 | { |
538 | { |
523 | if (!option (Opt_secondaryScreen)) |
539 | if (!option (Opt_secondaryScreen)) |
524 | return; |
540 | return; |
525 | |
541 | |
526 | for (int i = prev_nrow; i--; ) |
542 | for (int i = prev_nrow; i--; ) |
… | |
… | |
545 | return; |
561 | return; |
546 | |
562 | |
547 | want_refresh = 1; |
563 | want_refresh = 1; |
548 | view_start = 0; |
564 | view_start = 0; |
549 | |
565 | |
550 | selection_check (2); /* check for boundary cross */ |
566 | /* check for boundary cross */ |
|
|
567 | row_col_t pos; |
|
|
568 | pos.row = pos.col = 0; |
|
|
569 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
570 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
571 | CLEAR_SELECTION (); |
551 | |
572 | |
552 | current_screen = scrn; |
573 | current_screen = scrn; |
553 | |
574 | |
554 | #if NSCREENS |
575 | #if NSCREENS |
555 | if (option (Opt_secondaryScreen)) |
576 | if (option (Opt_secondaryScreen)) |
… | |
… | |
621 | /* |
642 | /* |
622 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
643 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
623 | * count positive ==> scroll up |
644 | * count positive ==> scroll up |
624 | * count negative ==> scroll down |
645 | * count negative ==> scroll down |
625 | */ |
646 | */ |
626 | int |
647 | int ecb_hot |
627 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
648 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
628 | { |
649 | { |
629 | if (count == 0 || (row1 > row2)) |
650 | if (count == 0 || (row1 > row2)) |
630 | return 0; |
651 | return 0; |
631 | |
652 | |
… | |
… | |
634 | |
655 | |
635 | if (count > 0 |
656 | if (count > 0 |
636 | && row1 == 0 |
657 | && row1 == 0 |
637 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
658 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
638 | { |
659 | { |
|
|
660 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
661 | |
639 | top_row = max (top_row - count, -saveLines); |
662 | top_row = max (top_row - count, -saveLines); |
640 | |
|
|
641 | // scroll everything up 'count' lines |
|
|
642 | term_start = (term_start + count) % total_rows; |
|
|
643 | |
663 | |
644 | // sever bottommost line |
664 | // sever bottommost line |
645 | { |
665 | { |
646 | line_t &l = ROW(row2 - count); |
666 | line_t &l = ROW(row2); |
647 | l.is_longer (0); |
667 | l.is_longer (0); |
648 | l.touch (); |
668 | l.touch (); |
649 | } |
669 | } |
650 | |
670 | |
|
|
671 | // scroll everything up 'count' lines |
|
|
672 | term_start = (term_start + count) % total_rows; |
|
|
673 | |
|
|
674 | // now copy lines below the scroll region bottom to the |
|
|
675 | // bottom of the screen again, so they look as if they |
|
|
676 | // hadn't moved. |
|
|
677 | for (int i = nrow; --i > row2; ) |
|
|
678 | { |
|
|
679 | line_t &l1 = ROW(i - count); |
|
|
680 | line_t &l2 = ROW(i); |
|
|
681 | |
|
|
682 | ::swap (l1, l2); |
|
|
683 | l2.touch (); |
|
|
684 | } |
|
|
685 | |
651 | // erase newly scrolled-in lines |
686 | // erase newly scrolled-in lines |
652 | for (int i = count; i--; ) |
687 | for (int i = count; i--; ) |
653 | { |
688 | { |
654 | line_t &l = ROW(nrow - 1 - i); |
689 | line_t &l = ROW(row2 - i); |
655 | |
690 | |
656 | // optimize if already cleared, can be significant on slow machines |
691 | // optimise if already cleared, can be significant on slow machines |
657 | // could be rolled into scr_blank_screen_mem |
692 | // could be rolled into scr_blank_screen_mem |
658 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
693 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
659 | { |
694 | { |
660 | scr_blank_line (l, 0, l.l, rstyle); |
695 | scr_blank_line (l, 0, l.l, rstyle); |
661 | l.l = 0; |
696 | l.l = 0; |
… | |
… | |
663 | } |
698 | } |
664 | else |
699 | else |
665 | scr_blank_screen_mem (l, rstyle); |
700 | scr_blank_screen_mem (l, rstyle); |
666 | } |
701 | } |
667 | |
702 | |
668 | // now copy lines below the scroll region bottom to the |
|
|
669 | // bottom of the screen again, so they look as if they |
|
|
670 | // hadn't moved. |
|
|
671 | for (int i = nrow; --i > row2; ) |
|
|
672 | { |
|
|
673 | line_t &l1 = ROW(i - count); |
|
|
674 | line_t &l2 = ROW(i); |
|
|
675 | |
|
|
676 | ::swap (l1, l2); |
|
|
677 | l2.touch (); |
|
|
678 | } |
|
|
679 | |
|
|
680 | // move and/or clear selection, if any |
703 | // move and/or clear selection, if any |
681 | if (selection.op && current_screen == selection.screen) |
704 | if (selection.op && current_screen == selection.screen |
|
|
705 | && selection.beg.row <= row2) |
682 | { |
706 | { |
683 | selection.beg.row -= count; |
707 | selection.beg.row -= count; |
684 | selection.end.row -= count; |
708 | selection.end.row -= count; |
685 | selection.mark.row -= count; |
709 | selection.mark.row -= count; |
686 | |
710 | |
687 | if (selection.beg.row < top_row |
711 | selection_check (0); |
688 | || selection.end.row < top_row |
|
|
689 | || selection.mark.row < top_row) |
|
|
690 | { |
|
|
691 | CLEAR_ALL_SELECTION (); |
|
|
692 | selection.op = SELECTION_CLEAR; |
|
|
693 | } |
|
|
694 | } |
712 | } |
695 | |
713 | |
696 | // finally move the view window, if desired |
714 | // finally move the view window, if desired |
697 | if (option (Opt_scrollWithBuffer) |
715 | if (option (Opt_scrollWithBuffer) |
698 | && view_start != 0 |
716 | && view_start != 0 |
… | |
… | |
728 | } |
746 | } |
729 | |
747 | |
730 | // use a simple and robust scrolling algorithm, this |
748 | // use a simple and robust scrolling algorithm, this |
731 | // part of scr_scroll_text is not time-critical. |
749 | // part of scr_scroll_text is not time-critical. |
732 | |
750 | |
|
|
751 | // sever line above scroll region |
|
|
752 | if (row1) |
|
|
753 | { |
|
|
754 | line_t &l = ROW(row1 - 1); |
|
|
755 | l.is_longer (0); |
|
|
756 | l.touch (); |
|
|
757 | } |
|
|
758 | |
733 | int rows = row2 - row1 + 1; |
759 | int rows = row2 - row1 + 1; |
734 | |
760 | |
735 | min_it (count, rows); |
761 | min_it (count, rows); |
736 | |
762 | |
737 | line_t *temp_buf = row_buf + total_rows; |
763 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
738 | |
764 | |
739 | for (int row = 0; row < rows; row++) |
765 | for (int row = 0; row < rows; row++) |
740 | { |
766 | { |
741 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
767 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
742 | |
768 | |
… | |
… | |
744 | scr_blank_screen_mem (temp_buf [row], rstyle); |
770 | scr_blank_screen_mem (temp_buf [row], rstyle); |
745 | } |
771 | } |
746 | |
772 | |
747 | for (int row = 0; row < rows; row++) |
773 | for (int row = 0; row < rows; row++) |
748 | ROW(row1 + row) = temp_buf [row]; |
774 | ROW(row1 + row) = temp_buf [row]; |
|
|
775 | |
|
|
776 | // sever bottommost line |
|
|
777 | { |
|
|
778 | line_t &l = ROW(row2); |
|
|
779 | l.is_longer (0); |
|
|
780 | l.touch (); |
|
|
781 | } |
749 | } |
782 | } |
750 | |
783 | |
751 | return count; |
784 | return count; |
752 | } |
785 | } |
753 | |
786 | |
754 | /* ------------------------------------------------------------------------- */ |
787 | /* ------------------------------------------------------------------------- */ |
755 | /* |
788 | /* |
756 | * Add text given in <str> of length <len> to screen struct |
789 | * Add text given in <str> of length <len> to screen struct |
757 | */ |
790 | */ |
758 | void |
791 | void ecb_hot |
759 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
792 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
760 | { |
793 | { |
761 | if (len <= 0) /* sanity */ |
794 | if (len <= 0) /* sanity */ |
762 | return; |
795 | return; |
763 | |
796 | |
764 | unsigned char checksel; |
797 | bool checksel; |
765 | unicode_t c; |
798 | unicode_t c; |
766 | int ncol = this->ncol; |
799 | int ncol = this->ncol; |
767 | const wchar_t *strend = str + len; |
800 | const wchar_t *strend = str + len; |
768 | |
801 | |
769 | want_refresh = 1; |
802 | want_refresh = 1; |
… | |
… | |
795 | |
828 | |
796 | while (str < strend) |
829 | while (str < strend) |
797 | { |
830 | { |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
831 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
799 | |
832 | |
800 | if (expect_false (c < 0x20)) |
833 | if (ecb_unlikely (c < 0x20)) |
801 | if (c == C0_LF) |
834 | if (c == C0_LF) |
802 | { |
835 | { |
803 | max_it (line->l, screen.cur.col); |
836 | max_it (line->l, screen.cur.col); |
804 | |
837 | |
805 | screen.flags &= ~Screen_WrapNext; |
838 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
824 | { |
857 | { |
825 | scr_tab (1, true); |
858 | scr_tab (1, true); |
826 | continue; |
859 | continue; |
827 | } |
860 | } |
828 | |
861 | |
829 | if (expect_false ( |
862 | if (ecb_unlikely ( |
830 | checksel /* see if we're writing within selection */ |
863 | checksel /* see if we're writing within selection */ |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
864 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
865 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
833 | )) |
866 | )) |
834 | { |
867 | { |
… | |
… | |
839 | * should be a similar check. |
872 | * should be a similar check. |
840 | */ |
873 | */ |
841 | CLEAR_SELECTION (); |
874 | CLEAR_SELECTION (); |
842 | } |
875 | } |
843 | |
876 | |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
877 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
845 | { |
878 | { |
846 | scr_do_wrap (); |
879 | scr_do_wrap (); |
847 | |
880 | |
848 | line->l = ncol; |
881 | line->l = ncol; |
849 | line->is_longer (1); |
882 | line->is_longer (1); |
… | |
… | |
851 | row = screen.cur.row; |
884 | row = screen.cur.row; |
852 | line = &ROW(row); /* _must_ refresh */ |
885 | line = &ROW(row); /* _must_ refresh */ |
853 | } |
886 | } |
854 | |
887 | |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
888 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
889 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
857 | c = 0xfffd; |
890 | c = 0xfffd; |
858 | |
891 | |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
892 | // rely on wcwidth to tell us the character width, do wcwidth before |
860 | // further replacements, as wcwidth might return -1 for the line |
893 | // further replacements, as wcwidth might return -1 for the line |
861 | // drawing characters below as they might be invalid in the current |
894 | // drawing characters below as they might be invalid in the current |
862 | // locale. |
895 | // locale. |
863 | int width = WCWIDTH (c); |
896 | int width = WCWIDTH (c); |
864 | |
897 | |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
898 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
866 | { |
899 | { |
867 | // vt100 special graphics and line drawing |
900 | // vt100 special graphics and line drawing |
868 | // 5f-7e standard vt100 |
901 | // 5f-7e standard vt100 |
869 | // 40-5e rxvt extension for extra curses acs chars |
902 | // 40-5e rxvt extension for extra curses acs chars |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
903 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
883 | c = vt100_0[c - 0x41]; |
916 | c = vt100_0[c - 0x41]; |
884 | width = 1; // vt100 line drawing characters are always single-width |
917 | width = 1; // vt100 line drawing characters are always single-width |
885 | } |
918 | } |
886 | } |
919 | } |
887 | |
920 | |
888 | if (expect_false (screen.flags & Screen_Insert)) |
921 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
889 | scr_insdel_chars (width, INSERT); |
922 | scr_insdel_chars (width, INSERT); |
890 | |
923 | |
891 | if (width != 0) |
924 | if (width != 0) |
892 | { |
925 | { |
893 | #if !UNICODE_3 |
926 | #if !UNICODE_3 |
… | |
… | |
898 | # else |
931 | # else |
899 | c = 0xfffd; |
932 | c = 0xfffd; |
900 | # endif |
933 | # endif |
901 | #endif |
934 | #endif |
902 | |
935 | |
903 | // nuke the character at this position, if required |
|
|
904 | if (expect_false ( |
|
|
905 | line->t[screen.cur.col] == NOCHAR |
|
|
906 | || (screen.cur.col < ncol - 1 |
|
|
907 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
908 | )) |
|
|
909 | scr_kill_char (*line, screen.cur.col); |
|
|
910 | |
|
|
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
936 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
912 | |
937 | |
913 | // if the character doesn't fit into the remaining columns... |
938 | // if the character doesn't fit into the remaining columns... |
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
939 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
915 | { |
940 | { |
916 | if (screen.flags & Screen_Autowrap) |
941 | if (screen.flags & Screen_Autowrap) |
917 | { |
942 | { |
918 | // ... artificially enlargen the previous one |
943 | // ... artificially enlargen the previous one |
919 | c = NOCHAR; |
944 | c = NOCHAR; |
… | |
… | |
922 | } |
947 | } |
923 | else |
948 | else |
924 | screen.cur.col = ncol - width; |
949 | screen.cur.col = ncol - width; |
925 | } |
950 | } |
926 | |
951 | |
|
|
952 | // nuke the character at this position, if required |
|
|
953 | // due to wonderful coincidences everywhere else in this loop |
|
|
954 | // we never have to check for overwriting a wide char itself, |
|
|
955 | // only its tail. |
|
|
956 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
|
|
957 | scr_kill_char (*line, screen.cur.col); |
|
|
958 | |
927 | line->touch (); |
959 | line->touch (); |
928 | |
960 | |
929 | do |
961 | do |
930 | { |
962 | { |
931 | line->t[screen.cur.col] = c; |
963 | line->t[screen.cur.col] = c; |
932 | line->r[screen.cur.col] = rend; |
964 | line->r[screen.cur.col] = rend; |
933 | |
965 | |
934 | if (expect_true (screen.cur.col < ncol - 1)) |
966 | if (ecb_likely (screen.cur.col < ncol - 1)) |
935 | screen.cur.col++; |
967 | screen.cur.col++; |
936 | else |
968 | else |
937 | { |
969 | { |
938 | line->l = ncol; |
970 | line->l = ncol; |
939 | if (screen.flags & Screen_Autowrap) |
971 | if (screen.flags & Screen_Autowrap) |
940 | screen.flags |= Screen_WrapNext; |
972 | screen.flags |= Screen_WrapNext; |
941 | break; |
973 | |
|
|
974 | goto end_of_line; |
942 | } |
975 | } |
943 | |
976 | |
944 | c = NOCHAR; |
977 | c = NOCHAR; |
945 | } |
978 | } |
946 | while (expect_false (--width > 0)); |
979 | while (ecb_unlikely (--width > 0)); |
947 | |
980 | |
948 | // pad with spaces when overwriting wide character with smaller one |
981 | // pad with spaces when overwriting wide character with smaller one |
949 | if (expect_false (!width)) |
982 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
950 | { |
983 | { |
951 | line->touch (); |
|
|
952 | |
|
|
953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
954 | { |
|
|
955 | line->t[c] = ' '; |
984 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
985 | line->r[c] = rend; |
957 | } |
|
|
958 | } |
986 | } |
|
|
987 | |
|
|
988 | end_of_line: |
|
|
989 | ; |
959 | } |
990 | } |
960 | #if ENABLE_COMBINING |
991 | #if ENABLE_COMBINING |
961 | else // width == 0 |
992 | else // width == 0 |
962 | { |
993 | { |
963 | if (c != 0xfeff) // ignore BOM |
994 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1026 | |
1057 | |
1027 | want_refresh = 1; |
1058 | want_refresh = 1; |
1028 | #endif |
1059 | #endif |
1029 | } |
1060 | } |
1030 | } |
1061 | } |
|
|
1062 | else if (screen.flags & Screen_WrapNext) |
|
|
1063 | screen.flags &= ~Screen_WrapNext; |
1031 | else |
1064 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1065 | scr_gotorc (0, -1, RELATIVE); |
1033 | } |
1066 | } |
1034 | |
1067 | |
1035 | /* ------------------------------------------------------------------------- */ |
1068 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1113 | * XTERM_SEQ: ESC 6 |
1146 | * XTERM_SEQ: ESC 6 |
1114 | * Move cursor left in row. If we're at the left boundary, shift everything |
1147 | * Move cursor left in row. If we're at the left boundary, shift everything |
1115 | * in that row right. Clear left column. |
1148 | * in that row right. Clear left column. |
1116 | */ |
1149 | */ |
1117 | #if !ENABLE_MINIMAL |
1150 | #if !ENABLE_MINIMAL |
1118 | void |
1151 | void ecb_cold |
1119 | rxvt_term::scr_backindex () NOTHROW |
1152 | rxvt_term::scr_backindex () NOTHROW |
1120 | { |
1153 | { |
1121 | if (screen.cur.col > 0) |
1154 | if (screen.cur.col > 0) |
1122 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1155 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1123 | else |
1156 | else |
… | |
… | |
1130 | * XTERM_SEQ: ESC 9 |
1163 | * XTERM_SEQ: ESC 9 |
1131 | * Move cursor right in row. If we're at the right boundary, shift everything |
1164 | * Move cursor right in row. If we're at the right boundary, shift everything |
1132 | * in that row left. Clear right column. |
1165 | * in that row left. Clear right column. |
1133 | */ |
1166 | */ |
1134 | #if !ENABLE_MINIMAL |
1167 | #if !ENABLE_MINIMAL |
1135 | void |
1168 | void ecb_cold |
1136 | rxvt_term::scr_forwardindex () NOTHROW |
1169 | rxvt_term::scr_forwardindex () NOTHROW |
1137 | { |
1170 | { |
1138 | if (screen.cur.col < ncol - 1) |
1171 | if (screen.cur.col < ncol - 1) |
1139 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1172 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1140 | else |
1173 | else |
… | |
… | |
1291 | scr_blank_line (line, col, num, rstyle); |
1324 | scr_blank_line (line, col, num, rstyle); |
1292 | } |
1325 | } |
1293 | |
1326 | |
1294 | /* ------------------------------------------------------------------------- */ |
1327 | /* ------------------------------------------------------------------------- */ |
1295 | /* |
1328 | /* |
1296 | * Erase part of whole of the screen |
1329 | * Erase part or whole of the screen |
1297 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1330 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1298 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1331 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1299 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1332 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1300 | */ |
1333 | */ |
1301 | void |
1334 | void |
… | |
… | |
1310 | ZERO_SCROLLBACK (); |
1343 | ZERO_SCROLLBACK (); |
1311 | |
1344 | |
1312 | switch (mode) |
1345 | switch (mode) |
1313 | { |
1346 | { |
1314 | case 0: /* erase to end of screen */ |
1347 | case 0: /* erase to end of screen */ |
1315 | selection_check (1); |
|
|
1316 | scr_erase_line (0); |
1348 | scr_erase_line (0); |
1317 | row = screen.cur.row + 1; /* possible OOB */ |
1349 | row = screen.cur.row + 1; /* possible OOB */ |
1318 | num = nrow - row; |
1350 | num = nrow - row; |
1319 | break; |
1351 | break; |
1320 | case 1: /* erase to beginning of screen */ |
1352 | case 1: /* erase to beginning of screen */ |
1321 | selection_check (3); |
|
|
1322 | scr_erase_line (1); |
1353 | scr_erase_line (1); |
1323 | row = 0; |
1354 | row = 0; |
1324 | num = screen.cur.row; |
1355 | num = screen.cur.row; |
1325 | break; |
1356 | break; |
1326 | case 2: /* erase whole screen */ |
1357 | case 2: /* erase whole screen */ |
1327 | selection_check (3); |
|
|
1328 | row = 0; |
1358 | row = 0; |
1329 | num = nrow; |
1359 | num = nrow; |
1330 | break; |
1360 | break; |
1331 | default: |
1361 | default: |
1332 | return; |
1362 | return; |
… | |
… | |
1349 | { |
1379 | { |
1350 | ren = DEFAULT_RSTYLE; |
1380 | ren = DEFAULT_RSTYLE; |
1351 | |
1381 | |
1352 | if (mapped) |
1382 | if (mapped) |
1353 | XClearArea (dpy, vt, 0, |
1383 | XClearArea (dpy, vt, 0, |
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
1384 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1355 | (unsigned int)Height2Pixel (num), False); |
1385 | (unsigned int)Height2Pixel (num), False); |
1356 | } |
1386 | } |
1357 | else |
1387 | else |
1358 | { |
1388 | { |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1389 | ren = rstyle & (RS_fgMask | RS_bgMask); |
… | |
… | |
1362 | { |
1392 | { |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1393 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1394 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1365 | XFillRectangle (dpy, vt, gc, |
1395 | XFillRectangle (dpy, vt, gc, |
1366 | 0, Row2Pixel (row - view_start), |
1396 | 0, Row2Pixel (row - view_start), |
1367 | (unsigned int)width, |
1397 | (unsigned int)vt_width, |
1368 | (unsigned int)Height2Pixel (num)); |
1398 | (unsigned int)Height2Pixel (num)); |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1399 | gcvalue.foreground = pix_colors[Color_fg]; |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1400 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1371 | } |
1401 | } |
1372 | } |
1402 | } |
… | |
… | |
1394 | /* ------------------------------------------------------------------------- */ |
1424 | /* ------------------------------------------------------------------------- */ |
1395 | /* |
1425 | /* |
1396 | * Fill the screen with `E's |
1426 | * Fill the screen with `E's |
1397 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1427 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1398 | */ |
1428 | */ |
1399 | void |
1429 | void ecb_cold |
1400 | rxvt_term::scr_E () NOTHROW |
1430 | rxvt_term::scr_E () NOTHROW |
1401 | { |
1431 | { |
1402 | rend_t fs; |
1432 | rend_t fs; |
1403 | |
1433 | |
1404 | want_refresh = 1; |
1434 | want_refresh = 1; |
1405 | ZERO_SCROLLBACK (); |
1435 | ZERO_SCROLLBACK (); |
1406 | |
1436 | |
1407 | num_scr_allow = 0; |
1437 | num_scr_allow = 0; |
1408 | selection_check (3); |
1438 | |
|
|
1439 | row_col_t pos; |
|
|
1440 | pos.row = pos.col = 0; |
|
|
1441 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1442 | CLEAR_SELECTION (); |
1409 | |
1443 | |
1410 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1444 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1411 | for (int row = nrow; row--; ) |
1445 | for (int row = nrow; row--; ) |
1412 | { |
1446 | { |
1413 | line_t &line = ROW(row); |
1447 | line_t &line = ROW(row); |
… | |
… | |
1564 | /* ------------------------------------------------------------------------- */ |
1598 | /* ------------------------------------------------------------------------- */ |
1565 | /* |
1599 | /* |
1566 | * Set the scrolling region |
1600 | * Set the scrolling region |
1567 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1601 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1568 | */ |
1602 | */ |
1569 | void |
1603 | void ecb_cold |
1570 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1604 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1571 | { |
1605 | { |
1572 | max_it (top, 0); |
1606 | max_it (top, 0); |
1573 | min_it (bot, nrow - 1); |
1607 | min_it (bot, nrow - 1); |
1574 | |
1608 | |
… | |
… | |
1584 | /* |
1618 | /* |
1585 | * Make the cursor visible/invisible |
1619 | * Make the cursor visible/invisible |
1586 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1620 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1587 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1621 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1588 | */ |
1622 | */ |
1589 | void |
1623 | void ecb_cold |
1590 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1624 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1591 | { |
1625 | { |
1592 | want_refresh = 1; |
1626 | want_refresh = 1; |
1593 | |
1627 | |
1594 | if (mode) |
1628 | if (mode) |
… | |
… | |
1601 | /* |
1635 | /* |
1602 | * Set/unset automatic wrapping |
1636 | * Set/unset automatic wrapping |
1603 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1637 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1604 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1638 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1605 | */ |
1639 | */ |
1606 | void |
1640 | void ecb_cold |
1607 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1641 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1608 | { |
1642 | { |
1609 | if (mode) |
1643 | if (mode) |
1610 | screen.flags |= Screen_Autowrap; |
1644 | screen.flags |= Screen_Autowrap; |
1611 | else |
1645 | else |
… | |
… | |
1620 | * Relative mode: line numbers are relative to top margin of scrolling region |
1654 | * Relative mode: line numbers are relative to top margin of scrolling region |
1621 | * and the cursor cannot be moved outside. |
1655 | * and the cursor cannot be moved outside. |
1622 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1656 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1623 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1657 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1624 | */ |
1658 | */ |
1625 | void |
1659 | void ecb_cold |
1626 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1660 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1627 | { |
1661 | { |
1628 | if (mode) |
1662 | if (mode) |
1629 | screen.flags |= Screen_Relative; |
1663 | screen.flags |= Screen_Relative; |
1630 | else |
1664 | else |
… | |
… | |
1637 | /* |
1671 | /* |
1638 | * Set insert/replace mode |
1672 | * Set insert/replace mode |
1639 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1673 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1640 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1674 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1641 | */ |
1675 | */ |
1642 | void |
1676 | void ecb_cold |
1643 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1677 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1644 | { |
1678 | { |
1645 | if (mode) |
1679 | if (mode) |
1646 | screen.flags |= Screen_Insert; |
1680 | screen.flags |= Screen_Insert; |
1647 | else |
1681 | else |
… | |
… | |
1653 | * Set/Unset tabs |
1687 | * Set/Unset tabs |
1654 | * XTERM_SEQ: Set tab at current column : ESC H |
1688 | * XTERM_SEQ: Set tab at current column : ESC H |
1655 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1689 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1656 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1690 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1657 | */ |
1691 | */ |
1658 | void |
1692 | void ecb_cold |
1659 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1693 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1660 | { |
1694 | { |
1661 | if (mode < 0) |
1695 | if (mode < 0) |
1662 | memset (tabs, 0, ncol); |
1696 | memset (tabs, 0, ncol); |
1663 | else if (screen.cur.col < ncol) |
1697 | else if (screen.cur.col < ncol) |
… | |
… | |
1682 | if (rvideo_state != on) |
1716 | if (rvideo_state != on) |
1683 | { |
1717 | { |
1684 | rvideo_state = on; |
1718 | rvideo_state = on; |
1685 | |
1719 | |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1720 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1687 | #ifdef HAVE_BG_PIXMAP |
1721 | #ifdef HAVE_IMG |
1688 | if (bgPixmap.pixmap == None) |
1722 | if (bg_img == 0) |
1689 | #endif |
1723 | #endif |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1724 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1691 | |
1725 | |
1692 | XGCValues gcvalue; |
1726 | XGCValues gcvalue; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
1727 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1702 | /* ------------------------------------------------------------------------- */ |
1736 | /* ------------------------------------------------------------------------- */ |
1703 | /* |
1737 | /* |
1704 | * Report current cursor position |
1738 | * Report current cursor position |
1705 | * XTERM_SEQ: Report position: ESC [ 6 n |
1739 | * XTERM_SEQ: Report position: ESC [ 6 n |
1706 | */ |
1740 | */ |
1707 | void |
1741 | void ecb_cold |
1708 | rxvt_term::scr_report_position () NOTHROW |
1742 | rxvt_term::scr_report_position () NOTHROW |
1709 | { |
1743 | { |
1710 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1744 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1711 | } |
1745 | } |
1712 | |
1746 | |
… | |
… | |
1715 | * ------------------------------------------------------------------------- */ |
1749 | * ------------------------------------------------------------------------- */ |
1716 | |
1750 | |
1717 | /* |
1751 | /* |
1718 | * Set font style |
1752 | * Set font style |
1719 | */ |
1753 | */ |
1720 | void |
1754 | void ecb_cold |
1721 | rxvt_term::set_font_style () NOTHROW |
1755 | rxvt_term::set_font_style () NOTHROW |
1722 | { |
1756 | { |
1723 | #if 0 |
1757 | #if 0 |
1724 | switch (charsets [screen.charset]) |
1758 | switch (charsets [screen.charset]) |
1725 | { |
1759 | { |
… | |
… | |
1747 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1781 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1748 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1782 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1749 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1783 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1750 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1784 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1751 | */ |
1785 | */ |
1752 | void |
1786 | void ecb_cold |
1753 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1787 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1754 | { |
1788 | { |
1755 | screen.charset = set; |
1789 | screen.charset = set; |
1756 | set_font_style (); |
1790 | set_font_style (); |
1757 | } |
1791 | } |
… | |
… | |
1778 | * ------------------------------------------------------------------------- */ |
1812 | * ------------------------------------------------------------------------- */ |
1779 | |
1813 | |
1780 | /* |
1814 | /* |
1781 | * refresh matching text. |
1815 | * refresh matching text. |
1782 | */ |
1816 | */ |
1783 | bool |
1817 | bool ecb_cold |
1784 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1818 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1785 | { |
1819 | { |
1786 | bool found = false; |
1820 | bool found = false; |
1787 | |
1821 | |
1788 | for (int i = 0; i < nrow; i++) |
1822 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1807 | PART_BEG = 0, |
1841 | PART_BEG = 0, |
1808 | PART_END, |
1842 | PART_END, |
1809 | RC_COUNT |
1843 | RC_COUNT |
1810 | }; |
1844 | }; |
1811 | |
1845 | |
1812 | void |
1846 | void ecb_hot |
1813 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1847 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1814 | { |
1848 | { |
1815 | int i; |
1849 | int i; |
1816 | row_col_t rc[RC_COUNT]; |
1850 | row_col_t rc[RC_COUNT]; |
1817 | |
1851 | |
… | |
… | |
1854 | * Refresh the entire screen |
1888 | * Refresh the entire screen |
1855 | */ |
1889 | */ |
1856 | void |
1890 | void |
1857 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1891 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1858 | { |
1892 | { |
1859 | scr_expose (0, 0, width, height, refresh); |
1893 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1860 | } |
1894 | } |
1861 | |
1895 | |
1862 | /* ------------------------------------------------------------------------- */ |
1896 | /* ------------------------------------------------------------------------- */ |
1863 | /* |
1897 | /* |
1864 | * Move the display so that the line represented by scrollbar value Y is at |
1898 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1920 | |
1954 | |
1921 | # ifndef NO_MAPALERT |
1955 | # ifndef NO_MAPALERT |
1922 | # ifdef MAPALERT_OPTION |
1956 | # ifdef MAPALERT_OPTION |
1923 | if (option (Opt_mapAlert)) |
1957 | if (option (Opt_mapAlert)) |
1924 | # endif |
1958 | # endif |
1925 | XMapWindow (dpy, parent[0]); |
1959 | XMapWindow (dpy, parent); |
1926 | # endif |
1960 | # endif |
1927 | |
1961 | |
1928 | # if ENABLE_FRILLS |
1962 | # if ENABLE_FRILLS |
1929 | if (option (Opt_urgentOnBell)) |
1963 | if (option (Opt_urgentOnBell)) |
1930 | set_urgency (1); |
1964 | set_urgency (1); |
… | |
… | |
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1977 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1944 | #endif |
1978 | #endif |
1945 | } |
1979 | } |
1946 | |
1980 | |
1947 | /* ------------------------------------------------------------------------- */ |
1981 | /* ------------------------------------------------------------------------- */ |
1948 | /* ARGSUSED */ |
1982 | void ecb_cold |
1949 | void |
|
|
1950 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1983 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1951 | { |
1984 | { |
1952 | #ifdef PRINTPIPE |
1985 | #ifdef PRINTPIPE |
1953 | int nrows, row_start; |
1986 | int nrows, row_start; |
1954 | FILE *fd = popen_printer (); |
1987 | FILE *fd = popen_printer (); |
… | |
… | |
2003 | /* |
2036 | /* |
2004 | * Refresh the screen |
2037 | * Refresh the screen |
2005 | * drawn_text/drawn_rend contain the screen information before the update. |
2038 | * drawn_text/drawn_rend contain the screen information before the update. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
2039 | * screen.text/screen.rend contain what the screen will change to. |
2007 | */ |
2040 | */ |
2008 | void |
2041 | void ecb_hot |
2009 | rxvt_term::scr_refresh () NOTHROW |
2042 | rxvt_term::scr_refresh () NOTHROW |
2010 | { |
2043 | { |
2011 | int16_t col, row, /* column/row we're processing */ |
2044 | int16_t col, row, /* column/row we're processing */ |
2012 | ocrow; /* old cursor row */ |
2045 | ocrow; /* old cursor row */ |
2013 | int i; /* tmp */ |
2046 | int i; /* tmp */ |
2014 | #ifndef NO_CURSORCOLOR |
|
|
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2016 | #endif |
|
|
2017 | rend_t *crp; // cursor rendition pointer |
|
|
2018 | rend_t ccol1, /* Cursor colour */ |
2047 | rend_t ccol1, /* Cursor colour */ |
2019 | ccol2; /* Cursor colour2 */ |
2048 | ccol2; /* Cursor colour2 */ |
|
|
2049 | rend_t cur_rend; |
|
|
2050 | int cur_col; |
2020 | |
2051 | |
2021 | want_refresh = 0; /* screen is current */ |
2052 | want_refresh = 0; /* screen is current */ |
2022 | |
2053 | |
2023 | if (refresh_type == NO_REFRESH || !mapped) |
2054 | if (refresh_type == NO_REFRESH || !mapped) |
2024 | return; |
2055 | return; |
… | |
… | |
2027 | * A: set up vars |
2058 | * A: set up vars |
2028 | */ |
2059 | */ |
2029 | refresh_count = 0; |
2060 | refresh_count = 0; |
2030 | |
2061 | |
2031 | unsigned int old_screen_flags = screen.flags; |
2062 | unsigned int old_screen_flags = screen.flags; |
2032 | char have_bg = 0; |
2063 | bool have_bg = 0; |
2033 | #ifdef HAVE_BG_PIXMAP |
2064 | #ifdef HAVE_IMG |
2034 | have_bg = bgPixmap.pixmap != None; |
2065 | have_bg = bg_img != 0; |
2035 | #endif |
2066 | #endif |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2067 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2037 | |
2068 | |
2038 | /* |
2069 | /* |
2039 | * B: reverse any characters which are selected |
2070 | * B: reverse any characters which are selected |
… | |
… | |
2043 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2074 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2044 | #if ENABLE_OVERLAY |
2075 | #if ENABLE_OVERLAY |
2045 | scr_swap_overlay (); |
2076 | scr_swap_overlay (); |
2046 | #endif |
2077 | #endif |
2047 | |
2078 | |
2048 | char showcursor = screen.flags & Screen_VisibleCursor; |
2079 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2049 | |
2080 | |
2050 | /* |
2081 | /* |
2051 | * C: set the cursor character (s) |
2082 | * C: set the cursor character (s) |
2052 | */ |
2083 | */ |
2053 | { |
2084 | { |
2054 | unsigned char setoldcursor; |
2085 | bool setoldcursor; |
2055 | |
2086 | |
2056 | #ifdef CURSOR_BLINK |
2087 | #ifdef CURSOR_BLINK |
2057 | if (hidden_cursor) |
2088 | if (hidden_cursor) |
2058 | showcursor = 0; |
2089 | showcursor = 0; |
2059 | #endif |
2090 | #endif |
… | |
… | |
2063 | int col = screen.cur.col; |
2094 | int col = screen.cur.col; |
2064 | |
2095 | |
2065 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2096 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2066 | col--; |
2097 | col--; |
2067 | |
2098 | |
2068 | crp = &ROW(screen.cur.row).r[col]; |
2099 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2100 | cur_col = col; |
2069 | |
2101 | |
2070 | #ifndef NO_CURSORCOLOR |
2102 | #ifndef NO_CURSORCOLOR |
2071 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2072 | if (ISSET_PIXCOLOR (Color_cursor)) |
2103 | if (ISSET_PIXCOLOR (Color_cursor)) |
2073 | ccol1 = Color_cursor; |
2104 | ccol1 = Color_cursor; |
2074 | else |
2105 | else |
2075 | #endif |
2106 | #endif |
2076 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2107 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2090 | ccol2 = Color_bg; |
2121 | ccol2 = Color_bg; |
2091 | #endif |
2122 | #endif |
2092 | |
2123 | |
2093 | if (focus) |
2124 | if (focus) |
2094 | { |
2125 | { |
|
|
2126 | rend_t rend = cur_rend; |
|
|
2127 | |
2095 | if (option (Opt_cursorUnderline)) |
2128 | if (option (Opt_cursorUnderline)) |
2096 | *crp ^= RS_Uline; |
2129 | rend ^= RS_Uline; |
2097 | else |
2130 | else |
2098 | { |
2131 | { |
2099 | *crp ^= RS_RVid; |
2132 | rend ^= RS_RVid; |
2100 | *crp = SET_FGCOLOR (*crp, ccol1); |
2133 | rend = SET_FGCOLOR (rend, ccol1); |
2101 | *crp = SET_BGCOLOR (*crp, ccol2); |
2134 | rend = SET_BGCOLOR (rend, ccol2); |
2102 | } |
2135 | } |
|
|
2136 | |
|
|
2137 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2103 | } |
2138 | } |
2104 | } |
2139 | } |
2105 | |
2140 | |
2106 | /* make sure no outline cursor is left around */ |
2141 | /* make sure no outline cursor is left around */ |
2107 | setoldcursor = 0; |
2142 | setoldcursor = 0; |
… | |
… | |
2146 | { |
2181 | { |
2147 | int16_t nits; |
2182 | int16_t nits; |
2148 | int i = num_scr; |
2183 | int i = num_scr; |
2149 | int j; |
2184 | int j; |
2150 | int len, wlen; |
2185 | int len, wlen; |
2151 | dLocal (int, num_scr); |
|
|
2152 | |
2186 | |
2153 | j = nrow; |
2187 | j = nrow; |
2154 | wlen = len = -1; |
2188 | wlen = len = -1; |
2155 | row = i > 0 ? 0 : j - 1; |
2189 | row = i > 0 ? 0 : j - 1; |
2156 | |
2190 | |
… | |
… | |
2231 | continue; |
2265 | continue; |
2232 | |
2266 | |
2233 | // redraw one or more characters |
2267 | // redraw one or more characters |
2234 | |
2268 | |
2235 | // seek to the beginning of wide characters |
2269 | // seek to the beginning of wide characters |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2270 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2237 | --col; |
2271 | --col; |
2238 | |
2272 | |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2273 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2240 | text_t *text = stp + col; |
2274 | text_t *text = stp + col; |
2241 | int count = 1; |
2275 | int count = 1; |
… | |
… | |
2279 | |
2313 | |
2280 | col--; /* went one too far. move back */ |
2314 | col--; /* went one too far. move back */ |
2281 | count -= i; /* dump any matching trailing chars */ |
2315 | count -= i; /* dump any matching trailing chars */ |
2282 | |
2316 | |
2283 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2317 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2284 | while (expect_false (i && text[count] == NOCHAR)) |
2318 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2285 | count++, i--; |
2319 | count++, i--; |
2286 | |
2320 | |
2287 | /* |
2321 | /* |
2288 | * Determine the attributes for the string |
2322 | * Determine the attributes for the string |
2289 | */ |
2323 | */ |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2324 | int fore = fgcolor_of (rend); // desired foreground |
2291 | int back = bgcolor_of (rend); // desired background |
2325 | int back = bgcolor_of (rend); // desired background |
2292 | |
2326 | |
2293 | // only do special processing if any attributes are set, which is unlikely |
2327 | // only do special processing if any attributes are set, which is unlikely |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2328 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2295 | { |
2329 | { |
2296 | bool invert = rend & RS_RVid; |
2330 | bool invert = rend & RS_RVid; |
2297 | |
2331 | |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2299 | if (rend & RS_Bold && fore == Color_fg) |
2333 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2388 | /* |
2422 | /* |
2389 | * Actually do the drawing of the string here |
2423 | * Actually do the drawing of the string here |
2390 | */ |
2424 | */ |
2391 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2425 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2392 | |
2426 | |
2393 | if (expect_true (have_bg && back == Color_bg)) |
2427 | if (ecb_likely (have_bg && back == Color_bg)) |
2394 | { |
2428 | { |
2395 | // this is very ugly, maybe push it into ->draw? |
2429 | // this is very ugly, maybe push it into ->draw? |
2396 | |
2430 | |
2397 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2431 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2398 | if (text[i] != ' ') |
2432 | if (text[i] != ' ') |
… | |
… | |
2405 | did_clear: ; |
2439 | did_clear: ; |
2406 | } |
2440 | } |
2407 | else |
2441 | else |
2408 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2442 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2409 | |
2443 | |
2410 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2444 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2411 | { |
2445 | { |
2412 | #if ENABLE_FRILLS |
2446 | #if ENABLE_FRILLS |
2413 | if (ISSET_PIXCOLOR (Color_underline)) |
2447 | if (ISSET_PIXCOLOR (Color_underline)) |
2414 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2448 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2415 | else |
2449 | else |
… | |
… | |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2461 | * G: cleanup cursor and display outline cursor if necessary |
2428 | */ |
2462 | */ |
2429 | if (showcursor) |
2463 | if (showcursor) |
2430 | { |
2464 | { |
2431 | if (focus) |
2465 | if (focus) |
2432 | { |
2466 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2433 | if (option (Opt_cursorUnderline)) |
|
|
2434 | *crp ^= RS_Uline; |
|
|
2435 | else |
|
|
2436 | { |
|
|
2437 | *crp ^= RS_RVid; |
|
|
2438 | #ifndef NO_CURSORCOLOR |
|
|
2439 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
|
|
2440 | #endif |
|
|
2441 | } |
|
|
2442 | } |
|
|
2443 | else if (oldcursor.row >= 0) |
2467 | else if (oldcursor.row >= 0) |
2444 | { |
2468 | { |
2445 | int cursorwidth = 1; |
2469 | int cursorwidth = 1; |
2446 | int col = oldcursor.col; |
2470 | int col = oldcursor.col; |
2447 | |
2471 | |
… | |
… | |
2461 | |
2485 | |
2462 | XDrawRectangle (dpy, vt, gc, |
2486 | XDrawRectangle (dpy, vt, gc, |
2463 | Col2Pixel (col), |
2487 | Col2Pixel (col), |
2464 | Row2Pixel (oldcursor.row), |
2488 | Row2Pixel (oldcursor.row), |
2465 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2489 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2466 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2490 | (unsigned int) (Height2Pixel (1) - 1)); |
2467 | } |
2491 | } |
2468 | } |
2492 | } |
2469 | |
2493 | |
2470 | /* |
2494 | /* |
2471 | * H: cleanup selection |
2495 | * H: cleanup selection |
… | |
… | |
2480 | screen.flags = old_screen_flags; |
2504 | screen.flags = old_screen_flags; |
2481 | num_scr = 0; |
2505 | num_scr = 0; |
2482 | num_scr_allow = 1; |
2506 | num_scr_allow = 1; |
2483 | } |
2507 | } |
2484 | |
2508 | |
2485 | void |
2509 | void ecb_cold |
2486 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2510 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2487 | { |
2511 | { |
2488 | if (!l.t) |
2512 | if (!l.valid ()) |
2489 | return; |
2513 | return; |
2490 | |
2514 | |
2491 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2515 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2492 | |
2516 | |
2493 | for (int i = ncol; i--; ) |
2517 | for (int i = ncol; i--; ) |
2494 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2518 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2495 | } |
2519 | } |
2496 | |
2520 | |
2497 | void |
2521 | void ecb_cold |
2498 | rxvt_term::scr_remap_chars () NOTHROW |
2522 | rxvt_term::scr_remap_chars () NOTHROW |
2499 | { |
2523 | { |
2500 | for (int i = total_rows; i--; ) |
2524 | for (int i = total_rows; i--; ) |
2501 | scr_remap_chars (row_buf [i]); |
2525 | scr_remap_chars (row_buf [i]); |
2502 | |
2526 | |
… | |
… | |
2505 | scr_remap_chars (drawn_buf [i]); |
2529 | scr_remap_chars (drawn_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2530 | scr_remap_chars (swap_buf [i]); |
2507 | } |
2531 | } |
2508 | } |
2532 | } |
2509 | |
2533 | |
2510 | void |
2534 | void ecb_cold |
2511 | rxvt_term::scr_recolour () NOTHROW |
2535 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2512 | { |
2536 | { |
2513 | #ifdef HAVE_BG_PIXMAP |
2537 | bool transparent = false; |
2514 | bgPixmap.apply (); |
|
|
2515 | #else |
|
|
2516 | |
2538 | |
|
|
2539 | #ifdef HAVE_IMG |
|
|
2540 | if (bg_img != 0) |
|
|
2541 | { |
|
|
2542 | # if ENABLE_TRANSPARENCY |
|
|
2543 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2544 | { |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
|
|
2546 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
|
|
2547 | |
|
|
2548 | transparent = true; |
|
|
2549 | } |
|
|
2550 | else |
|
|
2551 | # endif |
|
|
2552 | { |
|
|
2553 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2554 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
|
|
2555 | } |
|
|
2556 | } |
|
|
2557 | else |
|
|
2558 | #endif |
|
|
2559 | { |
2517 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2560 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2518 | XClearWindow (dpy, parent[0]); |
|
|
2519 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2561 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2562 | } |
|
|
2563 | |
|
|
2564 | XClearWindow (dpy, parent); |
2520 | |
2565 | |
2521 | if (scrollBar.win) |
2566 | if (scrollBar.win) |
2522 | { |
2567 | { |
|
|
2568 | if (transparent) |
|
|
2569 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2570 | else |
2523 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2571 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2524 | scrollBar.state = STATE_IDLE; |
2572 | scrollBar.state = SB_STATE_IDLE; |
2525 | scrollBar.show (0); |
2573 | scrollBar.show (0); |
2526 | } |
2574 | } |
2527 | |
2575 | |
2528 | #endif |
2576 | if (refresh) |
2529 | |
2577 | { |
2530 | /* bgPixmap.apply () does not do the following : */ |
|
|
2531 | scr_clear (); |
2578 | scr_clear (); |
2532 | scr_touch (true); |
2579 | scr_touch (true); |
|
|
2580 | } |
2533 | want_refresh = 1; |
2581 | want_refresh = 1; |
2534 | } |
2582 | } |
2535 | |
2583 | |
2536 | /* ------------------------------------------------------------------------- */ |
2584 | /* ------------------------------------------------------------------------- */ |
2537 | void |
2585 | void |
… | |
… | |
2594 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2642 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2595 | srp[col] ^= rstyle; |
2643 | srp[col] ^= rstyle; |
2596 | } |
2644 | } |
2597 | |
2645 | |
2598 | /* ------------------------------------------------------------------------- */ |
2646 | /* ------------------------------------------------------------------------- */ |
2599 | void |
2647 | void ecb_hot |
2600 | rxvt_term::scr_reverse_selection () NOTHROW |
2648 | rxvt_term::scr_reverse_selection () NOTHROW |
2601 | { |
2649 | { |
2602 | if (selection.op |
2650 | if (selection.op |
2603 | && current_screen == selection.screen |
2651 | && current_screen == selection.screen |
2604 | && selection.end.row >= view_start) |
2652 | && selection.end.row >= view_start) |
… | |
… | |
2623 | */ |
2671 | */ |
2624 | #if 0 |
2672 | #if 0 |
2625 | void |
2673 | void |
2626 | rxvt_term::scr_dump (int fd) NOTHROW |
2674 | rxvt_term::scr_dump (int fd) NOTHROW |
2627 | { |
2675 | { |
2628 | int row, wrote; |
2676 | // if this method is needed, it can be implemented by factoring the |
2629 | unsigned int width, towrite; |
2677 | // relevant code in scr_printscreen |
2630 | char r1[] = "\n"; |
|
|
2631 | |
|
|
2632 | for (row = saveLines + top_row; |
|
|
2633 | row < saveLines + nrow - 1; row++) |
|
|
2634 | { |
|
|
2635 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2636 | : ncol; |
|
|
2637 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2638 | { |
|
|
2639 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2640 | towrite); |
|
|
2641 | if (wrote < 0) |
|
|
2642 | return; /* XXX: death, no report */ |
|
|
2643 | } |
|
|
2644 | if (row_buf[row].l >= 0) |
|
|
2645 | if (write (fd, r1, 1) <= 0) |
|
|
2646 | return; /* XXX: death, no report */ |
|
|
2647 | } |
|
|
2648 | } |
2678 | } |
2649 | #endif |
2679 | #endif |
2650 | |
2680 | |
2651 | /* ------------------------------------------------------------------------- * |
2681 | /* ------------------------------------------------------------------------- * |
2652 | * CHARACTER SELECTION * |
2682 | * CHARACTER SELECTION * |
2653 | * ------------------------------------------------------------------------- */ |
2683 | * ------------------------------------------------------------------------- */ |
2654 | void |
2684 | void |
2655 | rxvt_term::selection_check (int check_more) NOTHROW |
2685 | rxvt_term::selection_check (int check_more) NOTHROW |
2656 | { |
2686 | { |
2657 | row_col_t pos; |
|
|
2658 | |
|
|
2659 | if (!selection.op) |
2687 | if (!selection.op) |
2660 | return; |
2688 | return; |
2661 | |
2689 | |
2662 | pos.row = pos.col = 0; |
|
|
2663 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2690 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2664 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2665 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2692 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2666 | || (check_more == 1 |
2693 | || (check_more == 1 |
2667 | && current_screen == selection.screen |
2694 | && current_screen == selection.screen |
2668 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2695 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2669 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2696 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2670 | || (check_more == 2 |
|
|
2671 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2672 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2673 | || (check_more == 3 |
|
|
2674 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2675 | || (check_more == 4 /* screen width change */ |
|
|
2676 | && (selection.beg.row != selection.end.row |
|
|
2677 | || selection.end.col > ncol))) |
|
|
2678 | CLEAR_SELECTION (); |
2697 | CLEAR_ALL_SELECTION (); |
|
|
2698 | } |
|
|
2699 | |
|
|
2700 | void |
|
|
2701 | rxvt_term::selection_changed () NOTHROW |
|
|
2702 | { |
|
|
2703 | line_t &r1 = ROW (selection.beg.row); |
|
|
2704 | while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) |
|
|
2705 | --selection.beg.col; |
|
|
2706 | |
|
|
2707 | line_t &r2 = ROW (selection.end.row); |
|
|
2708 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2709 | ++selection.end.col; |
|
|
2710 | |
|
|
2711 | want_refresh = 1; |
2679 | } |
2712 | } |
2680 | |
2713 | |
2681 | /* ------------------------------------------------------------------------- */ |
2714 | /* ------------------------------------------------------------------------- */ |
2682 | /* |
2715 | /* |
2683 | * Paste a selection direct to the command fd |
2716 | * Paste a selection direct to the command fd |
… | |
… | |
2689 | for (unsigned int i = 0; i < len; i++) |
2722 | for (unsigned int i = 0; i < len; i++) |
2690 | if (data[i] == C0_LF) |
2723 | if (data[i] == C0_LF) |
2691 | data[i] = C0_CR; |
2724 | data[i] = C0_CR; |
2692 | |
2725 | |
2693 | if (priv_modes & PrivMode_BracketPaste) |
2726 | if (priv_modes & PrivMode_BracketPaste) |
2694 | tt_printf ("\e[200~"); |
2727 | tt_printf ("\x1b[200~"); |
2695 | |
2728 | |
2696 | tt_write (data, len); |
2729 | tt_write (data, len); |
2697 | |
2730 | |
2698 | if (priv_modes & PrivMode_BracketPaste) |
2731 | if (priv_modes & PrivMode_BracketPaste) |
2699 | tt_printf ("\e[201~"); |
2732 | tt_printf ("\x1b[201~"); |
2700 | } |
2733 | } |
2701 | |
2734 | |
2702 | void |
2735 | void |
2703 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2736 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2704 | { |
2737 | { |
… | |
… | |
2708 | tt_paste (data, len); |
2741 | tt_paste (data, len); |
2709 | } |
2742 | } |
2710 | |
2743 | |
2711 | /* ------------------------------------------------------------------------- */ |
2744 | /* ------------------------------------------------------------------------- */ |
2712 | /* |
2745 | /* |
2713 | * Respond to a notification that a primary selection has been sent |
2746 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2714 | * EXT: SelectionNotify |
2747 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2715 | */ |
2748 | * as fallback |
2716 | void |
|
|
2717 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
|
|
2718 | { |
|
|
2719 | if (prop == None) /* check for failed XConvertSelection */ |
|
|
2720 | { |
|
|
2721 | if ((selection_type & Sel_CompoundText)) |
|
|
2722 | { |
|
|
2723 | int selnum = selection_type & Sel_whereMask; |
|
|
2724 | |
|
|
2725 | selection_type = 0; |
|
|
2726 | if (selnum != Sel_direct) |
|
|
2727 | selection_request_other (XA_STRING, selnum); |
|
|
2728 | } |
|
|
2729 | |
|
|
2730 | if ((selection_type & Sel_UTF8String)) |
|
|
2731 | { |
|
|
2732 | int selnum = selection_type & Sel_whereMask; |
|
|
2733 | |
|
|
2734 | selection_type = Sel_CompoundText; |
|
|
2735 | if (selnum != Sel_direct) |
|
|
2736 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2737 | else |
|
|
2738 | selection_type = 0; |
|
|
2739 | } |
|
|
2740 | |
|
|
2741 | return; |
|
|
2742 | } |
|
|
2743 | |
|
|
2744 | unsigned long bytes_after; |
|
|
2745 | XTextProperty ct; |
|
|
2746 | |
|
|
2747 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2748 | 0, PROP_SIZE / 4, |
|
|
2749 | delete_prop, AnyPropertyType, |
|
|
2750 | &ct.encoding, &ct.format, |
|
|
2751 | &ct.nitems, &bytes_after, |
|
|
2752 | &ct.value) != Success) |
|
|
2753 | { |
|
|
2754 | ct.value = 0; |
|
|
2755 | goto bailout; |
|
|
2756 | } |
|
|
2757 | |
|
|
2758 | if (ct.encoding == None) |
|
|
2759 | goto bailout; |
|
|
2760 | |
|
|
2761 | if (bytes_after) |
|
|
2762 | { |
|
|
2763 | // fetch and append remaining data |
|
|
2764 | XTextProperty ct2; |
|
|
2765 | |
|
|
2766 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2767 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2768 | delete_prop, AnyPropertyType, |
|
|
2769 | &ct2.encoding, &ct2.format, |
|
|
2770 | &ct2.nitems, &bytes_after, |
|
|
2771 | &ct2.value) != Success) |
|
|
2772 | goto bailout; |
|
|
2773 | |
|
|
2774 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2775 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2776 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2777 | ct.nitems += ct2.nitems; |
|
|
2778 | |
|
|
2779 | XFree (ct2.value); |
|
|
2780 | } |
|
|
2781 | |
|
|
2782 | if (ct.value == 0) |
|
|
2783 | goto bailout; |
|
|
2784 | |
|
|
2785 | if (ct.encoding == xa[XA_INCR]) |
|
|
2786 | { |
|
|
2787 | // INCR selection, start handshake |
|
|
2788 | if (!delete_prop) |
|
|
2789 | XDeleteProperty (dpy, win, prop); |
|
|
2790 | |
|
|
2791 | selection_wait = Sel_incr; |
|
|
2792 | incr_buf_fill = 0; |
|
|
2793 | incr_ev.start (10); |
|
|
2794 | |
|
|
2795 | goto bailout; |
|
|
2796 | } |
|
|
2797 | |
|
|
2798 | if (ct.nitems == 0) |
|
|
2799 | { |
|
|
2800 | if (selection_wait == Sel_incr) |
|
|
2801 | { |
|
|
2802 | XFree (ct.value); |
|
|
2803 | |
|
|
2804 | // finally complete, now paste the whole thing |
|
|
2805 | selection_wait = Sel_normal; |
|
|
2806 | ct.value = (unsigned char *)incr_buf; |
|
|
2807 | ct.nitems = incr_buf_fill; |
|
|
2808 | incr_buf = 0; |
|
|
2809 | incr_buf_size = 0; |
|
|
2810 | incr_ev.stop (); |
|
|
2811 | } |
|
|
2812 | else |
|
|
2813 | { |
|
|
2814 | if (selection_wait == Sel_normal |
|
|
2815 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2816 | { |
|
|
2817 | /* |
|
|
2818 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2819 | * XConvertSelection () but nothing was presented |
|
|
2820 | */ |
|
|
2821 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2822 | } |
|
|
2823 | |
|
|
2824 | goto bailout; |
|
|
2825 | } |
|
|
2826 | } |
|
|
2827 | else if (selection_wait == Sel_incr) |
|
|
2828 | { |
|
|
2829 | incr_ev.start (10); |
|
|
2830 | |
|
|
2831 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2832 | { |
|
|
2833 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2834 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2835 | } |
|
|
2836 | |
|
|
2837 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2838 | incr_buf_fill += ct.nitems; |
|
|
2839 | |
|
|
2840 | goto bailout; |
|
|
2841 | } |
|
|
2842 | |
|
|
2843 | char **cl; |
|
|
2844 | int cr; |
|
|
2845 | |
|
|
2846 | #if !ENABLE_MINIMAL |
|
|
2847 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2848 | // so recode it manually |
|
|
2849 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2850 | { |
|
|
2851 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2852 | char *s = rxvt_wcstombs (w); |
|
|
2853 | free (w); |
|
|
2854 | // TODO: strlen == only the first element will be converted. well... |
|
|
2855 | paste (s, strlen (s)); |
|
|
2856 | free (s); |
|
|
2857 | } |
|
|
2858 | else |
|
|
2859 | #endif |
|
|
2860 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2861 | && cl) |
|
|
2862 | { |
|
|
2863 | for (int i = 0; i < cr; i++) |
|
|
2864 | paste (cl[i], strlen (cl[i])); |
|
|
2865 | |
|
|
2866 | XFreeStringList (cl); |
|
|
2867 | } |
|
|
2868 | else |
|
|
2869 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2870 | |
|
|
2871 | bailout: |
|
|
2872 | XFree (ct.value); |
|
|
2873 | |
|
|
2874 | if (selection_wait == Sel_normal) |
|
|
2875 | selection_wait = Sel_none; |
|
|
2876 | } |
|
|
2877 | |
|
|
2878 | void |
|
|
2879 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2880 | { |
|
|
2881 | selection_wait = Sel_none; |
|
|
2882 | |
|
|
2883 | incr_buf_size = 0; |
|
|
2884 | free (incr_buf); |
|
|
2885 | |
|
|
2886 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2887 | } |
|
|
2888 | |
|
|
2889 | void |
|
|
2890 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2891 | { |
|
|
2892 | if (prop == None || selection_wait != Sel_incr) |
|
|
2893 | return; |
|
|
2894 | |
|
|
2895 | selection_paste (win, prop, true); |
|
|
2896 | } |
|
|
2897 | |
|
|
2898 | /* ------------------------------------------------------------------------- */ |
|
|
2899 | /* |
|
|
2900 | * Request the current selection: |
|
|
2901 | * Order: > internal selection if available |
|
|
2902 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
|
|
2903 | * > CUT_BUFFER0 |
|
|
2904 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2905 | * will auto fallback to CUT_BUFFER0 |
|
|
2906 | * EXT: button 2 release |
2749 | * EXT: button 2 release |
2907 | */ |
2750 | */ |
2908 | void |
2751 | void |
2909 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2752 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2910 | { |
2753 | { |
2911 | if (selection.text && selnum == Sel_Primary) |
2754 | if (!selection_req) |
2912 | { |
|
|
2913 | /* internal selection */ |
|
|
2914 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2915 | paste (str, strlen (str)); |
|
|
2916 | free (str); |
|
|
2917 | return; |
|
|
2918 | } |
2755 | { |
2919 | else |
2756 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2757 | selection_req->run (); |
2920 | { |
2758 | } |
2921 | selection_request_time = tm; |
|
|
2922 | selection_wait = Sel_normal; |
|
|
2923 | |
|
|
2924 | #if X_HAVE_UTF8_STRING |
|
|
2925 | selection_type = Sel_UTF8String; |
|
|
2926 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2927 | return; |
|
|
2928 | #else |
|
|
2929 | selection_type = Sel_CompoundText; |
|
|
2930 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2931 | return; |
|
|
2932 | #endif |
|
|
2933 | } |
|
|
2934 | |
|
|
2935 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2936 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2937 | } |
|
|
2938 | |
|
|
2939 | int |
|
|
2940 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2941 | { |
|
|
2942 | Atom sel; |
|
|
2943 | |
|
|
2944 | selection_type |= selnum; |
|
|
2945 | |
|
|
2946 | if (selnum == Sel_Primary) |
|
|
2947 | sel = XA_PRIMARY; |
|
|
2948 | else if (selnum == Sel_Secondary) |
|
|
2949 | sel = XA_SECONDARY; |
|
|
2950 | else |
|
|
2951 | sel = xa[XA_CLIPBOARD]; |
|
|
2952 | |
|
|
2953 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2954 | { |
|
|
2955 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2956 | vt, selection_request_time); |
|
|
2957 | return 1; |
|
|
2958 | } |
|
|
2959 | |
|
|
2960 | return 0; |
|
|
2961 | } |
2759 | } |
2962 | |
2760 | |
2963 | /* ------------------------------------------------------------------------- */ |
2761 | /* ------------------------------------------------------------------------- */ |
2964 | /* |
2762 | /* |
2965 | * Clear all selected text |
2763 | * Clear all selected text |
… | |
… | |
2996 | * EXT: button 1 or 3 release |
2794 | * EXT: button 1 or 3 release |
2997 | */ |
2795 | */ |
2998 | void |
2796 | void |
2999 | rxvt_term::selection_make (Time tm) |
2797 | rxvt_term::selection_make (Time tm) |
3000 | { |
2798 | { |
3001 | int i; |
2799 | int size; |
3002 | wchar_t *new_selection_text; |
2800 | wchar_t *new_selection_text; |
3003 | text_t *t; |
2801 | text_t *t; |
3004 | |
2802 | |
3005 | switch (selection.op) |
2803 | switch (selection.op) |
3006 | { |
2804 | { |
… | |
… | |
3022 | return; /* nothing selected, go away */ |
2820 | return; /* nothing selected, go away */ |
3023 | |
2821 | |
3024 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2822 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3025 | return; |
2823 | return; |
3026 | |
2824 | |
3027 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2825 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3028 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2826 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3029 | |
2827 | |
3030 | int ofs = 0; |
2828 | int ofs = 0; |
3031 | int extra = 0; |
2829 | int extra = 0; |
3032 | |
2830 | |
3033 | int col = selection.beg.col; |
2831 | int col = selection.beg.col; |
… | |
… | |
3039 | { |
2837 | { |
3040 | #if !ENABLE_MINIMAL |
2838 | #if !ENABLE_MINIMAL |
3041 | if (selection.rect) |
2839 | if (selection.rect) |
3042 | { |
2840 | { |
3043 | col = selection.beg.col; |
2841 | col = selection.beg.col; |
3044 | end_col = ncol + 1; |
2842 | end_col = selection.end.col; |
3045 | } |
2843 | } |
3046 | else |
2844 | else |
3047 | #endif |
2845 | #endif |
3048 | end_col = ROW(row).l; |
2846 | end_col = ROW(row).l; |
3049 | |
2847 | |
3050 | col = max (col, 0); |
2848 | col = max (col, 0); |
3051 | |
2849 | |
3052 | if (row == selection.end.row |
2850 | if (row == selection.end.row) |
3053 | #if !ENABLE_MINIMAL |
|
|
3054 | || selection.rect |
|
|
3055 | #endif |
|
|
3056 | ) |
|
|
3057 | min_it (end_col, selection.end.col); |
2851 | min_it (end_col, selection.end.col); |
3058 | |
2852 | |
3059 | t = ROW(row).t + col; |
2853 | t = ROW(row).t + col; |
3060 | |
2854 | |
3061 | for (; col < end_col; col++) |
2855 | for (; col < end_col; col++) |
… | |
… | |
3069 | |
2863 | |
3070 | extra -= (len - 1); |
2864 | extra -= (len - 1); |
3071 | |
2865 | |
3072 | if (extra < 0) |
2866 | if (extra < 0) |
3073 | { |
2867 | { |
3074 | extra += i; |
2868 | extra += size; |
3075 | i += i; |
2869 | size += size; |
3076 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2870 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3077 | } |
2871 | } |
3078 | |
2872 | |
3079 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2873 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3080 | } |
2874 | } |
3081 | #endif |
2875 | #endif |
… | |
… | |
3093 | |
2887 | |
3094 | new_selection_text[ofs++] = C0_LF; |
2888 | new_selection_text[ofs++] = C0_LF; |
3095 | } |
2889 | } |
3096 | else |
2890 | else |
3097 | #endif |
2891 | #endif |
3098 | if (!ROW(row).is_longer () && row != selection.end.row) |
2892 | if (!ROW(row).is_longer () |
|
|
2893 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2894 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3099 | new_selection_text[ofs++] = C0_LF; |
2895 | new_selection_text[ofs++] = C0_LF; |
3100 | } |
2896 | } |
3101 | |
|
|
3102 | if (end_col != selection.end.col) |
|
|
3103 | new_selection_text[ofs++] = C0_LF; |
|
|
3104 | |
2897 | |
3105 | new_selection_text[ofs] = 0; |
2898 | new_selection_text[ofs] = 0; |
3106 | |
2899 | |
3107 | if (ofs == 0) |
2900 | if (ofs == 0) |
3108 | { |
2901 | { |
… | |
… | |
3164 | /* ------------------------------------------------------------------------- */ |
2957 | /* ------------------------------------------------------------------------- */ |
3165 | /* |
2958 | /* |
3166 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2959 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3167 | * EXT: button 1 press |
2960 | * EXT: button 1 press |
3168 | */ |
2961 | */ |
3169 | void |
2962 | void ecb_cold |
3170 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2963 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3171 | { |
2964 | { |
3172 | clicks = ((clicks - 1) % 3) + 1; |
2965 | clicks = ((clicks - 1) % 3) + 1; |
3173 | selection.clicks = clicks; /* save clicks so extend will work */ |
2966 | selection.clicks = clicks; /* save clicks so extend will work */ |
3174 | |
2967 | |
… | |
… | |
3193 | |
2986 | |
3194 | /* ------------------------------------------------------------------------- */ |
2987 | /* ------------------------------------------------------------------------- */ |
3195 | /* |
2988 | /* |
3196 | * Mark a selection at the specified col/row |
2989 | * Mark a selection at the specified col/row |
3197 | */ |
2990 | */ |
3198 | void |
2991 | void ecb_cold |
3199 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2992 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3200 | { |
2993 | { |
3201 | want_refresh = 1; |
2994 | want_refresh = 1; |
3202 | |
2995 | |
3203 | selection.mark.row = row + view_start; |
2996 | selection.mark.row = row + view_start; |
… | |
… | |
3226 | * Word select: select text for 2 clicks |
3019 | * Word select: select text for 2 clicks |
3227 | * We now only find out the boundary in one direction |
3020 | * We now only find out the boundary in one direction |
3228 | */ |
3021 | */ |
3229 | |
3022 | |
3230 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3023 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3231 | #define DELIMIT_TEXT(x) \ |
3024 | #define DELIMIT_TEXT(x) \ |
3232 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3025 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3233 | #define DELIMIT_REND(x) 1 |
3026 | #define DELIMIT_REND(x) 1 |
3234 | |
3027 | |
3235 | void |
3028 | void ecb_cold |
3236 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3029 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3237 | { |
3030 | { |
3238 | int col, row, dirnadd, tcol, trow, w1, w2; |
3031 | int col, row, dirnadd, tcol, trow, w1, w2; |
3239 | row_col_t bound; |
3032 | row_col_t bound; |
3240 | text_t *stp; |
3033 | text_t *stp; |
… | |
… | |
3314 | * EXT: button 3 press; button 1 or 3 drag |
3107 | * EXT: button 3 press; button 1 or 3 drag |
3315 | * flag == 0 ==> button 1 |
3108 | * flag == 0 ==> button 1 |
3316 | * flag == 1 ==> button 3 press |
3109 | * flag == 1 ==> button 3 press |
3317 | * flag == 2 ==> button 3 motion |
3110 | * flag == 2 ==> button 3 motion |
3318 | */ |
3111 | */ |
3319 | void |
3112 | void ecb_cold |
3320 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3113 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3321 | { |
3114 | { |
3322 | int col = clamp (Pixel2Col (x), 0, ncol); |
3115 | int col = clamp (Pixel2Col (x), 0, ncol); |
3323 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3116 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3324 | |
3117 | |
… | |
… | |
3350 | |
3143 | |
3351 | /* ------------------------------------------------------------------------- */ |
3144 | /* ------------------------------------------------------------------------- */ |
3352 | /* |
3145 | /* |
3353 | * Extend the selection to the specified col/row |
3146 | * Extend the selection to the specified col/row |
3354 | */ |
3147 | */ |
3355 | void |
3148 | void ecb_cold |
3356 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3149 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3357 | { |
3150 | { |
3358 | row_col_t pos; |
3151 | row_col_t pos; |
3359 | enum { |
3152 | enum { |
3360 | LEFT, RIGHT |
3153 | LEFT, RIGHT |
3361 | } closeto = RIGHT; |
3154 | } closeto = RIGHT; |
3362 | |
|
|
3363 | want_refresh = 1; |
|
|
3364 | |
3155 | |
3365 | switch (selection.op) |
3156 | switch (selection.op) |
3366 | { |
3157 | { |
3367 | case SELECTION_INIT: |
3158 | case SELECTION_INIT: |
3368 | CLEAR_SELECTION (); |
3159 | CLEAR_SELECTION (); |
… | |
… | |
3548 | |
3339 | |
3549 | #if !ENABLE_MINIMAL |
3340 | #if !ENABLE_MINIMAL |
3550 | if (selection.rect && selection.beg.col > selection.end.col) |
3341 | if (selection.rect && selection.beg.col > selection.end.col) |
3551 | ::swap (selection.beg.col, selection.end.col); |
3342 | ::swap (selection.beg.col, selection.end.col); |
3552 | #endif |
3343 | #endif |
|
|
3344 | |
|
|
3345 | selection_changed (); |
3553 | } |
3346 | } |
3554 | |
3347 | |
3555 | #if !ENABLE_MINIMAL |
3348 | #if !ENABLE_MINIMAL |
3556 | void |
3349 | void ecb_cold |
3557 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3350 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3558 | { |
3351 | { |
3559 | int32_t end_col, end_row; |
3352 | int32_t end_col, end_row; |
3560 | text_t *stp; |
3353 | text_t *stp; |
3561 | |
3354 | |
… | |
… | |
3599 | /* ------------------------------------------------------------------------- */ |
3392 | /* ------------------------------------------------------------------------- */ |
3600 | /* |
3393 | /* |
3601 | * Double click on button 3 when already selected |
3394 | * Double click on button 3 when already selected |
3602 | * EXT: button 3 double click |
3395 | * EXT: button 3 double click |
3603 | */ |
3396 | */ |
3604 | void |
3397 | void ecb_cold |
3605 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3398 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3606 | { |
3399 | { |
3607 | selection.clicks = selection.clicks % 3 + 1; |
3400 | selection.clicks = selection.clicks % 3 + 1; |
3608 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3401 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3609 | } |
3402 | } |
… | |
… | |
3611 | /* ------------------------------------------------------------------------- */ |
3404 | /* ------------------------------------------------------------------------- */ |
3612 | /* |
3405 | /* |
3613 | * Respond to a request for our current selection |
3406 | * Respond to a request for our current selection |
3614 | * EXT: SelectionRequest |
3407 | * EXT: SelectionRequest |
3615 | */ |
3408 | */ |
3616 | void |
3409 | void ecb_cold |
3617 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3410 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3618 | { |
3411 | { |
|
|
3412 | Atom property = rq.property == None ? rq.target : rq.property; |
3619 | XSelectionEvent ev; |
3413 | XSelectionEvent ev; |
3620 | |
3414 | |
3621 | ev.type = SelectionNotify; |
3415 | ev.type = SelectionNotify; |
3622 | ev.property = None; |
3416 | ev.property = None; |
3623 | ev.display = rq.display; |
3417 | ev.display = rq.display; |
… | |
… | |
3638 | *target++ = xa[XA_COMPOUND_TEXT]; |
3432 | *target++ = xa[XA_COMPOUND_TEXT]; |
3639 | #if X_HAVE_UTF8_STRING |
3433 | #if X_HAVE_UTF8_STRING |
3640 | *target++ = xa[XA_UTF8_STRING]; |
3434 | *target++ = xa[XA_UTF8_STRING]; |
3641 | #endif |
3435 | #endif |
3642 | |
3436 | |
3643 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3437 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3644 | 32, PropModeReplace, |
3438 | 32, PropModeReplace, |
3645 | (unsigned char *)target_list, target - target_list); |
3439 | (unsigned char *)target_list, target - target_list); |
3646 | ev.property = rq.property; |
3440 | ev.property = property; |
3647 | } |
3441 | } |
3648 | #if TODO // TODO |
3442 | #if TODO // TODO |
3649 | else if (rq.target == xa[XA_MULTIPLE]) |
3443 | else if (rq.target == xa[XA_MULTIPLE]) |
3650 | { |
3444 | { |
3651 | /* TODO: Handle MULTIPLE */ |
3445 | /* TODO: Handle MULTIPLE */ |
3652 | } |
3446 | } |
3653 | #endif |
3447 | #endif |
3654 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3448 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3655 | { |
3449 | { |
3656 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3450 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3657 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3451 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3658 | ev.property = rq.property; |
3452 | ev.property = property; |
3659 | } |
3453 | } |
3660 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3454 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3661 | { |
3455 | { |
3662 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3456 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3663 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3457 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3664 | ev.property = rq.property; |
3458 | ev.property = property; |
3665 | } |
3459 | } |
3666 | else if (rq.target == XA_STRING |
3460 | else if (rq.target == XA_STRING |
3667 | || rq.target == xa[XA_TEXT] |
3461 | || rq.target == xa[XA_TEXT] |
3668 | || rq.target == xa[XA_COMPOUND_TEXT] |
3462 | || rq.target == xa[XA_COMPOUND_TEXT] |
3669 | || rq.target == xa[XA_UTF8_STRING] |
3463 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3740 | ct.value = (unsigned char *)cl; |
3534 | ct.value = (unsigned char *)cl; |
3741 | ct.nitems = selectlen; |
3535 | ct.nitems = selectlen; |
3742 | ct.encoding = target; |
3536 | ct.encoding = target; |
3743 | } |
3537 | } |
3744 | |
3538 | |
3745 | XChangeProperty (dpy, rq.requestor, rq.property, |
3539 | XChangeProperty (dpy, rq.requestor, property, |
3746 | ct.encoding, 8, PropModeReplace, |
3540 | ct.encoding, 8, PropModeReplace, |
3747 | ct.value, (int)ct.nitems); |
3541 | ct.value, (int)ct.nitems); |
3748 | ev.property = rq.property; |
3542 | ev.property = property; |
3749 | |
3543 | |
3750 | if (freect) |
3544 | if (freect) |
3751 | XFree (ct.value); |
3545 | XFree (ct.value); |
3752 | } |
3546 | } |
3753 | |
3547 | |
3754 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3548 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3755 | } |
3549 | } |
3756 | |
3550 | |
3757 | /* ------------------------------------------------------------------------- */ |
3551 | /* ------------------------------------------------------------------------- */ |
3758 | #ifdef USE_XIM |
3552 | #if USE_XIM |
3759 | void |
3553 | void ecb_cold |
3760 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3554 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3761 | { |
3555 | { |
3762 | XWindowAttributes xwa; |
3556 | XWindowAttributes xwa; |
3763 | |
3557 | |
3764 | XGetWindowAttributes (dpy, vt, &xwa); |
3558 | XGetWindowAttributes (dpy, vt, &xwa); |