ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.305 by ayin, Thu Feb 21 10:30:24 2008 UTC

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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
34 34
35inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
… …
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 91 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
95 if (mapped) \ 93 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
97 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
99 97
100#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 99 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
105 103
106#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
108 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
109 (unsigned int)width, \ 107 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
111 109
112/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 273 }
276 274
277 line_t *old_buf = row_buf; 275 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 277
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
283 281
284 if (top_row) 282 if (top_row)
… …
328 int qcol = 0; 326 int qcol = 0;
329 327
330 // see below for cursor adjustment rationale 328 // see below for cursor adjustment rationale
331 if (p == ocur.row) 329 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 330 screen.cur.row = q - (total_rows - nrow);
333 331
334 // fill a single destination line 332 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
336 { 334 {
337 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
… …
364 } 362 }
365 while (p != pend && q > 0); 363 while (p != pend && q > 0);
366 364
367 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
368 top_row = q - term_start; 366 top_row = q - term_start;
369 367
370 // make sure all terminal lines exist 368 // make sure all terminal lines exist
371 while (top_row > 0) 369 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 371 }
374 else 372 else
375 { 373 {
376 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
377 375
378 for (int row = min (nrow, prev_nrow); row--; ) 376 for (int row = min (nrow, prev_nrow); row--; )
379 { 377 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 379 line_t &qline = row_buf [row];
382 380
… …
405 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
406 404
407 prev_nrow = nrow; 405 prev_nrow = nrow;
408 prev_ncol = ncol; 406 prev_ncol = ncol;
409 407
410 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol);
411 409
412 for (int col = ncol; --col; ) 410 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0; 411 tabs [col] = col % TABSIZE == 0;
414 412
415 if (current_screen != PRIMARY) 413 if (current_screen != PRIMARY)
… …
596/* 594/*
597 * Change the rendition style for following text 595 * Change the rendition style for following text
598 */ 596 */
599void 597void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 598rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 599{
602 if (set) 600 if (set)
603 rstyle |= style; 601 rstyle |= style;
604 else if (style == ~RS_None) 602 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
606 else 604 else
607 rstyle &= ~style; 605 rstyle &= ~style;
608 } 606}
609 607
610/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
611/* 609/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 611 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 662 line_t &l2 = ROW(i);
665 663
666 ::swap (l1, l2); 664 ::swap (l1, l2);
667 l2.touch (); 665 l2.touch ();
668 } 666 }
669 667
670 // move and/or clear selection, if any 668 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
672 { 670 {
673 selection.beg.row -= count; 671 selection.beg.row -= count;
674 selection.end.row -= count; 672 selection.end.row -= count;
… …
710 { 708 {
711 /* move selected region too */ 709 /* move selected region too */
712 selection.beg.row -= count; 710 selection.beg.row -= count;
713 selection.end.row -= count; 711 selection.end.row -= count;
714 selection.mark.row -= count; 712 selection.mark.row -= count;
715 713
716 selection_check (0); 714 selection_check (0);
717 } 715 }
718 } 716 }
719 717
720 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
… …
832 } 830 }
833 831
834 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
835 { 833 {
836 scr_do_wrap (); 834 scr_do_wrap ();
837 835
838 line->l = ncol; 836 line->l = ncol;
839 line->is_longer (1); 837 line->is_longer (1);
840 838
841 row = screen.cur.row; 839 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
… …
1011 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1012 */ 1010 */
1013void 1011void
1014rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1015{ 1013{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1019 { 1015 {
1020 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1021 { 1017 {
1022#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1020 --screen.cur.row;
1025 return; 1021
1022 want_refresh = 1;
1026#endif 1023#endif
1027 } 1024 }
1028 } 1025 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1030 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1028}
1034 1029
1035/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1036/* 1031/*
1037 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1060 x = i; 1055 x = i;
1061 1056
1062 if (!--count) 1057 if (!--count)
1063 break; 1058 break;
1064 } 1059 }
1065 else 1060 else
1066 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1068 1063
1069 if (count) 1064 if (count)
1070 x = ncol - 1; 1065 x = ncol - 1;
… …
1186 } 1181 }
1187 } 1182 }
1188 else 1183 else
1189 { 1184 {
1190 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1191 { /* relative origin mode */ 1187 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1194 } 1190 }
1195 else 1191 else
1196 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1472 { 1468 {
1473 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1470 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1471 CLEAR_SELECTION ();
1476 else 1472 else
1473 {
1477 { /* shift selection */ 1474 /* shift selection */
1478 selection.beg.col += count; 1475 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1477 selection.end.col += count;
1481 } 1478 }
1482 } 1479 }
… …
1621 */ 1618 */
1622void 1619void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1621{
1625 if (mode < 0) 1622 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1629} 1626}
1630 1627
1631/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
… …
1866 return true; 1863 return true;
1867} 1864}
1868 1865
1869#ifndef NO_BELL 1866#ifndef NO_BELL
1870void 1867void
1871rxvt_term::bell_cb (time_watcher &w) 1868rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1869{
1873 rvideo_bell = false; 1870 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1871 scr_rvideo_mode (rvideo_mode);
1872 refresh_check ();
1875} 1873}
1876#endif 1874#endif
1877 1875
1878/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
1879void 1877void
… …
1885# ifdef MAPALERT_OPTION 1883# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1884 if (option (Opt_mapAlert))
1887# endif 1885# endif
1888 XMapWindow (dpy, parent[0]); 1886 XMapWindow (dpy, parent[0]);
1889# endif 1887# endif
1888
1890# if ENABLE_FRILLS 1889# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1890 if (option (Opt_urgentOnBell))
1892 { 1891 {
1893 XWMHints *h;
1894
1895 h = XGetWMHints(dpy, parent[0]); 1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1896 if (h != NULL)
1897 { 1893 {
1898 h->flags |= XUrgencyHint; 1894 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h); 1895 XSetWMHints (dpy, parent[0], h);
1900 } 1896 }
1901 } 1897 }
1902# endif 1898# endif
1903 1899
1904 if (option (Opt_visualBell)) 1900 if (option (Opt_visualBell))
1905 { 1901 {
1906 rvideo_bell = true; 1902 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1903 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1904 flush ();
1909 1905
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1906 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1907 }
1912 else 1908 else
1913 XBell (dpy, 0); 1909 XBell (dpy, 0);
1914#endif 1910#endif
1915} 1911}
… …
1996 return; 1992 return;
1997 1993
1998 /* 1994 /*
1999 * A: set up vars 1995 * A: set up vars
2000 */ 1996 */
1997 refresh_count = 0;
1998
2001 have_bg = 0; 1999 have_bg = 0;
2002 refresh_count = 0;
2003
2004#ifdef HAVE_BG_PIXMAP 2000#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2001 have_bg = bgPixmap.pixmap != None;
2006#endif 2002#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2004
2009 /* 2005 /*
2010 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2264 { 2260 {
2265 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2266 2262
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2264 if (rend & RS_Bold && fore == Color_fg)
2270 { 2265 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2266 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2267 fore = Color_BD;
2273# if !ENABLE_STYLES 2268# if !ENABLE_STYLES
2274 else 2269 else
2275 invert = !invert; 2270 invert = !invert;
2276# endif 2271# endif
2277 } 2272 }
2278 2273
2279 if (rend & RS_Italic 2274 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2275 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2276 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2277 fore = Color_IT;
2284# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2285 else 2279 else
… …
2319 } 2313 }
2320 2314
2321#ifdef TEXT_BLINK 2315#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2317 {
2324 if (!text_blink_ev.active) 2318 if (!text_blink_ev.is_active ())
2325 { 2319 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2320 text_blink_ev.again ();
2327 hidden_text = 0; 2321 hidden_text = 0;
2328 } 2322 }
2329 else if (hidden_text) 2323 else if (hidden_text)
2330 fore = back; 2324 fore = back;
2331 } 2325 }
… …
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2374 else
2381#endif 2375#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2377
2384 XDrawLine (dpy, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2381 }
2388 } /* for (col....) */ 2382 } /* for (col....) */
2389 } /* for (row....) */ 2383 } /* for (row....) */
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2422 else
2429#endif 2423#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2425
2432 XDrawRectangle (dpy, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2427 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2431 }
… …
2475rxvt_term::scr_recolour () NOTHROW 2469rxvt_term::scr_recolour () NOTHROW
2476{ 2470{
2477#ifdef HAVE_BG_PIXMAP 2471#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2472 bgPixmap.apply ();
2479#else 2473#else
2474
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2478
2484 if (scrollBar.win) 2479 if (scrollBar.win)
2485 { 2480 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2482 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2483 scrollBar.show (0);
2489 } 2484 }
2485
2490# endif 2486#endif
2491#endif 2487
2492 2488 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2489 scr_clear ();
2494 scr_touch (true); 2490 scr_touch (true);
2495 want_refresh = 1; 2491 want_refresh = 1;
2496} 2492}
2497 2493
… …
2589{ 2585{
2590 int row, wrote; 2586 int row, wrote;
2591 unsigned int width, towrite; 2587 unsigned int width, towrite;
2592 char r1[] = "\n"; 2588 char r1[] = "\n";
2593 2589
2594 for (row = saveLines - nsaved; 2590 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2591 row < saveLines + nrow - 1; row++)
2596 { 2592 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2593 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2594 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2595 for (towrite = width; towrite; towrite -= wrote)
… …
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2646 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2647 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2648 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2649 data[i] = C0_CR;
2654 2650
2651 if (priv_modes & PrivMode_BracketPaste)
2652 tt_printf ("\e[200~");
2653
2655 tt_write (data, len); 2654 tt_write (data, len);
2655
2656 if (priv_modes & PrivMode_BracketPaste)
2657 tt_printf ("\e[201~");
2656} 2658}
2657 2659
2658/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2659/* 2661/*
2660 * Respond to a notification that a primary selection has been sent 2662 * Respond to a notification that a primary selection has been sent
… …
2735 if (!delete_prop) 2737 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2737 2739
2738 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2739 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2740 incr_ev.start (NOW + 10); 2742 incr_ev.start (10);
2741 2743
2742 goto bailout; 2744 goto bailout;
2743 } 2745 }
2744 2746
2745 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
… …
2754 ct.nitems = incr_buf_fill; 2756 ct.nitems = incr_buf_fill;
2755 incr_buf = 0; 2757 incr_buf = 0;
2756 incr_buf_size = 0; 2758 incr_buf_size = 0;
2757 incr_ev.stop (); 2759 incr_ev.stop ();
2758 } 2760 }
2759 else 2761 else
2760 { 2762 {
2761 if (selection_wait == Sel_normal 2763 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 { 2765 {
2764 /* 2766 /*
… …
2771 goto bailout; 2773 goto bailout;
2772 } 2774 }
2773 } 2775 }
2774 else if (selection_wait == Sel_incr) 2776 else if (selection_wait == Sel_incr)
2775 { 2777 {
2776 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2777 2779
2778 while (incr_buf_fill + ct.nitems > incr_buf_size) 2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 { 2781 {
2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2821 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2823} 2825}
2824 2826
2825void 2827void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2827{ 2829{
2828 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2829 2831
2830 incr_buf_size = 0; 2832 incr_buf_size = 0;
2831 free (incr_buf); 2833 free (incr_buf);
… …
2842 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
2843} 2845}
2844 2846
2845/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2846/* 2848/*
2847 * Request the current selection: 2849 * Request the current selection:
2848 * Order: > internal selection if available 2850 * Order: > internal selection if available
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2850 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
… …
2854 */ 2856 */
2855void 2857void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2859{
2858 if (selection.text && selnum == Sel_Primary) 2860 if (selection.text && selnum == Sel_Primary)
2861 {
2859 { /* internal selection */ 2862 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2862 free (str); 2865 free (str);
2863 return; 2866 return;
2864 } 2867 }
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3133 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3134
3132 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3137 --selection.mark.col;
3135 3138
3136 if (selection.op) 3139 if (selection.op)
3140 {
3137 { /* clear the old selection */ 3141 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3144 }
3141 3145
3142 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3331 * a point/word/line which is either the start or end of the selection 3335 * a point/word/line which is either the start or end of the selection
3332 * and it was decided by whichever point/word/line was `fixed' at the 3336 * and it was decided by whichever point/word/line was `fixed' at the
3333 * time of the most recent button3 press 3337 * time of the most recent button3 press
3334 */ 3338 */
3335 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3336 { /* button3 press */ 3341 /* button3 press */
3337 /* 3342 /*
3338 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3339 */ 3344 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3361 } 3366 }
3362 } 3367 }
3363 else 3368 else
3369 {
3364 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3372 {
3367 if (selection.mark.row == selection.end.row 3373 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3374 && selection.mark.col == selection.end.col
3369 && clickchange 3375 && clickchange
… …
3450 selection.end.row++; 3456 selection.end.row++;
3451 } 3457 }
3452 } 3458 }
3453 3459
3454 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3455 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3456 if (closeto == LEFT) 3463 if (closeto == LEFT)
3457 { 3464 {
3458 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3467 }
… …
3659 XFree (ct.value); 3666 XFree (ct.value);
3660 } 3667 }
3661 3668
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3663} 3670}
3664
3665/* ------------------------------------------------------------------------- *
3666 * MOUSE ROUTINES *
3667 * ------------------------------------------------------------------------- */
3668
3669/*
3670 * return col/row values corresponding to x/y pixel values
3671 */
3672void
3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3674{
3675 *x = Pixel2Col (*x);
3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y);
3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679}
3680 3671
3681/* ------------------------------------------------------------------------- */ 3672/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3673#ifdef USE_XIM
3683void 3674void
3684rxvt_term::im_set_position (XPoint &pos) NOTHROW 3675rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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