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.289 by root, Fri Dec 14 05:25:26 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 }
… …
2317 } 2319 }
2318 2320
2319#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2323 {
2322 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2323 { 2325 {
2324 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2325 hidden_text = 0; 2327 hidden_text = 0;
2326 } 2328 }
2327 else if (hidden_text) 2329 else if (hidden_text)
2328 fore = back; 2330 fore = back;
2329 } 2331 }
… …
2852 */ 2854 */
2853void 2855void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2857{
2856 if (selection.text && selnum == Sel_Primary) 2858 if (selection.text && selnum == Sel_Primary)
2859 {
2857 { /* internal selection */ 2860 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2861 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2862 paste (str, strlen (str));
2860 free (str); 2863 free (str);
2861 return; 2864 return;
2862 } 2865 }
… …
3130 while (selection.mark.col > 0 3133 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3134 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3135 --selection.mark.col;
3133 3136
3134 if (selection.op) 3137 if (selection.op)
3138 {
3135 { /* clear the old selection */ 3139 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3140 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3141 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3142 }
3139 3143
3140 selection.op = SELECTION_INIT; 3144 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3333 * 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 3334 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3335 * time of the most recent button3 press
3332 */ 3336 */
3333 if (button3 && buttonpress) 3337 if (button3 && buttonpress)
3338 {
3334 { /* button3 press */ 3339 /* button3 press */
3335 /* 3340 /*
3336 * first determine which edge of the selection we are closest to 3341 * first determine which edge of the selection we are closest to
3337 */ 3342 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3343 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3344 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3362 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3363 selection.mark.col = selection.beg.col;
3359 } 3364 }
3360 } 3365 }
3361 else 3366 else
3367 {
3362 { /* button1 drag or button3 drag */ 3368 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3369 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3370 {
3365 if (selection.mark.row == selection.end.row 3371 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3372 && selection.mark.col == selection.end.col
3367 && clickchange 3373 && clickchange
… …
3448 selection.end.row++; 3454 selection.end.row++;
3449 } 3455 }
3450 } 3456 }
3451 3457
3452 if (button3 && buttonpress) 3458 if (button3 && buttonpress)
3459 {
3453 { /* mark may need to be changed */ 3460 /* mark may need to be changed */
3454 if (closeto == LEFT) 3461 if (closeto == LEFT)
3455 { 3462 {
3456 selection.mark.row = selection.end.row; 3463 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3464 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3465 }

Diff Legend

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