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.283 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.293 by root, Mon Dec 24 08:00:18 2007 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.
… …
596/* 596/*
597 * Change the rendition style for following text 597 * Change the rendition style for following text
598 */ 598 */
599void 599void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 600rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 601{
602 if (set) 602 if (set)
603 rstyle |= style; 603 rstyle |= style;
604 else if (style == ~RS_None) 604 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
606 else 606 else
607 rstyle &= ~style; 607 rstyle &= ~style;
608 } 608}
609 609
610/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
611/* 611/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 613 * count positive ==> scroll up
… …
1186 } 1186 }
1187 } 1187 }
1188 else 1188 else
1189 { 1189 {
1190 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1191 { /* relative origin mode */ 1192 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1194 } 1195 }
1195 else 1196 else
1196 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1472 { 1473 {
1473 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1476 else 1477 else
1478 {
1477 { /* shift selection */ 1479 /* shift selection */
1478 selection.beg.col += count; 1480 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1482 selection.end.col += count;
1481 } 1483 }
1482 } 1484 }
… …
1870void 1872void
1871rxvt_term::bell_cb (ev::timer &w, int revents) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1874{
1873 rvideo_bell = false; 1875 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1877 refresh_check ();
1875} 1878}
1876#endif 1879#endif
1877 1880
1878/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1879void 1882void
… …
1901 1904
1902 if (option (Opt_visualBell)) 1905 if (option (Opt_visualBell))
1903 { 1906 {
1904 rvideo_bell = true; 1907 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1908 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1909 flush ();
1907 1910
1908 bell_ev.start (VISUAL_BELL_DURATION); 1911 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1912 }
1910 else 1913 else
1911 XBell (dpy, 0); 1914 XBell (dpy, 0);
… …
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2262 { 2265 {
2263 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2264 2267
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2269 if (rend & RS_Bold && fore == Color_fg)
2268 { 2270 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2271 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2272 fore = Color_BD;
2271# if !ENABLE_STYLES 2273# if !ENABLE_STYLES
2272 else 2274 else
2273 invert = !invert; 2275 invert = !invert;
2274# endif 2276# endif
2275 } 2277 }
2276 2278
2277 if (rend & RS_Italic 2279 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2280 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2281 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2282 fore = Color_IT;
2282# if !ENABLE_STYLES 2283# if !ENABLE_STYLES
2283 else 2284 else
… …
2317 } 2318 }
2318 2319
2319#ifdef TEXT_BLINK 2320#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2321 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2322 {
2322 if (!text_blink_ev.active) 2323 if (!text_blink_ev.is_active ())
2323 { 2324 {
2324 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2325 text_blink_ev.again ();
2325 hidden_text = 0; 2326 hidden_text = 0;
2326 } 2327 }
2327 else if (hidden_text) 2328 else if (hidden_text)
2328 fore = back; 2329 fore = back;
2329 } 2330 }
… …
2473rxvt_term::scr_recolour () NOTHROW 2474rxvt_term::scr_recolour () NOTHROW
2474{ 2475{
2475#ifdef HAVE_BG_PIXMAP 2476#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2477 bgPixmap.apply ();
2477#else 2478#else
2479
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483
2481# if HAVE_SCROLLBARS 2484# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2485 if (scrollBar.win)
2483 { 2486 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2488 scrollBar.setIdle ();
2486 scrollbar_show (0); 2489 scrollbar_show (0);
2487 } 2490 }
2488# endif 2491# endif
2492
2489 scr_clear (); 2493 scr_clear ();
2490 scr_touch (true); 2494 scr_touch (true);
2491 want_refresh = 1; 2495 want_refresh = 1;
2492#endif
2493 2496
2497#endif
2494} 2498}
2495 2499
2496/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2497void 2501void
2498rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2852 */ 2856 */
2853void 2857void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2859{
2856 if (selection.text && selnum == Sel_Primary) 2860 if (selection.text && selnum == Sel_Primary)
2861 {
2857 { /* internal selection */ 2862 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2860 free (str); 2865 free (str);
2861 return; 2866 return;
2862 } 2867 }
… …
3130 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3137 --selection.mark.col;
3133 3138
3134 if (selection.op) 3139 if (selection.op)
3140 {
3135 { /* clear the old selection */ 3141 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3144 }
3139 3145
3140 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3329 * 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
3330 * 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
3331 * time of the most recent button3 press 3337 * time of the most recent button3 press
3332 */ 3338 */
3333 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3334 { /* button3 press */ 3341 /* button3 press */
3335 /* 3342 /*
3336 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3337 */ 3344 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3359 } 3366 }
3360 } 3367 }
3361 else 3368 else
3369 {
3362 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3372 {
3365 if (selection.mark.row == selection.end.row 3373 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3374 && selection.mark.col == selection.end.col
3367 && clickchange 3375 && clickchange
… …
3448 selection.end.row++; 3456 selection.end.row++;
3449 } 3457 }
3450 } 3458 }
3451 3459
3452 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3453 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3454 if (closeto == LEFT) 3463 if (closeto == LEFT)
3455 { 3464 {
3456 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3467 }

Diff Legend

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