… | |
… | |
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; |
… | |
… | |
49 | if (option (Opt_scrollTtyOutput)) \ |
47 | if (option (Opt_scrollTtyOutput)) \ |
50 | view_start = 0 |
48 | view_start = 0 |
51 | #define CLEAR_SELECTION() \ |
49 | #define CLEAR_SELECTION() \ |
52 | selection.beg.row = selection.beg.col \ |
50 | selection.beg.row = selection.beg.col \ |
53 | = selection.end.row = selection.end.col = 0 |
51 | = selection.end.row = selection.end.col = 0 |
54 | #define CLEAR_SELECTION_MARK() \ |
52 | #define CLEAR_ALL_SELECTION() \ |
|
|
53 | selection.beg.row = selection.beg.col \ |
|
|
54 | = selection.mark.row = selection.mark.col \ |
55 | selection.mark.row = selection.mark.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
56 | |
56 | |
57 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
57 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
58 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
58 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
59 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
59 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
60 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
60 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
… | |
… | |
96 | |
96 | |
97 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
98 | void |
98 | void |
99 | 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 |
100 | { |
100 | { |
101 | if (!l.t) |
101 | if (!l.valid ()) |
102 | { |
102 | { |
103 | lalloc (l); |
103 | l.alloc (); |
104 | col = 0; |
104 | col = 0; |
105 | width = ncol; |
105 | width = ncol; |
106 | } |
106 | } |
107 | |
107 | |
108 | l.touch (); |
108 | l.touch (); |
… | |
… | |
150 | l.r[col] = rend; |
150 | l.r[col] = rend; |
151 | col++; |
151 | col++; |
152 | } while (col < ncol && l.t[col] == NOCHAR); |
152 | } while (col < ncol && l.t[col] == NOCHAR); |
153 | } |
153 | } |
154 | |
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 | |
155 | /* ------------------------------------------------------------------------- * |
165 | /* ------------------------------------------------------------------------- * |
156 | * SCREEN INITIALISATION * |
166 | * SCREEN INITIALISATION * |
157 | * ------------------------------------------------------------------------- */ |
167 | * ------------------------------------------------------------------------- */ |
158 | |
168 | |
159 | 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 |
160 | rxvt_term::scr_reset () |
214 | rxvt_term::scr_reset () |
161 | { |
215 | { |
162 | #if ENABLE_OVERLAY |
216 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
217 | scr_overlay_off (); |
164 | #endif |
218 | #endif |
… | |
… | |
190 | total_rows = nrow + saveLines; |
244 | total_rows = nrow + saveLines; |
191 | |
245 | |
192 | screen.tscroll = 0; |
246 | screen.tscroll = 0; |
193 | screen.bscroll = nrow - 1; |
247 | screen.bscroll = nrow - 1; |
194 | |
248 | |
|
|
249 | void *prev_chunk = chunk; |
|
|
250 | size_t prev_chunk_size = chunk_size; |
|
|
251 | line_t *prev_drawn_buf = drawn_buf; |
|
|
252 | line_t *prev_swap_buf = swap_buf; |
|
|
253 | line_t *prev_row_buf = row_buf; |
|
|
254 | |
|
|
255 | scr_alloc (); |
|
|
256 | |
195 | if (!row_buf) |
257 | if (!prev_row_buf) |
196 | { |
258 | { |
197 | /* |
|
|
198 | * first time called so just malloc everything: don't rely on realloc |
|
|
199 | */ |
|
|
200 | top_row = 0; |
259 | top_row = 0; |
201 | term_start = 0; |
260 | term_start = 0; |
202 | |
|
|
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
205 | |
|
|
206 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
|
|
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
209 | |
|
|
210 | for (int row = nrow; row--; ) |
|
|
211 | { |
|
|
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
214 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
215 | } |
|
|
216 | |
261 | |
217 | memset (charsets, 'B', sizeof (charsets)); |
262 | memset (charsets, 'B', sizeof (charsets)); |
218 | rstyle = DEFAULT_RSTYLE; |
263 | rstyle = DEFAULT_RSTYLE; |
219 | screen.flags = Screen_DefaultFlags; |
264 | screen.flags = Screen_DefaultFlags; |
220 | screen.cur.row = screen.cur.col = 0; |
265 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
243 | { |
288 | { |
244 | /* |
289 | /* |
245 | * add or delete rows as appropriate |
290 | * add or delete rows as appropriate |
246 | */ |
291 | */ |
247 | |
292 | |
248 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
293 | int common_col = min (prev_ncol, ncol); |
249 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
250 | |
|
|
251 | #if 0 |
|
|
252 | if (nrow < prev_nrow) |
|
|
253 | { |
|
|
254 | for (int row = nrow; row < prev_nrow; row++) |
|
|
255 | { |
|
|
256 | lfree (swap_buf [row]); |
|
|
257 | lfree (drawn_buf[row]); |
|
|
258 | } |
|
|
259 | } |
|
|
260 | #endif |
|
|
261 | |
|
|
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
264 | |
294 | |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
295 | for (int row = min (nrow, prev_nrow); row--; ) |
266 | { |
296 | { |
267 | lresize (drawn_buf[row]); |
297 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
268 | lresize (swap_buf [row]); |
298 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
269 | } |
299 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
270 | |
300 | |
271 | for (int row = prev_nrow; row < nrow; row++) |
301 | copy_line (swap_buf [row], prev_swap_buf [row]); |
272 | { |
302 | } |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
275 | } |
|
|
276 | |
|
|
277 | line_t *old_buf = row_buf; |
|
|
278 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
279 | |
303 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
304 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
305 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
306 | int q = total_rows; // rewrapped row |
283 | |
307 | |
… | |
… | |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
315 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | |
316 | |
293 | do |
317 | do |
294 | { |
318 | { |
295 | p = MOD (p - 1, prev_total_rows); |
319 | p = MOD (p - 1, prev_total_rows); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
320 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
297 | int plines = 1; |
321 | int plines = 1; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
322 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
299 | |
323 | |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
324 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
301 | { |
325 | { |
302 | p = MOD (p - 1, prev_total_rows); |
326 | p = MOD (p - 1, prev_total_rows); |
303 | |
327 | |
304 | plines++; |
328 | plines++; |
305 | llen += prev_ncol; |
329 | llen += prev_ncol; |
… | |
… | |
318 | |
342 | |
319 | // re-assemble the full line by destination lines |
343 | // re-assemble the full line by destination lines |
320 | for (int qrow = q; qlines--; qrow++) |
344 | for (int qrow = q; qlines--; qrow++) |
321 | { |
345 | { |
322 | qline = row_buf + qrow; |
346 | qline = row_buf + qrow; |
323 | lalloc (*qline); |
347 | qline->alloc (); // redundant with next line |
324 | qline->l = ncol; |
348 | qline->l = ncol; |
325 | qline->is_longer (1); |
349 | qline->is_longer (1); |
326 | |
350 | |
327 | int qcol = 0; |
351 | int qcol = 0; |
328 | |
352 | |
… | |
… | |
343 | // this seems to upset applications/shells/readline |
367 | // this seems to upset applications/shells/readline |
344 | // least. |
368 | // least. |
345 | if (prow == ocur.row) |
369 | if (prow == ocur.row) |
346 | screen.cur.row = q - (total_rows - nrow); |
370 | screen.cur.row = q - (total_rows - nrow); |
347 | |
371 | |
348 | line_t &pline = old_buf [prow]; |
372 | line_t &pline = prev_row_buf [prow]; |
349 | |
373 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
374 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
375 | |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
376 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
377 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
374 | { |
398 | { |
375 | // if no scrollback exists (yet), wing, instead of wrap |
399 | // if no scrollback exists (yet), wing, instead of wrap |
376 | |
400 | |
377 | for (int row = min (nrow, prev_nrow); row--; ) |
401 | for (int row = min (nrow, prev_nrow); row--; ) |
378 | { |
402 | { |
379 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
403 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
380 | line_t &qline = row_buf [row]; |
404 | line_t &dst = row_buf [row]; |
381 | |
405 | |
382 | qline = pline; |
406 | copy_line (dst, src); |
383 | lresize (qline); |
|
|
384 | } |
407 | } |
385 | |
408 | |
386 | for (int row = prev_nrow; row < nrow; row++) |
409 | for (int row = prev_nrow; row < nrow; row++) |
387 | { |
|
|
388 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
410 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
389 | } |
|
|
390 | |
411 | |
391 | term_start = 0; |
412 | term_start = 0; |
392 | } |
413 | } |
393 | |
|
|
394 | free (old_buf); |
|
|
395 | delete old_ta; |
|
|
396 | delete old_ra; |
|
|
397 | |
414 | |
398 | clamp_it (screen.cur.row, 0, nrow - 1); |
415 | clamp_it (screen.cur.row, 0, nrow - 1); |
399 | clamp_it (screen.cur.col, 0, ncol - 1); |
416 | clamp_it (screen.cur.col, 0, ncol - 1); |
400 | } |
417 | } |
401 | |
418 | |
|
|
419 | for (int row = nrow; row--; ) |
|
|
420 | { |
|
|
421 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
422 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
423 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
424 | } |
|
|
425 | |
|
|
426 | chunk_free (prev_chunk, prev_chunk_size); |
|
|
427 | |
402 | free (tabs); |
428 | free (tabs); |
403 | tabs = (char *)rxvt_malloc (ncol); |
429 | tabs = (char *)rxvt_malloc (ncol); |
404 | |
430 | |
405 | for (int col = ncol; col--; ) |
431 | for (int col = ncol; col--; ) |
406 | tabs [col] = col % TABSIZE == 0; |
432 | tabs [col] = col % TABSIZE == 0; |
407 | |
433 | |
408 | CLEAR_SELECTION (); |
434 | CLEAR_ALL_SELECTION (); |
409 | CLEAR_SELECTION_MARK (); |
|
|
410 | |
435 | |
411 | prev_nrow = nrow; |
436 | prev_nrow = nrow; |
412 | prev_ncol = ncol; |
437 | prev_ncol = ncol; |
413 | |
438 | |
414 | tt_winch (); |
439 | tt_winch (); |
415 | |
440 | |
416 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
441 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
417 | } |
442 | } |
418 | |
443 | |
419 | /* ------------------------------------------------------------------------- */ |
444 | void ecb_cold |
420 | /* |
|
|
421 | * Free everything. That way malloc debugging can find leakage. |
|
|
422 | */ |
|
|
423 | void |
|
|
424 | rxvt_term::scr_release () NOTHROW |
445 | rxvt_term::scr_release () NOTHROW |
425 | { |
446 | { |
426 | if (row_buf) |
447 | chunk_free (chunk, chunk_size); |
427 | { |
448 | chunk = 0; |
428 | delete talloc; talloc = 0; |
449 | row_buf = 0; |
429 | delete ralloc; ralloc = 0; |
|
|
430 | |
450 | |
431 | free (row_buf); |
|
|
432 | free (swap_buf); |
|
|
433 | free (drawn_buf); |
|
|
434 | row_buf = 0; // signal that we freed all the arrays above |
|
|
435 | |
|
|
436 | free (tabs); |
451 | free (tabs); |
437 | tabs = 0; |
452 | tabs = 0; |
438 | } |
|
|
439 | } |
453 | } |
440 | |
454 | |
441 | /* ------------------------------------------------------------------------- */ |
455 | /* ------------------------------------------------------------------------- */ |
442 | /* |
456 | /* |
443 | * Hard/Soft reset |
457 | * Hard/Soft reset |
444 | */ |
458 | */ |
445 | void |
459 | void ecb_cold |
446 | rxvt_term::scr_poweron () |
460 | rxvt_term::scr_poweron () |
447 | { |
461 | { |
448 | scr_release (); |
462 | scr_release (); |
|
|
463 | |
449 | prev_nrow = prev_ncol = 0; |
464 | prev_nrow = prev_ncol = 0; |
450 | rvideo_mode = false; |
465 | rvideo_mode = false; |
451 | scr_soft_reset (); |
466 | scr_soft_reset (); |
452 | scr_reset (); |
467 | scr_reset (); |
453 | |
468 | |
454 | scr_clear (true); |
469 | scr_clear (true); |
455 | scr_refresh (); |
470 | scr_refresh (); |
456 | } |
471 | } |
457 | |
472 | |
458 | void |
473 | void ecb_cold |
459 | rxvt_term::scr_soft_reset () |
474 | rxvt_term::scr_soft_reset () NOTHROW |
460 | { |
475 | { |
461 | /* only affects modes, nothing drastic such as clearing the screen */ |
476 | /* only affects modes, nothing drastic such as clearing the screen */ |
462 | #if ENABLE_OVERLAY |
477 | #if ENABLE_OVERLAY |
463 | scr_overlay_off (); |
478 | scr_overlay_off (); |
464 | #endif |
479 | #endif |
… | |
… | |
519 | assert (s->cur.row >= 0); |
534 | assert (s->cur.row >= 0); |
520 | assert (s->cur.col >= 0); |
535 | assert (s->cur.col >= 0); |
521 | } |
536 | } |
522 | |
537 | |
523 | void |
538 | void |
524 | rxvt_term::scr_swap_screen () |
539 | rxvt_term::scr_swap_screen () NOTHROW |
525 | { |
540 | { |
526 | if (!option (Opt_secondaryScreen)) |
541 | if (!option (Opt_secondaryScreen)) |
527 | return; |
542 | return; |
528 | |
543 | |
529 | for (int i = prev_nrow; i--; ) |
544 | for (int i = prev_nrow; i--; ) |
… | |
… | |
548 | return; |
563 | return; |
549 | |
564 | |
550 | want_refresh = 1; |
565 | want_refresh = 1; |
551 | view_start = 0; |
566 | view_start = 0; |
552 | |
567 | |
553 | selection_check (2); /* check for boundary cross */ |
568 | /* check for boundary cross */ |
|
|
569 | row_col_t pos; |
|
|
570 | pos.row = pos.col = 0; |
|
|
571 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
572 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
573 | CLEAR_SELECTION (); |
554 | |
574 | |
555 | current_screen = scrn; |
575 | current_screen = scrn; |
556 | |
576 | |
557 | #if NSCREENS |
577 | #if NSCREENS |
558 | if (option (Opt_secondaryScreen)) |
578 | if (option (Opt_secondaryScreen)) |
… | |
… | |
624 | /* |
644 | /* |
625 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
645 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
626 | * count positive ==> scroll up |
646 | * count positive ==> scroll up |
627 | * count negative ==> scroll down |
647 | * count negative ==> scroll down |
628 | */ |
648 | */ |
629 | int |
649 | int ecb_hot |
630 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
650 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
631 | { |
651 | { |
632 | if (count == 0 || (row1 > row2)) |
652 | if (count == 0 || (row1 > row2)) |
633 | return 0; |
653 | return 0; |
634 | |
654 | |
… | |
… | |
711 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
731 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
712 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
732 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
713 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
733 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
714 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
734 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
715 | { |
735 | { |
716 | CLEAR_SELECTION (); |
736 | CLEAR_ALL_SELECTION (); |
717 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
737 | selection.op = SELECTION_CLEAR; |
718 | CLEAR_SELECTION_MARK (); |
|
|
719 | } |
738 | } |
720 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
739 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
721 | { |
740 | { |
722 | /* move selected region too */ |
741 | /* move selected region too */ |
723 | selection.beg.row -= count; |
742 | selection.beg.row -= count; |
… | |
… | |
769 | |
788 | |
770 | /* ------------------------------------------------------------------------- */ |
789 | /* ------------------------------------------------------------------------- */ |
771 | /* |
790 | /* |
772 | * Add text given in <str> of length <len> to screen struct |
791 | * Add text given in <str> of length <len> to screen struct |
773 | */ |
792 | */ |
774 | void |
793 | void ecb_hot |
775 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
794 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
776 | { |
795 | { |
777 | if (len <= 0) /* sanity */ |
796 | if (len <= 0) /* sanity */ |
778 | return; |
797 | return; |
779 | |
798 | |
… | |
… | |
1129 | * XTERM_SEQ: ESC 6 |
1148 | * XTERM_SEQ: ESC 6 |
1130 | * Move cursor left in row. If we're at the left boundary, shift everything |
1149 | * Move cursor left in row. If we're at the left boundary, shift everything |
1131 | * in that row right. Clear left column. |
1150 | * in that row right. Clear left column. |
1132 | */ |
1151 | */ |
1133 | #if !ENABLE_MINIMAL |
1152 | #if !ENABLE_MINIMAL |
1134 | void |
1153 | void ecb_cold |
1135 | rxvt_term::scr_backindex () NOTHROW |
1154 | rxvt_term::scr_backindex () NOTHROW |
1136 | { |
1155 | { |
1137 | if (screen.cur.col > 0) |
1156 | if (screen.cur.col > 0) |
1138 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1157 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1139 | else |
1158 | else |
… | |
… | |
1146 | * XTERM_SEQ: ESC 9 |
1165 | * XTERM_SEQ: ESC 9 |
1147 | * Move cursor right in row. If we're at the right boundary, shift everything |
1166 | * Move cursor right in row. If we're at the right boundary, shift everything |
1148 | * in that row left. Clear right column. |
1167 | * in that row left. Clear right column. |
1149 | */ |
1168 | */ |
1150 | #if !ENABLE_MINIMAL |
1169 | #if !ENABLE_MINIMAL |
1151 | void |
1170 | void ecb_cold |
1152 | rxvt_term::scr_forwardindex () NOTHROW |
1171 | rxvt_term::scr_forwardindex () NOTHROW |
1153 | { |
1172 | { |
1154 | if (screen.cur.col < ncol - 1) |
1173 | if (screen.cur.col < ncol - 1) |
1155 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1174 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1156 | else |
1175 | else |
… | |
… | |
1307 | scr_blank_line (line, col, num, rstyle); |
1326 | scr_blank_line (line, col, num, rstyle); |
1308 | } |
1327 | } |
1309 | |
1328 | |
1310 | /* ------------------------------------------------------------------------- */ |
1329 | /* ------------------------------------------------------------------------- */ |
1311 | /* |
1330 | /* |
1312 | * Erase part of whole of the screen |
1331 | * Erase part or whole of the screen |
1313 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1332 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1314 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1333 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1315 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1334 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1316 | */ |
1335 | */ |
1317 | void |
1336 | void |
… | |
… | |
1326 | ZERO_SCROLLBACK (); |
1345 | ZERO_SCROLLBACK (); |
1327 | |
1346 | |
1328 | switch (mode) |
1347 | switch (mode) |
1329 | { |
1348 | { |
1330 | case 0: /* erase to end of screen */ |
1349 | case 0: /* erase to end of screen */ |
1331 | selection_check (1); |
|
|
1332 | scr_erase_line (0); |
1350 | scr_erase_line (0); |
1333 | row = screen.cur.row + 1; /* possible OOB */ |
1351 | row = screen.cur.row + 1; /* possible OOB */ |
1334 | num = nrow - row; |
1352 | num = nrow - row; |
1335 | break; |
1353 | break; |
1336 | case 1: /* erase to beginning of screen */ |
1354 | case 1: /* erase to beginning of screen */ |
1337 | selection_check (3); |
|
|
1338 | scr_erase_line (1); |
1355 | scr_erase_line (1); |
1339 | row = 0; |
1356 | row = 0; |
1340 | num = screen.cur.row; |
1357 | num = screen.cur.row; |
1341 | break; |
1358 | break; |
1342 | case 2: /* erase whole screen */ |
1359 | case 2: /* erase whole screen */ |
1343 | selection_check (3); |
|
|
1344 | row = 0; |
1360 | row = 0; |
1345 | num = nrow; |
1361 | num = nrow; |
1346 | break; |
1362 | break; |
1347 | default: |
1363 | default: |
1348 | return; |
1364 | return; |
… | |
… | |
1365 | { |
1381 | { |
1366 | ren = DEFAULT_RSTYLE; |
1382 | ren = DEFAULT_RSTYLE; |
1367 | |
1383 | |
1368 | if (mapped) |
1384 | if (mapped) |
1369 | XClearArea (dpy, vt, 0, |
1385 | XClearArea (dpy, vt, 0, |
1370 | Row2Pixel (row - view_start), (unsigned int)width, |
1386 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1371 | (unsigned int)Height2Pixel (num), False); |
1387 | (unsigned int)Height2Pixel (num), False); |
1372 | } |
1388 | } |
1373 | else |
1389 | else |
1374 | { |
1390 | { |
1375 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1391 | ren = rstyle & (RS_fgMask | RS_bgMask); |
… | |
… | |
1378 | { |
1394 | { |
1379 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1395 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1380 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1396 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1381 | XFillRectangle (dpy, vt, gc, |
1397 | XFillRectangle (dpy, vt, gc, |
1382 | 0, Row2Pixel (row - view_start), |
1398 | 0, Row2Pixel (row - view_start), |
1383 | (unsigned int)width, |
1399 | (unsigned int)vt_width, |
1384 | (unsigned int)Height2Pixel (num)); |
1400 | (unsigned int)Height2Pixel (num)); |
1385 | gcvalue.foreground = pix_colors[Color_fg]; |
1401 | gcvalue.foreground = pix_colors[Color_fg]; |
1386 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1402 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1387 | } |
1403 | } |
1388 | } |
1404 | } |
… | |
… | |
1410 | /* ------------------------------------------------------------------------- */ |
1426 | /* ------------------------------------------------------------------------- */ |
1411 | /* |
1427 | /* |
1412 | * Fill the screen with `E's |
1428 | * Fill the screen with `E's |
1413 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1429 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1414 | */ |
1430 | */ |
1415 | void |
1431 | void ecb_cold |
1416 | rxvt_term::scr_E () NOTHROW |
1432 | rxvt_term::scr_E () NOTHROW |
1417 | { |
1433 | { |
1418 | rend_t fs; |
1434 | rend_t fs; |
1419 | |
1435 | |
1420 | want_refresh = 1; |
1436 | want_refresh = 1; |
1421 | ZERO_SCROLLBACK (); |
1437 | ZERO_SCROLLBACK (); |
1422 | |
1438 | |
1423 | num_scr_allow = 0; |
1439 | num_scr_allow = 0; |
1424 | selection_check (3); |
1440 | |
|
|
1441 | row_col_t pos; |
|
|
1442 | pos.row = pos.col = 0; |
|
|
1443 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1444 | CLEAR_SELECTION (); |
1425 | |
1445 | |
1426 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1446 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1427 | for (int row = nrow; row--; ) |
1447 | for (int row = nrow; row--; ) |
1428 | { |
1448 | { |
1429 | line_t &line = ROW(row); |
1449 | line_t &line = ROW(row); |
… | |
… | |
1580 | /* ------------------------------------------------------------------------- */ |
1600 | /* ------------------------------------------------------------------------- */ |
1581 | /* |
1601 | /* |
1582 | * Set the scrolling region |
1602 | * Set the scrolling region |
1583 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1603 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1584 | */ |
1604 | */ |
1585 | void |
1605 | void ecb_cold |
1586 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1606 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1587 | { |
1607 | { |
1588 | max_it (top, 0); |
1608 | max_it (top, 0); |
1589 | min_it (bot, nrow - 1); |
1609 | min_it (bot, nrow - 1); |
1590 | |
1610 | |
… | |
… | |
1600 | /* |
1620 | /* |
1601 | * Make the cursor visible/invisible |
1621 | * Make the cursor visible/invisible |
1602 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1622 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1603 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1623 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1604 | */ |
1624 | */ |
1605 | void |
1625 | void ecb_cold |
1606 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1626 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1607 | { |
1627 | { |
1608 | want_refresh = 1; |
1628 | want_refresh = 1; |
1609 | |
1629 | |
1610 | if (mode) |
1630 | if (mode) |
… | |
… | |
1617 | /* |
1637 | /* |
1618 | * Set/unset automatic wrapping |
1638 | * Set/unset automatic wrapping |
1619 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1639 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1620 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1640 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1621 | */ |
1641 | */ |
1622 | void |
1642 | void ecb_cold |
1623 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1643 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1624 | { |
1644 | { |
1625 | if (mode) |
1645 | if (mode) |
1626 | screen.flags |= Screen_Autowrap; |
1646 | screen.flags |= Screen_Autowrap; |
1627 | else |
1647 | else |
… | |
… | |
1636 | * Relative mode: line numbers are relative to top margin of scrolling region |
1656 | * Relative mode: line numbers are relative to top margin of scrolling region |
1637 | * and the cursor cannot be moved outside. |
1657 | * and the cursor cannot be moved outside. |
1638 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1658 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1639 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1659 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1640 | */ |
1660 | */ |
1641 | void |
1661 | void ecb_cold |
1642 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1662 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1643 | { |
1663 | { |
1644 | if (mode) |
1664 | if (mode) |
1645 | screen.flags |= Screen_Relative; |
1665 | screen.flags |= Screen_Relative; |
1646 | else |
1666 | else |
… | |
… | |
1653 | /* |
1673 | /* |
1654 | * Set insert/replace mode |
1674 | * Set insert/replace mode |
1655 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1675 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1656 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1676 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1657 | */ |
1677 | */ |
1658 | void |
1678 | void ecb_cold |
1659 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1679 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1660 | { |
1680 | { |
1661 | if (mode) |
1681 | if (mode) |
1662 | screen.flags |= Screen_Insert; |
1682 | screen.flags |= Screen_Insert; |
1663 | else |
1683 | else |
… | |
… | |
1669 | * Set/Unset tabs |
1689 | * Set/Unset tabs |
1670 | * XTERM_SEQ: Set tab at current column : ESC H |
1690 | * XTERM_SEQ: Set tab at current column : ESC H |
1671 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1691 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1672 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1692 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1673 | */ |
1693 | */ |
1674 | void |
1694 | void ecb_cold |
1675 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1695 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1676 | { |
1696 | { |
1677 | if (mode < 0) |
1697 | if (mode < 0) |
1678 | memset (tabs, 0, ncol); |
1698 | memset (tabs, 0, ncol); |
1679 | else if (screen.cur.col < ncol) |
1699 | else if (screen.cur.col < ncol) |
… | |
… | |
1698 | if (rvideo_state != on) |
1718 | if (rvideo_state != on) |
1699 | { |
1719 | { |
1700 | rvideo_state = on; |
1720 | rvideo_state = on; |
1701 | |
1721 | |
1702 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1722 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1703 | #ifdef HAVE_BG_PIXMAP |
1723 | #ifdef HAVE_IMG |
1704 | if (bg_pixmap == None) |
1724 | if (bg_img == 0) |
1705 | #endif |
1725 | #endif |
1706 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1726 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1707 | |
1727 | |
1708 | XGCValues gcvalue; |
1728 | XGCValues gcvalue; |
1709 | gcvalue.foreground = pix_colors[Color_fg]; |
1729 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1718 | /* ------------------------------------------------------------------------- */ |
1738 | /* ------------------------------------------------------------------------- */ |
1719 | /* |
1739 | /* |
1720 | * Report current cursor position |
1740 | * Report current cursor position |
1721 | * XTERM_SEQ: Report position: ESC [ 6 n |
1741 | * XTERM_SEQ: Report position: ESC [ 6 n |
1722 | */ |
1742 | */ |
1723 | void |
1743 | void ecb_cold |
1724 | rxvt_term::scr_report_position () NOTHROW |
1744 | rxvt_term::scr_report_position () NOTHROW |
1725 | { |
1745 | { |
1726 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1746 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1727 | } |
1747 | } |
1728 | |
1748 | |
… | |
… | |
1731 | * ------------------------------------------------------------------------- */ |
1751 | * ------------------------------------------------------------------------- */ |
1732 | |
1752 | |
1733 | /* |
1753 | /* |
1734 | * Set font style |
1754 | * Set font style |
1735 | */ |
1755 | */ |
1736 | void |
1756 | void ecb_cold |
1737 | rxvt_term::set_font_style () NOTHROW |
1757 | rxvt_term::set_font_style () NOTHROW |
1738 | { |
1758 | { |
1739 | #if 0 |
1759 | #if 0 |
1740 | switch (charsets [screen.charset]) |
1760 | switch (charsets [screen.charset]) |
1741 | { |
1761 | { |
… | |
… | |
1763 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1783 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1764 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1784 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1765 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1785 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1766 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1786 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1767 | */ |
1787 | */ |
1768 | void |
1788 | void ecb_cold |
1769 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1789 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1770 | { |
1790 | { |
1771 | screen.charset = set; |
1791 | screen.charset = set; |
1772 | set_font_style (); |
1792 | set_font_style (); |
1773 | } |
1793 | } |
… | |
… | |
1794 | * ------------------------------------------------------------------------- */ |
1814 | * ------------------------------------------------------------------------- */ |
1795 | |
1815 | |
1796 | /* |
1816 | /* |
1797 | * refresh matching text. |
1817 | * refresh matching text. |
1798 | */ |
1818 | */ |
1799 | bool |
1819 | bool ecb_cold |
1800 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1820 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1801 | { |
1821 | { |
1802 | bool found = false; |
1822 | bool found = false; |
1803 | |
1823 | |
1804 | for (int i = 0; i < nrow; i++) |
1824 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1823 | PART_BEG = 0, |
1843 | PART_BEG = 0, |
1824 | PART_END, |
1844 | PART_END, |
1825 | RC_COUNT |
1845 | RC_COUNT |
1826 | }; |
1846 | }; |
1827 | |
1847 | |
1828 | void |
1848 | void ecb_hot |
1829 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1849 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1830 | { |
1850 | { |
1831 | int i; |
1851 | int i; |
1832 | row_col_t rc[RC_COUNT]; |
1852 | row_col_t rc[RC_COUNT]; |
1833 | |
1853 | |
… | |
… | |
1870 | * Refresh the entire screen |
1890 | * Refresh the entire screen |
1871 | */ |
1891 | */ |
1872 | void |
1892 | void |
1873 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1893 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1874 | { |
1894 | { |
1875 | scr_expose (0, 0, width, height, refresh); |
1895 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1876 | } |
1896 | } |
1877 | |
1897 | |
1878 | /* ------------------------------------------------------------------------- */ |
1898 | /* ------------------------------------------------------------------------- */ |
1879 | /* |
1899 | /* |
1880 | * Move the display so that the line represented by scrollbar value Y is at |
1900 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1959 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1979 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1960 | #endif |
1980 | #endif |
1961 | } |
1981 | } |
1962 | |
1982 | |
1963 | /* ------------------------------------------------------------------------- */ |
1983 | /* ------------------------------------------------------------------------- */ |
1964 | void |
1984 | void ecb_cold |
1965 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1985 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1966 | { |
1986 | { |
1967 | #ifdef PRINTPIPE |
1987 | #ifdef PRINTPIPE |
1968 | int nrows, row_start; |
1988 | int nrows, row_start; |
1969 | FILE *fd = popen_printer (); |
1989 | FILE *fd = popen_printer (); |
… | |
… | |
2018 | /* |
2038 | /* |
2019 | * Refresh the screen |
2039 | * Refresh the screen |
2020 | * drawn_text/drawn_rend contain the screen information before the update. |
2040 | * drawn_text/drawn_rend contain the screen information before the update. |
2021 | * screen.text/screen.rend contain what the screen will change to. |
2041 | * screen.text/screen.rend contain what the screen will change to. |
2022 | */ |
2042 | */ |
2023 | void |
2043 | void ecb_hot |
2024 | rxvt_term::scr_refresh () NOTHROW |
2044 | rxvt_term::scr_refresh () NOTHROW |
2025 | { |
2045 | { |
2026 | int16_t col, row, /* column/row we're processing */ |
2046 | int16_t col, row, /* column/row we're processing */ |
2027 | ocrow; /* old cursor row */ |
2047 | ocrow; /* old cursor row */ |
2028 | int i; /* tmp */ |
2048 | int i; /* tmp */ |
2029 | #ifndef NO_CURSORCOLOR |
|
|
2030 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2031 | #endif |
|
|
2032 | rend_t *crp; // cursor rendition pointer |
|
|
2033 | rend_t ccol1, /* Cursor colour */ |
2049 | rend_t ccol1, /* Cursor colour */ |
2034 | ccol2; /* Cursor colour2 */ |
2050 | ccol2; /* Cursor colour2 */ |
|
|
2051 | rend_t cur_rend; |
|
|
2052 | int cur_col; |
2035 | |
2053 | |
2036 | want_refresh = 0; /* screen is current */ |
2054 | want_refresh = 0; /* screen is current */ |
2037 | |
2055 | |
2038 | if (refresh_type == NO_REFRESH || !mapped) |
2056 | if (refresh_type == NO_REFRESH || !mapped) |
2039 | return; |
2057 | return; |
… | |
… | |
2043 | */ |
2061 | */ |
2044 | refresh_count = 0; |
2062 | refresh_count = 0; |
2045 | |
2063 | |
2046 | unsigned int old_screen_flags = screen.flags; |
2064 | unsigned int old_screen_flags = screen.flags; |
2047 | bool have_bg = 0; |
2065 | bool have_bg = 0; |
2048 | #ifdef HAVE_BG_PIXMAP |
2066 | #ifdef HAVE_IMG |
2049 | have_bg = bg_pixmap != None; |
2067 | have_bg = bg_img != 0; |
2050 | #endif |
2068 | #endif |
2051 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2069 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2052 | |
2070 | |
2053 | /* |
2071 | /* |
2054 | * B: reverse any characters which are selected |
2072 | * B: reverse any characters which are selected |
… | |
… | |
2078 | int col = screen.cur.col; |
2096 | int col = screen.cur.col; |
2079 | |
2097 | |
2080 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2098 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2081 | col--; |
2099 | col--; |
2082 | |
2100 | |
2083 | crp = &ROW(screen.cur.row).r[col]; |
2101 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2102 | cur_col = col; |
2084 | |
2103 | |
2085 | #ifndef NO_CURSORCOLOR |
2104 | #ifndef NO_CURSORCOLOR |
2086 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2087 | if (ISSET_PIXCOLOR (Color_cursor)) |
2105 | if (ISSET_PIXCOLOR (Color_cursor)) |
2088 | ccol1 = Color_cursor; |
2106 | ccol1 = Color_cursor; |
2089 | else |
2107 | else |
2090 | #endif |
2108 | #endif |
2091 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2109 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2105 | ccol2 = Color_bg; |
2123 | ccol2 = Color_bg; |
2106 | #endif |
2124 | #endif |
2107 | |
2125 | |
2108 | if (focus) |
2126 | if (focus) |
2109 | { |
2127 | { |
|
|
2128 | rend_t rend = cur_rend; |
|
|
2129 | |
2110 | if (option (Opt_cursorUnderline)) |
2130 | if (option (Opt_cursorUnderline)) |
2111 | *crp ^= RS_Uline; |
2131 | rend ^= RS_Uline; |
2112 | else |
2132 | else |
2113 | { |
2133 | { |
2114 | *crp ^= RS_RVid; |
2134 | rend ^= RS_RVid; |
2115 | *crp = SET_FGCOLOR (*crp, ccol1); |
2135 | rend = SET_FGCOLOR (rend, ccol1); |
2116 | *crp = SET_BGCOLOR (*crp, ccol2); |
2136 | rend = SET_BGCOLOR (rend, ccol2); |
2117 | } |
2137 | } |
|
|
2138 | |
|
|
2139 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2118 | } |
2140 | } |
2119 | } |
2141 | } |
2120 | |
2142 | |
2121 | /* make sure no outline cursor is left around */ |
2143 | /* make sure no outline cursor is left around */ |
2122 | setoldcursor = 0; |
2144 | setoldcursor = 0; |
… | |
… | |
2161 | { |
2183 | { |
2162 | int16_t nits; |
2184 | int16_t nits; |
2163 | int i = num_scr; |
2185 | int i = num_scr; |
2164 | int j; |
2186 | int j; |
2165 | int len, wlen; |
2187 | int len, wlen; |
2166 | dLocal (int, num_scr); |
|
|
2167 | |
2188 | |
2168 | j = nrow; |
2189 | j = nrow; |
2169 | wlen = len = -1; |
2190 | wlen = len = -1; |
2170 | row = i > 0 ? 0 : j - 1; |
2191 | row = i > 0 ? 0 : j - 1; |
2171 | |
2192 | |
… | |
… | |
2442 | * G: cleanup cursor and display outline cursor if necessary |
2463 | * G: cleanup cursor and display outline cursor if necessary |
2443 | */ |
2464 | */ |
2444 | if (showcursor) |
2465 | if (showcursor) |
2445 | { |
2466 | { |
2446 | if (focus) |
2467 | if (focus) |
2447 | { |
2468 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2448 | if (option (Opt_cursorUnderline)) |
|
|
2449 | *crp ^= RS_Uline; |
|
|
2450 | else |
|
|
2451 | { |
|
|
2452 | *crp ^= RS_RVid; |
|
|
2453 | #ifndef NO_CURSORCOLOR |
|
|
2454 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
|
|
2455 | #endif |
|
|
2456 | } |
|
|
2457 | } |
|
|
2458 | else if (oldcursor.row >= 0) |
2469 | else if (oldcursor.row >= 0) |
2459 | { |
2470 | { |
2460 | int cursorwidth = 1; |
2471 | int cursorwidth = 1; |
2461 | int col = oldcursor.col; |
2472 | int col = oldcursor.col; |
2462 | |
2473 | |
… | |
… | |
2465 | |
2476 | |
2466 | while (col + cursorwidth < ncol |
2477 | while (col + cursorwidth < ncol |
2467 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2478 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2468 | cursorwidth++; |
2479 | cursorwidth++; |
2469 | |
2480 | |
2470 | #ifndef NO_CURSORCOLOR |
|
|
2471 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2472 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2473 | else |
|
|
2474 | #endif |
|
|
2475 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2481 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2476 | |
2482 | |
2477 | XDrawRectangle (dpy, vt, gc, |
2483 | XDrawRectangle (dpy, vt, gc, |
2478 | Col2Pixel (col), |
2484 | Col2Pixel (col), |
2479 | Row2Pixel (oldcursor.row), |
2485 | Row2Pixel (oldcursor.row), |
2480 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2486 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2481 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2487 | (unsigned int) (Height2Pixel (1) - 1)); |
2482 | } |
2488 | } |
2483 | } |
2489 | } |
2484 | |
2490 | |
2485 | /* |
2491 | /* |
2486 | * H: cleanup selection |
2492 | * H: cleanup selection |
… | |
… | |
2495 | screen.flags = old_screen_flags; |
2501 | screen.flags = old_screen_flags; |
2496 | num_scr = 0; |
2502 | num_scr = 0; |
2497 | num_scr_allow = 1; |
2503 | num_scr_allow = 1; |
2498 | } |
2504 | } |
2499 | |
2505 | |
2500 | void |
2506 | void ecb_cold |
2501 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2507 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2502 | { |
2508 | { |
2503 | if (!l.t) |
2509 | if (!l.valid ()) |
2504 | return; |
2510 | return; |
2505 | |
2511 | |
2506 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2512 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2507 | |
2513 | |
2508 | for (int i = ncol; i--; ) |
2514 | for (int i = ncol; i--; ) |
2509 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2515 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2510 | } |
2516 | } |
2511 | |
2517 | |
2512 | void |
2518 | void ecb_cold |
2513 | rxvt_term::scr_remap_chars () NOTHROW |
2519 | rxvt_term::scr_remap_chars () NOTHROW |
2514 | { |
2520 | { |
2515 | for (int i = total_rows; i--; ) |
2521 | for (int i = total_rows; i--; ) |
2516 | scr_remap_chars (row_buf [i]); |
2522 | scr_remap_chars (row_buf [i]); |
2517 | |
2523 | |
… | |
… | |
2520 | scr_remap_chars (drawn_buf [i]); |
2526 | scr_remap_chars (drawn_buf [i]); |
2521 | scr_remap_chars (swap_buf [i]); |
2527 | scr_remap_chars (swap_buf [i]); |
2522 | } |
2528 | } |
2523 | } |
2529 | } |
2524 | |
2530 | |
2525 | void |
2531 | void ecb_cold |
2526 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2532 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2527 | { |
2533 | { |
2528 | bool transparent = false; |
2534 | bool transparent = false; |
2529 | |
2535 | |
2530 | #ifdef HAVE_BG_PIXMAP |
2536 | #ifdef HAVE_IMG |
2531 | if (bg_pixmap != None) |
2537 | if (bg_img != 0) |
2532 | { |
2538 | { |
2533 | # ifdef ENABLE_TRANSPARENCY |
2539 | # if ENABLE_TRANSPARENCY |
2534 | if (bg_flags & BG_IS_TRANSPARENT) |
2540 | if (bg_flags & BG_IS_TRANSPARENT) |
2535 | { |
2541 | { |
2536 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2542 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
2537 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2543 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2538 | |
2544 | |
2539 | transparent = true; |
2545 | transparent = true; |
2540 | } |
2546 | } |
2541 | else |
2547 | else |
2542 | # endif |
2548 | # endif |
2543 | { |
2549 | { |
2544 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2550 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2545 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2551 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
2546 | } |
2552 | } |
2547 | } |
2553 | } |
2548 | else |
2554 | else |
2549 | #endif |
2555 | #endif |
2550 | { |
2556 | { |
… | |
… | |
2557 | if (scrollBar.win) |
2563 | if (scrollBar.win) |
2558 | { |
2564 | { |
2559 | if (transparent) |
2565 | if (transparent) |
2560 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2561 | else |
2567 | else |
2562 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2563 | scrollBar.state = SB_STATE_IDLE; |
2569 | scrollBar.state = SB_STATE_IDLE; |
2564 | scrollBar.show (0); |
2570 | scrollBar.show (0); |
2565 | } |
2571 | } |
2566 | |
2572 | |
2567 | if (refresh) |
2573 | if (refresh) |
… | |
… | |
2633 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2639 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2634 | srp[col] ^= rstyle; |
2640 | srp[col] ^= rstyle; |
2635 | } |
2641 | } |
2636 | |
2642 | |
2637 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2638 | void |
2644 | void ecb_hot |
2639 | rxvt_term::scr_reverse_selection () NOTHROW |
2645 | rxvt_term::scr_reverse_selection () NOTHROW |
2640 | { |
2646 | { |
2641 | if (selection.op |
2647 | if (selection.op |
2642 | && current_screen == selection.screen |
2648 | && current_screen == selection.screen |
2643 | && selection.end.row >= view_start) |
2649 | && selection.end.row >= view_start) |
… | |
… | |
2662 | */ |
2668 | */ |
2663 | #if 0 |
2669 | #if 0 |
2664 | void |
2670 | void |
2665 | rxvt_term::scr_dump (int fd) NOTHROW |
2671 | rxvt_term::scr_dump (int fd) NOTHROW |
2666 | { |
2672 | { |
2667 | int row, wrote; |
2673 | // if this method is needed, it can be implemented by factoring the |
2668 | unsigned int width, towrite; |
2674 | // relevant code in scr_printscreen |
2669 | const char r1[] = "\n"; |
|
|
2670 | |
|
|
2671 | for (row = saveLines + top_row; |
|
|
2672 | row < saveLines + nrow - 1; row++) |
|
|
2673 | { |
|
|
2674 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2675 | : ncol; |
|
|
2676 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2677 | { |
|
|
2678 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2679 | towrite); |
|
|
2680 | if (wrote < 0) |
|
|
2681 | return; /* XXX: death, no report */ |
|
|
2682 | } |
|
|
2683 | if (row_buf[row].l >= 0) |
|
|
2684 | if (write (fd, r1, 1) <= 0) |
|
|
2685 | return; /* XXX: death, no report */ |
|
|
2686 | } |
|
|
2687 | } |
2675 | } |
2688 | #endif |
2676 | #endif |
2689 | |
2677 | |
2690 | /* ------------------------------------------------------------------------- * |
2678 | /* ------------------------------------------------------------------------- * |
2691 | * CHARACTER SELECTION * |
2679 | * CHARACTER SELECTION * |
… | |
… | |
2694 | rxvt_term::selection_check (int check_more) NOTHROW |
2682 | rxvt_term::selection_check (int check_more) NOTHROW |
2695 | { |
2683 | { |
2696 | if (!selection.op) |
2684 | if (!selection.op) |
2697 | return; |
2685 | return; |
2698 | |
2686 | |
2699 | row_col_t pos; |
|
|
2700 | pos.row = pos.col = 0; |
|
|
2701 | |
|
|
2702 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2687 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
|
|
2688 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2703 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2689 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2704 | || (check_more == 1 |
2690 | || (check_more == 1 |
2705 | && current_screen == selection.screen |
2691 | && current_screen == selection.screen |
2706 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2692 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2707 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2693 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2708 | || (check_more == 2 |
|
|
2709 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2710 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2711 | || (check_more == 3 |
|
|
2712 | && ROWCOL_IS_AFTER (selection.end, pos))) |
|
|
2713 | CLEAR_SELECTION (); |
2694 | CLEAR_ALL_SELECTION (); |
|
|
2695 | } |
2714 | |
2696 | |
2715 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
2697 | void |
2716 | CLEAR_SELECTION_MARK (); |
2698 | rxvt_term::selection_changed () NOTHROW |
|
|
2699 | { |
|
|
2700 | line_t &r1 = ROW (selection.beg.row); |
|
|
2701 | while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) |
|
|
2702 | --selection.beg.col; |
|
|
2703 | |
|
|
2704 | line_t &r2 = ROW (selection.end.row); |
|
|
2705 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2706 | ++selection.end.col; |
|
|
2707 | |
|
|
2708 | want_refresh = 1; |
2717 | } |
2709 | } |
2718 | |
2710 | |
2719 | /* ------------------------------------------------------------------------- */ |
2711 | /* ------------------------------------------------------------------------- */ |
2720 | /* |
2712 | /* |
2721 | * Paste a selection direct to the command fd |
2713 | * Paste a selection direct to the command fd |
… | |
… | |
2727 | for (unsigned int i = 0; i < len; i++) |
2719 | for (unsigned int i = 0; i < len; i++) |
2728 | if (data[i] == C0_LF) |
2720 | if (data[i] == C0_LF) |
2729 | data[i] = C0_CR; |
2721 | data[i] = C0_CR; |
2730 | |
2722 | |
2731 | if (priv_modes & PrivMode_BracketPaste) |
2723 | if (priv_modes & PrivMode_BracketPaste) |
2732 | tt_printf ("\e[200~"); |
2724 | tt_printf ("\x1b[200~"); |
2733 | |
2725 | |
2734 | tt_write (data, len); |
2726 | tt_write (data, len); |
2735 | |
2727 | |
2736 | if (priv_modes & PrivMode_BracketPaste) |
2728 | if (priv_modes & PrivMode_BracketPaste) |
2737 | tt_printf ("\e[201~"); |
2729 | tt_printf ("\x1b[201~"); |
2738 | } |
2730 | } |
2739 | |
2731 | |
2740 | void |
2732 | void |
2741 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2733 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2742 | { |
2734 | { |
… | |
… | |
2962 | /* ------------------------------------------------------------------------- */ |
2954 | /* ------------------------------------------------------------------------- */ |
2963 | /* |
2955 | /* |
2964 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2956 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2965 | * EXT: button 1 press |
2957 | * EXT: button 1 press |
2966 | */ |
2958 | */ |
2967 | void |
2959 | void ecb_cold |
2968 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2960 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2969 | { |
2961 | { |
2970 | clicks = ((clicks - 1) % 3) + 1; |
2962 | clicks = ((clicks - 1) % 3) + 1; |
2971 | selection.clicks = clicks; /* save clicks so extend will work */ |
2963 | selection.clicks = clicks; /* save clicks so extend will work */ |
2972 | |
2964 | |
… | |
… | |
2991 | |
2983 | |
2992 | /* ------------------------------------------------------------------------- */ |
2984 | /* ------------------------------------------------------------------------- */ |
2993 | /* |
2985 | /* |
2994 | * Mark a selection at the specified col/row |
2986 | * Mark a selection at the specified col/row |
2995 | */ |
2987 | */ |
2996 | void |
2988 | void ecb_cold |
2997 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2989 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2998 | { |
2990 | { |
2999 | want_refresh = 1; |
2991 | want_refresh = 1; |
3000 | |
2992 | |
3001 | selection.mark.row = row + view_start; |
2993 | selection.mark.row = row + view_start; |
… | |
… | |
3024 | * Word select: select text for 2 clicks |
3016 | * Word select: select text for 2 clicks |
3025 | * We now only find out the boundary in one direction |
3017 | * We now only find out the boundary in one direction |
3026 | */ |
3018 | */ |
3027 | |
3019 | |
3028 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3020 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3029 | #define DELIMIT_TEXT(x) \ |
3021 | #define DELIMIT_TEXT(x) \ |
3030 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3022 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3031 | #define DELIMIT_REND(x) 1 |
3023 | #define DELIMIT_REND(x) 1 |
3032 | |
3024 | |
3033 | void |
3025 | void ecb_cold |
3034 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3026 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3035 | { |
3027 | { |
3036 | int col, row, dirnadd, tcol, trow, w1, w2; |
3028 | int col, row, dirnadd, tcol, trow, w1, w2; |
3037 | row_col_t bound; |
3029 | row_col_t bound; |
3038 | text_t *stp; |
3030 | text_t *stp; |
… | |
… | |
3112 | * EXT: button 3 press; button 1 or 3 drag |
3104 | * EXT: button 3 press; button 1 or 3 drag |
3113 | * flag == 0 ==> button 1 |
3105 | * flag == 0 ==> button 1 |
3114 | * flag == 1 ==> button 3 press |
3106 | * flag == 1 ==> button 3 press |
3115 | * flag == 2 ==> button 3 motion |
3107 | * flag == 2 ==> button 3 motion |
3116 | */ |
3108 | */ |
3117 | void |
3109 | void ecb_cold |
3118 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3110 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3119 | { |
3111 | { |
3120 | int col = clamp (Pixel2Col (x), 0, ncol); |
3112 | int col = clamp (Pixel2Col (x), 0, ncol); |
3121 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3113 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3122 | |
3114 | |
… | |
… | |
3148 | |
3140 | |
3149 | /* ------------------------------------------------------------------------- */ |
3141 | /* ------------------------------------------------------------------------- */ |
3150 | /* |
3142 | /* |
3151 | * Extend the selection to the specified col/row |
3143 | * Extend the selection to the specified col/row |
3152 | */ |
3144 | */ |
3153 | void |
3145 | void ecb_cold |
3154 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3146 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3155 | { |
3147 | { |
3156 | row_col_t pos; |
3148 | row_col_t pos; |
3157 | enum { |
3149 | enum { |
3158 | LEFT, RIGHT |
3150 | LEFT, RIGHT |
3159 | } closeto = RIGHT; |
3151 | } closeto = RIGHT; |
3160 | |
|
|
3161 | want_refresh = 1; |
|
|
3162 | |
3152 | |
3163 | switch (selection.op) |
3153 | switch (selection.op) |
3164 | { |
3154 | { |
3165 | case SELECTION_INIT: |
3155 | case SELECTION_INIT: |
3166 | CLEAR_SELECTION (); |
3156 | CLEAR_SELECTION (); |
… | |
… | |
3346 | |
3336 | |
3347 | #if !ENABLE_MINIMAL |
3337 | #if !ENABLE_MINIMAL |
3348 | if (selection.rect && selection.beg.col > selection.end.col) |
3338 | if (selection.rect && selection.beg.col > selection.end.col) |
3349 | ::swap (selection.beg.col, selection.end.col); |
3339 | ::swap (selection.beg.col, selection.end.col); |
3350 | #endif |
3340 | #endif |
|
|
3341 | |
|
|
3342 | selection_changed (); |
3351 | } |
3343 | } |
3352 | |
3344 | |
3353 | #if !ENABLE_MINIMAL |
3345 | #if !ENABLE_MINIMAL |
3354 | void |
3346 | void ecb_cold |
3355 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3347 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3356 | { |
3348 | { |
3357 | int32_t end_col, end_row; |
3349 | int32_t end_col, end_row; |
3358 | text_t *stp; |
3350 | text_t *stp; |
3359 | |
3351 | |
… | |
… | |
3397 | /* ------------------------------------------------------------------------- */ |
3389 | /* ------------------------------------------------------------------------- */ |
3398 | /* |
3390 | /* |
3399 | * Double click on button 3 when already selected |
3391 | * Double click on button 3 when already selected |
3400 | * EXT: button 3 double click |
3392 | * EXT: button 3 double click |
3401 | */ |
3393 | */ |
3402 | void |
3394 | void ecb_cold |
3403 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3395 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3404 | { |
3396 | { |
3405 | selection.clicks = selection.clicks % 3 + 1; |
3397 | selection.clicks = selection.clicks % 3 + 1; |
3406 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3398 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3407 | } |
3399 | } |
… | |
… | |
3409 | /* ------------------------------------------------------------------------- */ |
3401 | /* ------------------------------------------------------------------------- */ |
3410 | /* |
3402 | /* |
3411 | * Respond to a request for our current selection |
3403 | * Respond to a request for our current selection |
3412 | * EXT: SelectionRequest |
3404 | * EXT: SelectionRequest |
3413 | */ |
3405 | */ |
3414 | void |
3406 | void ecb_cold |
3415 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3407 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3416 | { |
3408 | { |
3417 | Atom property = rq.property == None ? rq.target : rq.property; |
3409 | Atom property = rq.property == None ? rq.target : rq.property; |
3418 | XSelectionEvent ev; |
3410 | XSelectionEvent ev; |
3419 | |
3411 | |
… | |
… | |
3552 | |
3544 | |
3553 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3545 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3554 | } |
3546 | } |
3555 | |
3547 | |
3556 | /* ------------------------------------------------------------------------- */ |
3548 | /* ------------------------------------------------------------------------- */ |
3557 | #ifdef USE_XIM |
3549 | #if USE_XIM |
3558 | void |
3550 | void ecb_cold |
3559 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3551 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3560 | { |
3552 | { |
3561 | XWindowAttributes xwa; |
3553 | XWindowAttributes xwa; |
3562 | |
3554 | |
3563 | XGetWindowAttributes (dpy, vt, &xwa); |
3555 | XGetWindowAttributes (dpy, vt, &xwa); |